Run all code on the server

Author: dsrw

ios/.gitignore

@@ -1,3 +1,4 @@
 *.a
 Enu.pck
 **/xcuserdata
+build/

src/controllers/script_controllers/host_bridge.nim

@@ -154,6 +154,22 @@ proc reset_level(self: Worker) =
     state.config_value.value:
       level_dir = current_level
 
+proc ensure_unit(self: Worker, unit: Unit) =
+  if unit notin self.node_map:
+    var node = self.node_map[self.active_unit].copy_tree
+    self.map_unit(unit, node)
+
+proc current_collider(self: Unit, kind: string): Unit =
+  var collider: Unit
+  state.units.value.walk_tree proc(unit: Unit) =
+    if self.collisions.value.any_it(it.id == unit.id):
+      if kind == "Unit" or kind == "Player" and unit of Player or
+          kind == "Bot" and unit of Bot or kind == "Build" and unit of Build or
+          kind == "Sign" and unit of Sign:
+        collider = unit
+        return
+  result = collider
+
 proc world_name(): string =
   state.config.world
 
@@ -391,9 +407,7 @@ proc all_units(T: type Unit, self: Worker): PNode =
     if unit of T:
       # objects without scripts won't show up in the node map. Create
       # a new dummy object
-      if unit notin self.node_map:
-        var node = self.node_map[self.active_unit].copy_tree
-        self.map_unit(unit, node)
+      self.ensure_unit(unit)
       node.add self.to_node(unit)
   result = node
 
@@ -425,9 +439,8 @@ proc draw_position_set(self: Build, position: Vector3) =
       (position - self.position).local_to(self.parent)
 
 proc save(self: Build, name: string) =
-  self.save_points[name] = (
-    self.draw_transform, self.color_value.value, self.drawing
-  )
+  self.save_points[name] =
+    (self.draw_transform, self.color_value.value, self.drawing)
 
 proc restore(self: Build, name: string) =
   (self.draw_transform, self.color_value.value, self.drawing) =
@@ -561,10 +574,9 @@ proc `open=`(self: Sign, value: bool) =
 
 proc coding(self: Worker, unit: Unit): Unit =
   if unit == state.player:
-    if ?state.open_unit and state.open_unit notin self.node_map:
-      var node = self.node_map[self.active_unit].copy_tree
-      self.map_unit(state.open_unit, node)
-    result = state.open_unit
+    if ?state.open_unit:
+      self.ensure_unit(state.open_unit)
+      result = state.open_unit
 
 proc `coding=`(self: Unit, value: Unit) =
   state.open_unit = value
@@ -583,7 +595,8 @@ proc bridge_to_vm*(worker: Worker) =
     glow, `glow=`, speed, `speed=`, scale, `scale=`, velocity, `velocity=`,
     active_unit, color, `color=`, sees, start_position, wake, frame_count,
     write_stack_trace, show, `show=`, frame_created, lock, `lock=`, reset,
-    press_action, load_level, level_name, world_name, reset_level
+    press_action, load_level, level_name, world_name, reset_level,
+    current_collider
 
   result.bridged_from_vm "base_bridge_private",
     link_dependency, action_running, `action_running=`, yield_script,

src/controllers/script_controllers/scripting.nim

@@ -36,11 +36,14 @@ proc script_error*(self: Worker, unit: Unit, e: ref VMQuit) =
     msg = e.parent.msg
 
   info "vm error", msg, file = unit.script_ctx.file_name
-  state.err(\"[url=unit://{unit.id}]{msg}[/url]")
-  unit.local_flags += HighlightError
+  for i, error in unit.errors.value:
+    var error = error
+    error.log = true
+    unit.errors[i] = error
+
+  unit.global_flags += HighlightError
   unit.global_flags -= ScriptInitializing
   unit.ensure_visible
-  state.push_flags ConsoleVisible
 
 proc init_interpreter*[T](self: Worker, _: T) {.gcsafe.} =
   private_access ScriptCtx
@@ -77,7 +80,7 @@ proc init_interpreter*[T](self: Worker, _: T) {.gcsafe.} =
         error "File not found handling error", file_name
 
       var loc = \"{file_name}({int info.line},{int info.col})"
-      errors.add (msg, info, loc)
+      errors.add (msg, info, loc, false)
       ctx.exit_code = error_code
       raise (ref VMQuit)(info: info, msg: msg, location: loc)
 
@@ -131,7 +134,7 @@ proc load_script*(self: Worker, unit: Unit, timeout = script_timeout) =
   try:
     self.active_unit = unit
     unit.errors.clear
-    unit.local_flags -= HighlightError
+    unit.global_flags -= HighlightError
 
     if not state.paused:
       let module_name = ctx.script.split_file.name

src/controllers/script_controllers/worker.nim

@@ -62,7 +62,7 @@ proc advance_unit(self: Worker, unit: Unit, timeout: MonoTime): bool =
 proc change_code(self: Worker, unit: Unit, code: Code) =
   debug "code changing", unit = unit.id
   unit.errors.clear
