Cleaned code, made many functions const and inline

AitorSimona · AitorSimona · commit 1a025484efa4 · 2019-10-27T00:31:39.000+02:00
diff --git a/CENTRAL 3D/Source/Component.cpp b/CENTRAL 3D/Source/Component.cpp
@@ -46,7 +46,7 @@ Component::ComponentType Component::GetType() const
 	return type;
 }
 
-GameObject * Component::GetContainerGameObject()
+GameObject * Component::GetContainerGameObject() const
 {
 	return GO;
 }
diff --git a/CENTRAL 3D/Source/Component.h b/CENTRAL 3D/Source/Component.h
@@ -27,7 +27,7 @@ class Component
 
 	// --- Getters ---
 	ComponentType GetType() const;
-	GameObject* GetContainerGameObject();
+	GameObject* GetContainerGameObject() const;
 	bool& GetActive();
 	bool IsEnabled() const;
 
diff --git a/CENTRAL 3D/Source/ComponentRenderer.cpp b/CENTRAL 3D/Source/ComponentRenderer.cpp
@@ -18,7 +18,7 @@ ComponentRenderer::~ComponentRenderer()
 
 }
 
-void ComponentRenderer::Draw()
+void ComponentRenderer::Draw() const
 {
 	ComponentMesh * mesh = this->GO->GetComponent<ComponentMesh>(Component::ComponentType::Mesh);
 
@@ -30,9 +30,8 @@ void ComponentRenderer::Draw()
 	}
 }
 
-void ComponentRenderer::DrawMesh(ComponentMesh& mesh) const
+inline void ComponentRenderer::DrawMesh(ComponentMesh& mesh) const
 {
-
 	// --- Draw Texture ---
 	glEnableClientState(GL_TEXTURE_COORD_ARRAY); // enable gl capability
 	glEnableClientState(GL_VERTEX_ARRAY); // enable client-side capability
@@ -74,7 +73,7 @@ void ComponentRenderer::DrawMesh(ComponentMesh& mesh) const
 
 }
 
-void ComponentRenderer::DrawNormals(const ComponentMesh& mesh) const
+inline void ComponentRenderer::DrawNormals(const ComponentMesh& mesh) const
 {
 	// --- Draw Mesh Normals ---
 	glBegin(GL_LINES);
@@ -124,7 +123,7 @@ void ComponentRenderer::DrawNormals(const ComponentMesh& mesh) const
 
 }
 
