refactor: deprecate packages/effect, move Terrain Grass into packages…

…/geometry (#446)
Orillusion · Aug 14, 2024 · ba26dc8 · ba26dc8
1 parent 5a9ff20
commit ba26dc8
Show file tree

Hide file tree

Showing 22 changed files with 22 additions and 245 deletions.
diff --git a/package.json b/package.json
@@ -32,13 +32,13 @@
         "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 && 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:effect",
+        "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:effect": "cd packages/effect && 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",

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
@@ -7,7 +7,7 @@ npm install @orillusion/geometry --save
 ```
 ```ts
 import { Scene3D } from "@orillusion/core"
-import { TextGeometry } from "@orillusion/geometry"
+import { TextGeometry, ExtrudeGeometry, TerrainGeometry } from "@orillusion/geometry"
 ```
 
 Or access Global build from CDN

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,6 +1,6 @@
 {
     "name": "@orillusion/geometry",
-    "version": "0.2.1",
+    "version": "0.2.2",
     "author": "Orillusion",
     "description": "Orillusion geometry Plugin",
     "main": "./dist/geometry.umd.js",

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 {
 

diff --git a/packages/geometry/TextGeometry.ts → packages/geometry/text/TextGeometry.ts b/packages/geometry/TextGeometry.ts → packages/geometry/text/TextGeometry.ts
@@ -1,7 +1,7 @@
-import { Shape2D } from "./ExtrudeGeometry/Shape2D";
-import { ExtrudeGeometry, ExtrudeGeometryArgs } from "./ExtrudeGeometry/ExtrudeGeometry";
-import { ShapeUtils } from "./ExtrudeGeometry/ShapeUtils";
-import { Font } from "./lib/opentype";
+import { Shape2D } from "../ExtrudeGeometry/Shape2D";
+import { ExtrudeGeometry, ExtrudeGeometryArgs } from "../ExtrudeGeometry/ExtrudeGeometry";
+import { ShapeUtils } from "../ExtrudeGeometry/ShapeUtils";
+import { Font } from "../lib/opentype";
 
 export type TextGeometryArgs = ExtrudeGeometryArgs & {
     font: Font;

diff --git a/samples/ext/_Sample_Boxes.ts b/samples/ext/_Sample_Boxes.ts
diff --git a/samples/ext/Sample_Grass.ts → samples/geometry/Sample_GrassGeometry.ts b/samples/ext/Sample_Grass.ts → samples/geometry/Sample_GrassGeometry.ts
@@ -1,7 +1,7 @@
 import { GUIHelp } from "@orillusion/debug/GUIHelp";
 import { Engine3D, View3D, Scene3D, CameraUtil, AtmosphericComponent, webGPUContext, HoverCameraController, Object3D, DirectLight, KelvinUtil, PlaneGeometry, VertexAttributeName, LitMaterial, MeshRenderer, Vector4, Vector3, Matrix3, PostProcessingComponent, TAAPost, BitmapTexture2D, GlobalFog, Color, FXAAPost } from "@orillusion/core";
 import { GUIUtil } from "@samples/utils/GUIUtil";
-import { GrassComponent, TerrainGeometry } from "@orillusion/effect";
+import { GrassComponent, TerrainGeometry } from "@orillusion/geometry";
 import { Stats } from "@orillusion/stats";
 
 // An sample of custom vertex attribute of geometry

diff --git a/samples/ext/Sample_Terrain.ts → samples/geometry/Sample_TerrainGeometry.ts b/samples/ext/Sample_Terrain.ts → samples/geometry/Sample_TerrainGeometry.ts
@@ -1,7 +1,7 @@
 import { GUIHelp } from "@orillusion/debug/GUIHelp";
 import { Engine3D, View3D, Scene3D, CameraUtil, AtmosphericComponent, webGPUContext, HoverCameraController, Object3D, DirectLight, KelvinUtil, PlaneGeometry, VertexAttributeName, LitMaterial, MeshRenderer, Vector4, Vector3, Matrix3, PostProcessingComponent, TAAPost, BitmapTexture2D, GlobalFog, Color, FXAAPost } from "@orillusion/core";
 import { GUIUtil } from "@samples/utils/GUIUtil";
-import { GrassComponent, TerrainGeometry } from "@orillusion/effect";
+import { TerrainGeometry } from "@orillusion/geometry";
 
 // An sample of custom vertex attribute of geometry
 class Sample_Terrain {