Skip to content

Commit

Permalink
bump v0.6.3
Browse files Browse the repository at this point in the history
  • Loading branch information
lslzl3000 authored May 30, 2023
2 parents 7b7c96a + 39c1056 commit 4d5d42b
Show file tree
Hide file tree
Showing 153 changed files with 6,373 additions and 732 deletions.
6 changes: 3 additions & 3 deletions .github/ISSUE_TEMPLATE/bug_report.md
Original file line number Diff line number Diff line change
Expand Up @@ -25,10 +25,10 @@ If applicable, add screenshots to help explain your problem
## Orillusion engine version
State the version you use for developement, e.g. 0.6.1

## Desktop (please complete the following information)
## Platform (please complete the following information)
- OS: [e.g. win, mac, android]
- Browser [e.g. chrome]
- Version [e.g. 113]
- Browser: [e.g. chrome]
- Version: [e.g. 113]

## Code demo link
If applicabla, please provide a sandbox/codepen/code snippet... to demonstrate the bug.
Expand Down
4 changes: 2 additions & 2 deletions .github/ISSUE_TEMPLATE/bug_report_zh.md
Original file line number Diff line number Diff line change
Expand Up @@ -27,8 +27,8 @@ assignees: ''

## 本机系统 (请填写完整):
- OS: [e.g. win, mac, android]
- Browser [e.g. chrome]
- Version [e.g. 113]
- Browser: [e.g. chrome]
- Version: [e.g. 113]

## 代码示例
如果有sandbox/codepen的代码示例链接,请提供
Expand Down
2 changes: 1 addition & 1 deletion .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -31,4 +31,4 @@ jobs:

- name: Test in Electron
run: pnpm run test:ci
timeout-minutes: 5
28 changes: 27 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,30 @@
## [0.6.2](https://github.com/Orillusion/orillusion/compare/v0.6.0...v0.6.2) (2023-05-15)
## [0.6.3](https://github.com/Orillusion/orillusion/compare/v0.6.2...v0.6.3) (2023-05-30)

### Bug Fixes

