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

Merge World in a miniature feature into develop #269

Open
wants to merge 53 commits into
base: develop
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
53 commits
Select commit Hold shift + click to select a range
ff87e56
Added Stub classes for issue #217
danvonk Jun 15, 2021
f75e6d6
Added methods for issue #217
danvonk Jun 15, 2021
e013118
Got rid of interface class
danvonk Jun 23, 2021
cd7a835
Minimap Prefab
danvonk Jun 23, 2021
c24ced2
Got MinimapConfigurationWindow working
danvonk Jun 23, 2021
c13dd3c
Minimap resizing works
danvonk Jun 23, 2021
e8ed9fd
MiniObjectManager
SzalonyNiemiec Jun 24, 2021
cc37641
Update MiniObjectManager.cs
SzalonyNiemiec Jun 24, 2021
4bc74db
TestScene and comments
SzalonyNiemiec Jun 24, 2021
8ed921f
track rotation
SzalonyNiemiec Jun 24, 2021
280a55d
Update MiniObjectManagerTestScene.unity
SzalonyNiemiec Jun 24, 2021
d5daa9e
Cleaned up Minimap (New) prefab
danvonk Jun 24, 2021
131a25d
Updated Handle logic
danvonk Jun 24, 2021
ebab8c9
Hotfix on handle logic
danvonk Jun 25, 2021
dcff619
Removed issueSelectionUI
danvonk Jun 25, 2021
dc5b9c8
Merge pull request #220 from rwth-acis/feature/minimap-positioning
danvonk Jun 25, 2021
789313c
Merge branch 'WIM/MiniObjectManager' into World-in-a-Miniature
SzalonyNiemiec Jun 25, 2021
14aef53
absoluteminimumworkingexample
SzalonyNiemiec Jun 25, 2021
4615715
tie corners to map handle scaling
SzalonyNiemiec Jun 25, 2021
7b330fb
update
SzalonyNiemiec Jun 26, 2021
337c9f9
Update MinimapTestScene.unity
SzalonyNiemiec Jun 28, 2021
cf9663a
ScaleIndicator code changes
SzalonyNiemiec Jul 6, 2021
9ba2561
Update MinimapTestScene to incorporate scaleIndicator
SzalonyNiemiec Jul 6, 2021
bd99a01
Merge pull request #247 from rwth-acis/WIM/Feature/ScaleIndicator
danvonk Jul 8, 2021
2c13937
Mini Object Manager now scales in both directions
SzalonyNiemiec Jul 11, 2021
c7c8a47
Add Serializer/Synchronizer stubs
danvonk Jul 13, 2021
96c802c
Merge branch 'World-in-a-Miniature' of github.com:rwth-acis/VIAProMa …
danvonk Jul 13, 2021
2c6d1ad
Add Tracked Objects
SzalonyNiemiec Jul 15, 2021
d4d3a10
fixed logical error in GetMiniObjectTypeIndex
SzalonyNiemiec Jul 15, 2021
3abb491
Added callback mechanism to ResourceManager
danvonk Jul 16, 2021
6cc5403
Minimap automatically spawns items
danvonk Jul 16, 2021
1b7342a
Obj deletion on the minimap
danvonk Jul 16, 2021
a482bfa
Created scale object prefab
danvonk Jul 16, 2021
012e3eb
Clamped min size of minimap + added map legend controller
danvonk Jul 17, 2021
37a9143
Scaling fix
danvonk Jul 17, 2021
4a8d634
scale stick implementation
danvonk Jul 17, 2021
86c6362
Put minimap legend in the upper-right quadrant
danvonk Jul 17, 2021
1b42544
Removed some dead code from MiniObjMgr
danvonk Jul 17, 2021
56c02e8
Update Minimap prefab
danvonk Jul 17, 2021
d5524c5
Merge pull request #265 from rwth-acis/WIM/Feature/Integration
danvonk Jul 17, 2021
430b14d
Reverted to correct shelf size
danvonk Jul 17, 2021
915a12c
Added MinimapSynchronizer
danvonk Jul 17, 2021
3efad8b
Added MinimapSerializer
danvonk Jul 17, 2021
545eff6
Cleaned up unncessary code
danvonk Jul 17, 2021
97b15db
Clean up imports
danvonk Jul 17, 2021
f05fb0c
Added clamp for localPos
danvonk Jul 17, 2021
8279c85
Fixed ColorPicker for Minimap + Scale Indicator
danvonk Jul 18, 2021
6c56052
Removed unneeded MinimapVisuals class
danvonk Jul 18, 2021
709c05d
Added RequiresComponent annotation + cleaned up Controller
danvonk Jul 18, 2021
a577e5a
Change initialisation of MiniObjMgr
danvonk Jul 18, 2021
aeaa10a
Test Scene
danvonk Jul 18, 2021
462b006
Resolved merge conflict on Minimap Serializer/Synchronizer
danvonk Jul 18, 2021
49ca8ee
Merge branch 'WIM/Develop' into World-in-a-Miniature
danvonk Jul 18, 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
Prev Previous commit
Next Next commit
absoluteminimumworkingexample
  • Loading branch information
