plant test

neuroprod · Dec 2, 2023 · b0f38d4 · b0f38d4
1 parent df95a4f
commit b0f38d4
Show file tree

Hide file tree

Showing 16 changed files with 672 additions and 692 deletions.
diff --git a/frontend/public/outside.bin b/frontend/public/outside.bin
diff --git a/frontend/public/outside.json b/frontend/public/outside.json
diff --git a/frontend/public/textures/fern_AC_Color.png b/frontend/public/textures/fern_AC_Color.png
diff --git a/frontend/public/textures/fern_AC_MRA.png b/frontend/public/textures/fern_AC_MRA.png
diff --git a/frontend/public/textures/fern_AC_Normal.png b/frontend/public/textures/fern_AC_Normal.png
diff --git a/frontend/public/textures/groundFront_Color.png b/frontend/public/textures/groundFront_Color.png
diff --git a/frontend/public/textures/ground_Color.png b/frontend/public/textures/ground_Color.png
diff --git a/frontend/public/textures/midGround_Color.png b/frontend/public/textures/midGround_Color.png
diff --git a/frontend/public/textures/rocksMedium_Color.png b/frontend/public/textures/rocksMedium_Color.png
diff --git a/frontend/public/textures/rocksMedium_MRA.png b/frontend/public/textures/rocksMedium_MRA.png
diff --git a/frontend/public/textures/rocksMedium_Normal.png b/frontend/public/textures/rocksMedium_Normal.png
diff --git a/frontend/src/GLFTLoader.ts b/frontend/src/GLFTLoader.ts
@@ -14,6 +14,7 @@ import AnimationChannelQuaternion from "./lib/animation/AnimationChannelQuaterni
 import AnimationChannelVector3 from "./lib/animation/AnimationChannelVector3";
 import Skin from "./lib/animation/Skin";
 import GBufferShaderSkin from "./shaders/GBufferShaderSkin";
+import {CullMode, GPUCullMode} from "./lib/WebGPUConstants";
 
 
 type Accessor = {
@@ -105,6 +106,7 @@ export default class GLFTLoader {
             }
             if (m.model.mesh.label.includes("_AC")) {
 m.model.castShadow=false;
+m.model.material.cullMode =CullMode.None
             }
         }
     }

diff --git a/frontend/src/PreloadData.ts b/frontend/src/PreloadData.ts
@@ -48,6 +48,9 @@ export const preloadImages = [
   "desk_Color",
   "desk_MRA",
   "desk_Normal",
+  "fern_AC_Color",
+  "fern_AC_MRA",
+  "fern_AC_Normal",
   "fish_Color",
   "fish_MRA",
   "fish_Normal",

diff --git a/frontend/src/lib/WebGPUConstants.ts b/frontend/src/lib/WebGPUConstants.ts
@@ -32,10 +32,10 @@ export const GPUFrontFace = {
     CW: 'cw'
 };
 
-export const GPUCullMode = {
-    None: 'none',
-    Front: 'front',
-    Back: 'back'
+export const CullMode = {
+    None: 'none' as GPUCullMode,
+    Front: 'front' as GPUCullMode,
+    Back: 'back' as GPUCullMode
 };
 
 export const IndexFormat = {

diff --git a/frontend/src/lib/core/Material.ts b/frontend/src/lib/core/Material.ts
@@ -20,6 +20,7 @@ export default class Material extends ObjectGPU {
     private depthStencilState: GPUDepthStencilState;
     private needsDepth: boolean = true;
     public skin:Skin
+    public cullMode: "none" | "front" | "back" = "back";
     constructor(renderer: Renderer, label: string, shader: Shader) {
         super(renderer, label);
         this.shader = shader;
@@ -75,7 +76,7 @@ export default class Material extends ObjectGPU {
 
             primitive: {
                 topology: "triangle-list",
-                cullMode: "back",
+                cullMode: this.cullMode,
             },
             multisample: {
                 count: pass.sampleCount,

diff --git a/frontend/src/lib/model/Model.ts b/frontend/src/lib/model/Model.ts
@@ -13,6 +13,7 @@ export default class Model extends Object3D
 
    public modelTransform: ModelTransform;
     public visible: boolean =true;
+
     constructor(renderer:Renderer,label:string) {
         super(renderer,label);
         this.modelTransform =new ModelTransform(renderer,label+"_transform")