-
Notifications
You must be signed in to change notification settings - Fork 16
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.
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
Feature/maroon 399 tools UI #409
base: develop
Are you sure you want to change the base?
Conversation
…abGraz/Maroon into feature/Maroon-399_ToolsUI
Fix issue
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please see the request changes,
- Use the Experiment Template scene for the CoulombsLawRemake
- Use the UI Prefab for the CoulombsLawRemake otherwise the UI layout is not correct
- The CoulombsLawRemake simulation is not working when playing the simulation
- Toolkit UI overlaps with Dialog View
- Tools like Ruler are not working in the other scenes
- Please move all experiment relevant scripts into the corresponding experiment folder
@@ -0,0 +1,583 @@ | |||
%YAML 1.1 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please move this prefab to the experiment folder.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
@@ -1,18 +0,0 @@ | |||
// |
There was a problem hiding this comment.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
renamed to ToggleToolUI.cs?
There was a problem hiding this comment.
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
@@ -0,0 +1,7 @@ | |||
fileFormatVersion: 2 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please move the ColoumbsLawRemake scene to the ColoumbsLaw experiment folder.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
@@ -0,0 +1,7 @@ | |||
fileFormatVersion: 2 | |||
guid: 2e69c3f8c37d40e49ac178de75fa1cf0 |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please copy the experiment room template scene and add your changes to this scene. Otherwise, the experiment room setting is missing.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
using System.Collections.Generic; | ||
using UnityEngine; | ||
|
||
namespace Assets.Maroon.reusableGui.Experiment.ToolsUI.Scripts |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
please change the namespace to Maroon.UI
using UnityEngine; | ||
using UnityEngine.UI; | ||
|
||
namespace Assets.Maroon.reusableGui.Experiment.ToolsUI.Scripts |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please change the namespace to Maroon.UI
|
||
namespace Assets.Maroon.reusableGui.Experiment.ToolsUI.Scripts | ||
{ | ||
public class PC_ObjectSelectionHandler : MonoBehaviour |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
is it just for particle selection? if yes maybe use another name
public class PC_ObjectSelectionHandler : MonoBehaviour | ||
{ | ||
[SerializeField] private GameObject inputXVariable; | ||
[SerializeField] private GameObject inputYVariable; |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
what about an inputZVariable?
using Maroon.Physics.Electromagnetism; | ||
using UnityEngine; | ||
|
||
public class ParticleManager : MonoBehaviour |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please move this to the experiment scene folder
using UnityEngine.EventSystems; | ||
using UnityEngine.UI; | ||
|
||
namespace Assets.Maroon.reusableGui.Experiment.ToolsUI.Scripts |
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Please change the namespace.
This script should also be moved to the experiment folder
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Done
# Conflicts: # unity/Assets/Maroon/reusableGui/Experiment/UI.prefab # unity/Assets/Maroon/scenes/experiments/OpticsSimulations/Optics.pc.unity
Hi, please have a look at the position of the files.
closes #399