-  unit.local_flags -= HighlightError
+  unit.global_flags -= HighlightError
   if ?unit.script_ctx and unit.script_ctx.running and not ?unit.clone_of:
     unit.collect_garbage
 
@@ -74,7 +74,6 @@ proc change_code(self: Worker, unit: Unit, code: Code) =
       edit.destroy
 
   unit.reset()
-  state.pop_flag ConsoleVisible
   if LoadingScript notin state.local_flags and code.nim.strip == "":
     self.interpreter.reset_module(unit.script_ctx.module_name)
     debug "reset module", module = unit.script_ctx.module_name
@@ -97,10 +96,9 @@ proc change_code(self: Worker, unit: Unit, code: Code) =
 proc watch_code(self: Worker, unit: Unit) =
   unit.code_value.changes:
     if added or touched:
-      if change.item.owner == "" or change.item.owner == Zen.thread_ctx.id:
+      if Server in state.local_flags:
         save_level(state.config.level_dir)
         self.change_code(unit, change.item)
-      elif Server in state.local_flags:
         if change.item.nim == "":
           remove_file unit.script_ctx.script
         else:
@@ -114,6 +112,18 @@ proc watch_code(self: Worker, unit: Unit) =
       except VMQuit as e:
         self.script_error(unit, e)
 
+  unit.zids.add:
+    unit.errors.changes:
+      if unit.code.owner == Zen.thread_ctx.id:
+        if added and change.item.log:
+          state.err(
+            \"[url=unit://{unit.id}]{change.item.msg} {unit.errors.len}[/url]"
+          )
+          state.push_flags ConsoleVisible
+
+        if removed:
+          state.pop_flags ConsoleVisible
+
   if unit.script_ctx.is_nil:
     unit.script_ctx =
       ScriptCtx.init(owner = unit, interpreter = self.interpreter)

src/nodes/build_node.nim

@@ -3,7 +3,7 @@ import pkg/godot except print, Color
 import
   godotapi/[
     node, voxel_terrain, voxel_mesher_blocky, voxel_tool, voxel_library,
-    shader_material, resource_loader, packed_scene, ray_cast
+    shader_material, resource_loader, packed_scene, ray_cast,
   ]
 import core, models/[units, builds, colors], gdutils
 import ./queries
@@ -80,7 +80,7 @@ gdobj BuildNode of VoxelTerrain:
 
         if Highlight in self.model.local_flags or
             (
-              HighlightError in self.model.local_flags and
+              HighlightError in self.model.global_flags and
               self.error_highlight_on
             ):
           m.set_shader_param("emission_energy", highlight_glow.to_variant)
@@ -168,15 +168,17 @@ gdobj BuildNode of VoxelTerrain:
       elif Resetting.removed:
         self.generator = gdnew[VoxelGeneratorFlat]()
         self.track_chunks()
-
-    self.model.local_flags.watch:
-      if HighlightError.added:
+      elif HighlightError.added:
         self.toggle_error_highlight_at = get_mono_time() + error_flash_time
         self.error_highlight_on = true
+        self.set_highlight
       elif HighlightError.removed:
         self.toggle_error_highlight_at = MonoTime.high
         self.error_highlight_on = false
-      if change.item in [Highlight, HighlightError]:
+        self.set_highlight
+
+    self.model.local_flags.watch:
+      if change.item == Highlight:
         self.set_highlight
 
     state.local_flags.watch:

src/types.nim

@@ -55,7 +55,6 @@ type
     Hover
     TargetMoved
     Highlight
-    HighlightError
     Hide
 
   GlobalModelFlags* = enum
@@ -66,6 +65,7 @@ type
     ScriptInitializing
     Dirty
     Resetting
+    HighlightError
 
   Tools* = enum
     CodeMode
@@ -129,7 +129,8 @@ type
     emission_colors*: seq[godot.Color]
     edits*: ZenTable[string, ZenTable[Vector3, VoxelInfo]]
 
-  ScriptErrors* = ZenSeq[tuple[msg: string, info: TLineInfo, location: string]]
+  ScriptErrors* =
+    ZenSeq[tuple[msg: string, info: TLineInfo, location: string, log: bool]]
 
   SightQuery* = object
     target*: Unit

vmlib/enu/base_api.nim

@@ -371,6 +371,9 @@ template t*(enu_target: NegativeNode) =
 template hit*(node: Unit): Vector3 =
   enu_target.hit(node)
 
+proc hit*[T: Unit](_: type T): T =
+  T(active_unit().current_collider($T))
+
 proc distance*(position: Vector3): float =
   position.distance_to(active_unit().position)
 

vmlib/enu/base_bridge.nim

@@ -49,6 +49,7 @@ bridged_to_host:
   proc reset_level*()
   proc level_name*(): string
   proc world_name*(): string
+  proc current_collider*(self: Unit, name: string): Unit
 
   # TODO: These should be in base_bridge_private, but are currently needed outside of base_api.
   proc echo_console*(msg: string)

vmlib/enu/types.nim

@@ -43,6 +43,8 @@ type
 
   Sign* = ref object of Unit
 
+  Player* = ref object of Unit
+
   Colors* = enum
     eraser
     blue