diff --git a/Editor/App.cpp b/Editor/App.cpp index 28d1ab571..a04f0afda 100644 --- a/Editor/App.cpp +++ b/Editor/App.cpp @@ -49,8 +49,7 @@ void App::Initialize(CoreApplicationView^ applicationView) CoreApplication::Resuming += ref new EventHandler(this, &App::OnResuming); - // These folders are also copied to the executable folder in post-build script: - wiFont::SetFontPath("fonts/"); + wiFont::SetFontPath(""); wiRenderer::SetShaderPath("shaders/"); } diff --git a/Editor/CameraWindow.cpp b/Editor/CameraWindow.cpp index e8265b11c..c81361efb 100644 --- a/Editor/CameraWindow.cpp +++ b/Editor/CameraWindow.cpp @@ -140,8 +140,6 @@ CameraWindow::CameraWindow(EditorComponent* editor) : GUI(&editor->GetGUI()) cameraWindow->Translate(XMFLOAT3((float)wiRenderer::GetDevice()->GetScreenWidth() - 720, 100, 0)); cameraWindow->SetVisible(false); - - ResetCam(); } diff --git a/Editor/Editor.cpp b/Editor/Editor.cpp index 6af9bb5f1..99147df91 100644 --- a/Editor/Editor.cpp +++ b/Editor/Editor.cpp @@ -324,6 +324,9 @@ void EditorComponent::ResizeLayout() helpButton->SetPos(XMFLOAT2(screenW - 50 - 55, 0)); helpButton->SetSize(XMFLOAT2(50, 40)); + helpLabel->SetSize(XMFLOAT2(screenW / 2.0f, screenH / 1.5f)); + helpLabel->SetPos(XMFLOAT2(screenW / 2.0f - helpLabel->scale.x / 2.0f, screenH / 2.0f - helpLabel->scale.y / 2.0f)); + exitButton->SetPos(XMFLOAT2(screenW - 50, 0)); exitButton->SetSize(XMFLOAT2(50, 40)); @@ -752,50 +755,44 @@ void EditorComponent::Load() helpButton->SetColor(wiColor(34, 158, 214, 180), wiWidget::WIDGETSTATE::IDLE); helpButton->SetColor(wiColor(113, 183, 214, 255), wiWidget::WIDGETSTATE::FOCUS); helpButton->OnClick([=](wiEventArgs args) { - static wiLabel* helpLabel = nullptr; - if (helpLabel == nullptr) - { - stringstream ss(""); - ss << "Help: " << endl << "############" << endl; - ss << "Move camera: WASD, or Contoller left stick or D-pad" << endl; - ss << "Look: Middle mouse button / arrow keys / controller right stick" << endl; - ss << "Select: Right mouse button" << endl; - ss << "Place decal, interact with water: Left mouse button when nothing is selected" << endl; - ss << "Camera speed: SHIFT button or controller R2/RT" << endl; - ss << "Camera up: E, down: Q" << endl; - ss << "Duplicate entity: Ctrl + D" << endl; - ss << "Select All: Ctrl + A" << endl; - ss << "Undo: Ctrl + Z" << endl; - ss << "Redo: Ctrl + Y" << endl; - ss << "Copy: Ctrl + C" << endl; - ss << "Paste: Ctrl + V" << endl; - ss << "Delete: DELETE button" << endl; - ss << "Place Instances: Ctrl + Shift + Left mouse click (place clipboard onto clicked surface)" << endl; - ss << "Script Console / backlog: HOME button" << endl; - ss << endl; - ss << "You can find sample scenes in the models directory. Try to load one." << endl; - ss << "You can also import models from .OBJ, .GLTF, .GLB files." << endl; - ss << "You can find a program configuration file at Editor/config.ini" << endl; - ss << "You can find sample LUA scripts in the scripts directory. Try to load one." << endl; - ss << "You can find a startup script at Editor/startup.lua (this will be executed on program start)" << endl; - ss << endl << endl << "For questions, bug reports, feedback, requests, please open an issue at:" << endl; - ss << "https://github.com/turanszkij/WickedEngine" << endl; - - float screenW = (float)wiRenderer::GetDevice()->GetScreenWidth(); - float screenH = (float)wiRenderer::GetDevice()->GetScreenHeight(); - - helpLabel = new wiLabel("HelpLabel"); - helpLabel->SetText(ss.str()); - helpLabel->SetSize(XMFLOAT2(screenW / 2.0f, screenH / 1.5f)); - helpLabel->SetPos(XMFLOAT2(screenW / 2.0f - helpLabel->scale.x / 2.0f, screenH / 2.0f - helpLabel->scale.y / 2.0f)); - helpLabel->SetVisible(false); - GetGUI().AddWidget(helpLabel); - } - helpLabel->SetVisible(!helpLabel->IsVisible()); }); GetGUI().AddWidget(helpButton); + { + stringstream ss(""); + ss << "Help:" << endl; + ss << "Move camera: WASD, or Contoller left stick or D-pad" << endl; + ss << "Look: Middle mouse button / arrow keys / controller right stick" << endl; + ss << "Select: Right mouse button" << endl; + ss << "Place decal, interact with water: Left mouse button when nothing is selected" << endl; + ss << "Camera speed: SHIFT button or controller R2/RT" << endl; + ss << "Camera up: E, down: Q" << endl; + ss << "Duplicate entity: Ctrl + D" << endl; + ss << "Select All: Ctrl + A" << endl; + ss << "Undo: Ctrl + Z" << endl; + ss << "Redo: Ctrl + Y" << endl; + ss << "Copy: Ctrl + C" << endl; + ss << "Paste: Ctrl + V" << endl; + ss << "Delete: DELETE button" << endl; + ss << "Place Instances: Ctrl + Shift + Left mouse click (place clipboard onto clicked surface)" << endl; + ss << "Script Console / backlog: HOME button" << endl; + ss << endl; + ss << "You can find sample scenes in the models directory. Try to load one." << endl; + ss << "You can also import models from .OBJ, .GLTF, .GLB files." << endl; + ss << "You can find a program configuration file at Editor/config.ini" << endl; + ss << "You can find sample LUA scripts in the scripts directory. Try to load one." << endl; + ss << "You can find a startup script at Editor/startup.lua (this will be executed on program start)" << endl; + ss << endl << "For questions, bug reports, feedback, requests, please open an issue at:" << endl; + ss << "https://github.com/turanszkij/WickedEngine" << endl; + ss << endl << "Devblog: https://wickedengine.net/" << endl; + ss << "Discord: https://discord.gg/CFjRYmE" << endl; + + helpLabel = new wiLabel("HelpLabel"); + helpLabel->SetText(ss.str()); + helpLabel->SetVisible(false); + GetGUI().AddWidget(helpLabel); + } exitButton = new wiButton("X"); exitButton->SetTooltip("Exit"); @@ -1029,135 +1026,139 @@ void EditorComponent::Update(float dt) cinemaModeCheckBox->SetCheck(false); } + // Camera control: + static XMFLOAT4 originalMouse = XMFLOAT4(0, 0, 0, 0); + static bool camControlStart = true; + if (camControlStart) + { + originalMouse = wiInput::GetPointer(); + } + + XMFLOAT4 currentMouse = wiInput::GetPointer(); + float xDif = 0, yDif = 0; + + if (wiInput::Down(wiInput::MOUSE_BUTTON_MIDDLE)) + { + camControlStart = false; + xDif = currentMouse.x - originalMouse.x; + yDif = currentMouse.y - originalMouse.y; + xDif = 0.1f * xDif * (1.0f / 60.0f); + yDif = 0.1f * yDif * (1.0f / 60.0f); +#ifdef PLATFORM_UWP + originalMouse = currentMouse; +#else + wiInput::SetPointer(originalMouse); +#endif // PLATFORM_UWP + wiInput::HidePointer(true); + } + else + { + camControlStart = true; + wiInput::HidePointer(false); + } + + const float buttonrotSpeed = 2.0f / 60.0f; + if (wiInput::Down(wiInput::KEYBOARD_BUTTON_LEFT)) + { + xDif -= buttonrotSpeed; + } + if (wiInput::Down(wiInput::KEYBOARD_BUTTON_RIGHT)) + { + xDif += buttonrotSpeed; + } + if (wiInput::Down(wiInput::KEYBOARD_BUTTON_UP)) + { + yDif -= buttonrotSpeed; + } + if (wiInput::Down(wiInput::KEYBOARD_BUTTON_DOWN)) + { + yDif += buttonrotSpeed; + } + + const XMFLOAT4 leftStick = wiInput::GetAnalog(wiInput::GAMEPAD_ANALOG_THUMBSTICK_L, 0); + const XMFLOAT4 rightStick = wiInput::GetAnalog(wiInput::GAMEPAD_ANALOG_THUMBSTICK_R, 0); + const XMFLOAT4 rightTrigger = wiInput::GetAnalog(wiInput::GAMEPAD_ANALOG_TRIGGER_R, 0); + + const float jostickrotspeed = 0.05f; + xDif += rightStick.x * jostickrotspeed; + yDif += rightStick.y * jostickrotspeed; + + xDif *= cameraWnd->rotationspeedSlider->GetValue(); + yDif *= cameraWnd->rotationspeedSlider->GetValue(); + + + if (cameraWnd->fpsCheckBox->GetCheck()) + { + // FPS Camera + const float clampedDT = min(dt, 0.1f); // if dt > 100 millisec, don't allow the camera to jump too far... + + const float speed = ((wiInput::Down(wiInput::KEYBOARD_BUTTON_LSHIFT) ? 10.0f : 1.0f) + rightTrigger.x * 10.0f) * cameraWnd->movespeedSlider->GetValue() * clampedDT; + static XMVECTOR move = XMVectorSet(0, 0, 0, 0); + XMVECTOR moveNew = XMVectorSet(leftStick.x, 0, leftStick.y, 0); + + if (!wiInput::Down(wiInput::KEYBOARD_BUTTON_LCONTROL)) + { + // Only move camera if control not pressed + if (wiInput::Down((wiInput::BUTTON)'A') || wiInput::Down(wiInput::GAMEPAD_BUTTON_LEFT)) { moveNew += XMVectorSet(-1, 0, 0, 0); } + if (wiInput::Down((wiInput::BUTTON)'D') || wiInput::Down(wiInput::GAMEPAD_BUTTON_RIGHT)) { moveNew += XMVectorSet(1, 0, 0, 0); } + if (wiInput::Down((wiInput::BUTTON)'W') || wiInput::Down(wiInput::GAMEPAD_BUTTON_UP)) { moveNew += XMVectorSet(0, 0, 1, 0); } + if (wiInput::Down((wiInput::BUTTON)'S') || wiInput::Down(wiInput::GAMEPAD_BUTTON_DOWN)) { moveNew += XMVectorSet(0, 0, -1, 0); } + if (wiInput::Down((wiInput::BUTTON)'E') || wiInput::Down(wiInput::GAMEPAD_BUTTON_2)) { moveNew += XMVectorSet(0, 1, 0, 0); } + if (wiInput::Down((wiInput::BUTTON)'Q') || wiInput::Down(wiInput::GAMEPAD_BUTTON_1)) { moveNew += XMVectorSet(0, -1, 0, 0); } + moveNew += XMVector3Normalize(moveNew); + } + moveNew *= speed; + + move = XMVectorLerp(move, moveNew, 0.18f * clampedDT / 0.0166f); // smooth the movement a bit + float moveLength = XMVectorGetX(XMVector3Length(move)); + + if (moveLength < 0.0001f) + { + move = XMVectorSet(0, 0, 0, 0); + } + + if (abs(xDif) + abs(yDif) > 0 || moveLength > 0.0001f) + { + XMMATRIX camRot = XMMatrixRotationQuaternion(XMLoadFloat4(&cameraWnd->camera_transform.rotation_local)); + XMVECTOR move_rot = XMVector3TransformNormal(move, camRot); + XMFLOAT3 _move; + XMStoreFloat3(&_move, move_rot); + cameraWnd->camera_transform.Translate(_move); + cameraWnd->camera_transform.RotateRollPitchYaw(XMFLOAT3(yDif, xDif, 0)); + camera.SetDirty(); + } + + cameraWnd->camera_transform.UpdateTransform(); + } + else + { + // Orbital Camera + + if (wiInput::Down(wiInput::KEYBOARD_BUTTON_LSHIFT)) + { + XMVECTOR V = XMVectorAdd(camera.GetRight() * xDif, camera.GetUp() * yDif) * 10; + XMFLOAT3 vec; + XMStoreFloat3(&vec, V); + cameraWnd->camera_target.Translate(vec); + } + else if (wiInput::Down(wiInput::KEYBOARD_BUTTON_LCONTROL) || currentMouse.z != 0.0f) + { + cameraWnd->camera_transform.Translate(XMFLOAT3(0, 0, yDif * 4 + currentMouse.z)); + cameraWnd->camera_transform.translation_local.z = std::min(0.0f, cameraWnd->camera_transform.translation_local.z); + camera.SetDirty(); + } + else if (abs(xDif) + abs(yDif) > 0) + { + cameraWnd->camera_target.RotateRollPitchYaw(XMFLOAT3(yDif * 2, xDif * 2, 0)); + camera.SetDirty(); + } + + cameraWnd->camera_target.UpdateTransform(); + cameraWnd->camera_transform.UpdateTransform_Parented(cameraWnd->camera_target); + } + if (!wiBackLog::isActive() && !GetGUI().HasFocus()) { - // Camera control: - static XMFLOAT4 originalMouse = XMFLOAT4(0, 0, 0, 0); - static bool camControlStart = true; - if (camControlStart) - { - originalMouse = wiInput::GetPointer(); - } - - XMFLOAT4 currentMouse = wiInput::GetPointer(); - float xDif = 0, yDif = 0; - - if (wiInput::Down(wiInput::MOUSE_BUTTON_MIDDLE)) - { - camControlStart = false; - xDif = currentMouse.x - originalMouse.x; - yDif = currentMouse.y - originalMouse.y; - xDif = 0.1f*xDif*(1.0f / 60.0f); - yDif = 0.1f*yDif*(1.0f / 60.0f); - wiInput::SetPointer(originalMouse); - wiInput::HidePointer(true); - } - else - { - camControlStart = true; - wiInput::HidePointer(false); - } - - const float buttonrotSpeed = 2.0f / 60.0f; - if (wiInput::Down(wiInput::KEYBOARD_BUTTON_LEFT)) - { - xDif -= buttonrotSpeed; - } - if (wiInput::Down(wiInput::KEYBOARD_BUTTON_RIGHT)) - { - xDif += buttonrotSpeed; - } - if (wiInput::Down(wiInput::KEYBOARD_BUTTON_UP)) - { - yDif -= buttonrotSpeed; - } - if (wiInput::Down(wiInput::KEYBOARD_BUTTON_DOWN)) - { - yDif += buttonrotSpeed; - } - - const XMFLOAT4 leftStick = wiInput::GetAnalog(wiInput::GAMEPAD_ANALOG_THUMBSTICK_L, 0); - const XMFLOAT4 rightStick = wiInput::GetAnalog(wiInput::GAMEPAD_ANALOG_THUMBSTICK_R, 0); - const XMFLOAT4 rightTrigger = wiInput::GetAnalog(wiInput::GAMEPAD_ANALOG_TRIGGER_R, 0); - - const float jostickrotspeed = 0.05f; - xDif += rightStick.x * jostickrotspeed; - yDif += rightStick.y * jostickrotspeed; - - xDif *= cameraWnd->rotationspeedSlider->GetValue(); - yDif *= cameraWnd->rotationspeedSlider->GetValue(); - - - if (cameraWnd->fpsCheckBox->GetCheck()) - { - // FPS Camera - const float clampedDT = min(dt, 0.1f); // if dt > 100 millisec, don't allow the camera to jump too far... - - const float speed = ((wiInput::Down(wiInput::KEYBOARD_BUTTON_LSHIFT) ? 10.0f : 1.0f) + rightTrigger.x * 10.0f) * cameraWnd->movespeedSlider->GetValue() * clampedDT; - static XMVECTOR move = XMVectorSet(0, 0, 0, 0); - XMVECTOR moveNew = XMVectorSet(leftStick.x, 0, leftStick.y, 0); - - if (!wiInput::Down(wiInput::KEYBOARD_BUTTON_LCONTROL)) - { - // Only move camera if control not pressed - if (wiInput::Down((wiInput::BUTTON)'A') || wiInput::Down(wiInput::GAMEPAD_BUTTON_LEFT)) { moveNew += XMVectorSet(-1, 0, 0, 0); } - if (wiInput::Down((wiInput::BUTTON)'D') || wiInput::Down(wiInput::GAMEPAD_BUTTON_RIGHT)) { moveNew += XMVectorSet(1, 0, 0, 0); } - if (wiInput::Down((wiInput::BUTTON)'W') || wiInput::Down(wiInput::GAMEPAD_BUTTON_UP)) { moveNew += XMVectorSet(0, 0, 1, 0); } - if (wiInput::Down((wiInput::BUTTON)'S') || wiInput::Down(wiInput::GAMEPAD_BUTTON_DOWN)) { moveNew += XMVectorSet(0, 0, -1, 0); } - if (wiInput::Down((wiInput::BUTTON)'E') || wiInput::Down(wiInput::GAMEPAD_BUTTON_2)) { moveNew += XMVectorSet(0, 1, 0, 0); } - if (wiInput::Down((wiInput::BUTTON)'Q') || wiInput::Down(wiInput::GAMEPAD_BUTTON_1)) { moveNew += XMVectorSet(0, -1, 0, 0); } - moveNew += XMVector3Normalize(moveNew); - } - moveNew *= speed; - - move = XMVectorLerp(move, moveNew, 0.18f * clampedDT / 0.0166f); // smooth the movement a bit - float moveLength = XMVectorGetX(XMVector3Length(move)); - - if (moveLength < 0.0001f) - { - move = XMVectorSet(0, 0, 0, 0); - } - - if (abs(xDif) + abs(yDif) > 0 || moveLength > 0.0001f) - { - XMMATRIX camRot = XMMatrixRotationQuaternion(XMLoadFloat4(&cameraWnd->camera_transform.rotation_local)); - XMVECTOR move_rot = XMVector3TransformNormal(move, camRot); - XMFLOAT3 _move; - XMStoreFloat3(&_move, move_rot); - cameraWnd->camera_transform.Translate(_move); - cameraWnd->camera_transform.RotateRollPitchYaw(XMFLOAT3(yDif, xDif, 0)); - camera.SetDirty(); - } - - cameraWnd->camera_transform.UpdateTransform(); - } - else - { - // Orbital Camera - - if (wiInput::Down(wiInput::KEYBOARD_BUTTON_LSHIFT)) - { - XMVECTOR V = XMVectorAdd(camera.GetRight() * xDif, camera.GetUp() * yDif) * 10; - XMFLOAT3 vec; - XMStoreFloat3(&vec, V); - cameraWnd->camera_target.Translate(vec); - } - else if (wiInput::Down(wiInput::KEYBOARD_BUTTON_LCONTROL) || currentMouse.z != 0.0f) - { - cameraWnd->camera_transform.Translate(XMFLOAT3(0, 0, yDif * 4 + currentMouse.z)); - cameraWnd->camera_transform.translation_local.z = std::min(0.0f, cameraWnd->camera_transform.translation_local.z); - camera.SetDirty(); - } - else if(abs(xDif) + abs(yDif) > 0) - { - cameraWnd->camera_target.RotateRollPitchYaw(XMFLOAT3(yDif*2, xDif*2, 0)); - camera.SetDirty(); - } - - cameraWnd->camera_target.UpdateTransform(); - cameraWnd->camera_transform.UpdateTransform_Parented(cameraWnd->camera_target); - } - // Begin picking: UINT pickMask = rendererWnd->GetPickType(); RAY pickRay = wiRenderer::GetPickRay((long)currentMouse.x, (long)currentMouse.y); diff --git a/Editor/Editor.h b/Editor/Editor.h index 38baf23c1..aad0dcf8a 100644 --- a/Editor/Editor.h +++ b/Editor/Editor.h @@ -101,6 +101,7 @@ public: wiCheckBox* physicsEnabledCheckBox = nullptr; wiCheckBox* cinemaModeCheckBox = nullptr; wiComboBox* renderPathComboBox = nullptr; + wiLabel* helpLabel = nullptr; wiTreeList* sceneGraphView = nullptr; std::unordered_set scenegraphview_added_items; diff --git a/Editor/Editor_SOURCE.vcxitems b/Editor/Editor_SOURCE.vcxitems index f5869076d..b6e348c13 100644 --- a/Editor/Editor_SOURCE.vcxitems +++ b/Editor/Editor_SOURCE.vcxitems @@ -92,6 +92,77 @@ - + + true + true + true + true + true + true + true + true + + + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + + + true + true + \ No newline at end of file diff --git a/Editor/Editor_SOURCE.vcxitems.filters b/Editor/Editor_SOURCE.vcxitems.filters index d9eae9c4e..30261c613 100644 --- a/Editor/Editor_SOURCE.vcxitems.filters +++ b/Editor/Editor_SOURCE.vcxitems.filters @@ -63,4 +63,56 @@ + + + {caf55722-5ff7-41fe-b606-f376e784aa2f} + + + + + images + + + images + + + images + + + images + + + images + + + images + + + images + + + images + + + images + + + images + + + images + + + images + + + images + + + images + + + images + + \ No newline at end of file diff --git a/Editor/Editor_UWP.vcxproj b/Editor/Editor_UWP.vcxproj index 7fadec5e9..94135542a 100644 --- a/Editor/Editor_UWP.vcxproj +++ b/Editor/Editor_UWP.vcxproj @@ -105,6 +105,7 @@ + @@ -134,38 +135,46 @@ $(SolutionDir)BUILD\$(Platform)\$(Configuration)\$(ProjectName)\ $(ProjectName)\$(Platform)\$(Configuration)\ + true $(SolutionDir)BUILD\$(Platform)\$(Configuration)\$(ProjectName)\ $(ProjectName)\$(Platform)\$(Configuration)\ + true $(SolutionDir)BUILD\$(Platform)\$(Configuration)\$(ProjectName)\ $(ProjectName)\$(Platform)\$(Configuration)\ + true $(SolutionDir)BUILD\$(Platform)\$(Configuration)\$(ProjectName)\ $(ProjectName)\$(Platform)\$(Configuration)\ + true $(SolutionDir)BUILD\$(Platform)\$(Configuration)\$(ProjectName)\ $(ProjectName)\$(Platform)\$(Configuration)\ + true $(SolutionDir)BUILD\$(Platform)\$(Configuration)\$(ProjectName)\ $(ProjectName)\$(Platform)\$(Configuration)\ + true $(SolutionDir)BUILD\$(Platform)\$(Configuration)\$(ProjectName)\ $(ProjectName)\$(Platform)\$(Configuration)\ + true $(SolutionDir)BUILD\$(Platform)\$(Configuration)\$(ProjectName)\ $(ProjectName)\$(Platform)\$(Configuration)\ + true - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies) + %(AdditionalDependencies) $(SolutionDir)BUILD\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm;../$(Platform)/$(Configuration) @@ -177,18 +186,24 @@ _DEBUG;%(PreprocessorDefinitions) - xcopy /Y /E /I $(SolutionDir)WickedEngine\shaders $(OutDir)AppX\shaders -xcopy /Y /E /I $(SolutionDir)WickedEngine\fonts $(OutDir)AppX\fonts -xcopy /Y /E /I $(SolutionDir)Editor\images $(OutDir)AppX\images - Copying assets + + + + PerMonitorHighDPIAware + + $(OutDir)shaders/%(Filename).cso + 5.0 + false + false + - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies) + %(AdditionalDependencies) $(SolutionDir)BUILD\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm;../$(Platform)/$(Configuration) @@ -200,18 +215,22 @@ xcopy /Y /E /I $(SolutionDir)Editor\images $(OutDir)AppX\images NDEBUG;%(PreprocessorDefinitions) - xcopy /Y /E /I $(SolutionDir)WickedEngine\shaders $(OutDir)AppX\shaders -xcopy /Y /E /I $(SolutionDir)WickedEngine\fonts $(OutDir)AppX\fonts -xcopy /Y /E /I $(SolutionDir)Editor\images $(OutDir)AppX\images - Copying assets + + + + PerMonitorHighDPIAware + + $(OutDir)shaders/%(Filename).cso + 5.0 + - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies) + %(AdditionalDependencies) $(SolutionDir)BUILD\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm64; $(VCInstallDir)\lib\arm64;../$(Platform)/$(Configuration) @@ -223,18 +242,24 @@ xcopy /Y /E /I $(SolutionDir)Editor\images $(OutDir)AppX\images _DEBUG;%(PreprocessorDefinitions) - xcopy /Y /E /I $(SolutionDir)WickedEngine\shaders $(OutDir)AppX\shaders -xcopy /Y /E /I $(SolutionDir)WickedEngine\fonts $(OutDir)AppX\fonts -xcopy /Y /E /I $(SolutionDir)Editor\images $(OutDir)AppX\images - Copying assets + + + + PerMonitorHighDPIAware + + $(OutDir)shaders/%(Filename).cso + 5.0 + false + false + - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies) + %(AdditionalDependencies) $(SolutionDir)BUILD\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm64; $(VCInstallDir)\lib\arm64;../$(Platform)/$(Configuration) @@ -246,18 +271,22 @@ xcopy /Y /E /I $(SolutionDir)Editor\images $(OutDir)AppX\images NDEBUG;%(PreprocessorDefinitions) - xcopy /Y /E /I $(SolutionDir)WickedEngine\shaders $(OutDir)AppX\shaders -xcopy /Y /E /I $(SolutionDir)WickedEngine\fonts $(OutDir)AppX\fonts -xcopy /Y /E /I $(SolutionDir)Editor\images $(OutDir)AppX\images - Copying assets + + + + PerMonitorHighDPIAware + + $(OutDir)shaders/%(Filename).cso + 5.0 + - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies) + %(AdditionalDependencies) $(SolutionDir)BUILD\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store; $(VCInstallDir)\lib;../$(Platform)/$(Configuration) @@ -269,18 +298,24 @@ xcopy /Y /E /I $(SolutionDir)Editor\images $(OutDir)AppX\images _DEBUG;%(PreprocessorDefinitions) - xcopy /Y /E /I $(SolutionDir)WickedEngine\shaders $(OutDir)AppX\shaders -xcopy /Y /E /I $(SolutionDir)WickedEngine\fonts $(OutDir)AppX\fonts -xcopy /Y /E /I $(SolutionDir)Editor\images $(OutDir)AppX\images - Copying assets + + + + PerMonitorHighDPIAware + + $(OutDir)shaders/%(Filename).cso + 5.0 + false + false + - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies) + %(AdditionalDependencies) $(SolutionDir)BUILD\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store; $(VCInstallDir)\lib;../$(Platform)/$(Configuration) @@ -292,18 +327,22 @@ xcopy /Y /E /I $(SolutionDir)Editor\images $(OutDir)AppX\images NDEBUG;%(PreprocessorDefinitions) - xcopy /Y /E /I $(SolutionDir)WickedEngine\shaders $(OutDir)AppX\shaders -xcopy /Y /E /I $(SolutionDir)WickedEngine\fonts $(OutDir)AppX\fonts -xcopy /Y /E /I $(SolutionDir)Editor\images $(OutDir)AppX\images - Copying assets + + + + PerMonitorHighDPIAware + + $(OutDir)shaders/%(Filename).cso + 5.0 + - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies) + %(AdditionalDependencies) $(SolutionDir)BUILD\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\amd64; $(VCInstallDir)\lib\amd64;../$(Platform)/$(Configuration) @@ -315,18 +354,24 @@ xcopy /Y /E /I $(SolutionDir)Editor\images $(OutDir)AppX\images _DEBUG;%(PreprocessorDefinitions) - xcopy /Y /E /I $(SolutionDir)WickedEngine\shaders $(OutDir)AppX\shaders -xcopy /Y /E /I $(SolutionDir)WickedEngine\fonts $(OutDir)AppX\fonts -xcopy /Y /E /I $(SolutionDir)Editor\images $(OutDir)AppX\images - Copying assets + + + + PerMonitorHighDPIAware + + $(OutDir)shaders/%(Filename).cso + 5.0 + false + false + - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies) + %(AdditionalDependencies) $(SolutionDir)BUILD\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\amd64; $(VCInstallDir)\lib\amd64;../$(Platform)/$(Configuration) @@ -338,14 +383,18 @@ xcopy /Y /E /I $(SolutionDir)Editor\images $(OutDir)AppX\images NDEBUG;%(PreprocessorDefinitions) - xcopy /Y /E /I $(SolutionDir)WickedEngine\shaders $(OutDir)AppX\shaders -xcopy /Y /E /I $(SolutionDir)WickedEngine\fonts $(OutDir)AppX\fonts -xcopy /Y /E /I $(SolutionDir)Editor\images $(OutDir)AppX\images - Copying assets + + + + PerMonitorHighDPIAware + + $(OutDir)shaders/%(Filename).cso + 5.0 + @@ -368,9 +417,7 @@ xcopy /Y /E /I $(SolutionDir)Editor\images $(OutDir)AppX\images - - {60da258f-e95f-4cf4-a46b-17d80644464b} - + diff --git a/Editor/Editor_UWP.vcxproj.filters b/Editor/Editor_UWP.vcxproj.filters index c80bb1cc7..7a785922a 100644 --- a/Editor/Editor_UWP.vcxproj.filters +++ b/Editor/Editor_UWP.vcxproj.filters @@ -38,4 +38,9 @@ + + + Assets + + \ No newline at end of file diff --git a/Editor/Editor_Windows.vcxproj b/Editor/Editor_Windows.vcxproj index 30a94501e..cb1645cd0 100644 --- a/Editor/Editor_Windows.vcxproj +++ b/Editor/Editor_Windows.vcxproj @@ -76,24 +76,28 @@ $(SolutionDir)BUILD\$(Platform)\$(Configuration)\$(ProjectName)\ $(ProjectName)\$(Platform)\$(Configuration)\ $(ProjectName) + true true $(ProjectName)\$(Platform)\$(Configuration)\ $(ProjectName) $(SolutionDir)BUILD\$(Platform)\$(Configuration)\$(ProjectName)\ + true false $(SolutionDir)BUILD\$(Platform)\$(Configuration)\$(ProjectName)\ $(ProjectName)\$(Platform)\$(Configuration)\ $(ProjectName) + true false $(ProjectName)\$(Platform)\$(Configuration)\ $(ProjectName) $(SolutionDir)BUILD\$(Platform)\$(Configuration)\$(ProjectName)\ + true @@ -109,6 +113,16 @@ true $(SolutionDir)BUILD\$(Platform)\$(Configuration);$(VULKAN_SDK)/Lib32;%(AdditionalLibraryDirectories) + + false + + + false + + + 5.0 + shaders/%(Filename).cso + @@ -124,6 +138,16 @@ true $(SolutionDir)BUILD\$(Platform)\$(Configuration);$(VULKAN_SDK)/Lib;%(AdditionalLibraryDirectories) + + false + + + false + + + 5.0 + shaders/%(Filename).cso + @@ -149,6 +173,10 @@ true $(SolutionDir)BUILD\$(Platform)\$(Configuration);$(VULKAN_SDK)/Lib32;%(AdditionalLibraryDirectories) + + 5.0 + shaders/%(Filename).cso + @@ -170,6 +198,10 @@ true $(SolutionDir)BUILD\$(Platform)\$(Configuration);$(VULKAN_SDK)/Lib;%(AdditionalLibraryDirectories) + + 5.0 + shaders/%(Filename).cso + @@ -193,9 +225,6 @@ - - {8c15dc72-70c8-4212-b046-0b166a688a7c} - {06163dcb-b183-4ed9-9c62-13ef1658e049} diff --git a/Template_UWP/App.cpp b/Template_UWP/App.cpp index 04edf8555..3f7c9e78b 100644 --- a/Template_UWP/App.cpp +++ b/Template_UWP/App.cpp @@ -53,9 +53,8 @@ void App::Initialize(CoreApplicationView^ applicationView) main.infoDisplay.watermark = true; main.infoDisplay.resolution = true; main.infoDisplay.fpsinfo = true; - - // These folders are also copied to the executable folder in post-build script: - wiFont::SetFontPath("fonts/"); + + wiFont::SetFontPath(""); wiRenderer::SetShaderPath("shaders/"); } diff --git a/Template_UWP/Template_UWP.vcxproj b/Template_UWP/Template_UWP.vcxproj index 8acc74199..b8a96b1d7 100644 --- a/Template_UWP/Template_UWP.vcxproj +++ b/Template_UWP/Template_UWP.vcxproj @@ -103,6 +103,9 @@ + + + @@ -131,38 +134,46 @@ $(SolutionDir)BUILD\$(Platform)\$(Configuration)\$(ProjectName)\ $(ProjectName)\$(Platform)\$(Configuration)\ + true $(SolutionDir)BUILD\$(Platform)\$(Configuration)\$(ProjectName)\ $(ProjectName)\$(Platform)\$(Configuration)\ + true $(SolutionDir)BUILD\$(Platform)\$(Configuration)\$(ProjectName)\ $(ProjectName)\$(Platform)\$(Configuration)\ + true $(SolutionDir)BUILD\$(Platform)\$(Configuration)\$(ProjectName)\ $(ProjectName)\$(Platform)\$(Configuration)\ + true $(SolutionDir)BUILD\$(Platform)\$(Configuration)\$(ProjectName)\ $(ProjectName)\$(Platform)\$(Configuration)\ + true $(SolutionDir)BUILD\$(Platform)\$(Configuration)\$(ProjectName)\ $(ProjectName)\$(Platform)\$(Configuration)\ + true $(SolutionDir)BUILD\$(Platform)\$(Configuration)\$(ProjectName)\ $(ProjectName)\$(Platform)\$(Configuration)\ + true $(SolutionDir)BUILD\$(Platform)\$(Configuration)\$(ProjectName)\ $(ProjectName)\$(Platform)\$(Configuration)\ + true - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies) + %(AdditionalDependencies) $(SolutionDir)BUILD\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm;../$(Platform)/$(Configuration) @@ -177,18 +188,29 @@ PerMonitorHighDPIAware - xcopy /Y /E /I $(SolutionDir)WickedEngine\shaders $(OutDir)AppX\shaders -xcopy /Y /E /I $(SolutionDir)WickedEngine\fonts $(OutDir)AppX\fonts - Copying assets + + + + + + false + + + false + + + 5.0 + $(OutDir)shaders/%(Filename).cso + - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies) + %(AdditionalDependencies) $(SolutionDir)BUILD\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm; $(VCInstallDir)\lib\arm;../$(Platform)/$(Configuration) @@ -203,18 +225,23 @@ xcopy /Y /E /I $(SolutionDir)WickedEngine\fonts $(OutDir)AppX\fonts PerMonitorHighDPIAware - xcopy /Y /E /I $(SolutionDir)WickedEngine\shaders $(OutDir)AppX\shaders -xcopy /Y /E /I $(SolutionDir)WickedEngine\fonts $(OutDir)AppX\fonts - Copying assets + + + + + + 5.0 + $(OutDir)shaders/%(Filename).cso + - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies) + %(AdditionalDependencies) $(SolutionDir)BUILD\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm64; $(VCInstallDir)\lib\arm64;../$(Platform)/$(Configuration) @@ -229,18 +256,29 @@ xcopy /Y /E /I $(SolutionDir)WickedEngine\fonts $(OutDir)AppX\fonts PerMonitorHighDPIAware - xcopy /Y /E /I $(SolutionDir)WickedEngine\shaders $(OutDir)AppX\shaders -xcopy /Y /E /I $(SolutionDir)WickedEngine\fonts $(OutDir)AppX\fonts - Copying assets + + + + + + false + + + false + + + 5.0 + $(OutDir)shaders/%(Filename).cso + - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies) + %(AdditionalDependencies) $(SolutionDir)BUILD\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\arm64; $(VCInstallDir)\lib\arm64;../$(Platform)/$(Configuration) @@ -255,18 +293,23 @@ xcopy /Y /E /I $(SolutionDir)WickedEngine\fonts $(OutDir)AppX\fonts PerMonitorHighDPIAware - xcopy /Y /E /I $(SolutionDir)WickedEngine\shaders $(OutDir)AppX\shaders -xcopy /Y /E /I $(SolutionDir)WickedEngine\fonts $(OutDir)AppX\fonts - Copying assets + + + + + + 5.0 + $(OutDir)shaders/%(Filename).cso + - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies) + %(AdditionalDependencies) $(SolutionDir)BUILD\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store; $(VCInstallDir)\lib;../$(Platform)/$(Configuration) @@ -281,18 +324,29 @@ xcopy /Y /E /I $(SolutionDir)WickedEngine\fonts $(OutDir)AppX\fonts PerMonitorHighDPIAware - xcopy /Y /E /I $(SolutionDir)WickedEngine\shaders $(OutDir)AppX\shaders -xcopy /Y /E /I $(SolutionDir)WickedEngine\fonts $(OutDir)AppX\fonts - Copying assets + + + + + + false + + + false + + + 5.0 + $(OutDir)shaders/%(Filename).cso + - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies) + %(AdditionalDependencies) $(SolutionDir)BUILD\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store; $(VCInstallDir)\lib;../$(Platform)/$(Configuration) @@ -307,18 +361,23 @@ xcopy /Y /E /I $(SolutionDir)WickedEngine\fonts $(OutDir)AppX\fonts PerMonitorHighDPIAware - xcopy /Y /E /I $(SolutionDir)WickedEngine\shaders $(OutDir)AppX\shaders -xcopy /Y /E /I $(SolutionDir)WickedEngine\fonts $(OutDir)AppX\fonts - Copying assets + + + + + + 5.0 + $(OutDir)shaders/%(Filename).cso + - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies) + %(AdditionalDependencies) $(SolutionDir)BUILD\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\amd64; $(VCInstallDir)\lib\amd64;../$(Platform)/$(Configuration) @@ -333,18 +392,29 @@ xcopy /Y /E /I $(SolutionDir)WickedEngine\fonts $(OutDir)AppX\fonts PerMonitorHighDPIAware - xcopy /Y /E /I $(SolutionDir)WickedEngine\shaders $(OutDir)AppX\shaders -xcopy /Y /E /I $(SolutionDir)WickedEngine\fonts $(OutDir)AppX\fonts - Copying assets + + + + + + false + + + false + + + 5.0 + $(OutDir)shaders/%(Filename).cso + - d2d1.lib; d3d11.lib; dxgi.lib; windowscodecs.lib; dwrite.lib; %(AdditionalDependencies) + %(AdditionalDependencies) $(SolutionDir)BUILD\$(Platform)\$(Configuration);%(AdditionalLibraryDirectories); $(VCInstallDir)\lib\store\amd64; $(VCInstallDir)\lib\amd64;../$(Platform)/$(Configuration) @@ -359,14 +429,19 @@ xcopy /Y /E /I $(SolutionDir)WickedEngine\fonts $(OutDir)AppX\fonts PerMonitorHighDPIAware - xcopy /Y /E /I $(SolutionDir)WickedEngine\shaders $(OutDir)AppX\shaders -xcopy /Y /E /I $(SolutionDir)WickedEngine\fonts $(OutDir)AppX\fonts - Copying assets + + + + + + 5.0 + $(OutDir)shaders/%(Filename).cso + @@ -404,6 +479,9 @@ xcopy /Y /E /I $(SolutionDir)WickedEngine\fonts $(OutDir)AppX\fonts {60da258f-e95f-4cf4-a46b-17d80644464b} + + + diff --git a/Template_UWP/Template_UWP.vcxproj.filters b/Template_UWP/Template_UWP.vcxproj.filters index 46598cf2f..cc5f88a0b 100644 --- a/Template_UWP/Template_UWP.vcxproj.filters +++ b/Template_UWP/Template_UWP.vcxproj.filters @@ -40,4 +40,9 @@ + + + Assets + + \ No newline at end of file diff --git a/WickedEngine.sln b/WickedEngine.sln index 7e83afbc8..373129ad5 100644 --- a/WickedEngine.sln +++ b/WickedEngine.sln @@ -7,7 +7,6 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Editor_Windows", "Editor\Ed EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Editor_UWP", "Editor\Editor_UWP.vcxproj", "{FA78BFAD-4B23-4A6B-92FA-A48CE56BED03}" ProjectSection(ProjectDependencies) = postProject - {8C15DC72-70C8-4212-B046-0B166A688A7C} = {8C15DC72-70C8-4212-B046-0B166A688A7C} {60DA258F-E95F-4CF4-A46B-17D80644464B} = {60DA258F-E95F-4CF4-A46B-17D80644464B} EndProjectSection EndProject @@ -19,26 +18,29 @@ Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Template_Windows", "Templat EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "Template_UWP", "Template_UWP\Template_UWP.vcxproj", "{C222218B-B6D1-406B-B2C0-8C1CED4A8D19}" ProjectSection(ProjectDependencies) = postProject - {8C15DC72-70C8-4212-B046-0B166A688A7C} = {8C15DC72-70C8-4212-B046-0B166A688A7C} {60DA258F-E95F-4CF4-A46B-17D80644464B} = {60DA258F-E95F-4CF4-A46B-17D80644464B} EndProjectSection EndProject -Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WickedEngine_SHADERS", "WickedEngine\WickedEngine_SHADERS.vcxproj", "{8C15DC72-70C8-4212-B046-0B166A688A7C}" -EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WickedEngine_SOURCE", "WickedEngine\WickedEngine_SOURCE.vcxitems", "{45D41ACC-2C3C-43D2-BC10-02AA73FFC7C7}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WickedEngine_Windows", "WickedEngine\WickedEngine_Windows.vcxproj", "{06163DCB-B183-4ED9-9C62-13EF1658E049}" EndProject Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WickedEngine_UWP", "WickedEngine\WickedEngine_UWP.vcxproj", "{60DA258F-E95F-4CF4-A46B-17D80644464B}" EndProject +Project("{8BC9CEB8-8B4A-11D0-8D11-00A0C91BC942}") = "WickedEngine_SHADERS", "WickedEngine\WickedEngine_SHADERS.vcxitems", "{92E86448-0724-4387-ABAC-96E63EDF4190}" +EndProject Global GlobalSection(SharedMSBuildProjectFiles) = preSolution + WickedEngine\WickedEngine_SHADERS.vcxitems*{06163dcb-b183-4ed9-9c62-13ef1658e049}*SharedItemsImports = 4 WickedEngine\WickedEngine_SOURCE.vcxitems*{06163dcb-b183-4ed9-9c62-13ef1658e049}*SharedItemsImports = 4 WickedEngine\WickedEngine_SOURCE.vcxitems*{45d41acc-2c3c-43d2-bc10-02aa73ffc7c7}*SharedItemsImports = 9 Editor\Editor_SOURCE.vcxitems*{5fe97b9b-a445-4eea-a42d-9de60b891d48}*SharedItemsImports = 4 WickedEngine\WickedEngine_SOURCE.vcxitems*{60da258f-e95f-4cf4-a46b-17d80644464b}*SharedItemsImports = 4 Editor\Editor_SOURCE.vcxitems*{867febca-09c4-4fe7-8a4c-4d9b1c27e7d0}*SharedItemsImports = 9 + WickedEngine\WickedEngine_SHADERS.vcxitems*{92e86448-0724-4387-abac-96e63edf4190}*SharedItemsImports = 9 + WickedEngine\WickedEngine_SHADERS.vcxitems*{c222218b-b6d1-406b-b2c0-8c1ced4a8d19}*SharedItemsImports = 4 Editor\Editor_SOURCE.vcxitems*{fa78bfad-4b23-4a6b-92fa-a48ce56bed03}*SharedItemsImports = 4 + WickedEngine\WickedEngine_SHADERS.vcxitems*{fa78bfad-4b23-4a6b-92fa-a48ce56bed03}*SharedItemsImports = 4 EndGlobalSection GlobalSection(SolutionConfigurationPlatforms) = preSolution Debug|ARM = Debug|ARM @@ -51,103 +53,14 @@ Global Release|x64 = Release|x64 EndGlobalSection GlobalSection(ProjectConfigurationPlatforms) = postSolution - {3A9EA3D0-A795-46ED-A737-7164E90DC309}.Debug|ARM.ActiveCfg = Debug|Win32 - {3A9EA3D0-A795-46ED-A737-7164E90DC309}.Debug|ARM64.ActiveCfg = Debug|Win32 - {3A9EA3D0-A795-46ED-A737-7164E90DC309}.Debug|Win32.ActiveCfg = Debug|Win32 - {3A9EA3D0-A795-46ED-A737-7164E90DC309}.Debug|Win32.Build.0 = Debug|Win32 - {3A9EA3D0-A795-46ED-A737-7164E90DC309}.Debug|x64.ActiveCfg = Debug|x64 - {3A9EA3D0-A795-46ED-A737-7164E90DC309}.Debug|x64.Build.0 = Debug|x64 - {3A9EA3D0-A795-46ED-A737-7164E90DC309}.Release|ARM.ActiveCfg = Release|Win32 - {3A9EA3D0-A795-46ED-A737-7164E90DC309}.Release|ARM64.ActiveCfg = Release|Win32 - {3A9EA3D0-A795-46ED-A737-7164E90DC309}.Release|Win32.ActiveCfg = Release|Win32 - {3A9EA3D0-A795-46ED-A737-7164E90DC309}.Release|Win32.Build.0 = Release|Win32 - {3A9EA3D0-A795-46ED-A737-7164E90DC309}.Release|x64.ActiveCfg = Release|x64 - {3A9EA3D0-A795-46ED-A737-7164E90DC309}.Release|x64.Build.0 = Release|x64 - {76AA3D37-3252-4785-9334-3FC6B8CC07DE}.Debug|ARM.ActiveCfg = Debug|Win32 - {76AA3D37-3252-4785-9334-3FC6B8CC07DE}.Debug|ARM64.ActiveCfg = Debug|Win32 - {76AA3D37-3252-4785-9334-3FC6B8CC07DE}.Debug|Win32.ActiveCfg = Debug|Win32 - {76AA3D37-3252-4785-9334-3FC6B8CC07DE}.Debug|Win32.Build.0 = Debug|Win32 - {76AA3D37-3252-4785-9334-3FC6B8CC07DE}.Debug|x64.ActiveCfg = Debug|x64 - {76AA3D37-3252-4785-9334-3FC6B8CC07DE}.Debug|x64.Build.0 = Debug|x64 - {76AA3D37-3252-4785-9334-3FC6B8CC07DE}.Release|ARM.ActiveCfg = Release|Win32 - {76AA3D37-3252-4785-9334-3FC6B8CC07DE}.Release|ARM64.ActiveCfg = Release|Win32 - {76AA3D37-3252-4785-9334-3FC6B8CC07DE}.Release|Win32.ActiveCfg = Release|Win32 - {76AA3D37-3252-4785-9334-3FC6B8CC07DE}.Release|Win32.Build.0 = Release|Win32 - {76AA3D37-3252-4785-9334-3FC6B8CC07DE}.Release|x64.ActiveCfg = Release|x64 - {76AA3D37-3252-4785-9334-3FC6B8CC07DE}.Release|x64.Build.0 = Release|x64 - {8C15DC72-70C8-4212-B046-0B166A688A7C}.Debug|ARM.ActiveCfg = Release|Win32 - {8C15DC72-70C8-4212-B046-0B166A688A7C}.Debug|ARM.Build.0 = Release|Win32 - {8C15DC72-70C8-4212-B046-0B166A688A7C}.Debug|ARM64.ActiveCfg = Release|Win32 - {8C15DC72-70C8-4212-B046-0B166A688A7C}.Debug|ARM64.Build.0 = Release|Win32 - {8C15DC72-70C8-4212-B046-0B166A688A7C}.Debug|Win32.ActiveCfg = Release|Win32 - {8C15DC72-70C8-4212-B046-0B166A688A7C}.Debug|Win32.Build.0 = Release|Win32 - {8C15DC72-70C8-4212-B046-0B166A688A7C}.Debug|x64.ActiveCfg = Release|Win32 - {8C15DC72-70C8-4212-B046-0B166A688A7C}.Debug|x64.Build.0 = Release|Win32 - {8C15DC72-70C8-4212-B046-0B166A688A7C}.Release|ARM.ActiveCfg = Release|Win32 - {8C15DC72-70C8-4212-B046-0B166A688A7C}.Release|ARM.Build.0 = Release|Win32 - {8C15DC72-70C8-4212-B046-0B166A688A7C}.Release|ARM64.ActiveCfg = Release|Win32 - {8C15DC72-70C8-4212-B046-0B166A688A7C}.Release|Win32.ActiveCfg = Release|Win32 - {8C15DC72-70C8-4212-B046-0B166A688A7C}.Release|Win32.Build.0 = Release|Win32 - {8C15DC72-70C8-4212-B046-0B166A688A7C}.Release|x64.ActiveCfg = Release|Win32 - {8C15DC72-70C8-4212-B046-0B166A688A7C}.Release|x64.Build.0 = Release|Win32 - {06163DCB-B183-4ED9-9C62-13EF1658E049}.Debug|ARM.ActiveCfg = Debug|x64 - {06163DCB-B183-4ED9-9C62-13EF1658E049}.Debug|ARM64.ActiveCfg = Debug|Win32 - {06163DCB-B183-4ED9-9C62-13EF1658E049}.Debug|Win32.ActiveCfg = Debug|Win32 - {06163DCB-B183-4ED9-9C62-13EF1658E049}.Debug|Win32.Build.0 = Debug|Win32 - {06163DCB-B183-4ED9-9C62-13EF1658E049}.Debug|x64.ActiveCfg = Debug|x64 - {06163DCB-B183-4ED9-9C62-13EF1658E049}.Debug|x64.Build.0 = Debug|x64 - {06163DCB-B183-4ED9-9C62-13EF1658E049}.Release|ARM.ActiveCfg = Release|x64 - {06163DCB-B183-4ED9-9C62-13EF1658E049}.Release|ARM64.ActiveCfg = Release|Win32 - {06163DCB-B183-4ED9-9C62-13EF1658E049}.Release|Win32.ActiveCfg = Release|Win32 - {06163DCB-B183-4ED9-9C62-13EF1658E049}.Release|Win32.Build.0 = Release|Win32 - {06163DCB-B183-4ED9-9C62-13EF1658E049}.Release|x64.ActiveCfg = Release|x64 - {06163DCB-B183-4ED9-9C62-13EF1658E049}.Release|x64.Build.0 = Release|x64 - {60DA258F-E95F-4CF4-A46B-17D80644464B}.Debug|ARM.ActiveCfg = Debug|ARM - {60DA258F-E95F-4CF4-A46B-17D80644464B}.Debug|ARM.Build.0 = Debug|ARM - {60DA258F-E95F-4CF4-A46B-17D80644464B}.Debug|ARM64.ActiveCfg = Debug|Win32 - {60DA258F-E95F-4CF4-A46B-17D80644464B}.Debug|Win32.ActiveCfg = Debug|Win32 - {60DA258F-E95F-4CF4-A46B-17D80644464B}.Debug|Win32.Build.0 = Debug|Win32 - {60DA258F-E95F-4CF4-A46B-17D80644464B}.Debug|x64.ActiveCfg = Debug|x64 - {60DA258F-E95F-4CF4-A46B-17D80644464B}.Debug|x64.Build.0 = Debug|x64 - {60DA258F-E95F-4CF4-A46B-17D80644464B}.Release|ARM.ActiveCfg = Release|ARM - {60DA258F-E95F-4CF4-A46B-17D80644464B}.Release|ARM.Build.0 = Release|ARM - {60DA258F-E95F-4CF4-A46B-17D80644464B}.Release|ARM64.ActiveCfg = Release|Win32 - {60DA258F-E95F-4CF4-A46B-17D80644464B}.Release|Win32.ActiveCfg = Release|Win32 - {60DA258F-E95F-4CF4-A46B-17D80644464B}.Release|Win32.Build.0 = Release|Win32 - {60DA258F-E95F-4CF4-A46B-17D80644464B}.Release|x64.ActiveCfg = Release|x64 - {60DA258F-E95F-4CF4-A46B-17D80644464B}.Release|x64.Build.0 = Release|x64 - {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Debug|ARM.ActiveCfg = Debug|ARM - {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Debug|ARM.Build.0 = Debug|ARM - {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Debug|ARM.Deploy.0 = Debug|ARM - {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Debug|ARM64.ActiveCfg = Debug|ARM64 - {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Debug|ARM64.Build.0 = Debug|ARM64 - {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Debug|ARM64.Deploy.0 = Debug|ARM64 - {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Debug|Win32.ActiveCfg = Debug|Win32 - {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Debug|Win32.Build.0 = Debug|Win32 - {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Debug|Win32.Deploy.0 = Debug|Win32 - {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Debug|x64.ActiveCfg = Debug|x64 - {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Debug|x64.Build.0 = Debug|x64 - {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Debug|x64.Deploy.0 = Debug|x64 - {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Release|ARM.ActiveCfg = Release|ARM - {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Release|ARM.Build.0 = Release|ARM - {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Release|ARM.Deploy.0 = Release|ARM - {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Release|ARM64.ActiveCfg = Release|ARM64 - {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Release|ARM64.Build.0 = Release|ARM64 - {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Release|ARM64.Deploy.0 = Release|ARM64 - {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Release|Win32.ActiveCfg = Release|Win32 - {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Release|Win32.Build.0 = Release|Win32 - {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Release|Win32.Deploy.0 = Release|Win32 - {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Release|x64.ActiveCfg = Release|x64 - {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Release|x64.Build.0 = Release|x64 - {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Release|x64.Deploy.0 = Release|x64 - {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Debug|ARM.ActiveCfg = Debug|Win32 - {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Debug|ARM64.ActiveCfg = Debug|Win32 + {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Debug|ARM.ActiveCfg = Debug|x64 + {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Debug|ARM64.ActiveCfg = Debug|x64 {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Debug|Win32.ActiveCfg = Debug|Win32 {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Debug|Win32.Build.0 = Debug|Win32 {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Debug|x64.ActiveCfg = Debug|x64 {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Debug|x64.Build.0 = Debug|x64 - {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Release|ARM.ActiveCfg = Release|Win32 - {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Release|ARM64.ActiveCfg = Release|Win32 + {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Release|ARM.ActiveCfg = Release|x64 + {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Release|ARM64.ActiveCfg = Release|x64 {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Release|Win32.ActiveCfg = Release|Win32 {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Release|Win32.Build.0 = Release|Win32 {5FE97B9B-A445-4EEA-A42D-9DE60B891D48}.Release|x64.ActiveCfg = Release|x64 @@ -176,6 +89,82 @@ Global {FA78BFAD-4B23-4A6B-92FA-A48CE56BED03}.Release|x64.ActiveCfg = Release|x64 {FA78BFAD-4B23-4A6B-92FA-A48CE56BED03}.Release|x64.Build.0 = Release|x64 {FA78BFAD-4B23-4A6B-92FA-A48CE56BED03}.Release|x64.Deploy.0 = Release|x64 + {3A9EA3D0-A795-46ED-A737-7164E90DC309}.Debug|ARM.ActiveCfg = Debug|x64 + {3A9EA3D0-A795-46ED-A737-7164E90DC309}.Debug|ARM64.ActiveCfg = Debug|x64 + {3A9EA3D0-A795-46ED-A737-7164E90DC309}.Debug|Win32.ActiveCfg = Debug|Win32 + {3A9EA3D0-A795-46ED-A737-7164E90DC309}.Debug|Win32.Build.0 = Debug|Win32 + {3A9EA3D0-A795-46ED-A737-7164E90DC309}.Debug|x64.ActiveCfg = Debug|x64 + {3A9EA3D0-A795-46ED-A737-7164E90DC309}.Debug|x64.Build.0 = Debug|x64 + {3A9EA3D0-A795-46ED-A737-7164E90DC309}.Release|ARM.ActiveCfg = Release|x64 + {3A9EA3D0-A795-46ED-A737-7164E90DC309}.Release|ARM64.ActiveCfg = Release|x64 + {3A9EA3D0-A795-46ED-A737-7164E90DC309}.Release|Win32.ActiveCfg = Release|Win32 + {3A9EA3D0-A795-46ED-A737-7164E90DC309}.Release|Win32.Build.0 = Release|Win32 + {3A9EA3D0-A795-46ED-A737-7164E90DC309}.Release|x64.ActiveCfg = Release|x64 + {3A9EA3D0-A795-46ED-A737-7164E90DC309}.Release|x64.Build.0 = Release|x64 + {76AA3D37-3252-4785-9334-3FC6B8CC07DE}.Debug|ARM.ActiveCfg = Debug|x64 + {76AA3D37-3252-4785-9334-3FC6B8CC07DE}.Debug|ARM64.ActiveCfg = Debug|x64 + {76AA3D37-3252-4785-9334-3FC6B8CC07DE}.Debug|Win32.ActiveCfg = Debug|Win32 + {76AA3D37-3252-4785-9334-3FC6B8CC07DE}.Debug|Win32.Build.0 = Debug|Win32 + {76AA3D37-3252-4785-9334-3FC6B8CC07DE}.Debug|x64.ActiveCfg = Debug|x64 + {76AA3D37-3252-4785-9334-3FC6B8CC07DE}.Debug|x64.Build.0 = Debug|x64 + {76AA3D37-3252-4785-9334-3FC6B8CC07DE}.Release|ARM.ActiveCfg = Release|x64 + {76AA3D37-3252-4785-9334-3FC6B8CC07DE}.Release|ARM64.ActiveCfg = Release|x64 + {76AA3D37-3252-4785-9334-3FC6B8CC07DE}.Release|Win32.ActiveCfg = Release|Win32 + {76AA3D37-3252-4785-9334-3FC6B8CC07DE}.Release|Win32.Build.0 = Release|Win32 + {76AA3D37-3252-4785-9334-3FC6B8CC07DE}.Release|x64.ActiveCfg = Release|x64 + {76AA3D37-3252-4785-9334-3FC6B8CC07DE}.Release|x64.Build.0 = Release|x64 + {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Debug|ARM.ActiveCfg = Debug|ARM + {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Debug|ARM.Build.0 = Debug|ARM + {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Debug|ARM.Deploy.0 = Debug|ARM + {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Debug|ARM64.Build.0 = Debug|ARM64 + {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Debug|ARM64.Deploy.0 = Debug|ARM64 + {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Debug|Win32.ActiveCfg = Debug|Win32 + {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Debug|Win32.Build.0 = Debug|Win32 + {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Debug|Win32.Deploy.0 = Debug|Win32 + {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Debug|x64.ActiveCfg = Debug|x64 + {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Debug|x64.Build.0 = Debug|x64 + {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Debug|x64.Deploy.0 = Debug|x64 + {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Release|ARM.ActiveCfg = Release|ARM + {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Release|ARM.Build.0 = Release|ARM + {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Release|ARM.Deploy.0 = Release|ARM + {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Release|ARM64.ActiveCfg = Release|ARM64 + {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Release|ARM64.Build.0 = Release|ARM64 + {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Release|ARM64.Deploy.0 = Release|ARM64 + {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Release|Win32.ActiveCfg = Release|Win32 + {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Release|Win32.Build.0 = Release|Win32 + {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Release|Win32.Deploy.0 = Release|Win32 + {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Release|x64.ActiveCfg = Release|x64 + {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Release|x64.Build.0 = Release|x64 + {C222218B-B6D1-406B-B2C0-8C1CED4A8D19}.Release|x64.Deploy.0 = Release|x64 + {06163DCB-B183-4ED9-9C62-13EF1658E049}.Debug|ARM.ActiveCfg = Debug|x64 + {06163DCB-B183-4ED9-9C62-13EF1658E049}.Debug|ARM64.ActiveCfg = Debug|x64 + {06163DCB-B183-4ED9-9C62-13EF1658E049}.Debug|Win32.ActiveCfg = Debug|Win32 + {06163DCB-B183-4ED9-9C62-13EF1658E049}.Debug|Win32.Build.0 = Debug|Win32 + {06163DCB-B183-4ED9-9C62-13EF1658E049}.Debug|x64.ActiveCfg = Debug|x64 + {06163DCB-B183-4ED9-9C62-13EF1658E049}.Debug|x64.Build.0 = Debug|x64 + {06163DCB-B183-4ED9-9C62-13EF1658E049}.Release|ARM.ActiveCfg = Release|x64 + {06163DCB-B183-4ED9-9C62-13EF1658E049}.Release|ARM64.ActiveCfg = Release|x64 + {06163DCB-B183-4ED9-9C62-13EF1658E049}.Release|Win32.ActiveCfg = Release|Win32 + {06163DCB-B183-4ED9-9C62-13EF1658E049}.Release|Win32.Build.0 = Release|Win32 + {06163DCB-B183-4ED9-9C62-13EF1658E049}.Release|x64.ActiveCfg = Release|x64 + {06163DCB-B183-4ED9-9C62-13EF1658E049}.Release|x64.Build.0 = Release|x64 + {60DA258F-E95F-4CF4-A46B-17D80644464B}.Debug|ARM.ActiveCfg = Debug|ARM + {60DA258F-E95F-4CF4-A46B-17D80644464B}.Debug|ARM.Build.0 = Debug|ARM + {60DA258F-E95F-4CF4-A46B-17D80644464B}.Debug|ARM64.ActiveCfg = Debug|ARM64 + {60DA258F-E95F-4CF4-A46B-17D80644464B}.Debug|ARM64.Build.0 = Debug|ARM64 + {60DA258F-E95F-4CF4-A46B-17D80644464B}.Debug|Win32.ActiveCfg = Debug|Win32 + {60DA258F-E95F-4CF4-A46B-17D80644464B}.Debug|Win32.Build.0 = Debug|Win32 + {60DA258F-E95F-4CF4-A46B-17D80644464B}.Debug|x64.ActiveCfg = Debug|x64 + {60DA258F-E95F-4CF4-A46B-17D80644464B}.Debug|x64.Build.0 = Debug|x64 + {60DA258F-E95F-4CF4-A46B-17D80644464B}.Release|ARM.ActiveCfg = Release|ARM + {60DA258F-E95F-4CF4-A46B-17D80644464B}.Release|ARM.Build.0 = Release|ARM + {60DA258F-E95F-4CF4-A46B-17D80644464B}.Release|ARM64.ActiveCfg = Release|ARM64 + {60DA258F-E95F-4CF4-A46B-17D80644464B}.Release|ARM64.Build.0 = Release|ARM64 + {60DA258F-E95F-4CF4-A46B-17D80644464B}.Release|Win32.ActiveCfg = Release|Win32 + {60DA258F-E95F-4CF4-A46B-17D80644464B}.Release|Win32.Build.0 = Release|Win32 + {60DA258F-E95F-4CF4-A46B-17D80644464B}.Release|x64.ActiveCfg = Release|x64 + {60DA258F-E95F-4CF4-A46B-17D80644464B}.Release|x64.Build.0 = Release|x64 EndGlobalSection GlobalSection(SolutionProperties) = preSolution HideSolutionNode = FALSE diff --git a/WickedEngine/LUA/luaconf.h b/WickedEngine/LUA/luaconf.h index 55310720d..3f8ef397c 100644 --- a/WickedEngine/LUA/luaconf.h +++ b/WickedEngine/LUA/luaconf.h @@ -48,7 +48,7 @@ ** By default, Lua on Windows use (some) specific Windows features */ #if !defined(LUA_USE_C89) && defined(_WIN32) && !defined(_WIN32_WCE) -#define LUA_USE_WINDOWS /* enable goodies for regular Windows */ +//#define LUA_USE_WINDOWS /* enable goodies for regular Windows */ #endif diff --git a/WickedEngine/WickedEngine_SHADERS.vcxitems b/WickedEngine/WickedEngine_SHADERS.vcxitems new file mode 100644 index 000000000..b5c52f9c5 --- /dev/null +++ b/WickedEngine/WickedEngine_SHADERS.vcxitems @@ -0,0 +1,2929 @@ + + + + $(MSBuildAllProjects);$(MSBuildThisFileFullPath) + true + {92e86448-0724-4387-abac-96e63edf4190} + + + + %(AdditionalIncludeDirectories);$(MSBuildThisFileDirectory) + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Geometry + Geometry + Geometry + Geometry + Geometry + Geometry + Geometry + Geometry + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Domain + Domain + Domain + Domain + Domain + Domain + Domain + Domain + + + Geometry + Geometry + Geometry + Geometry + Geometry + Geometry + Geometry + Geometry + + + Hull + Hull + Hull + Hull + Hull + Hull + Hull + Hull + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Geometry + Geometry + Geometry + Geometry + Geometry + Geometry + Geometry + Geometry + + + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + Pixel + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Compute + Compute + Compute + Compute + Compute + Compute + Compute + Compute + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + Vertex + + + \ No newline at end of file diff --git a/WickedEngine/WickedEngine_SHADERS.vcxitems.filters b/WickedEngine/WickedEngine_SHADERS.vcxitems.filters new file mode 100644 index 000000000..3e674aeb7 --- /dev/null +++ b/WickedEngine/WickedEngine_SHADERS.vcxitems.filters @@ -0,0 +1,981 @@ + + + + + {be5e3922-0e61-434a-92c8-bfaf03c26fb4} + + + {c23b3c81-afad-4c4d-a0fd-598f01477820} + + + {1ef621ed-feeb-4b4c-aa96-8dc5f9933634} + + + {993b685a-191e-4ffa-a5e4-66b00eb3eb35} + + + {bdf0867b-8819-4456-998f-296fed10d958} + + + {d69144c2-e3a3-45c1-b66a-caec6dc22a93} + + + {9f327310-fe88-414c-a23a-22839ea58475} + + + + + HF + + + HF + + + HF + + + HF + + + HF + + + HF + + + HF + + + HF + + + HF + + + HF + + + HF + + + HF + + + HF + + + HF + + + HF + + + HF + + + HF + + + HF + + + HF + + + HF + + + HF + + + HF + + + HF + + + HF + + + HF + + + HF + + + HF + + + HF + + + HF + + + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + CS + + + DS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + PS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + VS + + + GS + + + GS + + + GS + + + HS + + + CS + + + \ No newline at end of file diff --git a/WickedEngine/WickedEngine_SHADERS.vcxproj b/WickedEngine/WickedEngine_SHADERS.vcxproj deleted file mode 100644 index 433660ffc..000000000 --- a/WickedEngine/WickedEngine_SHADERS.vcxproj +++ /dev/null @@ -1,1071 +0,0 @@ - - - - - Release - Win32 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - Compute - 5.0 - - - Compute - - - Compute - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Pixel - - - Pixel - - - Pixel - - - Compute - 5.0 - - - Pixel - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Pixel - - - Vertex - - - Vertex - - - Vertex - - - Pixel - - - Vertex - - - Pixel - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Pixel - - - Vertex - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Pixel - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Pixel - - - Pixel - - - Vertex - - - Pixel - - - Pixel - - - Vertex - - - Compute - 5.0 - - - Compute - 5.0 - - - Pixel - - - Vertex - - - Pixel - - - Vertex - - - Vertex - - - Compute - - - Compute - 5.0 - - - Compute - 5.0 - - - Pixel - - - Pixel - - - Pixel - - - Compute - 5.0 - - - Compute - 5.0 - - - Pixel - - - Pixel - - - Pixel - 5.0 - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - 5.0 - - - Vertex - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Vertex - - - Vertex - - - Compute - - - Pixel - - - Pixel - - - Pixel - - - Vertex - - - Geometry - - - Pixel - - - Vertex - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - - - Compute - - - Compute - 5.0 - - - Pixel - - - Vertex - - - Compute - - - Compute - - - Compute - - - Domain - - - Geometry - 5.0 - - - Hull - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Vertex - - - Vertex - - - Vertex - - - Vertex - - - Vertex - - - Vertex - - - Vertex - - - Compute - 5.0 - - - Pixel - - - Compute - 5.0 - - - Compute - 5.0 - - - Pixel - - - Pixel - - - Vertex - - - Pixel - - - Pixel - - - Vertex - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Pixel - 5.0 - - - Compute - 5.0 - - - Vertex - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Pixel - - - Pixel - - - Vertex - - - Compute - 5.0 - - - Pixel - - - Vertex - - - Pixel - - - Pixel - - - Pixel - - - Vertex - - - Vertex - - - Vertex - - - Compute - - - Compute - 5.0 - - - Compute - 5.0 - - - Pixel - - - Pixel - - - Vertex - - - Pixel - - - Vertex - - - Pixel - - - Vertex - - - Compute - - - Compute - - - Compute - - - Pixel - - - Compute - - - Compute - - - Pixel - - - Compute - - - Compute - 5.0 - - - Compute - - - Compute - 5.0 - - - Compute - 5.0 - - - Pixel - - - Vertex - - - Pixel - - - Compute - 5.0 - - - Compute - 5.0 - - - Pixel - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Vertex - - - Pixel - - - Pixel - - - Pixel - - - Pixel - - - Compute - 5.0 - - - Geometry - 4.0 - - - Pixel - - - Compute - 5.0 - - - Compute - 5.0 - - - Compute - 5.0 - - - Vertex - - - Vertex - - - Vertex - - - Vertex - - - Vertex - - - Pixel - - - Vertex - - - - {8C15DC72-70C8-4212-B046-0B166A688A7C} - WickedEngine_SHADERS - 10.0 - - - - Application - false - v142 - true - MultiByte - - - - - - - - - - - - $(ProjectName)\$(Platform)\$(Configuration)\ - true - - - - Level3 - MaxSpeed - true - true - true - - - true - true - - - shaders/%(Filename).cso - 5.0 - false - - - - - - \ No newline at end of file diff --git a/WickedEngine/WickedEngine_SHADERS.vcxproj.filters b/WickedEngine/WickedEngine_SHADERS.vcxproj.filters deleted file mode 100644 index 1c39b2785..000000000 --- a/WickedEngine/WickedEngine_SHADERS.vcxproj.filters +++ /dev/null @@ -1,981 +0,0 @@ - - - - - HF - - - HF - - - HF - - - HF - - - HF - - - HF - - - HF - - - HF - - - HF - - - HF - - - HF - - - HF - - - HF - - - HF - - - HF - - - HF - - - HF - - - HF - - - HF - - - HF - - - HF - - - HF - - - HF - - - HF - - - HF - - - HF - - - HF - - - HF - - - HF - - - - - HS - - - DS - - - CS - - - CS - - - GS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - VS - - - VS - - - VS - - - VS - - - VS - - - VS - - - VS - - - VS - - - VS - - - VS - - - VS - - - VS - - - VS - - - VS - - - VS - - - PS - - - PS - - - PS - - - VS - - - PS - - - PS - - - PS - - - CS - - - CS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - CS - - - VS - - - CS - - - PS - - - PS - - - PS - - - PS - - - VS - - - VS - - - VS - - - VS - - - PS - - - PS - - - VS - - - PS - - - GS - - - VS - - - PS - - - CS - - - GS - - - CS - - - CS - - - CS - - - CS - - - CS - - - VS - - - VS - - - VS - - - VS - - - VS - - - VS - - - PS - - - VS - - - VS - - - PS - - - VS - - - CS - - - CS - - - CS - - - CS - - - CS - - - VS - - - VS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - CS - - - CS - - - CS - - - VS - - - VS - - - PS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - PS - - - CS - - - CS - - - VS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - VS - - - PS - - - PS - - - CS - - - PS - - - PS - - - PS - - - PS - - - PS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - VS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - VS - - - CS - - - CS - - - PS - - - PS - - - PS - - - PS - - - VS - - - PS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - PS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - PS - - - CS - - - PS - - - PS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - PS - - - VS - - - PS - - - CS - - - CS - - - CS - - - CS - - - PS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - PS - - - CS - - - CS - - - PS - - - CS - - - PS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - CS - - - - - {3b8f0b04-f10f-4fa9-a4a8-ecebbf8c5bf8} - - - {a87f55f5-69fc-4930-ad9e-1567cba6127c} - - - {37d4229d-560f-453c-943a-0ed2998cafb0} - - - {66b37341-6805-468d-8e86-e44158c7df67} - - - {6dab5a5d-0b2d-494b-920d-7fa21ca8b857} - - - {d2178be7-2efa-4aea-a36b-d6d1e98f4b43} - - - {12396e21-0254-42fa-a88b-805f0703eca5} - - - \ No newline at end of file diff --git a/WickedEngine/WickedEngine_UWP.vcxproj b/WickedEngine/WickedEngine_UWP.vcxproj index 2ec196541..dabdb9f56 100644 --- a/WickedEngine/WickedEngine_UWP.vcxproj +++ b/WickedEngine/WickedEngine_UWP.vcxproj @@ -5,6 +5,10 @@ Debug ARM + + Debug + ARM64 + Debug Win32 @@ -17,6 +21,10 @@ Release ARM + + Release + ARM64 + Release Win32 @@ -49,6 +57,11 @@ true v142 + + StaticLibrary + true + v142 + StaticLibrary true @@ -66,6 +79,12 @@ true v142 + + StaticLibrary + false + true + v142 + StaticLibrary false @@ -87,9 +106,15 @@ + + + + + + @@ -102,31 +127,49 @@ false $(SolutionDir)BUILD\$(Platform)\$(Configuration)\ $(MSBuildProjectName)\$(Platform)\$(Configuration)\ + true false $(SolutionDir)BUILD\$(Platform)\$(Configuration)\ $(MSBuildProjectName)\$(Platform)\$(Configuration)\ + true false $(MSBuildProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)BUILD\$(Platform)\$(Configuration)\ + true + + + false + $(MSBuildProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)BUILD\$(Platform)\$(Configuration)\ + true false $(MSBuildProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)BUILD\$(Platform)\$(Configuration)\ + true + + + false + $(MSBuildProjectName)\$(Platform)\$(Configuration)\ + $(SolutionDir)BUILD\$(Platform)\$(Configuration)\ + true false $(MSBuildProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)BUILD\$(Platform)\$(Configuration)\ + true false $(MSBuildProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)BUILD\$(Platform)\$(Configuration)\ + true @@ -143,6 +186,9 @@ shaders/%(Filename).cso + false + false + 5.0 @@ -162,6 +208,7 @@ shaders/%(Filename).cso + 5.0 @@ -181,6 +228,31 @@ shaders/%(Filename).cso + false + false + 5.0 + + + + + + + NotUsing + true + true + BULLET;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;BT_USE_DOUBLE_PRECISION;_ARM;%(PreprocessorDefinitions) + + + Console + false + false + + + shaders/%(Filename).cso + false + false + 5.0 @@ -200,6 +272,27 @@ shaders/%(Filename).cso + 5.0 + + + + + + + NotUsing + true + true + BULLET;%(AdditionalIncludeDirectories) + _CRT_SECURE_NO_WARNINGS;BT_USE_DOUBLE_PRECISION;_ARM;%(PreprocessorDefinitions) + + + Console + false + false + + + shaders/%(Filename).cso + 5.0 @@ -219,6 +312,9 @@ shaders/%(Filename).cso + false + false + 5.0 @@ -238,6 +334,7 @@ shaders/%(Filename).cso + 5.0 diff --git a/WickedEngine/WickedEngine_Windows.vcxproj b/WickedEngine/WickedEngine_Windows.vcxproj index c6a971c70..ffeca45c5 100644 --- a/WickedEngine/WickedEngine_Windows.vcxproj +++ b/WickedEngine/WickedEngine_Windows.vcxproj @@ -56,6 +56,7 @@ + @@ -73,18 +74,22 @@ $(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)BUILD\$(Platform)\$(Configuration)\ + true $(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)BUILD\$(Platform)\$(Configuration)\ + true $(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)BUILD\$(Platform)\$(Configuration)\ + true $(ProjectName)\$(Platform)\$(Configuration)\ $(SolutionDir)BUILD\$(Platform)\$(Configuration)\ + true @@ -106,6 +111,9 @@ shaders/%(Filename).cso + false + false + 5.0 true @@ -135,6 +143,9 @@ shaders/%(Filename).cso + false + false + 5.0 true @@ -166,6 +177,7 @@ shaders/%(Filename).cso + 5.0 $(VULKAN_SDK)/Lib32;%(AdditionalLibraryDirectories);%(AdditionalLibraryDirectories) @@ -193,6 +205,7 @@ shaders/%(Filename).cso + 5.0 $(VULKAN_SDK)/Lib;%(AdditionalLibraryDirectories);%(AdditionalLibraryDirectories) diff --git a/WickedEngine/voxelSceneCopyClear_TemporalSmoothing.hlsl b/WickedEngine/voxelSceneCopyClearCS_TemporalSmoothing.hlsl similarity index 100% rename from WickedEngine/voxelSceneCopyClear_TemporalSmoothing.hlsl rename to WickedEngine/voxelSceneCopyClearCS_TemporalSmoothing.hlsl diff --git a/WickedEngine/wiHelper.cpp b/WickedEngine/wiHelper.cpp index 2540fe3a9..91b9ee6e3 100644 --- a/WickedEngine/wiHelper.cpp +++ b/WickedEngine/wiHelper.cpp @@ -349,7 +349,7 @@ namespace wiHelper file.read((char*)data.data(), dataSize); file.close(); return true; - } + } #else using namespace concurrency; using namespace Platform; diff --git a/WickedEngine/wiInput.cpp b/WickedEngine/wiInput.cpp index 87ec2e1a9..fef5491dc 100644 --- a/WickedEngine/wiInput.cpp +++ b/WickedEngine/wiInput.cpp @@ -77,10 +77,10 @@ namespace wiInput if (p->Properties->IsPrimary) { mouse.position = XMFLOAT2(p->Position.X, p->Position.Y); - mouse.left_button_press = p->Properties->IsLeftButtonPressed; mouse.middle_button_press = p->Properties->IsMiddleButtonPressed; mouse.right_button_press = p->Properties->IsRightButtonPressed; + mouse.pressure = p->Properties->Pressure; } Touch touch; @@ -97,6 +97,7 @@ namespace wiInput mouse.left_button_press = p->Properties->IsLeftButtonPressed; mouse.middle_button_press = p->Properties->IsMiddleButtonPressed; mouse.right_button_press = p->Properties->IsRightButtonPressed; + mouse.pressure = p->Properties->Pressure; } Touch touch; @@ -111,6 +112,7 @@ namespace wiInput if (p->Properties->IsPrimary) { mouse.position = XMFLOAT2(p->Position.X, p->Position.Y); + mouse.pressure = p->Properties->Pressure; } Touch touch; @@ -481,9 +483,9 @@ namespace wiInput GetCursorPos(&p); ScreenToClient(wiPlatform::GetWindow(), &p); const float dpiscaling = wiPlatform::GetDPIScaling(); - return XMFLOAT4((float)p.x / dpiscaling, (float)p.y / dpiscaling, mouse.delta_wheel, 0); + return XMFLOAT4((float)p.x / dpiscaling, (float)p.y / dpiscaling, mouse.delta_wheel, mouse.pressure); #else - return XMFLOAT4(mouse.position.x, mouse.position.y, mouse.delta_wheel, 0); + return XMFLOAT4(mouse.position.x, mouse.position.y, mouse.delta_wheel, mouse.pressure); #endif } void SetPointer(const XMFLOAT4& props) diff --git a/WickedEngine/wiInput.h b/WickedEngine/wiInput.h index ad5a506d0..6f76f9ad7 100644 --- a/WickedEngine/wiInput.h +++ b/WickedEngine/wiInput.h @@ -86,6 +86,7 @@ namespace wiInput XMFLOAT2 position = XMFLOAT2(0, 0); XMFLOAT2 delta_position = XMFLOAT2(0, 0); float delta_wheel = 0; + float pressure = 1.0f; bool left_button_press = false; bool middle_button_press = false; bool right_button_press = false; @@ -117,7 +118,7 @@ namespace wiInput bool Press(BUTTON button, int playerindex = 0); // check if a button is held down bool Hold(BUTTON button, uint32_t frames = 30, bool continuous = false, int playerIndex = 0); - // get pointer position (eg. mouse pointer) (.xy) + scroll delta (.z) + 1 unused (.w) + // get pointer position (eg. mouse pointer) (.xy) + scroll delta (.z) + pressure (.w) XMFLOAT4 GetPointer(); // set pointer position (eg. mouse pointer) void SetPointer(const XMFLOAT4& props); diff --git a/WickedEngine/wiRenderer.cpp b/WickedEngine/wiRenderer.cpp index ac0ec500e..63625f328 100644 --- a/WickedEngine/wiRenderer.cpp +++ b/WickedEngine/wiRenderer.cpp @@ -1308,7 +1308,7 @@ void LoadShaders() wiJobSystem::Execute(ctx, [] { LoadShader(CS, computeShaders[CSTYPE_TILEFRUSTUMS], "tileFrustumsCS.cso"); }); wiJobSystem::Execute(ctx, [] { LoadShader(CS, computeShaders[CSTYPE_RESOLVEMSAADEPTHSTENCIL], "resolveMSAADepthStencilCS.cso"); }); wiJobSystem::Execute(ctx, [] { LoadShader(CS, computeShaders[CSTYPE_VOXELSCENECOPYCLEAR], "voxelSceneCopyClearCS.cso"); }); - wiJobSystem::Execute(ctx, [] { LoadShader(CS, computeShaders[CSTYPE_VOXELSCENECOPYCLEAR_TEMPORALSMOOTHING], "voxelSceneCopyClear_TemporalSmoothing.cso"); }); + wiJobSystem::Execute(ctx, [] { LoadShader(CS, computeShaders[CSTYPE_VOXELSCENECOPYCLEAR_TEMPORALSMOOTHING], "voxelSceneCopyClearCS_TemporalSmoothing.cso"); }); wiJobSystem::Execute(ctx, [] { LoadShader(CS, computeShaders[CSTYPE_VOXELRADIANCESECONDARYBOUNCE], "voxelRadianceSecondaryBounceCS.cso"); }); wiJobSystem::Execute(ctx, [] { LoadShader(CS, computeShaders[CSTYPE_VOXELCLEARONLYNORMAL], "voxelClearOnlyNormalCS.cso"); }); wiJobSystem::Execute(ctx, [] { LoadShader(CS, computeShaders[CSTYPE_GENERATEMIPCHAIN2D_UNORM4], "generateMIPChain2DCS_unorm4.cso"); }); diff --git a/WickedEngine/wiVersion.cpp b/WickedEngine/wiVersion.cpp index d1283aa69..f9b64030e 100644 --- a/WickedEngine/wiVersion.cpp +++ b/WickedEngine/wiVersion.cpp @@ -7,9 +7,9 @@ namespace wiVersion // main engine core const int major = 0; // minor features, major updates - const int minor = 41; + const int minor = 42; // minor bug fixes, alterations, refactors, updates - const int revision = 14; + const int revision = 0; const std::string version_string = std::to_string(major) + "." + std::to_string(minor) + "." + std::to_string(revision); diff --git a/generate_shader_buildtask_hlsl6.py b/generate_shader_buildtask_hlsl6.py index 389357f5e..5f22372c2 100644 --- a/generate_shader_buildtask_hlsl6.py +++ b/generate_shader_buildtask_hlsl6.py @@ -1,7 +1,7 @@ import os import xml.etree.ElementTree as ET -tree = ET.parse('WickedEngine/WickedEngine_SHADERS.vcxproj') +tree = ET.parse('WickedEngine/WickedEngine_SHADERS.vcxitems') root = tree.getroot() ## Hardcode visual studio namespace for now... @@ -26,6 +26,7 @@ for shader in root.iter(namespace + "FxCompile"): profile = shaderprofile.text name = shader.attrib["Include"] + name = name.replace("$(MSBuildThisFileDirectory)", "") print(profile + ": " + name) @@ -52,6 +53,7 @@ for shader in root.iter(namespace + "FxCompile"): ## Append to error log: file.write(" 2>>../build_HLSL6_errors.log \n") + break file.write("cd .. \n") diff --git a/generate_shader_buildtask_spirv.py b/generate_shader_buildtask_spirv.py index 94e7edbc9..ed71f9051 100644 --- a/generate_shader_buildtask_spirv.py +++ b/generate_shader_buildtask_spirv.py @@ -1,7 +1,7 @@ import os import xml.etree.ElementTree as ET -tree = ET.parse('WickedEngine/WickedEngine_SHADERS.vcxproj') +tree = ET.parse('WickedEngine/WickedEngine_SHADERS.vcxitems') root = tree.getroot() ## Hardcode visual studio namespace for now... @@ -26,6 +26,7 @@ for shader in root.iter(namespace + "FxCompile"): profile = shaderprofile.text name = shader.attrib["Include"] + name = name.replace("$(MSBuildThisFileDirectory)", "") print(profile + ": " + name) @@ -65,6 +66,7 @@ for shader in root.iter(namespace + "FxCompile"): ## Append to error log: file.write(" 2>>../build_SPIRV_errors.log \n") + break file.write("cd .. \n")