MAJ terminée. Nous sommes passés en version 14.6.2 . Pour consulter les "releases notes" associées c'est ici :

https://about.gitlab.com/releases/2022/01/11/security-release-gitlab-14-6-2-released/
https://about.gitlab.com/releases/2022/01/04/gitlab-14-6-1-released/

Commit 51bc39b5 authored by ATREVI Dieudonne's avatar ATREVI Dieudonne
Browse files

merge dev branch into the local branch

parent 52823614
fileFormatVersion: 2
guid: 1846b4a6021d3ac449c7a6b24af5688f
timeCreated: 1452696482
licenseType: Free
DefaultImporter:
userData:
assetBundleName:
assetBundleVariant:
This diff is collapsed.
......@@ -46,8 +46,8 @@ public class MenuManager : MonoBehaviour
public GameObject panel; // the panel gameObject
GameObject controlPanel; // The play, pause and stop control panel
public GameObject configPanel; // the panel to set the config parameters
public GameObject topMenuPanel;
public GameObject slider;
public GameObject topMenuPanel; // the top menu panel
public GameObject slider; // Slider for the progress state bar
LoadEnv env; // Contain datas for the environnement
/// <summary>
......@@ -60,8 +60,10 @@ public class MenuManager : MonoBehaviour
menu = GameObject.FindGameObjectWithTag("Menu");
panel = GameObject.FindGameObjectWithTag("Panel");
controlPanel = GameObject.Find("/controlCanvas/buttonControlPanel");
controlPanel.SetActive(false);
slider = GameObject.Find("/controlCanvas/Slider");
slider.SetActive(false);
......@@ -78,10 +80,18 @@ public class MenuManager : MonoBehaviour
Time.timeScale = 0;
}
/// <summary>
/// Function to play the scenario
/// </summary>
public void Play()
{
Time.timeScale = 1;
}
/// <summary>
/// Function to pause the scenario
/// </summary>
public void Pause()
{
Time.timeScale = 0;
......
......@@ -58,6 +58,11 @@ public class ConfigManager : MonoBehaviour
PanelCamera.transform.Find("RotY").GetComponent<InputField>().text = camRot.y.ToString();
PanelCamera.transform.Find("RotZ").GetComponent<InputField>().text = camRot.z.ToString();
// Resolution
Vector2 camRes = ConfigReader.camResolution;
PanelCamera.transform.Find("W").GetComponent<InputField>().text = camRes.x.ToString();
PanelCamera.transform.Find("H").GetComponent<InputField>().text = camRes.y.ToString();
// Look At Agent
PanelCamera.transform.Find("LookAgentID").GetComponent<InputField>().text = ConfigReader.camLookAtTarget.ToString();
......@@ -120,6 +125,13 @@ public class ConfigManager : MonoBehaviour
ConfigReader.camRotation = camRot;
// Resolution
Vector2 camRes;
camRes.x = float.Parse(PanelCamera.transform.Find("W").GetComponent<InputField>().text);
camRes.y = float.Parse(PanelCamera.transform.Find("H").GetComponent<InputField>().text);
ConfigReader.camResolution = camRes;
// Look At Agent
ConfigReader.camLookAtTarget = int.Parse(PanelCamera.transform.Find("LookAgentID").GetComponent<InputField>().text);
......
......@@ -8,19 +8,19 @@
<rotation x="0" y="0" z="0" />
</env_stageInfos>
<cam>
<position x="-20" y="-3" z="5" />
<position x="-27.753" y="-3" z="5" />
<rotation x="30.00001" 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" width="-1" height="-1">
<recording start="1" end="4" framerate="15" width="-1" height="-1">
<saveImgOriginal record="true" quality="8" width="-1" height="-1" />
<saveImgSegmentation record="false" quality="8" width="-1" height="-1" />
<saveImgCategories record="false" quality="8" width="-1" height="-1" />
<saveImgDepth record="false" quality="8" width="-1" height="-1" minDepth="0" maxDepth="50" exponent="1" />
<saveImgNormals record="false" quality="8" width="-1" height="-1" />
<saveImgOpticalFlow record="false" quality="8" width="-1" height="-1" motionVector="false" />
<saveImgOpticalFlow record="true" quality="8" width="-1" height="-1" motionVector="false" />
<saveBodyBoundingBoxes record="false" />
<saveHeadBoundingBoxes record="false" />
<saveDir>./Output/</saveDir>
......
......@@ -9,12 +9,12 @@
</env_stageInfos>
<cam>
<position x="15" y="2" z="5" />
<rotation x="8.404327" y="-4.315208E-07" z="254.5271" />
<rotation x="6.938073" y="4.300358E-07" z="257.3217" />
<lookAtAgent agentID="22" />
<followAgent agentID="-1" followOnX="false" followOnY="false" />
<CamResolution x="-1" y="-1" />
</cam>
<recording start="1" end="10" framerate="15">
<saveDir>./Output/LookAt/</saveDir>
<recording start="0" end="0" framerate="15" width="-1" height="-1">
<saveImgOriginal record="true" quality="8" width="1" height="-1" />
<saveImgSegmentation record="true" quality="8" width="1920" height="1080" />
<saveImgCategories record="true" quality="8" width="1280" height="720" />
......@@ -23,6 +23,7 @@
<saveImgOpticalFlow record="true" quality="8" width="1080" height="1920" motionVector="false" />
<saveBodyBoundingBoxes record="true" />
<saveHeadBoundingBoxes record="true" />
<saveDir>./Output/LookAt/</saveDir>
</recording>
<AgentColorList />
</ConfigData>
\ No newline at end of file
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment