@realsee/dnalogel 0.1.7-alpha.1 → 0.1.7-alpha.2

package/components/GLTFView/index.d.ts

@@ -89,6 +89,16 @@ export declare type GLTFViewPropTypes = {
  *  .start()
  *
  * ```
+ *
+ * ### 光照配置
+ *
+ * ```ts
+ * pointLight?: THREE.PointLight | false
+ * directionalLight?: THREE.DirectionalLight | false
+ * ambientLight?: THREE.AmbientLight | false
+ * ```
+ * 自带三种默认光照配置，你可以提供自己的光照实例。如果设置 `pointLight: false` 则禁用该光照效果。
+ *
  */
 export declare const GLTFView: React.FC<GLTFViewPropTypes>;
 export default GLTFView;

package/components/GLTFView/index.js

@@ -119,6 +119,16 @@ function _interopRequireWildcard(obj, nodeInterop) { if (!nodeInterop && obj &&
  *  .start()
  *
  * ```
+ *
+ * ### 光照配置
+ *
+ * ```ts
+ * pointLight?: THREE.PointLight | false
+ * directionalLight?: THREE.DirectionalLight | false
+ * ambientLight?: THREE.AmbientLight | false
+ * ```
+ * 自带三种默认光照配置，你可以提供自己的光照实例。如果设置 `pointLight: false` 则禁用该光照效果。
+ *
  */
 var GLTFView = function GLTFView(props) {
   var ref = React.useRef(null);
@@ -149,8 +159,7 @@ var GLTFView = function GLTFView(props) {
       };
     }();
 
-    callback();
-    console.log('refs', props.refs); // 实例
+    callback(); // 实例
 
     if (props.refs) {
       props.refs(gltfViewer);

package/libs/gltf-viewer/index.d.ts

@@ -11,8 +11,11 @@ export interface GLTFViewerConfig {
     backgroundHDR?: string;
     pixelRatio?: number;
     initial?: Partial<GLTFViewerState>;
-    pointLight?: THREE.PointLight;
-    directionalLight?: THREE.DirectionalLight;
+    pointLight?: THREE.PointLight | false;
+    directionalLight?: THREE.DirectionalLight | false;
+    ambientLight?: THREE.AmbientLight | false;
+    minFov?: number;
+    maxFov?: number;
 }
 export interface GLTFViewerState {
     fov: number;

package/libs/gltf-viewer/index.js

@@ -41,6 +41,8 @@ require("core-js/modules/es.number.is-integer.js");
 
 require("core-js/modules/es.number.constructor.js");
 
+require("core-js/modules/es.array.concat.js");
+
 var _assertThisInitialized2 = _interopRequireDefault(require("@babel/runtime/helpers/assertThisInitialized"));
 
 var _inherits2 = _interopRequireDefault(require("@babel/runtime/helpers/inherits"));
@@ -104,7 +106,8 @@ var Controller = /*#__PURE__*/function () {
     (0, _defineProperty2["default"])(this, "longitude", 0);
     (0, _defineProperty2["default"])(this, "latitude", -0.3);
     (0, _defineProperty2["default"])(this, "needsRender", false);
-    // 异步事件回调
+    this.config = config; // 异步事件回调
+
     this.callbacks = callbacks; // 默认状态参数
 
     var initial = config.initial || {};
@@ -149,11 +152,22 @@ var Controller = /*#__PURE__*/function () {
 
     this.camera = new THREE.PerspectiveCamera(this.fov, 1, 0.1, 10000); // 光照
 
-    this.pointLight = config.pointLight || new THREE.PointLight(0xfffffff, 0.9, 10000);
-    this.scene.add(this.pointLight);
-    this.directionLight = config.directionalLight || new THREE.DirectionalLight(0xfffffff, 0.1);
-    this.directionLight.position.setY(-1);
-    this.scene.add(this.directionLight); // 背景 HDR
+    if (config.pointLight !== false) {
+      this.pointLight = config.pointLight || new THREE.PointLight(0xfffffff, 1, 100000);
+      this.scene.add(this.pointLight);
+    }
+
+    if (config.directionalLight !== false) {
+      this.directionLight = config.directionalLight || new THREE.DirectionalLight(0xfffffff, 0.1);
+      this.directionLight.position.setY(-1);
+      this.scene.add(this.directionLight);
+    }
+
+    if (config.ambientLight !== false) {
+      this.ambientLight = config.ambientLight || new THREE.AmbientLight(0xfffffff);
+      this.scene.add(this.ambientLight);
+    } // 背景 HDR
+
 
     if (config.backgroundHDR) {
       var pmremGenerator = new THREE.PMREMGenerator(this.renderer);
@@ -205,6 +219,16 @@ var Controller = /*#__PURE__*/function () {
   }
 
   (0, _createClass2["default"])(Controller, [{
+    key: "minFov",
+    get: function get() {
+      return this.config.minFov || 20;
+    }
+  }, {
+    key: "maxFov",
+    get: function get() {
+      return this.config.maxFov || 120;
+    }
+  }, {
     key: "pause",
     value: function pause() {// nothing todo
     }
@@ -333,10 +357,10 @@ var Controller = /*#__PURE__*/function () {
         latitude: -Math.PI / 6
       });
       lightDirection.setLength(distance * 3);
-      this.pointLight.position.copy(center.clone().add(lightDirection));
+      if (this.pointLight) this.pointLight.position.copy(center.clone().add(lightDirection));
 
       if (fov !== this.fov) {
-        fov = Math.max(25, Math.min(60, fov));
+        fov = Math.max(25, Math.min(this.maxFov, fov));
         this.camera.fov = fov;
         this.camera.updateProjectionMatrix();
       }
@@ -578,8 +602,8 @@ var GLTFViewer = /*#__PURE__*/function (_Subscribe) {
               throw new TypeError('The fov is not an number');
             }
 
-            if (value > 60 || value < 20) {
-              throw new RangeError('The fov seems invalid~ fov: [20, 60]');
+            if (value > controller.maxFov || value < controller.minFov) {
+              throw new RangeError("The fov seems invalid~ fov: [".concat(controller.minFov, ", ").concat(controller.maxFov, "]"));
             }
           }
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@realsee/dnalogel",
-  "version": "0.1.7-alpha.1",
+  "version": "0.1.7-alpha.2",
   "description": "如视前端 Componets、Plugins 兼部分 SDKs \"Dnalogel\" 库。",
   "author": "BEIKE REALSEE TECHNOLOGY (HK) LIMITED",
   "peerDependencies": {

package/plugins/PanoMaskSelectorPlugin/fragmentShader.d.ts

@@ -1 +1 @@
-export declare const fragmentShader = "\nconst float PI = 3.1415926535897932384626433832795;\nuniform int enable;\nuniform sampler2D map;\nvarying vec2 vUv;\n\nuniform vec3 selectedColor;\nuniform vec3 maskColor;\nuniform float opacity;\nuniform float thickness;\n\n\n// \u5224\u65AD\u4E24\u4E2A\u989C\u8272\u662F\u5426\u76F8\u4F3C\nbool compare(vec3 c1, vec3 c2, float threshold) {\n  // \u8272\u503C\u8BEF\u5DEE 0.05\n  float diff = threshold;\n\n  float r = abs(c1.x - c2.x);\n  float g = abs(c1.y - c2.y);\n  float b = abs(c1.z - c2.z);\n\n  return r < diff && g < diff && b < diff;\n}\n\nvoid main(void) {\n  vec3 color = texture2D(map, vUv).xyz;\n  float alpha = texture2D(map, vUv).a;\n\n  gl_FragColor = vec4(color, 1.0);\n  return;\n  // gl_FragColor = vec4(color, opacity);\n\n\n  // \u5F00\u5173\n  if (enable != 1) {\n    gl_FragColor = vec4(color, opacity);\n    return;\n  }\n\n  // \u9ED8\u8BA4\u503C\uFF1A\u672A\u63D0\u4F9B \u9009\u4E2D\u8272\u503C\n  if (selectedColor.x == 0.0 && selectedColor.y == 0.0 && selectedColor.z == 0.0) {\n    gl_FragColor = vec4(color, opacity);\n    return;\n  }\n\n  bool similar = compare(color, selectedColor, 0.025);\n\n  // \u4E0D\u76F8\u4F3C\n  if (similar == false) {\n    gl_FragColor = vec4(color, opacity);\n    return;\n  }\n\n  // \u5BF9\u6BD4\u534A\u5F84\u5E45\u5EA6\n  float offset1 = thickness;\n  float offset2 = offset1 * sin(PI/4.0);\n\n  vec3 top = texture2D(map, vec2(vUv.x, vUv.y + offset1)).xyz;\n  vec3 right = texture2D(map, vec2(vUv.x + offset1, vUv.y)).xyz;\n  vec3 bottom = texture2D(map, vec2(vUv.x, vUv.y - offset1)).xyz;\n  vec3 left = texture2D(map, vec2(vUv.x - offset1, vUv.y)).xyz;\n  \n  vec3 topRight = texture2D(map, vec2(vUv.x + offset2, vUv.y + offset2)).xyz;\n  vec3 rightBottom = texture2D(map, vec2(vUv.x + offset2, vUv.y - offset2)).xyz;\n  vec3 bottomLeft = texture2D(map, vec2(vUv.x - offset2, vUv.y - offset2)).xyz;\n  vec3 leftTop = texture2D(map, vec2(vUv.x - offset2, vUv.y + offset2)).xyz;\n\n  float threshold = 0.0025;\n  bool a1 = compare(color, top, threshold);\n  bool b1 = compare(color, right, threshold);\n  bool c1 = compare(color, bottom, threshold);\n  bool d1 = compare(color, left, threshold);\n\n\n  bool a2 = compare(color, topRight, threshold);\n  bool b2 = compare(color, rightBottom, threshold);\n  bool c2 = compare(color, bottomLeft, threshold);\n  bool d2 = compare(color, leftTop, threshold);\n\n  if (a1 == true && b1 == true && c1 == true && d1 == true && a2 == true && b2 == true && c2 == true && d2 == true) {\n    gl_FragColor = vec4(color, opacity);\n    return;\n  }\n\n  gl_FragColor =  vec4(maskColor.x, maskColor.y, maskColor.z, 1.0);\n  // gl_FragColor =  vec4(154.0 / 255.0, 205.0 / 255.0, 50.0 / 255.0, 1.0) ;\n  // gl_FragColor =  vec4(139.0 / 255.0, 0.0 / 255.0, 0.0 / 255.0, 1.0) ;\n  // gl_FragColor =  vec4(255.0 / 255.0, 235.0 / 255.0, 59.0 / 255.0, 1.0) ;\n\n}\n";
+export declare const fragmentShader = "\nconst float PI = 3.1415926535897932384626433832795;\nuniform int enable;\nuniform sampler2D map;\nvarying vec2 vUv;\n\nuniform vec3 selectedColor;\nuniform vec3 maskColor;\nuniform float opacity;\nuniform float thickness;\n\n\n// \u5224\u65AD\u4E24\u4E2A\u989C\u8272\u662F\u5426\u76F8\u4F3C\nbool compare(vec3 c1, vec3 c2, float threshold) {\n  // \u8272\u503C\u8BEF\u5DEE 0.05\n  float diff = threshold;\n\n  float r = abs(c1.x - c2.x);\n  float g = abs(c1.y - c2.y);\n  float b = abs(c1.z - c2.z);\n\n  return r < diff && g < diff && b < diff;\n}\n\nvoid main(void) {\n  vec3 color = texture2D(map, vUv).xyz;\n  float alpha = texture2D(map, vUv).a;\n\n  gl_FragColor = vec4(color, opacity);\n\n  // \u5F00\u5173\n  if (enable != 1) {\n    gl_FragColor = vec4(color, opacity);\n    return;\n  }\n\n  // \u9ED8\u8BA4\u503C\uFF1A\u672A\u63D0\u4F9B \u9009\u4E2D\u8272\u503C\n  if (selectedColor.x == 0.0 && selectedColor.y == 0.0 && selectedColor.z == 0.0) {\n    gl_FragColor = vec4(color, opacity);\n    return;\n  }\n\n  bool similar = compare(color, selectedColor, 0.025);\n\n  // \u4E0D\u76F8\u4F3C\n  if (similar == false) {\n    gl_FragColor = vec4(color, opacity);\n    return;\n  }\n\n  // \u5BF9\u6BD4\u534A\u5F84\u5E45\u5EA6\n  float offset1 = thickness;\n  float offset2 = offset1 * sin(PI/4.0);\n\n  vec3 top = texture2D(map, vec2(vUv.x, vUv.y + offset1)).xyz;\n  vec3 right = texture2D(map, vec2(vUv.x + offset1, vUv.y)).xyz;\n  vec3 bottom = texture2D(map, vec2(vUv.x, vUv.y - offset1)).xyz;\n  vec3 left = texture2D(map, vec2(vUv.x - offset1, vUv.y)).xyz;\n  \n  vec3 topRight = texture2D(map, vec2(vUv.x + offset2, vUv.y + offset2)).xyz;\n  vec3 rightBottom = texture2D(map, vec2(vUv.x + offset2, vUv.y - offset2)).xyz;\n  vec3 bottomLeft = texture2D(map, vec2(vUv.x - offset2, vUv.y - offset2)).xyz;\n  vec3 leftTop = texture2D(map, vec2(vUv.x - offset2, vUv.y + offset2)).xyz;\n\n  float threshold = 0.0025;\n  bool a1 = compare(color, top, threshold);\n  bool b1 = compare(color, right, threshold);\n  bool c1 = compare(color, bottom, threshold);\n  bool d1 = compare(color, left, threshold);\n\n\n  bool a2 = compare(color, topRight, threshold);\n  bool b2 = compare(color, rightBottom, threshold);\n  bool c2 = compare(color, bottomLeft, threshold);\n  bool d2 = compare(color, leftTop, threshold);\n\n  if (a1 == true && b1 == true && c1 == true && d1 == true && a2 == true && b2 == true && c2 == true && d2 == true) {\n    gl_FragColor = vec4(color, opacity);\n    return;\n  }\n\n  gl_FragColor =  vec4(maskColor.x, maskColor.y, maskColor.z, 1.0);\n  // gl_FragColor =  vec4(154.0 / 255.0, 205.0 / 255.0, 50.0 / 255.0, 1.0) ;\n  // gl_FragColor =  vec4(139.0 / 255.0, 0.0 / 255.0, 0.0 / 255.0, 1.0) ;\n  // gl_FragColor =  vec4(255.0 / 255.0, 235.0 / 255.0, 59.0 / 255.0, 1.0) ;\n\n}\n";

package/plugins/PanoMaskSelectorPlugin/fragmentShader.js

@@ -6,5 +6,5 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.fragmentShader = void 0;
-var fragmentShader = "\nconst float PI = 3.1415926535897932384626433832795;\nuniform int enable;\nuniform sampler2D map;\nvarying vec2 vUv;\n\nuniform vec3 selectedColor;\nuniform vec3 maskColor;\nuniform float opacity;\nuniform float thickness;\n\n\n// \u5224\u65AD\u4E24\u4E2A\u989C\u8272\u662F\u5426\u76F8\u4F3C\nbool compare(vec3 c1, vec3 c2, float threshold) {\n  // \u8272\u503C\u8BEF\u5DEE 0.05\n  float diff = threshold;\n\n  float r = abs(c1.x - c2.x);\n  float g = abs(c1.y - c2.y);\n  float b = abs(c1.z - c2.z);\n\n  return r < diff && g < diff && b < diff;\n}\n\nvoid main(void) {\n  vec3 color = texture2D(map, vUv).xyz;\n  float alpha = texture2D(map, vUv).a;\n\n  gl_FragColor = vec4(color, 1.0);\n  return;\n  // gl_FragColor = vec4(color, opacity);\n\n\n  // \u5F00\u5173\n  if (enable != 1) {\n    gl_FragColor = vec4(color, opacity);\n    return;\n  }\n\n  // \u9ED8\u8BA4\u503C\uFF1A\u672A\u63D0\u4F9B \u9009\u4E2D\u8272\u503C\n  if (selectedColor.x == 0.0 && selectedColor.y == 0.0 && selectedColor.z == 0.0) {\n    gl_FragColor = vec4(color, opacity);\n    return;\n  }\n\n  bool similar = compare(color, selectedColor, 0.025);\n\n  // \u4E0D\u76F8\u4F3C\n  if (similar == false) {\n    gl_FragColor = vec4(color, opacity);\n    return;\n  }\n\n  // \u5BF9\u6BD4\u534A\u5F84\u5E45\u5EA6\n  float offset1 = thickness;\n  float offset2 = offset1 * sin(PI/4.0);\n\n  vec3 top = texture2D(map, vec2(vUv.x, vUv.y + offset1)).xyz;\n  vec3 right = texture2D(map, vec2(vUv.x + offset1, vUv.y)).xyz;\n  vec3 bottom = texture2D(map, vec2(vUv.x, vUv.y - offset1)).xyz;\n  vec3 left = texture2D(map, vec2(vUv.x - offset1, vUv.y)).xyz;\n  \n  vec3 topRight = texture2D(map, vec2(vUv.x + offset2, vUv.y + offset2)).xyz;\n  vec3 rightBottom = texture2D(map, vec2(vUv.x + offset2, vUv.y - offset2)).xyz;\n  vec3 bottomLeft = texture2D(map, vec2(vUv.x - offset2, vUv.y - offset2)).xyz;\n  vec3 leftTop = texture2D(map, vec2(vUv.x - offset2, vUv.y + offset2)).xyz;\n\n  float threshold = 0.0025;\n  bool a1 = compare(color, top, threshold);\n  bool b1 = compare(color, right, threshold);\n  bool c1 = compare(color, bottom, threshold);\n  bool d1 = compare(color, left, threshold);\n\n\n  bool a2 = compare(color, topRight, threshold);\n  bool b2 = compare(color, rightBottom, threshold);\n  bool c2 = compare(color, bottomLeft, threshold);\n  bool d2 = compare(color, leftTop, threshold);\n\n  if (a1 == true && b1 == true && c1 == true && d1 == true && a2 == true && b2 == true && c2 == true && d2 == true) {\n    gl_FragColor = vec4(color, opacity);\n    return;\n  }\n\n  gl_FragColor =  vec4(maskColor.x, maskColor.y, maskColor.z, 1.0);\n  // gl_FragColor =  vec4(154.0 / 255.0, 205.0 / 255.0, 50.0 / 255.0, 1.0) ;\n  // gl_FragColor =  vec4(139.0 / 255.0, 0.0 / 255.0, 0.0 / 255.0, 1.0) ;\n  // gl_FragColor =  vec4(255.0 / 255.0, 235.0 / 255.0, 59.0 / 255.0, 1.0) ;\n\n}\n";
+var fragmentShader = "\nconst float PI = 3.1415926535897932384626433832795;\nuniform int enable;\nuniform sampler2D map;\nvarying vec2 vUv;\n\nuniform vec3 selectedColor;\nuniform vec3 maskColor;\nuniform float opacity;\nuniform float thickness;\n\n\n// \u5224\u65AD\u4E24\u4E2A\u989C\u8272\u662F\u5426\u76F8\u4F3C\nbool compare(vec3 c1, vec3 c2, float threshold) {\n  // \u8272\u503C\u8BEF\u5DEE 0.05\n  float diff = threshold;\n\n  float r = abs(c1.x - c2.x);\n  float g = abs(c1.y - c2.y);\n  float b = abs(c1.z - c2.z);\n\n  return r < diff && g < diff && b < diff;\n}\n\nvoid main(void) {\n  vec3 color = texture2D(map, vUv).xyz;\n  float alpha = texture2D(map, vUv).a;\n\n  gl_FragColor = vec4(color, opacity);\n\n  // \u5F00\u5173\n  if (enable != 1) {\n    gl_FragColor = vec4(color, opacity);\n    return;\n  }\n\n  // \u9ED8\u8BA4\u503C\uFF1A\u672A\u63D0\u4F9B \u9009\u4E2D\u8272\u503C\n  if (selectedColor.x == 0.0 && selectedColor.y == 0.0 && selectedColor.z == 0.0) {\n    gl_FragColor = vec4(color, opacity);\n    return;\n  }\n\n  bool similar = compare(color, selectedColor, 0.025);\n\n  // \u4E0D\u76F8\u4F3C\n  if (similar == false) {\n    gl_FragColor = vec4(color, opacity);\n    return;\n  }\n\n  // \u5BF9\u6BD4\u534A\u5F84\u5E45\u5EA6\n  float offset1 = thickness;\n  float offset2 = offset1 * sin(PI/4.0);\n\n  vec3 top = texture2D(map, vec2(vUv.x, vUv.y + offset1)).xyz;\n  vec3 right = texture2D(map, vec2(vUv.x + offset1, vUv.y)).xyz;\n  vec3 bottom = texture2D(map, vec2(vUv.x, vUv.y - offset1)).xyz;\n  vec3 left = texture2D(map, vec2(vUv.x - offset1, vUv.y)).xyz;\n  \n  vec3 topRight = texture2D(map, vec2(vUv.x + offset2, vUv.y + offset2)).xyz;\n  vec3 rightBottom = texture2D(map, vec2(vUv.x + offset2, vUv.y - offset2)).xyz;\n  vec3 bottomLeft = texture2D(map, vec2(vUv.x - offset2, vUv.y - offset2)).xyz;\n  vec3 leftTop = texture2D(map, vec2(vUv.x - offset2, vUv.y + offset2)).xyz;\n\n  float threshold = 0.0025;\n  bool a1 = compare(color, top, threshold);\n  bool b1 = compare(color, right, threshold);\n  bool c1 = compare(color, bottom, threshold);\n  bool d1 = compare(color, left, threshold);\n\n\n  bool a2 = compare(color, topRight, threshold);\n  bool b2 = compare(color, rightBottom, threshold);\n  bool c2 = compare(color, bottomLeft, threshold);\n  bool d2 = compare(color, leftTop, threshold);\n\n  if (a1 == true && b1 == true && c1 == true && d1 == true && a2 == true && b2 == true && c2 == true && d2 == true) {\n    gl_FragColor = vec4(color, opacity);\n    return;\n  }\n\n  gl_FragColor =  vec4(maskColor.x, maskColor.y, maskColor.z, 1.0);\n  // gl_FragColor =  vec4(154.0 / 255.0, 205.0 / 255.0, 50.0 / 255.0, 1.0) ;\n  // gl_FragColor =  vec4(139.0 / 255.0, 0.0 / 255.0, 0.0 / 255.0, 1.0) ;\n  // gl_FragColor =  vec4(255.0 / 255.0, 235.0 / 255.0, 59.0 / 255.0, 1.0) ;\n\n}\n";
 exports.fragmentShader = fragmentShader;