SzalonyNiemiec committed Jun 25, 2021
commit 14aef53d5f11356169f7f13ce54ba246b6f39c06
Original file line number Diff line number Diff line change
@@ -1,5 +1,35 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!1 &436973978960014333
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 1619886400005281179}
m_Layer: 0
m_Name: MaxCorner
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &1619886400005281179
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 436973978960014333}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: 0.2, y: 0.4, z: 0.2}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2573944507440689825}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &5957690038063948990
MonoBehaviour:
m_ObjectHideFlags: 0
Expand All @@ -15,6 +45,36 @@ MonoBehaviour:
minimap: {fileID: 0}
xAxis: 0
positiveEnd: 0
--- !u!1 &1826768373268364844
GameObject:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
serializedVersion: 6
m_Component:
- component: {fileID: 6766783999358799419}
m_Layer: 0
m_Name: MinCorner
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!4 &6766783999358799419
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1826768373268364844}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
m_LocalPosition: {x: -0.2, y: 0, z: -0.2}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 2573944507440689825}
m_RootOrder: 8
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &2730148870562430998
GameObject:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -410,6 +470,8 @@ Transform:
- {fileID: 8626758906047642873}
- {fileID: 3815399627602026374}
- {fileID: 987336592787547387}
- {fileID: 6766783999358799419}
- {fileID: 1619886400005281179}
m_Father: {fileID: 0}
m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
Expand Down Expand Up @@ -1117,22 +1179,16 @@ GameObject:
type: 3}
m_PrefabInstance: {fileID: 5067259849110336403}
m_PrefabAsset: {fileID: 0}
--- !u!4 &748183901768436583 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5490047062781262068, guid: 11d995b8e11de854ea727ee6c2b7a2dd,
type: 3}
m_PrefabInstance: {fileID: 5067259849110336403}
m_PrefabAsset: {fileID: 0}
--- !u!114 &4259373392027874870 stripped
--- !u!114 &3499438287157885112 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 9029383501023036837, guid: 11d995b8e11de854ea727ee6c2b7a2dd,
m_CorrespondingSourceObject: {fileID: 8557408190111697707, guid: 11d995b8e11de854ea727ee6c2b7a2dd,
type: 3}
m_PrefabInstance: {fileID: 5067259849110336403}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 1410eac1ae94b4d4492a09cc368e152c, type: 3}
m_Script: {fileID: 11500000, guid: 3389a362e69edab40931e61d104578e0, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &6528719999318814275 stripped
Expand All @@ -1147,18 +1203,24 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: cb937299bb55a8148a57952055fb5387, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!114 &3499438287157885112 stripped
--- !u!114 &4259373392027874870 stripped
MonoBehaviour:
m_CorrespondingSourceObject: {fileID: 8557408190111697707, guid: 11d995b8e11de854ea727ee6c2b7a2dd,
m_CorrespondingSourceObject: {fileID: 9029383501023036837, guid: 11d995b8e11de854ea727ee6c2b7a2dd,
type: 3}
m_PrefabInstance: {fileID: 5067259849110336403}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 0}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3389a362e69edab40931e61d104578e0, type: 3}
m_Script: {fileID: 11500000, guid: 1410eac1ae94b4d4492a09cc368e152c, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!4 &748183901768436583 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 5490047062781262068, guid: 11d995b8e11de854ea727ee6c2b7a2dd,
type: 3}
m_PrefabInstance: {fileID: 5067259849110336403}
m_PrefabAsset: {fileID: 0}
--- !u!1001 &6972505331588600734
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down Expand Up @@ -1341,15 +1403,15 @@ PrefabInstance:
m_RemovedComponents:
- {fileID: 4259211149287515302, guid: a6f149a2e097403449e4df3abf718cab, type: 3}
m_SourcePrefab: {fileID: 100100000, guid: a6f149a2e097403449e4df3abf718cab, type: 3}
--- !u!1 &7312726321947263818 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1692006749377442631, guid: a6f149a2e097403449e4df3abf718cab,
type: 3}
m_PrefabInstance: {fileID: 8216592072495624205}
m_PrefabAsset: {fileID: 0}
--- !u!4 &7312726321947697002 stripped
Transform:
m_CorrespondingSourceObject: {fileID: 1692006749377343335, guid: a6f149a2e097403449e4df3abf718cab,
type: 3}
m_PrefabInstance: {fileID: 8216592072495624205}
m_PrefabAsset: {fileID: 0}
--- !u!1 &7312726321947263818 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 1692006749377442631, guid: a6f149a2e097403449e4df3abf718cab,
type: 3}
m_PrefabInstance: {fileID: 8216592072495624205}
m_PrefabAsset: {fileID: 0}
32 changes: 28 additions & 4 deletions Frontend/VIAProMa/Assets/Scenes/MinimapTestScene.unity
Original file line number Diff line number Diff line change
Expand Up @@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 0.44657874, g: 0.49641258, b: 0.5748172, a: 1}
m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1}
m_UseRadianceAmbientProbe: 0
--- !u!157 &3
LightmapSettings:
Expand Down Expand Up @@ -600,7 +600,7 @@ PrefabInstance:
- target: {fileID: 937139078701923806, guid: b72229148ad3ea7408d7fbb34a35ea28,
type: 3}
propertyPath: m_Enabled
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 943790359340717537, guid: b72229148ad3ea7408d7fbb34a35ea28,
type: 3}
Expand Down Expand Up @@ -945,7 +945,7 @@ PrefabInstance:
- target: {fileID: 2228182898798395367, guid: b72229148ad3ea7408d7fbb34a35ea28,
type: 3}
propertyPath: m_Enabled
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 2298999904214481730, guid: b72229148ad3ea7408d7fbb34a35ea28,
type: 3}
Expand Down Expand Up @@ -2988,7 +2988,7 @@ PrefabInstance:
- target: {fileID: 8957528376169097140, guid: b72229148ad3ea7408d7fbb34a35ea28,
type: 3}
propertyPath: m_Enabled
value: 1
value: 0
objectReference: {fileID: 0}
- target: {fileID: 8973724346150544505, guid: b72229148ad3ea7408d7fbb34a35ea28,
type: 3}
Expand Down Expand Up @@ -3072,6 +3072,30 @@ PrefabInstance:
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: b72229148ad3ea7408d7fbb34a35ea28, type: 3}
--- !u!1 &312707210 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 4159086768605391003, guid: 87a8507dac1abea46bfdea52a4387540,
type: 3}
m_PrefabInstance: {fileID: 332873497}
m_PrefabAsset: {fileID: 0}
--- !u!114 &312707211
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 312707210}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 3b69e05e52dace140acf7d248c0d31d7, type: 3}
m_Name:
m_EditorClassIdentifier:
minCorner: {fileID: 0}
maxCorner: {fileID: 0}
minScale: 0
maxScale: 0
trackedObjects: []
miniObjects: []
--- !u!1001 &332873497
PrefabInstance:
m_ObjectHideFlags: 0
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,7 @@ public class MiniObjectManager : MonoBehaviour
[SerializeField] private GameObject maxCorner;
[SerializeField] private float minScale;
[SerializeField] private float maxScale;
[SerializeField] private float yOffset;
[SerializeField] private List<GameObject> trackedObjects;
[SerializeField] private List<GameObject> miniObjects;
private float currentScale;
Expand Down Expand Up @@ -91,6 +92,7 @@ void CalculateLocalTransform() {
private Vector3 TranslateIntoLocalCoordinates(Vector3 globalPos) {
Vector3 localPos = globalPos - globalCenter;
localPos = localPos * currentScale;
localPos.y += yOffset;
return localPos;
}
}
8 changes: 0 additions & 8 deletions Frontend/VIAProMa/Assets/Tests/Visualizations/Minimap.meta

This file was deleted.