From 50bee1ddce797787e4681fb9e662044989516c1a Mon Sep 17 00:00:00 2001
From: Fabien Grzeskowiak <fabien.grzeskowiak@inria.fr>
Date: Wed, 19 Jun 2019 10:06:21 +0200
Subject: [PATCH] #12 path is now private and always set to
Configurations/config.xml
---
.../Scripts/Managers/MainManager.cs | 2 +-
Assets/Scenes/Tests/Sensors/lidarTests.unity | 110 +-----------------
.../config.xml | 0
config.xml => Configurations/config1.xml | 0
config1D.xml => Configurations/config1D.xml | 0
config2D.xml => Configurations/config2D.xml | 0
.../configJavad.xml | 0
.../configMulti.xml | 0
TrialTemplate.xml | 56 ---------
9 files changed, 7 insertions(+), 161 deletions(-)
rename configTestLidar.xml => Configurations/config.xml (100%)
rename config.xml => Configurations/config1.xml (100%)
rename config1D.xml => Configurations/config1D.xml (100%)
rename config2D.xml => Configurations/config2D.xml (100%)
rename configJavad.xml => Configurations/configJavad.xml (100%)
rename configMulti.xml => Configurations/configMulti.xml (100%)
delete mode 100644 TrialTemplate.xml
diff --git a/Assets/MainAssets/Scripts/Managers/MainManager.cs b/Assets/MainAssets/Scripts/Managers/MainManager.cs
index 2f8e6b4d..dae3af18 100644
--- a/Assets/MainAssets/Scripts/Managers/MainManager.cs
+++ b/Assets/MainAssets/Scripts/Managers/MainManager.cs
@@ -8,7 +8,7 @@ using UnityEngine.UI;
/// </summary>
public class MainManager : MonoBehaviour {
- public string configPath = "./config.xml";
+ private string configPath = "./Configurations/config.xml";
protected bool trialStarted;
protected bool isEndXP;
diff --git a/Assets/Scenes/Tests/Sensors/lidarTests.unity b/Assets/Scenes/Tests/Sensors/lidarTests.unity
index 1cf96254..2320572a 100644
--- a/Assets/Scenes/Tests/Sensors/lidarTests.unity
+++ b/Assets/Scenes/Tests/Sensors/lidarTests.unity
@@ -270,97 +270,6 @@ Transform:
m_Father: {fileID: 0}
m_RootOrder: 6
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
---- !u!1 &245658002
-GameObject:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- serializedVersion: 6
- m_Component:
- - component: {fileID: 245658003}
- - component: {fileID: 245658006}
- - component: {fileID: 245658005}
- - component: {fileID: 245658004}
- m_Layer: 0
- m_Name: wall1 (4)
- m_TagString: Wall
- m_Icon: {fileID: 0}
- m_NavMeshLayer: 0
- m_StaticEditorFlags: 0
- m_IsActive: 1
---- !u!4 &245658003
-Transform:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 245658002}
- m_LocalRotation: {x: 0.7071068, y: -0, z: -0, w: 0.7071068}
- m_LocalPosition: {x: 0, y: 1.5, z: 3.699}
- m_LocalScale: {x: 30, y: 0.10000005, z: 3}
- m_Children: []
- m_Father: {fileID: 2124144678}
- m_RootOrder: 16
- m_LocalEulerAnglesHint: {x: 90, y: 0, z: 0}
---- !u!65 &245658004
-BoxCollider:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 245658002}
- m_Material: {fileID: 0}
- m_IsTrigger: 0
- m_Enabled: 1
- serializedVersion: 2
- m_Size: {x: 0.99999994, y: 1.0000001, z: 1.0000002}
- m_Center: {x: 0, y: 0, z: 0}
---- !u!23 &245658005
-MeshRenderer:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 245658002}
- m_Enabled: 1
- m_CastShadows: 1
- m_ReceiveShadows: 1
- m_DynamicOccludee: 1
- m_MotionVectors: 1
- m_LightProbeUsage: 1
- m_ReflectionProbeUsage: 1
- m_RenderingLayerMask: 1
- m_RendererPriority: 0
- m_Materials:
- - {fileID: 2100000, guid: 825cfc62f9f91380c8f21c81a9ba564e, type: 2}
- m_StaticBatchInfo:
- firstSubMesh: 0
- subMeshCount: 0
- m_StaticBatchRoot: {fileID: 0}
- m_ProbeAnchor: {fileID: 0}
- m_LightProbeVolumeOverride: {fileID: 0}
- m_ScaleInLightmap: 1
- m_PreserveUVs: 0
- m_IgnoreNormalsForChartDetection: 0
- m_ImportantGI: 0
- m_StitchLightmapSeams: 0
- 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
---- !u!33 &245658006
-MeshFilter:
- m_ObjectHideFlags: 0
- m_CorrespondingSourceObject: {fileID: 0}
- m_PrefabInstance: {fileID: 0}
- m_PrefabAsset: {fileID: 0}
- m_GameObject: {fileID: 245658002}
- m_Mesh: {fileID: 10202, guid: 0000000000000000e000000000000000, type: 0}
--- !u!1001 &718258144
PrefabInstance:
m_ObjectHideFlags: 0
@@ -406,7 +315,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4733032602104108, guid: 510fa4e9b95fe56458354a444ee1782e, type: 3}
propertyPath: m_RootOrder
- value: 2
+ value: 3
objectReference: {fileID: 0}
- target: {fileID: 4733032602104108, guid: 510fa4e9b95fe56458354a444ee1782e, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -523,7 +432,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 4865729094210728, guid: fb73397d3f04b34449b1f11a4cb4f10a, type: 3}
propertyPath: m_RootOrder
- value: 4
+ value: 5
objectReference: {fileID: 0}
- target: {fileID: 4865729094210728, guid: fb73397d3f04b34449b1f11a4cb4f10a, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -589,7 +498,7 @@ PrefabInstance:
- target: {fileID: 6706874436810338313, guid: 2f9db8af8376bea5186c6d7c1c7b58d6,
type: 3}
propertyPath: m_RootOrder
- value: 0
+ value: 1
objectReference: {fileID: 0}
- target: {fileID: 6706874436810338313, guid: 2f9db8af8376bea5186c6d7c1c7b58d6,
type: 3}
@@ -675,7 +584,7 @@ Transform:
m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: []
m_Father: {fileID: 0}
- m_RootOrder: 3
+ m_RootOrder: 4
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!114 &1271338248
MonoBehaviour:
@@ -788,12 +697,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: 24891f120803b294db4910f86c111155, type: 3}
m_Name:
m_EditorClassIdentifier:
---- !u!4 &2124144678 stripped
-Transform:
- m_CorrespondingSourceObject: {fileID: 6070563075698876070, guid: 2f9db8af8376bea5186c6d7c1c7b58d6,
- type: 3}
- m_PrefabInstance: {fileID: 1071126366}
- m_PrefabAsset: {fileID: 0}
--- !u!64 &682170474849220785
MeshCollider:
m_ObjectHideFlags: 0
@@ -897,7 +800,7 @@ PrefabInstance:
objectReference: {fileID: 0}
- target: {fileID: 400102, guid: 25bc54dbedb9aa64b8832d82c6944807, type: 3}
propertyPath: m_RootOrder
- value: 1
+ value: 2
objectReference: {fileID: 0}
- target: {fileID: 400102, guid: 25bc54dbedb9aa64b8832d82c6944807, type: 3}
propertyPath: m_LocalEulerAnglesHint.x
@@ -1338,7 +1241,7 @@ Transform:
- {fileID: 8711787014871231494}
- {fileID: 8711961178337518248}
m_Father: {fileID: 0}
- m_RootOrder: 5
+ m_RootOrder: 0
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!4 &8932478282534353934
Transform:
@@ -1419,7 +1322,6 @@ MonoBehaviour:
m_Script: {fileID: 11500000, guid: d898cf07e683fae63914f2e2a83b1ecc, type: 3}
m_Name:
m_EditorClassIdentifier:
- configPath: ./configTestLidar.xml
--- !u!1 &8934410210958763984
GameObject:
m_ObjectHideFlags: 0
diff --git a/configTestLidar.xml b/Configurations/config.xml
similarity index 100%
rename from configTestLidar.xml
rename to Configurations/config.xml
diff --git a/config.xml b/Configurations/config1.xml
similarity index 100%
rename from config.xml
rename to Configurations/config1.xml
diff --git a/config1D.xml b/Configurations/config1D.xml
similarity index 100%
rename from config1D.xml
rename to Configurations/config1D.xml
diff --git a/config2D.xml b/Configurations/config2D.xml
similarity index 100%
rename from config2D.xml
rename to Configurations/config2D.xml
diff --git a/configJavad.xml b/Configurations/configJavad.xml
similarity index 100%
rename from configJavad.xml
rename to Configurations/configJavad.xml
diff --git a/configMulti.xml b/Configurations/configMulti.xml
similarity index 100%
rename from configMulti.xml
rename to Configurations/configMulti.xml
diff --git a/TrialTemplate.xml b/TrialTemplate.xml
deleted file mode 100644
index e2df55f8..00000000
--- a/TrialTemplate.xml
+++ /dev/null
@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="utf-8"?>
-<Trial xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance">
- <scene meshName="Kerlann">
- <Position x="0" y="0" z="0" />
- <Rotation x="0" y="0" z="0" />
- <recordingFile>Output_{USER}_{ITT}.csv</recordingFile>
- <endingConditions>
- <condition parameter="time" test="greater" value="60" />
- </endingConditions>
- </scene>
- <player>
- <TrialRegularPlayer mesh="RegPlayer" radius="0.33">
- <Position x="0" y="0" z="0" />
- <Rotation x="0" y="0" z="0" />
- <controlLaw>
- <LawControllerSpeedAngle speedCurrent="0" speedDefault="1.33" speedVariation="0.5" angularSpeed="30" accelerationMax="0.8" timeBeforeControl="0" />
- </controlLaw>
- </TrialRegularPlayer>
- </player>
- <screenRecorder record="false" timeToStart="0" timeToStop="0" framerate="25">
- <saveDir>./Output/</saveDir>
- </screenRecorder>
- <SavedDataList>
- <data>
- <DataUnitySpatial />
- </data>
- <data>
- <DataDeviceState />
- </data>
- </SavedDataList>
- <agents>
- <agent>
- <TrialRegularAgent mesh="m002" radius="0.33" visualVariation="0" animationOffset="0" heightOffset="0">
- <Position x="0" y="0" z="0" />
- <Rotation x="0" y="0" z="0" />
- <controlLaw>
- <LawStanding animationType="0" />
- </controlLaw>
- <controlSim>
- <RVOconfig SimulationID="0" neighborDist="5" maxNeighbors="3" timeHorizon="2" timeHorizonObst="0" radius="0.33" maxSpeed="2" />
- </controlSim>
- </TrialRegularAgent>
- </agent>
- <agent>
- <TrialRegularAgent mesh="m002" radius="0.33" visualVariation="0" animationOffset="0" heightOffset="0">
- <Position x="0" y="0" z="0" />
- <Rotation x="0" y="0" z="0" />
- <controlLaw>
- <LawFileData timeColumn="1" xColumn="0" yColumn="0" zColumn="0">
- <dataFile>file.dat</dataFile>
- </LawFileData>
- </controlLaw>
- </TrialRegularAgent>
- </agent>
- </agents>
-</Trial>
\ No newline at end of file
--
GitLab