Merge pull request #11 from lr8soft/dev-y

dev-y

Author: lr8soft

.idea/workspace.xml

@@ -0,0 +1,11 @@
+//glm::vec3 pos = glm::vec3(0.0f, 0.0f, 2.0f);
+//glm::vec3 target = glm::vec3(0.0f, 0.0f, 0.0f);
+//glm::vec3 up = glm::vec3(0.0f, 1.0f, 0.0f);
+
+//glm::mat4 view = glm::lookAt(pos, target, up);
+//glm::mat4 projection = glm::perspective(glm::radians(45.0f), (float)XCFrameInfo::ScreenWidth / XCFrameInfo::ScreenHeight, 0.1f, 1000.0f);
+
+//glm::mat4 model;
+//model = glm::translate(model, glm::vec3(0.0f, 0.0f, 0.0f));
+//model = glm::rotate(model,glm::radians(-30.0f),glm::vec3(1,0,0));
+//model = glm::scale(model, glm::vec3(1.0f));

Python2D/3DCamera.txt

@@ -131,6 +131,8 @@
     <ClCompile Include="util\gl3w.c" />
     <ClCompile Include="util\ImageLoader.cpp" />
     <ClCompile Include="util\ShaderReader.cpp" />
+    <ClCompile Include="XCCore\Background\BackgroundHelper.cpp" />
+    <ClCompile Include="XCCore\Background\Lake.cpp" />
     <ClCompile Include="XCCore\Bullet\BulletHelper.cpp" />
     <ClCompile Include="XCCore\Bullet\CircleBullet.cpp" />
     <ClCompile Include="XCCore\Task\Task.cpp" />
@@ -142,6 +144,7 @@
     <ClCompile Include="XCCore\Item\Player.cpp" />
     <ClCompile Include="XCCore\XCRender\DecisionPointSE.cpp" />
     <ClCompile Include="XCCore\XCRender\RenderManager.cpp" />
+    <ClCompile Include="XCCore\XCRender\XCAdvImageHelper.cpp" />
     <ClCompile Include="XCCore\XCRender\XCColorBlockHelper.cpp" />
     <ClCompile Include="XCCore\Stage\Stage.cpp" />
     <ClCompile Include="XCFrameInfo.cpp" />
@@ -157,6 +160,9 @@
     <ClInclude Include="util\ImageLoader.h" />
     <ClInclude Include="util\ShaderReader.h" />
     <ClInclude Include="util\stb_image.h" />
+    <ClInclude Include="XCCore\Background\Background.h" />
+    <ClInclude Include="XCCore\Background\BackgroundHelper.h" />
+    <ClInclude Include="XCCore\Background\Lake.h" />
     <ClInclude Include="XCCore\Bullet\Bullet.h" />
     <ClInclude Include="XCCore\Bullet\BulletHelper.h" />
     <ClInclude Include="XCCore\Bullet\CircleBullet.h" />
@@ -171,6 +177,7 @@
     <ClInclude Include="XCCore\XCRender\IRenderHelper.h" />
     <ClInclude Include="XCCore\XCRender\ISpecialEffect.h" />
     <ClInclude Include="XCCore\XCRender\RenderManager.h" />
+    <ClInclude Include="XCCore\XCRender\XCAdvImageHelper.h" />
     <ClInclude Include="XCCore\XCRender\XCColorBlockHelper.h" />
     <ClInclude Include="XCCore\Stage\Stage.h" />
     <ClInclude Include="XCFrameInfo.h" />

Python2D/Python2D.vcxproj

@@ -28,6 +28,9 @@
     <Filter Include="XCCore\Task">
       <UniqueIdentifier>{303b8fc6-942a-443b-85e0-f81bdcf099af}</UniqueIdentifier>
     </Filter>
+    <Filter Include="XCCore\Background">
+      <UniqueIdentifier>{f2bb86c8-b3aa-4e55-9427-8633fcd22128}</UniqueIdentifier>
+    </Filter>
   </ItemGroup>
   <ItemGroup>
     <ClCompile Include="util\ConfigManager.cpp">
@@ -96,6 +99,15 @@
     <ClCompile Include="XCCore\Task\TaskHelper.cpp">
       <Filter>XCCore\Task</Filter>
     </ClCompile>
+    <ClCompile Include="XCCore\Background\Lake.cpp">
+      <Filter>XCCore\Background</Filter>
+    </ClCompile>
+    <ClCompile Include="XCCore\Background\BackgroundHelper.cpp">
+      <Filter>XCCore\Background</Filter>
+    </ClCompile>
+    <ClCompile Include="XCCore\XCRender\XCAdvImageHelper.cpp">
+      <Filter>XCCore\XCRender</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="util\ConfigManager.h">
@@ -172,5 +184,17 @@
     <ClInclude Include="XCCore\Task\TaskHelper.h">
       <Filter>XCCore\Task</Filter>
     </ClInclude>
+    <ClInclude Include="XCCore\Background\Background.h">
+      <Filter>XCCore\Background</Filter>
+    </ClInclude>
+    <ClInclude Include="XCCore\Background\Lake.h">
+      <Filter>XCCore\Background</Filter>
+    </ClInclude>
+    <ClInclude Include="XCCore\Background\BackgroundHelper.h">
+      <Filter>XCCore\Background</Filter>
+    </ClInclude>
+    <ClInclude Include="XCCore\XCRender\XCAdvImageHelper.h">
+      <Filter>XCCore\XCRender</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>