diff --git a/OrthographicShaderRP/assets/minecraft/blockstates/bedrock.json b/OrthographicShaderRP/assets/minecraft/blockstates/bedrock.json deleted file mode 100644 index b59ed82..0000000 --- a/OrthographicShaderRP/assets/minecraft/blockstates/bedrock.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "minecraft:block/bedrock" - } - ] - } -} \ No newline at end of file diff --git a/OrthographicShaderRP/assets/minecraft/blockstates/deepslate.json b/OrthographicShaderRP/assets/minecraft/blockstates/deepslate.json deleted file mode 100644 index 35e65ad..0000000 --- a/OrthographicShaderRP/assets/minecraft/blockstates/deepslate.json +++ /dev/null @@ -1,51 +0,0 @@ -{ - "variants": { - "axis=x": [ - { - "model": "minecraft:block/deepslate", - "x": 90, - "y": 90 - }, - { - "model": "minecraft:block/deepslate_mirrored", - "x": 90, - "y": 90 - }, - { - "model": "minecraft:block/deepslate", - "y": 90, - "x": 90 - }, - { - "model": "minecraft:block/deepslate_mirrored", - "y": 90, - "x": 90 - } - ], - "axis=y": [ - { - "model": "minecraft:block/deepslate" - } - ], - "axis=z": [ - { - "model": "minecraft:block/deepslate", - "x": 90 - }, - { - "model": "minecraft:block/deepslate_mirrored", - "x": 90 - }, - { - "model": "minecraft:block/deepslate", - "y": 180, - "x": 90 - }, - { - "model": "minecraft:block/deepslate_mirrored", - "y": 180, - "x": 90 - } - ] - } -} \ No newline at end of file diff --git a/OrthographicShaderRP/assets/minecraft/blockstates/dirt.json b/OrthographicShaderRP/assets/minecraft/blockstates/dirt.json deleted file mode 100644 index b4c73f8..0000000 --- a/OrthographicShaderRP/assets/minecraft/blockstates/dirt.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "minecraft:block/dirt" - } - ] - } -} \ No newline at end of file diff --git a/OrthographicShaderRP/assets/minecraft/blockstates/dirt_path.json b/OrthographicShaderRP/assets/minecraft/blockstates/dirt_path.json deleted file mode 100644 index fe1cfad..0000000 --- a/OrthographicShaderRP/assets/minecraft/blockstates/dirt_path.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "minecraft:block/dirt_path" - } - ] - } -} \ No newline at end of file diff --git a/OrthographicShaderRP/assets/minecraft/blockstates/grass_block.json b/OrthographicShaderRP/assets/minecraft/blockstates/grass_block.json deleted file mode 100644 index d249c3a..0000000 --- a/OrthographicShaderRP/assets/minecraft/blockstates/grass_block.json +++ /dev/null @@ -1,10 +0,0 @@ -{ - "variants": { - "snowy=false": { - "model": "minecraft:block/grass_block" - }, - "snowy=true": { - "model": "minecraft:block/grass_block_snow" - } - } -} \ No newline at end of file diff --git a/OrthographicShaderRP/assets/minecraft/blockstates/infested_stone.json b/OrthographicShaderRP/assets/minecraft/blockstates/infested_stone.json deleted file mode 100644 index 0a50cb2..0000000 --- a/OrthographicShaderRP/assets/minecraft/blockstates/infested_stone.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "minecraft:block/stone" - } - ] - } -} \ No newline at end of file diff --git a/OrthographicShaderRP/assets/minecraft/blockstates/netherrack.json b/OrthographicShaderRP/assets/minecraft/blockstates/netherrack.json deleted file mode 100644 index ba04c48..0000000 --- a/OrthographicShaderRP/assets/minecraft/blockstates/netherrack.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "minecraft:block/netherrack" - } - ] - } -} \ No newline at end of file diff --git a/OrthographicShaderRP/assets/minecraft/blockstates/podzol.json b/OrthographicShaderRP/assets/minecraft/blockstates/podzol.json deleted file mode 100644 index dc33475..0000000 --- a/OrthographicShaderRP/assets/minecraft/blockstates/podzol.json +++ /dev/null @@ -1,12 +0,0 @@ -{ - "variants": { - "snowy=false": [ - { - "model": "minecraft:block/podzol" - } - ], - "snowy=true": { - "model": "minecraft:block/grass_block_snow" - } - } -} \ No newline at end of file diff --git a/OrthographicShaderRP/assets/minecraft/blockstates/sand.json b/OrthographicShaderRP/assets/minecraft/blockstates/sand.json deleted file mode 100644 index 40bc8d7..0000000 --- a/OrthographicShaderRP/assets/minecraft/blockstates/sand.json +++ /dev/null @@ -1,9 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "minecraft:block/sand" - } - ] - } -} \ No newline at end of file diff --git a/OrthographicShaderRP/assets/minecraft/blockstates/stone.json b/OrthographicShaderRP/assets/minecraft/blockstates/stone.json deleted file mode 100644 index 49abfe3..0000000 --- a/OrthographicShaderRP/assets/minecraft/blockstates/stone.json +++ /dev/null @@ -1,18 +0,0 @@ -{ - "variants": { - "": [ - { - "model": "minecraft:block/stone" - }, - { - "model": "minecraft:block/stone" - }, - { - "model": "minecraft:block/stone" - }, - { - "model": "minecraft:block/stone" - } - ] - } -} \ No newline at end of file diff --git a/OrthographicShaderRP/assets/minecraft/shaders/include/vsh_util.glsl b/OrthographicShaderRP/assets/minecraft/shaders/include/vsh_util.glsl index b043550..d4c7d9a 100644 --- a/OrthographicShaderRP/assets/minecraft/shaders/include/vsh_util.glsl +++ b/OrthographicShaderRP/assets/minecraft/shaders/include/vsh_util.glsl @@ -6,6 +6,14 @@ #define LIGHT0_DIRECTION vec3(0.2, 1.0, -0.7) // Default light 0 direction everywhere except in inventory #define LIGHT1_DIRECTION vec3(-0.2, 1.0, 0.7) // Default light 1 direction everywhere except in nether and inventory +/* + * Returns the FOV in degrees + * Calculates using the fact that top/near = tan(theta / 2) + */ +float getFOV(mat4 ProjMat) { + return atan(1.0, ProjMat[1][1]) * 114.591559; +} + /* * Returns if rendering in a GUI * In the GUI, near is 1000 and far is 3000, so -(far+near)/(far-near) = -2.0