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.

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

Connection Curves #120

Open
wants to merge 270 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
270 commits
Select commit Hold shift + click to select a range
d1016a8
abstracted AStar so only one version is needed
SebastianMeinberger Jun 22, 2020
19f8716
Removed the unnacassary leftovers from old AStar
SebastianMeinberger Jun 22, 2020
0868a02
The VectorToCell function now works correct for vectors with negantiv…
SebastianMeinberger Jun 22, 2020
42f80e5
Finished HPAStar
SebastianMeinberger Jun 22, 2020
1c98b5c
The CellToClusternumber function now wotks correctly for negativ values
SebastianMeinberger Jun 23, 2020
d9fdb5c
HPAStar search now returns the correct vector3 path
SebastianMeinberger Jun 23, 2020
769e254
Added some test scenes
SebastianMeinberger Jun 24, 2020
18d6341
Added greedy search
SebastianMeinberger Jun 24, 2020
457c68f
Revoded a test case
SebastianMeinberger Jun 24, 2020
b20f0dd
Cleaned up a bit
SebastianMeinberger Jun 24, 2020
6f2e5cf
Added cubic bezier curve calculation
SebastianMeinberger Jun 26, 2020
9b0875e
Added a simple curve calculation that bruteforces controllpoints
SebastianMeinberger Jun 26, 2020
5c72e7b
Added general Bezier Calculation
SebastianMeinberger Jun 26, 2020
563f1b7
Now the intersections points with the collider box get calculated cor…
SebastianMeinberger Jun 27, 2020
36a813a
The height of the controllpoints now scales with the high difference …
SebastianMeinberger Jun 27, 2020
f90fe71
The witdh of the controllpoints now scales with how close the boundin…
SebastianMeinberger Jun 27, 2020
f01093d
Start and goal can now freely be moved
SebastianMeinberger Jun 27, 2020
3a2af6b
The curve generation now trys two gernerate the standart curve first
SebastianMeinberger Jun 28, 2020
11b4996
The curve generation now trys to also use the sides, but the methid w…
SebastianMeinberger Jun 28, 2020
4cd5af2
Bending cirve to the side now measures the amount of points left and …
SebastianMeinberger Jun 29, 2020
8248ef2
Cleaned up a bit
SebastianMeinberger Jun 29, 2020
2f3b90b
Added CentroidCalculation
SebastianMeinberger Jul 1, 2020
a55464e
Now joined BezierCurves are used for the curve above
SebastianMeinberger Jul 1, 2020
2761d9f
Th side path for the curve now also use the improved joined bezier Me…
SebastianMeinberger Jul 1, 2020
26ad2d9
The up vector for the side path now gets calculated correctly
SebastianMeinberger Jul 3, 2020
f96d697
The sides path now gets resanned for additional obstacles
SebastianMeinberger Jul 3, 2020
79191a8
The curve calcuöation for the sides now gets done in 2D and them tran…
SebastianMeinberger Jul 5, 2020
1833bca
The curve above now also uses the 2 Dimensional calculation
SebastianMeinberger Jul 5, 2020
390c2f0
Before the shifting of the farther middle point it gets checked if it…
SebastianMeinberger Jul 6, 2020
117c962
MAde a few test scenes and a generator for random tests
SebastianMeinberger Jul 6, 2020
bb50217
Changed the BezierCurve class to an general curve interface
SebastianMeinberger Jul 7, 2020
53bf9f7
Put the othe curve related functions into the new interface
SebastianMeinberger Jul 7, 2020
26b3c16
Fixed formatting
SebastianMeinberger Jul 9, 2020
f6a2c49
The greedy line now doesn't get replaced by the simple line
SebastianMeinberger Jul 9, 2020
57dca41
Cleaned up a bit
SebastianMeinberger Jul 15, 2020
5fc0517
Finished the new controll point determination for the sides
SebastianMeinberger Jul 16, 2020
1bf4a15
Fixed, that the curve looked weird when a controllpoint is left from …
SebastianMeinberger Jul 18, 2020
f224bd7
Now the generation doesn't freeze when the boundingbox includes start…
SebastianMeinberger Jul 19, 2020
c07bd05
The check if something collides with start or goal now works corrrectly
SebastianMeinberger Jul 19, 2020
0d17928
The bounding box now never includes start or goal
SebastianMeinberger Jul 20, 2020
e9d46dc
The border restriction now is optimised to keep the boundingbox betwe…
SebastianMeinberger Jul 20, 2020
7177a2e
Changed the colliosion detection. The AppBar now always gets ignored
SebastianMeinberger Jul 21, 2020
b1ef162
Renamed it to curve.cs
SebastianMeinberger Jul 21, 2020
8e1f845
Made a few example scenes to show a few features
SebastianMeinberger Jul 21, 2020
3ef4594
For the bounding box correction now also works, when the obstacle is …
SebastianMeinberger Jul 21, 2020
83d5ac4
The generator classes now properly inherit there needed functions
SebastianMeinberger Jul 28, 2020
0186b40
Added a connect button to the appbar and made an icon for it
SebastianMeinberger Jul 28, 2020
a354851
Changed the buttom position
SebastianMeinberger Jul 29, 2020
03135b4
Added an empty lineConnect function
SebastianMeinberger Jul 29, 2020
c06e145
Added the function that you can choose the resolution of the curve
SebastianMeinberger Jul 29, 2020
4bce3aa
Added the new line controller
SebastianMeinberger Jul 29, 2020
6958d17
Removed the additional boundingbox. Collision test now check for the …
SebastianMeinberger Jul 29, 2020
cac854b
The connect funtion now connects the clicked object with any object n…
SebastianMeinberger Jul 29, 2020
8d379fe
The connect function now takes an array as parameter, becuase otherwi…
SebastianMeinberger Jul 29, 2020
1e35848
Added mutiple progress bars for test reasons
SebastianMeinberger Jul 29, 2020
c71d84f
Readded the LineController prefab
SebastianMeinberger Jul 29, 2020
8d28f12
The collision detection now also checks if the collider collides with…
SebastianMeinberger Jul 30, 2020
bcf6acd
Removed everything related to HPAStar
SebastianMeinberger Jul 30, 2020
c29c64c
Clicking the connect button now calls the StartConnect Function in Li…
SebastianMeinberger Jul 30, 2020
aa76be6
A user can now add a line by first clicking on the connect button and…
SebastianMeinberger Jul 30, 2020
8615b6c
The curve now follows the virtual hand while connecting
SebastianMeinberger Jul 30, 2020
fb93411
Changed the default height to 0.5
SebastianMeinberger Jul 30, 2020
f59ddbd
Clicking without hitting a target now stops the connecting
SebastianMeinberger Jul 30, 2020
c7c1c77
The AppBar is now again collapsed in when spawning
SebastianMeinberger Jul 31, 2020
c6a6ec1
The connect button is now disabled in the no delete mode
SebastianMeinberger Jul 31, 2020
61adbe0
The mainPointer now doesn't get checked for null but if its ToString …
SebastianMeinberger Jul 31, 2020
4e2c602
Removed the old line controller because it is obsolete now
SebastianMeinberger Jul 31, 2020
3c11c4b
AStar now returns a path from start to goal instead of goal to start
SebastianMeinberger Jul 31, 2020
cba865b
The IntTriplePathToCurve function now alway assumes that the path sta…
SebastianMeinberger Jul 31, 2020
055b84a
Removed a few unaccessary references and commented out lines
SebastianMeinberger Jul 31, 2020
0830a1b
Removed orphan meta file
SebastianMeinberger Jul 31, 2020
b977454
Created a IsValidCollider method
SebastianMeinberger Aug 1, 2020
5ef9919
Now a collider is not valid when it contains the start or goal point
SebastianMeinberger Aug 1, 2020
30e44b4
Added a layer for curve deleting
SebastianMeinberger Aug 1, 2020
b3d3638
Added the Disconnect Button
SebastianMeinberger Aug 1, 2020
8cf88c6
added the disconnect function
SebastianMeinberger Aug 1, 2020
6b22a8e
The check if start and goal is in the collider can now correctly be t…
SebastianMeinberger Aug 1, 2020
789e460
Made it smaller
SebastianMeinberger Aug 2, 2020
d59f4df
Added the new LineControlller to them
SebastianMeinberger Aug 2, 2020
12679c8
Added an icon for the disconnect button
SebastianMeinberger Aug 3, 2020
50216fb
The connection curves now get deleted correctly, when a connected obj…
SebastianMeinberger Aug 4, 2020
1ecbb20
The CheckColliosion Method now gets invoked correctly
SebastianMeinberger Aug 4, 2020
268ab96
Fixed that the collision check didnt worked on objects with a namer s…
SebastianMeinberger Aug 4, 2020
b15e432
Collider that aren't primitive now are alway valid in the valid check
SebastianMeinberger Aug 4, 2020
a717df9
The delete cube now gets detected again as valid collider for curves
SebastianMeinberger Aug 4, 2020
e139331
Curve now get approximated with capsual colliders instead of boxes
SebastianMeinberger Aug 5, 2020
95fe631
Added a function for scanning for obstacles
SebastianMeinberger Aug 5, 2020
27bc697
Improved the collider rescan and also implemeted it for collider above
SebastianMeinberger Aug 6, 2020
8fe3d38
The calculation for the intersection points above now uses the right …
SebastianMeinberger Aug 6, 2020
92d6b46
The contact points now don't get shifted around anymore to ensure the…
SebastianMeinberger Aug 6, 2020
7b1d2bf
Fixed, that the curves clipps into the boundingbox when start or goal…
SebastianMeinberger Aug 7, 2020
f83c222
The scan for above used a way to big x value for the inital scan
SebastianMeinberger Aug 7, 2020
8c38184
Added a cube for collision testing
SebastianMeinberger Aug 8, 2020
aeb9598
Added a Coroutine for AStar and a wrapper class for its parameters
SebastianMeinberger Aug 8, 2020
3cf1898
Added an overloading for the AStarParameter class that mimics the sta…
SebastianMeinberger Aug 9, 2020
25a77fd
Copied the AStar coroutine into the curve controller, because it is a…
SebastianMeinberger Aug 9, 2020
88d5422
The status of the coroutine now doesn't get pulled and instead awaite…
SebastianMeinberger Aug 10, 2020
a09df6a
The temp curve gets now updated again
SebastianMeinberger Aug 11, 2020
3c89858
The curve now temporaly snaps to a target when the curosr hovers over…
SebastianMeinberger Aug 11, 2020
ac0c8ab
AStar now displays how many frames it need. Just for test purposes
SebastianMeinberger Aug 11, 2020
a189e1f
The AStar coroutine is now called normally with its parameters. They …
SebastianMeinberger Aug 11, 2020
0def3e1
Merge branch 'connectionCurves/curveAnimations' into connectionCurves…
SebastianMeinberger Aug 13, 2020
62fc078
Temp Curves are now yellow
SebastianMeinberger Aug 13, 2020
5ced436
The curve colliosion check now uses the layermask again
SebastianMeinberger Aug 13, 2020
85e1d5f
The delete check now doesn't use the default distance, because its wa…
SebastianMeinberger Aug 13, 2020
99c4402
Added a networkable connection curve that gets instanciated with phot…
SebastianMeinberger Aug 15, 2020
3595f72
Added a synchronising script for line renderer
SebastianMeinberger Aug 15, 2020
f63cb63
The script now inherits IPunOberservable
SebastianMeinberger Aug 15, 2020
fecf1c9
Chenged the observer mode to 'unreliable on change'
SebastianMeinberger Aug 15, 2020
ca6a198
Sending complex data types doesn't work. Added a test scenario for en…
SebastianMeinberger Aug 15, 2020
692ae7b
Colour test
SebastianMeinberger Aug 15, 2020
7f36042
Position Test
SebastianMeinberger Aug 15, 2020
658b1df
The linesynchroniser now gets it line assigned in the editor
SebastianMeinberger Aug 16, 2020
66dfa9f
The linesynchroniser now gets it line assigned in the editor
SebastianMeinberger Aug 16, 2020
6709ff7
Resolved merge conflict
SebastianMeinberger Aug 16, 2020
d880d5c
Resolved merge conflict
SebastianMeinberger Aug 16, 2020
8460ec7
Resolved a strange merge issu
SebastianMeinberger Aug 16, 2020
4a71049
Added a OnLeftRoom function, that could be usefull for clenaup
SebastianMeinberger Aug 17, 2020
0b243da
Switched from Coroutines to async await
SebastianMeinberger Aug 17, 2020
4223d52
Changed everything to async await
SebastianMeinberger Aug 17, 2020
22e57f4
The connection curve now gets instantiated as scene object, but the o…
SebastianMeinberger Aug 18, 2020
0d22775
Forgot to add something
SebastianMeinberger Aug 18, 2020
6ab469d
Added the meta file
SebastianMeinberger Aug 18, 2020
ae0df8a
Curves now get added via RPC
SebastianMeinberger Aug 18, 2020
5faf888
Put the connection curves in a own script
SebastianMeinberger Aug 18, 2020
8c0dae1
Merged edgecaseImprovment into networkFunctunality
SebastianMeinberger Aug 18, 2020
9693e22
The connection curves class is now a component of the prefab
SebastianMeinberger Aug 18, 2020
52b6f66
Test for instatiating the connectionscurve with data
SebastianMeinberger Aug 18, 2020
da815a0
All adding and removing from the watch list for the curves is now han…
SebastianMeinberger Aug 19, 2020
96710ea
Everything ,beside the color setting, of the setup from the curves no…
SebastianMeinberger Aug 19, 2020
001eeed
The line renderer pointer is now per default safed in the prefab
SebastianMeinberger Aug 19, 2020
43e6338
ConnectionCurves now always get destroyed with the photon destroy
SebastianMeinberger Aug 19, 2020
df09bfa
Before destroying a curve, the client now ensures the ownership
SebastianMeinberger Aug 19, 2020
4ccd446
Readded a line that or some reasons was deleted
SebastianMeinberger Aug 21, 2020
8b28025
Temp curve now gets determined by an attribute connection curves have
SebastianMeinberger Aug 21, 2020
1b5f75e
The state change is now done through a ChnageState Method, whicher pe…
SebastianMeinberger Aug 21, 2020
2043038
The connection color now gets changed trough RPC
SebastianMeinberger Aug 22, 2020
3be65ca
Removed now uneccasary components
SebastianMeinberger Aug 22, 2020
434904c
The color now gets transmitted as float array
SebastianMeinberger Aug 22, 2020
0ce041d
The color of each curve now defently gets resettet to green when the …
SebastianMeinberger Aug 22, 2020
592e617
The default look of the curves is now hangeld by the prefab
SebastianMeinberger Aug 22, 2020
35b6917
Now no part of multiplayer avatars counts as collision
SebastianMeinberger Aug 22, 2020
eb00972
DeleteCurve() now waits until it has the ownership
SebastianMeinberger Aug 23, 2020
23d28fd
The appbar now doesn't use SendMeassage to communicate with the line …
SebastianMeinberger Aug 23, 2020
f0c1b92
The masterclient now also has to wait for ownership to delete a curve
SebastianMeinberger Aug 23, 2020
d40b23e
The curves now also work when your aren't in a room
SebastianMeinberger Aug 23, 2020
7cca5df
Fixed, that the checkEndCollisionParameter was ignored
SebastianMeinberger Aug 23, 2020
5d27d51
Merge branch 'master' into connectionCurves/nietworkWithOwnership
SebastianMeinberger Aug 23, 2020
3c7f65c
Fixed, that the simple generation scanned for new obstacles infinite …
SebastianMeinberger Aug 23, 2020
508eafd
ConnectionCurves now get serialized through a dictionary in the saveL…
SebastianMeinberger Aug 25, 2020
bb2a7f1
When the curve gets instantiated without instantiation data by the sa…
SebastianMeinberger Aug 25, 2020
88a4b08
The connection curve now resolves the serilizerID in an async method …
SebastianMeinberger Aug 26, 2020
b6bfdb3
Removed the part that tryed to instantiate photon objetcts with the c…
SebastianMeinberger Aug 26, 2020
5b61adc
The goal now gets changed through an RPC
SebastianMeinberger Aug 26, 2020
f4110c7
I have no idea why photon doesn't accept that bloody function
SebastianMeinberger Aug 26, 2020
1fa6eb2
The curve now uses the first parent with a photonview as start and go…
SebastianMeinberger Aug 27, 2020
d7d4f95
Added a scene for the UserEvaluation of the connection curves
SebastianMeinberger Aug 27, 2020
2b40512
Connecting a curve now enters a new AppBar state in which all other A…
SebastianMeinberger Aug 27, 2020
9c91075
Added a lot of helper scripts for the evaluation
SebastianMeinberger Aug 30, 2020
c060cd8
The titel can now set via the inspector
SebastianMeinberger Aug 31, 2020
5f38d1b
Added another task
SebastianMeinberger Aug 31, 2020
0f847aa
The deletmode now only gets canceld, when there was nothing deletd fr…
SebastianMeinberger Sep 1, 2020
6e0f591
Changed the RPC name back to 'SetGoal'
SebastianMeinberger Sep 3, 2020
ca00ef3
Merged syncTempGoalRPC and userevaluation
SebastianMeinberger Sep 3, 2020
eb1c24f
Fixed the null pointer issu
SebastianMeinberger Sep 3, 2020
68aaae1
The goal now gets only set, if it isn't already the goal
SebastianMeinberger Sep 3, 2020
13fa96f
The deletecube now uses the rotation value from the controller
SebastianMeinberger Sep 4, 2020
189d1f0
A click is now only counted, if the last state switch is longer then …
SebastianMeinberger Sep 4, 2020
57c5e24
The evaluation script now automaticlly sets the backend server adress
SebastianMeinberger Sep 4, 2020
3840e48
Added a task for the collobaration funktion
SebastianMeinberger Sep 4, 2020
7e71df5
Fixed that a curve thows a nullexeption, when the linecontroller was …
SebastianMeinberger Sep 4, 2020
b8f5ddc
Fixed spelling
SebastianMeinberger Sep 4, 2020
2dfe61f
fixed a bug, where the curve update stoped under strange race conditions
SebastianMeinberger Sep 10, 2020
fc7eb99
Added the stuff for the technical evaluation and updated the testcase…
SebastianMeinberger Sep 10, 2020
c9d1ea9
Deleted the coroutine functions
SebastianMeinberger Sep 10, 2020
666860f
changed the searching for the Line controller from searching by name …
SebastianMeinberger Sep 10, 2020
8c0c2d9
The calcukation of the exact curve now uses multiple threads, but the…
SebastianMeinberger Sep 10, 2020
6e17152
Switched from the normal multi threading to unitys job system
SebastianMeinberger Sep 11, 2020
6e9ca9e
Fixed, that the wronge connection curves got there linerenderer updated
SebastianMeinberger Sep 11, 2020
79719b6
Put the array acesses in own sections to improve the readability
SebastianMeinberger Sep 22, 2020
5b6a26d
Fixed, that the bezier curve calculation always generated a curve wit…
SebastianMeinberger Sep 26, 2020
d75f322
Moved all acesses to the native arrys into the job struct
SebastianMeinberger Sep 26, 2020
f610678
The joined curve generation can again use the path finding algorithms
SebastianMeinberger Sep 26, 2020
152b55b
Added a stopwatch for test purposes
SebastianMeinberger Sep 26, 2020
8af44f8
Cleaned up a bit
SebastianMeinberger Oct 12, 2020
a6d7d89
Removed the stopwatch
SebastianMeinberger Oct 12, 2020
bf18b3b
Fixed a bug, where at the start a connection curve was generated, tha…
SebastianMeinberger Oct 13, 2020
49d0cee
A curve now can't have the same start and goal
SebastianMeinberger Oct 14, 2020
85debb8
Fixed the seeItSayIt lable from the disconnect button
SebastianMeinberger Oct 14, 2020
32e16da
Added a scene for the end presentation
SebastianMeinberger Oct 15, 2020
5201267
CHanged the distance difference needed for a S-type curve from a fakt…
SebastianMeinberger Oct 15, 2020
e732c1d
Added summarys to the functions
SebastianMeinberger Oct 15, 2020
3ec5359
Deleted now obsolete files
SebastianMeinberger Oct 15, 2020
eedc81f
The LineController is now acessed through the singleton class
SebastianMeinberger Oct 17, 2020
a6e14f7
Added summarys for the Curve Connection functionalitys
SebastianMeinberger Oct 17, 2020
e857712
Added the LineCrontroller to the managers prefab
SebastianMeinberger Oct 17, 2020
39c98ff
The joined curve generation is no longer a gameobject, because it was…
SebastianMeinberger Oct 17, 2020
a6c2947
Renamed the LineController to ConnectionCurveManager
SebastianMeinberger Oct 21, 2020
ceeaf5b
Added summarys to the functions
SebastianMeinberger Oct 21, 2020
2190209
Added summarys and renamed some functions
SebastianMeinberger Oct 22, 2020
8c06c04
Added summarys for all functions
SebastianMeinberger Oct 23, 2020
2e53263
The CurveManager is now only acessed through the signleton class
SebastianMeinberger Oct 23, 2020
d141ae9
Removed a unnassasary variable
SebastianMeinberger Oct 23, 2020
b3d6ead
Added summarys
SebastianMeinberger Oct 23, 2020
a7ccd48
Added summarys
SebastianMeinberger Oct 24, 2020
b1985ae
Added summarys
SebastianMeinberger Oct 24, 2020
70ee397
Added summarys
SebastianMeinberger Oct 25, 2020
1019a92
Fixed a typo in a summary
SebastianMeinberger Oct 25, 2020
15375e2
Added summarys
SebastianMeinberger Oct 25, 2020
267e2ad
Fixed typos in the summarys
SebastianMeinberger Oct 25, 2020
25ea046
Added summarys
SebastianMeinberger Oct 25, 2020
7c91992
Renamed the ReconstructPath function in order to comply with the nami…
SebastianMeinberger Oct 25, 2020
e7e0ce5
Added summarys
SebastianMeinberger Oct 25, 2020
c5ef13c
Deleted now unnacassary files
SebastianMeinberger Oct 25, 2020
c15e886
Updated the scene to the current ConnectionCurveSystem
SebastianMeinberger Oct 26, 2020
eb45cd0
The curve setup now also works when the curve is part of the scene
SebastianMeinberger Oct 26, 2020
7433b85
Updated the scene to the new connection curve system
SebastianMeinberger Oct 26, 2020
0615626
Added a scene that shows curve generation through AStar
SebastianMeinberger Oct 26, 2020
c189006
Renamed the UserEvaluation scene
SebastianMeinberger Oct 26, 2020
8d865a8
Updated to the new ConnectionCurveManager name
SebastianMeinberger Oct 26, 2020
caf1f41
Removed the old LineController
SebastianMeinberger Oct 26, 2020
96fbb31
Added the MRTK Diagnostic System
SebastianMeinberger Oct 26, 2020
f850857
Moved all scripts and prefabs from the test folder into the actual fo…
SebastianMeinberger Oct 26, 2020
09cd273
Copyed the grid shader in order to change it individually
SebastianMeinberger Oct 26, 2020
3da25f2
Merge branch 'master' into connectionCurves/mergeMasterIntoConnection…
SebastianMeinberger Dec 9, 2020
f2c4e1d
The manipulation handler is now checked for null
SebastianMeinberger Dec 9, 2020
ed66dfe
Removed the old null check for the main pointer, because in the mrtk …
SebastianMeinberger Dec 9, 2020
3039513
It is now checked, if something got wrong in the simple curve generation
SebastianMeinberger Dec 10, 2020
bdf4799
Changed the version in the comment that warns about a missing unity f…
SebastianMeinberger Dec 10, 2020
8db4791
Changed the allocation strategy for the nativ arrays for a massiv per…
SebastianMeinberger Dec 10, 2020
79a5bef
Revert "Changed the allocation strategy for the nativ arrays for a ma…
SebastianMeinberger Dec 10, 2020
f051409
Changed the allocation strategys of all nativ arrays tp persistent
SebastianMeinberger Dec 11, 2020
8b981b8
The nativ arrays are now disposed on application quit
SebastianMeinberger Dec 12, 2020
a4d6c34
Added a more simle testing area
SebastianMeinberger Dec 12, 2020
f3752b4
Removed the old line controller
SebastianMeinberger Dec 12, 2020
3143f56
The nativ arrays are now resized on demand
SebastianMeinberger Dec 12, 2020
918ec3d
Merged devlop into connectionCurves
SebastianMeinberger Dec 12, 2020
a46220c
Changed the visibilty for the Objectmanipulator to public get, in ord…
SebastianMeinberger Dec 12, 2020
d428286
In the connecting state, it is now checked if the connection curve al…
SebastianMeinberger Dec 12, 2020
27c4e07
Added the room controller to make it easier to test photon related stuff
SebastianMeinberger Dec 12, 2020
0a882aa
Added a few comments and cleaned up a bit
SebastianMeinberger Dec 13, 2020
30f0df2
Added a new material for the delete cube
SebastianMeinberger Dec 13, 2020
5ce9a1e
Refined some summarys
SebastianMeinberger Dec 13, 2020
8401d69
Setting the tempgoal now works without being in a photon room
SebastianMeinberger Dec 13, 2020
7d1e718
Merge branch 'develop' into connectionCurves/master
SebastianMeinberger Jan 21, 2021
cdaf8a6
Merged develop into connectionCurves/master
SebastianMeinberger Jan 21, 2021
7e20371
Fixed a merge error
SebastianMeinberger Jan 21, 2021
9f09169
Fixed the null exeptions, when the mainPointer is invalid
SebastianMeinberger Apr 20, 2021
52678a3
The selection of the mainpointer now searches for the pointer targeti…
SebastianMeinberger Apr 20, 2021
0da3289
Merge branch 'develop' into connectionCurves/master
SebastianMeinberger May 4, 2021
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
86 changes: 86 additions & 0 deletions Frontend/VIAProMa/Assets/Materials/DeleteCube.mat
Original file line number Diff line number Diff line change
@@ -0,0 +1,86 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: DeleteCube
m_Shader: {fileID: 4800000, guid: 65c40aa30dd2b704bac7512a200022e1, type: 3}
m_ShaderKeywords:
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _CellHeight: 0.5
- _CellWidth: 0.5
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _OffsetX: 0
- _OffsetY: 0
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _WireThickness: 0.01
- _WireThicknessX: 0.1
- _WireThicknessY: 0.1
- _ZWrite: 1
m_Colors:
- _BackgroundColor: {r: 0, g: 0, b: 0, a: 0}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _WireColor: {r: 1, g: 0.023584902, b: 0.023584902, a: 0.53333336}
8 changes: 8 additions & 0 deletions Frontend/VIAProMa/Assets/Materials/DeleteCube.mat.meta

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

