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

Maroon-399 Tools UI #409

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

Maroon-399 Tools UI #409

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
40 commits
Select commit Hold shift + click to select a range
bf10f35
Add tools suite and leightweight version of Coulombs law experiment
dpdsw Aug 19, 2022
3971287
Initial Commit
dpdsw Aug 2, 2022
3224428
Added lightweight coulombslaw scene
dpdsw Aug 12, 2022
e6d5cbf
Add leightweight version of coulombs law experiment
dpdsw Aug 19, 2022
6e253a1
Update UIParticleDragHandler.cs
dpdsw Aug 19, 2022
b3168ed
Remove uneccessary file
dpdsw Aug 19, 2022
d0c46a6
Change Canvas Render Mode to Overlay
michaelholly Aug 29, 2022
d877e0e
Added Simulation, Materials
dpdsw Sep 12, 2022
ace744a
Moved Files to according folders
dpdsw Sep 24, 2022
183596a
Moved to ExperimentSetting
dpdsw Sep 24, 2022
5b5e9e9
Adapted Dragging
dpdsw Sep 24, 2022
dd4c9c9
applieder scaling to UI
dpdsw Sep 24, 2022
5c5df5b
Added z input variable
dpdsw Sep 24, 2022
8d22b81
adapted namespace
dpdsw Sep 24, 2022
c079147
fine tuning particle properties
dpdsw Sep 24, 2022
150122f
fix CoordSystem calculations
michaelholly Oct 3, 2022
a98bd1d
Fixed scale of visualization
dpdsw Oct 28, 2022
9f819b0
Fixed dependency errors and warnings post merge
Averimon Oct 2, 2024
661aa15
Changed coordinate system to micrometer
Averimon Oct 8, 2024
4b83a11
Fixed shader + materials for ColoumbsLawRemake
Averimon Oct 25, 2024
f4a1c32
Disabled z-axis movement for Voltmeter+Ruler pins
Averimon Oct 28, 2024
de1a627
Adjusted ruler and voltmeter to new unit (nanometer)
Averimon Oct 29, 2024
f6157e9
Implemented ToolController
Averimon Oct 29, 2024
7db4697
Swapped out old CoulombsLaw with Remake
Averimon Oct 29, 2024
574490d
Changed pin colors of ruler
Averimon Oct 29, 2024
b4788ab
Fix Check fails (multiple UICameras+removed unknown script)
Averimon Nov 12, 2024
7d36e20
Removed deprecated ColumbsLaw
Averimon Nov 12, 2024
004e16c
Fixed missing references
Averimon Nov 12, 2024
cfd5289
Renamed CoulombsLaw scene
Averimon Nov 12, 2024
fc3c55f
Bugfix: Add charge button works again
Averimon Nov 18, 2024
ad2bc77
Added Language file to CoulombsLaw
Averimon Nov 18, 2024
6953b50
Added VectorFieldVisualization and Toggle Vector Field
Averimon Nov 18, 2024
c8d282e
Removed author comment and made Start methods private
Averimon Nov 18, 2024
73d5799
Added Maroon.Experiments.CoulombsLaw namespace
Averimon Nov 18, 2024
f9697a6
Simplified code
Averimon Nov 18, 2024
b25269a
Fixed missing prefabs
Averimon Nov 18, 2024
0910bce
Made abstract IField functions non-abstract
Averimon Nov 18, 2024
d243b0c
Capitalized function names
Averimon Nov 18, 2024
2e0238b
Fixed incorrect indentation
Averimon Nov 18, 2024
c126883
CoulombsLaw Physics improvements
Averimon Dec 6, 2024
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
435 changes: 237 additions & 198 deletions unity/Assets/Maroon/reusableGui/Experiment/Resources/Tools/Ruler.prefab
View file
Open in desktop

Large diffs are not rendered by default.

361 changes: 182 additions & 179 deletions unity/Assets/Maroon/reusableGui/Experiment/Resources/Tools/Voltmeter.prefab
View file
Open in desktop

Large diffs are not rendered by default.

13 changes: 5 additions & 8 deletions unity/Assets/Maroon/reusableGui/Experiment/Scripts/Runtime/ToggleUIElement.cs
View file
Open in desktop
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Is this file used anywhere now? if not can it be removed

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

sorry, but I can't seem to find out if this file is used anywhere?

Original file line number Diff line number Diff line change
@@ -1,6 +1,3 @@
//
//Author: Tobias Stöckl
Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please do not remove this file. This is used in the Optics experiment scene.

Copy link
Collaborator

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

renamed to ToggleToolUI.cs?

Copy link
Collaborator Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should be back again and work properly in the optics experiment

//
using UnityEngine;

public class ToggleUIElement : MonoBehaviour
Expand All @@ -10,9 +7,9 @@ public class ToggleUIElement : MonoBehaviour
private bool _isActive = true;


public void ToggleElement()
{
_isActive = !_isActive;
UiElement.SetActive(_isActive);
public void ToggleElement()
{
_isActive = !_isActive;
UiElement.SetActive(_isActive);
}
}
}
2 changes: 1 addition & 1 deletion unity/Assets/Maroon/reusableGui/Experiment/Scripts/Runtime/ToggleUIElement.cs.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions unity/Assets/Maroon/reusableGui/Experiment/ToolsUI.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

8 changes: 8 additions & 0 deletions unity/Assets/Maroon/reusableGui/Experiment/ToolsUI/Icons.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added unity/Assets/Maroon/reusableGui/Experiment/ToolsUI/Icons/calculator.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
140 changes: 140 additions & 0 deletions unity/Assets/Maroon/reusableGui/Experiment/ToolsUI/Icons/calculator.png.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added unity/Assets/Maroon/reusableGui/Experiment/ToolsUI/Icons/stopwatch.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
140 changes: 140 additions & 0 deletions unity/Assets/Maroon/reusableGui/Experiment/ToolsUI/Icons/stopwatch.png.meta
View file
Open in desktop

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Binary file added unity/Assets/Maroon/reusableGui/Experiment/ToolsUI/Icons/tools.png
View file
Open in desktop
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Loading
Loading