fix baseMap for media packages

Orillusion · Sep 4, 2023 · b99f4a3 · b99f4a3
1 parent 804ae6e
commit b99f4a3
Show file tree

Hide file tree

Showing 4 changed files with 19 additions and 21 deletions.
diff --git a/packages/media-extention/ChromaKeyMaterial.ts b/packages/media-extention/ChromaKeyMaterial.ts
@@ -1,4 +1,4 @@
-import { Engine3D, ShaderLib, Vector4, Color, BlendMode, registerMaterial, Material, RenderShader } from "@orillusion/core";
+import { Engine3D, ShaderLib, Vector4, Color, BlendMode, Material, RenderShader, Texture } from "@orillusion/core";
 import ChromaKeyShader from "./ChromaKeyShader.wgsl?raw";
 
 /**
@@ -45,6 +45,14 @@ export class ChromaKeyMaterial extends Material {
                 this.defaultPass.setTexture(`baseMap`, Engine3D.res.whiteTexture);
         }
 
+        public set baseMap(value: Texture) {
+                this.defaultPass.setTexture(`baseMap`, value);
+        }
+
+        public get baseMap() {
+                return this.defaultPass.getTexture(`baseMap`);
+        }
+
         /**
          * Set the clip rect area
          */

diff --git a/packages/media-extention/ImageMaterial.ts b/packages/media-extention/ImageMaterial.ts
@@ -15,10 +15,7 @@ export class ImageMaterial extends Material {
     constructor() {
         super();
         ShaderLib.register("ImageMaterialShader", ImageMaterialShader);
-
         this.defaultPass = new RenderShader(`ImageMaterialShader`, `ImageMaterialShader`);
-
-
         this.defaultPass.setShaderEntry(`VertMain`, `FragMain`)
         this.defaultPass.setUniformVector4(`transformUV1`, new Vector4(0, 0, 1, 1));
         this.defaultPass.setUniformVector4(`transformUV2`, new Vector4(0, 0, 1, 1));
@@ -38,6 +35,14 @@ export class ImageMaterial extends Material {
         this.defaultPass.setTexture(`baseMap`, Engine3D.res.whiteTexture);
     }
 
+    public set baseMap(value: Texture) {
+        this.defaultPass.setTexture(`baseMap`, value);
+    }
+
+    public get baseMap() {
+        return this.defaultPass.getTexture(`baseMap`);
+    }
+
     /**
      * Set the clip rect area
      */
@@ -52,20 +57,6 @@ export class ImageMaterial extends Material {
         return this.defaultPass.uniforms[`rectClip`].vector4;
     }
 
-    /**
-     * Set no env Map
-     */
-    public set envMap(texture: Texture) {
-        //no need env texture
-    }
-
-    /**
-     * Set no shadow Map
-     */
-    public set shadowMap(texture: Texture) {
-        //not need shadowMap texture
-    }
-
     /**
      * Start debug GUI
      */

diff --git a/packages/media-extention/VideoMaterial.ts b/packages/media-extention/VideoMaterial.ts
@@ -1,5 +1,5 @@
 
-import { Color, Engine3D, Material, RenderShader, ShaderLib, Texture, Vector4, registerMaterial } from '@orillusion/core';
+import { Color, Engine3D, Material, RenderShader, ShaderLib, Texture, Vector4 } from '@orillusion/core';
 import VideoShader from "./VideoShader.wgsl?raw";
 
 /**
@@ -19,7 +19,6 @@ export class VideoMaterial extends Material {
         this.defaultPass = new RenderShader(`VideoShader`, `VideoShader`);
         this.defaultPass.setShaderEntry(`VertMain`, `FragMain`)
 
-
         this.defaultPass.setShaderEntry(`VertMain`, `FragMain`)
         this.defaultPass.setUniformVector4(`transformUV1`, new Vector4(0, 0, 1, 1));
         this.defaultPass.setUniformVector4(`transformUV2`, new Vector4(0, 0, 1, 1));

diff --git a/packages/media-extention/package.json b/packages/media-extention/package.json
@@ -1,6 +1,6 @@
 {
     "name": "@orillusion/media-extention",
-    "version": "0.2.2",
+    "version": "0.2.3",
     "author": "Orillusion",
     "description": "Orillusion Media Material Extention",
     "main": "./dist/media.umd.js",