General branch fixes

cpp/src/component.cpp

@@ -20,8 +20,6 @@
 
 using namespace godot;
 
-GFComponent::GFComponent() {
-}
 GFComponent::~GFComponent() {
 }
 
@@ -36,10 +34,7 @@ Ref<GFComponent> GFComponent::from_id(ecs_entity_t comp, ecs_entity_t entity, GF
 			"	Entity ", world->id_to_text(comp), " is not a component"
 		);
 	}
-	Ref<GFComponent> comp_ref = Ref(memnew(GFComponent));
-	comp_ref->source_entity_id = entity;
-	comp_ref->set_id(comp);
-	comp_ref->set_world(world);
+	Ref<GFComponent> comp_ref = memnew(GFComponent(entity, comp, world));
 	return setup_template<GFComponent>(comp_ref);
 }
 
@@ -51,10 +46,7 @@ Ref<GFComponent> GFComponent::from_id_no_source(ecs_entity_t comp, GFWorld* worl
 			"	Entity ", world->id_to_text(comp), " is not a component"
 		);
 	}
-	Ref<GFComponent> comp_ref = Ref(memnew(GFComponent));
-	comp_ref->source_entity_id = 0;
-	comp_ref->set_id(comp);
-	comp_ref->set_world(world);
+	Ref<GFComponent> comp_ref = Ref(memnew(GFComponent(0, comp, world)));
 	comp_ref->update_script();
 	return comp_ref;
 }
@@ -373,10 +365,6 @@ void GFComponent::set_source_id(ecs_entity_t id) {
 	source_entity_id = id;
 }
 
