aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorchai <chaifix@163.com>2019-01-18 10:30:32 +0800
committerchai <chaifix@163.com>2019-01-18 10:30:32 +0800
commit63547185567a4bc9c66ad2420134e2dc4a1a58ba (patch)
tree63f73779aa40bd31c1f50afae26afcdecbde620e
parentc861508a4d1195d6a453a237a334ce0fefc4dd7e (diff)
*opengl.h
-rw-r--r--build/vc++/libjin/libjin.vcxproj4
-rw-r--r--build/vc++/libjin/libjin.vcxproj.filters12
-rw-r--r--src/libjin/game/application.cpp2
-rw-r--r--src/libjin/graphics/fonts/ttf.cpp2
-rw-r--r--src/libjin/graphics/graphic.h2
-rw-r--r--src/libjin/graphics/opengl.cpp (renamed from src/libjin/graphics/gl.cpp)2
-rw-r--r--src/libjin/graphics/opengl.h (renamed from src/libjin/graphics/gl.h)0
-rw-r--r--src/libjin/graphics/shaders/shader.cpp2
-rw-r--r--src/libjin/graphics/window.cpp2
9 files changed, 14 insertions, 14 deletions
diff --git a/build/vc++/libjin/libjin.vcxproj b/build/vc++/libjin/libjin.vcxproj
index 14b0718..2697bde 100644
--- a/build/vc++/libjin/libjin.vcxproj
+++ b/build/vc++/libjin/libjin.vcxproj
@@ -175,7 +175,7 @@
<ClInclude Include="..\..\..\src\libjin\Graphics\graphics.h" />
<ClInclude Include="..\..\..\src\libjin\Graphics\image.h" />
<ClInclude Include="..\..\..\src\libjin\Graphics\mesh.h" />
- <ClInclude Include="..\..\..\src\libjin\Graphics\gl.h" />
+ <ClInclude Include="..\..\..\src\libjin\Graphics\opengl.h" />
<ClInclude Include="..\..\..\src\libjin\graphics\renderable.h" />
<ClInclude Include="..\..\..\src\libjin\graphics\sprite_batch.h" />
<ClInclude Include="..\..\..\src\libjin\graphics\sprite_sheet.h" />
@@ -249,7 +249,7 @@
<ClCompile Include="..\..\..\src\libjin\Graphics\graphic.cpp" />
<ClCompile Include="..\..\..\src\libjin\Graphics\image.cpp" />
<ClCompile Include="..\..\..\src\libjin\Graphics\mesh.cpp" />
- <ClCompile Include="..\..\..\src\libjin\Graphics\gl.cpp" />
+ <ClCompile Include="..\..\..\src\libjin\Graphics\opengl.cpp" />
<ClCompile Include="..\..\..\src\libjin\graphics\sprite_batch.cpp" />
<ClCompile Include="..\..\..\src\libjin\graphics\sprite_sheet.cpp" />
<ClCompile Include="..\..\..\src\libjin\Graphics\shapes.cpp" />
diff --git a/build/vc++/libjin/libjin.vcxproj.filters b/build/vc++/libjin/libjin.vcxproj.filters
index 7156e41..3a17d94 100644
--- a/build/vc++/libjin/libjin.vcxproj.filters
+++ b/build/vc++/libjin/libjin.vcxproj.filters
@@ -195,9 +195,6 @@
<ClInclude Include="..\..\..\src\libjin\Graphics\color.h">
<Filter>graphics</Filter>
</ClInclude>
- <ClInclude Include="..\..\..\src\libjin\Graphics\gl.h">
- <Filter>graphics</Filter>
- </ClInclude>
<ClInclude Include="..\..\..\src\libjin\Graphics\graphic.h">
<Filter>graphics</Filter>
</ClInclude>
@@ -316,6 +313,9 @@
<Filter>utils</Filter>
</ClInclude>
<ClInclude Include="..\..\..\src\libjin\jin.h" />
+ <ClInclude Include="..\..\..\src\libjin\Graphics\opengl.h">
+ <Filter>graphics</Filter>
+ </ClInclude>
</ItemGroup>
<ItemGroup>
<None Include="..\..\..\src\libjin\core\README.md">
@@ -396,9 +396,6 @@
<ClCompile Include="..\..\..\src\libjin\Graphics\color.cpp">
<Filter>graphics</Filter>
</ClCompile>
- <ClCompile Include="..\..\..\src\libjin\Graphics\gl.cpp">
- <Filter>graphics</Filter>
- </ClCompile>
<ClCompile Include="..\..\..\src\libjin\Graphics\graphic.cpp">
<Filter>graphics</Filter>
</ClCompile>
@@ -474,5 +471,8 @@
<ClCompile Include="..\..\..\src\libjin\Utils\unittest.cpp">
<Filter>utils</Filter>
</ClCompile>
+ <ClCompile Include="..\..\..\src\libjin\Graphics\opengl.cpp">
+ <Filter>graphics</Filter>
+ </ClCompile>
</ItemGroup>
</Project> \ No newline at end of file
diff --git a/src/libjin/game/application.cpp b/src/libjin/game/application.cpp
index e67231f..c198336 100644
--- a/src/libjin/game/application.cpp
+++ b/src/libjin/game/application.cpp
@@ -6,7 +6,7 @@
#include "../time/timer.h"
#include "../input/event.h"
#include "../graphics/window.h"
-#include "../graphics/gl.h"
+#include "../graphics/opengl.h"
#include "../math/math.h"
#include "application.h"
diff --git a/src/libjin/graphics/fonts/ttf.cpp b/src/libjin/graphics/fonts/ttf.cpp
index f47e7e4..1357810 100644
--- a/src/libjin/graphics/fonts/ttf.cpp
+++ b/src/libjin/graphics/fonts/ttf.cpp
@@ -5,7 +5,7 @@
#include "../../common/array.hpp"
-#include "../gl.h"
+#include "../opengl.h"
#include "../color.h"
#include "../shaders/shader.h"
diff --git a/src/libjin/graphics/graphic.h b/src/libjin/graphics/graphic.h
index ac2bc0e..857785d 100644
--- a/src/libjin/graphics/graphic.h
+++ b/src/libjin/graphics/graphic.h
@@ -9,7 +9,7 @@
#include "../math/transform.h"
#include "renderable.h"
-#include "gl.h"
+#include "opengl.h"
#include "bitmap.h"
namespace JinEngine
diff --git a/src/libjin/graphics/gl.cpp b/src/libjin/graphics/opengl.cpp
index b90a29b..da3659d 100644
--- a/src/libjin/graphics/gl.cpp
+++ b/src/libjin/graphics/opengl.cpp
@@ -1,7 +1,7 @@
#define OGL2D_IMPLEMENT
#include "../utils/log.h"
-#include "gl.h"
+#include "opengl.h"
#include "color.h"
#include "canvas.h"
#include "texture.h"
diff --git a/src/libjin/graphics/gl.h b/src/libjin/graphics/opengl.h
index e97ebb6..e97ebb6 100644
--- a/src/libjin/graphics/gl.h
+++ b/src/libjin/graphics/opengl.h
diff --git a/src/libjin/graphics/shaders/shader.cpp b/src/libjin/graphics/shaders/shader.cpp
index c7f6f11..dce795d 100644
--- a/src/libjin/graphics/shaders/shader.cpp
+++ b/src/libjin/graphics/shaders/shader.cpp
@@ -8,7 +8,7 @@
#include "../../utils/log.h"
#include "../../utils/macros.h"
-#include "../gl.h"
+#include "../opengl.h"
#include "../window.h"
#include "jsl_compiler.h"
diff --git a/src/libjin/graphics/window.cpp b/src/libjin/graphics/window.cpp
index 6171c9d..479961b 100644
--- a/src/libjin/graphics/window.cpp
+++ b/src/libjin/graphics/window.cpp
@@ -10,7 +10,7 @@
#include "shaders/shader.h"
#include "window.h"
-#include "gl.h"
+#include "opengl.h"
#include "canvas.h"
using namespace JinEngine::Graphics::Shaders;