clean up code and use enums

Aviii06 · Aviii06 · commit e2fd835bbfe8 · 2022-02-01T18:18:39.000+05:30
add enum classes

clean up code

add bool return type, fix minor changes

fix initialization of temp variables
diff --git a/rootex/core/renderer/renderer.cpp b/rootex/core/renderer/renderer.cpp
@@ -30,7 +30,7 @@ void Renderer::bind(MaterialResourceFile* newMaterial, MaterialResourceFile* old
 {
 	ZoneNamedN(materialBind, "Render Material Bind", true);
 	BasicMaterialResourceFile* basicMaterialResourceFilePointer = dynamic_cast<BasicMaterialResourceFile*>(newMaterial);
-	if (basicMaterialResourceFilePointer != nullptr)
+	if (basicMaterialResourceFilePointer)
 	{
 		newMaterial->bindSamplers();
 		newMaterial->bindTextures();
diff --git a/rootex/core/resource_files/custom_material_resource_file.cpp b/rootex/core/resource_files/custom_material_resource_file.cpp
@@ -5,6 +5,7 @@
 #include "core/renderer/shaders/register_locations_vertex_shader.h"
 #include "framework/systems/render_system.h"
 #include "resource_loader.h"
+#define MAX_NUMBER_OF_CUSTOM_CB 8
 
 void to_json(JSON::json& j, const CustomMaterialData& s)
 {
@@ -52,7 +53,7 @@ void from_json(const JSON::json& j, CustomMaterialData& s)
 	{
 		s.customConstantBuffers.push_back(customConstantBuffers);
 	}
-	for (auto& typeOfCustomConstantBuffers : j.value("typeOfCustomConstantBuffers", Vector<float>()))
+	for (auto& typeOfCustomConstantBuffers : j.value("typeOfCustomConstantBuffers", Vector<TYPES_OF_BUFFERS>()))
 	{
 		s.typeOfCustomConstantBuffers.push_back(typeOfCustomConstantBuffers);
 	}
@@ -276,8 +277,8 @@ void CustomMaterialResourceFile::reimport()
 	typeOfCustomConstantBuffers = m_MaterialData.typeOfCustomConstantBuffers;
 
 	recompileShaders();
-	float fakeArray[64];
-	m_PSCB = RenderingDevice::GetSingleton()->createBuffer((const char*)fakeArray, 64 * sizeof(float), D3D11_BIND_CONSTANT_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
+	float fakeArray[MAX_NUMBER_OF_CUSTOM_CB * 4];
+	m_PSCB = RenderingDevice::GetSingleton()->createBuffer((const char*)fakeArray, sizeof(fakeArray), D3D11_BIND_CONSTANT_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
 	m_VSCB = RenderingDevice::GetSingleton()->createBuffer<PerModelVSCBData>(PerModelVSCBData(), D3D11_BIND_CONSTANT_BUFFER, D3D11_USAGE_DYNAMIC, D3D11_CPU_ACCESS_WRITE);
 }
 
@@ -288,46 +289,69 @@ bool CustomMaterialResourceFile::save()
 
 float CustomMaterialResourceFile::getFloat(int index)
 {
-	return customConstantBuffers[4 * index];
+	if (4 * index < customConstantBuffers.size())
+		return customConstantBuffers[4 * index];
+	return 0.0f;
 }
 
-Vector<float> CustomMaterialResourceFile::getFloat3(int index)
+Vector3 CustomMaterialResourceFile::getFloat3(int index)
 {
-	Vector<float> temp;
-	temp.push_back(customConstantBuffers[4 * index]);
-	temp.push_back(customConstantBuffers[4 * index + 1]);
-	temp.push_back(customConstantBuffers[4 * index + 2]);
+	Vector3 temp = { 0.0f, 0.0f, 0.0f };
+	if (4 * index < customConstantBuffers.size())
+	{
+		temp.x = customConstantBuffers[4 * index];
+		temp.y = customConstantBuffers[4 * index + 1];
+		temp.z = customConstantBuffers[4 * index + 2];
+	}
 	return temp;
 }
 
-Vector<float> CustomMaterialResourceFile::getColor(int index)
+Color CustomMaterialResourceFile::getColor(int index)
 {
-	Vector<float> temp;
-	temp.push_back(customConstantBuffers[4 * index]);
-	temp.push_back(customConstantBuffers[4 * index + 1]);
-	temp.push_back(customConstantBuffers[4 * index + 2]);
-	temp.push_back(customConstantBuffers[4 * index + 3]);
+	Color temp = { 0.0f, 0.0f, 0.0f, 0.0f };
+	if (4 * index < customConstantBuffers.size())
+	{
+		temp.x = customConstantBuffers[4 * index];
+		temp.y = customConstantBuffers[4 * index + 1];
+		temp.z = customConstantBuffers[4 * index + 2];
+		temp.w = customConstantBuffers[4 * index + 3];
+	}
 	return temp;
 }
 
-void CustomMaterialResourceFile::setFloat(int index, float value)
+bool CustomMaterialResourceFile::setFloat(int index, float value)
 {
-	customConstantBuffers[4 * index] = value;
+	if (4 * index < customConstantBuffers.size())
+	{
+		customConstantBuffers[4 * index] = value;
+		return true;
+	}
+	return false;
 }
 
-void CustomMaterialResourceFile::setFloat3(int index, Vector3 value)
+bool CustomMaterialResourceFile::setFloat3(int index, Vector3 value)
 {
-	customConstantBuffers[4 * index] = value.x;
-	customConstantBuffers[4 * index + 1] = value.y;
-	customConstantBuffers[4 * index + 2] = value.z;
+	if (4 * index < customConstantBuffers.size())
+	{
+		customConstantBuffers[4 * index] = value.x;
+		customConstantBuffers[4 * index + 1] = value.y;
+		customConstantBuffers[4 * index + 2] = value.z;
+		return true;
+	}
+	return false;
 }
 
-void CustomMaterialResourceFile::setColor(int index, Color value)
+bool CustomMaterialResourceFile::setColor(int index, Color value)
 {
-	customConstantBuffers[4 * index] = value.x;
-	customConstantBuffers[4 * index + 1] = value.y;
-	customConstantBuffers[4 * index + 2] = value.z;
-	customConstantBuffers[4 * index + 3] = value.w;
+	if (4 * index < customConstantBuffers.size())
+	{
+		customConstantBuffers[4 * index] = value.x;
+		customConstantBuffers[4 * index + 1] = value.y;
+		customConstantBuffers[4 * index + 2] = value.z;
+		customConstantBuffers[4 * index + 3] = value.w;
+		return true;
+	}
+	return false;
 }
 
 void CustomMaterialResourceFile::draw()
@@ -511,95 +535,59 @@ void CustomMaterialResourceFile::draw()
 		ImGui::TreePop();
 	}
 
-	int i = 0;
-	int j = 0;
-	float tempFloat3[3];
-	float* addressesFloat3[3];
-	float tempColor[4];
-	float* addressesColor[4];
-	for (auto&& cb : customConstantBuffers)
+	for (int i = 0; i < customConstantBuffers.size(); i += 4)
 	{
-		if (typeOfCustomConstantBuffers[i / 4] == 1.0)
+		String customConstantBufferName = "CB Slot " + std::to_string(i / 4);
+		switch (typeOfCustomConstantBuffers[i / 4])
 		{
-			if (i % 4 == 0)
-			{
-				String customConstantBufferName = "CB Slot " + std::to_string(i / 4);
-				ImGui::DragFloat(customConstantBufferName.c_str(), &cb, 0.01f, 0.0f, 10.0f);
-				ImGui::Separator();
-			}
-		}
-		if (typeOfCustomConstantBuffers[i / 4] == 2.0)
-		{
-			tempFloat3[j % 3] = cb;
-			addressesFloat3[j % 3] = &cb;
-			if (i % 4 != 3)
-			{
-				j++;
-				i++;
-				continue;
-			}
-			String customConstantBufferName = "CB Slot " + std::to_string(i / 4);
-			ImGui::DragFloat3(customConstantBufferName.c_str(), tempFloat3, 0.01f, 0.0f, 10.0f);
-			for (int k = 0; k < 3; k++)
-			{
-				*addressesFloat3[k] = tempFloat3[k];
-			}
-			ImGui::Separator();
+		case TYPES_OF_BUFFERS::FLOATCB:
+			ImGui::DragFloat(customConstantBufferName.c_str(), &customConstantBuffers[i], 0.01f, 0.0f, 10.0f);
+			break;
+		case TYPES_OF_BUFFERS::FLOAT3CB:
+			ImGui::DragFloat3(customConstantBufferName.c_str(), &customConstantBuffers[i], 0.01f, 0.0f, 10.0f);
+			break;
+		case TYPES_OF_BUFFERS::COLORCB:
+			ImGui::ColorPicker4(customConstantBufferName.c_str(), &customConstantBuffers[i]);
+			break;
 		}
-		if (typeOfCustomConstantBuffers[i / 4] == 3.0)
-		{
-			tempColor[i % 4] = cb;
-			addressesColor[i % 4] = &cb;
-			if (i % 4 != 3)
-			{
-				i++;
-				continue;
-			}
-			String customConstantBufferName = "CB Slot " + std::to_string(i / 4);
-			ImGui::ColorPicker4(customConstantBufferName.c_str(), tempColor);
-			for (int k = 0; k < 4; k++)
-			{
-				*addressesColor[k] = tempColor[k];
-			}
-			ImGui::Separator();
-		}
-		i++;
-		continue;
+		ImGui::Separator();
 	}
 
-	if (ImGui::Button(ICON_ROOTEX_PLUS "Push float CB"))
+	if (customConstantBuffers.size() < MAX_NUMBER_OF_CUSTOM_CB * sizeof(float))
 	{
-		float value = 1.0;
-		customConstantBuffers.push_back(value);
-		customConstantBuffers.push_back(value);
-		customConstantBuffers.push_back(value);
-		customConstantBuffers.push_back(value);
-		typeOfCustomConstantBuffers.push_back(1.0);
-	}
-	ImGui::SameLine();
+		if (ImGui::Button(ICON_ROOTEX_PLUS "Push float CB"))
+		{
+			float value = 1.0;
+			customConstantBuffers.push_back(value);
+			customConstantBuffers.push_back(value);
+			customConstantBuffers.push_back(value);
+			customConstantBuffers.push_back(value);
+			typeOfCustomConstantBuffers.push_back(TYPES_OF_BUFFERS::FLOATCB);
+		}
+		ImGui::SameLine();
 
-	if (ImGui::Button(ICON_ROOTEX_PLUS "Push float3 CB"))
-	{
-		float value = 1.0;
-		customConstantBuffers.push_back(value);
-		customConstantBuffers.push_back(value);
-		customConstantBuffers.push_back(value);
-		customConstantBuffers.push_back(value);
-		typeOfCustomConstantBuffers.push_back(2.0);
-	}
-	ImGui::SameLine();
+		if (ImGui::Button(ICON_ROOTEX_PLUS "Push float3 CB"))
+		{
+			float value = 1.0;
+			customConstantBuffers.push_back(value);
+			customConstantBuffers.push_back(value);
+			customConstantBuffers.push_back(value);
+			customConstantBuffers.push_back(value);
+			typeOfCustomConstantBuffers.push_back(TYPES_OF_BUFFERS::FLOAT3CB);
+		}
+		ImGui::SameLine();
 
-	if (ImGui::Button(ICON_ROOTEX_PLUS "Push Color CB"))
-	{
-		float value = 1.0;
-		customConstantBuffers.push_back(value);
-		customConstantBuffers.push_back(value);
-		customConstantBuffers.push_back(value);
-		customConstantBuffers.push_back(value);
-		typeOfCustomConstantBuffers.push_back(3.0);
+		if (ImGui::Button(ICON_ROOTEX_PLUS "Push Color CB"))
+		{
+			float value = 1.0;
+			customConstantBuffers.push_back(value);
+			customConstantBuffers.push_back(value);
+			customConstantBuffers.push_back(value);
+			customConstantBuffers.push_back(value);
+			typeOfCustomConstantBuffers.push_back(TYPES_OF_BUFFERS::COLORCB);
+		}
+		ImGui::SameLine();
 	}
-	ImGui::SameLine();
-
 	if (ImGui::Button(ICON_ROOTEX_MINUS "Pop CB"))
 	{
 		customConstantBuffers.pop_back();
diff --git a/rootex/core/resource_files/custom_material_resource_file.h b/rootex/core/resource_files/custom_material_resource_file.h
@@ -11,7 +11,7 @@ class CustomMaterialResourceFile : public MaterialResourceFile
 private:
 	static inline Microsoft::WRL::ComPtr<ID3D11SamplerState> s_Sampler;
 	Vector<float> customConstantBuffers;
-	Vector<float> typeOfCustomConstantBuffers; // 1.0 -> float, 2.0 -> float3, 3.0 -> Color
+	Vector<TYPES_OF_BUFFERS> typeOfCustomConstantBuffers;
 
 	CustomMaterialData m_MaterialData;
 
@@ -60,10 +60,10 @@ class CustomMaterialResourceFile : public MaterialResourceFile
 	void drawTextureSlots(const char* label, Vector<Ref<ImageResourceFile>>& textures);
 
 	float getFloat(int index);
-	Vector<float> getFloat3(int index);
-	Vector<float> getColor(int index);
+	Vector3 getFloat3(int index);
+	Color getColor(int index);
 
-	void setFloat(int index, float value);
-	void setFloat3(int index, Vector3 value);
-	void setColor(int index, Color value);
+	bool setFloat(int index, float value);
+	bool setFloat3(int index, Vector3 value);
+	bool setColor(int index, Color value);
 };
diff --git a/rootex/core/resource_files/material_resource_file.h b/rootex/core/resource_files/material_resource_file.h
@@ -117,14 +117,21 @@ struct SkyMaterialData
 void to_json(JSON::json& j, const SkyMaterialData& s);
 void from_json(const JSON::json& j, SkyMaterialData& s);
 
+enum class TYPES_OF_BUFFERS
+{
+	FLOATCB,
+	FLOAT3CB,
+	COLORCB
+};
+
 struct CustomMaterialData
 {
 	String vertexShaderPath;
 	String pixelShaderPath;
 	Vector<Ref<ImageResourceFile>> vertexShaderTextures;
 	Vector<Ref<ImageResourceFile>> pixelShaderTextures;
 	Vector<float> customConstantBuffers;
-	Vector<float> typeOfCustomConstantBuffers;
+	Vector<TYPES_OF_BUFFERS> typeOfCustomConstantBuffers;
 };
 
 void to_json(JSON::json& j, const CustomMaterialData& s);

Original file line number	Diff line number	Diff line change
`@@ -30,7 +30,7 @@ void Renderer::bind(MaterialResourceFile* newMaterial, MaterialResourceFile* old`
`30`	`30`	`{`
`31`	`31`	`ZoneNamedN(materialBind, "Render Material Bind", true);`
`32`	`32`	`BasicMaterialResourceFile* basicMaterialResourceFilePointer = dynamic_cast<BasicMaterialResourceFile*>(newMaterial);`
`33`		`- if (basicMaterialResourceFilePointer != nullptr)`
	`33`	`+ if (basicMaterialResourceFilePointer)`
`34`	`34`	`{`
`35`	`35`	`newMaterial->bindSamplers();`
`36`	`36`	`newMaterial->bindTextures();`