Add siding rail model

zbx1425 · Dec 27, 2022 · b0f72d0 · b0f72d0
1 parent 8618dd1
commit b0f72d0
Show file tree

Hide file tree

Showing 3 changed files with 173 additions and 10 deletions.
diff --git a/common/src/main/java/cn/zbx1425/mtrsteamloco/CustomResources.java b/common/src/main/java/cn/zbx1425/mtrsteamloco/CustomResources.java
@@ -39,11 +39,17 @@ public static void init(ResourceManager resourceManager) {
         RenderTrainDK3Mini.initGLModel(resourceManager);
 
         try {
-            RawModel rawRailModel = MainClient.modelManager.loadRawModel(
+            RawModel rawCommonRailModel = MainClient.modelManager.loadRawModel(
                     resourceManager, new ResourceLocation("mtrsteamloco:models/rail.obj"), MainClient.atlasManager);
-            rawRailModel.clearAttrStates();
-            Model railModel = MainClient.modelManager.uploadModel(rawRailModel);
-            MainClient.railRenderDispatcher.setModel(railModel);
+            rawCommonRailModel.clearAttrStates();
+            Model commonRailModel = MainClient.modelManager.uploadModel(rawCommonRailModel);
+
+            RawModel rawSidingRailModel = MainClient.modelManager.loadRawModel(
+                    resourceManager, new ResourceLocation("mtrsteamloco:models/rail_siding.obj"), MainClient.atlasManager);
+            rawSidingRailModel.clearAttrStates();
+            Model sidingRailModel = MainClient.modelManager.uploadModel(rawSidingRailModel);
+
+            MainClient.railRenderDispatcher.setModel(commonRailModel, sidingRailModel);
         } catch (IOException e) {
             e.printStackTrace();
         }

diff --git a/common/src/main/java/cn/zbx1425/mtrsteamloco/render/rail/RailRenderDispatcher.java b/common/src/main/java/cn/zbx1425/mtrsteamloco/render/rail/RailRenderDispatcher.java
@@ -1,8 +1,6 @@
 package cn.zbx1425.mtrsteamloco.render.rail;
 
 import cn.zbx1425.sowcer.batch.BatchManager;
-import cn.zbx1425.sowcer.batch.EnqueueProp;
-import cn.zbx1425.sowcer.batch.ShaderProp;
 import cn.zbx1425.sowcer.model.Model;
 import cn.zbx1425.sowcer.math.Matrix4f;
 import mtr.data.Rail;
@@ -23,15 +21,17 @@ public class RailRenderDispatcher {
 
     public static boolean isHoldingRailItem = false;
 
-    protected Model railModel;
+    protected Model commonRailModel;
+    protected Model sidingRailModel;
 
-    public void setModel(Model railModel) {
-        this.railModel = railModel;
+    public void setModel(Model commonRailModel, Model sidingRailModel) {
+        this.commonRailModel = commonRailModel;
+        this.sidingRailModel = sidingRailModel;
     }
 
     private void addRail(Rail rail) {
         if (railSpanMap.containsKey(rail)) return;
-        RailSpan railSpan = new RailSpan(rail, railModel);
+        RailSpan railSpan = new RailSpan(rail, rail.railType == RailType.SIDING ? sidingRailModel : commonRailModel);
         railSpanMap.put(rail, railSpan);
         railSpanList.add(railSpan);
     }

diff --git a/common/src/main/resources/assets/mtrsteamloco/models/rail_siding.obj b/common/src/main/resources/assets/mtrsteamloco/models/rail_siding.obj
@@ -0,0 +1,157 @@
+# Blender 3.3.1
+# www.blender.org
+usemtl track_tucson_modif#flipv=1
+v -0.858000 -0.990000 0.100000
+v -0.858000 0.120000 0.100000
+v -0.858000 -0.990000 -0.100000
+v -0.858000 0.120000 -0.100000
+v 0.858000 -0.990000 0.100000
+v 0.858000 0.120000 0.100000
+v 0.858000 -0.990000 -0.100000
+v 0.858000 0.120000 -0.100000
+v 0.660000 0.122000 0.300000
+v 0.760000 0.122000 0.300000
+v 0.660000 0.122000 -0.300000
+v 0.760000 0.122000 -0.300000
+v 0.700000 0.240000 0.300000
+v 0.700000 0.120000 0.300000
+v 0.700000 0.240000 -0.300000
+v 0.700000 0.120000 -0.300000
+v 0.720000 0.240000 0.300000
+v 0.720000 0.120000 0.300000
+v 0.720000 0.240000 -0.300000
+v 0.720000 0.120000 -0.300000
+v 0.735000 0.240000 0.300000
+v 0.685000 0.240000 0.300000
+v 0.735000 0.240000 -0.300000
+v 0.685000 0.240000 -0.300000
+v -0.760000 0.122000 0.300000
+v -0.660000 0.122000 0.300000
+v -0.760000 0.122000 -0.300000
+v -0.660000 0.122000 -0.300000
+v -0.720000 0.240000 0.300000
+v -0.720000 0.120000 0.300000
+v -0.720000 0.240000 -0.300000
+v -0.720000 0.120000 -0.300000
+v -0.700000 0.240000 0.300000
+v -0.700000 0.120000 0.300000
+v -0.700000 0.240000 -0.300000
+v -0.700000 0.120000 -0.300000
+v -0.685000 0.240000 0.300000
+v -0.735000 0.240000 0.300000
+v -0.685000 0.240000 -0.300000
+v -0.735000 0.240000 -0.300000
+v -0.585000 -0.990000 -0.100000
+v -0.585000 0.120000 0.100000
+v -0.585000 0.120000 -0.100000
+v -0.585000 -0.990000 0.100000
+v 0.585000 0.120000 -0.100000
+v 0.585000 -0.990000 0.100000
+v 0.585000 -0.990000 -0.100000
+v 0.585000 0.120000 0.100000
+vn -1.0000 -0.0000 -0.0000
+vn -0.0000 -0.0000 -1.0000
+vn 1.0000 -0.0000 -0.0000
+vn -0.0000 -0.0000 1.0000
+vn -0.0000 -1.0000 -0.0000
+vn -0.0000 1.0000 -0.0000
+vt 0.017835 0.003363
+vt 0.007914 0.487682
+vt 0.352543 0.697844
+vt 0.267835 0.003363
+vt 0.257914 0.487682
+vt 0.234910 0.061056
+vt 0.017835 0.253363
+vt 0.742086 0.244395
+vt 0.352543 0.565608
+vt 0.267835 0.253363
+vt 0.752590 0.061056
+vt 0.992086 0.244395
+vt 0.752008 0.252256
+vt 0.484779 0.697844
+vt 0.007914 0.237682
+vt 1.002008 0.252256
+vt 0.257914 0.237682
+vt 0.234910 0.499678
+vt 0.742086 0.494395
+vt 0.752008 0.002256
+vt 0.484779 0.565608
+vt 0.992086 0.494395
+vt 1.002008 0.002256
+vt 0.752590 0.499679
+vt 1.007130 0.746220
+vt 1.007130 0.782028
+vt 0.017870 0.746220
+vt 0.017870 0.782028
+vt 0.993569 0.817501
+vt 0.993569 0.766387
+vt 0.007298 0.817501
+vt 0.007298 0.766387
+vt 0.993569 0.816660
+vt 0.993569 0.765546
+vt 0.007298 0.816660
+vt 0.007298 0.765546
+vt 0.995318 0.940338
+vt 0.995318 0.957167
+vt 0.006058 0.940338
+vt 0.006058 0.957167
+vt 1.007130 0.746220
+vt 1.007130 0.782028
+vt 0.017870 0.746220
+vt 0.017870 0.782028
+vt 0.993569 0.817501
+vt 0.993569 0.766387
+vt 0.007298 0.817501
+vt 0.007298 0.766387
+vt 0.993569 0.816660
+vt 0.993569 0.765546
+vt 0.007298 0.816660
+vt 0.007298 0.765546
+vt 0.995318 0.940338
+vt 0.995318 0.957167
+vt 0.006058 0.940338
+vt 0.006058 0.957167
+vt 0.763579 0.696405
+vt 0.742086 0.306895
+vt 0.385602 0.565608
+vt 0.257914 0.425182
+vt 0.234910 0.170712
+vt 0.391780 0.645846
+vt 0.752590 0.170712
+vt 0.784088 0.643182
+vt 0.992086 0.306895
+vt 0.007914 0.425182
+vt 0.385602 0.697844
+vt 0.992086 0.431895
+vt 0.752590 0.390023
+vt 0.409373 0.632094
+vt 0.451720 0.697844
+vt 0.007914 0.300182
+vt 0.160364 0.678269
+vt 0.742086 0.431895
+vt 0.451720 0.565608
+vt 0.412348 0.679500
+vt 0.257914 0.300182
+vt 0.234910 0.390023
+vt 0.140416 0.632041
+s 0
+f 1/1/1 2/4/1 4/10/1 3/7/1
+f 47/74/2 45/68/2 8/22/2 7/19/2
+f 7/20/3 8/23/3 6/16/3 5/13/3
+f 44/66/4 42/60/4 2/5/4 1/2/4
+f 47/75/5 7/21/5 5/14/5 46/71/5
+f 43/63/6 4/11/6 2/6/6 42/61/6
+f 9/25/6 10/26/6 12/28/6 11/27/6
+f 13/29/1 15/31/1 16/32/1 14/30/1
+f 17/33/3 18/34/3 20/36/3 19/35/3
+f 21/37/6 23/39/6 24/40/6 22/38/6
+f 25/41/6 26/42/6 28/44/6 27/43/6
+f 29/45/1 31/47/1 32/48/1 30/46/1
+f 33/49/3 34/50/3 36/52/3 35/51/3
+f 37/53/6 39/55/6 40/56/6 38/54/6
+f 41/57/3 43/64/3 42/62/3 44/67/3
+f 3/8/2 4/12/2 43/65/2 41/58/2
+f 3/9/5 41/59/5 44/67/5 1/3/5
+f 5/15/4 6/17/4 48/77/4 46/72/4
+f 8/24/6 45/69/6 48/78/6 6/18/6
+f 46/73/1 48/79/1 45/70/1 47/76/1