Skip to content

Commit

Permalink
Merge branch 'dev' of https://github.com/Orillusion/orillusion into d…
Browse files Browse the repository at this point in the history
…ev-0.7fix
  • Loading branch information
X-OldGentleMan committed Nov 3, 2023
2 parents ebafec7 + e90839d commit b8f5097
Show file tree
Hide file tree
Showing 13 changed files with 32 additions and 52 deletions.
17 changes: 17 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,3 +1,20 @@
# [0.7.0](https://github.com/Orillusion/orillusion/compare/v0.6.9...v0.7.0) (2023-11-01)


### Bug Fixes

* Character loss during text layout. ([#317](https://github.com/Orillusion/orillusion/issues/317)) ([8ad7169](https://github.com/Orillusion/orillusion/commit/8ad71695df37ce3b21833773fe4c429817d2108c))
* fix gltf sample ([#321](https://github.com/Orillusion/orillusion/issues/321)) ([4ca35b5](https://github.com/Orillusion/orillusion/commit/4ca35b576454cb52aee47ddbc271a4d36a906e78))
* **particle:** add get baseMap ([e59bd9f](https://github.com/Orillusion/orillusion/commit/e59bd9f4d43e98941ef634aff5c4e525a02cc6f1))


### Features

* add graphic bath mesh ([#319](https://github.com/Orillusion/orillusion/issues/319)) ([7df4f95](https://github.com/Orillusion/orillusion/commit/7df4f95c9bfa85dc2aae121a64916121c2741988))
* **audio:** move audio to @orillusion/media-extension ([166d286](https://github.com/Orillusion/orillusion/commit/166d2866b3e427339082f6bbdc7d391d4b91e784))



## [0.6.9](https://github.com/Orillusion/orillusion/compare/v0.6.8...v0.6.9) (2023-09-06)

### Bug Fixes
Expand Down
1 change: 0 additions & 1 deletion index.html
Original file line number Diff line number Diff line change
Expand Up @@ -119,7 +119,6 @@
<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 src="https://unpkg.com/peerjs@1.5.0/dist/peerjs.min.js"></script>
<script type="module" src="/samples/index.ts"></script>
</body>
</html>
2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@orillusion/core",
"version": "0.6.9",
"version": "0.7.0",
"author": "Orillusion",
"description": "Orillusion WebGPU Engine",
"main": "./dist/orillusion.umd.js",
Expand Down
4 changes: 2 additions & 2 deletions packages/effect/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@orillusion/effect",
"version": "0.1.0",
"version": "0.1.1",
"author": "Orillusion",
"description": "Orillusion Effects Plugin",
"main": "./dist/effect.umd.js",
Expand All @@ -19,6 +19,6 @@
"url": "git+https://github.com/Orillusion/orillusion.git"
},
"dependencies": {
"@orillusion/core": "^0.6.9"
"@orillusion/core": "^0.7.0"
}
}
3 changes: 2 additions & 1 deletion packages/media-extention/ChromaKeyMaterial.ts
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,8 @@ export class ChromaKeyMaterial extends Material {
shaderState.castShadow = false;
shaderState.useZ = false;
shaderState.blendMode = BlendMode.ALPHA;

this.shader = newShader;

// default value
this.shader.setTexture(`baseMap`, Engine3D.res.whiteTexture);
}
Expand Down
4 changes: 2 additions & 2 deletions packages/media-extention/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@orillusion/media-extention",
"version": "0.3.1",
"version": "0.3.3",
"author": "Orillusion",
"description": "Orillusion Media Material Extention",
"main": "./dist/media.umd.js",
Expand All @@ -21,6 +21,6 @@
"url": "git+https://github.com/Orillusion/orillusion.git"
},
"dependencies": {
"@orillusion/core": "^0.6.9"
"@orillusion/core": "^0.7.0"
}
}
4 changes: 2 additions & 2 deletions packages/particle/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@orillusion/particle",
"version": "0.0.3",
"version": "0.1.0",
"author": "Orillusion",
"description": "Orillusion Particle Plugin",
"main": "./dist/particle.umd.js",
Expand All @@ -21,6 +21,6 @@
"url": "git+https://github.com/Orillusion/orillusion.git"
},
"dependencies": {
"@orillusion/core": "^0.6.9"
"@orillusion/core": "^0.7.0"
}
}
4 changes: 2 additions & 2 deletions packages/physics/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@orillusion/physics",
"version": "0.2.0",
"version": "0.2.1",
"author": "Orillusion",
"description": "Orillusion Physics Plugin, Powerd by Ammo.js",
"main": "./dist/physics.umd.js",
Expand All @@ -22,6 +22,6 @@
},
"dependencies": {
"@orillusion/ammo": "^0.1.1",
"@orillusion/core": "^0.6.0"
"@orillusion/core": "^0.7.0"
}
}
2 changes: 1 addition & 1 deletion packages/post/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,6 +19,6 @@
"url": "git+https://github.com/Orillusion/orillusion.git"
},
"dependencies": {
"@orillusion/core": "^0.6.0"
"@orillusion/core": "^0.7.0"
}
}
4 changes: 2 additions & 2 deletions packages/stats/package.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"name": "@orillusion/stats",
"version": "0.2.0",
"version": "0.2.1",
"author": "Orillusion",
"description": "Orillusion Stats Plugin",
"main": "./dist/stats.umd.js",
Expand All @@ -21,6 +21,6 @@
"url": "git+https://github.com/Orillusion/orillusion.git"
},
"dependencies": {
"@orillusion/core": "^0.6.0"
"@orillusion/core": "^0.7.0"
}
}
36 changes: 0 additions & 36 deletions packages/uiTool/package.json

This file was deleted.

2 changes: 1 addition & 1 deletion public
Submodule public updated 120 files
1 change: 0 additions & 1 deletion src/loader/parser/prefab/mats/MaterialUtilities.ts
Original file line number Diff line number Diff line change
Expand Up @@ -65,7 +65,6 @@ export class MaterialUtilities {
case ValueEnumType.int:
case ValueEnumType.int16:
case ValueEnumType.int32:
case ValueEnumType.int32:
case ValueEnumType.uint:
case ValueEnumType.uint32:
case ValueEnumType.uint64:
Expand Down

0 comments on commit b8f5097

Please sign in to comment.