dofdev/oriels
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

shaders restored! ty StereoNick ^-^

Browse source
This commit is contained in:
ethan merchant 2023-05-26 13:05:56 -04:00
parent ee48b97794
commit e7dcffd575
7 changed files with 18 additions and 36 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
oriels.csproj
View file

@ -3,6 +3,8 @@
<PropertyGroup>
<OutputType>Exe</OutputType>
<TargetFramework>net6.0</TargetFramework>
<SKAssetFolder>add</SKAssetFolder>
<SKAssetDestination>add</SKAssetDestination>
</PropertyGroup>
<ItemGroup>
@ -16,24 +18,4 @@
</None>
</ItemGroup>
<ItemGroup>
<None Remove="add/shaders/oriel.hlsl" />
<None Remove="add/shaders/colorcube.hlsl" />
<None Remove="add/shaders/panes.hlsl" />
<None Remove="add/shaders/frame.hlsl" />
<None Remove="add/shaders/room.hlsl" />
<None Remove="add/shaders/above.hlsl" />
<None Remove="add/shaders/below.hlsl" />
</ItemGroup>
<ItemGroup>
<SKShader Include="add/shaders/oriel.hlsl" />
<SKShader Include="add/shaders/colorcube.hlsl" />
<SKShader Include="add/shaders/panes.hlsl" />
<SKShader Include="add/shaders/frame.hlsl" />
<SKShader Include="add/shaders/room.hlsl" />
<SKShader Include="add/shaders/above.hlsl" />
<SKShader Include="add/shaders/below.hlsl" />
</ItemGroup>
</Project>

10
src/Backrooms/Mono.cs
View file

@ -20,27 +20,27 @@ public class Mono {
thing = new Thing[] {
new Thing(
model.GetMesh("Carpet"),
new Material(Shader.FromFile("shaders/oriel.hlsl")),
new Material(Shader.FromFile("oriel.hlsl")),
"backrooms/Carpet.png"
),
new Thing(
model.GetMesh("Walls"),
new Material(Shader.FromFile("shaders/oriel.hlsl")),
new Material(Shader.FromFile("oriel.hlsl")),
"backrooms/Walls.png"
),
new Thing(
model.GetMesh("Ceiling"),
new Material(Shader.FromFile("shaders/oriel.hlsl")),
new Material(Shader.FromFile("oriel.hlsl")),
"backrooms/Ceiling.png"
),
new Thing(
model.GetMesh("Vents"),
new Material(Shader.FromFile("shaders/oriel.hlsl")),
new Material(Shader.FromFile("oriel.hlsl")),
"backrooms/Vents.png"
),
new Thing(
model.GetMesh("Lights"),
new Material(Shader.FromFile("shaders/oriel.hlsl")),
new Material(Shader.FromFile("oriel.hlsl")),
"backrooms/Lights.png"
),
};

2
src/Greenyard/Mono.cs
View file

@ -10,7 +10,7 @@ public class Mono {
Model greenyardModel = Model.FromFile("greenyard.glb");
Mesh[] greenyard;
Material greenyardMat = new Material(Shader.FromFile("/shaders/oriel.hlsl"));
Material greenyardMat = new Material(Shader.FromFile("/oriel.hlsl"));
Matrix matrix = Matrix.Identity;
Vec3 offset = new Vec3(2, 1, -12);

8
src/Mono.cs
View file

@ -7,10 +7,10 @@ public class Mono {
public PullRequest.Noise noise = new PullRequest.Noise(939949595);
public Material matDev;
public Material matHoloframe = new Material(Shader.FromFile("shaders/above.hlsl"));
Material matHoloframeUnder = new Material(Shader.FromFile("shaders/below.hlsl"));
public Material matHolo = new Material(Shader.FromFile("shaders/above.hlsl"));
Material matHoloUnder = new Material(Shader.FromFile("shaders/below.hlsl"));
public Material matHoloframe = new Material(Shader.FromFile("above.hlsl"));
Material matHoloframeUnder = new Material(Shader.FromFile("below.hlsl"));
public Material matHolo = new Material(Shader.FromFile("above.hlsl"));
Material matHoloUnder = new Material(Shader.FromFile("below.hlsl"));
public Rig rig = new Rig();
public Space space = new Space();

4
src/Space.cs
View file

@ -13,8 +13,8 @@ public class Space {
BufferData data = new BufferData();
Material matFloor = new Material(Shader.Default);
Model shed = Model.FromFile("shed/shed.glb", Shader.FromFile("shaders/room.hlsl"));
Model leek = Model.FromFile("houseleek_plant.glb", Shader.FromFile("shaders/room.hlsl"));
Model shed = Model.FromFile("shed/shed.glb", Shader.FromFile("room.hlsl"));
Model leek = Model.FromFile("houseleek_plant.glb", Shader.FromFile("room.hlsl"));
Mesh cube = Mesh.Cube;
Solid floor;

2
src/Space/Mono.cs
View file

@ -28,7 +28,7 @@ public class Mono {
Mesh meshCube;
// Model skyboxModel = Model.FromFile("fantasy_skybox.glb");
// Mesh skybox;
// Material skyboxMat = new Material(Shader.FromFile("/shaders/oriel.hlsl"));
// Material skyboxMat = new Material(Shader.FromFile("/oriel.hlsl"));
public Mono() {

6
src/dofs/oriel/Oriel.cs
View file

@ -3,9 +3,9 @@ namespace Oriels;
public class Oriel {
Material matClear = new Material(Shader.Default);
public Material matOriel = new Material(Shader.FromFile("shaders/oriel.hlsl"));
Material matFrame = new Material(Shader.FromFile("shaders/frame.hlsl"));
Material matPanes = new Material(Shader.FromFile("shaders/panes.hlsl"));
public Material matOriel = new Material(Shader.FromFile("oriel.hlsl"));
Material matFrame = new Material(Shader.FromFile("frame.hlsl"));
Material matPanes = new Material(Shader.FromFile("panes.hlsl"));
public Matrix matrix, matrixInv;
public Bounds bounds;