Update controller asset #11

hj-cpdm-son · 2025-10-28T02:21:05Z

Update the controller asset to the latest version.

Before

After

salarkhan-google

Is the goal of updating this asset to try to match the real controller? Because it seems like there is still a notable difference. The new asset has a more grey tint and it very different from the sysui controller model.

Update resource to latest

hj-cpdm-son · 2025-11-11T05:19:25Z

Hello.
I’ve confirmed the latest controller assets with the UX team and I completed the update.
There are some differences compared to the system, but these have been verified to be due to shading and lighting. The underlying assets are the same across Unity and the system.
Thank you.

salarkhan-google

Everything is almost good. Just need to update the shader and baseColor texture, and ensure all textures have sRGB set to false. Then the controller looks more like the sysui controller.

salarkhan-google · 2025-11-12T18:19:31Z

Samples~/XRController/Texture/Metallic.png

You can get rid of this since now we have a single texture storing metallic and roughness

salarkhan-google · 2025-11-12T18:20:21Z

Samples~/XRController/Texture/BaseColor.png

BaseColor is incorrect. Use the texture from sysui.

It looks like the image you attached isn’t the latest. The menu icon is different.
The image below (which I added) is the latest version.

salarkhan-google · 2025-11-12T18:25:44Z

Samples~/XRController/Shader/Controller_Builtin.shader

+            float3 arm = tex2D (_AoRoughnessMetallic, IN.uv_BaseColor);
+            o.Metallic = arm.b;
+            o.Smoothness = 1 - arm.g;
+            o.Occlusion = 1;            


o.Occlusion = arm.r;

according to the material in sysui

salarkhan-google · 2025-11-12T18:49:11Z

From your scripts and shader file, please remove all trailing white space. Use space instead of tabs.

salarkhan-google

Need to ensure you format your code correctly according to C# standards.

SA1600: Public classes and methods must have a document header
US1400: Indentations must use 4 spaces
US1300: Lines must contain 100 characters or fewer. If contains more than 100 characters, split over multiple lines in clang format.
SA1215: All non-static readonly private fields must be placed before all non-static non-readonly private fields.

Please check the scripts in the other samples to understand the formatting.

salarkhan-google · 2025-11-12T18:49:53Z

Samples~/XRController/Script/XRControllerDisplay.cs

-    /// </summary>
-    public class XRControllerDisplay : MonoBehaviour
-    {
-#pragma warning disable CS0649 // Serialized fields don't need assignment


Either bring back the warning disabler or ensure to assign private fields with some default value.

Add the warning disabler

salarkhan-google · 2025-11-12T18:51:30Z

Samples~/XRController/Script/XRControllerDisplay.cs

+		[SerializeField] private Transform _targetObject;
+		[SerializeField] private Vector3 _releasedPosition;
+		[SerializeField] private Vector3 _pressedPosition;
+		[SerializeField] private Vector3 _releasedRotation;
+		[SerializeField] private Vector3 _pressedRotation;


Even here consider adding the #pragma warning disable CS0649 // Serialized fields don't need assignment.

Add the warning disabler

salarkhan-google · 2025-11-12T19:18:00Z

Samples~/XRController/Script/XRControllerDisplay.cs

+		private static void EnableActions(params InputAction[] actions)
+		{
+			foreach (var a in actions) a?.Enable();
+		}
+
+		private static void DisableActions(params InputAction[] actions)
+		{
+			foreach (var a in actions) a?.Disable();
+		}


Doesn't make sense to make these methods static since they are private anyways.

salarkhan-google · 2025-11-12T19:18:54Z

Samples~/XRController/Script/XRControllerDisplay.cs

+		private readonly List<(InputAction action,
+			Action<InputAction.CallbackContext> onStarted,
+			Action<InputAction.CallbackContext> onPerformed,
+			Action<InputAction.CallbackContext> onCanceled)> _bindings = new();


readonly members should go above all private members.

salarkhan-google · 2025-11-12T19:19:57Z

Samples~/XRController/Script/XRControllerDisplay.cs

+		private readonly List<(InputAction action,
+			Action<InputAction.CallbackContext> onStarted,
+			Action<InputAction.CallbackContext> onPerformed,
+			Action<InputAction.CallbackContext> onCanceled)> _bindings = new();


seperate () and new to make it "new ()"

salarkhan-google · 2025-11-12T19:20:25Z

Samples~/XRController/Script/XRControllerDisplay.cs

+	}
+
+	[Serializable]
+	public class XrControllerButtonInfo


Need public class description header

Add the description header.

salarkhan-google · 2025-11-12T19:20:52Z

Samples~/XRController/Script/XRControllerDisplay.cs

