diff --git a/Assets/MemoryBox/arScene/Scripts/Memstone.cs b/Assets/MemoryBox/arScene/Scripts/Memstone.cs
index 3f42abd718f46a7965b25532c3230cfdd18d55f6..be99e24ace98e0390c259b9e5f3865184be242ae 100644
--- a/Assets/MemoryBox/arScene/Scripts/Memstone.cs
+++ b/Assets/MemoryBox/arScene/Scripts/Memstone.cs
@@ -12,7 +12,7 @@ namespace MemoryBox.arScene.Scripts
public float Latitude;
public float Longitude;
- public User User;
+ public UserGps UserGps;
public DebugText Logger;
@@ -24,7 +24,7 @@ namespace MemoryBox.arScene.Scripts
{
// if this is placed through the editor we need to add it to the user
// User is empty if this gets created dynamically
- User.MemoryObjects.Add(this);
+ UserGps.MemoryObjects.Add(this);
}
// Update is called once per frame
@@ -66,7 +66,7 @@ namespace MemoryBox.arScene.Scripts
public void UpdatePosition()
{
- UpdatePosition(User.GetLocationInfo());
+ UpdatePosition(UserGps.GetLocationInfo());
}
public void UpdatePosition(GpSdata userGps)
diff --git a/Assets/MemoryBox/arScene/Scripts/ObjectFactory.cs b/Assets/MemoryBox/arScene/Scripts/ObjectFactory.cs
index 02d05b41ade92474fb5ca7a4ba78dad44db01e93..fa37f0505af7643330f3c730bc25bf6791eddf35 100644
--- a/Assets/MemoryBox/arScene/Scripts/ObjectFactory.cs
+++ b/Assets/MemoryBox/arScene/Scripts/ObjectFactory.cs
@@ -5,7 +5,7 @@ namespace MemoryBox.arScene.Scripts
{
public class ObjectFactory : MonoBehaviour
{
- public User User;
+ public UserGps UserGps;
public DebugText Logger;
public void AddMemstone(string name, float latitude, float longitude, Mesh mesh, Material material)
@@ -15,7 +15,7 @@ namespace MemoryBox.arScene.Scripts
var memComponent = memObject.AddComponent<Memstone>();
memComponent.Latitude = latitude;
memComponent.Longitude = longitude;
- memComponent.User = User;
+ memComponent.UserGps = UserGps;
memComponent.Logger = Logger;
// todo altitude? maybe use GPSdata as datatype
diff --git a/Assets/MemoryBox/arScene/Scripts/User.cs b/Assets/MemoryBox/arScene/Scripts/UserGps.cs
similarity index 97%
rename from Assets/MemoryBox/arScene/Scripts/User.cs
rename to Assets/MemoryBox/arScene/Scripts/UserGps.cs
index 06b86ec17ece21837267228a19deb6606f3f3a13..bc258c1d7ddad909d6ee913a65a84534010d03ac 100644
--- a/Assets/MemoryBox/arScene/Scripts/User.cs
+++ b/Assets/MemoryBox/arScene/Scripts/UserGps.cs
@@ -10,9 +10,8 @@ namespace MemoryBox.arScene.Scripts
* Currently only GPS and its update mechanism live here.
* TODO What else can we add?
*/
- public class User : MonoBehaviour
+ public class UserGps : MonoBehaviour
{
- public DebugText Logger;
public GpSdata GpSdata;
private Boolean _gpsStarted;
diff --git a/Assets/MemoryBox/arScene/Scripts/User.cs.meta b/Assets/MemoryBox/arScene/Scripts/UserGps.cs.meta
similarity index 100%
rename from Assets/MemoryBox/arScene/Scripts/User.cs.meta
rename to Assets/MemoryBox/arScene/Scripts/UserGps.cs.meta
diff --git a/Assets/MemoryBox/arScene/arScene.unity b/Assets/MemoryBox/arScene/arScene.unity
index 411c436d3477d306c08fac0db14c8c51b8642279..ac6a2f24a1f81783d48a30ce91e5a1ae651b3d2c 100644
--- a/Assets/MemoryBox/arScene/arScene.unity
+++ b/Assets/MemoryBox/arScene/arScene.unity
@@ -833,6 +833,7 @@ RectTransform:
- {fileID: 1917059639}
- {fileID: 390057442}
- {fileID: 642231144}
+ - {fileID: 606266133}
m_Father: {fileID: 0}
m_RootOrder: 9
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
@@ -3054,7 +3055,7 @@ GameObject:
- component: {fileID: 606266133}
- component: {fileID: 606266132}
m_Layer: 0
- m_Name: User
+ m_Name: UserGps
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
@@ -3071,7 +3072,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: aa5e4e393fa2cdc4a92ecd3e82891305, type: 3}
m_Name:
m_EditorClassIdentifier:
- Logger: {fileID: 1167427449}
--- !u!4 &606266133
Transform:
m_ObjectHideFlags: 0
@@ -3079,11 +3079,11 @@ Transform:
m_PrefabInternal: {fileID: 0}
m_GameObject: {fileID: 606266131}
m_LocalRotation: {x: -0, y: -0, z: -0, w: 1}
- m_LocalPosition: {x: -285.3286, y: -696.16724, z: 8.16}
+ m_LocalPosition: {x: -362.15, y: -642.33, z: -5.84}
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
- m_Father: {fileID: 2143593087}
- m_RootOrder: 2
+ m_Father: {fileID: 194651075}
+ m_RootOrder: 3
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &619437919
GameObject:
@@ -4378,7 +4378,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
Latitude: 52.55301
Longitude: 13.40355
- User: {fileID: 606266132}
+ UserGps: {fileID: 0}
Logger: {fileID: 1167427449}
--- !u!1 &900807304
GameObject:
@@ -5482,7 +5482,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
Latitude: 52.43355
Longitude: 13.3631
- User: {fileID: 606266132}
+ UserGps: {fileID: 0}
Logger: {fileID: 1167427449}
--- !u!1 &1255785230
GameObject:
@@ -6048,7 +6048,7 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 2868ee2241426d74cab54df7dec06227, type: 3}
m_Name:
m_EditorClassIdentifier:
- User: {fileID: 606266132}
+ UserGps: {fileID: 0}
Logger: {fileID: 1167427449}
--- !u!4 &1373830367
Transform:
@@ -6355,7 +6355,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
Latitude: 52.52625
Longitude: 13.40055
- User: {fileID: 606266132}
+ UserGps: {fileID: 0}
Logger: {fileID: 1167427449}
--- !u!1 &1444983096
GameObject:
@@ -7307,7 +7307,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
Latitude: 52.55314
Longitude: 13.40363
- User: {fileID: 606266132}
+ UserGps: {fileID: 0}
Logger: {fileID: 1167427449}
--- !u!1 &1624793990
GameObject:
@@ -7621,7 +7621,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
Latitude: 52.43353
Longitude: 13.36297
- User: {fileID: 606266132}
+ UserGps: {fileID: 0}
Logger: {fileID: 1167427449}
--- !u!1 &1666448631
GameObject:
@@ -9831,7 +9831,6 @@ Transform:
m_Children:
- {fileID: 629051739}
- {fileID: 1373830367}
- - {fileID: 606266133}
m_Father: {fileID: 0}
m_RootOrder: 10
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}