From af7bdaa10ee71a319dc55c3c7556fa43a95c9dc9 Mon Sep 17 00:00:00 2001 From: chai Date: Tue, 2 Apr 2019 21:45:33 +0800 Subject: *misc --- source/tests/win32/01-window/03_sub_menu.cpp | 29 ++++++++++++++++++---------- 1 file changed, 19 insertions(+), 10 deletions(-) (limited to 'source/tests/win32/01-window/03_sub_menu.cpp') diff --git a/source/tests/win32/01-window/03_sub_menu.cpp b/source/tests/win32/01-window/03_sub_menu.cpp index bd3f7b6..58386ac 100644 --- a/source/tests/win32/01-window/03_sub_menu.cpp +++ b/source/tests/win32/01-window/03_sub_menu.cpp @@ -50,6 +50,7 @@ int WINAPI wWinMain(HINSTANCE hInstance, HINSTANCE hPrevInstance, PWSTR lpCmdLin } HDC hdc; HGLRC glc; +HGLRC glc2; static PAINTSTRUCT ps; HBRUSH hBrush; HBRUSH hOldBrush; @@ -58,6 +59,7 @@ HPEN hOldPen; PIXELFORMATDESCRIPTOR pfd; int pf; File* file; +File* file2; DataBuffer db(102400); AEIO::Filesystem* fs; ImageData* imgdata = new ImageData(); @@ -89,7 +91,7 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, // 图片测试 fs = AEIO::Filesystem::Get(); fs->Mount(".", "root"); - file = new File("root/img.png"); + file = new File("root/img.jpg"); file->Open(File::FILE_MODE_READ); file->ReadAll(&db); @@ -102,7 +104,16 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, imgdata->Decode(db); img = new Image(); - img->Refresh(imgdata); + img->Renew(imgdata); + + wglMakeCurrent(hdc, glc); + + file2 = new File("root/img.png"); + file2->Open(File::FILE_MODE_READ); + file2->ReadAll(&db); + imgdata->Decode(db); + img->Renew(imgdata, {50, 100}); + delete imgdata; break; @@ -142,21 +153,19 @@ LRESULT CALLBACK WndProc(HWND hwnd, UINT msg, glBindTexture(GL_TEXTURE_2D, tex); //绑定纹理： glEnable(GL_TEXTURE_2D); //启用2D纹理映射 - glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP); //S方向上贴图 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP); //T方向上贴图 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST); //放大纹理过滤方式 glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST); //缩小纹理过滤方式 - glBegin(GL_QUADS); - glTexCoord2f(0.0f, 0.0f); - glVertex3f(-1.0f, -1.0f, 0.0f); - glTexCoord2f(1.0f, 0.0f); - glVertex3f(0.5f, -0.5f, 0.0f); - glTexCoord2f(1.0f, 1.0f); - glVertex3f(1.0f, 1.0f, 0.0f); glTexCoord2f(0.0f, 1.0f); + glVertex3f(-0.5f, -0.5f, 0.0f); + glTexCoord2f(1.0f, 1.0f); + glVertex3f(0.5f, -0.5f, 0.0f); + glTexCoord2f(1.0f, 0.0f); + glVertex3f(0.5f, 0.5f, 0.0f); + glTexCoord2f(0.0f, 0.0f); glVertex3f(-0.5f, 0.5f, 0.0f); glEnd(); -- cgit v1.1-26-g67d0