Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fix Background Texture Error #446

Merged
merged 13 commits into from
Aug 20, 2021
Merged

Fix Background Texture Error #446

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
13 commits
Select commit Hold shift + click to select a range
121cec5
feat: add scene background texture
gz65555 Aug 10, 2021
40c5a86
style: fix import style
gz65555 Aug 10, 2021
ec409d8
refactor: rename scale to scaleToFit
gz65555 Aug 12, 2021
f97a9bb
refactor: use vec2 to vec3
gz65555 Aug 12, 2021
28e32d4
refactor: add internal decoration
gz65555 Aug 13, 2021
667eee0
refactor: use Vector2 instead of value
gz65555 Aug 13, 2021
6c0fc1a
refactor: fix value equal bug
gz65555 Aug 13, 2021
a24d4af
refactor: rename background fill mode
gz65555 Aug 13, 2021
b1b9e35
Merge branch 'dev/0.5' of github.com:oasis-engine/engine into dev/0.5
gz65555 Aug 16, 2021
c5cd08b
Merge branch 'dev/0.5' of github.com:oasis-engine/engine into dev/0.5
gz65555 Aug 18, 2021
d940dac
test: test for background
gz65555 Aug 18, 2021
12835a0
refactor: fix background texture bug
gz65555 Aug 20, 2021
95e5d18
Merge branch 'dev/0.5' of github.com:oasis-engine/engine into dev/0.5
gz65555 Aug 20, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
24 changes: 12 additions & 12 deletions packages/core/src/Background.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -86,24 +86,24 @@ export class Background {

switch (this._textureFillMode) {
case BackgroundTextureFillMode.Fill:
positions[0].setValue(-1, -1, -1);
positions[1].setValue(1, -1, -1);
positions[2].setValue(-1, 1, -1);
positions[3].setValue(1, 1, -1);
positions[0].setValue(-1, -1, 1);
positions[1].setValue(1, -1, 1);
positions[2].setValue(-1, 1, 1);
positions[3].setValue(1, 1, 1);
break;
case BackgroundTextureFillMode.AspectFitWidth:
const fitWidthScale = 1 / ((this._texture.width * (height / width)) / height);
positions[0].setValue(-1, -fitWidthScale, -1);
positions[1].setValue(1, -fitWidthScale, -1);
positions[2].setValue(-1, fitWidthScale, -1);
positions[3].setValue(1, fitWidthScale, -1);
positions[0].setValue(-1, -fitWidthScale, 1);
positions[1].setValue(1, -fitWidthScale, 1);
positions[2].setValue(-1, fitWidthScale, 1);
positions[3].setValue(1, fitWidthScale, 1);
break;
case BackgroundTextureFillMode.AspectFitHeight:
const fitHeightScale = (this._texture.width * (height / width)) / height;
positions[0].setValue(-fitHeightScale, -1, -1);
positions[1].setValue(fitHeightScale, -1, -1);
positions[2].setValue(-fitHeightScale, 1, -1);
positions[3].setValue(fitHeightScale, 1, -1);
positions[0].setValue(-fitHeightScale, -1, 1);
positions[1].setValue(fitHeightScale, -1, 1);
positions[2].setValue(-fitHeightScale, 1, 1);
positions[3].setValue(fitHeightScale, 1, 1);
break;
}
_backgroundTextureMesh.setPositions(positions);
Expand Down
2 changes: 2 additions & 0 deletions packages/core/src/Engine.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,6 +27,7 @@ import { RenderState } from "./shader/state/RenderState";
import { Texture2D, TextureCubeFace, TextureCubeMap, TextureFormat } from "./texture";
import { PhysicsManager } from "./PhysicsManager";
import { ModelMesh, PrimitiveMesh } from "./mesh";
import { CompareFunction } from "./shader";

/** TODO: delete */
const engineFeatureManager = new FeatureManager<EngineFeature>();
Expand Down Expand Up @@ -190,6 +191,7 @@ export class Engine extends EventDispatcher {

this._backgroundTextureMaterial = new Material(this, Shader.find("background-texture"));
this._backgroundTextureMaterial.isGCIgnored = true;
this._backgroundTextureMaterial.renderState.depthState.compareFunction = CompareFunction.LessEqual;

this._backgroundTextureMesh = PrimitiveMesh.createPlane(this, 2, 2, 1, 1, false);
this._backgroundTextureMesh.isGCIgnored = true;
Expand Down