+		public Vector3 GetPositionLerp(float t)
+		{
+			return Vector3.Lerp(_releasedPosition, _pressedPosition, t);
+		}
+
+		public Vector3 GetRotationLerp(float t)
+		{
+			return Vector3.Lerp(_releasedRotation, _pressedRotation, t);
+		}
+
+		public Quaternion GetRotationQuaternionLerp(float t)
+		{
+			return Quaternion.Euler(Vector3.Lerp(_releasedRotation, _pressedRotation, t));
+		}
+
+		public void SetStatus(float t)
+		{
+			if (_targetObject == null) return;
+			t = Mathf.Clamp01(t);
+
+			_targetObject.localPosition = Vector3.Lerp(_releasedPosition, _pressedPosition, t);
+			_targetObject.localRotation = Quaternion.Lerp(
+				Quaternion.Euler(_releasedRotation),
+				Quaternion.Euler(_pressedRotation),
+				t);
+		}


Need public method description headers.

Add the description header.

salarkhan-google · 2025-11-12T19:22:15Z

Samples~/XRController/Script/XRControllerDisplay.cs

-    /// <summary>
-    /// Used to display the controller asset.
-    /// </summary>


Do not remove class description headers.

Add the description header.

hj-cpdm-son · 2025-11-13T09:20:51Z

Thanks for the comment. I’ve updated it.

salarkhan-google · 2025-11-13T18:34:27Z

Samples~/XRController/Script/XRControllerDisplay.cs

+            Action<InputAction.CallbackContext> onStarted,
+            Action<InputAction.CallbackContext> onPerformed,
+            Action<InputAction.CallbackContext> onCanceled)> _bindings = new ();
+


Please remove trailing white space

salarkhan-google · 2025-11-13T18:36:35Z

Samples~/XRController/Shader/Controller_Builtin.shader

+        ENDCG
+    }
+    FallBack "Diffuse"
+}


All source files must have a new line at end

salarkhan-google · 2025-11-13T18:36:58Z

Samples~/XRController/Shader/ControllerLed_Builtin.shader

+            ENDCG
+        }
+    }
+}


All source files must have new line at end

salarkhan-google · 2025-11-13T18:37:15Z

Samples~/XRController/Script/XRControllerDisplay.cs

        }
    }
-}
+}


All source files must have new line at end

salarkhan-google · 2025-11-13T19:02:17Z

Samples~/XRController/Script/XRControllerDisplay.cs

+            if (_thumbstickTransform != null)
+                _thumbstickTransform.localRotation = _thumbstickInitialRotation;


Please add curly brackets to all if statements. if statements without curly brackets are not allowed. Ensure each bracket is on new line. Ensure there is a one line space between ending curly bracket and statements below it.

salarkhan-google · 2025-11-13T19:03:00Z

Samples~/XRController/Script/XRControllerDisplay.cs

+                _triggerAxisAction,
+                _gripAxisAction,
+                _thumbstickAxisAction
+            );


Closing round bracket must be on same line as final statement.

salarkhan-google · 2025-11-14T01:15:13Z

@hj-cpdm-son please bring my recent changes on the main branch in your fork main branch. My new changes contains a github action which should then help you identify formatting errors or build related issues.

* Update controller asset * Update resources to latest * Update resources(scripts, png) * Update code format

Update controller asset

52e71e0

toji mentioned this pull request Oct 28, 2025

Add Samsung Galaxy XR controller assets immersive-web/webxr-input-profiles#279

Merged

salarkhan-google reviewed Nov 3, 2025

View reviewed changes

hj-cpdm-son added 2 commits November 11, 2025 13:56

Update resources to latest

e1c9c53

Merge pull request #4 from hj-cpdm-son/update_resource

bb176ce

Update resource to latest

salarkhan-google requested changes Nov 12, 2025

View reviewed changes

Update resources(scripts, png)

24f27f6

salarkhan-google reviewed Nov 14, 2025

View reviewed changes

hj-cpdm-son added 2 commits November 14, 2025 10:53

Merge branch 'android:main' into main

94b9f74

Update code format

bd1b799

salarkhan-google merged commit c6aa7e9 into android:main Nov 17, 2025
1 check passed

salarkhan-google pushed a commit that referenced this pull request Nov 17, 2025

Update controller asset (#11)

6761cd5

* Update controller asset * Update resources to latest * Update resources(scripts, png) * Update code format

+                          ENDCG
+                      }
+                  }
+              }

                
                    No newline at end of file

		if (_thumbstickTransform != null)
		_thumbstickTransform.localRotation = _thumbstickInitialRotation;

Update controller asset #11

Update controller asset #11

Uh oh!

Conversation

hj-cpdm-son commented Oct 28, 2025

Uh oh!

salarkhan-google left a comment

Choose a reason for hiding this comment

Uh oh!

hj-cpdm-son commented Nov 11, 2025

Uh oh!

salarkhan-google left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

salarkhan-google commented Nov 12, 2025

Uh oh!

salarkhan-google left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

hj-cpdm-son commented Nov 13, 2025

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

salarkhan-google commented Nov 14, 2025

Uh oh!

Uh oh!