* **android:** reslove webgpu errors ([#170](https://github.com/Orillusion/orillusion/issues/170)) ([a867ea7](https://github.com/Orillusion/orillusion/commit/a867ea7d6188f9b458189e2d5b6d8ea4e7d27a27))
* **blend:** fix blend mode ([#181](https://github.com/Orillusion/orillusion/issues/181)) ([e65cbb9](https://github.com/Orillusion/orillusion/commit/e65cbb9161a5947687f8b51972f416b542125dfd)) ([#178](https://github.com/Orillusion/orillusion/issues/178)) ([62ba7ce](https://github.com/Orillusion/orillusion/commit/62ba7cea188ff4f7d81a86505a554eebb6eee565))
* **canvas:** refine context3d init process ([#163](https://github.com/Orillusion/orillusion/issues/163)) ([8d7cde8](https://github.com/Orillusion/orillusion/commit/8d7cde8be4dc64acd5f4515ccd374f025966df7c))
* **ComponentCollect:** break component dependency for engine3D ([#161](https://github.com/Orillusion/orillusion/issues/161)) ([5c69be1](https://github.com/Orillusion/orillusion/commit/5c69be1f60edbb4c4ca9a9584554128e4182a95a))
* **destory:** fix object destory ([#164](https://github.com/Orillusion/orillusion/issues/164)) ([071ac16](https://github.com/Orillusion/orillusion/commit/071ac16d2eb82aa79a85244140a76d390543973a))
* **sky:** fix LDR skybox texture color ([#171](https://github.com/Orillusion/orillusion/issues/171)) ([9a89d2b](https://github.com/Orillusion/orillusion/commit/9a89d2b5058c7a3584106032a649faa1084c16ca))
* **sky:** fix AtmosphericSky color ([#179](https://github.com/Orillusion/orillusion/issues/179)) ([eb6ef48](https://github.com/Orillusion/orillusion/commit/eb6ef48cf3e8b4f183abba56b2e9aa1c5d777694))
* **light:** fix shader light position ([#175](https://github.com/Orillusion/orillusion/issues/175)) ([b2ba00f](https://github.com/Orillusion/orillusion/commit/b2ba00f6c95d2f1965aa8af7c7ab682f809c828b))
* **PropertyAnimation:** space conversion ([#162](https://github.com/Orillusion/orillusion/issues/162)) ([4dd34a3](https://github.com/Orillusion/orillusion/commit/4dd34a3a0bdacb39fcd0337c7fed9e759766b077))
* **renderOpt:** fix poor performance in handling shadow ([#143](https://github.com/Orillusion/orillusion/issues/143)) ([93d8a1c](https://github.com/Orillusion/orillusion/commit/93d8a1ce097102563ee67e0d016c499e4689ef19))
* **sample:** fix propertyAnimation. ([#173](https://github.com/Orillusion/orillusion/issues/173)) ([c35e838](https://github.com/Orillusion/orillusion/commit/c35e8383554f55c13bd73bdc2cb91b57e80ba3ce))
* **sample:** update shadowRameRate ([#132](https://github.com/Orillusion/orillusion/issues/132)) ([30e92d6](https://github.com/Orillusion/orillusion/commit/30e92d603b9d6bade008403a6abca47a3f6379fc))
* **shadow:** fix shadow cullmode ([#147](https://github.com/Orillusion/orillusion/issues/147)) ([2083b40](https://github.com/Orillusion/orillusion/commit/2083b40fd622d4baf4509e1819ff8dd25afd1e8d))


### Features

* **GUI:** add GUI feature ([#157](https://github.com/Orillusion/orillusion/issues/157)) ([016fdd9](https://github.com/Orillusion/orillusion/commit/016fdd9cb974f0c76e222b09cb2950c75bae32fb)) ([#166](https://github.com/Orillusion/orillusion/issues/166)) ([5caee15](https://github.com/Orillusion/orillusion/commit/5caee157365844b4a59d67237a725602df2755dc)) ([#172](https://github.com/Orillusion/orillusion/issues/172)) ([5c7c6ef](https://github.com/Orillusion/orillusion/commit/5c7c6ef1fd9642d578b109bdb9e740c52b892523)) ([#174](https://github.com/Orillusion/orillusion/issues/174)) ([58ad344](https://github.com/Orillusion/orillusion/commit/58ad3441d4ce6bb2a472a8232b37360d18b34f3d)) ([#182](https://github.com/Orillusion/orillusion/issues/182)) ([7797b86](https://github.com/Orillusion/orillusion/commit/7797b86d769565c7451e9b8707181c8addc463db))
* **sample:** add new POST samples ([#183](https://github.com/Orillusion/orillusion/issues/183)) ([328bf72](https://github.com/Orillusion/orillusion/commit/328bf7218a8f59b751b3f943ef4015b72e95a3f1))
* **sample:** add property animation sample ([#146](https://github.com/Orillusion/orillusion/issues/146)) ([8c0adf9](https://github.com/Orillusion/orillusion/commit/8c0adf904b9ab6f275b2bfa6d152d3452444abed))


## [0.6.2](https://github.com/Orillusion/orillusion/compare/v0.6.1...v0.6.2) (2023-05-15)

### Bug Fixes

Expand Down
9 changes: 7 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -100,8 +100,13 @@ await Engine3D.init({
Please read the [Docs](https://www.orillusion.com/guide/) to Learn More.

## Platform
**Chrome Desktop: 113+**
**Edge Desktop: 113+**
**Windows/Mac/Linux:**
- Chrome 113+
- Edge: 113+

**Android (Behind the `enable-unsafe-webgpu` flag):**
- Chrome Canary 113+
- Edge Canary 113+

## Useful links
- [Official Web Site](https://www.orillusion.com/)
Expand Down
61 changes: 54 additions & 7 deletions index.html
Original file line number Diff line number Diff line change
Expand Up @@ -19,16 +19,11 @@
}

.menu {
position: fixed;
z-index: 10000;
left: 0;
top: 0;
bottom: 0;
width: 150px;
padding: 20px;
overflow: overlay;
border-right: 1px solid #fff;
background: rgba(0, 0, 0, .6);
background: #000;
}

.menu>p {
Expand Down Expand Up @@ -67,12 +62,64 @@
border: none;
width: 100%;
height: 100%;
flex: 1;
}
.toggle{
display: none;
align-items: center;
position: fixed;
width: 20px;
height: 20px;
fill: currentColor;
left: 10px;
top: 10px;
cursor: pointer;
}
.close{
display: none;
position: fixed;
top: 5px;
left: 155px;
padding: 5px;
width: 20px;
height: 20px;
cursor: pointer;
}
svg{
transition: transform 0.15s;
}
svg:hover{
transform: scale(1.2);
}
@media screen and (max-width:599px) {
.menu{
display: none;
position: fixed;
z-index: 1111;
left: 0;
top: 0;
bottom: 0;
}
.toggle{
display: flex;
}
body.show > .menu{
display: block;
}
body.show > iframe{
pointer-events: none;
}
.close{
display: inline-block;
}
}
</style>
</head>

<body>
<svg class="toggle" onclick="document.body.classList.add('show')" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24">
<path d="M17,11H3c-0.6,0-1-0.4-1-1s0.4-1,1-1h14c0.6,0,1,0.4,1,1S17.6,11,17,11z"></path><path d="M21,7H3C2.4,7,2,6.6,2,6s0.4-1,1-1h18c0.6,0,1,0.4,1,1S21.6,7,21,7z"></path><path d="M21,15H3c-0.6,0-1-0.4-1-1s0.4-1,1-1h18c0.6,0,1,0.4,1,1S21.6,15,21,15z"></path><path d="M17,19H3c-0.6,0-1-0.4-1-1s0.4-1,1-1h14c0.6,0,1,0.4,1,1S17.6,19,17,19z"></path>
</svg>
<script type="module" src="/samples/index.ts"></script>
</body>

</html>
4 changes: 2 additions & 2 deletions package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@orillusion/core",
"version": "0.6.2",
"version": "0.6.3",
"author": "Orillusion",
"description": "Orillusion WebGPU Engine",
"main": "./dist/orillusion.umd.js",
Expand Down Expand Up @@ -42,7 +42,7 @@
},
"optionalDependencies": {
"conventional-changelog-cli": "^2.2.2",
"electron": "25.0.0-beta.1",
"electron": "25.0.0-beta.8",
"uglify-js": "^3.17.4",
"xvfb-maybe": "^0.2.1"
}
Expand Down
8 changes: 4 additions & 4 deletions pnpm-lock.yaml

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion public
Submodule public updated 2 files
+20,150 −1 json/anim_0.json
+ sky/LDR_sky.jpg
96 changes: 96 additions & 0 deletions samples/animation/Sample_PropertyAnimation.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,96 @@
import { GUIHelp } from "@orillusion/debug/GUIHelp";
import { createExampleScene, createSceneParam } from "@samples/utils/ExampleScene";
import { GUIUtil } from "@samples/utils/GUIUtil";
import { Scene3D, PropertyAnimation, Engine3D, Object3D, Object3DUtil, PropertyAnimClip, WrapMode } from "@orillusion/core";

class Sample_PropertyAnimation {
scene: Scene3D;
animation: PropertyAnimation;

async run() {
Engine3D.setting.shadow.autoUpdate = true;
Engine3D.setting.shadow.updateFrameRate = 1;
Engine3D.setting.shadow.shadowBound = 20;
Engine3D.setting.shadow.shadowBias = 0.0001;

await Engine3D.init();
let param = createSceneParam();
param.camera.distance = 16;
param.camera.pitch = -25;
param.light.intensity = 40;
let exampleScene = createExampleScene(param);

GUIHelp.init();
GUIUtil.renderDirLight(exampleScene.light, false);

this.scene = exampleScene.scene;
await this.initScene(this.scene);

Engine3D.startRenderView(exampleScene.view);

this.displayGUI();
}

async initScene(scene: Scene3D) {
// floor
let floor: Object3D = Object3DUtil.GetSingleCube(16, 0.1, 16, 1, 1, 1);
scene.addChild(floor);

// load external model
let model = await Engine3D.res.loadGltf('PBR/Duck/Duck.gltf') as Object3D;
let container = new Object3D();
container.addChild(model);
model.rotationY = 180;
this.scene.addChild(container);
model.scaleX = model.scaleY = model.scaleZ = 0.01;

this.animation = await this.initPropertyAnim(container);
this.animation.play(this.animation.defaultClip);

return true;
}

private async initPropertyAnim(owner: Object3D) {
// add PropertyAnimation
let animation = owner.addComponent(PropertyAnimation);

//load a animation clip
let json: any = await Engine3D.res.loadJSON('json/anim_0.json');
let animClip = new PropertyAnimClip();
animClip.parse(json);
animClip.wrapMode = WrapMode.Loop;
animation.defaultClip = animClip.name;
animation.autoPlay = true;

// register clip to animation
animation.appendClip(animClip);
return animation;
}

private displayGUI() {
// restart the animation clip
GUIHelp.addFolder('Property Animation');
GUIHelp.addButton('Restart', () => {
this.animation.play(this.animation.defaultClip, true);
});

let data = { Seek: 0, Speed: 1 };

// seek the animation to the specified time
let totalTime = this.animation.getClip(this.animation.defaultClip).totalTime;
GUIHelp.add(data, 'Seek', 0, totalTime, 0.01).onChange((v) => {
this.animation.stop();
this.animation.seek(v);
});

// change animation speed
GUIHelp.add(data, 'Speed', 0, 1, 0.01).onChange((v) => {
this.animation.speed = v;
});

GUIHelp.open();
GUIHelp.endFolder();
}
}

new Sample_PropertyAnimation().run();
9 changes: 5 additions & 4 deletions samples/base/Sample_AddRemove.ts
Original file line number Diff line number Diff line change
Expand Up @@ -36,9 +36,9 @@ class Sample_AddRemove {
GUIHelp.addButton("add", async () => {
/******** player1 *******/
let clone = player.clone()
clone.transform.x = Math.random() * 100;
clone.transform.y = Math.random() * 100;
clone.transform.z = Math.random() * 100;
clone.transform.x = Math.random() * 100 - 50;
clone.transform.y = Math.random() * 100 - 50;
clone.transform.z = Math.random() * 100 - 50;
clone.transform.localScale.set(20, 20, 20)

this.view.scene.addChild(clone);
Expand All @@ -51,10 +51,11 @@ class Sample_AddRemove {
if (obj) {
list.splice(index, 1)
this.view.scene.removeChild(obj)
obj.destroy(true);
}
});

GUIHelp.endFolder();
GUIHelp.open();
}
}

Expand Down
Loading

0 comments on commit 4d5d42b

Please sign in to comment.