cailean
/
drecon-unity
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

updates to cameras, texts, and scripts

audio
Cailean Finn 4 months ago
parent
46d9217f7d
commit
91ca4abbf3
5 changed files with 117 additions and 76 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 118
      Assets/5_Scenes/DreconDemo.unity
  2. 30
      Assets/8_Scripts/2_General/Rotate.cs
  3. 41
      Assets/8_Scripts/3_Script/Howl by Alan Ginsberg.txt
  4. 2
      Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human.mat
  5. 2
      Assets/ML-Agents/Timers/DreconDemo_timers.json

118
Assets/5_Scenes/DreconDemo.unity
View File

@ -919,22 +919,22 @@ LineRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_Positions:
- {x: -362.98315, y: -22.543243, z: -282.9311}
- {x: -104.42244, y: -22.543243, z: -282.9311}
- {x: -104.42244, y: -22.543243, z: -64.48384}
- {x: -362.98315, y: -22.543243, z: -64.48384}
- {x: -362.98315, y: -22.543243, z: -282.9311}
- {x: -362.98315, y: 438.8254, z: -282.9311}
- {x: -104.42244, y: 438.8254, z: -282.9311}
- {x: -104.42244, y: -22.543243, z: -282.9311}
- {x: -104.42244, y: 438.8254, z: -282.9311}
- {x: -104.42244, y: 438.8254, z: -64.48384}
- {x: -104.42244, y: -22.543243, z: -64.48384}
- {x: -104.42244, y: 438.8254, z: -64.48384}
- {x: -362.98315, y: 438.8254, z: -64.48384}
- {x: -362.98315, y: -22.543243, z: -64.48384}
- {x: -362.98315, y: 438.8254, z: -64.48384}
- {x: -362.98315, y: 438.8254, z: -282.9311}
- {x: -387.25262, y: -22.136444, z: -261.261}
- {x: -113.77623, y: -22.136444, z: -261.261}
- {x: -113.77623, y: -22.136444, z: -74.10927}
- {x: -387.25262, y: -22.136444, z: -74.10927}
- {x: -387.25262, y: -22.136444, z: -261.261}
- {x: -387.25262, y: 446.16705, z: -261.261}
- {x: -113.77623, y: 446.16705, z: -261.261}
- {x: -113.77623, y: -22.136444, z: -261.261}
- {x: -113.77623, y: 446.16705, z: -261.261}
- {x: -113.77623, y: 446.16705, z: -74.10927}
- {x: -113.77623, y: -22.136444, z: -74.10927}
- {x: -113.77623, y: 446.16705, z: -74.10927}
- {x: -387.25262, y: 446.16705, z: -74.10927}
- {x: -387.25262, y: -22.136444, z: -74.10927}
- {x: -387.25262, y: 446.16705, z: -74.10927}
- {x: -387.25262, y: 446.16705, z: -261.261}
m_Parameters:
serializedVersion: 3
widthMultiplier: 1
@ -2053,7 +2053,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 153031623}
serializedVersion: 2
m_LocalRotation: {x: -0.000012148616, y: 0.9991337, z: 0.041616097, w: -0.00007738355}
m_LocalRotation: {x: -0.000012147186, y: 0.9991337, z: 0.04161607, w: -0.000077417935}
m_LocalPosition: {x: 18.101631, y: 8.540332, z: 4.4995093}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -3872,8 +3872,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 320225263}
serializedVersion: 2
m_LocalRotation: {x: -0.10993652, y: 0.80571866, z: -0.5601088, w: -0.1581441}
m_LocalPosition: {x: 146.21146, y: 328.14352, z: -324.696}
m_LocalRotation: {x: -0.109934606, y: 0.80571884, z: -0.5601098, w: -0.15814109}
m_LocalPosition: {x: 146.21146, y: 328.14352, z: -324.69604}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children:
@ -3902,7 +3902,7 @@ MonoBehaviour:
m_Follow: {fileID: 1683887270}
m_Lens:
FieldOfView: 0.3993083
OrthographicSize: 0.4485027
OrthographicSize: 0.2006525
NearClipPlane: 0.01
FarClipPlane: 5000
Dutch: 0
@ -4194,7 +4194,7 @@ Camera:
far clip plane: 5000
field of view: 0.3993083
orthographic: 1
orthographic size: 0.4485027
orthographic size: 0.2006525
m_Depth: -1
m_CullingMask:
serializedVersion: 2
@ -4218,8 +4218,8 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 330585543}
serializedVersion: 2
m_LocalRotation: {x: -0.10993652, y: 0.80571866, z: -0.5601088, w: -0.1581441}
m_LocalPosition: {x: 146.21146, y: 328.14352, z: -324.696}
m_LocalRotation: {x: -0.109934606, y: 0.80571884, z: -0.5601098, w: -0.15814109}
m_LocalPosition: {x: 146.21146, y: 328.14352, z: -324.69604}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
m_Children: []
@ -4245,7 +4245,7 @@ MonoBehaviour:
m_BlendUpdateMethod: 1
m_DefaultBlend:
m_Style: 1
m_Time: 14
m_Time: 11
m_CustomCurve:
serializedVersion: 2
m_Curve: []
@ -10655,6 +10655,7 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_Speed: 1
m_Axis: 1
--- !u!1001 &817214980
PrefabInstance:
m_ObjectHideFlags: 0
@ -11393,7 +11394,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 882491594}
serializedVersion: 2
m_LocalRotation: {x: 0.25553572, y: 0.66415966, z: -0.65266776, w: 0.26003507}
m_LocalRotation: {x: 0.2555353, y: 0.66415983, z: -0.65266794, w: 0.26003468}
m_LocalPosition: {x: 18.100853, y: 10.055965, z: -0.48116565}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -11704,7 +11705,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 917542184}
serializedVersion: 2
m_LocalRotation: {x: -0.00006332729, y: 0.73596877, z: -0.6770155, w: -0.000046156118}
m_LocalRotation: {x: -0.000063312706, y: 0.73596877, z: -0.6770155, w: -0.000046140267}
m_LocalPosition: {x: 18.099787, y: 68.54034, z: 4.499522}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -11780,7 +11781,7 @@ MonoBehaviour:
m_Follow: {fileID: 38443225415845789}
m_Lens:
FieldOfView: 179
OrthographicSize: 1.51
OrthographicSize: 1.8
NearClipPlane: 0.5
FarClipPlane: 5000
Dutch: 0
@ -12232,6 +12233,7 @@ GameObject:
- component: {fileID: 949034604}
- component: {fileID: 949034605}
- component: {fileID: 949034606}
- component: {fileID: 949034607}
m_Layer: 0
m_Name: Environment-Wide-Still-2
m_TagString: vc_Environment
@ -12314,6 +12316,20 @@ MonoBehaviour:
m_Name:
m_EditorClassIdentifier:
m_CameraSettings: {fileID: 11400000, guid: 42c5ba543fa15ee47bcc3879b6527f54, type: 2}
--- !u!114 &949034607
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 949034603}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 519cf89ae36670048bb519d29044f45e, type: 3}
m_Name:
m_EditorClassIdentifier:
m_Speed: 1
m_Axis: 1
--- !u!1 &951379155
GameObject:
m_ObjectHideFlags: 0
@ -21679,7 +21695,7 @@ Transform:
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1634889327}
serializedVersion: 2
m_LocalRotation: {x: -0.25950268, y: 0.6790122, z: -0.62649494, w: -0.28125605}
m_LocalRotation: {x: -0.2595026, y: 0.6790122, z: -0.626495, w: -0.2812559}
m_LocalPosition: {x: 11.361925, y: 9.244215, z: 7.779041}
m_LocalScale: {x: 1, y: 1, z: 1}
m_ConstrainProportionsScale: 0
@ -22029,7 +22045,7 @@ MonoBehaviour:
m_Lens:
FieldOfView: 14
OrthographicSize: 10
NearClipPlane: 13
NearClipPlane: 70
FarClipPlane: 5000
Dutch: 0
ModeOverride: 2
@ -23643,12 +23659,12 @@ MonoBehaviour:
m_LookAt: {fileID: 0}
m_Follow: {fileID: 0}
m_Lens:
FieldOfView: 28.3
FieldOfView: 24
OrthographicSize: 45
NearClipPlane: 148.4
FarClipPlane: 275
NearClipPlane: 40
FarClipPlane: 400
Dutch: 0
ModeOverride: 1
ModeOverride: 2
LensShift: {x: 0, y: 0}
GateFit: 2
FocusDistance: 10
@ -24017,22 +24033,22 @@ LineRenderer:
m_SortingLayer: 0
m_SortingOrder: 0
m_Positions:
- {x: -61.655884, y: -13.651871, z: -236.81883}
- {x: 159.31458, y: -13.651871, z: -236.81883}
- {x: 159.31458, y: -13.651871, z: -13.28746}
- {x: -61.655884, y: -13.651871, z: -13.28746}
- {x: -61.655884, y: -13.651871, z: -236.81883}
- {x: -61.655884, y: 456.73767, z: -236.81883}
- {x: 159.31458, y: 456.73767, z: -236.81883}
- {x: 159.31458, y: -13.651871, z: -236.81883}
- {x: 159.31458, y: 456.73767, z: -236.81883}
- {x: 159.31458, y: 456.73767, z: -13.28746}
- {x: 159.31458, y: -13.651871, z: -13.28746}
- {x: 159.31458, y: 456.73767, z: -13.28746}
- {x: -61.655884, y: 456.73767, z: -13.28746}
- {x: -61.655884, y: -13.651871, z: -13.28746}
- {x: -61.655884, y: 456.73767, z: -13.28746}
- {x: -61.655884, y: 456.73767, z: -236.81883}
- {x: -84.76288, y: -21.918839, z: -242.2361}
- {x: 160.52072, y: -21.918839, z: -242.2361}
- {x: 160.52072, y: -21.918839, z: 8.086563}
- {x: -84.76288, y: -21.918839, z: 8.086563}
- {x: -84.76288, y: -21.918839, z: -242.2361}
- {x: -84.76288, y: 470.6853, z: -242.2361}
- {x: 160.52072, y: 470.6853, z: -242.2361}
- {x: 160.52072, y: -21.918839, z: -242.2361}
- {x: 160.52072, y: 470.6853, z: -242.2361}
- {x: 160.52072, y: 470.6853, z: 8.086563}
- {x: 160.52072, y: -21.918839, z: 8.086563}
- {x: 160.52072, y: 470.6853, z: 8.086563}
- {x: -84.76288, y: 470.6853, z: 8.086563}
- {x: -84.76288, y: -21.918839, z: 8.086563}
- {x: -84.76288, y: 470.6853, z: 8.086563}
- {x: -84.76288, y: 470.6853, z: -242.2361}
m_Parameters:
serializedVersion: 3
widthMultiplier: 1
@ -24779,8 +24795,8 @@ MonoBehaviour:
m_LookaheadTime: 0
m_LookaheadSmoothing: 0
m_LookaheadIgnoreY: 0
m_HorizontalDamping: 10
m_VerticalDamping: 10
m_HorizontalDamping: 15
m_VerticalDamping: 15
m_ScreenX: 0.5
m_ScreenY: 0.5
m_DeadZoneWidth: 0

