Add function MatrixPerspectiveVFovLH and MatrixPerspectiveHFovLH

Author: ariaci

src/SHADERed/Objects/FunctionVariableManager.cpp

@@ -167,6 +167,23 @@ namespace ed {
 				matrix = glm::perspectiveFov(45.0f, view[0], view[1], z[0], z[1]);
 			} break;
 
+			case FunctionShaderVariable::MatrixPerspectiveVFovLH: {
+				float fov = *LoadFloat(var->Arguments, 0);
+				float* view = LoadFloat(var->Arguments, 1);
+				float* z = LoadFloat(var->Arguments, 3);
+
+				matrix = glm::perspective(fov, view[0] / view[1], z[0], z[1]);
+			} break;
+
+			case FunctionShaderVariable::MatrixPerspectiveHFovLH: {
+				float* view = LoadFloat(var->Arguments, 1);
+				float aspect = view[0] / view[1];
+				float fov = *LoadFloat(var->Arguments, 0) / aspect;
+				float* z = LoadFloat(var->Arguments, 3);
+
+				matrix = glm::perspective(fov, aspect, z[0], z[1]);
+			} break;
+
 			case FunctionShaderVariable::MatrixRotationAxis: {
 				float* axis = LoadFloat(var->Arguments, 0);
 				float angle = *LoadFloat(var->Arguments, 3);
@@ -297,6 +314,14 @@ namespace ed {
 				*LoadFloat(var->Arguments, 2) = 0.1f;
 				*LoadFloat(var->Arguments, 3) = 100.0f;
 				break;
+			case FunctionShaderVariable::MatrixPerspectiveVFovLH:
+			case FunctionShaderVariable::MatrixPerspectiveHFovLH:
+				*LoadFloat(var->Arguments, 0) = glm::half_pi<float>();
+				*LoadFloat(var->Arguments, 1) = 800;
+				*LoadFloat(var->Arguments, 2) = 600;
+				*LoadFloat(var->Arguments, 3) = 0.1f;
+				*LoadFloat(var->Arguments, 4) = 100.0f;
+				break;
 			case FunctionShaderVariable::MatrixRotationAxis:
 				*LoadFloat(var->Arguments, 0) = 1;
 				break;
@@ -324,6 +349,8 @@ namespace ed {
 		case FunctionShaderVariable::MatrixOrthographicLH: return 4;
 		case FunctionShaderVariable::MatrixPerspectiveFovLH: return 4;
 		case FunctionShaderVariable::MatrixPerspectiveLH: return 4;
+		case FunctionShaderVariable::MatrixPerspectiveVFovLH: return 5;
+		case FunctionShaderVariable::MatrixPerspectiveHFovLH: return 5;
 		case FunctionShaderVariable::MatrixRotationAxis: return 4;
 		case FunctionShaderVariable::MatrixRotationNormal: return 4;
 		case FunctionShaderVariable::MatrixRotationRollPitchYaw: return 3;

src/SHADERed/Objects/Names.cpp

@@ -101,6 +101,8 @@ const char* FUNCTION_NAMES[] = {
 	"MatrixOrthographicLH",
 	"MatrixPerspectiveFovLH",
 	"MatrixPerspectiveLH",
+	"MatrixPerspectiveVFovLH",
+	"MatrixPerspectiveHFovLH",
 	"MatrixRotationAxis",
 	"MatrixRotationNormal",
 	"MatrixRotationRollPitchYaw",

src/SHADERed/Objects/Names.h

@@ -5,7 +5,7 @@ extern const char* TOPOLOGY_ITEM_NAMES[11];
 extern const char* SYSTEM_VARIABLE_NAMES[22];
 extern const char* VARIABLE_TYPE_NAMES[15];
 extern const char* VARIABLE_TYPE_NAMES_GLSL[15];
-extern const char* FUNCTION_NAMES[22];
+extern const char* FUNCTION_NAMES[24];
 extern const char* GEOMETRY_NAMES[7];
 extern const char* PIPELINE_ITEM_NAMES[8];
 extern const char* BLEND_NAMES[20];

src/SHADERed/Objects/ShaderVariable.h

@@ -53,6 +53,8 @@ namespace ed {
 		MatrixOrthographicLH,
 		MatrixPerspectiveFovLH,
 		MatrixPerspectiveLH,
+		MatrixPerspectiveVFovLH,
+		MatrixPerspectiveHFovLH,
 		MatrixRotationAxis,
 		MatrixRotationNormal,
 		MatrixRotationRollPitchYaw,

src/SHADERed/UI/Tools/VariableValueEdit.cpp

@@ -472,6 +472,43 @@ namespace ed {
 			ImGui::NextColumn();
 		} break;
 
+		case FunctionShaderVariable::MatrixPerspectiveVFovLH: 
+		case FunctionShaderVariable::MatrixPerspectiveHFovLH: {
+			ImGui::Text("FOV:");
+			ImGui::NextColumn();
+
+			ImGui::PushItemWidth(-1);
+			float fov = *FunctionVariableManager::LoadFloat(m_var->Arguments, 0);
+			if (ImGui::SliderAngle(("##fovAngle" + std::string(m_var->Name)).c_str(), &fov, 0, 180))
+				ret = true;
+			*FunctionVariableManager::LoadFloat(m_var->Arguments, 0) = fov;
+			ImGui::NextColumn();
+
+			ImGui::Text("View size:");
+			ImGui::NextColumn();
+
+			ImGui::PushItemWidth(-1);
+			if (ImGui::DragFloat2(("##viewSize" + std::string(m_var->Name)).c_str(), FunctionVariableManager::LoadFloat(m_var->Arguments, 1), 0.01f))
+				ret = true;
+			ImGui::NextColumn();
+
+			ImGui::Text("Near Z:");
+			ImGui::NextColumn();
+
+			ImGui::PushItemWidth(-1);
+			if (ImGui::DragFloat(("##nearZ" + std::string(m_var->Name)).c_str(), FunctionVariableManager::LoadFloat(m_var->Arguments, 3), 0.01f))
+				ret = true;
+			ImGui::NextColumn();
+
+			ImGui::Text("Far Z:");
+			ImGui::NextColumn();
+
+			ImGui::PushItemWidth(-1);
+			if (ImGui::DragFloat(("##farZ" + std::string(m_var->Name)).c_str(), FunctionVariableManager::LoadFloat(m_var->Arguments, 4), 0.01f))
+				ret = true;
+			ImGui::NextColumn();
+		} break;
+
 		case FunctionShaderVariable::MatrixRotationAxis: {
 			ImGui::Text("Axis:");
 			ImGui::NextColumn();