Merge branch 'dev' into darora/311/ui-feedback

Author: PepperLola

.github/dependabot.yml

@@ -5,3 +5,7 @@ updates:
     directory: "/"
     schedule:
       interval: "daily"
+  - package-ecosystem: "nix"
+    directory: "/"
+    schedule:
+      interval: "weekly"

.gitignore

@@ -11,3 +11,5 @@ renderer/
 .idea
 **/.direnv
 .npmrc
+result
+result-*

fission/public/assetpack.zip

@@ -1,3 +1,3 @@
 version https://git-lfs.github.com/spec/v1
-oid sha256:929579b2dc87cffb6b5236f054a6b1ffcb17f0a384f4262f58fd2cb99fdc48ac
-size 41776301
+oid sha256:2213eb7905d6fe15beb5fca656065c248da0c4f4b7630ced943bb5cf4a32c3fb
+size 43082276

fission/src/systems/scene/DragModeSystem.ts

@@ -357,8 +357,22 @@ class DragModeSystem extends WorldSystem {
     private stopDragging(): void {
         if (!this._isDragging) return
 
+        let targetSceneObject: MirabufSceneObject | undefined
+        let shouldTransition = true
+
+        if (this._dragTarget) {
+            const association = World.physicsSystem.getBodyAssociation(this._dragTarget.bodyId) as RigidNodeAssociate
+            targetSceneObject = association?.sceneObject
+            if (association?.isGamePiece) {
+                shouldTransition = false
+            }
+        }
+
         if (this._dragTarget?.physicsDisabled) {
-            World.physicsSystem.enablePhysicsForBody(this._dragTarget.bodyId)
+            World.physicsSystem.enablePhysicsForBody(
+                this._dragTarget.bodyId,
+                targetSceneObject?.mechanism.layerReserve?.layer
+            )
         } else if (this._dragTarget) {
             const body = World.physicsSystem.getBody(this._dragTarget.bodyId)
             if (body) {
@@ -386,17 +400,6 @@ class DragModeSystem extends WorldSystem {
             }
         }
 
-        let targetSceneObject: MirabufSceneObject | undefined
-        let shouldTransition = true
-
-        if (this._dragTarget) {
-            const association = World.physicsSystem.getBodyAssociation(this._dragTarget.bodyId) as RigidNodeAssociate
-            targetSceneObject = association?.sceneObject
-            if (association?.isGamePiece) {
-                shouldTransition = false
-            }
-        }
-
         this._isDragging = false
         this._dragTarget = undefined
 
@@ -427,6 +430,9 @@ class DragModeSystem extends WorldSystem {
             World.physicsSystem.activateBody(this._dragTarget.bodyId)
         }
 
+        const compensateGravity =
+            DragModeSystem.DRAG_FORCE_CONSTANTS.GRAVITY_COMPENSATION && !this._dragTarget.physicsDisabled
+
         const currentPos = body.GetPosition()
         const currentPosition = new THREE.Vector3(currentPos.GetX(), currentPos.GetY(), currentPos.GetZ())
         const currentRotation = body.GetRotation()
@@ -508,7 +514,7 @@ class DragModeSystem extends WorldSystem {
             const forceNeeded = velocityError.multiplyScalar(forceMultiplier)
 
             // Add gravity compensation to counteract downward pull
-            if (DragModeSystem.DRAG_FORCE_CONSTANTS.GRAVITY_COMPENSATION) {
+            if (compensateGravity) {
                 const gravityCompensation = new THREE.Vector3(
                     0,
                     mass * DragModeSystem.DRAG_FORCE_CONSTANTS.GRAVITY_MAGNITUDE,
@@ -558,7 +564,7 @@ class DragModeSystem extends WorldSystem {
             )
 
             // Add gravity compensation to prevent falling when stationary
-            if (DragModeSystem.DRAG_FORCE_CONSTANTS.GRAVITY_COMPENSATION) {
+            if (compensateGravity) {
                 const gravityCompensationY = mass * DragModeSystem.DRAG_FORCE_CONSTANTS.GRAVITY_MAGNITUDE
                 brakingForce.SetY(brakingForce.GetY() + gravityCompensationY)
             }

flake.nix

@@ -2,18 +2,22 @@
 # https://wiki.nixos.org/wiki/Flakes#Setup
 {
   description = "Synthesis' Web-Based Robotics Simulator";
-  
+
   nixConfig = {
     commit-lock-file-summary = "chore: update flake.lock";
   };
 
-  inputs= {
+  inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     systems.url = "github:nix-systems/triplet";
   };
 
   outputs =
-    { self, nixpkgs, systems }:
+    {
+      self,
+      nixpkgs,
+      systems,
+    }:
     let
       inherit (nixpkgs) lib;
 
@@ -55,17 +59,36 @@
               bun
             ];
           };
-          multiplayer = pkgs.mkShell {
+          glueball = pkgs.mkShell {
             packages = with pkgs; [
-              bun
+              cargo
+              clippy
+              rustfmt
+              rust-analyzer
             ];
           };
         }
       );
 
+      packages = forEachSystem (
+        { pkgs, ... }: {
+          glueball = pkgs.callPackage ./glueball/package.nix { };
+        }
+      );
+
       formatter = forEachSystem ({ pkgs, ... }: pkgs.nixfmt-tree);
 
-      # Build all devShells, instead of just verifying they are derivations
-      checks = forEachSystem ({ system, ... }: self.devShells.${system});
+      # Build all devShells and packages, instead of just verifying they are
+      # derivations
+      checks = forEachSystem (
+        { system, ... }:
+        let
+          prefixAttrs = prefix: lib.mapAttrs' (n: lib.nameValuePair "${prefix}-${n}");
+        in
+        lib.foldr lib.attrsets.unionOfDisjoint { } [
+          (prefixAttrs "dev-shell" self.devShells.${system})
+          (prefixAttrs "package" self.packages.${system} )
+        ]
+      );
     };
 }

glueball/.envrc

@@ -0,0 +1,3 @@
+if command -v nix &>/dev/null; then
+    use flake .#glueball
+fi

glueball/package.nix

@@ -0,0 +1,19 @@
+{
+  lib,
+  rustPlatform,
+}:
+rustPlatform.buildRustPackage {
+  pname = "glueball";
+  inherit ((lib.importTOML ./Cargo.toml).package) version;
+
+  src = ./.;
+
+  cargoLock.lockFile = ./Cargo.lock;
+
+  meta = {
+    description = "Proxy server for facilitating multiplayer interactions in Autodesk Synthesis";
+    homepage = "https://synthesis.autodesk.com";
+    mainProgram = "glueball";
+    license = lib.licenses.asl20;
+  };
+}