restructure

.gitmodules

@@ -2,5 +2,5 @@
 	path = submodule/milsko
 	url = https://gitea.nishi.boats/pyrite-dev/milsko
 [submodule "submodule/ode"]
-	path = submodule/ode
+	path = engine/submodule/ode
 	url = https://github.com/thomasmarsh/ODE

CMakeLists.txt

@@ -9,12 +9,8 @@ include(GNUInstallDirs)
 set(CMAKE_INSTALL_RPATH "${CMAKE_INSTALL_FULL_LIBDIR}")
 set(CMAKE_INSTALL_RPATH_USE_LINK_PATH TRUE)
 
-include_directories(external/stb)
-
 set(MW_INSTALL_HEADERS OFF)
 
-add_subdirectory(external/lz4)
-add_subdirectory(external/ode)
 add_subdirectory(submodule/milsko) # Since Milsko provides CMake, we just use it
 
 add_subdirectory(engine)

engine/CMakeLists.txt

@@ -14,6 +14,10 @@ macro(install_target name)
 	)
 endmacro()
 
+add_subdirectory(external/lz4)
+add_subdirectory(external/ode)
+include_directories(external/stb)
+
 file(GLOB GearSrc_SRC src/*.c)
 
 add_library(GearSrc SHARED ${GearSrc_SRC})

engine/src/client.c

@@ -14,7 +14,7 @@ GSClient GSClientCreate(GSEngine engine) {
 	client->engine = engine;
 
 	client->camera[0] = 0;
-	client->camera[1] = 2;
+	client->camera[1] = 0;
 	client->camera[2] = 5;
 
 	client->look_at[0] = 0;
@@ -43,33 +43,7 @@ void GSClientDestroy(GSClient client) {
 	GSLog(GSLogInfo, "Destroyed client");
 }
 
-GSModel m = NULL;
-
 static void scene(GSClient client) {
-	static double r	  = 0;
-	GSVector3     pos = {0, 0, 0};
-	GSVector3     rot = {0, 0, 0};
-	int	      i;
-	int	      a = 1;
-
-	if(m == NULL) m = GSModelOpen(client->engine, "game:/mdl/crate.gsm");
-
-	rot[1] = r;
-	for(i = -a; i <= a; i++) {
-		int j;
-
-		pos[0] = i * 1.5;
-		for(j = -a; j <= a; j++) {
-			pos[2] = j * 1.5;
-
-			GSGLPushMatrix(client->gl);
-			GSGLSetPosition(client->gl, pos);
-			GSGLSetRotation(client->gl, rot);
-			GSModelDraw(m);
-			GSGLPopMatrix(client->gl);
-		}
-	}
-	r++;
 }
 
 void GSClientStep(GSClient client) {