EtherealEngine · anselm · Nov 2, 2023 · Nov 1, 2023 · Nov 1, 2023 · Nov 2, 2023
@@ -32,6 +32,7 @@ import {
   useQuery
 } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions'
 import { getMutableState, getState, useHookstate } from '@etherealengine/hyperflux'
+import { isEqual } from 'lodash'
 import React from 'react'
 import AutoSizer from 'react-virtualized-auto-sizer'
 import 'reactflow/dist/style.css'
@@ -57,7 +58,13 @@ const ActiveBehaveGraph = (props: { entity }) => {
       initialGraph={graphComponent.graph}
       examples={{}}
       registry={behaveGraphState.registries[graphComponent.domain]}
-      onChangeGraph={commitProperty(BehaveGraphComponent, 'graph')}
+      onChangeGraph={
+        (newGraph) => {
+          if (isEqual(graphComponent.graph, newGraph)) return
+          commitProperty(BehaveGraphComponent, 'graph')(newGraph)
+        }
+        // need this to smoothen UX
+      }
     />
   )
 }

@@ -83,7 +83,7 @@ export const Flow: React.FC<FlowProps> = ({ initialGraph: graph, examples, regis
   useEffect(() => {
     if (dragging.value || !mouseOver.value) return
     onChangeGraph(graphJson ?? graph)
-  }, [dragging, graphJson])
+  }, [graphJson]) // change in node position triggers reactor
 
   return (
     <ReactFlow

@@ -36,17 +36,17 @@ import {
 } from '@etherealengine/engine/src/ecs/functions/ComponentFunctions'
 import { entityExists } from '@etherealengine/engine/src/ecs/functions/EntityFunctions'
 import { EntityTreeComponent } from '@etherealengine/engine/src/ecs/functions/EntityTree'
-import { ErrorComponent } from '@etherealengine/engine/src/scene/components/ErrorComponent'
 import { NameComponent } from '@etherealengine/engine/src/scene/components/NameComponent'
 import { getMutableState, useHookstate } from '@etherealengine/hyperflux'
 
 import ArrowDropDownIcon from '@mui/icons-material/ArrowDropDown'
 import ArrowRightIcon from '@mui/icons-material/ArrowRight'
 
+import { ErrorComponent } from '@etherealengine/engine/src/scene/components/ErrorComponent'
 import { ItemTypes, SupportedFileTypes } from '../../constants/AssetTypes'
-import { addMediaNode } from '../../functions/addMediaNode'
 import { EntityNodeEditor } from '../../functions/ComponentEditors'
 import { EditorControlFunctions } from '../../functions/EditorControlFunctions'
+import { addMediaNode } from '../../functions/addMediaNode'
 import { isAncestor } from '../../functions/getDetachedObjectsRoots'
 import { SelectionState } from '../../services/SelectionServices'
 import useUpload from '../assets/useUpload'

@@ -0,0 +1,175 @@
+/*
+CPAL-1.0 License
+
+The contents of this file are subject to the Common Public Attribution License
+Version 1.0. (the "License"); you may not use this file except in compliance
+with the License. You may obtain a copy of the License at
+https://github.com/EtherealEngine/etherealengine/blob/dev/LICENSE.
+The License is based on the Mozilla Public License Version 1.1, but Sections 14
+and 15 have been added to cover use of software over a computer network and 
+provide for limited attribution for the Original Developer. In addition, 
+Exhibit A has been modified to be consistent with Exhibit B.
+
+Software distributed under the License is distributed on an "AS IS" basis,
+WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License for the
+specific language governing rights and limitations under the License.
+
+The Original Code is Ethereal Engine.
+
+The Original Developer is the Initial Developer. The Initial Developer of the
+Original Code is the Ethereal Engine team.
+
+All portions of the code written by the Ethereal Engine team are Copyright © 2021-2023 
+Ethereal Engine. All Rights Reserved.
+*/
+
+import { NodeCategory, SocketsList, makeEventNodeDefinition, sequence } from '@behave-graph/core'
+import {
+  Component,
+  ComponentMap,
+  Query,
+  defineQuery,
+  removeQuery
+} from '../../../../../ecs/functions/ComponentFunctions'
+import {
+  SystemDefinitions,
+  SystemUUID,
+  defineSystem,
+  disableSystem,
+  startSystem
+} from '../../../../../ecs/functions/SystemFunctions'
+
+let systemCounter = 0
+
+type State = {
+  query: Query
+  systemUUID: SystemUUID
+}
+const initialState = (): State => ({
+  query: undefined!,
+  systemUUID: '' as SystemUUID
+})
+
+// very 3D specific.
+export const OnQuery = makeEventNodeDefinition({
+  typeName: 'engine/onQuery',
+  category: NodeCategory.Event,
+  label: 'On Query',
+  configuration: {
+    numInputs: {
+      valueType: 'number',
+      defaultValue: 1
+    }
+  },
+  in: (_, graphApi) => {
+    const sockets: SocketsList = []
+
+    const componentName = (index) => {
+      const choices = Array.from(ComponentMap.keys()).sort()
+      choices.unshift('none')
+      return {
+        key: `componentName${index}`,
+        valueType: 'string',
+        choices: choices
+      }
+    }
+    const type = () => {
+      const choices = ['entry', 'exit']
+      choices.unshift('none')
+      return {
+        key: 'type',
+        valueType: 'string',
+        choices: choices
+      }
+    }
+
+    const system = () => {
+      const systemDefinitions = Array.from(SystemDefinitions.keys()).map((key) => key as string)
+      const groups = systemDefinitions.filter((key) => key.includes('group')).sort()
+      const nonGroups = systemDefinitions.filter((key) => !key.includes('group')).sort()
+      const choices = [...groups, ...nonGroups]
+      choices.unshift('none')
+      return {
+        key: 'system',
+        valueType: 'string',
+        choices: choices
+      }
+    }
+    // unsure how to get all system groups
+
+    sockets.push({ ...type() }, { ...system() })
+
+    for (const index of sequence(1, (_.numInputs ?? OnQuery.configuration?.numInputs.defaultValue) + 1)) {
+      sockets.push({ ...componentName(index) })
+    }
+    return sockets
+  },
+
+  out: {
+    flow: 'flow',
+    entity: 'entity'
+  },
+  initialState: initialState(),
+  init: ({ read, write, commit, graph, configuration }) => {
+    const type = read<string>('type')
+    const system = read<SystemUUID>('system')
+
+    const queryComponents: Component[] = []
+    for (const index of sequence(1, (configuration.numInputs ?? OnQuery.configuration?.numInputs.defaultValue) + 1)) {
+      const componentName = read<string>(`componentName${index}`)
+      const component = ComponentMap.get(componentName)!
+      queryComponents.push(component)
+    }
+    const query = defineQuery(queryComponents)
+    let prevQueryResult = []
+    let newQueryResult = []
+    let queryType
+    switch (type) {
+      case 'entry': {
+        queryType = query.enter
+        break
+      }
+      case 'exit': {
+        queryType = query.exit
+        break
+      }
+      case 'none': {
+        queryType = query
+        break
+      }
+    }
+    const systemUUID = defineSystem({
+      uuid: 'behave-graph-onQuery-' + systemCounter++,
+      execute: () => {
+        newQueryResult = queryType()
+        if (newQueryResult.length === 0) return
+        if (prevQueryResult === newQueryResult) return
+        const tempResult = newQueryResult
+        function delayedLoop(i) {
+          if (i < tempResult.length) {
+            const eid = tempResult[i]
+            write('entity', eid)
+            commit('flow')
+            setTimeout(() => {
+              prevQueryResult = tempResult
+              delayedLoop(i + 1)
+            }, 50) //milliseconds, to prevent write from skipping over entities
+          }
+        }
+        delayedLoop(0)
+      }
+    })
+    startSystem(systemUUID, { with: system })
+    const state: State = {
+      query,
+      systemUUID
+    }
+
+    return state
+  },
+  dispose: ({ state: { query, systemUUID }, graph: { getDependency } }) => {
+    disableSystem(systemUUID)
+    removeQuery(query)
+    return initialState()
+  }
+})
@@ -34,6 +34,7 @@ import {
 } from '@behave-graph/core'
 import { GetSceneProperty, SetSceneProperty } from '@behave-graph/scene'
 import { OnButtonState } from './Events/onButtonState'
+import { OnQuery } from './Events/onQuery'
 import * as ComponentNodes from './Values/ComponentNodes'
 import * as CustomNodes from './Values/CustomNodes'
 import * as EntityNodes from './Values/EntityNodes'
@@ -74,6 +75,7 @@ export const getEngineNodesMap = memo<Record<string, NodeDefinition>>(() => {
 
     // events
     OnButtonState, // click included
+    OnQuery,
     // async
     //switchScene.Description,
     ...SetSceneProperty(engineValueTypeNames),