From 8c5c878e1dfc990655c148d84effe7691ad89aab Mon Sep 17 00:00:00 2001 From: spatialfree Date: Fri, 24 Dec 2021 20:59:25 -0500 Subject: [PATCH] fix batch file --- Niko.bat | 2 +- add/oriel.hlsl | 9 ++++----- 2 files changed, 5 insertions(+), 6 deletions(-) diff --git a/Niko.bat b/Niko.bat index f45e1ee..6e764cd 100644 --- a/Niko.bat +++ b/Niko.bat @@ -1,3 +1,3 @@ git fetch git pull -oriels.bat \ No newline at end of file +Micro.bat \ No newline at end of file diff --git a/add/oriel.hlsl b/add/oriel.hlsl index 3773331..eba5a93 100644 --- a/add/oriel.hlsl +++ b/add/oriel.hlsl @@ -177,8 +177,8 @@ psOut ps(psIn input) { float3 ro = input.campos; // ray origin float3 rd = normalize(input.world - ro); // ray direction - float oriel = oriel(ro, rd); - ro += oriel * rd; + float ol = oriel(ro, rd); + ro += ol * rd; float dist = raymarch(ro, rd); // float dist = raymarch(ro, rd); @@ -211,8 +211,8 @@ psOut ps(psIn input) { } // input.color = float4(col, 1); - - // if (input.world.x > 0.0) { + + // if (input.world.y > (_center.y + _dimensions.y / 2.0 ) - 0.0666) { // col = float3(1 - col.r, 1 - col.g, 1 - col.b); // } result.color = float4(col, 1); @@ -230,6 +230,5 @@ psOut ps(psIn input) { // result.depth = zc/wc; // result.color.rgb = float3(zc/wc); - return result; } \ No newline at end of file