30
Assets/8_Scripts/2_General/Rotate.cs
View File

@ -6,8 +6,36 @@ public class Rotate : MonoBehaviour
{
// Update is called once per frame
public float m_Speed;
private float m_X;
private float m_Y;
private float m_Z;
public enum Axis
{
X,
Y,
Z
}
public Axis m_Axis;
void Update()
{
this.transform.Rotate(0, -Time.fixedDeltaTime * m_Speed, 0, Space.World);
float speed = -Time.fixedDeltaTime * m_Speed;
m_X = 0;
m_Y = 0;
m_Z = 0;
if (m_Axis == Axis.X)
{
m_X = speed;
} else if (m_Axis == Axis.Y)
{
m_Y = speed;
} else if (m_Axis == Axis.Z)
{
m_Z = speed;
}
this.transform.Rotate(m_X, m_Y, m_Z, Space.World);
}
}

41
Assets/8_Scripts/3_Script/Howl by Alan Ginsberg.txt
View File

@ -1,34 +1,31 @@
what sphinx of cement and aluminum bashed open their skulls and ate up their brains and imagination?
moloch
solitude, filth
ugliness.
solitude, filth, ugliness.
unobtainable dollars
children screaming under the stairways
sobbing in armies, weeping in the parks
moloch, moloch
nightmare of moloch
moloch, moloch, nightmare of moloch
moloch the loveless
mental moloch.
moloch, the heavy judger of men
moloch, the incomprehensible prison
moloch, the soulless jail
the heavy judger of men
the incomprehensible prison
congress of sorrows
moloch whose buildings are judgment
moloch, the vast stone of war
whose buildings are judgment
the vast stone of war
moloch, the stunned governments
moloch whose mind is pure machinery
moloch whose blood is running money
moloch whose fingers are ten armies
moloch whose breast is a cannibal dynamo
moloch whose ear is a smoking tomb
moloch whose eyes are a thousand blind windows
moloch whose factories dream and croak in the fog
moloch whose antennae crown the cities
moloch whose love is endless oil and stone
moloch whose soul is electricity and banks
moloch whose poverty is the specter of genius
moloch whose fate is a cloud of sexless hydrogen
moloch whose name is the mind
whose mind is pure machinery
whose blood is running money
whose fingers are ten armies
whose breast is a cannibal dynamo
whose ear is a smoking tomb
whose eyes are a thousand blind windows
whose factories dream and croak in the fog
whose antennae crown the cities
whose love is endless oil and stone
whose soul is electricity and banks
whose poverty is the specter of genius
whose fate is a cloud of sexless hydrogen
whose name is the mind
moloch in whom I sit lonely
moloch in whom I dream angels
crazy in moloch.

