diff options
author | chai <chaifix@163.com> | 2019-01-09 00:54:59 +0800 |
---|---|---|
committer | chai <chaifix@163.com> | 2019-01-09 00:54:59 +0800 |
commit | e1e9a0d2262dd90507eae0dc3d779a1a6d5b78bd (patch) | |
tree | a19c93813be193b9c1470504d24be077af260159 | |
parent | c5dfd619814f1de3ec10a08c650e7214fad6a279 (diff) |
*opengl backend
-rw-r--r-- | bin/jin.exe | bin | 572928 -> 572928 bytes | |||
-rw-r--r-- | src/libjin/filesystem/je_compressor.cpp | 0 | ||||
-rw-r--r-- | src/libjin/filesystem/je_compressor.h | 14 | ||||
-rw-r--r-- | src/libjin/graphics/je_graphic.cpp | 4 |
4 files changed, 16 insertions, 2 deletions
diff --git a/bin/jin.exe b/bin/jin.exe Binary files differindex 7d38f87..9a78a56 100644 --- a/bin/jin.exe +++ b/bin/jin.exe diff --git a/src/libjin/filesystem/je_compressor.cpp b/src/libjin/filesystem/je_compressor.cpp new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/src/libjin/filesystem/je_compressor.cpp diff --git a/src/libjin/filesystem/je_compressor.h b/src/libjin/filesystem/je_compressor.h new file mode 100644 index 0000000..efaf6c3 --- /dev/null +++ b/src/libjin/filesystem/je_compressor.h @@ -0,0 +1,14 @@ +#ifndef __JE_COMPRESSOR_H__ +#define __JE_COMPRESSOR_H__ + +namespace JinEngine +{ + namespace Filesystem + { + + + + } +} + +#endif
\ No newline at end of file diff --git a/src/libjin/graphics/je_graphic.cpp b/src/libjin/graphics/je_graphic.cpp index 8340741..d4a706a 100644 --- a/src/libjin/graphics/je_graphic.cpp +++ b/src/libjin/graphics/je_graphic.cpp @@ -77,7 +77,7 @@ namespace JinEngine .uploadVertices(2, GL_FLOAT, 0, vertexCoords) .uploadUV(2, GL_FLOAT, 0, textureCoords); - gl.bindTexture2D(getGLTexture()); + gl.bindTexture2D(mTexture); gl.drawArrays(GL_QUADS, 0, 4); shader->end(); @@ -112,7 +112,7 @@ namespace JinEngine .uploadVertices(2, GL_FLOAT, 0, vertexCoords) .uploadUV(2, GL_FLOAT, 0, textureCoords); - gl.bindTexture2D(getGLTexture()); + gl.bindTexture2D(mTexture); gl.drawArrays(GL_QUADS, 0, 4); shader->end(); |