14 changes: 14 additions & 0 deletions Frontend/VIAProMa/Assets/NuGet.config
Original file line number Diff line number Diff line change
@@ -0,0 +1,14 @@
<?xml version="1.0" encoding="utf-8"?>
<configuration>
<packageSources>
<add key="NuGet" value="http://www.nuget.org/api/v2/" />
</packageSources>
<disabledPackageSources />
<activePackageSource>
<add key="All" value="(Aggregate source)" />
</activePackageSource>
<config>
<add key="repositoryPath" value="./Packages" />
<add key="DefaultPushSource" value="http://www.nuget.org/api/v2/" />
</config>
</configuration>
32 changes: 32 additions & 0 deletions Frontend/VIAProMa/Assets/NuGet.config.meta

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

9 changes: 9 additions & 0 deletions Frontend/VIAProMa/Assets/NuGet.meta

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

9 changes: 9 additions & 0 deletions Frontend/VIAProMa/Assets/NuGet/Editor.meta

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

Binary file not shown.
33 changes: 33 additions & 0 deletions Frontend/VIAProMa/Assets/NuGet/Editor/DotNetZip.dll.meta

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

Binary file not shown.
33 changes: 33 additions & 0 deletions Frontend/VIAProMa/Assets/NuGet/Editor/NugetForUnity.dll.meta

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

