Fixes for Release 4.0

- Corrected "bullet" path to lib - CreateExistingMesgGO now uses ToAdd - Stop deleting Mesh Dynamic buffer (dirty fix) - Must look into dynamic buffer management for Mesh
Shadow-Wizard-Games · May 17, 2024 · 2b29e40 · 2b29e40
1 parent ed1f4de
commit 2b29e40
Show file tree

Hide file tree

Showing 7 changed files with 22 additions and 4 deletions.
diff --git a/TheOneBuilder/BuilderSceneManager.cpp b/TheOneBuilder/BuilderSceneManager.cpp
@@ -20,6 +20,9 @@ bool BuilderSceneManager::Start()
 	engine->N_sceneManager->LoadScene("MainMenu");
 	engine->N_sceneManager->Start();
 
+	// pew pew pew :3
+	Resources::LoadFromLibrary<Model>("Library/Meshes/SM_Cube/pCube1.mesh");
+
 	return true;
 }
 

diff --git a/TheOneEditor/Assets/Meshes/SM_Cube.fbx → TheOneEditor/Assets/Meshes/pCube1.fbx b/TheOneEditor/Assets/Meshes/SM_Cube.fbx → TheOneEditor/Assets/Meshes/pCube1.fbx
diff --git a/TheOneEditor/Library/Materials/pCube1/lambert1.toematerial b/TheOneEditor/Library/Materials/pCube1/lambert1.toematerial
@@ -0,0 +1,14 @@
+{
+  "shader": "Library/Shaders/MeshColor.toeshader",
+  "uniforms": [
+    {
+      "Name": "u_Color",
+      "Vec4": {
+        "w": 1.0,
+        "x": 0.4000000059604645,
+        "y": 0.4000000059604645,
+        "z": 0.4000000059604645
+      }
+    }
+  ]
+}
diff --git a/TheOneEditor/Library/Meshes/pCube1/pCube1.mesh b/TheOneEditor/Library/Meshes/pCube1/pCube1.mesh
diff --git a/TheOneEngine/Mesh.cpp b/TheOneEngine/Mesh.cpp
@@ -123,7 +123,7 @@ Mesh::Mesh(std::shared_ptr<GameObject> containerGO, Mesh* ref) : Component(conta
 
 Mesh::~Mesh()
 {
-	if (dynamicVAO) {
+	/*if (dynamicVAO) {
 		GLCALL(glDeleteVertexArrays(1, &dynamicVAO));
 		dynamicVAO = 0;
 	}
@@ -136,7 +136,7 @@ Mesh::~Mesh()
 	if (dynamicIBO) {
 		GLCALL(glDeleteBuffers(1, &dynamicIBO));
 		dynamicIBO = 0;
-	}
+	}*/
 }
 
 

diff --git a/TheOneEngine/MonoRegisterer.cpp b/TheOneEngine/MonoRegisterer.cpp
@@ -127,7 +127,8 @@ static vec3f GetTransformRight(GameObject* GOptr)
 //GameObject
 static GameObject* InstantiateBullet(vec3f* initialPosition, vec3f* direction)
 {
-	engine->N_sceneManager->CreateMeshGO("Assets/Meshes/SM_Cube.fbx");
+	engine->N_sceneManager->CreateExistingMeshGO("Library/Meshes/pCube1/pCube1.mesh");
+
 	GameObject* go = engine->N_sceneManager->objectsToAdd.back().get();
 
 	SetPosition(go, initialPosition);

diff --git a/TheOneEngine/N_SceneManager.cpp b/TheOneEngine/N_SceneManager.cpp
@@ -810,7 +810,7 @@ void N_SceneManager::CreateExistingMeshGO(std::string path)
 			if (isSingleMesh)
 			{
 				meshGO.get()->parent = currentScene->GetRootSceneGO();
-				currentScene->GetRootSceneGO().get()->children.push_back(meshGO);
+				engine->N_sceneManager->objectsToAdd.push_back(meshGO);
 			}
 			else
 			{