diff --git a/frontend/src/CharacterHandler.ts b/frontend/src/CharacterHandler.ts index cb6d056..3d3e67d 100644 --- 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 index 4fa4830..cdf2ca7 100644 --- 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 b/frontend/src/GameModel.ts similarity index 82% rename from frontend/public/GameModel.ts rename to frontend/src/GameModel.ts index e6c6ba3..c2e4708 100644 --- a/frontend/public/GameModel.ts +++ b/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 index 401e088..8ee6c66 100644 --- 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 index 091e3dc..012f5f2 100644 --- 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 index 2bcdf3f..891f99e 100644 --- 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 index 3a74e15..81c920b 100644 --- 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 index bf4afb2..a514649 100644 --- 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 index 23b9bbd..c49126d 100644 --- 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 index a981d8f..198a0f2 100644 --- 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 index 5eeb315..df1e82d 100644 --- 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 index d0232be..dd32b36 100644 --- 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 index f4f06d2..a4d3d3b 100644 --- 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 index d787ee6..fe63765 100644 --- 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 index 5790f6f..f33d21f 100644 --- 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 index 2edce6b..66933b1 100644 --- 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 index 27a21b4..e3f99fe 100644 --- 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 index ab61ae2..b8e6ef3 100644 --- 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 index 5445e69..e25894a 100644 --- 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 index b444459..8eaf7dd 100644 --- 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 index 7a59bc7..cdb8604 100644 --- 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 index 5ef1a0f..7812197 100644 --- 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 index 526f1f3..f8873f4 100644 --- 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 index 0170741..477b0ed 100644 --- 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 index 41746a0..b74fe61 100644 --- 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 index d56a68d..f72ce84 100644 --- 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"; diff --git a/frontend/src/renderPasses/ShadowCube.ts b/frontend/src/renderPasses/ShadowCube.ts index 3be483e..ff963eb 100644 --- a/frontend/src/renderPasses/ShadowCube.ts +++ b/frontend/src/renderPasses/ShadowCube.ts @@ -6,7 +6,7 @@ import Camera from "../lib/Camera"; import {Vector3} from "math.gl"; import Model from "../lib/model/Model"; -import GameModel from "../../public/GameModel"; +import GameModel from "../GameModel"; export default class ShadowCube { diff --git a/frontend/src/renderPasses/ShadowCubePass.ts b/frontend/src/renderPasses/ShadowCubePass.ts index a0b6563..20f026f 100644 --- a/frontend/src/renderPasses/ShadowCubePass.ts +++ b/frontend/src/renderPasses/ShadowCubePass.ts @@ -8,7 +8,7 @@ import ModelRenderer from "../lib/model/ModelRenderer"; import Model from "../lib/model/Model"; import Camera from "../lib/Camera"; -import GameModel from "../../public/GameModel"; +import GameModel from "../GameModel"; export default class ShadowCubePass extends RenderPass { diff --git a/frontend/src/renderPasses/ShadowPass.ts b/frontend/src/renderPasses/ShadowPass.ts index 03f890a..14bf52e 100644 --- a/frontend/src/renderPasses/ShadowPass.ts +++ b/frontend/src/renderPasses/ShadowPass.ts @@ -12,7 +12,7 @@ import DepthSkinShader from "../shaders/DepthSkinShader"; import Camera from "../lib/Camera"; import {Vector3} from "math.gl"; import UI from "../lib/UI/UI"; -import GameModel from "../../public/GameModel"; +import GameModel from "../GameModel"; export default class ShadowPass extends RenderPass { diff --git a/frontend/src/transitions/DigGrave.ts b/frontend/src/transitions/DigGrave.ts index 0b64648..8cc5f77 100644 --- a/frontend/src/transitions/DigGrave.ts +++ b/frontend/src/transitions/DigGrave.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel, {Scenes, StateGold, UIState} from "../../public/GameModel"; +import GameModel, {Scenes, StateGold, UIState} from "../GameModel"; import RenderSettings from "../RenderSettings"; import {CURSOR} from "../ui/Cursor"; diff --git a/frontend/src/transitions/FeedFish.ts b/frontend/src/transitions/FeedFish.ts index 28dcd28..222dc89 100644 --- a/frontend/src/transitions/FeedFish.ts +++ b/frontend/src/transitions/FeedFish.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel, {StateGrandpa} from "../../public/GameModel"; +import GameModel, {StateGrandpa} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class FeedFish extends Transition { diff --git a/frontend/src/transitions/FindFasionPants.ts b/frontend/src/transitions/FindFasionPants.ts index 2af7cec..3463f95 100644 --- a/frontend/src/transitions/FindFasionPants.ts +++ b/frontend/src/transitions/FindFasionPants.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel, {Pants, StateFasion, UIState} from "../../public/GameModel"; +import GameModel, {Pants, StateFasion, UIState} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class FindFasionPants extends Transition { diff --git a/frontend/src/transitions/FindGirlPants.ts b/frontend/src/transitions/FindGirlPants.ts index 891c56c..320187d 100644 --- a/frontend/src/transitions/FindGirlPants.ts +++ b/frontend/src/transitions/FindGirlPants.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel, {Pants, StateGirl, UIState} from "../../public/GameModel"; +import GameModel, {Pants, StateGirl, UIState} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class FindGirlpaPants extends Transition { diff --git a/frontend/src/transitions/FindGlowPants.ts b/frontend/src/transitions/FindGlowPants.ts index e760476..0b8dfcc 100644 --- a/frontend/src/transitions/FindGlowPants.ts +++ b/frontend/src/transitions/FindGlowPants.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel, {Pants, StateHighTech, UIState} from "../../public/GameModel"; +import GameModel, {Pants, StateHighTech, UIState} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class FindGlowPants extends Transition { diff --git a/frontend/src/transitions/FindGrandpaPants.ts b/frontend/src/transitions/FindGrandpaPants.ts index 5e8ac0b..f6a3ad9 100644 --- a/frontend/src/transitions/FindGrandpaPants.ts +++ b/frontend/src/transitions/FindGrandpaPants.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel, {Pants, StateGrandpa, UIState} from "../../public/GameModel"; +import GameModel, {Pants, StateGrandpa, UIState} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class FindGrandpaPants extends Transition { diff --git a/frontend/src/transitions/FindHunterPants.ts b/frontend/src/transitions/FindHunterPants.ts index 5f4866b..082faea 100644 --- a/frontend/src/transitions/FindHunterPants.ts +++ b/frontend/src/transitions/FindHunterPants.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel, {Pants, StateHunter, UIState} from "../../public/GameModel"; +import GameModel, {Pants, StateHunter, UIState} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class FindHunterPants extends Transition { diff --git a/frontend/src/transitions/GoGrave.ts b/frontend/src/transitions/GoGrave.ts index f18115a..66ebf81 100644 --- a/frontend/src/transitions/GoGrave.ts +++ b/frontend/src/transitions/GoGrave.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel, {StateGrandpa} from "../../public/GameModel"; +import GameModel, {StateGrandpa} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class GoGrave extends Transition { diff --git a/frontend/src/transitions/GoInside.ts b/frontend/src/transitions/GoInside.ts index 1024fad..a2d6fea 100644 --- a/frontend/src/transitions/GoInside.ts +++ b/frontend/src/transitions/GoInside.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel, {Scenes} from "../../public/GameModel"; +import GameModel, {Scenes} from "../GameModel"; import {Vector3} from "math.gl"; import Timeline from "gsap"; import RenderSettings from "../RenderSettings"; diff --git a/frontend/src/transitions/GoLeftRoom.ts b/frontend/src/transitions/GoLeftRoom.ts index 657eff5..93ee8b3 100644 --- a/frontend/src/transitions/GoLeftRoom.ts +++ b/frontend/src/transitions/GoLeftRoom.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel from "../../public/GameModel"; +import GameModel from "../GameModel"; import gsap from "gsap"; export default class GoLeftRoom extends Transition { diff --git a/frontend/src/transitions/GoOutside.ts b/frontend/src/transitions/GoOutside.ts index b987bd8..2961616 100644 --- a/frontend/src/transitions/GoOutside.ts +++ b/frontend/src/transitions/GoOutside.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel, {Scenes} from "../../public/GameModel"; +import GameModel, {Scenes} from "../GameModel"; import {Vector3} from "math.gl"; import Timeline from "gsap"; import RenderSettings from "../RenderSettings"; diff --git a/frontend/src/transitions/GoRightRoom.ts b/frontend/src/transitions/GoRightRoom.ts index 4bf2cb2..18d4aba 100644 --- a/frontend/src/transitions/GoRightRoom.ts +++ b/frontend/src/transitions/GoRightRoom.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel, {StateFasion, StateGold, StateHighTech} from "../../public/GameModel"; +import GameModel, {StateFasion, StateGold, StateHighTech} from "../GameModel"; import gsap from "gsap"; export default class GoRightRoom extends Transition { diff --git a/frontend/src/transitions/OpenBookcase.ts b/frontend/src/transitions/OpenBookcase.ts index c20a76b..66df6df 100644 --- a/frontend/src/transitions/OpenBookcase.ts +++ b/frontend/src/transitions/OpenBookcase.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel, {StateGold, UIState} from "../../public/GameModel"; +import GameModel, {StateGold, UIState} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; import RenderSettings from "../RenderSettings"; diff --git a/frontend/src/transitions/PickFlower.ts b/frontend/src/transitions/PickFlower.ts index f484cbd..f93cbe4 100644 --- a/frontend/src/transitions/PickFlower.ts +++ b/frontend/src/transitions/PickFlower.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel, {StateHighTech} from "../../public/GameModel"; +import GameModel, {StateHighTech} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class PickFlower extends Transition { diff --git a/frontend/src/transitions/PushBirdHouse.ts b/frontend/src/transitions/PushBirdHouse.ts index 7d2a59f..476d325 100644 --- a/frontend/src/transitions/PushBirdHouse.ts +++ b/frontend/src/transitions/PushBirdHouse.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel, {StateGirl} from "../../public/GameModel"; +import GameModel, {StateGirl} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; import gsap from "gsap" diff --git a/frontend/src/transitions/ReadMail.ts b/frontend/src/transitions/ReadMail.ts index 14264fe..fd538db 100644 --- a/frontend/src/transitions/ReadMail.ts +++ b/frontend/src/transitions/ReadMail.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel, {StateFasion} from "../../public/GameModel"; +import GameModel, {StateFasion} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class ReadMail extends Transition { diff --git a/frontend/src/transitions/Sit.ts b/frontend/src/transitions/Sit.ts index d3b56d2..8b7d0b3 100644 --- a/frontend/src/transitions/Sit.ts +++ b/frontend/src/transitions/Sit.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel from "../../public/GameModel"; +import GameModel from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class Sit extends Transition { diff --git a/frontend/src/transitions/StartGame.ts b/frontend/src/transitions/StartGame.ts index 1b3eaa9..7f5b27f 100644 --- a/frontend/src/transitions/StartGame.ts +++ b/frontend/src/transitions/StartGame.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel, {Scenes} from "../../public/GameModel"; +import GameModel, {Scenes} from "../GameModel"; import Timeline from "gsap"; import RenderSettings from "../RenderSettings"; import {CURSOR} from "../ui/Cursor"; diff --git a/frontend/src/transitions/StartMachine.ts b/frontend/src/transitions/StartMachine.ts index 539575f..792fb7e 100644 --- a/frontend/src/transitions/StartMachine.ts +++ b/frontend/src/transitions/StartMachine.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel, {StateHighTech} from "../../public/GameModel"; +import GameModel, {StateHighTech} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class StartMachine extends Transition { diff --git a/frontend/src/transitions/StartMill.ts b/frontend/src/transitions/StartMill.ts index b5b6f58..eb3a8cd 100644 --- a/frontend/src/transitions/StartMill.ts +++ b/frontend/src/transitions/StartMill.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel, {MillState, StateGold} from "../../public/GameModel"; +import GameModel, {MillState, StateGold} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class StartMill extends Transition { diff --git a/frontend/src/transitions/TakeFishFood.ts b/frontend/src/transitions/TakeFishFood.ts index a04f6e4..25d211d 100644 --- a/frontend/src/transitions/TakeFishFood.ts +++ b/frontend/src/transitions/TakeFishFood.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel, {StateGrandpa} from "../../public/GameModel"; +import GameModel, {StateGrandpa} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class TakeFishFood extends Transition { diff --git a/frontend/src/transitions/TakeKey.ts b/frontend/src/transitions/TakeKey.ts index b2e70f2..f12ee16 100644 --- a/frontend/src/transitions/TakeKey.ts +++ b/frontend/src/transitions/TakeKey.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel, {StateGold} from "../../public/GameModel"; +import GameModel, {StateGold} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class TakeKey extends Transition { diff --git a/frontend/src/transitions/TakeShovel.ts b/frontend/src/transitions/TakeShovel.ts index 4a310d7..d0bd2cf 100644 --- a/frontend/src/transitions/TakeShovel.ts +++ b/frontend/src/transitions/TakeShovel.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel, {StateGold} from "../../public/GameModel"; +import GameModel, {StateGold} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class TakeShovel extends Transition { diff --git a/frontend/src/transitions/TakeStick.ts b/frontend/src/transitions/TakeStick.ts index d33e4bf..12f4163 100644 --- a/frontend/src/transitions/TakeStick.ts +++ b/frontend/src/transitions/TakeStick.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel, {StateGirl} from "../../public/GameModel"; +import GameModel, {StateGirl} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; diff --git a/frontend/src/transitions/TextInfo.ts b/frontend/src/transitions/TextInfo.ts index 6975c23..2fb0476 100644 --- a/frontend/src/transitions/TextInfo.ts +++ b/frontend/src/transitions/TextInfo.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel from "../../public/GameModel"; +import GameModel from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class TextInfo extends Transition { diff --git a/frontend/src/transitions/TextInfoLock.ts b/frontend/src/transitions/TextInfoLock.ts index b15dc89..0e1ab25 100644 --- a/frontend/src/transitions/TextInfoLock.ts +++ b/frontend/src/transitions/TextInfoLock.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel from "../../public/GameModel"; +import GameModel from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class TextInfoLock extends Transition { diff --git a/frontend/src/transitions/WearPants.ts b/frontend/src/transitions/WearPants.ts index 1dabbd1..0c837b8 100644 --- a/frontend/src/transitions/WearPants.ts +++ b/frontend/src/transitions/WearPants.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel from "../../public/GameModel"; +import GameModel from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class WearPants extends Transition { diff --git a/frontend/src/transitions/Work.ts b/frontend/src/transitions/Work.ts index 471eefe..3d09672 100644 --- a/frontend/src/transitions/Work.ts +++ b/frontend/src/transitions/Work.ts @@ -1,5 +1,5 @@ import Transition from "./Transition"; -import GameModel, {StateFasion, StateGirl, StateHighTech} from "../../public/GameModel"; +import GameModel, {StateFasion, StateGirl, StateHighTech} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; import {PantsState} from "../extras/Pants3D"; diff --git a/frontend/src/trigers/BirdHouseTrigger.ts b/frontend/src/trigers/BirdHouseTrigger.ts index bbb959b..96eee1e 100644 --- a/frontend/src/trigers/BirdHouseTrigger.ts +++ b/frontend/src/trigers/BirdHouseTrigger.ts @@ -1,5 +1,5 @@ import HitTrigger from "./HitTrigger"; -import GameModel, {StateGirl, Transitions} from "../../public/GameModel"; +import GameModel, {StateGirl, Transitions} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class BirdHouseTrigger extends HitTrigger { diff --git a/frontend/src/trigers/BookCaseTrigger.ts b/frontend/src/trigers/BookCaseTrigger.ts index 460f12f..29ac68c 100644 --- a/frontend/src/trigers/BookCaseTrigger.ts +++ b/frontend/src/trigers/BookCaseTrigger.ts @@ -1,5 +1,5 @@ import HitTrigger from "./HitTrigger"; -import GameModel, {StateGold, Transitions} from "../../public/GameModel"; +import GameModel, {StateGold, Transitions} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; import {Vector3} from "math.gl"; diff --git a/frontend/src/trigers/DigGraveTrigger.ts b/frontend/src/trigers/DigGraveTrigger.ts index e1f7ad5..7d678e2 100644 --- a/frontend/src/trigers/DigGraveTrigger.ts +++ b/frontend/src/trigers/DigGraveTrigger.ts @@ -1,5 +1,5 @@ import HitTrigger from "./HitTrigger"; -import GameModel, {StateGold, Transitions} from "../../public/GameModel"; +import GameModel, {StateGold, Transitions} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class DigGraveTrigger extends HitTrigger { diff --git a/frontend/src/trigers/DoorGoInsideTrigger.ts b/frontend/src/trigers/DoorGoInsideTrigger.ts index aeaad9c..e8a36e0 100644 --- a/frontend/src/trigers/DoorGoInsideTrigger.ts +++ b/frontend/src/trigers/DoorGoInsideTrigger.ts @@ -7,7 +7,7 @@ import GameModel, { StateHighTech, StateHunter, Transitions -} from "../../public/GameModel"; +} from "../GameModel"; import {Vector3} from "math.gl"; import {CURSOR} from "../ui/Cursor"; diff --git a/frontend/src/trigers/DoorGoOutsideTrigger.ts b/frontend/src/trigers/DoorGoOutsideTrigger.ts index d01efc5..95748e2 100644 --- a/frontend/src/trigers/DoorGoOutsideTrigger.ts +++ b/frontend/src/trigers/DoorGoOutsideTrigger.ts @@ -1,5 +1,5 @@ import HitTrigger from "./HitTrigger"; -import GameModel, {Pants, StateGold, Transitions} from "../../public/GameModel"; +import GameModel, {Pants, StateGold, Transitions} from "../GameModel"; import {Vector3} from "math.gl"; import {CURSOR} from "../ui/Cursor"; diff --git a/frontend/src/trigers/DoorInsideTrigger.ts b/frontend/src/trigers/DoorInsideTrigger.ts index 9479918..f36cd57 100644 --- a/frontend/src/trigers/DoorInsideTrigger.ts +++ b/frontend/src/trigers/DoorInsideTrigger.ts @@ -1,5 +1,5 @@ import HitTrigger from "./HitTrigger"; -import GameModel, {StateFasion, Transitions} from "../../public/GameModel"; +import GameModel, {StateFasion, Transitions} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class DoorInsideTrigger extends HitTrigger { diff --git a/frontend/src/trigers/FishFoodTrigger.ts b/frontend/src/trigers/FishFoodTrigger.ts index 8d3dca6..d0cb2e0 100644 --- a/frontend/src/trigers/FishFoodTrigger.ts +++ b/frontend/src/trigers/FishFoodTrigger.ts @@ -1,5 +1,5 @@ import HitTrigger from "./HitTrigger"; -import GameModel, {Transitions} from "../../public/GameModel"; +import GameModel, {Transitions} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; import {Vector3} from "math.gl"; diff --git a/frontend/src/trigers/FishTrigger.ts b/frontend/src/trigers/FishTrigger.ts index 48fa651..90674dc 100644 --- a/frontend/src/trigers/FishTrigger.ts +++ b/frontend/src/trigers/FishTrigger.ts @@ -1,5 +1,5 @@ import HitTrigger from "./HitTrigger"; -import GameModel, {StateGrandpa, Transitions} from "../../public/GameModel"; +import GameModel, {StateGrandpa, Transitions} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class FishTrigger extends HitTrigger { diff --git a/frontend/src/trigers/FloorHitTrigger.ts b/frontend/src/trigers/FloorHitTrigger.ts index 21ae783..dc77aaf 100644 --- a/frontend/src/trigers/FloorHitTrigger.ts +++ b/frontend/src/trigers/FloorHitTrigger.ts @@ -1,4 +1,4 @@ -import GameModel from "../../public/GameModel"; +import GameModel from "../GameModel"; import {CURSOR} from "../ui/Cursor"; import HitTrigger from "./HitTrigger"; diff --git a/frontend/src/trigers/FlowerHitTrigger.ts b/frontend/src/trigers/FlowerHitTrigger.ts index d4865f6..101dfae 100644 --- a/frontend/src/trigers/FlowerHitTrigger.ts +++ b/frontend/src/trigers/FlowerHitTrigger.ts @@ -1,5 +1,5 @@ import HitTrigger from "./HitTrigger"; -import GameModel, {Transitions} from "../../public/GameModel"; +import GameModel, {Transitions} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; import {Vector3} from "math.gl"; diff --git a/frontend/src/trigers/FlowerPotHitTrigger.ts b/frontend/src/trigers/FlowerPotHitTrigger.ts index ccab1e5..de6c9c1 100644 --- a/frontend/src/trigers/FlowerPotHitTrigger.ts +++ b/frontend/src/trigers/FlowerPotHitTrigger.ts @@ -1,5 +1,5 @@ import HitTrigger from "./HitTrigger"; -import GameModel, {StateHighTech, Transitions} from "../../public/GameModel"; +import GameModel, {StateHighTech, Transitions} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class FlowerPotHitTrigger extends HitTrigger { diff --git a/frontend/src/trigers/GirlPantsTrigger.ts b/frontend/src/trigers/GirlPantsTrigger.ts index 5be88a0..7a9ad49 100644 --- a/frontend/src/trigers/GirlPantsTrigger.ts +++ b/frontend/src/trigers/GirlPantsTrigger.ts @@ -1,5 +1,5 @@ import HitTrigger from "./HitTrigger"; -import GameModel, {Transitions} from "../../public/GameModel"; +import GameModel, {Transitions} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class GirlPantsTrigger extends HitTrigger { diff --git a/frontend/src/trigers/GoGraveTrigger.ts b/frontend/src/trigers/GoGraveTrigger.ts index 215ead1..0167929 100644 --- a/frontend/src/trigers/GoGraveTrigger.ts +++ b/frontend/src/trigers/GoGraveTrigger.ts @@ -1,5 +1,5 @@ import HitTrigger from "./HitTrigger"; -import GameModel, {Transitions} from "../../public/GameModel"; +import GameModel, {Transitions} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class GoGraveTrigger extends HitTrigger { diff --git a/frontend/src/trigers/GoHunterPants.ts b/frontend/src/trigers/GoHunterPants.ts index 12213ce..49208c3 100644 --- a/frontend/src/trigers/GoHunterPants.ts +++ b/frontend/src/trigers/GoHunterPants.ts @@ -1,5 +1,5 @@ import HitTrigger from "./HitTrigger"; -import GameModel, {StateGrandpa, Transitions} from "../../public/GameModel"; +import GameModel, {StateGrandpa, Transitions} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class GoHunterTrigger extends HitTrigger { diff --git a/frontend/src/trigers/GoWorkTrigger.ts b/frontend/src/trigers/GoWorkTrigger.ts index 2e181bd..fcf26a9 100644 --- a/frontend/src/trigers/GoWorkTrigger.ts +++ b/frontend/src/trigers/GoWorkTrigger.ts @@ -1,5 +1,5 @@ import HitTrigger from "./HitTrigger"; -import GameModel, {StateFasion, Transitions} from "../../public/GameModel"; +import GameModel, {StateFasion, Transitions} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class GoWorkTrigger extends HitTrigger { diff --git a/frontend/src/trigers/GrandpaFishTrigger.ts b/frontend/src/trigers/GrandpaFishTrigger.ts index 066af05..ebbdc8f 100644 --- a/frontend/src/trigers/GrandpaFishTrigger.ts +++ b/frontend/src/trigers/GrandpaFishTrigger.ts @@ -1,5 +1,5 @@ import Trigger from "./Trigger"; -import GameModel, {Scenes, StateGrandpa} from "../../public/GameModel"; +import GameModel, {Scenes, StateGrandpa} from "../GameModel"; export default class GrandpaFishTrigger extends Trigger { constructor(scene: Scenes) { diff --git a/frontend/src/trigers/GrandpaPantsTrigger.ts b/frontend/src/trigers/GrandpaPantsTrigger.ts index 630df37..d08ebbe 100644 --- a/frontend/src/trigers/GrandpaPantsTrigger.ts +++ b/frontend/src/trigers/GrandpaPantsTrigger.ts @@ -1,5 +1,5 @@ import HitTrigger from "./HitTrigger"; -import GameModel, {Transitions} from "../../public/GameModel"; +import GameModel, {Transitions} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class GrandpaPantsTrigger extends HitTrigger { diff --git a/frontend/src/trigers/HighTechPantsTrigger.ts b/frontend/src/trigers/HighTechPantsTrigger.ts index f461aa6..08d6392 100644 --- a/frontend/src/trigers/HighTechPantsTrigger.ts +++ b/frontend/src/trigers/HighTechPantsTrigger.ts @@ -1,5 +1,5 @@ import HitTrigger from "./HitTrigger"; -import GameModel, {StateHighTech, Transitions} from "../../public/GameModel"; +import GameModel, {StateHighTech, Transitions} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class HighTechPantsTrigger extends HitTrigger { diff --git a/frontend/src/trigers/HitTextTrigger.ts b/frontend/src/trigers/HitTextTrigger.ts index 2a65fdc..ab425b6 100644 --- a/frontend/src/trigers/HitTextTrigger.ts +++ b/frontend/src/trigers/HitTextTrigger.ts @@ -1,5 +1,5 @@ import HitTrigger from "./HitTrigger"; -import GameModel, {Scenes, Transitions} from "../../public/GameModel"; +import GameModel, {Scenes, Transitions} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class HitTextTrigger extends HitTrigger { diff --git a/frontend/src/trigers/HitTrigger.ts b/frontend/src/trigers/HitTrigger.ts index 823250a..748d2c7 100644 --- a/frontend/src/trigers/HitTrigger.ts +++ b/frontend/src/trigers/HitTrigger.ts @@ -1,5 +1,5 @@ import Trigger from "./Trigger"; -import GameModel, {Scenes} from "../../public/GameModel"; +import GameModel, {Scenes} from "../GameModel"; import {isArray} from "math.gl"; diff --git a/frontend/src/trigers/KeyTrigger.ts b/frontend/src/trigers/KeyTrigger.ts index 341587c..ac78a14 100644 --- a/frontend/src/trigers/KeyTrigger.ts +++ b/frontend/src/trigers/KeyTrigger.ts @@ -1,5 +1,5 @@ import HitTrigger from "./HitTrigger"; -import GameModel, {Transitions} from "../../public/GameModel"; +import GameModel, {Transitions} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class KeyTrigger extends HitTrigger { diff --git a/frontend/src/trigers/MachineTrigger.ts b/frontend/src/trigers/MachineTrigger.ts index c422f20..4097a6d 100644 --- a/frontend/src/trigers/MachineTrigger.ts +++ b/frontend/src/trigers/MachineTrigger.ts @@ -1,5 +1,5 @@ import HitTrigger from "./HitTrigger"; -import GameModel, {StateHighTech, Transitions} from "../../public/GameModel"; +import GameModel, {StateHighTech, Transitions} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; import {Vector3} from "math.gl"; diff --git a/frontend/src/trigers/MailBoxTrigger.ts b/frontend/src/trigers/MailBoxTrigger.ts index e39f461..37ece3b 100644 --- a/frontend/src/trigers/MailBoxTrigger.ts +++ b/frontend/src/trigers/MailBoxTrigger.ts @@ -1,5 +1,5 @@ import HitTrigger from "./HitTrigger"; -import GameModel, {Transitions} from "../../public/GameModel"; +import GameModel, {Transitions} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class MailBoxTrigger extends HitTrigger { diff --git a/frontend/src/trigers/MillTrigger.ts b/frontend/src/trigers/MillTrigger.ts index 5472d53..85f8308 100644 --- a/frontend/src/trigers/MillTrigger.ts +++ b/frontend/src/trigers/MillTrigger.ts @@ -1,5 +1,5 @@ import HitTrigger from "./HitTrigger"; -import GameModel, {StateGold, Transitions} from "../../public/GameModel"; +import GameModel, {StateGold, Transitions} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class MillTrigger extends HitTrigger { diff --git a/frontend/src/trigers/PackageTrigger.ts b/frontend/src/trigers/PackageTrigger.ts index 5646b8a..93b92f5 100644 --- a/frontend/src/trigers/PackageTrigger.ts +++ b/frontend/src/trigers/PackageTrigger.ts @@ -1,5 +1,5 @@ import HitTrigger from "./HitTrigger"; -import GameModel, {Transitions} from "../../public/GameModel"; +import GameModel, {Transitions} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; import {Vector3} from "math.gl"; diff --git a/frontend/src/trigers/ShovelTrigger.ts b/frontend/src/trigers/ShovelTrigger.ts index c1d2046..56ebffc 100644 --- a/frontend/src/trigers/ShovelTrigger.ts +++ b/frontend/src/trigers/ShovelTrigger.ts @@ -1,5 +1,5 @@ import HitTrigger from "./HitTrigger"; -import GameModel, {StateGold, Transitions} from "../../public/GameModel"; +import GameModel, {StateGold, Transitions} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; import {Vector3} from "math.gl"; diff --git a/frontend/src/trigers/SitTrigger.ts b/frontend/src/trigers/SitTrigger.ts index 92b00e3..f61c881 100644 --- a/frontend/src/trigers/SitTrigger.ts +++ b/frontend/src/trigers/SitTrigger.ts @@ -1,5 +1,5 @@ import HitTrigger from "./HitTrigger"; -import GameModel, {Transitions} from "../../public/GameModel"; +import GameModel, {Transitions} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class SitTrigger extends HitTrigger { diff --git a/frontend/src/trigers/StickTrigger.ts b/frontend/src/trigers/StickTrigger.ts index 5897d6b..12f8d8e 100644 --- a/frontend/src/trigers/StickTrigger.ts +++ b/frontend/src/trigers/StickTrigger.ts @@ -1,5 +1,5 @@ import HitTrigger from "./HitTrigger"; -import GameModel, {Transitions} from "../../public/GameModel"; +import GameModel, {Transitions} from "../GameModel"; import {CURSOR} from "../ui/Cursor"; export default class StickTrigger extends HitTrigger { diff --git a/frontend/src/trigers/Trigger.ts b/frontend/src/trigers/Trigger.ts index f742a3d..79424b2 100644 --- a/frontend/src/trigers/Trigger.ts +++ b/frontend/src/trigers/Trigger.ts @@ -1,4 +1,4 @@ -import GameModel, {Scenes} from "../../public/GameModel"; +import GameModel, {Scenes} from "../GameModel"; export default class Trigger { private scene: Scenes; diff --git a/frontend/src/ui/CheckButton.ts b/frontend/src/ui/CheckButton.ts index d09b38f..051c20c 100644 --- a/frontend/src/ui/CheckButton.ts +++ b/frontend/src/ui/CheckButton.ts @@ -1,7 +1,7 @@ import UIBitmapModel from "../lib/model/UIBitmapModel"; import Renderer from "../lib/Renderer"; import PreLoader from "../lib/PreLoader"; -import GameModel from "../../public/GameModel"; +import GameModel from "../GameModel"; import gsap from "gsap"; import UIData from "../UIData"; diff --git a/frontend/src/ui/CloseButton.ts b/frontend/src/ui/CloseButton.ts index bc50e68..54b4cb4 100644 --- a/frontend/src/ui/CloseButton.ts +++ b/frontend/src/ui/CloseButton.ts @@ -2,7 +2,7 @@ import UIBitmapModel from "../lib/model/UIBitmapModel"; import Renderer from "../lib/Renderer"; import PreLoader from "../lib/PreLoader"; import gsap from "gsap"; -import GameModel from "../../public/GameModel"; +import GameModel from "../GameModel"; export default class CloseButton extends UIBitmapModel { diff --git a/frontend/src/ui/CursorIconWalk.ts b/frontend/src/ui/CursorIconWalk.ts index 3bc0bb5..be110df 100644 --- a/frontend/src/ui/CursorIconWalk.ts +++ b/frontend/src/ui/CursorIconWalk.ts @@ -3,7 +3,7 @@ import Renderer from "../lib/Renderer"; import PreLoader from "../lib/PreLoader"; import UIBitmapModel from "../lib/model/UIBitmapModel"; -import GameModel from "../../public/GameModel"; +import GameModel from "../GameModel"; import gsap from "gsap"; export default class CursorIconWalk extends CursorIcon { diff --git a/frontend/src/ui/DraggButton.ts b/frontend/src/ui/DraggButton.ts index 9e7c367..95d0eca 100644 --- a/frontend/src/ui/DraggButton.ts +++ b/frontend/src/ui/DraggButton.ts @@ -1,7 +1,7 @@ import UIBitmapModel from "../lib/model/UIBitmapModel"; import Renderer from "../lib/Renderer"; import PreLoader from "../lib/PreLoader"; -import GameModel from "../../public/GameModel"; +import GameModel from "../GameModel"; import gsap from "gsap"; import {clamp, Vector3} from "math.gl"; diff --git a/frontend/src/ui/Endscreen.ts b/frontend/src/ui/Endscreen.ts index 9c18d26..d313277 100644 --- a/frontend/src/ui/Endscreen.ts +++ b/frontend/src/ui/Endscreen.ts @@ -2,7 +2,7 @@ import UIBitmapModel from "../lib/model/UIBitmapModel"; import Renderer from "../lib/Renderer"; import PreLoader from "../lib/PreLoader"; -import GameModel from "../../public/GameModel"; +import GameModel from "../GameModel"; import gsap from "gsap"; diff --git a/frontend/src/ui/EnterButton.ts b/frontend/src/ui/EnterButton.ts index 2d599de..1665c4b 100644 --- a/frontend/src/ui/EnterButton.ts +++ b/frontend/src/ui/EnterButton.ts @@ -2,7 +2,7 @@ import UIBitmapModel from "../lib/model/UIBitmapModel"; import Renderer from "../lib/Renderer"; import PreLoader from "../lib/PreLoader"; import gsap from "gsap"; -import GameModel, {Transitions} from "../../public/GameModel"; +import GameModel, {Transitions} from "../GameModel"; export default class EnterButton extends UIBitmapModel { diff --git a/frontend/src/ui/GameUI.ts b/frontend/src/ui/GameUI.ts index cd65545..7aac266 100644 --- a/frontend/src/ui/GameUI.ts +++ b/frontend/src/ui/GameUI.ts @@ -1,7 +1,7 @@ import Renderer from "../lib/Renderer"; import PreLoader from "../lib/PreLoader"; import Camera from "../lib/Camera"; -import GameModel, {StateGold, Transitions, UIState} from "../../public/GameModel"; +import GameModel, {StateGold, Transitions, UIState} from "../GameModel"; import UIModelRenderer from "./UIModelRenderer"; import {Vector2} from "math.gl"; import UIModel from "../lib/model/UIModel"; diff --git a/frontend/src/ui/GithubButton.ts b/frontend/src/ui/GithubButton.ts index c773c58..a9b67d0 100644 --- a/frontend/src/ui/GithubButton.ts +++ b/frontend/src/ui/GithubButton.ts @@ -2,7 +2,7 @@ import UIBitmapModel from "../lib/model/UIBitmapModel"; import Renderer from "../lib/Renderer"; import PreLoader from "../lib/PreLoader"; import gsap from "gsap"; -import GameModel from "../../public/GameModel"; +import GameModel from "../GameModel"; export default class GithubButton extends UIBitmapModel { diff --git a/frontend/src/ui/Inventory.ts b/frontend/src/ui/Inventory.ts index 5c713d5..98e5153 100644 --- a/frontend/src/ui/Inventory.ts +++ b/frontend/src/ui/Inventory.ts @@ -1,7 +1,7 @@ import UIBitmapModel from "../lib/model/UIBitmapModel"; import Renderer from "../lib/Renderer"; import PreLoader from "../lib/PreLoader"; -import GameModel from "../../public/GameModel"; +import GameModel from "../GameModel"; import gsap from "gsap"; import InventoryButton from "./InventoryButton"; diff --git a/frontend/src/ui/InventoryButton.ts b/frontend/src/ui/InventoryButton.ts index 37f2c80..38c6722 100644 --- a/frontend/src/ui/InventoryButton.ts +++ b/frontend/src/ui/InventoryButton.ts @@ -1,7 +1,7 @@ import UIBitmapModel from "../lib/model/UIBitmapModel"; import Renderer from "../lib/Renderer"; import PreLoader from "../lib/PreLoader"; -import GameModel, {UIState} from "../../public/GameModel"; +import GameModel, {UIState} from "../GameModel"; import gsap from "gsap"; export default class InventoryButton extends UIBitmapModel { diff --git a/frontend/src/ui/InventoryDetail.ts b/frontend/src/ui/InventoryDetail.ts index 2dcfa9d..5bef2bc 100644 --- a/frontend/src/ui/InventoryDetail.ts +++ b/frontend/src/ui/InventoryDetail.ts @@ -1,7 +1,7 @@ import UIBitmapModel from "../lib/model/UIBitmapModel"; import Renderer from "../lib/Renderer"; import PreLoader from "../lib/PreLoader"; -import GameModel, {UIState} from "../../public/GameModel"; +import GameModel, {UIState} from "../GameModel"; import gsap from "gsap"; import CloseButton from "./CloseButton"; import UseButton from "./UseButton"; diff --git a/frontend/src/ui/KrisButton.ts b/frontend/src/ui/KrisButton.ts index ca02d99..0e08922 100644 --- a/frontend/src/ui/KrisButton.ts +++ b/frontend/src/ui/KrisButton.ts @@ -2,7 +2,7 @@ import UIBitmapModel from "../lib/model/UIBitmapModel"; import Renderer from "../lib/Renderer"; import PreLoader from "../lib/PreLoader"; import gsap from "gsap"; -import GameModel from "../../public/GameModel"; +import GameModel from "../GameModel"; export default class KrisButton extends UIBitmapModel { diff --git a/frontend/src/ui/KrisEndButton.ts b/frontend/src/ui/KrisEndButton.ts index 1b636bc..6c7115b 100644 --- a/frontend/src/ui/KrisEndButton.ts +++ b/frontend/src/ui/KrisEndButton.ts @@ -2,7 +2,7 @@ import UIBitmapModel from "../lib/model/UIBitmapModel"; import Renderer from "../lib/Renderer"; import PreLoader from "../lib/PreLoader"; import gsap from "gsap"; -import GameModel from "../../public/GameModel"; +import GameModel from "../GameModel"; export default class KrisEndButton extends UIBitmapModel { diff --git a/frontend/src/ui/Menu.ts b/frontend/src/ui/Menu.ts index 5fb6fe0..cdc912b 100644 --- a/frontend/src/ui/Menu.ts +++ b/frontend/src/ui/Menu.ts @@ -1,7 +1,7 @@ import UIBitmapModel from "../lib/model/UIBitmapModel"; import Renderer from "../lib/Renderer"; import PreLoader from "../lib/PreLoader"; -import GameModel, {UIState} from "../../public/GameModel"; +import GameModel, {UIState} from "../GameModel"; import gsap from "gsap"; import CloseButton from "./CloseButton"; import DraggButton from "./DraggButton"; diff --git a/frontend/src/ui/MenuButton.ts b/frontend/src/ui/MenuButton.ts index 3d7a969..daf1a49 100644 --- a/frontend/src/ui/MenuButton.ts +++ b/frontend/src/ui/MenuButton.ts @@ -1,7 +1,7 @@ import UIBitmapModel from "../lib/model/UIBitmapModel"; import Renderer from "../lib/Renderer"; import PreLoader from "../lib/PreLoader"; -import GameModel, {UIState} from "../../public/GameModel"; +import GameModel, {UIState} from "../GameModel"; import gsap from "gsap"; export default class MenuButton extends UIBitmapModel { diff --git a/frontend/src/ui/MusicEndButton.ts b/frontend/src/ui/MusicEndButton.ts index 4c962ce..a5bc62f 100644 --- a/frontend/src/ui/MusicEndButton.ts +++ b/frontend/src/ui/MusicEndButton.ts @@ -2,7 +2,7 @@ import UIBitmapModel from "../lib/model/UIBitmapModel"; import Renderer from "../lib/Renderer"; import PreLoader from "../lib/PreLoader"; import gsap from "gsap"; -import GameModel from "../../public/GameModel"; +import GameModel from "../GameModel"; export default class MusicEndButton extends UIBitmapModel { diff --git a/frontend/src/ui/Note.ts b/frontend/src/ui/Note.ts index 19a07d3..3b20680 100644 --- a/frontend/src/ui/Note.ts +++ b/frontend/src/ui/Note.ts @@ -1,7 +1,7 @@ import Renderer from "../lib/Renderer"; import PreLoader from "../lib/PreLoader"; import UIBitmapModel from "../lib/model/UIBitmapModel"; -import GameModel from "../../public/GameModel"; +import GameModel from "../GameModel"; import gsap from "gsap"; export default class Note extends UIBitmapModel { diff --git a/frontend/src/ui/UseButton.ts b/frontend/src/ui/UseButton.ts index 2bee002..2275a8d 100644 --- a/frontend/src/ui/UseButton.ts +++ b/frontend/src/ui/UseButton.ts @@ -1,7 +1,7 @@ import UIBitmapModel from "../lib/model/UIBitmapModel"; import Renderer from "../lib/Renderer"; import PreLoader from "../lib/PreLoader"; -import GameModel from "../../public/GameModel"; +import GameModel from "../GameModel"; import gsap from "gsap"; export default class UseButton extends UIBitmapModel {