21 changes: 21 additions & 0 deletions Frontend/VIAProMa/Assets/NuGet/LICENSE
Original file line number Diff line number Diff line change
@@ -0,0 +1,21 @@
MIT License

Copyright (c) 2018 Patrick McCarthy

Permission is hereby granted, free of charge, to any person obtaining a copy
of this software and associated documentation files (the "Software"), to deal
in the Software without restriction, including without limitation the rights
to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
copies of the Software, and to permit persons to whom the Software is
furnished to do so, subject to the following conditions:

The above copyright notice and this permission notice shall be included in all
copies or substantial portions of the Software.

THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
SOFTWARE.
8 changes: 8 additions & 0 deletions Frontend/VIAProMa/Assets/NuGet/LICENSE.meta

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

Binary file added Frontend/VIAProMa/Assets/NuGet/README.pdf
Binary file not shown.
8 changes: 8 additions & 0 deletions Frontend/VIAProMa/Assets/NuGet/README.pdf.meta

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

9 changes: 9 additions & 0 deletions Frontend/VIAProMa/Assets/NuGet/Resources.meta

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

Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
88 changes: 88 additions & 0 deletions Frontend/VIAProMa/Assets/NuGet/Resources/defaultIcon.png.meta

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

8 changes: 8 additions & 0 deletions Frontend/VIAProMa/Assets/Packages.meta

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

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

Binary file not shown.
Binary file not shown.

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

Loading