there's your problem
This commit is contained in:
parent
5dea3f77d7
commit
ebf298a559
3 changed files with 16 additions and 13 deletions
|
@ -126,19 +126,18 @@ float map(float3 pos) {
|
|||
// pos.x = _center.x + pos.x;
|
||||
// pos.y = _center.y + pos.y;
|
||||
// pos.z = _center.z - pos.z;
|
||||
// float sphere = sdSphere(pos + float3(0, 0.5, 0) - _center, 0.1);
|
||||
float sphere = sdSphere(pos + float3(0, 0, -1) - _center, 0.1);
|
||||
// return sdLink(pos, 0.1, 0.1, 0.1);
|
||||
// float octo = sdOctahedron(pos - _center - position, 0.2);
|
||||
float frame = sdBoxFrame(pos - _center - position, float3(0.06, 0.06, 0.06), 0.004);
|
||||
|
||||
float orielFrame = sdBoxFrame(pos - _center, _dimensions / 2, 0.004);
|
||||
// return lerp(sphere, octo, windStrength);
|
||||
|
||||
float plane = sdPlane(pos - _center + float3(0, 1.5, 0), float3(0, 1, 0), 0);
|
||||
float plane = sdPlane(pos - _center + float3(0, 0.5, 0), float3(0, 1, 0), 0);
|
||||
|
||||
// float blendd = lerp(octo, frame, windStrength);
|
||||
// return min(min(plane, orielFrame), frame);
|
||||
return min(plane, orielFrame);
|
||||
return min(min(plane, orielFrame), sphere);
|
||||
|
||||
// return opRep(pos - _center, float3(0, 0, 0));
|
||||
}
|
||||
|
|
20
Program.cs
20
Program.cs
|
@ -665,14 +665,18 @@ public class Oriel {
|
|||
|
||||
|
||||
// crown.SetVector("_center", bounds.center);
|
||||
crown.SetFloat("_height", bounds.dimensions.y);
|
||||
crown.SetFloat("_ypos", bounds.center.y);
|
||||
crown.FaceCull = Cull.Front;
|
||||
crown.Transparency = Transparency.Add;
|
||||
crown.DepthTest = DepthTest.Always;
|
||||
// crown.QueueOffset = 0;
|
||||
// crown.DepthWrite = false;
|
||||
mesh.Draw(crown, Matrix.TRS(bounds.center, Quat.Identity, bounds.dimensions));
|
||||
|
||||
|
||||
// crown.SetFloat("_height", bounds.dimensions.y);
|
||||
// crown.SetFloat("_ypos", bounds.center.y);
|
||||
// crown.FaceCull = Cull.Front;
|
||||
// crown.Transparency = Transparency.Add;
|
||||
// crown.DepthTest = DepthTest.Always;
|
||||
|
||||
// // crown.QueueOffset = 0;
|
||||
// // crown.DepthWrite = false;
|
||||
|
||||
// mesh.Draw(crown, Matrix.TRS(bounds.center, Quat.Identity, bounds.dimensions));
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -4,5 +4,5 @@ cd bin/Debug
|
|||
@REM echo "zipping into dofdev site"
|
||||
@REM 7z u oriels.zip %cd%/netcoreapp3.1
|
||||
@REM Xcopy "oriels.zip" "C:/dofdev/Web Development/dofdev/res/oriels.zip" /F /Y
|
||||
cd netcoreapp3.1
|
||||
cd netcoreapp6.0
|
||||
oriels.exe
|
Loading…
Add table
Reference in a new issue