studiorailgun/Renderer
2
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fix tree data
All checks were successful
studiorailgun/Renderer/pipeline/head This commit looks good
Details

Browse Source
This commit is contained in:
austin 2024-05-05 19:11:26 -04:00
parent 696f1175bb
commit cfbd4c05ce
4 changed files with 8 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
assets/Data/foliage.json
View File

@ -92,7 +92,7 @@
"gainMultiplier": 0.9, "gainMultiplier": 0.9,
"emitterSpatialOffset": [0,3,0] "emitterSpatialOffset": [0,3,0]
}, },
"modelPath" : "Models/proceduralTree2/proceduralTree2v2.fbx" "modelPath" : "Models/foliage/proceduralTree2/proceduralTree2v2.fbx"
} }
] ]

4
assets/Models/modelPretransforms.json
View File

@ -23,7 +23,7 @@
] ]
}, },
{ {
"path" : "Models/proceduralTree2/proceduralTree2v2.fbx", "path" : "Models/foliage/proceduralTree2/proceduralTree2v2.fbx",
"meshes" : [ "meshes" : [
{ {
"meshName" : "Trunk", "meshName" : "Trunk",
@ -34,7 +34,7 @@
] ]
}, },
{ {
"path" : "Models/foliageBlockTemplate1Test1.fbx", "path" : "Models/foliage/foliageBlockTemplate1Test1.fbx",
"meshes" : [ "meshes" : [
{ {
"meshName" : "Plane", "meshName" : "Plane",

6
assets/Textures/default_texture_map.json
View File

@ -432,7 +432,7 @@
"Textures/skyscraper1.png" "Textures/skyscraper1.png"
] ]
}, },
"Models/foliageBlockTemplate1Test1.fbx" : { "Models/foliage/foliageBlockTemplate1Test1.fbx" : {
"Plane" : [ "Plane" : [
"Textures/leaf3layer1.png", "Textures/leaf3layer1.png",
"Textures/leaf3layer1.png" "Textures/leaf3layer1.png"
@ -454,8 +454,8 @@
}, },
"Models/proceduralTree2/proceduralTree2v2.fbx": { "Models/proceduralTree2/proceduralTree2v2.fbx": {
"Trunk" : [ "Trunk" : [
"Models/proceduralTree2/Trunk.png", "Models/foliage/proceduralTree2/Trunk.png",
"Models/proceduralTree2/Trunk.png" "Models/foliage/proceduralTree2/Trunk.png"
] ]
} }
} }

4
src/main/java/electrosphere/entity/types/tree/ProceduralTree.java
View File

@ -82,7 +82,7 @@ public class ProceduralTree {
branchInstanceTemplate = InstanceTemplate.createInstanceTemplate( branchInstanceTemplate = InstanceTemplate.createInstanceTemplate(
1000, 1000,
"Models/proceduralTree2/proceduralTree2v2.fbx", "Models/foliage/proceduralTree2/proceduralTree2v2.fbx",
"Shaders/instanced/proceduraltree/proceduraltree.vs", "Shaders/instanced/proceduraltree/proceduraltree.vs",
"Shaders/instanced/proceduraltree/proceduraltree.fs", "Shaders/instanced/proceduraltree/proceduraltree.fs",
attributes); attributes);
@ -92,7 +92,7 @@ public class ProceduralTree {
leafAttributes.put(leafColorAttribute, HomogenousBufferTypes.VEC3F); leafAttributes.put(leafColorAttribute, HomogenousBufferTypes.VEC3F);
leafInstanceTemplate = InstanceTemplate.createInstanceTemplate( leafInstanceTemplate = InstanceTemplate.createInstanceTemplate(
10000, 10000,
"Models/foliageBlockTemplate1Test1.fbx", "Models/foliage/foliageBlockTemplate1Test1.fbx",
"Shaders/instanced/colorshift/colorshift.vs", "Shaders/instanced/colorshift/colorshift.vs",
"Shaders/instanced/colorshift/colorshift.fs", "Shaders/instanced/colorshift/colorshift.fs",
leafAttributes leafAttributes