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 16066d64 authored by ATREVI Dieudonne's avatar ATREVI Dieudonne
Browse files

New features on the interface

- Add controls buttons (play and pause)
- Add Top menu (Setting, Help, About)
- Add Load bar (not active right now)
- Add Toggle button for record boolean
parent 0ccebd89
fileFormatVersion: 2
guid: 9dfa86bcb502323649fcc1af8f07660a
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: d7fd7eb9a38319183ae98468395b7b5f
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: 87d4c8a46d833851eadbf4aabdcce7dd
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
fileFormatVersion: 2
guid: a92a0b4471c106236ab628451e6d08e2
TextureImporter:
internalIDToNameTable: []
externalObjects: {}
serializedVersion: 10
mipmaps:
mipMapMode: 0
enableMipMap: 0
sRGBTexture: 1
linearTexture: 0
fadeOut: 0
borderMipMap: 0
mipMapsPreserveCoverage: 0
alphaTestReferenceValue: 0.5
mipMapFadeDistanceStart: 1
mipMapFadeDistanceEnd: 3
bumpmap:
convertToNormalMap: 0
externalNormalMap: 0
heightScale: 0.25
normalMapFilter: 0
isReadable: 0
streamingMipmaps: 0
streamingMipmapsPriority: 0
grayScaleToAlpha: 0
generateCubemap: 6
cubemapConvolution: 0
seamlessCubemap: 0
textureFormat: 1
maxTextureSize: 2048
textureSettings:
serializedVersion: 2
filterMode: -1
aniso: -1
mipBias: -100
wrapU: 1
wrapV: 1
wrapW: 1
nPOTScale: 0
lightmap: 0
compressionQuality: 50
spriteMode: 1
spriteExtrude: 1
spriteMeshType: 1
alignment: 0
spritePivot: {x: 0.5, y: 0.5}
spritePixelsToUnits: 100
spriteBorder: {x: 0, y: 0, z: 0, w: 0}
spriteGenerateFallbackPhysicsShape: 1
alphaUsage: 1
alphaIsTransparency: 1
spriteTessellationDetail: -1
textureType: 8
textureShape: 1
singleChannelComponent: 0
maxTextureSizeSet: 0
compressionQualitySet: 0
textureFormatSet: 0
platformSettings:
- serializedVersion: 3
buildTarget: DefaultTexturePlatform
maxTextureSize: 2048
resizeAlgorithm: 0
textureFormat: -1
textureCompression: 1
compressionQuality: 50
crunchedCompression: 0
allowsAlphaSplitting: 0
overridden: 0
androidETC2FallbackOverride: 0
forceMaximumCompressionQuality_BC6H_BC7: 0
spriteSheet:
serializedVersion: 2
sprites: []
outline: []
physicsShape: []
bones: []
spriteID: 5e97eb03825dee720800000000000000
internalID: 0
vertices: []
indices:
edges: []
weights: []
secondaryTextures: []
spritePackingTag:
pSDRemoveMatte: 0
pSDShowRemoveMatteOption: 0
userData:
assetBundleName:
assetBundleVariant:
......@@ -405,7 +405,10 @@ public class LoadEnv : MonoBehaviour
// p or P => Load the param setting panel
if (Input.GetKeyDown("p"))
{
menuM.configParams();
if((menuM.panel.activeSelf==false)&&(menuM.configPanel.activeSelf==false))
{
menuM.configParams();
}
}
}
......
......@@ -43,8 +43,11 @@ public class MenuManager : MonoBehaviour
Camera cam; // the main camera
Dropdown configFilesMenu; // GUI object to select the scenario
GameObject menu; // the menu gameObject
GameObject panel; // the panel gameObject
GameObject configPanel; // the panel to set the config parameters
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;
LoadEnv env; // Contain datas for the environnement
/// <summary>
......@@ -57,6 +60,14 @@ 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);
topMenuPanel = GameObject.Find("/controlCanvas/fakePanel");
topMenuPanel.SetActive(false);
configPanel = GameObject.FindGameObjectWithTag("configPanel");
obstReader = new ObstaclesReader();
......@@ -66,7 +77,15 @@ public class MenuManager : MonoBehaviour
configFilesMenu.options.Clear();
Time.timeScale = 0;
//CheckCommandLine(); // Fab: It doesn't work when i tested. I call it in the LoadEnv start and it works
}
public void Play()
{
Time.timeScale = 1;
}
public void Pause()
{
Time.timeScale = 0;
}
/// <summary>
......@@ -176,6 +195,10 @@ public class MenuManager : MonoBehaviour
env.loadScenario(ConfigReader.trajectoriesDir);
panel.SetActive(false);
configPanel.SetActive(false);
controlPanel.SetActive(true);
topMenuPanel.SetActive(true);
slider.SetActive(true);
GameObject.Find("/controlCanvas/fakePanel/topMenu").SetActive(false);
}
/// <summary>
......@@ -183,16 +206,15 @@ public class MenuManager : MonoBehaviour
/// </summary>
public void toogleMenu()
{
panel.SetActive(!panel.activeSelf);
// Pause the scenario when showing the menu
if(Time.timeScale == 1)
if(panel.activeSelf==false)
{
panel.SetActive(!panel.activeSelf);
controlPanel.SetActive(!panel.activeSelf);
topMenuPanel.SetActive(!panel.activeSelf);
slider.SetActive(!panel.activeSelf);
// Pause the scenario while showing the menu
Time.timeScale = 0;
}
else{
Time.timeScale = 1;
}
}
/// <summary>
......@@ -202,6 +224,9 @@ public class MenuManager : MonoBehaviour
{
Time.timeScale = 0; // Pause the scenario when modifying the parameters
configPanel.SetActive(!configPanel.activeSelf);
controlPanel.SetActive(!controlPanel.activeSelf);
slider.SetActive(!slider.activeSelf);
topMenuPanel.SetActive(false);
ConfigManager.showConfig();
}
......@@ -215,6 +240,9 @@ public class MenuManager : MonoBehaviour
ConfigReader.LoadConfig(configPath);
env.updateScenario(ConfigReader.trajectoriesDir);
controlPanel.SetActive(!controlPanel.activeSelf);
slider.SetActive(!panel.activeSelf);
topMenuPanel.SetActive(true);
Time.timeScale = 1; // start after the parameters modification
}
......
......@@ -36,7 +36,7 @@ using SFB;
public class ConfigManager : MonoBehaviour
{
// GameObject to store differents panel in the canvas
public static GameObject PanelCamera, PanelRecording, PanelStageEnv;
public static GameObject PanelCamera, PanelRecording, PanelTimeSetting, PanelStageEnv;
public static InputField LookAgent, FollowAgent;
/// <summary>
......@@ -68,12 +68,14 @@ public class ConfigManager : MonoBehaviour
/// Get Recording parameters
// Duration
PanelRecording = GameObject.Find("/ConfigMenu/Panel/PanelRecording/Button/Panel");
PanelRecording.transform.Find("startVal").GetComponent<InputField>().text = ConfigReader.recordingStart.ToString();
PanelRecording.transform.Find("endVal").GetComponent<InputField>().text = ConfigReader.recordingEnd.ToString();
PanelRecording = GameObject.Find("/ConfigMenu/Panel/PanelRecording/Button/Panel");
PanelTimeSetting = GameObject.Find("/ConfigMenu/Panel/PanelRecording/Button/Panel/timeSettingPanel");
PanelRecording.transform.Find("recordVal").GetComponent<Toggle>().isOn = ConfigReader.recording;
PanelTimeSetting.transform.Find("startVal").GetComponent<InputField>().text = ConfigReader.recordingStart.ToString();
PanelTimeSetting.transform.Find("endVal").GetComponent<InputField>().text = ConfigReader.recordingEnd.ToString();
// FPS
PanelRecording.transform.Find("fps").GetComponent<InputField>().text = ConfigReader.recordingFramerate.ToString();
PanelTimeSetting.transform.Find("fps").GetComponent<InputField>().text = ConfigReader.recordingFramerate.ToString();
// Save Path
PanelRecording.transform.Find("savedirVal").GetComponent<Text>().text = ConfigReader.recordingSaveDir;
......@@ -129,12 +131,21 @@ public class ConfigManager : MonoBehaviour
//// Set Recording parameters
// Duration
PanelRecording = GameObject.Find("/ConfigMenu/Panel/PanelRecording/Button/Panel");
ConfigReader.recordingStart = int.Parse(PanelRecording.transform.Find("startVal").GetComponent<InputField>().text);
ConfigReader.recordingEnd = int.Parse(PanelRecording.transform.Find("endVal").GetComponent<InputField>().text);
PanelTimeSetting = GameObject.Find("/ConfigMenu/Panel/PanelRecording/Button/Panel/timeSettingPanel");
if(PanelRecording.transform.Find("recordVal").GetComponent<Toggle>().isOn)
{
ConfigReader.recordingStart = int.Parse(PanelTimeSetting.transform.Find("startVal").GetComponent<InputField>().text);
ConfigReader.recordingEnd = int.Parse(PanelTimeSetting.transform.Find("endVal").GetComponent<InputField>().text);
// FPS
ConfigReader.recordingFramerate = int.Parse(PanelTimeSetting.transform.Find("fps").GetComponent<InputField>().text);
}
else{
ConfigReader.recordingStart = 0;
ConfigReader.recordingEnd = 0;
}
// FPS
ConfigReader.recordingFramerate = int.Parse(PanelRecording.transform.Find("fps").GetComponent<InputField>().text);
// Save Datas
ConfigReader.recordOriginalImg = PanelRecording.transform.Find("imgOri").GetComponent<Toggle>().isOn;
ConfigReader.recordSegmentationImg = PanelRecording.transform.Find("imgSeg").GetComponent<Toggle>().isOn;
......@@ -253,5 +264,14 @@ public class ConfigManager : MonoBehaviour
}
return path;
}
}
/// <summary>
/// Method to check if the record toggle is on or off and display the time setting parameters accordingly.
/// </summary>
public void checkRecordToggle(){
PanelRecording = GameObject.Find("/ConfigMenu/Panel/PanelRecording/Button/Panel");
PanelTimeSetting = GameObject.Find("/ConfigMenu/Panel/PanelRecording/Button/Panel/timeSettingPanel");
PanelTimeSetting.SetActive(PanelRecording.transform.Find("recordVal").GetComponent<Toggle>().isOn);
}
}
\ No newline at end of file
......@@ -8,7 +8,7 @@
<rotation x="0" y="0" z="0" />
</env_stageInfos>
<cam>
<position x="-38" y="-3" z="5" />
<position x="-36.31199" y="-3" z="5" />
<rotation x="30.00001" y="0" z="90" />
<lookAtAgent agentID="-1" />
<followAgent agentID="0" followOnX="true" followOnY="false" />
......@@ -19,4 +19,4 @@
<savedData ImgOriginal="true" ImgSegmentation="false" ImgCategories="false" ImgDepth="false" ImgNormals="false" ImgOpticalFlow="false" BodyBoundingBoxes="false" HeadBoundingBoxes="false" />
</recording>
<AgentColorList />
</ConfigData>
</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