fixed dual mode

adafcaefc · Dec 6, 2024 · 27ce798 · 27ce798
1 parent 4e3d8a4
commit 27ce798
Show file tree

Hide file tree

Showing 9 changed files with 9 additions and 249 deletions.
diff --git a/Geome3Dash/Geome3Dash.vcxproj b/Geome3Dash/Geome3Dash.vcxproj
@@ -72,7 +72,6 @@
     <ClCompile Include="src\game\component\G3DNumberSetting.cpp" />
     <ClCompile Include="src\game\planet\G3DPlanetLayer.cpp" />
     <ClCompile Include="src\game\playing\G3DPlayLayer.cpp" />
-    <ClCompile Include="src\game\test\G3DModelPreviewLayer.cpp" />
     <ClCompile Include="src\helper\spline\Curve.cpp" />
     <ClCompile Include="src\helper\spline\Spline.cpp" />
     <ClCompile Include="src\hook\CCEGLView.cpp" />
@@ -90,7 +89,7 @@
     <ClCompile Include="src\delegate\CustomTouch.cpp" />
     <ClCompile Include="src\helper\CommonHelper.cpp" />
     <ClCompile Include="src\helper\OpenGLStateHelper.cpp" />
-    <ClCompile Include="src\Entries.cpp" />
+    <ClCompile Include="src\Geome3DashEntry.cpp" />
     <ClCompile Include="src\LevelEditorImGui.cpp" />
     <ClCompile Include="src\PlanetStateManager.cpp" />
     <ClCompile Include="src\PlayerObjectModel.cpp" />
@@ -139,10 +138,9 @@
     <ClInclude Include="src\game\component\G3DNumberSetting.h" />
     <ClInclude Include="src\game\planet\G3DPlanetLayer.h" />
     <ClInclude Include="src\game\playing\G3DPlayLayer.h" />
-    <ClInclude Include="src\game\test\G3DModelPreviewLayer.h" />
     <ClInclude Include="src\helper\CommonHelper.h" />
     <ClInclude Include="src\helper\OpenGLStateHelper.h" />
-    <ClInclude Include="src\Entries.h" />
+    <ClInclude Include="src\Geome3DashEntry.h" />
     <ClInclude Include="src\helper\spline\Curve.h" />
     <ClInclude Include="src\helper\spline\Spline.h" />
     <ClInclude Include="src\LevelDataManager.h" />

diff --git a/Geome3Dash/Geome3Dash.vcxproj.filters b/Geome3Dash/Geome3Dash.vcxproj.filters
@@ -21,7 +21,7 @@
     <ClCompile Include="pch.cpp">
       <Filter>Frameworks</Filter>
     </ClCompile>
-    <ClCompile Include="src\Entries.cpp">
+    <ClCompile Include="src\Geome3DashEntry.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
     <ClCompile Include="src\Delegate\CustomKeyboard.cpp">
@@ -93,9 +93,6 @@
     <ClCompile Include="src\game\playing\G3DPlayLayer.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
-    <ClCompile Include="src\game\test\G3DModelPreviewLayer.cpp">
-      <Filter>Source Files</Filter>
-    </ClCompile>
     <ClCompile Include="src\LevelDataManager.cpp">
       <Filter>Source Files</Filter>
     </ClCompile>
@@ -212,7 +209,7 @@
     <ClInclude Include="src\CocosShaderProgram.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\Entries.h">
+    <ClInclude Include="src\Geome3DashEntry.h">
       <Filter>Header Files</Filter>
     </ClInclude>
     <ClInclude Include="src\Helper\OpenGLStateHelper.h">
@@ -278,9 +275,6 @@
     <ClInclude Include="src\game\playing\G3DPlayLayer.h">
       <Filter>Header Files</Filter>
     </ClInclude>
-    <ClInclude Include="src\game\test\G3DModelPreviewLayer.h">
-      <Filter>Header Files</Filter>
-    </ClInclude>
     <ClInclude Include="src\LevelDataManager.h">
       <Filter>Header Files</Filter>
     </ClInclude>

diff --git a/Geome3Dash/dllmain.cpp b/Geome3Dash/dllmain.cpp
@@ -1,5 +1,5 @@
 #include "pch.h"
-#include "src/Entries.h"
+#include "src/Geome3DashEntry.h"
 
 static DWORD WINAPI mainThread(LPVOID lpParam)
 {

diff --git a/Geome3Dash/src/Entries.cpp → Geome3Dash/src/Geome3DashEntry.cpp b/Geome3Dash/src/Entries.cpp → Geome3Dash/src/Geome3DashEntry.cpp
@@ -1,6 +1,6 @@
 #include "pch.h"
 
-#include "Entries.h"
+#include "Geome3DashEntry.h"
 
 namespace g3d
 {

diff --git a/Geome3Dash/src/Entries.h → Geome3Dash/src/Geome3DashEntry.h b/Geome3Dash/src/Entries.h → Geome3Dash/src/Geome3DashEntry.h
diff --git a/Geome3Dash/src/game/editor/G3DCameraKeyframeEditorPopup.cpp b/Geome3Dash/src/game/editor/G3DCameraKeyframeEditorPopup.cpp
@@ -234,7 +234,8 @@ namespace g3d
 		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
 
 		player1.render(ckel->blockShaderProgram, ckel->layer3d->camera, ckel->layer3d->light);
-		player2.render(ckel->blockShaderProgram, ckel->layer3d->camera, ckel->layer3d->light);
+		if (ckel->lel->m_gameState.m_isDualMode) { player2.render(ckel->blockShaderProgram, ckel->layer3d->camera, ckel->layer3d->light); }
+
 		for (auto& block : blocks) { block.render(ckel->blockShaderProgram, ckel->layer3d->camera, ckel->layer3d->light); }
 
 		glDisable(GL_DEPTH_TEST);

diff --git a/Geome3Dash/src/game/playing/G3DPlayLayer.cpp b/Geome3Dash/src/game/playing/G3DPlayLayer.cpp
@@ -92,7 +92,7 @@ namespace g3d
     void G3DPlayLayer::drawPlayers()
     {
         player1.render(shaderProgram, camera, light);
-        player2.render(shaderProgram, camera, light);
+        if (playLayer->m_gameState.m_isDualMode) { player2.render(shaderProgram, camera, light); }
     }
 
     void G3DPlayLayer::draw()

diff --git a/Geome3Dash/src/game/test/G3DModelPreviewLayer.cpp b/Geome3Dash/src/game/test/G3DModelPreviewLayer.cpp
diff --git a/Geome3Dash/src/game/test/G3DModelPreviewLayer.h b/Geome3Dash/src/game/test/G3DModelPreviewLayer.h