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

New Feature: Drag and Drop System #493

Open
wants to merge 36 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
36 commits
Select commit Hold shift + click to select a range
0315ff7
Serialized Issue Data to easier create test Issues in Inspector
PaulMWeiser Jun 22, 2022
78bf063
Update function for issues that ignores IssueSelectionManager
PaulMWeiser Jun 22, 2022
6f6f8e9
Basic Drag And Drop Functions added
PaulMWeiser Jun 22, 2022
867f3d2
a few small comments added
Jun 25, 2022
581faa5
Merge pull request #456 from rwth-acis/drag-and-drop/dropIssuesIntoVi…
ossocore Jun 25, 2022
4ad75fd
made drag-and-drop trigger component smaller
PaulMWeiser Jul 4, 2022
761122e
Corrected error in the AppBar code
PaulMWeiser Jul 5, 2022
215e59a
Destruction of Issue card after addition to visualization implemented
PaulMWeiser Jul 5, 2022
e365a24
Bugfixes
PaulMWeiser Jul 6, 2022
06f38bf
Implemented Overlap Indicator feature
PaulMWeiser Jul 6, 2022
76ae8f2
Added flag to turn off Issue Destruction after drop
PaulMWeiser Jul 6, 2022
3aa925d
Speed condition functionality fully implemented
PaulMWeiser Jul 7, 2022
627e5d2
Merge pull request #473 from rwth-acis/drag-and-drop/highlightBug
ossocore Jul 7, 2022
f8d988b
Merge pull request #474 from rwth-acis/drag-and-drop/overlappingIssues
ossocore Jul 8, 2022
545e70a
Merge branch 'drag-and-drop/develop' into drag-and-drop/waitperiodAlt…
ossocore Jul 8, 2022
e8ba3e8
Merge pull request #476 from rwth-acis/drag-and-drop/waitperiodAltern…
ossocore Jul 8, 2022
ff9d0d3
Merge branch 'drag-and-drop/develop' into drag-and-drop/deleteIssues
ossocore Jul 8, 2022
1918f07
Resolved merge conflict double Update method
ossocore Jul 8, 2022
239a173
Merge pull request #475 from rwth-acis/drag-and-drop/deleteIssues
ossocore Jul 8, 2022
ff3a6dd
structured Drag and Drop class, added comments
PaulMWeiser Jul 8, 2022
f3b7406
Small comment changes, added Building progress bar to test scene
PaulMWeiser Jul 8, 2022
89c5ae3
Added colliders to building prefabs to make them work with DandD
PaulMWeiser Jul 8, 2022
de36591
Put DandD components onto IssueInScene object, prepaired CompDisp
PaulMWeiser Jul 9, 2022
c0d3414
Moved DandD script into the script folder, removed unnecessary object
PaulMWeiser Jul 9, 2022
94f825a
cards now get removed from kanban board when dragging issue out
Jul 10, 2022
2c3e283
Fixed bug: adding issue to kanban board results in error
Jul 10, 2022
147d9dc
Merge pull request #482 from rwth-acis/drag-and-drop/integrate-featur…
ossocore Jul 10, 2022
379121b
Update CopyMover.cs
PaulMWeiser Jul 10, 2022
97f94ad
Merge pull request #487 from rwth-acis/drag-and-drop/delete-issues-fr…
PaulMWeiser Jul 10, 2022
1b6d82b
It just won't disappear otherwise
PaulMWeiser Jul 10, 2022
253a457
Competence Display Drag and Drop collider added
PaulMWeiser Jul 10, 2022
28ec786
corrected hitbox shift and stupid bug in CompetenceDisplay
PaulMWeiser Jul 10, 2022
59376e3
Merge pull request #491 from rwth-acis/drag-and-drop/develop
ossocore Jul 10, 2022
6406cba
made variable public get for others see if issue is being destroyed (…
PaulMWeiser Jul 10, 2022
4655bad
tweaked variable scoping and collider size
KritiaSthovania Dec 13, 2022
6148f33
polished coding
KritiaSthovania Dec 14, 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
Original file line number Diff line number Diff line change
Expand Up @@ -48,6 +48,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
logLevel: 1
ignoreGlobalLogLevel: 0
recorderInUse: {fileID: 0}
speakerInUse: {fileID: 0}
AutoCreateRecorderIfNotFound: 0
Expand Down Expand Up @@ -412,8 +413,13 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
logLevel: 1
ignoreGlobalLogLevel: 0
playbackOnlyWhenEnabled: 0
PlayDelayMs: 200
playDelayMs: -1
playbackDelaySettings:
MinDelaySoft: 200
MaxDelaySoft: 400
MaxDelayHard: 1000
--- !u!1001 &6523064825053795340
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down
272 changes: 271 additions & 1 deletion Frontend/VIAProMa/Assets/Prefabs/Resources/Card In Scene.prefab
Original file line number Diff line number Diff line change
Expand Up @@ -305,6 +305,7 @@ Transform:
- {fileID: 6607187418284078679}
- {fileID: 692061462000232331}
- {fileID: 7092569771786069753}
- {fileID: 61066550092676283}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand All @@ -320,6 +321,24 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: a544857c7aef28843ad09528a6078fe4, type: 3}
m_Name:
m_EditorClassIdentifier:
content:
source: 0
id: 0
name:
description:
projectId: 0
creator:
source: 0
id: 0
userName:
firstName:
lastName:
profileImageUrl:
status: 0
creationDate:
closedDate:
developers: []
commenters: []
titleField: {fileID: 856870973326955817}
descriptionField: {fileID: 856870974006305475}
creatorDisplay: {fileID: 2612109103114148045}
Expand Down Expand Up @@ -1427,6 +1446,24 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2290553ba68ef054da11c9e9f80a6a30, type: 3}
m_Name:
m_EditorClassIdentifier:
content:
source: 0
id: 0
name:
description:
projectId: 0
creator:
source: 0
id: 0
userName:
firstName:
lastName:
profileImageUrl:
status: 0
creationDate:
closedDate:
developers: []
commenters: []
statusLabel: {fileID: 856870973359599690}
statusLabelBackground: {fileID: 856870972376199350}
--- !u!1 &856870974006305473
Expand Down Expand Up @@ -1609,6 +1646,214 @@ MonoBehaviour:
_SortingLayer: 0
_SortingLayerID: 0
_SortingOrder: 0
--- !u!1 &2162789172893337649
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1681886552623970463}
- component: {fileID: 1801967053315900333}
m_Layer: 0
m_Name: Line
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1681886552623970463
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2162789172893337649}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 61066550092676283}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!120 &1801967053315900333
LineRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 2162789172893337649}
m_Enabled: 1
m_CastShadows: 0
m_ReceiveShadows: 0
m_DynamicOccludee: 1
m_MotionVectors: 0
m_LightProbeUsage: 0
m_ReflectionProbeUsage: 0
m_RayTracingMode: 0
m_RayTraceProcedural: 0
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 10306, guid: 0000000000000000f000000000000000, type: 0}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
m_Positions:
- {x: 0, y: 0, z: 0}
- {x: 0, y: 0, z: 0}
m_Parameters:
serializedVersion: 3
widthMultiplier: 0.1
widthCurve:
serializedVersion: 2
m_Curve:
- serializedVersion: 3
time: 0
value: 0.075
inSlope: 0
outSlope: 0
tangentMode: 0
weightedMode: 0
inWeight: 0.33333334
outWeight: 0.33333334
m_PreInfinity: 2
m_PostInfinity: 2
m_RotationOrder: 4
colorGradient:
serializedVersion: 2
key0: {r: 0.16862746, g: 0.28627452, b: 0.6784314, a: 1}
key1: {r: 0.16862746, g: 0.28627452, b: 0.6784314, a: 0.5882353}
key2: {r: 0.16862746, g: 0.28627452, b: 0.6784314, a: 0}
key3: {r: 0, g: 0, b: 0, a: 0}
key4: {r: 0, g: 0, b: 0, a: 0}
key5: {r: 0, g: 0, b: 0, a: 0}
key6: {r: 0, g: 0, b: 0, a: 0}
key7: {r: 0, g: 0, b: 0, a: 0}
ctime0: 0
ctime1: 65535
ctime2: 65535
ctime3: 0
ctime4: 0
ctime5: 0
ctime6: 0
ctime7: 0
atime0: 21627
atime1: 65535
atime2: 0
atime3: 0
atime4: 0
atime5: 0
atime6: 0
atime7: 0
m_Mode: 0
m_NumColorKeys: 2
m_NumAlphaKeys: 2
numCornerVertices: 0
numCapVertices: 0
alignment: 0
textureMode: 0
shadowBias: 0.5
generateLightingData: 0
m_UseWorldSpace: 0
m_Loop: 0
--- !u!1 &5403975654919103403
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 61066550092676283}
- component: {fileID: 1555265433458610697}
- component: {fileID: 3151562588382028753}
- component: {fileID: 5263886314892949828}
m_Layer: 0
m_Name: DragAndDropComponent
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &61066550092676283
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5403975654919103403}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0, y: 0, z: 0}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children:
- {fileID: 1681886552623970463}
m_Father: {fileID: 856870972359737782}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!65 &1555265433458610697
BoxCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5403975654919103403}
m_Material: {fileID: 0}
m_IsTrigger: 1
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.29, y: 0.19, z: 0.019}
m_Center: {x: 0, y: 0, z: 0}
--- !u!54 &3151562588382028753
Rigidbody:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5403975654919103403}
serializedVersion: 2
m_Mass: 1
m_Drag: 0
m_AngularDrag: 0.05
m_UseGravity: 0
m_IsKinematic: 1
m_Interpolate: 0
m_Constraints: 0
m_CollisionDetection: 0
--- !u!114 &5263886314892949828
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 5403975654919103403}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 21bf9131190a9ec43910b26caae313c4, type: 3}
m_Name:
m_EditorClassIdentifier:
speedThreshhold: 0.2
destroyTime: 0.25
destroyIssueAfterDrop: 1
indicatorLine: {fileID: 2162789172893337649}
--- !u!1 &5542261119816781319
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1736,6 +1981,24 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 15e97069839c9eb44a173cfafdf9eb62, type: 3}
m_Name:
m_EditorClassIdentifier:
content:
source: 0
id: 0
name:
description:
projectId: 0
creator:
source: 0
id: 0
userName:
firstName:
lastName:
profileImageUrl:
status: 0
creationDate:
closedDate:
developers: []
commenters: []
sourceLabel: {fileID: 2925787367677302117}
backgroundRenderer: {fileID: 6475105189842819349}
--- !u!1 &8030521001853960915
Expand Down Expand Up @@ -1834,6 +2097,13 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: c0de5b72e47d86a4a812675c2e30c2b4, type: 3}
m_Name:
m_EditorClassIdentifier:
content:
source: 0
id: 0
userName:
firstName:
lastName:
profileImageUrl:
profileImageRenderer: {fileID: 173300850093514634}
userNameLabel: {fileID: 856870972607805465}
--- !u!1 &8466726778041815642
Expand Down Expand Up @@ -2006,7 +2276,7 @@ BoxCollider:
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 2
m_Size: {x: 0.3, y: 0.2, z: 0.01}
m_Size: {x: 0.3, y: 0.2, z: 0.02}
m_Center: {x: 0, y: 0, z: 0}
--- !u!114 &3264034768150556465
MonoBehaviour:
Expand Down
Loading