-Ref<GFRegisterableEntity> GFComponent::new_internal() {
-	return Ref(memnew(GFComponent));
-}
-
 void GFComponent::_bind_methods() {
 	GDVIRTUAL_BIND(_build, "b");
 	godot::ClassDB::bind_method(D_METHOD("_register_internal"), &GFComponent::_register_internal);
@@ -393,6 +381,4 @@ void GFComponent::_bind_methods() {
 	godot::ClassDB::bind_method(D_METHOD("get_data_alignment"), &GFComponent::get_data_alignment);
 	godot::ClassDB::bind_method(D_METHOD("is_alive"), &GFComponent::is_alive);
 	godot::ClassDB::bind_method(D_METHOD("_to_string"), &GFComponent::to_string);
-
-	godot::ClassDB::bind_static_method(get_class_static(), D_METHOD("_new_internal"), &GFComponent::new_internal);
 }

cpp/src/component.h

@@ -18,16 +18,18 @@ namespace godot {
 		GDCLASS(GFComponent, GFRegisterableEntity)
 
 	public:
-		GFComponent();
 		GFComponent(ecs_entity_t component, GFWorld* world):
-			GFRegisterableEntity(component, world) {
-				update_script();
-			}
+			GFRegisterableEntity(component, world),
+			source_entity_id(0)
+		{}
 		GFComponent(ecs_entity_t entity, ecs_entity_t component, GFWorld* world):
 			source_entity_id(entity),
-			GFRegisterableEntity(component, world) {
-				update_script();
-			}
+			GFRegisterableEntity(component, world)
+		{}
+		GFComponent():
+			source_entity_id(0),
+			GFRegisterableEntity(0, GFWorld::singleton())
+		{}
 		~GFComponent();
 
 		// --------------------------------------
@@ -63,7 +65,6 @@ namespace godot {
 		static const EcsStruct* get_struct_ptr(GFWorld*, ecs_entity_t);
 		void set_source_id(ecs_entity_t id);
 
-		static Ref<GFRegisterableEntity> new_internal();
 
 	protected:
 		static void _bind_methods();

cpp/src/component_builder.h

@@ -16,7 +16,14 @@ namespace godot {
 		GDCLASS(GFComponentBuilder, RefCounted)
 
 	public:
-		GFComponentBuilder(GFWorld* world): world(world) {}
+		GFComponentBuilder(GFWorld* world):
+			component_desc({0}),
+			struct_desc({0}),
+			name(""),
+			member_names(Array()),
+			world(world),
+			built(false)
+		{}
 		GFComponentBuilder():
 			GFComponentBuilder(GFWorld::singleton())
 		{}

cpp/src/doc_classes/GFWorld.xml

@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8" ?>
-<class name="GFWorld" inherits="Object" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/godotengine/godot/master/doc/class.xsd">
+<class name="GFWorld" inherits="Object"
+	xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="https://raw.githubusercontent.com/godotengine/godot/master/doc/class.xsd">
 	<brief_description>
 		An entity component system world.
 	</brief_description>
@@ -51,7 +52,6 @@
 				[/codeblock]
 			</description>
 		</method>
-		</method>
 		<method name="pair">
 			<return type="GFPair" />
 			<param index="0" name="first" type="Variant" />

cpp/src/entity.h

@@ -28,7 +28,10 @@ namespace godot {
 		// New entity in specific world
 		GFEntity(GFWorld* world) ;
 		// Reference an entity
-		GFEntity(ecs_entity_t id_, GFWorld* world_): id(id_), world_instance_id(world_->get_instance_id()) {}
+		GFEntity(ecs_entity_t id_, GFWorld* world_):
+			id(id_),
+			world_instance_id(world_->get_instance_id())
+		{}
 		// Copy an entity reference
 		GFEntity(GFEntity& ett): GFEntity(ett.get_id(), ett.get_world()) {}
 		~GFEntity();

cpp/src/module.cpp

@@ -129,9 +129,6 @@ void GFModule::_register_user() {
 	GFRegisterableEntity::_register_user();
 }
 
-Ref<GFRegisterableEntity> GFModule::new_internal() {
-	return Ref(memnew(GFModule));
-}
 
 void GFModule::_bind_methods() {
 	godot::ClassDB::bind_static_method(get_class_static(), D_METHOD("new_in_world", "world"), &GFModule::new_named_in_world);
@@ -140,5 +137,4 @@ void GFModule::_bind_methods() {
 	godot::ClassDB::bind_static_method(get_class_static(), D_METHOD("from_id", "module_id", "world"), &GFModule::from_id, nullptr);
 	godot::ClassDB::bind_method(D_METHOD("_register_internal"), &GFModule::_register_internal);
 	godot::ClassDB::bind_method(D_METHOD("_register_user"), &GFModule::_register_user);
-	godot::ClassDB::bind_static_method(get_class_static(), D_METHOD("_new_internal"), GFModule::new_internal);
 }

cpp/src/module.h

@@ -54,8 +54,6 @@ namespace godot {
 		static Ref<GFModule> from(Variant module, GFWorld*);
 		static Ref<GFModule> from_id(ecs_entity_t, GFWorld*);
 
-		static Ref<GFRegisterableEntity> new_internal();
-
 		// --------------------------------------
 		// --- Unexposed
 		// --------------------------------------

cpp/src/observer_builder.h

@@ -16,8 +16,13 @@ namespace godot {
 		GDCLASS(GFObserverBuilder, GFQuerylikeBuilder)
 
 	public:
-		GFObserverBuilder(GFWorld* world): GFQuerylikeBuilder(world) {}
-		GFObserverBuilder(): GFObserverBuilder(GFWorld::singleton()) {}
+		GFObserverBuilder(GFWorld* world):
+			GFQuerylikeBuilder(world),
+			events(0)
+		{}
+		GFObserverBuilder():
+			GFObserverBuilder(GFWorld::singleton())
+		{}
 		~GFObserverBuilder();
 
 		// **************************************

cpp/src/pair.cpp

@@ -12,8 +12,6 @@
 
 using namespace godot;
 
-GFPair::GFPair() {
-}
 GFPair::~GFPair() {
 }
 

cpp/src/pair.h

@@ -16,13 +16,15 @@ namespace godot {
 		GDCLASS(GFPair, GFEntity)
 
 	public:
-		GFPair();
 		GFPair(ecs_entity_t first, ecs_entity_t second, GFWorld* world):
 			GFEntity(ecs_make_pair(first, second), world)
-			{}
+		{}
 		GFPair(ecs_entity_t pair_id, GFWorld* world):
 			GFEntity(pair_id, world)
-			{}
+		{}
+		GFPair():
+			GFPair(0, nullptr)
+		{}
 		~GFPair();
 
 		// --------------------------------------

cpp/src/query.cpp

@@ -9,9 +9,6 @@
 
 using namespace godot;
 
-GFQuery::GFQuery() {
-
-}
 GFQuery::~GFQuery() {
 	ecs_query_fini(query);
 }

cpp/src/query.h

@@ -14,8 +14,13 @@ namespace godot {
 		GDCLASS(GFQuery, RefCounted)
 
 	public:
-		GFQuery();
-		GFQuery(GFWorld* world, ecs_query_t* query): world(world), query(query) {}
+		GFQuery(GFWorld* world, ecs_query_t* query):
+			world(world),
+			query(query)
+		{}
+		GFQuery():
+			GFQuery(nullptr, nullptr)
+		{}
 		~GFQuery();
 
 		// --------------------------------------

cpp/src/query_builder.h

@@ -18,8 +18,12 @@ namespace godot {
 		GDCLASS(GFQueryBuilder, GFQuerylikeBuilder)
 
 	public:
-		GFQueryBuilder(GFWorld* world): GFQuerylikeBuilder(world) {}
-		GFQueryBuilder(): GFQueryBuilder(GFWorld::singleton()) {}
+		GFQueryBuilder(GFWorld* world):
+			GFQuerylikeBuilder(world)
+		{}
+		GFQueryBuilder():
+			GFQueryBuilder(GFWorld::singleton())
+		{}
 		~GFQueryBuilder();
 
 		// **************************************

cpp/src/query_iterator.cpp

@@ -11,9 +11,6 @@
 
 using namespace godot;
 
-GFQueryIterator::GFQueryIterator() {
-}
-
 GFQueryIterator::~GFQueryIterator() {
 	if (!is_done()) {
 		ecs_iter_fini(&iterator);

cpp/src/query_iterator.h

@@ -12,11 +12,13 @@ namespace godot {
 		GDCLASS(GFQueryIterator, RefCounted)
 
 	public:
-		GFQueryIterator();
+		GFQueryIterator():
+			GFQueryIterator(nullptr, {0})
+		{}
 		GFQueryIterator(Ref<GFQuery> query, ecs_iter_t iterator):
 			query(query),
 			iterator(iterator)
-			{}
+		{}
 		~GFQueryIterator();
 
 		// --------------------------------------

cpp/src/querylike_builder.cpp

@@ -3,7 +3,6 @@
 #include "querylike_builder.h"
 #include "component.h"
 #include "godot_cpp/variant/callable.hpp"
-#include "godot_cpp/variant/utility_functions.hpp"
 #include "godot_cpp/variant/variant.hpp"
 #include "utils.h"
 #include "world.h"
@@ -13,8 +12,6 @@
 
 using namespace godot;
 
-GFQuerylikeBuilder::GFQuerylikeBuilder() {
-}
 GFQuerylikeBuilder::~GFQuerylikeBuilder() {
 }
 

cpp/src/querylike_builder.h

@@ -23,8 +23,15 @@ namespace godot {
 		friend QueryIterationContext;
 
 	public:
-		GFQuerylikeBuilder();
-		GFQuerylikeBuilder(GFWorld* world): world(world) {}
+		GFQuerylikeBuilder():
+			GFQuerylikeBuilder(nullptr)
+		{}
+		GFQuerylikeBuilder(GFWorld* world):
+			query_desc(0),
+			built(false),
+			term_count(0),
+			world(world)
+		{}
 		~GFQuerylikeBuilder();
 
 		// **************************************

cpp/src/registerable_entity.cpp

@@ -1,6 +1,7 @@
 
 #include "registerable_entity.h"
 #include "godot_cpp/classes/wrapped.hpp"
+#include "world.h"
 
 #include <flecs.h>
 #include <godot_cpp/core/class_db.hpp>
@@ -71,14 +72,9 @@ void GFRegisterableEntity::_register_user() {
 	GDVIRTUAL_CALL(_register, get_world());
 }
 
-Ref<GFRegisterableEntity> GFRegisterableEntity::new_internal() {
-	return Ref(memnew(GFRegisterableEntity));
-}
-
 void GFRegisterableEntity::_bind_methods() {
 	GDVIRTUAL_BIND(_register, "world");
 	godot::ClassDB::bind_static_method(GFRegisterableEntity::get_class_static(), D_METHOD("new_in_world", "world"), &GFRegisterableEntity::new_in_world);
 	godot::ClassDB::bind_method(D_METHOD("_register_internal"), &GFRegisterableEntity::_register_internal);
 	godot::ClassDB::bind_method(D_METHOD("_register_user"), &GFRegisterableEntity::_register_user);
-	godot::ClassDB::bind_static_method(get_class_static(), D_METHOD("_new_internal"), &GFRegisterableEntity::new_internal);
 }

cpp/src/registerable_entity.h

@@ -15,18 +15,22 @@ namespace godot {
 		GDCLASS(GFRegisterableEntity, GFEntity)
 
 	public:
-		GFRegisterableEntity(): GFEntity() {}
-		GFRegisterableEntity(GFWorld* world): GFEntity(world) {}
+		GFRegisterableEntity():
+			GFRegisterableEntity(GFWorld::singleton())
+		{}
+		GFRegisterableEntity(GFWorld* world):
+			GFEntity(world)
+		{}
 		GFRegisterableEntity(ecs_entity_t id, GFWorld* world):
-			GFEntity(id, world) {}
+			GFEntity(id, world)
+		{}
 		~GFRegisterableEntity();
 
 		// --------------------------------------------------------
 		// --- Exposed ---
 		// --------------------------------------------------------
 
 		GDVIRTUAL1(_register, GFWorld*)
-		static Ref<GFRegisterableEntity> new_internal();
 
 		static Ref<GFRegisterableEntity> new_in_world(GFWorld*);
 		static Ref<GFRegisterableEntity> from_id(ecs_entity_t id, GFWorld* world);

cpp/src/system_builder.h

@@ -18,8 +18,13 @@ namespace godot {
 		GDCLASS(GFSystemBuilder, GFQuerylikeBuilder)
 
 	public:
-		GFSystemBuilder(GFWorld* world): GFQuerylikeBuilder(world) {}
-		GFSystemBuilder(): GFSystemBuilder(GFWorld::singleton()) {}
+		GFSystemBuilder(GFWorld* world):
+			GFQuerylikeBuilder(world),
+			callable(Callable())
+		{}
+		GFSystemBuilder():
+			GFSystemBuilder(GFWorld::singleton())
+		{}
 		~GFSystemBuilder();
 
 		// **************************************