Skip to content
GitLab
Projects
Groups
Snippets
/
Help
Help
Support
Community forum
Keyboard shortcuts
?
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
Menu
Open sidebar
OCSR
ChAOS
Commits
7a0f2a61
Commit
7a0f2a61
authored
Mar 06, 2020
by
ATREVI Dieudonne
Browse files
small bug fixed
parent
79057b74
Changes
4
Hide whitespace changes
Inline
Side-by-side
Assets/Scene/startSc.unity
View file @
7a0f2a61
No preview for this file type
Assets/Scripts/Menu/CommandLineParser.cs
View file @
7a0f2a61
...
...
@@ -101,4 +101,4 @@ public class CommandLineParser
}
}
#
endregion
}
}
\ No newline at end of file
Assets/Scripts/Menu/MenuManager.cs
View file @
7a0f2a61
...
...
@@ -44,7 +44,7 @@ public class MenuManager : MonoBehaviour
Dropdown
configFilesMenu
;
// GUI object to select the scenario
GameObject
menu
;
// the menu gameObject
GameObject
panel
;
// the panel gameObject
GameObject
configPanel
,
wall
;
// the panel to set the config parameters
GameObject
configPanel
;
// the panel to set the config parameters
LoadEnv
env
;
/// <summary>
...
...
@@ -58,7 +58,6 @@ public class MenuManager : MonoBehaviour
menu
=
GameObject
.
FindGameObjectWithTag
(
"Menu"
);
panel
=
GameObject
.
FindGameObjectWithTag
(
"Panel"
);
configPanel
=
GameObject
.
FindGameObjectWithTag
(
"configPanel"
);
wall
=
GameObject
.
FindGameObjectWithTag
(
"Obst"
);
obstReader
=
new
ObstaclesReader
();
...
...
@@ -67,7 +66,7 @@ public class MenuManager : MonoBehaviour
configFilesMenu
.
options
.
Clear
();
Time
.
timeScale
=
0
;
//CheckCommandLine(); // Fab:
D
oesn't work when i tested. I call it in the LoadEnv start and it works
//CheckCommandLine(); // Fab:
It d
oesn't work when i tested. I call it in the LoadEnv start and it works
}
/// <summary>
...
...
@@ -119,9 +118,9 @@ public class MenuManager : MonoBehaviour
env
=
gameObject
.
GetComponent
<
LoadEnv
>();
env
.
loadScenario
(
ConfigReader
.
trajectoriesDir
);
ConfigReader
.
camResolution
=
CommandLine
.
GetCamResolution
();
//
ConfigReader.camResolution = CommandLine.GetCamResolution();
panel
.
SetActive
(
false
);
menu
.
SetActive
(
false
);
configPanel
.
SetActive
(
false
);
Time
.
timeScale
=
1
;
...
...
Scenarios/ExampleFollow.xml
View file @
7a0f2a61
...
...
@@ -8,13 +8,13 @@
<rotation
x=
"0"
y=
"0"
z=
"0"
/>
</env_stageInfos>
<cam>
<position
x=
"-2
1
"
y=
"
0
"
z=
"5"
/>
<rotation
x=
"
2
0.0
9134"
y=
"9.090955E-07"
z=
"259.4649
"
/>
<position
x=
"-2
8
"
y=
"
-3
"
z=
"5"
/>
<rotation
x=
"
3
0.0
000076"
y=
"0"
z=
"90
"
/>
<lookAtAgent
agentID=
"-1"
/>
<followAgent
agentID=
"0"
followOnX=
"true"
followOnY=
"false"
/>
<CamResolution
x=
"-1"
y=
"-1"
/>
</cam>
<recording
start=
"
0
"
end=
"
0
"
framerate=
"15"
>
<recording
start=
"
1
"
end=
"
3
"
framerate=
"15"
>
<saveDir>
/home/fabrice/Documents/OCSR/chaos/output2/
</saveDir>
<savedData
ImgOriginal=
"true"
ImgSegmentation=
"false"
ImgCategories=
"false"
ImgDepth=
"false"
ImgNormals=
"false"
ImgOpticalFlow=
"false"
BodyBoundingBoxes=
"false"
HeadBoundingBoxes=
"false"
/>
</recording>
...
...
Write
Preview
Supports
Markdown
0%
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment