Model tweaks

- Made the position of the rotated cube in the center of the light bridge emitter consistent across states - Enabled AO for gels because they had them disabled for some reason - Removed an old light bridge emitter model
Fusion-Flux · Jun 28, 2023 · bad6093 · bad6093
1 parent a28285c
commit bad6093
Show file tree

Hide file tree

Showing 14 changed files with 27 additions and 150 deletions.
diff --git a/src/main/resources/assets/portalcubed/models/block/adhesion_gel.json b/src/main/resources/assets/portalcubed/models/block/adhesion_gel.json
@@ -1,5 +1,4 @@
 {
-	"ambientocclusion": false,
 	"textures": {
 		"particle": "portalcubed:block/adhesion_gel",
 		"adhesion_gel": "portalcubed:block/adhesion_gel"

diff --git a/src/main/resources/assets/portalcubed/models/block/conversion_gel.json b/src/main/resources/assets/portalcubed/models/block/conversion_gel.json
@@ -1,5 +1,4 @@
 {
-	"ambientocclusion": false,
 	"textures": {
 		"particle": "portalcubed:block/conversion_gel",
 		"conversion_gel": "portalcubed:block/conversion_gel"

diff --git a/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_active.json b/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_active.json
diff --git a/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_down_edge_off.json b/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_down_edge_off.json
@@ -52,9 +52,9 @@
 		},
 		{
 			"name": "emission",
-			"from": [2, 1.5, 13.2],
-			"to": [14, 2.5, 14.2],
-			"rotation": {"angle": 45, "axis": "x", "origin": [2.5, 2, 13.7]},
+			"from": [2.075, 1.5, 13.15711],
+			"to": [14.075, 2.5, 14.15711],
+			"rotation": {"angle": 45, "axis": "x", "origin": [2.575, 2, 13.65711]},
 			"faces": {
 				"north": {"uv": [10.016, 15.516, 15.984, 15.984], "texture": "#0"},
 				"south": {"uv": [10.016, 15.516, 15.984, 15.984], "texture": "#0"},

diff --git a/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_down_edge_on.json b/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_down_edge_on.json
@@ -53,9 +53,9 @@
 		},
 		{
 			"name": "emission",
-			"from": [2, 1.5, 13.2],
-			"to": [14, 2.5, 14.2],
-			"rotation": {"angle": 45, "axis": "x", "origin": [2.5, 2, 13.7]},
+			"from": [2.075, 1.5, 13.15711],
+			"to": [14.075, 2.5, 14.15711],
+			"rotation": {"angle": 45, "axis": "x", "origin": [2.575, 2, 13.65711]},
 			"faces": {
 				"north": {"uv": [10.016, 15.516, 15.984, 15.984], "texture": "#5"},
 				"south": {"uv": [10.016, 15.516, 15.984, 15.984], "texture": "#0"},

diff --git a/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_left_edge_off.json b/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_left_edge_off.json
@@ -22,7 +22,7 @@
 		{
 			"name": "cube inverted",
 			"from": [4.0375, 14.0375, 15.95],
-			"to": [0.0375, 1.9125, 12.95],
+			"to": [0.0375, 2.0125, 12.95],
 			"rotation": {"angle": 0, "axis": "z", "origin": [-3.9625, 14, 14.20269]},
 			"faces": {
 				"north": {"uv": [2.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"},
@@ -52,9 +52,9 @@
 		},
 		{
 			"name": "emission",
-			"from": [1.64295, 1.9625, 13.34723],
-			"to": [2.64295, 13.9625, 14.34723],
-			"rotation": {"angle": 45, "axis": "y", "origin": [2.14295, 7.9625, 13.84723]},
+			"from": [1.5375, 2.0375, 13.15711],
+			"to": [2.5375, 14.0375, 14.15711],
+			"rotation": {"angle": 45, "axis": "y", "origin": [2.0375, 8.0375, 13.65711]},
 			"faces": {
 				"north": {"uv": [10.016, 15.516, 15.984, 15.984], "rotation": 90, "texture": "#0"},
 				"east": {"uv": [10.016, 15.516, 15.984, 15.984], "rotation": 270, "texture": "#0"},

diff --git a/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_left_edge_on.json b/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_left_edge_on.json
@@ -53,9 +53,9 @@
 		},
 		{
 			"name": "emission",
-			"from": [1.51795, 1.9625, 13.09723],
-			"to": [2.51795, 13.9625, 14.09723],
-			"rotation": {"angle": 45, "axis": "y", "origin": [2.01795, 7.9625, 13.59723]},
+			"from": [1.5375, 2.0375, 13.15711],
+			"to": [2.5375, 14.0375, 14.15711],
+			"rotation": {"angle": 45, "axis": "y", "origin": [2.0375, 8.0375, 13.65711]},
 			"faces": {
 				"north": {"uv": [10.016, 15.516, 15.984, 15.984], "rotation": 90, "texture": "#3"},
 				"east": {"uv": [10.016, 15.516, 15.984, 15.984], "rotation": 270, "texture": "#3"},

diff --git a/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_right_edge_off.json b/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_right_edge_off.json
@@ -22,7 +22,7 @@
 		{
 			"name": "cube inverted",
 			"from": [16.0375, 14.0375, 15.95],
-			"to": [12.0375, 1.9125, 12.95],
+			"to": [12.0375, 2.0125, 12.95],
 			"rotation": {"angle": 0, "axis": "z", "origin": [8.0375, 14, 14.20269]},
 			"faces": {
 				"north": {"uv": [2.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"},
@@ -52,9 +52,9 @@
 		},
 		{
 			"name": "emission",
-			"from": [13.64295, 1.9625, 13.34723],
-			"to": [14.64295, 13.9625, 14.34723],
-			"rotation": {"angle": 45, "axis": "y", "origin": [14.14295, 7.9625, 13.84723]},
+			"from": [13.5375, 2.0375, 13.15711],
+			"to": [14.5375, 14.0375, 14.15711],
+			"rotation": {"angle": 45, "axis": "y", "origin": [14.0375, 8.0375, 13.65711]},
 			"faces": {
 				"north": {"uv": [10.016, 15.516, 15.984, 15.984], "rotation": 90, "texture": "#0"},
 				"east": {"uv": [10.016, 15.516, 15.984, 15.984], "rotation": 270, "texture": "#0"},

diff --git a/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_right_edge_on.json b/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_right_edge_on.json
@@ -23,7 +23,7 @@
 		{
 			"name": "cube inverted",
 			"from": [16.0375, 14.0375, 15.95],
-			"to": [12.0375, 1.9125, 12.95],
+			"to": [12.0375, 2.0125, 12.95],
 			"rotation": {"angle": 0, "axis": "z", "origin": [8.0375, 14, 14.20269]},
 			"faces": {
 				"north": {"uv": [2.516, 4.984, 8.484, 3.016], "rotation": 90, "texture": "#0"},
@@ -53,9 +53,9 @@
 		},
 		{
 			"name": "emission",
-			"from": [13.49295, 1.9625, 13.09723],
-			"to": [14.49295, 13.9625, 14.09723],
-			"rotation": {"angle": 45, "axis": "y", "origin": [13.99295, 7.9625, 13.59723]},
+			"from": [13.5375, 2.0375, 13.15711],
+			"to": [14.5375, 14.0375, 14.15711],
+			"rotation": {"angle": 45, "axis": "y", "origin": [14.0375, 8.0375, 13.65711]},
 			"faces": {
 				"north": {"uv": [10.016, 15.516, 15.984, 15.984], "rotation": 90, "texture": "#2"},
 				"east": {"uv": [10.016, 15.516, 15.984, 15.984], "rotation": 270, "texture": "#2"},

diff --git a/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_up_edge_off.json b/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_up_edge_off.json
@@ -52,9 +52,9 @@
 		},
 		{
 			"name": "emission",
-			"from": [2, 13.5, 13.2],
-			"to": [14, 14.5, 14.2],
-			"rotation": {"angle": 45, "axis": "x", "origin": [2.5, 14, 13.7]},
+			"from": [2.075, 13.5, 13.15711],
+			"to": [14.075, 14.5, 14.15711],
+			"rotation": {"angle": 45, "axis": "x", "origin": [7.575, 14, 13.65711]},
 			"faces": {
 				"north": {"uv": [10.016, 15.516, 15.984, 15.984], "texture": "#0"},
 				"south": {"uv": [10.016, 15.516, 15.984, 15.984], "texture": "#0"},

diff --git a/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_up_edge_on.json b/src/main/resources/assets/portalcubed/models/block/light_bridge_emitter_up_edge_on.json
@@ -54,9 +54,9 @@
 		},
 		{
 			"name": "emission",
-			"from": [2, 13.5, 13.2],
-			"to": [14, 14.5, 14.2],
-			"rotation": {"angle": 45, "axis": "x", "origin": [2.5, 14, 13.7]},
+			"from": [2.075, 13.5, 13.15711],
+			"to": [14.075, 14.5, 14.15711],
+			"rotation": {"angle": 45, "axis": "x", "origin": [2.575, 14, 13.65711]},
 			"faces": {
 				"north": {"uv": [10.016, 15.516, 15.984, 15.984], "texture": "#3"},
 				"south": {"uv": [10.016, 15.516, 15.984, 15.984], "texture": "#3"},

diff --git a/src/main/resources/assets/portalcubed/models/block/propulsion_gel.json b/src/main/resources/assets/portalcubed/models/block/propulsion_gel.json
@@ -1,5 +1,4 @@
 {
-	"ambientocclusion": false,
 	"textures": {
 		"particle": "portalcubed:block/propulsion_gel",
 		"propulsion_gel": "portalcubed:block/propulsion_gel"

diff --git a/src/main/resources/assets/portalcubed/models/block/reflection_gel.json b/src/main/resources/assets/portalcubed/models/block/reflection_gel.json
@@ -1,5 +1,4 @@
 {
-	"ambientocclusion": false,
 	"textures": {
 		"particle": "portalcubed:block/reflection_gel",
 		"reflection_gel": "portalcubed:block/reflection_gel"

diff --git a/src/main/resources/assets/portalcubed/models/block/repulsion_gel.json b/src/main/resources/assets/portalcubed/models/block/repulsion_gel.json
@@ -1,5 +1,4 @@
 {
-	"ambientocclusion": false,
 	"textures": {
 		"particle": "portalcubed:block/repulsion_gel",
 		"repulsion_gel": "portalcubed:block/repulsion_gel"