More cleanups.

game_scene.cpp

@@ -255,7 +255,7 @@ GameScene::GameScene() {
 	camera_2d = memnew(Camera2D);
 	camera_2d->size = Vector2(1920, 1080);
 
-	mesh = memnew(Mesh());
+	mesh = Ref<Mesh>(memnew(Mesh()));
 	//cmaterial = memnew(ColoredMaterial());
 	//cmaterial->color = glm::vec4(1, 1, 0, 1);
 	color_material.instance();
@@ -266,11 +266,11 @@ GameScene::GameScene() {
 	mesh->upload();
 
 	mi = memnew(MeshInstance3D());
-	mi->material = color_material.ptr();
+	mi->material = color_material;
 	mi->mesh = mesh;
 
 	mi2 = memnew(MeshInstance3D());
-	mi2->material = color_material.ptr();
+	mi2->material = color_material;
 	mi2->mesh = mesh;
 	mi2->transform.origin.x = 1;
 

game_scene.h

@@ -53,7 +53,7 @@ public:
 	Sprite *sprite;
 
 	Camera3D *camera;
-	Mesh *mesh;
+	Ref<Mesh> mesh;
 	MeshInstance3D *mi;
 	MeshInstance3D *mi2;
 	Ref<ColorMaterial> color_material;

sfw/render_core/mesh_utils.cpp

@@ -2,9 +2,10 @@
 #include "render_core/mesh_utils.h"
 //--STRIP
 
-void MeshUtils::create_cone(Mesh *mesh) {
+void MeshUtils::create_cone(Ref<Mesh> mesh) {
-    if (!mesh)
+	if (!mesh.is_valid()) {
 		return;
+	}
 
 	uint32_t vc = mesh->vertices.size();
 

sfw/render_core/mesh_utils.h

@@ -7,7 +7,7 @@
 
 class MeshUtils {
 public:
-    static void create_cone(Mesh *mesh);
+    static void create_cone(Ref<Mesh> mesh);
 };
 
 #endif

sfw/render_objects/mesh_instance_2d.cpp

@@ -33,5 +33,9 @@ void MeshInstance2D::render() {
 MeshInstance2D::MeshInstance2D() {
 }
 MeshInstance2D::~MeshInstance2D() {
+	for (int i = 0; i < children.size(); ++i) {
+		memdelete(children[i]);
+	}
+
 	children.clear();
 }

sfw/render_objects/mesh_instance_2d.h

@@ -2,6 +2,8 @@
 #define MESH_INSTACE_2D_H
 
 //--STRIP
+#include "object_2d.h"
+
 #include "core/vector.h"
 
 #include "render_core/material.h"
@@ -10,7 +12,9 @@
 #include "core/transform.h"
 //--STRIP
 
-class MeshInstance2D {
+class MeshInstance2D : public Object2D {
+	SFW_OBJECT(MeshInstance2D, Object2D);
+
 public:
 	void render();
 

sfw/render_objects/mesh_instance_3d.cpp

@@ -1,3 +1,4 @@
+
 //--STRIP
 #include "render_objects/mesh_instance_3d.h"
 
@@ -5,7 +6,7 @@
 //--STRIP
 
 void MeshInstance3D::render() {
-	if (!mesh) {
+	if (!mesh.is_valid()) {
 		return;
 	}
 
@@ -13,7 +14,7 @@ void MeshInstance3D::render() {
 
 	Camera3D::current_camera->set_model_view_matrix(mat_orig * transform);
 
-	if (material) {
+	if (material.is_valid()) {
 		material->bind();
 	}
 
@@ -31,9 +32,11 @@ void MeshInstance3D::render() {
 }
 
 MeshInstance3D::MeshInstance3D() {
-	material = NULL;
-	mesh = NULL;
 }
 MeshInstance3D::~MeshInstance3D() {
+	for (int i = 0; i < children.size(); ++i) {
+		memdelete(children[i]);
+	}
+
 	children.clear();
 }

sfw/render_objects/mesh_instance_3d.h

@@ -13,14 +13,16 @@
 //--STRIP
 
 class MeshInstance3D : public Object3D {
+	SFW_OBJECT(MeshInstance3D, Object3D);
+
 public:
 	void render();
 
 	MeshInstance3D();
 	~MeshInstance3D();
 
-	Material *material;
+	Ref<Material> material;
-	Mesh *mesh;
+	Ref<Mesh> mesh;
 
 	Vector<MeshInstance3D *> children;
 };

tools/merger/join.sh

@@ -6,5 +6,5 @@ cd ..
 
 python tools/merger/join.py --template tools/merger/sfw.h.inl --path . --output tools/merger/out/sfw.h
 python tools/merger/join.py --template tools/merger/sfw.cpp.inl --path . --output tools/merger/out/sfw.cpp
-python tools/merger/join.py --template tools/merger/sfw.x.inl --path . --output tools/merger/out/sfw
+python tools/merger/join.py --template tools/merger/sfw_3rd.x.inl --path . --output tools/merger/out/sfw_3rd.h
 

tools/merger/sfw.h.inl

@@ -721,6 +721,7 @@ SOFTWARE.
 //--STRIP
 {{FILE:sfw/render_objects/camera_2d.h}}
 //--STRIP
+//#include "object_2d.h"
 //#include "core/vector.h"
 //#include "render_core/material.h"
 //#include "render_core/mesh.h"