Browse Source

exposed xrot on recorder

main
Cailean Finn 8 months ago
parent
commit
a2b976a9f1
  1. 2
      Assets/10_URPEquirectangularCamera/CubeMapMat.mat
  2. 7
      Assets/6_Scenes/Beep.unity
  3. 8
      Assets/7_Scripts/Recording/RenderText.cs
  4. 2
      Assets/ML-Agents/Timers/Beep_timers.json

2
Assets/10_URPEquirectangularCamera/CubeMapMat.mat

@ -108,7 +108,7 @@ Material:
- _DivideY: 3.5 - _DivideY: 3.5
- _DstBlend: 0 - _DstBlend: 0
- _EnvironmentReflections: 1 - _EnvironmentReflections: 1
- _EquiRotation: 0.75 - _EquiRotation: 0.875
- _EquiRotationY: 5.23 - _EquiRotationY: 5.23
- _FOVScale_X: 0.9 - _FOVScale_X: 0.9
- _FOVScale_Y: 0.3 - _FOVScale_Y: 0.3

7
Assets/6_Scenes/Beep.unity

@ -38,7 +38,7 @@ RenderSettings:
m_ReflectionIntensity: 1 m_ReflectionIntensity: 1
m_CustomReflection: {fileID: 0} m_CustomReflection: {fileID: 0}
m_Sun: {fileID: 0} m_Sun: {fileID: 0}
m_IndirectSpecularColor: {r: 3833.7505, g: 3094.2192, b: 2949.6174, a: 1} m_IndirectSpecularColor: {r: 3834.518, g: 3088.7231, b: 2929.215, a: 1}
m_UseRadianceAmbientProbe: 0 m_UseRadianceAmbientProbe: 0
--- !u!157 &3 --- !u!157 &3
LightmapSettings: LightmapSettings:
@ -15731,7 +15731,7 @@ PrefabInstance:
- target: {fileID: 933460690440954431, guid: 547378ae4bbaf4b4ba24e3243bcd0838, - target: {fileID: 933460690440954431, guid: 547378ae4bbaf4b4ba24e3243bcd0838,
type: 3} type: 3}
propertyPath: m_IsActive propertyPath: m_IsActive
value: 1 value: 0
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 8431763121321237345, guid: 547378ae4bbaf4b4ba24e3243bcd0838, - target: {fileID: 8431763121321237345, guid: 547378ae4bbaf4b4ba24e3243bcd0838,
type: 3} type: 3}
@ -18089,8 +18089,9 @@ MonoBehaviour:
m_ProjectionType: 3 m_ProjectionType: 3
m_Record: 0 m_Record: 0
m_RecordOnAwake: 0 m_RecordOnAwake: 0
m_RecordedFrames: 0 m_RecordedFrames: 1
material: {fileID: 2100000, guid: 0fe1464735a8dbc4ab5d663da266238b, type: 2} material: {fileID: 2100000, guid: 0fe1464735a8dbc4ab5d663da266238b, type: 2}
x_RotationOffset: 0
--- !u!4 &2081823901 --- !u!4 &2081823901
Transform: Transform:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0

8
Assets/7_Scripts/Recording/RenderText.cs

@ -35,6 +35,7 @@ public class RenderText : MonoBehaviour
float y_FOV; float y_FOV;
float y_Rotation; float y_Rotation;
float x_Rotation; float x_Rotation;
public float x_RotationOffset;
float y_Divide; float y_Divide;
float x_Divide; float x_Divide;
@ -101,6 +102,7 @@ public class RenderText : MonoBehaviour
if (frameCount == 0 || frameCount == 2) if (frameCount == 0 || frameCount == 2)
{ {
// Set Front & Back // Set Front & Back
// Default X_Rotation 0.25f & 1f
if(m_ProjectionType == ProjectionType.Gnomic) if(m_ProjectionType == ProjectionType.Gnomic)
{ {
txt_W = 8192; txt_W = 8192;
@ -210,15 +212,15 @@ public class RenderText : MonoBehaviour
m_CubeMapPrefab.transform.localPosition = new Vector3(m_CubeMapPrefab.transform.localPosition.x, m_YHeight, m_CubeMapPrefab.transform.localPosition.z); m_CubeMapPrefab.transform.localPosition = new Vector3(m_CubeMapPrefab.transform.localPosition.x, m_YHeight, m_CubeMapPrefab.transform.localPosition.z);
if (m_ProjectionType != ProjectionType.CroppedFOV) if (m_ProjectionType != ProjectionType.CroppedFOV)
{ {
material.SetFloat("_EquiRotation", x_Rotation * frameCount); material.SetFloat("_EquiRotation", x_RotationOffset + (x_Rotation * frameCount));
} else } else
{ {
if(frameCount == 0 || frameCount == 2) if(frameCount == 0 || frameCount == 2)
{ {
material.SetFloat("_EquiRotation", x_Rotation + frameCount); material.SetFloat("_EquiRotation", x_RotationOffset + (x_Rotation + frameCount));
} else } else
{ {
material.SetFloat("_EquiRotation", frameCount + 0.5f); material.SetFloat("_EquiRotation", x_RotationOffset + frameCount + 0.5f);
} }
} }

2
Assets/ML-Agents/Timers/Beep_timers.json

@ -1 +1 @@
{"count":1,"self":14.440399999999999,"total":14.4788243,"children":{"InitializeActuators":{"count":1,"self":0.0015034,"total":0.0015034,"children":null},"InitializeSensors":{"count":1,"self":0.0010067,"total":0.0010067,"children":null},"AgentSendState":{"count":1,"self":0.0005047,"total":0.0005047,"children":{"CollectObservations":{"count":1,"self":0,"total":0,"children":null},"WriteActionMask":{"count":1,"self":0,"total":0,"children":null},"RequestDecision":{"count":1,"self":0,"total":0,"children":null}}},"DecideAction":{"count":1,"self":0.0339055,"total":0.0339055,"children":{"RayPerceptionSensor.Perceive":{"count":1,"self":0,"total":0,"children":null}}},"AgentAct":{"count":1,"self":0.0015038,"total":0.0015038,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713206179","unity_version":"2023.2.8f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2023.2.8f1\\Editor\\Unity.exe -projectpath C:\\Users\\Gebruiker\\Documents\\BB_BeautyBeep\\git\\beep-final -useHub -hubIPC -cloudEnvironment production","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.3.0-exp.3","scene_name":"Beep","end_time_seconds":"1713206194"}} {"count":1,"self":15.1784032,"total":15.2778947,"children":{"InitializeActuators":{"count":1,"self":0.003021,"total":0.003021,"children":null},"InitializeSensors":{"count":1,"self":0.0031533999999999998,"total":0.0031533999999999998,"children":null},"AgentSendState":{"count":2,"self":0.0011473,"total":0.0016948,"children":{"CollectObservations":{"count":1,"self":0.0005475,"total":0.0005475,"children":null},"WriteActionMask":{"count":1,"self":0,"total":0,"children":null},"RequestDecision":{"count":1,"self":0,"total":0,"children":null}}},"DecideAction":{"count":2,"self":0.084617,"total":0.0856777,"children":{"RayPerceptionSensor.Perceive":{"count":1,"self":0.0010607,"total":0.0010607,"children":null}}},"AgentAct":{"count":2,"self":0.0049413,"total":0.0049413,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1713259904","unity_version":"2023.2.8f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2023.2.8f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\Projects\\24_03-Beep\\beep-final -useHub -hubIPC -cloudEnvironment production","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.3.0-exp.3","scene_name":"Beep","end_time_seconds":"1713259919"}}
Loading…
Cancel
Save