non-Lsystem pine tree

assets/Data/entity/foliage.json

@@ -160,6 +160,18 @@
                     }
                 }
             }
+        },
+        {
+            "id" : "pine2",
+            "tokens" : [
+                "TREE",
+                "FLAMMABLE"
+            ],
+            "graphicsTemplate": {
+                "model": {
+                    "path" : "Models/foliage/tree4.glb"
+                }
+            }
         }
 
     ]

assets/Models/foliage/texturemap.json

@@ -0,0 +1,16 @@
+{
+    "textureMap": {
+        "Models/foliage/tree4.glb": [
+            {
+                "meshName" : "trunk",
+                "diffuse" : "/Textures/Bark_NormalTree.png",
+                "isDefault" : true
+            },
+            {
+                "meshName" : "leaves",
+                "diffuse" : "/Textures/Leaf_Pine_C.png",
+                "isDefault" : false
+            }
+        ]
+    }
+}

docs/src/progress/renderertodo.md

@@ -867,6 +867,7 @@ Work on separating procedural tree generation steps
 
 (10/16/2024)
 Camera offset definitions in entity files
+Non-Lsystem pine tree
 
 # TODO
 

src/main/java/electrosphere/entity/types/foliage/FoliageUtils.java

@@ -35,7 +35,10 @@ public class FoliageUtils {
     public static Entity clientSpawnBasicFoliage(String type, long seed){
         FoliageType rawType = Globals.gameConfigCurrent.getFoliageMap().getFoliage(type);
         Entity rVal;
-        if(rawType.getGraphicsTemplate().getProceduralModel().getTreeModel()!=null){
+        if(
+            rawType.getGraphicsTemplate().getProceduralModel() != null &&
+            rawType.getGraphicsTemplate().getProceduralModel().getTreeModel()!=null
+        ){
             rVal = ProceduralTree.clientGenerateProceduralTree(type, 0);
         } else {
             rVal = EntityCreationUtils.createClientSpatialEntity();
@@ -77,7 +80,10 @@ public class FoliageUtils {
     public static Entity serverSpawnTreeFoliage(Realm realm, Vector3d position, String type, long seed){
         FoliageType rawType = Globals.gameConfigCurrent.getFoliageMap().getFoliage(type);
         Entity rVal;
-        if(rawType.getGraphicsTemplate().getProceduralModel().getTreeModel()!=null){
+        if(
+            rawType.getGraphicsTemplate().getProceduralModel() != null &&
+            rawType.getGraphicsTemplate().getProceduralModel().getTreeModel()!=null
+        ){
             rVal = ProceduralTree.serverGenerateProceduralTree(realm, position, rawType, seed);
         } else {
             rVal = EntityCreationUtils.createServerEntity(realm, position);