Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Feature/maroon 399 tools UI #409

Open
wants to merge 21 commits into
base: develop
Choose a base branch
from
Open

Feature/maroon 399 tools UI #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
21 commits
Select commit Hold shift + click to select a range
07e1f90
Initial Commit
dpdsw Aug 2, 2022
b62d3ff
Fix coord systems world position, improve example scene
dpdsw Aug 2, 2022
e0a054a
Added lightweight coulombslaw scene
dpdsw Aug 12, 2022
989389c
Add leightweight version of coulombs law experiment
dpdsw Aug 19, 2022
0cd0ed5
Add tools suite and leightweight version of Coulombs law experiment
dpdsw Aug 19, 2022
72d94c7
Merge branch 'feature/Maroon-399_ToolsUI' of https://github.com/GameL…
dpdsw Aug 19, 2022
7d0d8ac
Update UIParticleDragHandler.cs
dpdsw Aug 19, 2022
b08b68f
Remove uneccessary file
dpdsw Aug 19, 2022
7c8a535
Merge remote-tracking branch 'remotes/origin/develop' into feature/Ma…
michaelholly Aug 29, 2022
2251064
Change Canvas Render Mode to Overlay
michaelholly Aug 29, 2022
cc95672
Added Simulation, Materials
dpdsw Sep 12, 2022
78b8726
Merge remote-tracking branch 'remotes/origin/develop' into feature/Ma…
michaelholly Sep 21, 2022
6748dc2
Moved Files to according folders
dpdsw Sep 24, 2022
c85096a
Moved to ExperimentSetting
dpdsw Sep 24, 2022
62816f6
Adapted Dragging
dpdsw Sep 24, 2022
144c5b6
applieder scaling to UI
dpdsw Sep 24, 2022
d65c61d
Added z input variable
dpdsw Sep 24, 2022
42d65b3
adapted namespace
dpdsw Sep 24, 2022
2ca1abc
fine tuning particle properties
dpdsw Sep 24, 2022
b200ac7
fix CoordSystem calculations
michaelholly Oct 3, 2022
5deb15a
Fixed scale of visualization
dpdsw Oct 28, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
60 changes: 36 additions & 24 deletions unity/Assets/Maroon/reusableGui/Experiment/Resources/Tools/Ruler.prefab
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -625,7 +625,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2499cb07610e0cd4a98a23b652b27f4e, type: 3}
m_Name:
m_EditorClassIdentifier:
minimum: 0
minimum: -1000
maximum: 1000
textFormat: F3
onValueChangedFloat:
Expand Down Expand Up @@ -984,7 +984,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2499cb07610e0cd4a98a23b652b27f4e, type: 3}
m_Name:
m_EditorClassIdentifier:
minimum: 0
minimum: -1000
maximum: 1000
textFormat: F3
onValueChangedFloat:
Expand Down Expand Up @@ -3105,7 +3105,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2499cb07610e0cd4a98a23b652b27f4e, type: 3}
m_Name:
m_EditorClassIdentifier:
minimum: 0
minimum: -1000
maximum: 1000
textFormat: F3
onValueChangedFloat:
Expand Down Expand Up @@ -3653,7 +3653,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2499cb07610e0cd4a98a23b652b27f4e, type: 3}
m_Name:
m_EditorClassIdentifier:
minimum: 0
minimum: -1000
maximum: 1000
textFormat: F3
onValueChangedFloat:
Expand Down Expand Up @@ -4737,7 +4737,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2499cb07610e0cd4a98a23b652b27f4e, type: 3}
m_Name:
m_EditorClassIdentifier:
minimum: 0
minimum: -1000
maximum: 1000
textFormat: F3
onValueChangedFloat:
Expand Down Expand Up @@ -5247,7 +5247,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2499cb07610e0cd4a98a23b652b27f4e, type: 3}
m_Name:
m_EditorClassIdentifier:
minimum: 0
minimum: -1000
maximum: 1000
textFormat: F3
onValueChangedFloat:
Expand Down Expand Up @@ -6066,7 +6066,7 @@ RectTransform:
m_GameObject: {fileID: 5165379301302195030}
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 5165379301469294548}
- {fileID: 1108972717605733715}
Expand Down Expand Up @@ -6507,7 +6507,7 @@ GameObject:
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
m_IsActive: 0
--- !u!4 &5165379301469294548
Transform:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -6578,7 +6578,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
ruler: {fileID: 0}
distanceText: {fileID: 0}
distanceText: {fileID: 1038391439375974165}
selectedUnit: 0
--- !u!114 &5165379301034805233
MonoBehaviour:
Expand Down Expand Up @@ -6619,22 +6619,22 @@ PrefabInstance:
- target: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5,
type: 3}
propertyPath: m_AnchorMax.x
value: 1
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5,
type: 3}
propertyPath: m_AnchorMax.y
value: 1
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5,
type: 3}
propertyPath: m_AnchorMin.x
value: 1
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5,
type: 3}
propertyPath: m_AnchorMin.y
value: 1
value: 0.5
objectReference: {fileID: 0}
- target: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5,
type: 3}
Expand Down Expand Up @@ -6699,12 +6699,12 @@ PrefabInstance:
- target: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5,
type: 3}
propertyPath: m_AnchoredPosition.x
value: -300
value: 0
objectReference: {fileID: 0}
- target: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5,
type: 3}
propertyPath: m_AnchoredPosition.y
value: -200
value: 0
objectReference: {fileID: 0}
- target: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5,
type: 3}
Expand Down Expand Up @@ -6899,18 +6899,18 @@ RectTransform:
type: 3}
m_PrefabInstance: {fileID: 884308809616865012}
m_PrefabAsset: {fileID: 0}
--- !u!1 &6358324291355598696 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6086892437245716892, guid: 5c79149608e055446ae721a812143cd5,
type: 3}
m_PrefabInstance: {fileID: 884308809616865012}
m_PrefabAsset: {fileID: 0}
--- !u!224 &1108972717605733715 stripped
RectTransform:
m_CorrespondingSourceObject: {fileID: 226990752306787239, guid: 5c79149608e055446ae721a812143cd5,
type: 3}
m_PrefabInstance: {fileID: 884308809616865012}
m_PrefabAsset: {fileID: 0}
--- !u!1 &6358324291355598696 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 6086892437245716892, guid: 5c79149608e055446ae721a812143cd5,
type: 3}
m_PrefabInstance: {fileID: 884308809616865012}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &5165379301034805239
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -7167,15 +7167,27 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 4c5e9291eb4da1e45b2cbb6a796f659c, type: 3}
--- !u!1 &59755804292893887 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5150805762426047304, guid: 4c5e9291eb4da1e45b2cbb6a796f659c,
type: 3}
m_PrefabInstance: {fileID: 5165379301034805239}
m_PrefabAsset: {fileID: 0}
--- !u!1 &6840167794421137399 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1820075770532083712, guid: 4c5e9291eb4da1e45b2cbb6a796f659c,
type: 3}
m_PrefabInstance: {fileID: 5165379301034805239}
m_PrefabAsset: {fileID: 0}
--- !u!1 &59755804292893887 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5150805762426047304, guid: 4c5e9291eb4da1e45b2cbb6a796f659c,
--- !u!114 &1038391439375974165 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 5315943661431322850, guid: 4c5e9291eb4da1e45b2cbb6a796f659c,
type: 3}
m_PrefabInstance: {fileID: 5165379301034805239}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3}
m_Name:
m_EditorClassIdentifier:
Loading