Skip to content

Feature/maroon 599 coulombs law rework #602

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

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

Feature/maroon 599 coulombs law rework #602

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
108 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
f13f499
Improved Mouse-Drag on Charges, removed Wobble and Objects not stay e…
BillyTortellini May 7, 2025
13e64ac
Fixed Particle Removal, Removed ParticleManager, Refactored DragHandl…
BillyTortellini May 7, 2025
57d1583
Removed old CoulombsLaw Logic and unused Scripts, fixed bugs
BillyTortellini May 8, 2025
21aecb7
Corrected Force Calculation, Particle Movement now working
BillyTortellini May 9, 2025
704971e
Fixed Raycasts/Stuck particles, added experimental Vector-Field Scene…
BillyTortellini May 13, 2025
9f1c6e3
Added movement Gizmo back for particles
BillyTortellini May 14, 2025
84add41
Added selection marker, fixed Drag-And-Drop Bug
BillyTortellini May 14, 2025
4e61374
Removed temporary PointCharges scene
BillyTortellini May 15, 2025
609feb7
Fixed Voltage Visualization
BillyTortellini May 20, 2025
2c7893f
Refactored Equipotential Shader
BillyTortellini May 21, 2025
3b6e97e
Fixed Voltmeter values not updating properly
BillyTortellini May 22, 2025
c1a7916
Changed Camera To Orthographic, UI-Refactor, added more physics options
BillyTortellini May 27, 2025
93172fe
Ruler/Voltmeter refactor and bug fixes
BillyTortellini Jun 3, 2025
2ba47ae
Fixed UI and Tools-Prefabs for CoulombsLaw
BillyTortellini Jun 4, 2025
0794ccf
Re-added missing script to huygensPrinciple
BillyTortellini Jun 4, 2025
4b257c9
Removed missing script references from unused prefabs
BillyTortellini Jun 4, 2025
b7673bf
Merged development branch, mostly user changes from this branch for c…
BillyTortellini Jun 4, 2025
384e072
fixed webbuild after moving script to different folder?
BillyTortellini Jun 4, 2025
67d1bc8
Added new scene for new implementation
BillyTortellini Jun 11, 2025
2f6f39e
Movement Gizmo working with SelectionSystem
BillyTortellini Jun 13, 2025
4465eb6
Visualization Plane Rework, VectorFieldController and first ChargedRo…
BillyTortellini Jun 16, 2025
b6f4004
Delete unused ToggleUIElement.cs
michaelholly Jun 18, 2025
76d1324
Implemented charged Rods and charged Planes
BillyTortellini Jun 18, 2025
ca94a8d
Implemented Movement-Simulation with proper reset
BillyTortellini Jun 20, 2025
3489fb5
Refactored SelectionSystem UI handling
BillyTortellini Jun 20, 2025
e2c2a8e
Started refactoring GUI for better layout
BillyTortellini Jun 20, 2025
3fa3280
Refactored UI
BillyTortellini Jun 23, 2025
2d7a1be
Multimeter implementation and more UI polish
BillyTortellini Jun 23, 2025
780c942
Fixed UI bugs and more UI polish
BillyTortellini Jun 24, 2025
8c16bed
First implementation of draggable visualization plane
BillyTortellini Jun 24, 2025
b55632c
Polished Visualization Plane
BillyTortellini Jun 25, 2025
91641bd
VectorField with DrawCalls instead of multiple gameObjects
BillyTortellini Jun 30, 2025
d966e02
Started replacing vector-field logic with shader
BillyTortellini Jun 30, 2025
0b97f2d
Vector field working with direction and scale
BillyTortellini Jul 1, 2025
149a817
Finished Vector-Field Shader
BillyTortellini Jul 2, 2025
0ecd436
Moved vector-field calculation to GPU
BillyTortellini Jul 2, 2025
676c7c7
Shader code refactoring and Visualization plane updates
BillyTortellini Jul 2, 2025
1a85d1a
Visualization Plane update and 2D version for VectorField
BillyTortellini Jul 3, 2025
52566f0
Polished Draggable and Movemement Gizmos
BillyTortellini Jul 4, 2025
b175263
GUI Rework + added translations
BillyTortellini Jul 4, 2025
fcfa7b2
Removed old UI-Code, bugfixes for new UI
BillyTortellini Jul 4, 2025
3005ee0
New UI-Icons and Ground-Pin
BillyTortellini Jul 8, 2025
ac78127
Added IsoSurface Visualization
BillyTortellini Jul 8, 2025
91e3968
Fixed chared rod visualization/radius
BillyTortellini Jul 9, 2025
49493cc
Added field lines
BillyTortellini Jul 9, 2025
1671fe4
Fixed WebGL build
BillyTortellini Jul 10, 2025
a1a5ac9
Added simulation options and polish
BillyTortellini Jul 11, 2025
5f21a1e
Added Scenarios, minor bug-fixes
BillyTortellini Jul 22, 2025
83b8e8e
Physics-Mouse-Drag and Trail-Renderer
BillyTortellini Jul 23, 2025
b337349
Fixed TrailRendering Issue
BillyTortellini Jul 23, 2025
92cf964
UI improvements
michaelholly Jun 25, 2025
eacdae5
Fix Tests
michaelholly Jul 31, 2025
73c39c0
Delete unused scripts
michaelholly Jul 31, 2025
ffbf141
Delete unused tool suite prefab
michaelholly Jul 31, 2025
67a57f1
Add missing ToolContentHandler files
michaelholly Oct 16, 2025
fece599
Remove unused KeyboardControl from FallingCoil and FaradaysLaw
michaelholly Oct 16, 2025
af7cbbb
Fix Vande Graaff Generator Stripes
michaelholly Oct 16, 2025
832ad68
Fixed rayBox intersection with orthographic camera
BillyTortellini Jul 24, 2025
8e22dba
Merged Maroon-399_ToolsUI
BillyTortellini Nov 12, 2025
c92a67e
Fixed atomParticle model size (asset import settings) in other experi…
BillyTortellini Nov 12, 2025
d91f6b8
Fixed testcases by adding assembly definition to project
BillyTortellini Dec 1, 2025
b6a4b4a
Added Force-Vector visualization
BillyTortellini Dec 3, 2025
5bf9276
Removed offset causing force-vectors to not be perfectly centered
BillyTortellini Dec 4, 2025
50c8ffb
Improved ChargedPoint trail-renderer start/pause/reset behavior
BillyTortellini Dec 11, 2025
d1c0548
Fixed bug with particles that don't contribute to electric-field
BillyTortellini Dec 16, 2025
05427c3
Merged with develop
BillyTortellini Dec 17, 2025
304fd6c
Replaced old coulombs law experiment with the new version.
michaelholly Dec 19, 2025
2a0d235
Fix missing References in prefabs and scenes
michaelholly Jan 19, 2026
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
76 changes: 38 additions & 38 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 @@ -114,7 +114,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
Expand Down Expand Up @@ -589,7 +589,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 1
checkPaddingRequired: 0
m_isRichText: 1
Expand Down Expand Up @@ -1418,7 +1418,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 35.15
m_fontSize: 27.1
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand All @@ -1440,7 +1440,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
Expand Down Expand Up @@ -1575,7 +1575,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 35.15
m_fontSize: 27.1
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand All @@ -1597,7 +1597,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
Expand Down Expand Up @@ -1753,7 +1753,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 1
checkPaddingRequired: 0
m_isRichText: 1
Expand Down Expand Up @@ -1868,7 +1868,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 35.15
m_fontSize: 27.1
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand All @@ -1890,7 +1890,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
Expand Down Expand Up @@ -2173,7 +2173,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 35.15
m_fontSize: 27.1
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand All @@ -2195,7 +2195,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
Expand Down Expand Up @@ -2330,7 +2330,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 35.15
m_fontSize: 27.1
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand All @@ -2352,7 +2352,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
Expand Down Expand Up @@ -2539,7 +2539,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 35.15
m_fontSize: 27.1
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand All @@ -2561,7 +2561,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
Expand Down Expand Up @@ -2717,7 +2717,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 1
checkPaddingRequired: 0
m_isRichText: 1
Expand Down Expand Up @@ -2884,7 +2884,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 35.15
m_fontSize: 27.1
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand All @@ -2906,7 +2906,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
Expand Down Expand Up @@ -3041,7 +3041,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 35.15
m_fontSize: 27.1
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand All @@ -3063,7 +3063,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
Expand Down Expand Up @@ -3997,7 +3997,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 1
checkPaddingRequired: 0
m_isRichText: 1
Expand Down Expand Up @@ -4133,7 +4133,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 1
checkPaddingRequired: 0
m_isRichText: 1
Expand Down Expand Up @@ -4343,7 +4343,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 1
checkPaddingRequired: 0
m_isRichText: 1
Expand Down Expand Up @@ -4479,7 +4479,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 1
checkPaddingRequired: 0
m_isRichText: 1
Expand Down Expand Up @@ -4668,7 +4668,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 35.15
m_fontSize: 27.1
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand All @@ -4690,7 +4690,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
Expand Down Expand Up @@ -5083,7 +5083,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 35.15
m_fontSize: 27.1
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand All @@ -5105,7 +5105,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
Expand Down Expand Up @@ -5623,7 +5623,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 1
checkPaddingRequired: 0
m_isRichText: 1
Expand Down Expand Up @@ -5759,7 +5759,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 1
checkPaddingRequired: 0
m_isRichText: 1
Expand Down Expand Up @@ -5874,7 +5874,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 35.15
m_fontSize: 27.1
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand All @@ -5896,7 +5896,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
Expand Down Expand Up @@ -6083,7 +6083,7 @@ MonoBehaviour:
m_faceColor:
serializedVersion: 2
rgba: 4294967295
m_fontSize: 35.15
m_fontSize: 27.1
m_fontSizeBase: 36
m_fontWeight: 400
m_enableAutoSizing: 1
Expand All @@ -6105,7 +6105,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
Expand Down Expand Up @@ -6261,7 +6261,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 1
checkPaddingRequired: 0
m_isRichText: 1
Expand Down Expand Up @@ -6499,7 +6499,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 1
checkPaddingRequired: 0
m_isRichText: 1
Expand Down Expand Up @@ -6635,7 +6635,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 1
checkPaddingRequired: 0
m_isRichText: 1
Expand Down Expand Up @@ -6963,7 +6963,7 @@ MonoBehaviour:
m_linkedTextComponent: {fileID: 0}
parentLinkedComponent: {fileID: 0}
m_enableKerning: 1
m_ActiveFontFeatures: 00000000
m_ActiveFontFeatures: 6e72656b
m_enableExtraPadding: 0
checkPaddingRequired: 0
m_isRichText: 1
Expand Down
Loading