From 603150eed964564af55c6c897a77009a9bee5c8f Mon Sep 17 00:00:00 2001 From: Federico Gratti Date: Fri, 27 Sep 2024 14:22:38 -0300 Subject: [PATCH] Set innerWidth and innerHeight as default Screen size --- package.json | 2 +- src/OScreen.js | 8 +-- src/Screen.js | 55 ---------------- src/index.js | 3 +- types/Screen.d.ts | 12 ---- types/index.d.ts | 155 +++++++++++++++++++++++----------------------- 6 files changed, 83 insertions(+), 152 deletions(-) delete mode 100644 src/Screen.js delete mode 100644 types/Screen.d.ts diff --git a/package.json b/package.json index 2e36bf2..682304b 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "name": "ohzi-core", - "version": "12.1.0", + "version": "12.1.1", "description": "OHZI Interactive Core Library", "source": "src/index.js", "module": "build/index.mjs", diff --git a/src/OScreen.js b/src/OScreen.js index 7c38e5c..87a33af 100644 --- a/src/OScreen.js +++ b/src/OScreen.js @@ -4,13 +4,13 @@ class OScreen { init() { - this.width = 1; - this.height = 1; + this.width = window.innerWidth; + this.height = window.innerHeight; this.position = new Vector2(); - this.render_width = 1; - this.render_height = 1; + this.render_width = window.innerWidth; + this.render_height = window.innerHeight; this.width_height = new Vector2(this.width, this.height); this.dpr = 1; diff --git a/src/Screen.js b/src/Screen.js deleted file mode 100644 index 2913796..0000000 --- a/src/Screen.js +++ /dev/null @@ -1,55 +0,0 @@ -import { OScreen } from './OScreen'; - -class Screen -{ - init() - { - console.warn('Screen Singleton is deprecated. Please use OScreen.'); - OScreen.init(); - } - - update_position(x, y) - { - console.warn('Screen Singleton is deprecated. Please use OScreen.'); - OScreen.update_position(x, y); - } - - update() - { - console.warn('Screen Singleton is deprecated. Please use OScreen.'); - OScreen.update(); - } - - update_size(width, height) - { - console.warn('Screen Singleton is deprecated. Please use OScreen.'); - OScreen.update_size(width, height); - } - - apply_pixel_density_v2(vector2) - { - console.warn('Screen Singleton is deprecated. Please use OScreen.'); - return OScreen.apply_pixel_density_v2(vector2); - } - - apply_pixel_density(value) - { - console.warn('Screen Singleton is deprecated. Please use OScreen.'); - return OScreen.apply_pixel_density(value); - } - - get_pixel_size() - { - console.warn('Screen Singleton is deprecated. Please use OScreen.'); - return OScreen.get_pixel_size(); - } - - get aspect_ratio() - { - console.warn('Screen Singleton is deprecated. Please use OScreen.'); - return OScreen.aspect_ratio; - } -} - -const screen = new Screen(); -export { screen as Screen }; diff --git a/src/index.js b/src/index.js index b5cc288..5d20006 100644 --- a/src/index.js +++ b/src/index.js @@ -33,7 +33,6 @@ import { UnrealBloomRender } from './render_mode/UnrealBloomRender'; import { VRRender } from './render_mode/VRRender'; import { RenderLoop } from './RenderLoop'; import { SceneManager } from './SceneManager'; -import { Screen } from './Screen'; import { Time } from './Time'; import { UI } from './UI'; import { DrawIOAnimationSheet } from './view_components/transition/DrawIOAnimationSheet'; @@ -128,6 +127,6 @@ export { ModelUtilities, NormalAORender, NormalRender, NumberInterpolator, ObjectUtilities, OBJLoader, OMath, OrthographicCamera, OrthographicFrustumPointFitter, OS, OScreen, ParticleAttribute, ParticlePositionAttribute, PerspectiveCamera, PerspectiveFrustumPointFitter, PointArrayLoader, RegularLoadingState, RenderLoop, ResourceBatch, - ResourceContainer, RGBETextureLoader, SceneManager, Screen, SDFTextBatch, SimpleTextDrawer, Sphere, StringUtilities, Text2D, TextLoader, TextureLoader, Time, TimeUtilities, TransitionManager, TransitionTable, UI, UIElement, UnrealBloomComposeMaterial, UnrealBloomRender, UpdatableMaterialMesh, Validation, VectorInterpolator, VerticalPlane, VideoLoader, ViewComponent, + ResourceContainer, RGBETextureLoader, SceneManager, SDFTextBatch, SimpleTextDrawer, Sphere, StringUtilities, Text2D, TextLoader, TextureLoader, Time, TimeUtilities, TransitionManager, TransitionTable, UI, UIElement, UnrealBloomComposeMaterial, UnrealBloomRender, UpdatableMaterialMesh, Validation, VectorInterpolator, VerticalPlane, VideoLoader, ViewComponent, ViewComponentManager, ViewManager, VRRender, WorldImage }; diff --git a/types/Screen.d.ts b/types/Screen.d.ts deleted file mode 100644 index 7b23b17..0000000 --- a/types/Screen.d.ts +++ /dev/null @@ -1,12 +0,0 @@ -export { screen as Screen }; -declare const screen: Screen; -declare class Screen { - init(): void; - update_position(x: any, y: any): void; - update(): void; - update_size(width: any, height: any): void; - apply_pixel_density_v2(vector2: any): any; - apply_pixel_density(value: any): number; - get_pixel_size(): any; - get aspect_ratio(): number; -} diff --git a/types/index.d.ts b/types/index.d.ts index d73c57e..726b7ce 100644 --- a/types/index.d.ts +++ b/types/index.d.ts @@ -1,109 +1,108 @@ -import { AbstractLoader } from "./resource_loader/AbstractLoader"; -import { AbstractScene } from "./scenes/AbstractScene"; +import { BaseApplication } from "./BaseApplication"; +import { Browser } from "./Browser"; +import { CameraManager } from "./CameraManager"; +import { Capabilities } from "./Capabilities"; +import { Debug } from "./Debug"; +import { Graphics } from "./Graphics"; +import { Initializer } from "./Initializer"; +import { KeyboardInput } from "./KeyboardInput"; +import { OS } from "./OS"; +import { OScreen } from "./OScreen"; +import { OrthographicCamera } from "./OrthographicCamera"; +import { PerspectiveCamera } from "./PerspectiveCamera"; +import { RenderLoop } from "./RenderLoop"; +import { ResourceContainer } from "./ResourceContainer"; +import { SceneManager } from "./SceneManager"; +import { Time } from "./Time"; +import { UI } from "./UI"; import { ActionEvent } from "./action_sequencer/ActionEvent"; import { ActionInterpolator } from "./action_sequencer/ActionInterpolator"; import { ActionSequencer } from "./action_sequencer/ActionSequencer"; -import { ActionSequencerBuilder } from "./view_components/transition/ActionSequencerBuilder"; -import { AddMaterial } from "./materials/AddMaterial"; -import { ApplicationView } from "./view_components/ApplicationView"; -import { ArrayUtilities } from "./utilities/ArrayUtilities"; -import { Arrow } from "./primitives/Arrow"; +import { NumberInterpolator } from "./action_sequencer/NumberInterpolator"; +import { VectorInterpolator } from "./action_sequencer/VectorInterpolator"; +import { CanvasDrawer } from "./canvas_drawer/CanvasDrawer"; +import { SimpleTextDrawer } from "./canvas_drawer/SimpleTextDrawer"; +import { Grid } from "./components/Grid"; +import { Line } from "./components/Line"; +import { Text2D } from "./components/Text2D"; +import { UIElement } from "./components/UIElement"; +import { UpdatableMaterialMesh } from "./components/UpdatableMaterialMesh"; +import { WorldImage } from "./components/WorldImage"; +import { SDFTextBatch } from "./components/sdf_text/SDFTextBatch"; +import { GPUParticleSystem } from "./gpu_particles/GPUParticleSystem"; +import { ParticleAttribute } from "./gpu_particles/ParticleAttribute"; +import { ParticlePositionAttribute } from "./gpu_particles/ParticlePositionAttribute"; +import { CSSAnimator } from "./html_utilities/CSSAnimator"; import { AsyncAbstractLoader } from "./loaders/AsyncAbstractLoader"; import { AsyncAudiosLoader } from "./loaders/AsyncAudiosLoader"; import { AsyncObjectsLoader } from "./loaders/AsyncObjectsLoader"; -import { AsyncTextureLoader } from "./resource_loader/AsyncTextureLoader"; import { AsyncTexturesLoader } from "./loaders/AsyncTexturesLoader"; -import { AudioLoader } from "./resource_loader/AudioLoader"; -import { BaseApplication } from "./BaseApplication"; -import { BaseRender } from "./render_mode/BaseRender"; +import { AddMaterial } from "./materials/AddMaterial"; import { BaseShaderMaterial } from "./materials/BaseShaderMaterial"; -import { BasisLoader } from "./resource_loader/BasisLoader"; import { BlitMaterial } from "./materials/BlitMaterial"; -import { Blurrer } from "./render_utilities/Blurrer"; -import { Browser } from "./Browser"; -import { CameraManager } from "./CameraManager"; -import { CameraUtilities } from "./utilities/CameraUtilities"; -import { CanvasDrawer } from "./canvas_drawer/CanvasDrawer"; -import { Capabilities } from "./Capabilities"; -import { CSSAnimator } from "./html_utilities/CSSAnimator"; +import { DualFilteringBlurMaterial } from "./materials/DualFilteringBlurMaterial"; +import { UnrealBloomComposeMaterial } from "./materials/UnrealBloomComposeMaterial"; +import { Arrow } from "./primitives/Arrow"; import { Cube } from "./primitives/Cube"; -import { CubemapLoader } from "./resource_loader/CubemapLoader"; -import { DAELoader } from "./resource_loader/DAELoader"; -import { Debug } from "./Debug"; +import { HorizontalPlane } from "./primitives/HorizontalPlane"; +import { Sphere } from "./primitives/Sphere"; +import { VerticalPlane } from "./primitives/VerticalPlane"; +import { BaseRender } from "./render_mode/BaseRender"; import { DebugNormalsRender } from "./render_mode/DebugNormalsRender"; -import { DrawIOAnimationSheet } from "./view_components/transition/DrawIOAnimationSheet"; -import { DualFilteringBlurMaterial } from "./materials/DualFilteringBlurMaterial"; +import { NormalAORender } from "./render_mode/NormalAORender"; +import { NormalRender } from "./render_mode/NormalRender"; +import { UnrealBloomRender } from "./render_mode/UnrealBloomRender"; +import { VRRender } from "./render_mode/VRRender"; +import { Blurrer } from "./render_utilities/Blurrer"; import { DualFilteringBlurrer } from "./render_utilities/DualFilteringBlurrer"; -import { EasingFunctions } from "./utilities/EasingFunctions"; +import { GaussianBlurrer } from "./render_utilities/GaussianBlurrer"; +import { MedianFilter } from "./render_utilities/MedianFilter"; +import { AbstractLoader } from "./resource_loader/AbstractLoader"; +import { AsyncTextureLoader } from "./resource_loader/AsyncTextureLoader"; +import { AudioLoader } from "./resource_loader/AudioLoader"; +import { BasisLoader } from "./resource_loader/BasisLoader"; +import { CubemapLoader } from "./resource_loader/CubemapLoader"; +import { DAELoader } from "./resource_loader/DAELoader"; import { FileLoader } from "./resource_loader/FileLoader"; import { FontLoader } from "./resource_loader/FontLoader"; -import { FrustumPointFitter } from "./utilities/FrustumPointFitter"; -import { GaussianBlurrer } from "./render_utilities/GaussianBlurrer"; -import { GeometryUtilities } from "./utilities/GeometryUtilities"; import { GLTFDRACOLoader } from "./resource_loader/GLTFDRACOLoader"; import { GLTFLoader } from "./resource_loader/GLTFLoader"; -import { GPUParticleSystem } from "./gpu_particles/GPUParticleSystem"; -import { Graphics } from "./Graphics"; -import { Grid } from "./components/Grid"; import { HDRCubeTextureLoader } from "./resource_loader/HDRCubeTextureLoader"; -import { HighQualityLoadingState } from "./scenes/loading_states/HighQualityLoadingState"; -import { HorizontalPlane } from "./primitives/HorizontalPlane"; -import { HTMLUtilities } from "./utilities/HTMLUtilities"; -import { ImageUtilities } from "./utilities/ImageUtilities"; -import { Initializer } from "./Initializer"; import { JSONLoader } from "./resource_loader/JSONLoader"; -import { KeyboardInput } from "./KeyboardInput"; -import { Line } from "./components/Line"; +import { OBJLoader } from "./resource_loader/OBJLoader"; +import { PointArrayLoader } from "./resource_loader/PointArrayLoader"; +import { RGBETextureLoader } from "./resource_loader/RGBETextureLoader"; +import { ResourceBatch } from "./resource_loader/ResourceBatch"; +import { TextLoader } from "./resource_loader/TextLoader"; +import { TextureLoader } from "./resource_loader/TextureLoader"; +import { VideoLoader } from "./resource_loader/VideoLoader"; +import { AbstractScene } from "./scenes/AbstractScene"; +import { HighQualityLoadingState } from "./scenes/loading_states/HighQualityLoadingState"; import { LoadingState } from "./scenes/loading_states/LoadingState"; -import { MedianFilter } from "./render_utilities/MedianFilter"; +import { RegularLoadingState } from "./scenes/loading_states/RegularLoadingState"; import { MeshBatcher } from "./static_batcher/MeshBatcher"; +import { ArrayUtilities } from "./utilities/ArrayUtilities"; +import { CameraUtilities } from "./utilities/CameraUtilities"; +import { EasingFunctions } from "./utilities/EasingFunctions"; +import { FrustumPointFitter } from "./utilities/FrustumPointFitter"; +import { GeometryUtilities } from "./utilities/GeometryUtilities"; +import { HTMLUtilities } from "./utilities/HTMLUtilities"; +import { ImageUtilities } from "./utilities/ImageUtilities"; import { MeshSampler } from "./utilities/MeshSampler"; import { ModelUtilities } from "./utilities/ModelUtilities"; -import { NormalAORender } from "./render_mode/NormalAORender"; -import { NormalRender } from "./render_mode/NormalRender"; -import { NumberInterpolator } from "./action_sequencer/NumberInterpolator"; -import { ObjectUtilities } from "./utilities/ObjectUtilities"; -import { OBJLoader } from "./resource_loader/OBJLoader"; import { OMath } from "./utilities/OMath"; -import { OrthographicCamera } from "./OrthographicCamera"; +import { ObjectUtilities } from "./utilities/ObjectUtilities"; import { OrthographicFrustumPointFitter } from "./utilities/OrthographicFrustumPointFitter"; -import { OS } from "./OS"; -import { OScreen } from "./OScreen"; -import { ParticleAttribute } from "./gpu_particles/ParticleAttribute"; -import { ParticlePositionAttribute } from "./gpu_particles/ParticlePositionAttribute"; -import { PerspectiveCamera } from "./PerspectiveCamera"; import { PerspectiveFrustumPointFitter } from "./utilities/PerspectiveFrustumPointFitter"; -import { PointArrayLoader } from "./resource_loader/PointArrayLoader"; -import { RegularLoadingState } from "./scenes/loading_states/RegularLoadingState"; -import { RenderLoop } from "./RenderLoop"; -import { ResourceBatch } from "./resource_loader/ResourceBatch"; -import { ResourceContainer } from "./ResourceContainer"; -import { RGBETextureLoader } from "./resource_loader/RGBETextureLoader"; -import { SceneManager } from "./SceneManager"; -import { Screen } from "./Screen"; -import { SDFTextBatch } from "./components/sdf_text/SDFTextBatch"; -import { SimpleTextDrawer } from "./canvas_drawer/SimpleTextDrawer"; -import { Sphere } from "./primitives/Sphere"; import { StringUtilities } from "./utilities/StringUtilities"; -import { Text2D } from "./components/Text2D"; -import { TextLoader } from "./resource_loader/TextLoader"; -import { TextureLoader } from "./resource_loader/TextureLoader"; -import { Time } from "./Time"; import { TimeUtilities } from "./utilities/TimeUtilities"; -import { TransitionManager } from "./view_components/TransitionManager"; -import { TransitionTable } from "./view_components/transition/TransitionTable"; -import { UI } from "./UI"; -import { UIElement } from "./components/UIElement"; -import { UnrealBloomComposeMaterial } from "./materials/UnrealBloomComposeMaterial"; -import { UnrealBloomRender } from "./render_mode/UnrealBloomRender"; -import { UpdatableMaterialMesh } from "./components/UpdatableMaterialMesh"; import { Validation } from "./utilities/Validation"; -import { VectorInterpolator } from "./action_sequencer/VectorInterpolator"; -import { VerticalPlane } from "./primitives/VerticalPlane"; -import { VideoLoader } from "./resource_loader/VideoLoader"; +import { ApplicationView } from "./view_components/ApplicationView"; +import { TransitionManager } from "./view_components/TransitionManager"; import { ViewComponent } from "./view_components/ViewComponent"; import { ViewComponentManager } from "./view_components/ViewComponentManager"; import { ViewManager } from "./view_components/ViewManager"; -import { VRRender } from "./render_mode/VRRender"; -import { WorldImage } from "./components/WorldImage"; -export { AbstractLoader, AbstractScene, ActionEvent, ActionInterpolator, ActionSequencer, ActionSequencerBuilder, AddMaterial, ApplicationView, ArrayUtilities, Arrow, AsyncAbstractLoader, AsyncAudiosLoader, AsyncObjectsLoader, AsyncTextureLoader, AsyncTexturesLoader, AudioLoader, BaseApplication, BaseRender, BaseShaderMaterial, BasisLoader, BlitMaterial, Blurrer, Browser, BufferGeometryUtils, CameraManager, CameraUtilities, CanvasDrawer, Capabilities, CSSAnimator, Cube, CubemapLoader, DAELoader, Debug, DebugNormalsRender, DrawIOAnimationSheet, DualFilteringBlurMaterial, DualFilteringBlurrer, EasingFunctions, FileLoader, FontLoader, FrustumPointFitter, GaussianBlurrer, GeometryUtilities, GLTFDRACOLoader, GLTFLoader, GPUParticleSystem, Graphics, Grid, HDRCubeTextureLoader, HighQualityLoadingState, HorizontalPlane, HTMLUtilities, ImageUtilities, Initializer, JSONLoader, KeyboardInput, Line, LoadingState, MedianFilter, MeshBatcher, MeshSampler, ModelUtilities, NormalAORender, NormalRender, NumberInterpolator, ObjectUtilities, OBJLoader, OMath, OrthographicCamera, OrthographicFrustumPointFitter, OS, OScreen, ParticleAttribute, ParticlePositionAttribute, PerspectiveCamera, PerspectiveFrustumPointFitter, PointArrayLoader, RegularLoadingState, RenderLoop, ResourceBatch, ResourceContainer, RGBETextureLoader, SceneManager, Screen, SDFTextBatch, SimpleTextDrawer, Sphere, StringUtilities, Text2D, TextLoader, TextureLoader, Time, TimeUtilities, TransitionManager, TransitionTable, UI, UIElement, UnrealBloomComposeMaterial, UnrealBloomRender, UpdatableMaterialMesh, Validation, VectorInterpolator, VerticalPlane, VideoLoader, ViewComponent, ViewComponentManager, ViewManager, VRRender, WorldImage }; +import { ActionSequencerBuilder } from "./view_components/transition/ActionSequencerBuilder"; +import { DrawIOAnimationSheet } from "./view_components/transition/DrawIOAnimationSheet"; +import { TransitionTable } from "./view_components/transition/TransitionTable"; +export { AbstractLoader, AbstractScene, ActionEvent, ActionInterpolator, ActionSequencer, ActionSequencerBuilder, AddMaterial, ApplicationView, ArrayUtilities, Arrow, AsyncAbstractLoader, AsyncAudiosLoader, AsyncObjectsLoader, AsyncTextureLoader, AsyncTexturesLoader, AudioLoader, BaseApplication, BaseRender, BaseShaderMaterial, BasisLoader, BlitMaterial, Blurrer, Browser, BufferGeometryUtils, CameraManager, CameraUtilities, CanvasDrawer, Capabilities, CSSAnimator, Cube, CubemapLoader, DAELoader, Debug, DebugNormalsRender, DrawIOAnimationSheet, DualFilteringBlurMaterial, DualFilteringBlurrer, EasingFunctions, FileLoader, FontLoader, FrustumPointFitter, GaussianBlurrer, GeometryUtilities, GLTFDRACOLoader, GLTFLoader, GPUParticleSystem, Graphics, Grid, HDRCubeTextureLoader, HighQualityLoadingState, HorizontalPlane, HTMLUtilities, ImageUtilities, Initializer, JSONLoader, KeyboardInput, Line, LoadingState, MedianFilter, MeshBatcher, MeshSampler, ModelUtilities, NormalAORender, NormalRender, NumberInterpolator, ObjectUtilities, OBJLoader, OMath, OrthographicCamera, OrthographicFrustumPointFitter, OS, OScreen, ParticleAttribute, ParticlePositionAttribute, PerspectiveCamera, PerspectiveFrustumPointFitter, PointArrayLoader, RegularLoadingState, RenderLoop, ResourceBatch, ResourceContainer, RGBETextureLoader, SceneManager, SDFTextBatch, SimpleTextDrawer, Sphere, StringUtilities, Text2D, TextLoader, TextureLoader, Time, TimeUtilities, TransitionManager, TransitionTable, UI, UIElement, UnrealBloomComposeMaterial, UnrealBloomRender, UpdatableMaterialMesh, Validation, VectorInterpolator, VerticalPlane, VideoLoader, ViewComponent, ViewComponentManager, ViewManager, VRRender, WorldImage };