Skip to content

Commit

Permalink
More model stuff
Browse files Browse the repository at this point in the history 
- Optimized the legacy portal gun models/textures
- Unified the dyeable bits of all portal guns to 1 texture
- Added the Mel portal gun skin
- Added the Reloaded portal gun skins
- Fixed some misplaced model overrides
- Fixed z fighting on laser emitters/catchers
  • Loading branch information
@Cart3r1234
Cart3r1234 committed Jul 10, 2023
1 parent 40e7ae1 commit 25a9da4
Show file tree
Hide file tree
Showing 23 changed files with 851 additions and 143 deletions.
29 changes: 11 additions & 18 deletions src/main/resources/assets/portalcubed/models/block/laser_catcher.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -18,13 +18,12 @@
"south": {"uv": [4.508, 0.008, 6.992, 3.992], "rotation": 90, "texture": "#0"},
"west": {"uv": [6.992, 7.992, 4.508, 4.008], "rotation": 90, "texture": "#0"},
"down": {"uv": [0.008, 0.008, 3.992, 3.992], "rotation": 90, "texture": "#0"}
},
"portalcubed:render_type": "cutout"
}
},
{
"name": "translucent",
"from": [0, 16, 0],
"to": [16, 17, 16],
"from": [-0.01, 15.99, -0.01],
"to": [16.01, 17.01, 16.01],
"rotation": {"angle": 0, "axis": "y", "origin": [16, 23, 0]},
"faces": {
"north": {"uv": [0.008, 15.008, 15.992, 15.992], "texture": "#2"},
Expand All @@ -44,13 +43,12 @@
}
},
{
"from": [0, 17.025, 0],
"to": [16, 17.025, 16],
"from": [-0.01, 17.015, -0.01],
"to": [16.01, 17.035, 16.01],
"rotation": {"angle": 0, "axis": "y", "origin": [16, 23, 0]},
"faces": {
"up": {"uv": [8, 8, 12, 12], "rotation": 90, "texture": "#1"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [0, 0, 0],
Expand All @@ -62,8 +60,7 @@
"south": {"uv": [0, 0, 16, 16], "texture": "#2", "cullface": "south"},
"west": {"uv": [0, 0, 16, 16], "texture": "#2", "cullface": "west"},
"down": {"uv": [0.008, 0.008, 4.008, 4.008], "rotation": 180, "texture": "#0", "cullface": "down"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [4.25, 17, 4],
Expand All @@ -75,8 +72,7 @@
"south": {"uv": [9.992, 3.492, 9.758, 1.758], "rotation": 90, "texture": "#0"},
"west": {"uv": [9.992, 3.492, 9.758, 1.758], "rotation": 90, "texture": "#0"},
"up": {"uv": [8.008, 1.758, 9.742, 3.492], "rotation": 90, "texture": "#0"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [7.75, 18, 7],
Expand All @@ -85,8 +81,7 @@
"faces": {
"east": {"uv": [8.508, 2.758, 8.258, 2.508], "rotation": 90, "texture": "#0"},
"west": {"uv": [8.508, 2.758, 8.258, 2.508], "rotation": 90, "texture": "#0"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [7.45711, 18, 8],
Expand All @@ -95,8 +90,7 @@
"faces": {
"north": {"uv": [8.508, 2.758, 8.258, 2.508], "rotation": 90, "texture": "#0"},
"south": {"uv": [8.508, 2.758, 8.258, 2.508], "rotation": 90, "texture": "#0"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [8.41789, 6.95711, 6.175],
Expand All @@ -107,8 +101,7 @@
"east": {"uv": [6.758, 6.008, 9.258, 7.008], "rotation": 90, "texture": "#0"},
"south": {"uv": [6.758, 5.008, 9.258, 6.008], "rotation": 90, "texture": "#0"},
"west": {"uv": [6.758, 6.258, 9.258, 7.258], "rotation": 90, "texture": "#0"}
},
"portalcubed:render_type": "cutout"
}
}
],
"display": {
Expand Down
29 changes: 11 additions & 18 deletions src/main/resources/assets/portalcubed/models/block/laser_catcher_active.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -19,13 +19,12 @@
"south": {"uv": [4.508, 0.008, 6.992, 3.992], "rotation": 90, "texture": "#0"},
"west": {"uv": [6.992, 7.992, 4.508, 4.008], "rotation": 90, "texture": "#0"},
"down": {"uv": [0.008, 0.008, 3.992, 3.992], "rotation": 90, "texture": "#0"}
},
"portalcubed:render_type": "cutout"
}
},
{
"name": "translucent",
"from": [0, 16, 0],
"to": [16, 17, 16],
"from": [-0.01, 15.99, -0.01],
"to": [16.01, 17.01, 16.01],
"rotation": {"angle": 0, "axis": "y", "origin": [16.04289, 22.95711, 0]},
"faces": {
"north": {"uv": [0.008, 15.008, 15.992, 15.992], "texture": "#2"},
Expand Down Expand Up @@ -54,8 +53,7 @@
"south": {"uv": [7, 6.984, 7.984, 0], "rotation": 90, "texture": "#3"},
"west": {"uv": [7.984, 6.984, 7, 0], "rotation": 90, "texture": "#3"},
"up": {"uv": [6.992, 0, 0.008, 6.984], "texture": "#3"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [8.41789, 6.95711, 6.175],
Expand All @@ -66,8 +64,7 @@
"east": {"uv": [6.758, 6.008, 9.258, 7.008], "rotation": 90, "texture": "#0"},
"south": {"uv": [6.758, 5.008, 9.258, 6.008], "rotation": 90, "texture": "#0"},
"west": {"uv": [6.758, 6.258, 9.258, 7.258], "rotation": 90, "texture": "#0"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [0, 0, 0],
Expand All @@ -79,8 +76,7 @@
"south": {"uv": [0, 0, 16, 16], "texture": "#2", "cullface": "south"},
"west": {"uv": [0, 0, 16, 16], "texture": "#2"},
"down": {"uv": [0.008, 0.008, 4.008, 4.008], "rotation": 180, "texture": "#0", "cullface": "down"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [7.75, 18, 7],
Expand All @@ -89,8 +85,7 @@
"faces": {
"east": {"uv": [8.508, 2.758, 8.258, 2.508], "rotation": 90, "texture": "#0"},
"west": {"uv": [8.508, 2.758, 8.258, 2.508], "rotation": 90, "texture": "#0"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [7.45711, 18, 8],
Expand All @@ -99,17 +94,15 @@
"faces": {
"north": {"uv": [8.508, 2.758, 8.258, 2.508], "rotation": 90, "texture": "#0"},
"south": {"uv": [8.508, 2.758, 8.258, 2.508], "rotation": 90, "texture": "#0"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [0, 17.025, 0],
"to": [16, 17.025, 16],
"from": [-0.01, 17.015, -0.01],
"to": [16.01, 17.035, 16.01],
"rotation": {"angle": 0, "axis": "y", "origin": [16, 23, 0]},
"faces": {
"up": {"uv": [12, 8, 16, 12], "rotation": 90, "texture": "#1"}
},
"portalcubed:render_type": "cutout"
}
}
],
"display": {
Expand Down
31 changes: 11 additions & 20 deletions src/main/resources/assets/portalcubed/models/block/laser_emitter.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"elements": [
{
"name": "translucent",
"from": [0, 16, 0],
"to": [16, 17, 16],
"from": [-0.01, 15.99, -0.01],
"to": [16.01, 17.01, 16.01],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 23, 16]},
"faces": {
"north": {"uv": [0, 15, 16, 16], "texture": "#1"},
Expand Down Expand Up @@ -52,8 +52,7 @@
"south": {"uv": [4.508, 0.008, 6.992, 3.992], "rotation": 90, "texture": "#0"},
"west": {"uv": [6.992, 7.992, 4.508, 4.008], "rotation": 90, "texture": "#0"},
"down": {"uv": [0.008, 0.008, 3.992, 3.992], "rotation": 90, "texture": "#0"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [4.25, 17, 4],
Expand All @@ -65,8 +64,7 @@
"south": {"uv": [9.992, 3.492, 9.758, 1.758], "rotation": 90, "texture": "#0"},
"west": {"uv": [9.992, 3.492, 9.758, 1.758], "rotation": 90, "texture": "#0"},
"up": {"uv": [8.008, 1.758, 9.742, 3.492], "rotation": 90, "texture": "#0"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [8, 18, 4.5],
Expand All @@ -75,8 +73,7 @@
"faces": {
"east": {"uv": [7.742, 3.242, 7.008, 1.508], "rotation": 90, "texture": "#0"},
"west": {"uv": [7.742, 3.242, 7.008, 1.508], "rotation": 90, "texture": "#0"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [4.5, 18, 8],
Expand All @@ -85,8 +82,7 @@
"faces": {
"north": {"uv": [7.742, 3.242, 7.008, 1.508], "rotation": 270, "texture": "#0"},
"south": {"uv": [7.742, 3.242, 7.008, 1.508], "rotation": 90, "texture": "#0"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [2.64376, 7, 9.21508],
Expand All @@ -98,8 +94,7 @@
"south": {"uv": [9.242, 6.992, 7.008, 6.508], "rotation": 90, "texture": "#0"},
"west": {"uv": [7.008, 7.758, 9.258, 7.258], "rotation": 90, "texture": "#0"},
"up": {"uv": [7.008, 7.758, 7.508, 7.258], "rotation": 180, "texture": "#0"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [4.76508, 7, 11.3364],
Expand All @@ -111,8 +106,7 @@
"south": {"uv": [9.242, 6.992, 7.008, 6.508], "rotation": 90, "texture": "#0"},
"west": {"uv": [7.008, 5.992, 9.242, 5.508], "rotation": 90, "texture": "#0"},
"up": {"uv": [7.008, 7.758, 7.508, 7.258], "rotation": 180, "texture": "#0"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [0.81533, 7, 7.80086],
Expand All @@ -124,8 +118,7 @@
"south": {"uv": [9.242, 7.992, 7.008, 7.758], "rotation": 90, "texture": "#0"},
"west": {"uv": [7.008, 7.492, 9.242, 7.258], "rotation": 90, "texture": "#0"},
"up": {"uv": [7.008, 7.508, 7.258, 7.258], "rotation": 180, "texture": "#0"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [7.17929, 7, 14.16482],
Expand All @@ -137,8 +130,7 @@
"south": {"uv": [9.242, 7.992, 7.008, 7.758], "rotation": 90, "texture": "#0"},
"west": {"uv": [7.008, 7.492, 9.242, 7.258], "rotation": 90, "texture": "#0"},
"up": {"uv": [7.008, 7.508, 7.258, 7.258], "rotation": 180, "texture": "#0"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [0, 0, 0],
Expand All @@ -150,8 +142,7 @@
"south": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "south"},
"west": {"uv": [0, 0, 16, 16], "texture": "#1", "cullface": "west"},
"down": {"uv": [0.008, 0.008, 4.008, 4.008], "rotation": 180, "texture": "#0", "cullface": "down"}
},
"portalcubed:render_type": "cutout"
}
}
],
"display": {
Expand Down
31 changes: 11 additions & 20 deletions src/main/resources/assets/portalcubed/models/block/laser_emitter_active.json
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,8 +9,8 @@
"elements": [
{
"name": "translucent",
"from": [0, 16, 0],
"to": [16, 17, 16],
"from": [-0.01, 15.99, -0.01],
"to": [16.01, 17.01, 16.01],
"rotation": {"angle": 0, "axis": "y", "origin": [0, 23, 16]},
"faces": {
"north": {"uv": [0, 15, 16, 16], "texture": "#2"},
Expand Down Expand Up @@ -52,8 +52,7 @@
"south": {"uv": [4.508, 0.008, 6.992, 3.992], "rotation": 90, "texture": "#0"},
"west": {"uv": [6.992, 7.992, 4.508, 4.008], "rotation": 90, "texture": "#0"},
"down": {"uv": [0.008, 0.008, 3.992, 3.992], "rotation": 90, "texture": "#0"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [4.25, 17, 4],
Expand All @@ -65,8 +64,7 @@
"south": {"uv": [9.992, 3.492, 9.758, 1.758], "rotation": 90, "texture": "#0"},
"west": {"uv": [9.992, 3.492, 9.758, 1.758], "rotation": 90, "texture": "#0"},
"up": {"uv": [8.008, 1.758, 9.742, 3.492], "rotation": 90, "texture": "#0"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [8, 18, 4.5],
Expand All @@ -75,8 +73,7 @@
"faces": {
"east": {"uv": [7.742, 3.242, 7.008, 1.508], "rotation": 90, "texture": "#0"},
"west": {"uv": [7.742, 3.242, 7.008, 1.508], "rotation": 90, "texture": "#0"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [4.5, 18, 8],
Expand All @@ -85,8 +82,7 @@
"faces": {
"north": {"uv": [7.742, 3.242, 7.008, 1.508], "rotation": 270, "texture": "#0"},
"south": {"uv": [7.742, 3.242, 7.008, 1.508], "rotation": 90, "texture": "#0"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [2.64376, 7, 9.21508],
Expand All @@ -98,8 +94,7 @@
"south": {"uv": [9.242, 6.992, 7.008, 6.508], "rotation": 90, "texture": "#0"},
"west": {"uv": [7.008, 7.758, 9.258, 7.258], "rotation": 90, "texture": "#0"},
"up": {"uv": [7.008, 7.758, 7.508, 7.258], "rotation": 180, "texture": "#0"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [4.76508, 7, 11.3364],
Expand All @@ -111,8 +106,7 @@
"south": {"uv": [9.242, 6.992, 7.008, 6.508], "rotation": 90, "texture": "#0"},
"west": {"uv": [7.008, 5.992, 9.242, 5.508], "rotation": 90, "texture": "#0"},
"up": {"uv": [7.008, 7.758, 7.508, 7.258], "rotation": 180, "texture": "#0"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [0.81533, 7, 7.80086],
Expand All @@ -124,8 +118,7 @@
"south": {"uv": [9.242, 7.992, 7.008, 7.758], "rotation": 90, "texture": "#0"},
"west": {"uv": [7.008, 7.492, 9.242, 7.258], "rotation": 90, "texture": "#0"},
"up": {"uv": [7.008, 7.508, 7.258, 7.258], "rotation": 180, "texture": "#0"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [7.17929, 7, 14.16482],
Expand All @@ -137,8 +130,7 @@
"south": {"uv": [9.242, 7.992, 7.008, 7.758], "rotation": 90, "texture": "#0"},
"west": {"uv": [7.008, 7.492, 9.242, 7.258], "rotation": 90, "texture": "#0"},
"up": {"uv": [7.008, 7.508, 7.258, 7.258], "rotation": 180, "texture": "#0"}
},
"portalcubed:render_type": "cutout"
}
},
{
"from": [0, 0, 0],
Expand All @@ -150,8 +142,7 @@
"south": {"uv": [0, 0, 16, 16], "texture": "#2", "cullface": "south"},
"west": {"uv": [0, 0, 16, 16], "texture": "#2", "cullface": "west"},
"down": {"uv": [0.008, 0.008, 4.008, 4.008], "rotation": 180, "texture": "#0", "cullface": "down"}
},
"portalcubed:render_type": "cutout"
}
}
],
"display": {
Expand Down
Loading

0 comments on commit 25a9da4

Please sign in to comment.