sid
/
NazaraEngine
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Minor fixes

This commit is contained in:
Jérôme Leclercq 2021-12-23 17:39:37 +01:00
parent b53d2a0560
commit d4dfe97006
5 changed files with 12 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
bin/resources/god_rays.nzsl
View File

@ -19,7 +19,7 @@ struct Settings
decay: f32, decay: f32,
density: f32, density: f32,
weight: f32, weight: f32,
lightPosition: vec2<f32>, //< Switch to world position lightPosition: vec2<f32>, //< TODO: Switch to world position
} }
const SampleCount: i32 = 200; const SampleCount: i32 = 200;

5
bin/resources/skybox.nzsl
View File

@ -51,10 +51,7 @@ fn main(input: VertIn) -> VertOut
{ {
// Set translation part to zero // Set translation part to zero
let rotationMat = viewerData.viewMatrix; let rotationMat = viewerData.viewMatrix;
// rotationMat[3].xyz = vec3<f32>(0.0, 0.0, 0.0); // Requires SPIRV generator to handle swizzle for store expressions rotationMat[3].xyz = vec3<f32>(0.0, 0.0, 0.0);
rotationMat[3][0] = 0.0;
rotationMat[3][1] = 0.0;
rotationMat[3][2] = 0.0;
let output: VertOut; let output: VertOut;
output.position = viewerData.projectionMatrix * rotationMat * vec4<f32>(input.position, 1.0); output.position = viewerData.projectionMatrix * rotationMat * vec4<f32>(input.position, 1.0);

2
src/Nazara/Shader/SpirvConstantCache.cpp
View File

@ -570,12 +570,14 @@ namespace Nz
case ImageType::E1D_Array: case ImageType::E1D_Array:
imageType.arrayed = true; imageType.arrayed = true;
[[fallthrough]];
case ImageType::E1D: case ImageType::E1D:
imageType.dim = SpirvDim::Dim1D; imageType.dim = SpirvDim::Dim1D;
break; break;
case ImageType::E2D_Array: case ImageType::E2D_Array:
imageType.arrayed = true; imageType.arrayed = true;
[[fallthrough]];
case ImageType::E2D: case ImageType::E2D:
imageType.dim = SpirvDim::Dim2D; imageType.dim = SpirvDim::Dim2D;
break; break;

7
xmake-repo/packages/q/qt5base/xmake.lua
View File

@ -43,7 +43,12 @@ package("qt5base")
end) end)
on_install("windows", "linux", "macosx", "mingw", "android", "iphoneos", function (package) on_install("windows", "linux", "macosx", "mingw", "android", "iphoneos", function (package)
os.vrunv("python", {"-m", "ensurepip"}) -- ensurepip is dropped in recent releases
try
{
function () os.vrunv("python", {"-m", "ensurepip"}) end
}
os.vrunv("python", {"-m", "pip", "install", "-U", "pip"}) os.vrunv("python", {"-m", "pip", "install", "-U", "pip"})
os.vrunv("python", {"-m", "pip", "install", "aqtinstall"}) os.vrunv("python", {"-m", "pip", "install", "aqtinstall"})

4
xmake.lua
View File

@ -229,10 +229,10 @@ rule("build_rendererplugins")
on_load(function (target) on_load(function (target)
local deps = table.wrap(target:get("deps")) local deps = table.wrap(target:get("deps"))
if target:kind() == "binary" and (table.find_first(deps, "NazaraRenderer") or table.find_first(deps, "NazaraGraphics")) then if target:kind() == "binary" and (table.contains(deps, "NazaraRenderer") or table.contains(deps, "NazaraGraphics")) then
for name, _ in pairs(modules) do for name, _ in pairs(modules) do
local depName = "Nazara" .. name local depName = "Nazara" .. name
if name:match("^.+Renderer$") and table.find_first(deps, depName) == nil then -- don't overwrite dependency if name:match("^.+Renderer$") and table.contains(deps, depName) == nil then -- don't overwrite dependency
target:add("deps", depName, {inherit = false}) target:add("deps", depName, {inherit = false})
end end
end end