Skip to content

Add vcpkg.json, fix for issues #332 and #335 #333

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
ariaci wants to merge 4 commits into
base: master
Choose a base branch
from
Open

Add vcpkg.json, fix for issues #332 and #335 #333

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
95c8004
Add vcpkg.json to improve building-pipeline
swp-ariaci Jan 20, 2025
16ebf22
Fix #332 for matrices accessing columns via array-index-operator
swp-ariaci Jan 24, 2025
09fd3b5
Fix #335 for UI double conversion in degree of the MatrixPerspectiveF…
swp-ariaci Feb 14, 2025
80090cd
Add function MatrixPerspectiveVFovLH and MatrixPerspectiveHFovLH
ariaci Mar 15, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 1 addition & 4 deletions src/SHADERed/Objects/Debug/ExpressionCompiler.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,10 +684,7 @@ namespace ed {
resType = m_module->type<spvgentwo::vector_t<float, 4>*>();

if (resType != nullptr) {
spvgentwo::Instruction* tempVar = bb->opVariable(obj->getResultTypeInstr(), spvgentwo::spv::StorageClass::Function);
bb->opStore(tempVar, obj);
spvgentwo::Instruction* vecPtr = bb->opAccessChain(resType, tempVar, m_visit(a_access->Indices[0]));

spvgentwo::Instruction* vecPtr = bb->opAccessChain(resType, obj, m_visit(a_access->Indices[0]));
return bb->opLoad(vecPtr);
}
} else if (obj->getType()->isArray() || obj->getType()->isStruct()) {
Expand Down
27 changes: 27 additions & 0 deletions src/SHADERed/Objects/FunctionVariableManager.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
Expand Down Expand Up @@ -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;
Expand Down Expand Up @@ -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;
Expand Down
2 changes: 2 additions & 0 deletions src/SHADERed/Objects/Names.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -101,6 +101,8 @@ const char* FUNCTION_NAMES[] = {
"MatrixOrthographicLH",
"MatrixPerspectiveFovLH",
"MatrixPerspectiveLH",
"MatrixPerspectiveVFovLH",
"MatrixPerspectiveHFovLH",
"MatrixRotationAxis",
"MatrixRotationNormal",
"MatrixRotationRollPitchYaw",
Expand Down
2 changes: 1 addition & 1 deletion src/SHADERed/Objects/Names.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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];
Expand Down
2 changes: 2 additions & 0 deletions src/SHADERed/Objects/ShaderVariable.h
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -53,6 +53,8 @@ namespace ed {
MatrixOrthographicLH,
MatrixPerspectiveFovLH,
MatrixPerspectiveLH,
MatrixPerspectiveVFovLH,
MatrixPerspectiveHFovLH,
MatrixRotationAxis,
MatrixRotationNormal,
MatrixRotationRollPitchYaw,
Expand Down
41 changes: 39 additions & 2 deletions src/SHADERed/UI/Tools/VariableValueEdit.cpp
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -415,10 +415,10 @@ namespace ed {
ImGui::NextColumn();

ImGui::PushItemWidth(-1);
float fov = glm::degrees(*FunctionVariableManager::LoadFloat(m_var->Arguments, 0));
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) = glm::radians(fov);
*FunctionVariableManager::LoadFloat(m_var->Arguments, 0) = fov;
ImGui::NextColumn();

ImGui::Text("Aspect ratio:");
Expand Down Expand Up @@ -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();
Expand Down
11 changes: 11 additions & 0 deletions vcpkg.json
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
{
"$schema": "https://raw.githubusercontent.com/microsoft/vcpkg-tool/main/docs/vcpkg.schema.json",
"name": "shadered-project",
"version": "1.5.6",
"description": "SHADERed project compilation",
"dependencies": [
"sdl2",
"glew",
"glm"
]
}