-void ComponentRenderer::DrawAxis() const
+inline void ComponentRenderer::DrawAxis() const
 {
 	// --- Draw Axis ---
 	glLineWidth(2.0f);
diff --git a/CENTRAL 3D/Source/ComponentRenderer.h b/CENTRAL 3D/Source/ComponentRenderer.h
@@ -15,13 +15,13 @@ class ComponentRenderer : public Component
 	ComponentRenderer(GameObject* ContainerGO);
 	virtual ~ComponentRenderer();
 
-	void Draw();
+	void Draw() const;
 
 private:
 	// --- Draw Functiions accessed by main Draw ---
-	void DrawMesh(ComponentMesh& mesh) const;
-	void DrawNormals(const ComponentMesh& mesh) const;
-	void DrawAxis() const;
+	inline void DrawMesh(ComponentMesh& mesh) const;
+	inline void DrawNormals(const ComponentMesh& mesh) const;
+	inline void DrawAxis() const;
 
 public:
 	bool draw_vertexnormals = false;
diff --git a/CENTRAL 3D/Source/ComponentTransform.cpp b/CENTRAL 3D/Source/ComponentTransform.cpp
@@ -8,7 +8,7 @@ ComponentTransform::~ComponentTransform()
 {
 }
 
-float3 ComponentTransform::GetPosition()
+float3 ComponentTransform::GetPosition() const
 {
 	float3 position;
 	/*Local_transform.TransformPos(position);
@@ -22,7 +22,7 @@ float3 ComponentTransform::GetPosition()
 	return position;
 }
 
-float3 ComponentTransform::GetScale()
+float3 ComponentTransform::GetScale() const
 {
 	float3 scale;
 
@@ -33,7 +33,7 @@ float3 ComponentTransform::GetScale()
 	return scale;
 }
 
-float3 ComponentTransform::GetRotation()
+float3 ComponentTransform::GetRotation() const
 {
 	float3 rotation = float3::zero;
 
@@ -43,7 +43,7 @@ float3 ComponentTransform::GetRotation()
 	return rotation;
 }
 
-float4x4 ComponentTransform::GetLocalTransform()
+float4x4 ComponentTransform::GetLocalTransform() const
 {
 	return Local_transform;
 }
diff --git a/CENTRAL 3D/Source/ComponentTransform.h b/CENTRAL 3D/Source/ComponentTransform.h
@@ -12,10 +12,10 @@ class ComponentTransform : public Component
 	virtual ~ComponentTransform();
 
 	// --- Getters ---
-	float3			GetPosition();
-	float3			GetScale();
-	float3			GetRotation();
-	float4x4        GetLocalTransform();
+	float3			GetPosition() const;
+	float3			GetScale() const;
+	float3			GetRotation() const;
+	float4x4        GetLocalTransform() const;
 
 	// --- Setters ---
 	void			SetPosition(float x, float y, float z);
diff --git a/CENTRAL 3D/Source/GameObject.cpp b/CENTRAL 3D/Source/GameObject.cpp
@@ -93,7 +93,7 @@ void GameObject::RemoveComponent(Component::ComponentType type)
 	}
 }
 
-bool GameObject::HasComponent(Component::ComponentType type)
+bool GameObject::HasComponent(Component::ComponentType type) const
 {
 	// --- Search for given type of component ---
 
diff --git a/CENTRAL 3D/Source/GameObject.h b/CENTRAL 3D/Source/GameObject.h
@@ -45,7 +45,7 @@ class GameObject
 
 	Component*		AddComponent(Component::ComponentType type);
 	void			RemoveComponent(Component::ComponentType type);
-	bool			HasComponent(Component::ComponentType type);
+	bool			HasComponent(Component::ComponentType type) const;
 
 	// --- Setters ---
 	void			SetName(const char* name);
diff --git a/CENTRAL 3D/Source/ModuleGui.cpp b/CENTRAL 3D/Source/ModuleGui.cpp
@@ -354,17 +354,17 @@ void ModuleGui::LoadStatus(const json & file)
 			LOG("|[error]: Could not find sub-node %s in GUI JSON Node, please check JSON EditorConfig", panels[i]->GetName());
 	}
 }
-void ModuleGui::HandleInput(SDL_Event * event)
+void ModuleGui::HandleInput(SDL_Event * event) const
 {
 	ImGui_ImplSDL2_ProcessEvent(event);
 }
 
-bool ModuleGui::IsKeyboardCaptured()
+bool ModuleGui::IsKeyboardCaptured() const
 {
 	return capture_keyboard;
 }
 
-bool ModuleGui::IsMouseCaptured()
+bool ModuleGui::IsMouseCaptured() const
 {
 	return capture_mouse;
 }
diff --git a/CENTRAL 3D/Source/ModuleGui.h b/CENTRAL 3D/Source/ModuleGui.h
@@ -38,10 +38,10 @@ class ModuleGui : public Module
 
 	void LoadStatus(const json & file) override;
 
-	void HandleInput(SDL_Event* event);
+	void HandleInput(SDL_Event* event) const;
 
-	bool IsKeyboardCaptured();
-	bool IsMouseCaptured();
+	bool IsKeyboardCaptured() const;
+	bool IsMouseCaptured() const;
 public:
 
 	PanelSettings*		panelSettings = nullptr;
diff --git a/CENTRAL 3D/Source/ModuleImporter.cpp b/CENTRAL 3D/Source/ModuleImporter.cpp
@@ -64,7 +64,7 @@ bool ModuleImporter::CleanUp()
 	return true;
 }
 
-bool ModuleImporter::LoadFromPath(const char* path)
+bool ModuleImporter::LoadFromPath(const char* path) const
 {
 	bool ret = true;
 
diff --git a/CENTRAL 3D/Source/ModuleImporter.h b/CENTRAL 3D/Source/ModuleImporter.h
@@ -16,7 +16,7 @@ class ModuleImporter : public Module
 	bool CleanUp();
 
 	// --- Utilities ---
-	bool LoadFromPath(const char* path);
+	bool LoadFromPath(const char* path) const;
 
 private:
 	ImporterScene* IScene = nullptr;
diff --git a/CENTRAL 3D/Source/ModuleRenderer3D.cpp b/CENTRAL 3D/Source/ModuleRenderer3D.cpp
@@ -181,7 +181,7 @@ bool ModuleRenderer3D::CleanUp()
 	return true;
 }
 
-void ModuleRenderer3D::UpdateGLCapabilities()
+void ModuleRenderer3D::UpdateGLCapabilities() const
 {
 	// --- Enable/Disable OpenGL Capabilities ---
 
@@ -225,7 +225,7 @@ void ModuleRenderer3D::OnResize(int width, int height)
 	glLoadIdentity();
 }
 
-uint ModuleRenderer3D::CreateBufferFromData(uint Targetbuffer, uint size, void * data)
+uint ModuleRenderer3D::CreateBufferFromData(uint Targetbuffer, uint size, void * data) const
 {
 	uint ID = 0;
 
diff --git a/CENTRAL 3D/Source/ModuleRenderer3D.h b/CENTRAL 3D/Source/ModuleRenderer3D.h
@@ -19,10 +19,10 @@ class ModuleRenderer3D : public Module
 	bool CleanUp();
 
 	// --- Utilities ---
-	void UpdateGLCapabilities();
+	void UpdateGLCapabilities() const;
 	void OnResize(int width, int height);
 
-	uint CreateBufferFromData(uint Targetbuffer, uint size, void* data);
+	uint CreateBufferFromData(uint Targetbuffer, uint size, void* data) const;
 
 	// --- Setters ---
 	bool SetVSync(bool vsync);
diff --git a/CENTRAL 3D/Source/ModuleSceneManager.cpp b/CENTRAL 3D/Source/ModuleSceneManager.cpp
@@ -136,7 +136,7 @@ uint ModuleSceneManager::GetNumGameObjects() const
 	return game_objects.size();
 }
 
-uint ModuleSceneManager::GetSelectedGameObjects() 
+uint ModuleSceneManager::GetSelectedGameObjects() const
 {
 	return SelectedGameObject;
 }
@@ -163,7 +163,7 @@ void ModuleSceneManager::SetTextureToSelectedGO(uint id)
 	}
 }
 
-GameObject * ModuleSceneManager::CreateEmptyGameObject()
+GameObject * ModuleSceneManager::CreateEmptyGameObject() 
 {
 	// --- Create New Game Object Name ---
 	std::string Name = "GameObject ";
@@ -192,7 +192,7 @@ ComponentMaterial * ModuleSceneManager::CreateEmptyMaterial()
 	return Material;
 }
 
-void ModuleSceneManager::LoadParMesh(par_shapes_mesh_s * mesh, GameObject& new_object)
+void ModuleSceneManager::LoadParMesh(par_shapes_mesh_s * mesh, GameObject& new_object) const
 {
 	// --- Obtain data from par shapes mesh and load it into component mesh ---
 	ComponentMesh* new_mesh = (ComponentMesh*)new_object.AddComponent(Component::ComponentType::Mesh);
@@ -254,7 +254,7 @@ void ModuleSceneManager::LoadParMesh(par_shapes_mesh_s * mesh, GameObject& new_o
 	par_shapes_free_mesh(mesh);
 }
 
-GameObject * ModuleSceneManager::CreateCube(float sizeX, float sizeY, float sizeZ)
+GameObject * ModuleSceneManager::CreateCube(float sizeX, float sizeY, float sizeZ) const
 {
 	// --- Generating 6 planes and merging them to create a cube, since par shapes cube 
 	// does not have uvs / normals 
@@ -300,7 +300,7 @@ GameObject * ModuleSceneManager::CreateCube(float sizeX, float sizeY, float size
 	return new_object;
 }
 
-GameObject * ModuleSceneManager::CreateSphere(float Radius, int slices, int slacks)
+GameObject * ModuleSceneManager::CreateSphere(float Radius, int slices, int slacks) const
 {
 	// --- Create par shapes sphere ---
 	par_shapes_mesh * mesh = par_shapes_create_parametric_sphere(slices, slacks);
diff --git a/CENTRAL 3D/Source/ModuleSceneManager.h b/CENTRAL 3D/Source/ModuleSceneManager.h
@@ -26,13 +26,13 @@ class ModuleSceneManager : public Module
 	// --- Creators ---
 	GameObject* CreateEmptyGameObject();
 	ComponentMaterial* CreateEmptyMaterial();
-	GameObject* CreateCube(float sizeX, float sizeY, float sizeZ);
-	GameObject* CreateSphere(float Radius, int slices, int slacks);
+	GameObject* CreateCube(float sizeX, float sizeY, float sizeZ) const;
+	GameObject* CreateSphere(float Radius, int slices, int slacks) const;
 	void CreateGrid() const;
 
 	// --- Getters ---
 	uint GetNumGameObjects() const;
-	uint GetSelectedGameObjects();
+	uint GetSelectedGameObjects() const;
 	std::vector<GameObject*>& GetGameObjects();
 
 	// --- Setters ---
@@ -41,8 +41,9 @@ class ModuleSceneManager : public Module
 
 	// --- Utilities ---
 	void Draw() const;
+
 private:
-	void LoadParMesh(par_shapes_mesh_s* mesh, GameObject& new_object);
+	void LoadParMesh(par_shapes_mesh_s* mesh, GameObject& new_object) const;
 
 public:
 	ComponentMaterial* CheckersMaterial = nullptr;
diff --git a/CENTRAL 3D/Source/ModuleWindow.cpp b/CENTRAL 3D/Source/ModuleWindow.cpp
@@ -135,17 +135,17 @@ void ModuleWindow::SetWindowHeight(uint height)
 	UpdateWindowSize();
 }
 
-uint ModuleWindow::GetWindowWidth()
+uint ModuleWindow::GetWindowWidth() const
 {
 	return screen_width;
 }
 
-uint ModuleWindow::GetWindowHeight()
+uint ModuleWindow::GetWindowHeight() const
 {
 	return screen_height;
 }
 
-uint ModuleWindow::GetDisplayRefreshRate()
+uint ModuleWindow::GetDisplayRefreshRate() 
 {
 	uint refreshRate = 0;
 
@@ -255,22 +255,22 @@ void ModuleWindow::SetFullscreenDesktop(bool value)
 	}
 }
 
-bool ModuleWindow::IsFullscreen()
+bool ModuleWindow::IsFullscreen() const
 {
 	return fullscreen;
 }
 
-bool ModuleWindow::IsResizable()
+bool ModuleWindow::IsResizable() const
 {
 	return resizable;
 }
 
-bool ModuleWindow::IsBorderless()
+bool ModuleWindow::IsBorderless() const
 {
 	return borderless;
 }
 
-bool ModuleWindow::IsFullscreenDesktop()
+bool ModuleWindow::IsFullscreenDesktop() const
 {
 	return fullscreen_desktop;
 }
diff --git a/CENTRAL 3D/Source/ModuleWindow.h b/CENTRAL 3D/Source/ModuleWindow.h
@@ -37,15 +37,15 @@ class ModuleWindow : public Module
 
 	// --- Getters ---
 	void GetWinMaxMinSize(uint & min_width, uint & min_height, uint & max_width, uint & max_height) const;
-	uint GetWindowWidth();
-	uint GetWindowHeight();
+	uint GetWindowWidth() const;
+	uint GetWindowHeight() const;
 	float GetWinBrightness() const;
 	uint GetDisplayRefreshRate();
 
-	bool IsFullscreen();
-	bool IsResizable();
-	bool IsBorderless();
-	bool IsFullscreenDesktop();
+	bool IsFullscreen() const;
+	bool IsResizable() const;
+	bool IsBorderless() const;
+	bool IsFullscreenDesktop() const;
 
 	// --- Save/Load ----
 	void SaveStatus(json &file) const override;
diff --git a/CENTRAL 3D/Source/PanelAbout.cpp b/CENTRAL 3D/Source/PanelAbout.cpp
@@ -14,7 +14,7 @@ PanelAbout::~PanelAbout()
 {
 }
 
-bool PanelAbout::Draw()
+bool PanelAbout::Draw() 
 {
 	ImGuiWindowFlags settingsFlags = 0;
 	settingsFlags = ImGuiWindowFlags_NoFocusOnAppearing;
diff --git a/CENTRAL 3D/Source/PanelConsole.cpp b/CENTRAL 3D/Source/PanelConsole.cpp
diff --git a/CENTRAL 3D/Source/PanelSettings.cpp b/CENTRAL 3D/Source/PanelSettings.cpp
diff --git a/CENTRAL 3D/Source/PanelSettings.h b/CENTRAL 3D/Source/PanelSettings.h

Original file line number	Diff line number	Diff line change
`@@ -46,7 +46,7 @@ Component::ComponentType Component::GetType() const`
`46`	`46`	`return type;`
`47`	`47`	`}`
`48`	`48`
`49`		`-GameObject * Component::GetContainerGameObject()`
	`49`	`+GameObject * Component::GetContainerGameObject() const`
`50`	`50`	`{`
`51`	`51`	`return GO;`
`52`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -18,7 +18,7 @@ ComponentRenderer::~ComponentRenderer()`
`18`	`18`
`19`	`19`	`}`
`20`	`20`
`21`		`-void ComponentRenderer::Draw()`
	`21`	`+void ComponentRenderer::Draw() const`
`22`	`22`	`{`
`23`	`23`	`ComponentMesh * mesh = this->GO->GetComponent<ComponentMesh>(Component::ComponentType::Mesh);`
`24`	`24`
`@@ -30,9 +30,8 @@ void ComponentRenderer::Draw()`
`30`	`30`	`}`
`31`	`31`	`}`
`32`	`32`
`33`		`-void ComponentRenderer::DrawMesh(ComponentMesh& mesh) const`
	`33`	`+inline void ComponentRenderer::DrawMesh(ComponentMesh& mesh) const`
`34`	`34`	`{`
`35`		`-`
`36`	`35`	`// --- Draw Texture ---`
`37`	`36`	`glEnableClientState(GL_TEXTURE_COORD_ARRAY); // enable gl capability`
`38`	`37`	`glEnableClientState(GL_VERTEX_ARRAY); // enable client-side capability`
`@@ -74,7 +73,7 @@ void ComponentRenderer::DrawMesh(ComponentMesh& mesh) const`
`74`	`73`
`75`	`74`	`}`
`76`	`75`
`77`		`-void ComponentRenderer::DrawNormals(const ComponentMesh& mesh) const`
	`76`	`+inline void ComponentRenderer::DrawNormals(const ComponentMesh& mesh) const`
`78`	`77`	`{`
`79`	`78`	`// --- Draw Mesh Normals ---`
`80`	`79`	`glBegin(GL_LINES);`
`@@ -124,7 +123,7 @@ void ComponentRenderer::DrawNormals(const ComponentMesh& mesh) const`
`124`	`123`
`125`	`124`	`}`
`126`	`125`
`127`		`-void ComponentRenderer::DrawAxis() const`
	`126`	`+inline void ComponentRenderer::DrawAxis() const`
`128`	`127`	`{`
`129`	`128`	`// --- Draw Axis ---`
`130`	`129`	`glLineWidth(2.0f);`
Original file line number	Diff line number	Diff line change
`@@ -8,7 +8,7 @@ ComponentTransform::~ComponentTransform()`
`8`	`8`	`{`
`9`	`9`	`}`
`10`	`10`
`11`		`-float3 ComponentTransform::GetPosition()`
	`11`	`+float3 ComponentTransform::GetPosition() const`
`12`	`12`	`{`
`13`	`13`	`float3 position;`
`14`	`14`	`/*Local_transform.TransformPos(position);`
`@@ -22,7 +22,7 @@ float3 ComponentTransform::GetPosition()`
`22`	`22`	`return position;`
`23`	`23`	`}`
`24`	`24`
`25`		`-float3 ComponentTransform::GetScale()`
	`25`	`+float3 ComponentTransform::GetScale() const`
`26`	`26`	`{`
`27`	`27`	`float3 scale;`
`28`	`28`
`@@ -33,7 +33,7 @@ float3 ComponentTransform::GetScale()`
`33`	`33`	`return scale;`
`34`	`34`	`}`
`35`	`35`
`36`		`-float3 ComponentTransform::GetRotation()`
	`36`	`+float3 ComponentTransform::GetRotation() const`
`37`	`37`	`{`
`38`	`38`	`float3 rotation = float3::zero;`
`39`	`39`
`@@ -43,7 +43,7 @@ float3 ComponentTransform::GetRotation()`
`43`	`43`	`return rotation;`
`44`	`44`	`}`
`45`	`45`
`46`		`-float4x4 ComponentTransform::GetLocalTransform()`
	`46`	`+float4x4 ComponentTransform::GetLocalTransform() const`
`47`	`47`	`{`
`48`	`48`	`return Local_transform;`
`49`	`49`	`}`
Original file line number	Diff line number	Diff line change
`@@ -93,7 +93,7 @@ void GameObject::RemoveComponent(Component::ComponentType type)`
`93`	`93`	`}`
`94`	`94`	`}`
`95`	`95`
`96`		`-bool GameObject::HasComponent(Component::ComponentType type)`
	`96`	`+bool GameObject::HasComponent(Component::ComponentType type) const`
`97`	`97`	`{`
`98`	`98`	`// --- Search for given type of component ---`
`99`	`99`
Original file line number	Diff line number	Diff line change
`@@ -354,17 +354,17 @@ void ModuleGui::LoadStatus(const json & file)`
`354`	`354`	`LOG("\|[error]: Could not find sub-node %s in GUI JSON Node, please check JSON EditorConfig", panels[i]->GetName());`
`355`	`355`	`}`
`356`	`356`	`}`
`357`		`-void ModuleGui::HandleInput(SDL_Event * event)`
	`357`	`+void ModuleGui::HandleInput(SDL_Event * event) const`
`358`	`358`	`{`
`359`	`359`	`ImGui_ImplSDL2_ProcessEvent(event);`
`360`	`360`	`}`
`361`	`361`
`362`		`-bool ModuleGui::IsKeyboardCaptured()`
	`362`	`+bool ModuleGui::IsKeyboardCaptured() const`
`363`	`363`	`{`
`364`	`364`	`return capture_keyboard;`
`365`	`365`	`}`
`366`	`366`
`367`		`-bool ModuleGui::IsMouseCaptured()`
	`367`	`+bool ModuleGui::IsMouseCaptured() const`
`368`	`368`	`{`
`369`	`369`	`return capture_mouse;`
`370`	`370`	`}`