Skip to content

Commit 208e448

Browse files
committed
Scene refinements.
1 parent 7041fc3 commit 208e448

File tree

3 files changed

+20
-5
lines changed

3 files changed

+20
-5
lines changed

LowLevel/Sandbox/Assets/Scenes/Benchmark/LargeWorld/LargeWorld.cs

Lines changed: 16 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,9 @@ public class LargeWorld : MonoBehaviour
2121
private Vector2 m_CameraPosition;
2222
private PhysicsWheelJoint m_RearWheelJoint;
2323
private PhysicsWheelJoint m_FrontWheelJoint;
24+
25+
private FloatField m_WorldPosition;
26+
private FloatField m_WorldSize;
2427

2528
private void OnEnable()
2629
{
@@ -29,8 +32,8 @@ private void OnEnable()
2932
m_UIDocument = GetComponent<UIDocument>();
3033

3134
m_CameraManipulator = FindFirstObjectByType<CameraManipulator>();
32-
m_CameraManipulator.CameraSize = 25f;
33-
m_CameraManipulator.CameraPosition = Vector2.zero;
35+
m_CameraManipulator.CameraSize = 20f;
36+
m_CameraManipulator.CameraPosition = new Vector2(0f, -5f);
3437

3538
// Set up the scene reset action.
3639
m_SandboxManager.SceneResetAction = SetupScene;
@@ -43,7 +46,7 @@ private void OnEnable()
4346
m_CycleCount = 600;
4447
m_GridSize = 1f;
4548
m_GridCount = (int)(m_CycleCount * m_WavePeriod / m_GridSize);
46-
m_CameraPanSpeed = 0f;
49+
m_CameraPanSpeed = 25f;
4750

4851
m_FollowCar = true;
4952

@@ -79,6 +82,13 @@ private void SetupOptions()
7982
cameraPanSpeed.value = m_CameraPanSpeed;
8083
cameraPanSpeed.RegisterValueChangedCallback(evt => { m_CameraPanSpeed = evt.newValue; });
8184

85+
// World Position.
86+
m_WorldPosition = root.Q<FloatField>("world-position");
87+
88+
// World Size.
89+
m_WorldSize = root.Q<FloatField>("world-size");
90+
m_WorldSize.value = m_GridSize * m_GridCount / 1000.0f;
91+
8292
// Reset Scene.
8393
var resetScene = root.Q<Button>("reset-scene");
8494
resetScene.clicked += SetupScene;
@@ -263,6 +273,9 @@ private void Update()
263273

264274
if (m_FollowCar)
265275
m_CameraManipulator.CameraPosition = new Vector2(m_FrontWheelJoint.bodyA.position.x, m_CameraManipulator.CameraPosition.y);
276+
277+
// Show world position.
278+
m_WorldPosition.value = m_CameraManipulator.CameraPosition.x / 1000.0f;
266279
}
267280

268281
private void SetCarSpeed(float speed)

LowLevel/Sandbox/Assets/Scenes/Benchmark/LargeWorld/LargeWorldMenu.uxml

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,8 @@
66
<ui:Tab label="Large World Options" tabindex="0" name="Tab">
77
<ui:Toggle label="Follow Car" name="follow-car" focusable="false" value="false"/>
88
<ui:Slider label="Camera Pan Speed" value="0" high-value="400" name="camera-pan-speed" fill="true" show-input-field="true" low-value="-400" focusable="false"/>
9+
<ui:FloatField label="World Position (Km)" value="0" name="world-position" enabled="true" focusable="false" readonly="true"/>
10+
<ui:FloatField label="World Size (Km)" value="0" name="world-size" enabled="true" focusable="false" readonly="true"/>
911
<ui:Button text="Reset Scene" name="reset-scene" focusable="false"/>
1012
</ui:Tab>
1113
</ui:TabView>

LowLevel/Sandbox/Assets/Scenes/Joints/UserJoint/UserJointMenu.uxml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -9,8 +9,8 @@
99
<ui:Slider label="Joint Max Force" value="0" high-value="1000" show-input-field="true" name="joint-max-force" fill="true" low-value="0" focusable="false"/>
1010
<ui:Slider label="Anchor Offset X" value="0" high-value="0.7" show-input-field="true" name="anchor-offset-x" fill="true" low-value="0" focusable="false"/>
1111
<ui:Slider label="Anchor Offset Y" value="0" high-value="1" show-input-field="true" name="anchor-offset-y" fill="true" low-value="-1" focusable="false"/>
12-
<ui:FloatField label="Impulse #0" value="0" name="impulse-0" enabled="true" focusable="false"/>
13-
<ui:FloatField label="Impulse #1" value="0" name="impulse-1" enabled="true" focusable="false"/>
12+
<ui:FloatField label="Impulse #0" value="0" name="impulse-0" enabled="true" focusable="false" readonly="true"/>
13+
<ui:FloatField label="Impulse #1" value="0" name="impulse-1" enabled="true" focusable="false" readonly="true"/>
1414
<ui:Button text="Reset Scene" name="reset-scene" focusable="false"/>
1515
</ui:Tab>
1616
</ui:TabView>

0 commit comments

Comments
 (0)