Merge pull request #7 from vimcaw/shader-editor

vimcaw · Apr 25, 2023 · 97ab5a6 · 97ab5a6
2 parents f6620bf + 848b599
commit 97ab5a6
Show file tree

Hide file tree

Showing 3 changed files with 9 additions and 14 deletions.
diff --git a/.changeset/chilly-actors-joke.md b/.changeset/chilly-actors-joke.md
@@ -0,0 +1,5 @@
+---
+'core': patch
+---
+
+fix: cannot check the debug flag option
diff --git a/packages/core/src/PropertiesPanel/Properties/BooleanProperty.tsx b/packages/core/src/PropertiesPanel/Properties/BooleanProperty.tsx
@@ -2,7 +2,7 @@ import { Object3D } from 'three';
 import { Checkbox } from 'antd';
 import { O } from 'ts-toolbelt';
 import { observerLayer } from '../../store/threeJsData';
-import { isObject3DWithOnBeforeRenderFlag } from '../types';
+import { Object3DWithOnBeforeRenderFlag } from '../types';
 
 export default function BooleanProperty<T extends Object3D>({
   object,
@@ -37,9 +37,9 @@ export function CustomBooleanProperty<T extends Object3D>({
     <Checkbox
       checked={object[propName]}
       onChange={e => {
-        const node = observerLayer.findNode(object.uuid);
+        const node = observerLayer.findNode(object.uuid) as Object3DWithOnBeforeRenderFlag;
 
-        if (node && isObject3DWithOnBeforeRenderFlag(node)) {
+        if (node) {
           if (!node[propName]) {
             node.onBeforeRenderCopy = node.onBeforeRender;
             node.onBeforeRender = () => {

diff --git a/packages/core/src/PropertiesPanel/types.ts b/packages/core/src/PropertiesPanel/types.ts
@@ -1,16 +1,6 @@
 import type { Object3D } from 'three';
 
 export type Object3DWithOnBeforeRenderFlag = Object3D & {
-  onBeforeRenderFlag: boolean;
+  onBeforeRenderFlag?: boolean;
   onBeforeRenderCopy?: Object3D['onBeforeRender'];
 };
-
-export function isObject3DWithOnBeforeRenderFlag(
-  object: unknown
-): object is Object3DWithOnBeforeRenderFlag {
-  return (
-    typeof object === 'object' &&
-    object !== null &&
-    (object as Object3DWithOnBeforeRenderFlag).onBeforeRenderFlag !== undefined
-  );
-}