Merge pull request #20 from croquet/merge-develop

Merge develop

unity/Assets/CroquetJS/tutorial8/Models.js

@@ -1,6 +1,6 @@
 // Tutorial 8 Models
 
-import { Actor, mix, AM_Spatial, AM_Behavioral, Behavior, sphericalRandom, v3_add, UserManager, User, AM_Avatar } from "@croquet/worldcore-kernel";
+import { Actor, mix, AM_Spatial, AM_Drivable, AM_Behavioral, Behavior, sphericalRandom, v3_add, UserManager, User } from "@croquet/worldcore-kernel";
 import { GameModelRoot } from "@croquet/game-models";
 
 //------------------------------------------------------------------------------------------
@@ -92,9 +92,9 @@ ColorActor.register('ColorActor');
 //-- AvatarActor ----------------------------------------------------------------------------
 //------------------------------------------------------------------------------------------
 
-// AvatarActor includes the AM_Avatar mixin.  Avatars have a driver property that holds the viewId of the user controlling them.
+// AvatarActor includes the AM_Drivable mixin.  Drivables have a driver property that holds the viewId of the user controlling them.
 
-class AvatarActor extends mix(Actor).with(AM_Spatial, AM_Avatar) {
+class AvatarActor extends mix(Actor).with(AM_Spatial, AM_Drivable) {
     get gamePawnType() { return "tutorial8Avatar" }
 
     get color() { return this._color || [0.5, 0.5, 0.5] }

unity/Assets/CroquetJS/tutorial9/Models.js

@@ -1,6 +1,6 @@
 // Tutorial 9 Models
 
-import { Actor, mix, AM_Spatial, AM_Behavioral, Behavior, sphericalRandom, v3_add, v3_sub, v3_normalize, UserManager, User, AM_Avatar, q_axisAngle, toRad } from "@croquet/worldcore-kernel";
+import { Actor, mix, AM_Spatial, AM_Drivable, AM_Behavioral, Behavior, sphericalRandom, v3_add, v3_sub, v3_normalize, UserManager, User, q_axisAngle, toRad } from "@croquet/worldcore-kernel";
 import { GameModelRoot } from "@croquet/game-models";
 
 //------------------------------------------------------------------------------------------
@@ -91,7 +91,7 @@ ColorActor.register('ColorActor');
 
 // AvatarActor includes the AM_Avatar mixin.  Avatars have a driver property that holds the viewId of the user controlling them.
 
-class AvatarActor extends mix(Actor).with(AM_Spatial, AM_Avatar) {
+class AvatarActor extends mix(Actor).with(AM_Spatial, AM_Drivable) {
     get gamePawnType() { return "tutorial9Avatar" }
 
     get color() { return this._color || [-1, 0, 0] }
@@ -115,7 +115,11 @@ class AvatarActor extends mix(Actor).with(AM_Spatial, AM_Avatar) {
     beShoved(v) {
         const translation = v3_add(this.translation, v);
         if (this.driver) {
-            this.snap({ translation });
+            // the C4U bridge normally filters out all updates to a locally
+            // driven gameObject from its own actor.  override that filtering
+            // explicitly, so that even the view that normally drives this
+            // avatar is updated.
+            this.snapOverridingDriver({ translation });
         } else {
             this.set({ translation });
         }

unity/Assets/Scripts/AssignFollowCamTarget.cs

@@ -6,17 +6,17 @@
 public class AssignFollowCamTarget : MonoBehaviour
 {
     public FollowCam followCamToUpdate;
-    
+
     void Start()
     {
-        
+
     }
 
     // Update is called once per frame
     void Update()
     {
-        CroquetAvatarComponent a = CroquetAvatarSystem.Instance.GetActiveAvatarComponent();
-        
+        CroquetDrivableComponent a = CroquetDrivableSystem.Instance.GetActiveDrivableComponent();
+
         if ( a != null)
         {
             followCamToUpdate.target = a.transform;

unity/Assets/Scripts/MouseLookAvatar.cs

@@ -21,20 +21,20 @@ public class MouseLookAvatar : MonoBehaviour
     private float pitch = 0;
 
     private int croquetHandle;
-    private CroquetAvatarComponent croquetAvatarComponent;
+    private CroquetDrivableComponent croquetAvatarComponent;
 
     private bool isActiveAvatarLastFrame = false;
 
     void Start()
     {
         croquetHandle = GetComponent<CroquetEntityComponent>().croquetHandle;
-        croquetAvatarComponent = gameObject.GetComponent<CroquetAvatarComponent>();
+        croquetAvatarComponent = gameObject.GetComponent<CroquetDrivableComponent>();
         avatarCamera = Camera.main;
     }
 
     void Update()
     {
-        CroquetAvatarComponent activeAvatar = CroquetAvatarSystem.Instance.GetActiveAvatarComponent();
+        CroquetDrivableComponent activeAvatar = CroquetDrivableSystem.Instance.GetActiveDrivableComponent();
         if (croquetAvatarComponent != activeAvatar)
         {
             isActiveAvatarLastFrame = false;
@@ -175,7 +175,7 @@ void Drive()
         trans.localPosition = newPos;
         trans.localRotation = yawQ;
 
-        CroquetSpatialSystem.Instance.SnapObjectTo(croquetHandle, newPos, yawQ);
-        CroquetSpatialSystem.Instance.SnapObjectInCroquet(croquetHandle, newPos, yawQ);
+        CroquetSpatialSystem.Instance.DrivePawn(croquetHandle, newPos, yawQ);
+        CroquetSpatialSystem.Instance.DriveActor(croquetHandle, false, newPos, yawQ);
     }
 }

unity/Assets/Scripts/OverheadAvatar.cs

@@ -9,18 +9,18 @@ public class OverheadAvatar : MonoBehaviour
     private int right = 0;
 
     private int croquetHandle;
-    private CroquetAvatarComponent croquetAvatarComponent;
+    private CroquetDrivableComponent croquetAvatarComponent;
 
     void Start()
     {
         croquetHandle = gameObject.GetComponent<CroquetEntityComponent>().croquetHandle;
-        croquetAvatarComponent = gameObject.GetComponent<CroquetAvatarComponent>();
+        croquetAvatarComponent = gameObject.GetComponent<CroquetDrivableComponent>();
         // Debug.Log($"OverheadAvatar on {croquetHandle}");
     }
 
     void Update()
     {
-        CroquetAvatarComponent activeAvatar = CroquetAvatarSystem.Instance.GetActiveAvatarComponent();
+        CroquetDrivableComponent activeAvatar = CroquetDrivableSystem.Instance.GetActiveDrivableComponent();
         if (croquetAvatarComponent != activeAvatar)
         {
             return;
@@ -110,7 +110,7 @@ void Drive()
         Vector3 tt = newRot * t;
         Vector3 newPos = transform.localPosition + tt;
 
-        CroquetSpatialSystem.Instance.SnapObjectTo(croquetHandle, newPos, newRot);
-        CroquetSpatialSystem.Instance.SnapObjectInCroquet(croquetHandle, newPos, newRot);
+        CroquetSpatialSystem.Instance.DrivePawn(croquetHandle, newPos, newRot);
+        CroquetSpatialSystem.Instance.DriveActor(croquetHandle, false, newPos, newRot); // false => no "snap"
     }
 }

unity/Packages/manifest.json

@@ -3,15 +3,15 @@
     "com.unity.addressables": "1.19.19",
     "com.unity.collab-proxy": "2.0.0",
     "com.unity.ide.rider": "3.0.18",
-    "com.unity.ide.visualstudio": "2.0.17",
+    "com.unity.ide.visualstudio": "2.0.22",
     "com.unity.ide.vscode": "1.2.5",
     "com.unity.inputsystem": "1.5.0",
     "com.unity.test-framework": "1.1.31",
     "com.unity.textmeshpro": "3.0.6",
     "com.unity.timeline": "1.6.4",
     "com.unity.ugui": "1.0.0",
     "com.unity.visualscripting": "1.8.0",
-    "io.croquet.multiplayer": "https://github.com/croquet/croquet-for-unity-package.git#v0.9.0",
+    "io.croquet.multiplayer": "https://github.com/croquet/croquet-for-unity-package.git#v0.9.3",
     "net.gree.unity-webview": "https://github.com/gree/unity-webview.git?path=/dist/package-nofragment",
     "com.unity.modules.ai": "1.0.0",
     "com.unity.modules.androidjni": "1.0.0",

unity/Packages/packages-lock.json

@@ -38,7 +38,7 @@
       "url": "https://packages.unity.com"
     },
     "com.unity.ide.visualstudio": {
-      "version": "2.0.17",
+      "version": "2.0.22",
       "depth": 0,
       "source": "registry",
       "dependencies": {
@@ -121,14 +121,14 @@
       "url": "https://packages.unity.com"
     },
     "io.croquet.multiplayer": {
-      "version": "https://github.com/croquet/croquet-for-unity-package.git#v0.9.0",
+      "version": "https://github.com/croquet/croquet-for-unity-package.git#v0.9.3",
       "depth": 0,
       "source": "git",
       "dependencies": {
         "com.unity.addressables": "1.19.19",
         "com.unity.inputsystem": "1.5.0"
       },
-      "hash": "9bddf70f2e43a0ef777ac04e8fcf6a15bfcc322e"
+      "hash": "bbee80e755e85fbc0ec84fe4d02682df676d650f"
     },
     "net.gree.unity-webview": {
       "version": "https://github.com/gree/unity-webview.git?path=/dist/package-nofragment",