move file

neuroprod · Oct 11, 2024 · c24b4ec · c24b4ec
1 parent 9124abc
commit c24b4ec
Show file tree

Hide file tree

Showing 104 changed files with 185 additions and 180 deletions.
diff --git a/frontend/src/CharacterHandler.ts b/frontend/src/CharacterHandler.ts
@@ -8,7 +8,7 @@ import Object3D from "./lib/core/Object3D";
 import gsap from "gsap";
 import Timeline from "gsap";
 
-import GameModel, {Scenes} from "../public/GameModel";
+import GameModel, {Scenes} from "./GameModel";
 import GLFTLoader from "./GLFTLoader";
 
 

diff --git a/frontend/src/GameCamera.ts b/frontend/src/GameCamera.ts
@@ -1,7 +1,7 @@
 import Camera from "./lib/Camera";
 import {Vector2, Vector3} from "math.gl";
 import Renderer from "./lib/Renderer";
-import GameModel, {Scenes, StateGold} from "../public/GameModel";
+import GameModel, {Scenes, StateGold} from "./GameModel";
 import Timer from "./lib/Timer";
 
 export default class GameCamera {

diff --git a/frontend/public/GameModel.ts → frontend/src/GameModel.ts b/frontend/public/GameModel.ts → frontend/src/GameModel.ts
@@ -1,82 +1,82 @@
-import Transition from "../src/transitions/Transition";
-import GoOutside from "../src/transitions/GoOutside";
-import StartGame from "../src/transitions/StartGame";
+import Transition from "./transitions/Transition";
+import GoOutside from "./transitions/GoOutside";
+import StartGame from "./transitions/StartGame";
 import {Vector2, Vector3} from "math.gl";
-import Main from "../src/Main";
-import GoInside from "../src/transitions/GoInside";
-import Trigger from "../src/trigers/Trigger";
-import HitTextTrigger from "../src/trigers/HitTextTrigger";
-import Drawing from "../src/drawing/Drawing";
-import GoRightRoom from "../src/transitions/GoRightRoom";
-import GoLeftRoom from "../src/transitions/GoLeftRoom";
-import {FloorHitTrigger} from "../src/trigers/FloorHitTrigger";
-import OutlinePass from "../src/renderPasses/OutlinePass";
-import Renderer from "../src/lib/Renderer";
-import CharacterHandler from "../src/CharacterHandler";
-import DoorGoOutsideTrigger from "../src/trigers/DoorGoOutsideTrigger";
-import DoorGoInsideTrigger from "../src/trigers/DoorGoInsideTrigger";
-import DoorInsideTrigger from "../src/trigers/DoorInsideTrigger";
-import GoWorkTrigger from "../src/trigers/GoWorkTrigger";
-import GameCamera from "../src/GameCamera";
-import TextHandler from "../src/TextHandler";
-import UI from "../src/lib/UI/UI";
-import SoundHandler from "../src/SoundHandler";
-import GameUI from "../src/ui/GameUI";
-import RenderSettings from "../src/RenderSettings";
-import GoGraveTrigger from "../src/trigers/GoGraveTrigger";
-import GoHunterTrigger from "../src/trigers/GoHunterPants";
-import SitTrigger from "../src/trigers/SitTrigger";
-import ReadMail from "../src/transitions/ReadMail";
-import FindHunterPants from "../src/transitions/FindHunterPants";
-import TextInfo from "../src/transitions/TextInfo";
-import BookCaseTrigger from "../src/trigers/BookCaseTrigger";
-import MillTrigger from "../src/trigers/MillTrigger";
-import Room from "../src/Room";
-import Outside from "../src/Outside";
-import UIUtils from "../src/lib/UI/UIUtils";
-import SelectItem from "../src/lib/UI/math/SelectItem";
-import StartMill from "../src/transitions/StartMill";
-import Work from "../src/transitions/Work";
-import GoGrave from "../src/transitions/GoGrave";
-import FlowerPotHitTrigger from "../src/trigers/FlowerPotHitTrigger";
-import FlowerHitTrigger from "../src/trigers/FlowerHitTrigger";
-import PointLight from "../src/renderPasses/PointLight";
-import MachineHitTrigger from "../src/trigers/MachineTrigger";
-import PickFlower from "../src/transitions/PickFlower";
-import StartMachine from "../src/transitions/StartMachine";
-import FishFoodTrigger from "../src/trigers/FishFoodTrigger";
-import BirdHouseTrigger from "../src/trigers/BirdHouseTrigger";
-import FishTrigger from "../src/trigers/FishTrigger";
-import GirlPantsTrigger from "../src/trigers/GirlPantsTrigger";
-import GrandpaPantsTrigger from "../src/trigers/GrandpaPantsTrigger";
-import ShovelTrigger from "../src/trigers/ShovelTrigger";
-import StickTrigger from "../src/trigers/StickTrigger";
-import TakeFishFood from "../src/transitions/TakeFishFood";
-import FeedFish from "../src/transitions/FeedFish";
-import FindGrandpaPants from "../src/transitions/FindGrandpaPants";
-import TakeStick from "../src/transitions/TakeStick";
-import PushBirdHouse from "../src/transitions/PushBirdHouse";
-import FindGirlpaPants from "../src/transitions/FindGirlPants";
-import PackageTrigger from "../src/trigers/PackageTrigger";
-import MailBoxTrigger from "../src/trigers/MailBoxTrigger";
-import FindFasionPants from "../src/transitions/FindFasionPants";
-import HighTechPantsTrigger from "../src/trigers/HighTechPantsTrigger";
-import FindGlowPants from "../src/transitions/FindGlowPants";
-import KeyTrigger from "../src/trigers/KeyTrigger";
-import TakeKey from "../src/transitions/TakeKey";
-import OpenBookcase from "../src/transitions/OpenBookcase";
-import TakeShovel from "../src/transitions/TakeShovel";
-import DigGraveTrigger from "../src/trigers/DigGraveTrigger";
-import DigGrave from "../src/transitions/DigGrave";
-import LightOutsideRenderPass from "../src/renderPasses/LightOutsideRenderPass";
-import GrandpaFishTrigger from "../src/trigers/GrandpaFishTrigger";
-import AnimationMixer from "../src/lib/animation/AnimationMixer";
-import WearPants from "../src/transitions/WearPants";
-import Sit from "../src/transitions/Sit";
-import Pants3D from "../src/extras/Pants3D";
-import TextInfoLock from "../src/transitions/TextInfoLock";
-import Clock from "../src/extras/Clock";
-import ColorV from "../src/lib/ColorV";
+import Main from "./Main";
+import GoInside from "./transitions/GoInside";
+import Trigger from "./trigers/Trigger";
+import HitTextTrigger from "./trigers/HitTextTrigger";
+import Drawing from "./drawing/Drawing";
+import GoRightRoom from "./transitions/GoRightRoom";
+import GoLeftRoom from "./transitions/GoLeftRoom";
+import {FloorHitTrigger} from "./trigers/FloorHitTrigger";
+import OutlinePass from "./renderPasses/OutlinePass";
+import Renderer from "./lib/Renderer";
+import CharacterHandler from "./CharacterHandler";
+import DoorGoOutsideTrigger from "./trigers/DoorGoOutsideTrigger";
+import DoorGoInsideTrigger from "./trigers/DoorGoInsideTrigger";
+import DoorInsideTrigger from "./trigers/DoorInsideTrigger";
+import GoWorkTrigger from "./trigers/GoWorkTrigger";
+import GameCamera from "./GameCamera";
+import TextHandler from "./TextHandler";
+import UI from "./lib/UI/UI";
+import SoundHandler from "./SoundHandler";
+import GameUI from "./ui/GameUI";
+import RenderSettings from "./RenderSettings";
+import GoGraveTrigger from "./trigers/GoGraveTrigger";
+import GoHunterTrigger from "./trigers/GoHunterPants";
+import SitTrigger from "./trigers/SitTrigger";
+import ReadMail from "./transitions/ReadMail";
+import FindHunterPants from "./transitions/FindHunterPants";
+import TextInfo from "./transitions/TextInfo";
+import BookCaseTrigger from "./trigers/BookCaseTrigger";
+import MillTrigger from "./trigers/MillTrigger";
+import Room from "./Room";
+import Outside from "./Outside";
+import UIUtils from "./lib/UI/UIUtils";
+import SelectItem from "./lib/UI/math/SelectItem";
+import StartMill from "./transitions/StartMill";
+import Work from "./transitions/Work";
+import GoGrave from "./transitions/GoGrave";
+import FlowerPotHitTrigger from "./trigers/FlowerPotHitTrigger";
+import FlowerHitTrigger from "./trigers/FlowerHitTrigger";
+import PointLight from "./renderPasses/PointLight";
+import MachineHitTrigger from "./trigers/MachineTrigger";
+import PickFlower from "./transitions/PickFlower";
+import StartMachine from "./transitions/StartMachine";
+import FishFoodTrigger from "./trigers/FishFoodTrigger";
+import BirdHouseTrigger from "./trigers/BirdHouseTrigger";
+import FishTrigger from "./trigers/FishTrigger";
+import GirlPantsTrigger from "./trigers/GirlPantsTrigger";
+import GrandpaPantsTrigger from "./trigers/GrandpaPantsTrigger";
+import ShovelTrigger from "./trigers/ShovelTrigger";
+import StickTrigger from "./trigers/StickTrigger";
+import TakeFishFood from "./transitions/TakeFishFood";
+import FeedFish from "./transitions/FeedFish";
+import FindGrandpaPants from "./transitions/FindGrandpaPants";
+import TakeStick from "./transitions/TakeStick";
+import PushBirdHouse from "./transitions/PushBirdHouse";
+import FindGirlpaPants from "./transitions/FindGirlPants";
+import PackageTrigger from "./trigers/PackageTrigger";
+import MailBoxTrigger from "./trigers/MailBoxTrigger";
+import FindFasionPants from "./transitions/FindFasionPants";
+import HighTechPantsTrigger from "./trigers/HighTechPantsTrigger";
+import FindGlowPants from "./transitions/FindGlowPants";
+import KeyTrigger from "./trigers/KeyTrigger";
+import TakeKey from "./transitions/TakeKey";
+import OpenBookcase from "./transitions/OpenBookcase";
+import TakeShovel from "./transitions/TakeShovel";
+import DigGraveTrigger from "./trigers/DigGraveTrigger";
+import DigGrave from "./transitions/DigGrave";
+import LightOutsideRenderPass from "./renderPasses/LightOutsideRenderPass";
+import GrandpaFishTrigger from "./trigers/GrandpaFishTrigger";
+import AnimationMixer from "./lib/animation/AnimationMixer";
+import WearPants from "./transitions/WearPants";
+import Sit from "./transitions/Sit";
+import Pants3D from "./extras/Pants3D";
+import TextInfoLock from "./transitions/TextInfoLock";
+import Clock from "./extras/Clock";
+import ColorV from "./lib/ColorV";
 
 export enum StateGold {
     START,

diff --git a/frontend/src/ImagePreloader.ts b/frontend/src/ImagePreloader.ts
@@ -2,7 +2,7 @@ import Renderer from "./lib/Renderer";
 import PreLoader from "./lib/PreLoader";
 import {preloadImages} from "./PreloadData";
 import TextureLoader from "./lib/textures/TextureLoader";
-import GameModel from "../public/GameModel";
+import GameModel from "./GameModel";
 
 
 class ImagePreloader {

diff --git a/frontend/src/Intro.ts b/frontend/src/Intro.ts
@@ -4,7 +4,7 @@ import GLFTLoader from "./GLFTLoader";
 import TextureLoader from "./lib/textures/TextureLoader";
 import ModelRenderer from "./lib/model/ModelRenderer";
 import Model from "./lib/model/Model";
-import GameModel, {StateGold} from "../public/GameModel";
+import GameModel, {StateGold} from "./GameModel";
 import Plane from "./lib/meshes/Plane";
 import Material from "./lib/core/Material";
 import SmokeShader from "./shaders/SmokeShader";

diff --git a/frontend/src/Main.ts b/frontend/src/Main.ts
@@ -36,7 +36,7 @@ import ShadowPass from "./renderPasses/ShadowPass";
 import DOFPass from "./renderPasses/DOFPass";
 import PostRenderPass from "./renderPasses/PostRenderPass";
 import FXAARenderPass from "./renderPasses/FXAARenderPass";
-import GameModel, {Scenes, StateGold, UIState} from "../public/GameModel";
+import GameModel, {Scenes, StateGold, UIState} from "./GameModel";
 import GameCamera from "./GameCamera";
 import Ray from "./lib/Ray";
 import Drawer from "./drawing/Drawer";

diff --git a/frontend/src/Outside.ts b/frontend/src/Outside.ts
@@ -15,7 +15,7 @@ import Fish from "./extras/Fish";
 import FogPlanes from "./extras/FogPlanes";
 import Leaves from "./extras/Leaves";
 import TextureLoader from "./lib/textures/TextureLoader";
-import GameModel, {StateFasion, StateGirl, StateGold, StateHunter} from "../public/GameModel";
+import GameModel, {StateFasion, StateGirl, StateGold, StateHunter} from "./GameModel";
 import {NumericArray, Vector3} from "math.gl";
 
 import GlassGlowShader from "./shaders/GlassGlowShader";

diff --git a/frontend/src/Room.ts b/frontend/src/Room.ts
@@ -15,7 +15,7 @@ import Clock from "./extras/Clock";
 import {Osc2Screen} from "./extras/Osc2Screen";
 import {Osc1Screen} from "./extras/Osc1Screen";
 import Machine from "./extras/Machine";
-import GameModel, {StateFasion, StateGold, StateGrandpa, StateHighTech} from "../public/GameModel";
+import GameModel, {StateFasion, StateGold, StateGrandpa, StateHighTech} from "./GameModel";
 
 
 import Model from "./lib/model/Model";

diff --git a/frontend/src/Scene.ts b/frontend/src/Scene.ts
@@ -2,7 +2,7 @@ import Renderer from "./lib/Renderer";
 import PreLoader from "./lib/PreLoader";
 import GLFTLoader from "./GLFTLoader";
 import Ray from "./lib/Ray";
-import GameModel, {Scenes} from "../public/GameModel";
+import GameModel, {Scenes} from "./GameModel";
 import {Vector3} from "math.gl";
 
 export default class Scene {

diff --git a/frontend/src/SoundHandler.ts b/frontend/src/SoundHandler.ts
@@ -1,7 +1,7 @@
 import PreLoader from "./lib/PreLoader";
 import {Howl} from 'howler';
 
-import GameModel, {Scenes} from "../public/GameModel";
+import GameModel, {Scenes} from "./GameModel";
 
 export default class SoundHandler {
     private stepInside: Howl;

diff --git a/frontend/src/TextHandler.ts b/frontend/src/TextHandler.ts
@@ -6,7 +6,7 @@ import JSONLoader from "./JSONLoader";
 import Model from "./lib/model/Model";
 import Font, {TEXT_ALIGN} from "./lib/text/Font";
 import FontMeshRenderer from "./lib/text/FontMeshRenderer";
-import GameModel from "../public/GameModel";
+import GameModel from "./GameModel";
 import Material from "./lib/core/Material";
 import FontShader from "./lib/text/FontShader";
 import {BlendFactor, BlendOperation} from "./lib/WebGPUConstants";

diff --git a/frontend/src/drawing/Drawer.ts b/frontend/src/drawing/Drawer.ts
@@ -5,7 +5,7 @@ import UI from "../lib/UI/UI";
 import Drawing from "./Drawing";
 import Renderer from "../lib/Renderer";
 import SelectItem from "../lib/UI/math/SelectItem";
-import GameModel from "../../public/GameModel";
+import GameModel from "../GameModel";
 import ColorV from "../lib/ColorV";
 import gsap from "gsap";
 import {saveToBinFile} from "../lib/SaveUtils";

diff --git a/frontend/src/drawing/Drawing.ts b/frontend/src/drawing/Drawing.ts
@@ -43,6 +43,7 @@ export default class Drawing extends Model {
     }
 
     update() {
+
         if (this.visible) {
 
             let target = this.offset.clone();
@@ -57,6 +58,10 @@ export default class Drawing extends Model {
 
         this.firstDrawInstances = Math.floor(this.start * this.numDrawInstancesMax);
         this.numDrawInstances = Math.floor(this.progress * this.numDrawInstancesMax) - this.firstDrawInstances;
+       // if(this.label=='drawings/intro_world.bin' && this.progress!=1&& this.progress!=0)
+         //   console.log(this.progress, this.numDrawInstances,this.label)
+        //this.numDrawInstances =0
+//Math.min(  this.numDrawInstances,this.numDrawInstancesMax);
         super.update()
     }
 

diff --git a/frontend/src/drawing/DrawingPreloader.ts b/frontend/src/drawing/DrawingPreloader.ts
@@ -2,7 +2,7 @@ import Renderer from "../lib/Renderer";
 import PreLoader from "../lib/PreLoader";
 import DrawingLoader from "./DrawingLoader";
 import Drawing from "./Drawing";
-import GameModel from "../../public/GameModel";
+import GameModel from "../GameModel";
 import {preloadDrawings} from "../PreloadData";
 
 

diff --git a/frontend/src/drawing/DrawingRenderer.ts b/frontend/src/drawing/DrawingRenderer.ts
@@ -48,7 +48,7 @@ export default class DrawingRenderer {
                 }
             }
 
-            if (model.mesh.hasIndices) {
+            if (model.mesh.hasIndices && model.mesh.indexBuffer ) {
 
                 passEncoder.setIndexBuffer(model.mesh.indexBuffer, model.mesh.indexFormat);
                 passEncoder.drawIndexed(

diff --git a/frontend/src/extras/FogPlanes.ts b/frontend/src/extras/FogPlanes.ts
@@ -7,7 +7,7 @@ import Timer from "../lib/Timer";
 import {Vector4} from "math.gl";
 import Object3D from "../lib/core/Object3D";
 import {BlendFactor, BlendOperation} from "../lib/WebGPUConstants";
-import GameModel from "../../public/GameModel";
+import GameModel from "../GameModel";
 
 export default class FogPlanes {
     private renderer: Renderer;

diff --git a/frontend/src/extras/LaptopScreen.ts b/frontend/src/extras/LaptopScreen.ts
@@ -7,7 +7,7 @@ import LaptopShader from "./LaptopShader";
 
 import LaptopMailShader from "./LaptopMailShader";
 import LaptopProgrammingShader from "./LaptopProgrammingShader";
-import {StateFasion} from "../../public/GameModel";
+import {StateFasion} from "../GameModel";
 import LaptopCanMakeShader from "./LaptopCanMakeShader";
 import LaptopDistordShader from "./LaptopDistordShader";
 import Noise1D from "./Noise1D";

diff --git a/frontend/src/extras/Machine.ts b/frontend/src/extras/Machine.ts
@@ -5,7 +5,7 @@ import {Vector3} from "math.gl";
 import Material from "../lib/core/Material";
 import GBufferGlowPantsProgress from "../shaders/GBufferGlowPantsProgress";
 import Timer from "../lib/Timer";
-import GameModel, {StateHighTech} from "../../public/GameModel";
+import GameModel, {StateHighTech} from "../GameModel";
 
 export default class Machine {
     private renderer: Renderer;

diff --git a/frontend/src/extras/Mill.ts b/frontend/src/extras/Mill.ts
@@ -1,6 +1,6 @@
 import gsap from "gsap"
 import Model from "../lib/model/Model";
-import GameModel, {MillState} from "../../public/GameModel";
+import GameModel, {MillState} from "../GameModel";
 import Renderer from "../lib/Renderer";
 
 import Material from "../lib/core/Material";

diff --git a/frontend/src/extras/Pants3D.ts b/frontend/src/extras/Pants3D.ts
@@ -10,7 +10,7 @@ import UI from "../lib/UI/UI";
 import Timer from "../lib/Timer";
 import gsap from "gsap";
 import {NumericArray, Quaternion} from "math.gl";
-import GameModel from "../../public/GameModel";
+import GameModel from "../GameModel";
 import Pants3DEndShader from "./Pants3DEndShader";
 
 export enum PantsState {

diff --git a/frontend/src/lib/Camera.ts b/frontend/src/lib/Camera.ts
@@ -3,7 +3,7 @@ import Renderer from "./Renderer";
 import {lerp, Matrix4, Vector2, Vector3, Vector4} from "math.gl";
 import UI from "./UI/UI";
 import Model from "./model/Model";
-import GameModel from "../../public/GameModel";
+import GameModel from "../GameModel";
 
 export default class Camera extends UniformGroup {
     public static instance: Camera;

diff --git a/frontend/src/lib/animation/AnimationMixer.ts b/frontend/src/lib/animation/AnimationMixer.ts
@@ -1,6 +1,6 @@
 import Animation from "./Animation";
 import UI from "../UI/UI";
-import GameModel from "../../../public/GameModel";
+import GameModel from "../../GameModel";
 
 export default class AnimationMixer {
     public animationsByName: { [name: string]: Animation } = {};

diff --git a/frontend/src/lib/model/ModelRenderer.ts b/frontend/src/lib/model/ModelRenderer.ts
@@ -1,7 +1,7 @@
 import Model from "./Model";
 import RenderPass from "../core/RenderPass";
 import Renderer from "../Renderer";
-import GameModel from "../../../public/GameModel";
+import GameModel from "../../GameModel";
 
 export default class ModelRenderer {
 

diff --git a/frontend/src/renderPasses/CanvasRenderPass.ts b/frontend/src/renderPasses/CanvasRenderPass.ts
@@ -13,7 +13,7 @@ import SelectItem from "../lib/UI/math/SelectItem";
 import RenderSettings from "../RenderSettings";
 
 import FontMeshRenderer from "../lib/text/FontMeshRenderer";
-import GameModel from "../../public/GameModel";
+import GameModel from "../GameModel";
 import DefaultTextures from "../lib/textures/DefaultTextures";
 
 

diff --git a/frontend/src/renderPasses/LightOutsideRenderPass.ts b/frontend/src/renderPasses/LightOutsideRenderPass.ts
@@ -20,7 +20,7 @@ import ColorV from "../lib/ColorV";
 
 import GlobalLightOutsideShader from "../shaders/GlobalLightOutsideShader";
 import RenderSettings from "../RenderSettings";
-import GameModel from "../../public/GameModel";
+import GameModel from "../GameModel";
 import Object3D from "../lib/core/Object3D";
 import ModelRenderer from "../lib/model/ModelRenderer";
 import PointLight from "./PointLight";

diff --git a/frontend/src/renderPasses/LightRoomRenderPass.ts b/frontend/src/renderPasses/LightRoomRenderPass.ts
@@ -17,7 +17,7 @@ import ColorV from "../lib/ColorV";
 import {saveToJsonFile} from "../lib/SaveUtils";
 import MainLight from "../MainLight";
 import Object3D from "../lib/core/Object3D";
-import GameModel from "../../public/GameModel";
+import GameModel from "../GameModel";
 import RenderSettings from "../RenderSettings";
 import MathArray from "@math.gl/core/src/classes/base/math-array";