2
Assets/9_Models/Humanoid/SMPLX_Texture/smplx texture human.mat
View File

@ -205,7 +205,7 @@ Material:
- _Ior: 1.5
- _IridescenceMask: 1
- _IridescenceThickness: 1
- _LerpTexture: 1
- _LerpTexture: 0.03875969
- _LinkDetailsWithBase: 1
- _MaterialID: 1
- _Metallic: 0

2
Assets/ML-Agents/Timers/DreconDemo_timers.json
View File

@ -1 +1 @@
{"count":1,"self":192.1486592,"total":198.3939017,"children":{"InitializeActuators":{"count":1,"self":0.001011,"total":0.001011,"children":null},"InitializeSensors":{"count":1,"self":0.0015030999999999998,"total":0.0015030999999999998,"children":null},"AgentSendState":{"count":11538,"self":0.0700986,"total":1.5712141,"children":{"CollectObservations":{"count":5769,"self":1.477973,"total":1.477973,"children":null},"WriteActionMask":{"count":5769,"self":0.0095294,"total":0.0095294,"children":null},"RequestDecision":{"count":5769,"self":0.0136131,"total":0.0136131,"children":null}}},"DecideAction":{"count":11538,"self":2.7985198,"total":2.7985198,"children":null},"AgentAct":{"count":11538,"self":1.8719948,"total":1.8719947,"children":null}},"gauges":{"DReCon-v0.CumulativeReward":{"count":1,"max":6707.32275,"min":6707.32275,"runningAverage":6707.32275,"value":6707.32275,"weightedAverage":6707.32275}},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1717767753","unity_version":"2022.3.5f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.5f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\Projects\\24_3-Moloch\\2_Unity\\Expeirments\\Drecon2022 -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-caile -hubSessionId 301e7cd0-e7c0-4bd4-976e-75706ef8b74d -accessToken X7oGdpDmdZLg79lpeE3MtQVwrdzZOqMwcIGRdvWfpI8005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1717767951"}}
{"count":1,"self":314.7872256,"total":328.3624625,"children":{"InitializeActuators":{"count":1,"self":0.0012384,"total":0.0012384,"children":null},"InitializeSensors":{"count":1,"self":0.0010118,"total":0.0010118,"children":null},"AgentSendState":{"count":18837,"self":0.13811569999999998,"total":3.9351626,"children":{"CollectObservations":{"count":9419,"self":3.2952548,"total":3.2952548999999998,"children":null},"WriteActionMask":{"count":9419,"self":0.0113926,"total":0.0113926,"children":null},"RequestDecision":{"count":9419,"self":0.4903994,"total":0.4903994,"children":null}}},"DecideAction":{"count":18837,"self":6.31065,"total":6.31065,"children":null},"AgentAct":{"count":18837,"self":3.3261751999999998,"total":3.3261751,"children":null}},"gauges":{},"metadata":{"timer_format_version":"0.1.0","start_time_seconds":"1717929086","unity_version":"2022.3.5f1","command_line_arguments":"C:\\Program Files\\Unity\\Hub\\Editor\\2022.3.5f1\\Editor\\Unity.exe -projectpath C:\\Users\\caile\\Desktop\\drecon-unity -useHub -hubIPC -cloudEnvironment production -licensingIpc LicenseClient-cail -hubSessionId 54d62fb1-d031-4cf8-972f-61a26f9b4ce4 -accessToken nDJK2CK7Mfn8E4WwlfB4xRQLHGqrIOWOlcuQLOi8Y88005f","communication_protocol_version":"1.5.0","com.unity.ml-agents_version":"2.0.1","scene_name":"DreconDemo","end_time_seconds":"1717929414"}}
Write Preview
Loading…
Cancel
Save