Merge branch 'dev' of github.com:Orillusion/orillusion into dev

Orillusion · Oct 8, 2024 · 7770b26 · 7770b26
2 parents 9f56463 + c54e7bf
commit 7770b26
Show file tree

Hide file tree

Showing 106 changed files with 5,938 additions and 1,276 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,26 @@
+## [0.8.3](https://github.com/Orillusion/orillusion/compare/v0.8.2...v0.8.3) (2024-08-28)
+
+
+### Bug Fixes
+
+* fix frameRate and camera resize ([c4b8626](https://github.com/Orillusion/orillusion/commit/c4b8626c91937d50fba1a2d94101e84053a83d4c))
+* fix InstanceDraw destroy error ([4529594](https://github.com/Orillusion/orillusion/commit/4529594491e111e2d98ca4319189215614d97654))
+* **GUI:** add option to receive post effects ([#426](https://github.com/Orillusion/orillusion/issues/426)) ([af74bb1](https://github.com/Orillusion/orillusion/commit/af74bb1c14a1ee42af749868271f9b45a65c2384))
+* **inputsystem:** capture pointer on pointerdown ([#432](https://github.com/Orillusion/orillusion/issues/432)) ([cc90b82](https://github.com/Orillusion/orillusion/commit/cc90b82d4d9ab8250553263e3c0499a84e3e503c))
+* **shadow:** fix acceptShadow ([4d6a838](https://github.com/Orillusion/orillusion/commit/4d6a8387310381d158fc13bc168cc7482cc656b3))
+* **transform:** fix lookAt at vertical angle ([#431](https://github.com/Orillusion/orillusion/issues/431)) ([1922f18](https://github.com/Orillusion/orillusion/commit/1922f185f67b450dcbb04216ee30dfba8cc0e0a2))
+
+
+### Features
+
+* add GridObject ([#436](https://github.com/Orillusion/orillusion/issues/436)) ([a939ce6](https://github.com/Orillusion/orillusion/commit/a939ce62ccbe3e6db6e964ebcf2921d975b23a1c))
+* **geometry:** add extra geometry package, extrude geometry and text geometry ([#442](https://github.com/Orillusion/orillusion/issues/442)) ([069e6d4](https://github.com/Orillusion/orillusion/commit/069e6d40d4510be09dfe3c7af9ac1b97bb855ccd))
+* **graphic:** move graphic3D to @orillusion/graphic ([#427](https://github.com/Orillusion/orillusion/issues/427)) ([a1d1b2a](https://github.com/Orillusion/orillusion/commit/a1d1b2aa9fc0b6abc55ad7894312f1100f6b466e))
+* **physics:** add RopeSoftBody, rigidbody dragger, and enhance collisionShapeUtil ([#448](https://github.com/Orillusion/orillusion/issues/448)) ([452d730](https://github.com/Orillusion/orillusion/commit/452d730ef3377867cd81fe6d78e3a1b744c4e2b5))
+* **physics:** Refactor physics plugin with extensive enhancements and new features ([#440](https://github.com/Orillusion/orillusion/issues/440)) ([7c18db5](https://github.com/Orillusion/orillusion/commit/7c18db5157a0001c9f056e6c7a158e62ff5f0e2b))
+
+
+
 ## [0.8.2](https://github.com/Orillusion/orillusion/compare/v0.8.1...v0.8.2) (2024-07-21)
 
 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@orillusion/core",
-    "version": "0.8.3-dev.2",
+    "version": "0.8.4-dev.1",
     "author": "Orillusion",
     "description": "Orillusion WebGPU Engine",
     "type": "module",
@@ -31,7 +31,14 @@
     "scripts": {
         "dev": "vite",
         "build": "tsc --p tsconfig.build.json && vite build && npm run build:types && npm run minify",
-        "build:test": "tsc --p tsconfig.build.json && vite build",
+        "build:test": "tsc --p tsconfig.build.json && vite build && npm run build:packages",
+        "build:packages": "npm run build:physics && npm run build:media && npm run build:stats && npm run build:particle && npm run build:graphic && npm run build:geometry",
+        "build:physics": "cd packages/physics && npm run build",
+        "build:media": "cd packages/media-extention && npm run build",
+        "build:stats": "cd packages/stats && npm run build",
+        "build:particle": "cd packages/particle && npm run build",
+        "build:graphic": "cd packages/graphic && npm run build",
+        "build:geometry": "cd packages/geometry && npm run build",
         "build:types": "tsc --emitDeclarationOnly -p tsconfig.build.json && rm -rf dist/packages && mv dist/src dist/types",
         "minify": "./node_modules/vite/node_modules/.bin/esbuild dist/orillusion.es.max.js --sourcemap --minify --outfile=dist/orillusion.es.js && ./node_modules/vite/node_modules/.bin/esbuild dist/orillusion.umd.max.js --minify --sourcemap --outfile=dist/orillusion.umd.js",
         "test": "electron test/ci/main.js",
@@ -47,7 +54,7 @@
         "changelog": "conventional-changelog -p angular -i CHANGELOG.md -s"
     },
     "devDependencies": {
-        "@webgpu/types": "^0.1.40",
+        "@webgpu/types": "^0.1.45",
         "conventional-changelog-cli": "^2.2.2",
         "electron": "^31.1.0",
         "typedoc": "^0.25.7",

diff --git a/packages/ammo/ammo.d.ts b/packages/ammo/ammo.d.ts
diff --git a/packages/ammo/package.json b/packages/ammo/package.json
diff --git a/packages/effect/README.md b/packages/effect/README.md
diff --git a/packages/effect/grass/GrassNode.ts b/packages/effect/grass/GrassNode.ts
diff --git a/packages/effect/index.ts b/packages/effect/index.ts
diff --git a/packages/effect/package.json b/packages/effect/package.json
diff --git a/packages/effect/tsconfig.json b/packages/effect/tsconfig.json
diff --git a/packages/effect/vite.config.js b/packages/effect/vite.config.js
diff --git a/packages/geometry/README.md b/packages/geometry/README.md
@@ -0,0 +1,19 @@
+Extra geometry plugins for [Orillusion](https://www.orillusion.com)
+
+## Usage
+```bash
+npm install @orillusion/core --save
+npm install @orillusion/geometry --save
+```
+```ts
+import { Scene3D } from "@orillusion/core"
+import { TextGeometry, ExtrudeGeometry, TerrainGeometry } from "@orillusion/geometry"
+```
+
+Or access Global build from CDN
+```html
+<script src="https://unpkg.com/@orillusion/core/dist/orillusion.umd.js"></script>
+<script src="https://unpkg.com/@orillusion/geometry/dist/geometry.umd.js"></script>
+```
+
+More doc from [Orillusion](https://www.orillusion.com/guide/graphics/mesh.html)
diff --git a/...es/effect/grass/geometry/GrassGeometry.ts → packages/geometry/grass/GrassGeometry.ts b/...es/effect/grass/geometry/GrassGeometry.ts → packages/geometry/grass/GrassGeometry.ts
@@ -1,15 +1,11 @@
-import { BoundingBox, GeometryBase, Vector3, VertexAttributeName } from "@orillusion/core";
-import { GrassNode } from "../GrassNode";
-
-
-
+import { BoundingBox, GeometryBase, Transform, Vector3, VertexAttributeName } from "@orillusion/core";
 
 export class GrassGeometry extends GeometryBase {
     public width: number;
     public height: number;
     public segmentW: number;
     public segmentH: number;
-    public nodes: GrassNode[];
+    public nodes: Transform[];
 
     constructor(width: number, height: number, segmentW: number = 1, segmentH: number = 1, count: number) {
         super();
@@ -43,7 +39,7 @@ export class GrassGeometry extends GeometryBase {
 
         let pi = 3.1415926 * 0.5;
         for (let gi = 0; gi < count; gi++) {
-            let node = new GrassNode();
+            let node = new Transform();
             this.nodes.push(node);
 
             let dir = new Vector3(1 * Math.random() - 0.5, 0.0, 1 * Math.random() - 0.5);

diff --git a/.../effect/grass/component/GrassComponent.ts → ...eometry/grass/component/GrassComponent.ts b/.../effect/grass/component/GrassComponent.ts → ...eometry/grass/component/GrassComponent.ts
@@ -1,7 +1,6 @@
-import { BoundingBox, Color, ComponentBase, GPUPrimitiveTopology, LightingFunction_frag, MeshRenderer, Texture, UnLitMaterial, Vector3, VertexAttributeName } from "@orillusion/core";
+import { BoundingBox, Color, ComponentBase, GPUPrimitiveTopology, LightingFunction_frag, MeshRenderer, Texture, Transform, UnLitMaterial, Vector3, VertexAttributeName } from "@orillusion/core";
 import { GrassMaterial } from "../material/GrassMaterial";
-import { GrassGeometry } from "../geometry/GrassGeometry";
-import { GrassNode } from "../GrassNode";
+import { GrassGeometry } from "../GrassGeometry";
 
 export class GrassComponent extends MeshRenderer {
 
@@ -40,7 +39,7 @@ export class GrassComponent extends MeshRenderer {
         this.grassMaterial.baseMap = grassTexture;
     }
 
-    public get nodes(): GrassNode[] {
+    public get nodes(): Transform[] {
         return this.grassGeometry.nodes;
     }
 }
diff --git a/...es/effect/grass/material/GrassMaterial.ts → .../geometry/grass/material/GrassMaterial.ts b/...es/effect/grass/material/GrassMaterial.ts → .../geometry/grass/material/GrassMaterial.ts
diff --git a/...es/effect/grass/shader/GrassBaseShader.ts → .../geometry/grass/shader/GrassBaseShader.ts b/...es/effect/grass/shader/GrassBaseShader.ts → .../geometry/grass/shader/GrassBaseShader.ts
diff --git a/...ect/grass/shader/GrassCastShadowShader.ts → ...try/grass/shader/GrassCastShadowShader.ts b/...ect/grass/shader/GrassCastShadowShader.ts → ...try/grass/shader/GrassCastShadowShader.ts
diff --git a/packages/effect/grass/shader/GrassShader.ts → ...ages/geometry/grass/shader/GrassShader.ts b/packages/effect/grass/shader/GrassShader.ts → ...ages/geometry/grass/shader/GrassShader.ts
diff --git a/...rass/shader/GrassVertexAttributeShader.ts → ...rass/shader/GrassVertexAttributeShader.ts b/...rass/shader/GrassVertexAttributeShader.ts → ...rass/shader/GrassVertexAttributeShader.ts
diff --git a/packages/geometry/index.ts b/packages/geometry/index.ts
@@ -7,4 +7,8 @@ export * from "./ExtrudeGeometry/Path2D"
 export * from "./ExtrudeGeometry/Shape2D"
 export * from "./ExtrudeGeometry/ShapeUtils"
 export * from "./parser/FontParser"
-export * from "./TextGeometry"
+export * from "./text/TextGeometry"
+export * from "./terrain/TerrainGeometry"
+export * from "./grass/GrassGeometry"
+export * from "./grass/component/GrassComponent";
+export * from "./grass/material/GrassMaterial";
diff --git a/packages/geometry/package.json b/packages/geometry/package.json
@@ -1,8 +1,8 @@
 {
     "name": "@orillusion/geometry",
-    "version": "0.2.0",
+    "version": "0.2.4",
     "author": "Orillusion",
-    "description": "Orillusion geometry Plugin",
+    "description": "Orillusion Geometry Plugin",
     "main": "./dist/geometry.umd.js",
     "module": "./dist/geometry.es.js",
     "module:dev": "./index.ts",
@@ -21,7 +21,7 @@
         "type": "git",
         "url": "git+https://github.com/Orillusion/orillusion.git"
     },
-    "dependencies": {
-        "@orillusion/core": "^0.8.0"
+    "peerDependencies": {
+        "@orillusion/core": ">=0.8.0"
     }
 }
diff --git a/...ffect/terrain/geometry/TerrainGeometry.ts → packages/geometry/terrain/TerrainGeometry.ts b/...ffect/terrain/geometry/TerrainGeometry.ts → packages/geometry/terrain/TerrainGeometry.ts
@@ -1,4 +1,4 @@
-import { BitmapTexture2D, Plane, PlaneGeometry, Texture, Vector3, VertexAttributeName, lerp } from "@orillusion/core"
+import { BitmapTexture2D, PlaneGeometry, Vector3, VertexAttributeName, lerp } from "@orillusion/core"
 
 export class TerrainGeometry extends PlaneGeometry {