diff options
| author | chai <chaifix@163.com> | 2019-01-21 21:07:00 +0800 |
|---|---|---|
| committer | chai <chaifix@163.com> | 2019-01-21 21:07:00 +0800 |
| commit | 63d4e2f436b4c0eb420967ea13bcd16de6e1ea84 (patch) | |
| tree | 8c394be88695a173e51c3d262908a2eded67c7dc | |
| parent | 63547185567a4bc9c66ad2420134e2dc4a1a58ba (diff) | |
*misc
| -rw-r--r-- | bin/SDL2.dll | bin | 771072 -> 771072 bytes | |||
| -rw-r--r-- | bin/cembed.exe | bin | 11264 -> 11264 bytes | |||
| -rw-r--r-- | bin/jin.exe | bin | 317440 -> 337408 bytes | |||
| -rw-r--r-- | bin/lua51.dll | bin | 364544 -> 364544 bytes | |||
| -rw-r--r-- | src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib | bin | 33996 -> 33996 bytes | |||
| -rw-r--r-- | src/3rdparty/LuaJIT-2.0.5/src/minilua.lib | bin | 33996 -> 33996 bytes | |||
| -rw-r--r-- | src/libjin/graphics/shaders/shader.cpp | 4 |
7 files changed, 2 insertions, 2 deletions
diff --git a/bin/SDL2.dll b/bin/SDL2.dll Binary files differindex 6202063..368dda7 100644 --- a/bin/SDL2.dll +++ b/bin/SDL2.dll diff --git a/bin/cembed.exe b/bin/cembed.exe Binary files differindex d9d3a6c..b82dcd8 100644 --- a/bin/cembed.exe +++ b/bin/cembed.exe diff --git a/bin/jin.exe b/bin/jin.exe Binary files differindex 64620b8..6db248b 100644 --- a/bin/jin.exe +++ b/bin/jin.exe diff --git a/bin/lua51.dll b/bin/lua51.dll Binary files differindex 58b7cdd..5084f27 100644 --- a/bin/lua51.dll +++ b/bin/lua51.dll diff --git a/src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib b/src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib Binary files differindex d4372fd..c7be727 100644 --- a/src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib +++ b/src/3rdparty/LuaJIT-2.0.5/src/buildvm.lib diff --git a/src/3rdparty/LuaJIT-2.0.5/src/minilua.lib b/src/3rdparty/LuaJIT-2.0.5/src/minilua.lib Binary files differindex a3cce18..e2b3ac3 100644 --- a/src/3rdparty/LuaJIT-2.0.5/src/minilua.lib +++ b/src/3rdparty/LuaJIT-2.0.5/src/minilua.lib diff --git a/src/libjin/graphics/shaders/shader.cpp b/src/libjin/graphics/shaders/shader.cpp index dce795d..36f6603 100644 --- a/src/libjin/graphics/shaders/shader.cpp +++ b/src/libjin/graphics/shaders/shader.cpp @@ -218,8 +218,8 @@ namespace JinEngine return *this; } gl.activeTextureUnit(unit); - glUniform1i(location, unit); gl.bindTexture2D(tex->getGLTexture()); + glUniform1i(location, unit); gl.activeTextureUnit(MAIN_TEXTURE_UNIT); return *this; } @@ -236,9 +236,9 @@ namespace JinEngine // TODO: 쳣 return *this; } - glUniform1i(location, unit); glActiveTexture(GL_TEXTURE0 + unit); gl.bindTexture2D(canvas->getGLTexture()); + glUniform1i(location, unit); glActiveTexture(GL_TEXTURE0); return *this; |