Entities can now be created dynamically

.gitignore

@@ -3,3 +3,4 @@ bin/
 int/
 *.aps
 *.res
+*.nfpack

Game/src/MainState.cpp

@@ -61,9 +61,6 @@ void MainState::update(float deltaTime) {
 			camera->moveLeft(speed * deltaTime);
 	}
 
-	//test.setPosition(nf::Vec3(std::sin(circle) * 10.0, 5.0, std::cos(circle) * 10.0));
-	circle += 1.5f * deltaTime;
-
 	text.setText("FPS: " + std::to_string(app->getFPS()));
 
 	if (button.isClicked() || app->isKeyPressed(NFI_R))
@@ -79,6 +76,12 @@ void MainState::update(float deltaTime) {
 		sound2.stop();
 	}
 
+	if (app->isKeyPressed(NFI_K)) {
+		entities.push_back(new nf::Entity);
+		entities.back()->create(ap["2mats.obj"], nf::Entity::Type::DYNAMIC);
+		entities.back()->setPosition(camera->getPosition());
+	}
+
 	if (app->isKeyPressed(NFI_ESCAPE))
 		app->quit();
 }
@@ -102,6 +105,5 @@ void MainState::render(nf::Renderer& renderer) {
 void MainState::onExit() {
 	Log("MainState onExit!");
 
-	circle = 0.0f;
 	entities.clear();
 }

Game/src/include/MainState.h

@@ -27,7 +27,5 @@ private:
 	nf::Sound sound;
 	nf::Sound sound2;
 
-	float circle;
-
 	std::vector<nf::Entity*> entities;
 };

NothinFancy/src/NFObject/Entity.cpp

@@ -10,7 +10,7 @@
 namespace nf {
 	Entity::Entity() :
 		m_constructed(false),
-		m_createdAtLoad(false),
+		m_member(false),
 		m_type(Type::STATIC),
 		m_model(nullptr),
 		m_position(0.0),
@@ -18,9 +18,8 @@ namespace nf {
 		m_scale(1.0),
 		m_update(false)
 	{
-		if (Application::getApp() && Application::getApp()->getCurrentState())
+		if (!Application::getApp() || !Application::getApp()->getCurrentState())
-			if (Application::getApp()->getCurrentState()->isLoading())
+			m_member = true;
-				m_createdAtLoad = true;
 	}
 
 	void Entity::create(Asset* modelAsset, Type type) {
@@ -46,11 +45,10 @@ namespace nf {
 		if (type != Type::DETAIL)
 			Application::getApp()->getPhysicsEngine()->addActor(this);
 
-		if (!Application::getApp()->getCurrentState()->isRunning())
+		if (m_member)
-			if (m_createdAtLoad)
-				Application::getApp()->getCurrentState()->m_entsToDelete.push_back(this);
-			else
 			Application::getApp()->getCurrentState()->m_nfObjects.push_back(this);
+		else
+			Application::getApp()->getCurrentState()->m_entsToDelete.push_back(this);
 	}
 
 	bool Entity::isConstructed() {

NothinFancy/src/Renderer/Model.cpp

@@ -19,8 +19,6 @@ namespace nf {
 			Error("Model exceedes 32 texture limit!");
 		std::string obj = model->data;
 		size_t startMtlPos = obj.find("newmtl");
-		if (startMtlPos == std::string::npos)
-			Error("No materials found in model!");
 		std::string mtl = obj.substr(startMtlPos);
 		struct TempMaterial {
 			std::vector<float> outVB;

NothinFancy/src/include/Entity.h

@@ -49,7 +49,7 @@ namespace nf {
 		~Entity();
 	private:
 		bool m_constructed;
-		bool m_createdAtLoad;
+		bool m_member;
 		Type m_type;
 		Model* m_model;