diff --git a/Assets/Animation Clips/Main b/Assets/Animation Clips/Main deleted file mode 100644 index ac5a59fa..00000000 Binary files a/Assets/Animation Clips/Main and /dev/null differ diff --git a/Assets/Materials/UIMat_Credits.shmat b/Assets/Materials/UIMat_Credits.shmat index 17dd04a8..4c5f5a74 100644 --- a/Assets/Materials/UIMat_Credits.shmat +++ b/Assets/Materials/UIMat_Credits.shmat @@ -3,6 +3,6 @@ SubPass: UI Properties: data.color: {x: 1, y: 1, z: 1, w: 1} - data.textureIndex: 55278388 + data.textureIndex: 59379300 data.alpha: 1 data.beta: {x: 1, y: 1, z: 1} \ No newline at end of file diff --git a/Assets/Scenes/Level1.shade b/Assets/Scenes/Level1.shade index b5ac7855..cadf6da8 100644 --- a/Assets/Scenes/Level1.shade +++ b/Assets/Scenes/Level1.shade @@ -17,7 +17,7 @@ - EID: 85 Name: EnvironmentMaster IsActive: true - NumberOfChildren: 18 + NumberOfChildren: 9 Components: ~ Scripts: ~ - EID: 84 @@ -6827,764 +6827,6 @@ Material: 131956078 IsActive: true Scripts: ~ -- EID: 602 - Name: PottedPlant - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -4.01561403, y: 0.334217787, z: -4.03895283} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Renderable Component: - Mesh: 136851231 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.100000001, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 601 - Name: PottedPlant - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -3.0781858, y: 0.901458919, z: -8.24384117} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Renderable Component: - Mesh: 136851231 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.100000001, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 600 - Name: PottedPlant - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 5.14082956, y: 0.956586063, z: -9.60649967} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Renderable Component: - Mesh: 136851231 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.100000001, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 599 - Name: PottedPlant - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 4.97405958, y: 0.956586063, z: -2.56497669} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Renderable Component: - Mesh: 136851231 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.100000001, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 596 - Name: 3books - IsActive: true - NumberOfChildren: 3 - Components: - Transform Component: - Translate: {x: -6.65892982, y: 1.21501589, z: -9.38873291} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Scripts: ~ -- EID: 66059 - Name: Redbook - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -0.216216087, y: -0.168680668, z: -0.0682477951} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Renderable Component: - Mesh: 149990626 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 598 - Name: Bluebook - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -0.0121536255, y: -0.168680668, z: -0.0682477951} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Renderable Component: - Mesh: 148931934 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 597 - Name: Greenbook - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.181077003, y: -0.168680668, z: -0.0682477951} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Renderable Component: - Mesh: 150010583 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 595 - Name: 3books - IsActive: true - NumberOfChildren: 3 - Components: - Transform Component: - Translate: {x: -7.73414946, y: 0.743469238, z: -9.38873291} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Scripts: ~ -- EID: 594 - Name: Redbook - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -0.216216087, y: -0.168680668, z: -0.0682477951} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Renderable Component: - Mesh: 149990626 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 593 - Name: Bluebook - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -0.0121536255, y: -0.168680668, z: -0.0682477951} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Renderable Component: - Mesh: 148931934 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 592 - Name: Greenbook - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.181077003, y: -0.168680668, z: -0.0682477951} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Renderable Component: - Mesh: 150010583 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 591 - Name: 3books - IsActive: true - NumberOfChildren: 3 - Components: - Transform Component: - Translate: {x: -7.73414946, y: 1.68549871, z: -9.38873291} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Scripts: ~ -- EID: 590 - Name: Redbook - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -0.216216087, y: -0.168680668, z: -0.0682477951} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Renderable Component: - Mesh: 149990626 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 589 - Name: Bluebook - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -0.0121536255, y: -0.168680668, z: -0.0682477951} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Renderable Component: - Mesh: 148931934 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 588 - Name: Greenbook - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.181077003, y: -0.168680668, z: -0.0682477951} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Renderable Component: - Mesh: 150010583 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 587 - Name: Photoframe - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 1.74995995, y: 0.783303618, z: -5.44767904} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Renderable Component: - Mesh: 139864675 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.200000003, y: 0.300000012, z: 0.100000001} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.150000006, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 586 - Name: 3books - IsActive: true - NumberOfChildren: 3 - Components: - Transform Component: - Translate: {x: -8.85774136, y: 0.239445657, z: -9.46920681} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Scripts: ~ -- EID: 585 - Name: Redbook - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -0.216216087, y: -0.168680668, z: -0.0682477951} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Renderable Component: - Mesh: 149990626 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 584 - Name: Bluebook - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -0.0121536255, y: -0.168680668, z: -0.0682477951} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Renderable Component: - Mesh: 148931934 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 583 - Name: Greenbook - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.181077003, y: -0.168680668, z: -0.0682477951} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Renderable Component: - Mesh: 150010583 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ - EID: 236 Name: ====GameManager==== IsActive: true @@ -7769,6 +7011,7 @@ Score: 50 currCategory: 1 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 200 @@ -7821,6 +7064,7 @@ Score: 500 currCategory: 2 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 200 @@ -7873,6 +7117,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 200 @@ -7925,6 +7170,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 200 @@ -9071,7 +8317,7 @@ NumberOfChildren: 2 Components: Transform Component: - Translate: {x: 700, y: 400, z: 0.600000024} + Translate: {x: 700, y: 400, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 60, y: 60, z: 1} IsActive: true @@ -9201,6 +8447,78 @@ Clicked: false IsActive: true Scripts: ~ +- EID: 523 + Name: Mesh_Apple + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: -7.29431438, y: 1.17736602, z: -4.53253984} + Rotate: {x: -5.83341553e-08, y: 7.48974247e-14, z: 1.10461471e-08} + Scale: {x: 1, y: 1, z: 1} + IsActive: true + Renderable Component: + Mesh: 144128170 + Material: 122370915 + IsActive: true + RigidBody Component: + Type: Dynamic + Drag: 0.00999999978 + Angular Drag: 0.100000001 + Gravity Scale: 1 + Use Gravity: true + Interpolate: false + Sleeping Enabled: true + Freeze Position X: false + Freeze Position Y: false + Freeze Position Z: false + Freeze Rotation X: false + Freeze Rotation Y: false + Freeze Rotation Z: false + IsActive: true + Collider Component: + Colliders: + - Is Trigger: false + Collision Tag: 2 + Type: Box + Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003} + Friction: 0.400000006 + Bounciness: 0 + Density: 1 + Position Offset: {x: 0, y: 0, z: 0} + Rotation Offset: {x: 0, y: 0, z: 0} + IsActive: true + classSHADE::SHParticleEmitterComponent: + Emission Count: 10 + Is Passive: false + Emission Interval: 0 + Min Life: 1 + Max Life: 2 + Minimum Speed: 1 + Maximum Speed: 1.5 + Minimum Size: 0 + Maximum Size: 0.075000003 + Size Decay: 0.907999992 + Angular Ranges And Offset: {x: 6.19999981, y: 3.1400001, z: 0, w: 1.70000005} + Rotation Speed: 0.805999994 + Rotation Decay: 0 + Texture Asset ID: 0 + Custom Update Shader Asset ID: 0 + Color Tint: {x: 0.581223547, y: 0.722466946, z: 0.283257961, w: 1} + Acceleration: {x: 0, y: -0.0390000008, z: 0} + IsActive: true + Scripts: + - Type: Item + Enabled: true + Score: 10 + currCategory: 0 + currFood: 1 + density: 1 + dontReturn: false + soundDistance: 10 + highlightSpeed: 200 + highlightThickness: 60 + highlightLowerClamp: 0.25 - EID: 66150 Name: ParticlesDeco IsActive: true diff --git a/Assets/Scenes/Level2.shade b/Assets/Scenes/Level2.shade index f481e842..29266a48 100644 --- a/Assets/Scenes/Level2.shade +++ b/Assets/Scenes/Level2.shade @@ -113,6 +113,7 @@ Score: 50 currCategory: 1 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -165,6 +166,7 @@ Score: 50 currCategory: 1 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -217,6 +219,7 @@ Score: 500 currCategory: 2 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -269,6 +272,7 @@ Score: 500 currCategory: 2 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -321,6 +325,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -373,6 +378,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -425,6 +431,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -483,6 +490,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 2 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -703,6 +711,7 @@ Score: 50 currCategory: 1 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -755,6 +764,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -807,6 +817,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -859,6 +870,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -911,6 +923,7 @@ Score: 500 currCategory: 2 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -963,6 +976,7 @@ Score: 50 currCategory: 1 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1015,6 +1029,7 @@ Score: 50 currCategory: 1 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1067,6 +1082,7 @@ Score: 50 currCategory: 1 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1119,6 +1135,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1171,6 +1188,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1223,6 +1241,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1275,6 +1294,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1327,6 +1347,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1379,6 +1400,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1431,6 +1453,7 @@ Score: 50 currCategory: 1 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1483,6 +1506,7 @@ Score: 500 currCategory: 2 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1535,6 +1559,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1587,6 +1612,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1639,6 +1665,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1697,6 +1724,7 @@ Score: 500 currCategory: 2 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1749,6 +1777,7 @@ Score: 50 currCategory: 1 currFood: 0 + density: 3 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1801,6 +1830,7 @@ Score: 50 currCategory: 1 currFood: 0 + density: 3 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1853,6 +1883,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 3 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1905,6 +1936,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 3 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -1957,6 +1989,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 3 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -2015,6 +2048,7 @@ Score: 500 currCategory: 2 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -2067,6 +2101,7 @@ Score: 50 currCategory: 1 currFood: 0 + density: 3 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -2119,6 +2154,7 @@ Score: 50 currCategory: 1 currFood: 0 + density: 3 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -2171,6 +2207,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 3 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -2223,6 +2260,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 3 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -2275,6 +2313,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 3 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -2333,6 +2372,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 2 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -2559,6 +2599,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 2 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -3103,6 +3144,8 @@ armLength: 2 turnSpeedPitch: 0.200000003 turnSpeedYaw: 0.400000006 + inverseXControls: false + inverseYControls: false pitchUpperClamp: 45 pitchLowerClamp: 5 - EID: 9 @@ -4128,7 +4171,7 @@ NumberOfChildren: 4 Components: Transform Component: - Translate: {x: 4.14898109, y: 0.25564307, z: -0.619376183} + Translate: {x: 4.31892872, y: 0.25564307, z: 0.661221743} Rotate: {x: -0, y: 0, z: -0} Scale: {x: 0.999979734, y: 1, z: 0.999979734} IsActive: true @@ -5606,7 +5649,7 @@ Components: Transform Component: Translate: {x: 0, y: -300, z: 0} - Rotate: {x: 0.5, y: 1.63842165, z: 0.5} + Rotate: {x: 0.5, y: 0.5, z: 0.5} Scale: {x: 400, y: 100, z: 500} IsActive: true Renderable Component: @@ -5692,7 +5735,7 @@ - EID: 19 Name: ====EnvironmentMaster==== IsActive: true - NumberOfChildren: 55 + NumberOfChildren: 33 Components: Transform Component: Translate: {x: 0, y: 0, z: 0} @@ -10673,9 +10716,9 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: -2.38418579e-07, y: 1, z: -3.52933483e-07} + Translate: {x: 0, y: 1, z: -5.04253421e-07} Rotate: {x: -0, y: 1.57079601, z: 0} - Scale: {x: 0.999907732, y: 1, z: 0.999907732} + Scale: {x: 0.999908686, y: 1, z: 0.999908686} IsActive: true Renderable Component: Mesh: 150586966 @@ -14999,1626 +15042,6 @@ - Type: CeilingFan Enabled: true rotateSpeed: 3 -- EID: 602 - Name: Redbook - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 4.34861851, y: 1, z: -1.91356158} - Rotate: {x: 0, y: -1.57079601, z: 0} - Scale: {x: 0.999925315, y: 1, z: 0.999925315} - IsActive: true - Renderable Component: - Mesh: 149990626 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 601 - Name: Redbook - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 4.63469744, y: 1, z: -0.435294002} - Rotate: {x: 0, y: -1.57079601, z: 0} - Scale: {x: 0.999920726, y: 1, z: 0.999920726} - IsActive: true - Renderable Component: - Mesh: 149990626 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 600 - Name: Redbook - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 4.44533873, y: 1, z: -1.24962187} - Rotate: {x: 0, y: -1.57079601, z: 0} - Scale: {x: 0.999914169, y: 1, z: 0.999914169} - IsActive: true - Renderable Component: - Mesh: 149990626 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 599 - Name: Bluebook - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 4.56141567, y: 1, z: -1.1465956} - Rotate: {x: 0, y: -1.57079601, z: 0} - Scale: {x: 0.999922931, y: 1, z: 0.999922931} - IsActive: true - Renderable Component: - Mesh: 148931934 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 598 - Name: Bluebook - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 4.56141567, y: 1, z: -0.544055402} - Rotate: {x: 0, y: -1.57079601, z: 0} - Scale: {x: 0.999945939, y: 1, z: 0.999945939} - IsActive: true - Renderable Component: - Mesh: 148931934 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 597 - Name: Greenbook - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 4.57130337, y: 1.06610978, z: -0.719168544} - Rotate: {x: 0, y: -1.57079649, z: -0.261799455} - Scale: {x: 0.999999583, y: 0.999999702, z: 0.999999762} - IsActive: true - Renderable Component: - Mesh: 150010583 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 596 - Name: Greenbook - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 4.3876543, y: 1.04479623, z: -1.43414247} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Renderable Component: - Mesh: 150010583 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.400000006, z: 0.300000012} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 595 - Name: Photoframe - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 4.54446268, y: 1.05918598, z: -0.938923955} - Rotate: {x: 0, y: -1.57079601, z: 0} - Scale: {x: 0.999982595, y: 1, z: 0.999982595} - IsActive: true - Renderable Component: - Mesh: 139864675 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.200000003, y: 0.300000012, z: 0.100000001} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.150000006, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 594 - Name: PottedPlant - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 4.28349304, y: 1, z: -1.73401773} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Renderable Component: - Mesh: 136851231 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.100000001, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 593 - Name: Speaker - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 4.40097761, y: 1.07500005, z: 0.637028515} - Rotate: {x: 0, y: -1.57079601, z: 0} - Scale: {x: 0.999965429, y: 1, z: 0.999965429} - IsActive: true - Renderable Component: - Mesh: 141518062 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.200000003, y: 0.400000006, z: 0.200000003} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 592 - Name: Speaker - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 4.40578842, y: 1.07500005, z: 1.40910745} - Rotate: {x: 0, y: -1.57079601, z: 0} - Scale: {x: 0.999966621, y: 1, z: 0.999966621} - IsActive: true - Renderable Component: - Mesh: 141518062 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.200000003, y: 0.400000006, z: 0.200000003} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 591 - Name: CardboardBox - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 4.37812614, y: 1.07500005, z: 1.03216779} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Renderable Component: - Mesh: 147649979 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.400000006, y: 0.400000006, z: 0.400000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 590 - Name: PottedPlant - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 4.36108637, y: 1.45819271, z: 1.11082494} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Renderable Component: - Mesh: 136851231 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.200000003, y: 0.200000003, z: 0.200000003} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.100000001, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 589 - Name: Crate - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 4.19665241, y: 1.07500005, z: 1.79704213} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Renderable Component: - Mesh: 137537688 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.400000006, y: 0.400000006, z: 0.400000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 588 - Name: Plate - IsActive: true - NumberOfChildren: 4 - Components: - Transform Component: - Translate: {x: 4.31892872, y: 0.25564307, z: 0.745245218} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 0.999979734, y: 1, z: 0.999979734} - IsActive: true - Renderable Component: - Mesh: 140964851 - Material: 124370424 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.200000003, y: 0.100000001, z: 0.200000003} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: - - Type: Breakable - Enabled: true - threshHold: 0.100000001 - ignoreRaccoon: false - breakClipHandlerName: SFXBreak492 - breakClipPath: event:/Props/impact_break -- EID: 587 - Name: Piece1 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -0.0586929321, y: 0, z: 0} - Rotate: {x: -0, y: 3.6088712e-09, z: 1.97286229e-16} - Scale: {x: 1, y: 1, z: 1} - IsActive: false - Renderable Component: - Mesh: 146557542 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 586 - Name: Piece2 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -0.0104182959, y: 0, z: -0.0662035942} - Rotate: {x: -0, y: 0.174533099, z: -0} - Scale: {x: 0.999999881, y: 1, z: 0.999999881} - IsActive: false - Renderable Component: - Mesh: 145439064 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.200000003} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 585 - Name: Piece3 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.0431699753, y: 1.18017197e-05, z: -0.0288243294} - Rotate: {x: -0, y: 0, z: 0.174533099} - Scale: {x: 0.999999881, y: 0.999999583, z: 1} - IsActive: false - Renderable Component: - Mesh: 139411134 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 584 - Name: Piece4 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.0341523886, y: 0.0088942796, z: 0.0554270744} - Rotate: {x: -0, y: 0, z: -0} - Scale: {x: 1, y: 1, z: 1} - IsActive: false - Renderable Component: - Mesh: 136742160 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 583 - Name: Plate - IsActive: true - NumberOfChildren: 4 - Components: - Transform Component: - Translate: {x: 4.12820768, y: 0.25564307, z: -1.05906928} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 0.999979734, y: 1, z: 0.999979734} - IsActive: true - Renderable Component: - Mesh: 140964851 - Material: 124370424 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.200000003, y: 0.100000001, z: 0.200000003} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: - - Type: Breakable - Enabled: true - threshHold: 0.100000001 - ignoreRaccoon: false - breakClipHandlerName: SFXBreak492 - breakClipPath: event:/Props/impact_break -- EID: 582 - Name: Piece1 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -0.0586929321, y: 0, z: 0} - Rotate: {x: -0, y: 3.6088712e-09, z: 1.97286229e-16} - Scale: {x: 1, y: 1, z: 1} - IsActive: false - Renderable Component: - Mesh: 146557542 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 581 - Name: Piece2 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -0.0104182959, y: 0, z: -0.0662035942} - Rotate: {x: -0, y: 0.174533099, z: -0} - Scale: {x: 0.999999881, y: 1, z: 0.999999881} - IsActive: false - Renderable Component: - Mesh: 145439064 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.200000003} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 580 - Name: Piece3 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.0431699753, y: 1.18017197e-05, z: -0.0288243294} - Rotate: {x: -0, y: 0, z: 0.174533099} - Scale: {x: 0.999999881, y: 0.999999583, z: 1} - IsActive: false - Renderable Component: - Mesh: 139411134 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 578 - Name: Piece4 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.0341523886, y: 0.0088942796, z: 0.0554270744} - Rotate: {x: -0, y: 0, z: -0} - Scale: {x: 1, y: 1, z: 1} - IsActive: false - Renderable Component: - Mesh: 136742160 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 577 - Name: Plate - IsActive: true - NumberOfChildren: 4 - Components: - Transform Component: - Translate: {x: 4.50039959, y: 0.25564307, z: -1.03683174} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 0.999979734, y: 1, z: 0.999979734} - IsActive: true - Renderable Component: - Mesh: 140964851 - Material: 124370424 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.200000003, y: 0.100000001, z: 0.200000003} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: - - Type: Breakable - Enabled: true - threshHold: 0.100000001 - ignoreRaccoon: false - breakClipHandlerName: SFXBreak492 - breakClipPath: event:/Props/impact_break -- EID: 575 - Name: Piece1 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -0.0586929321, y: 0, z: 0} - Rotate: {x: -0, y: 3.6088712e-09, z: 1.97286229e-16} - Scale: {x: 1, y: 1, z: 1} - IsActive: false - Renderable Component: - Mesh: 146557542 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 616 - Name: Piece2 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -0.0104182959, y: 0, z: -0.0662035942} - Rotate: {x: -0, y: 0.174533099, z: -0} - Scale: {x: 0.999999881, y: 1, z: 0.999999881} - IsActive: false - Renderable Component: - Mesh: 145439064 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.200000003} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 617 - Name: Piece3 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.0431699753, y: 1.18017197e-05, z: -0.0288243294} - Rotate: {x: -0, y: 0, z: 0.174533099} - Scale: {x: 0.999999881, y: 0.999999583, z: 1} - IsActive: false - Renderable Component: - Mesh: 139411134 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 618 - Name: Piece4 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.0341523886, y: 0.0088942796, z: 0.0554270744} - Rotate: {x: -0, y: 0, z: -0} - Scale: {x: 1, y: 1, z: 1} - IsActive: false - Renderable Component: - Mesh: 136742160 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 619 - Name: Crate - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 4.38009119, y: 0.186668962, z: -1.70407295} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Renderable Component: - Mesh: 137537688 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.400000006, y: 0.400000006, z: 0.400000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 620 - Name: Plate - IsActive: true - NumberOfChildren: 4 - Components: - Transform Component: - Translate: {x: 1.71689963, y: 0.118150897, z: 0.286598682} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 0.999979734, y: 1, z: 0.999979734} - IsActive: true - Renderable Component: - Mesh: 140964851 - Material: 124370424 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.200000003, y: 0.100000001, z: 0.200000003} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: - - Type: Breakable - Enabled: true - threshHold: 0.100000001 - ignoreRaccoon: false - breakClipHandlerName: SFXBreak145 - breakClipPath: event:/Props/impact_break -- EID: 621 - Name: Piece1 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -0.0586929321, y: 0, z: 0} - Rotate: {x: -0, y: 3.6088712e-09, z: 1.97286229e-16} - Scale: {x: 1, y: 1, z: 1} - IsActive: false - Renderable Component: - Mesh: 146557542 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 622 - Name: Piece2 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -0.0104182959, y: 0, z: -0.0662035942} - Rotate: {x: -0, y: 0.174533099, z: -0} - Scale: {x: 0.999999881, y: 1, z: 0.999999881} - IsActive: false - Renderable Component: - Mesh: 145439064 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.200000003} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 623 - Name: Piece3 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.0431699753, y: 1.18017197e-05, z: -0.0288243294} - Rotate: {x: -0, y: 0, z: 0.174533099} - Scale: {x: 0.999999881, y: 0.999999583, z: 1} - IsActive: false - Renderable Component: - Mesh: 139411134 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 624 - Name: Piece4 - IsActive: false - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: 0.0341523886, y: 0.0088942796, z: 0.0554270744} - Rotate: {x: -0, y: 0, z: -0} - Scale: {x: 1, y: 1, z: 1} - IsActive: false - Renderable Component: - Mesh: 136742160 - Material: 124370424 - IsActive: false - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: true - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: false - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.100000001, y: 0.0500000007, z: 0.150000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: false - Scripts: ~ -- EID: 625 - Name: CardboardBox - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -4.37000751, y: 0.149801284, z: 2.28307414} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Renderable Component: - Mesh: 147649979 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.400000006, y: 0.400000006, z: 0.400000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 626 - Name: CardboardBox - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -4.28439379, y: 0.175731421, z: 3.33887315} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 1, y: 1, z: 1} - IsActive: true - Renderable Component: - Mesh: 147649979 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.400000006, y: 0.400000006, z: 0.400000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ -- EID: 628 - Name: Crate - IsActive: true - NumberOfChildren: 0 - Components: - Transform Component: - Translate: {x: -3.93361688, y: 0.217600718, z: 4.24284506} - Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 2, y: 2, z: 2} - IsActive: true - Renderable Component: - Mesh: 137537688 - Material: 131956078 - IsActive: true - RigidBody Component: - Type: Dynamic - Drag: 0.00999999978 - Angular Drag: 0.100000001 - Gravity Scale: 1 - Use Gravity: true - Interpolate: false - Sleeping Enabled: false - Freeze Position X: false - Freeze Position Y: false - Freeze Position Z: false - Freeze Rotation X: false - Freeze Rotation Y: false - Freeze Rotation Z: false - IsActive: true - Collider Component: - Colliders: - - Is Trigger: false - Collision Tag: 0 - Type: Box - Half Extents: {x: 0.400000006, y: 0.400000006, z: 0.400000006} - Friction: 0.400000006 - Bounciness: 0 - Density: 1 - Position Offset: {x: 0, y: 0.200000003, z: 0} - Rotation Offset: {x: 0, y: 0, z: 0} - IsActive: true - Scripts: ~ - EID: 548 Name: TweenManager IsActive: true @@ -16835,7 +15258,7 @@ NumberOfChildren: 2 Components: Transform Component: - Translate: {x: 700, y: 400, z: 0.600000024} + Translate: {x: 700, y: 400, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 60, y: 60, z: 1} IsActive: true diff --git a/Assets/Scenes/Level3.shade b/Assets/Scenes/Level3.shade index 4e17191c..1ac90ccb 100644 --- a/Assets/Scenes/Level3.shade +++ b/Assets/Scenes/Level3.shade @@ -6,7 +6,7 @@ Components: Transform Component: Translate: {x: -4.64838362, y: 2.94342947, z: 0.209690213} - Rotate: {x: 0.5, y: 0.5, z: 6.5} + Rotate: {x: 0.5, y: 0.5, z: -2.5} Scale: {x: 1, y: 1, z: 1} IsActive: true Light Component: @@ -9106,7 +9106,7 @@ scoreText: 237 timeText: 525 minusTimerText: 524 - multiplierText: 521 + multiplierText: 524 maxMultiplierDuration: 5 maxMultiplierCombo: 10 multiplierFont: 60 @@ -9152,11 +9152,11 @@ - Is Trigger: true Collision Tag: 0 Type: Box - Half Extents: {x: 10, y: 1, z: 8} + Half Extents: {x: 5, y: 1, z: 5} Friction: 0.400000006 Bounciness: 0 Density: 1 - Position Offset: {x: -4.5, y: -1.5, z: 0} + Position Offset: {x: -1.89999998, y: -1.5, z: 0} Rotation Offset: {x: 0, y: 0, z: 0} IsActive: true Scripts: @@ -9537,6 +9537,7 @@ Score: 50 currCategory: 1 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -9589,6 +9590,7 @@ Score: 50 currCategory: 1 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -9641,6 +9643,7 @@ Score: 50 currCategory: 1 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -9693,6 +9696,7 @@ Score: 50 currCategory: 1 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -9745,6 +9749,7 @@ Score: 50 currCategory: 1 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -9797,6 +9802,7 @@ Score: 50 currCategory: 1 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -9849,6 +9855,7 @@ Score: 50 currCategory: 1 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -9901,6 +9908,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -9953,6 +9961,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10005,6 +10014,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10057,6 +10067,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10109,6 +10120,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10161,6 +10173,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10213,6 +10226,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10265,6 +10279,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10317,6 +10332,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10369,6 +10385,7 @@ Score: 500 currCategory: 2 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10421,6 +10438,7 @@ Score: 500 currCategory: 2 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10473,6 +10491,7 @@ Score: 500 currCategory: 2 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10525,6 +10544,7 @@ Score: 500 currCategory: 2 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10583,6 +10603,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 2 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -10809,6 +10830,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 2 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -11035,6 +11057,7 @@ Score: 500 currCategory: 2 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -11087,6 +11110,7 @@ Score: 50 currCategory: 1 currFood: 0 + density: 1 dontReturn: true soundDistance: 10 highlightSpeed: 300 @@ -11139,6 +11163,7 @@ Score: 50 currCategory: 1 currFood: 0 + density: 1 dontReturn: true soundDistance: 10 highlightSpeed: 300 @@ -11191,6 +11216,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: true soundDistance: 10 highlightSpeed: 300 @@ -11243,6 +11269,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: true soundDistance: 10 highlightSpeed: 300 @@ -11295,6 +11322,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: true soundDistance: 10 highlightSpeed: 300 @@ -11353,6 +11381,7 @@ Score: 500 currCategory: 2 currFood: 0 + density: 1 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -11405,6 +11434,7 @@ Score: 50 currCategory: 1 currFood: 0 + density: 1 dontReturn: true soundDistance: 10 highlightSpeed: 300 @@ -11457,6 +11487,7 @@ Score: 50 currCategory: 1 currFood: 0 + density: 1 dontReturn: true soundDistance: 10 highlightSpeed: 300 @@ -11509,6 +11540,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: true soundDistance: 10 highlightSpeed: 300 @@ -11561,6 +11593,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: true soundDistance: 10 highlightSpeed: 300 @@ -11613,6 +11646,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 1 dontReturn: true soundDistance: 10 highlightSpeed: 300 @@ -11698,6 +11732,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 2 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -11924,6 +11959,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 2 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -12150,6 +12186,7 @@ Score: 10 currCategory: 0 currFood: 0 + density: 2 dontReturn: false soundDistance: 10 highlightSpeed: 300 @@ -15122,7 +15159,7 @@ NumberOfChildren: 2 Components: Transform Component: - Translate: {x: 700, y: 400, z: 0.600000024} + Translate: {x: 700, y: 400, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 60, y: 60, z: 1} IsActive: true diff --git a/Assets/Scenes/MainMenu.shade b/Assets/Scenes/MainMenu.shade index c85eee83..299cf867 100644 --- a/Assets/Scenes/MainMenu.shade +++ b/Assets/Scenes/MainMenu.shade @@ -548,6 +548,7 @@ sfxVolSlider: 30 bgmVolSlider: 31 fovSlider: 37 + sensitivitySlider: 38 - EID: 20 Name: BackGround IsActive: true @@ -846,7 +847,7 @@ - EID: 33 Name: Camera Text Group IsActive: true - NumberOfChildren: 3 + NumberOfChildren: 4 Components: Transform Component: Translate: {x: -900, y: -220, z: 0} @@ -881,6 +882,28 @@ Clicked: false IsActive: true Scripts: ~ +- EID: 35 + Name: Sensitivity Text + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: -100, z: 0.100000001} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 75, y: 75, z: 1} + IsActive: true + Text Renderer Component: + Text: Sensitivity + Font: 174412429 + Color: {x: 0, y: 0, z: 0, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ - EID: 449 Name: Camera Invert X Text IsActive: true @@ -928,7 +951,7 @@ - EID: 36 Name: Camera Slider Group IsActive: true - NumberOfChildren: 3 + NumberOfChildren: 4 Components: Transform Component: Translate: {x: 100, y: -200, z: 0} @@ -966,6 +989,31 @@ Clicked: false IsActive: true Scripts: ~ +- EID: 38 + Name: Sensitivity Slider + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: -100, z: 0} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 1000, y: 75, z: 1} + IsActive: true + Renderable Component: + Mesh: 141771688 + Material: 128676209 + IsActive: true + Slider Component: + Slider Value: 1 + Min Value: 0 + Max Value: 100 + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: ~ - EID: 448 Name: Invert X Toggle Button IsActive: true @@ -1118,7 +1166,7 @@ - EID: 43 Name: Camera Slider Text Group IsActive: true - NumberOfChildren: 1 + NumberOfChildren: 2 Components: Transform Component: Translate: {x: 700, y: -225, z: -0.5} @@ -1156,6 +1204,31 @@ - Type: SHADE_Scripting.UI.SliderText Enabled: true sliderObj: 37 +- EID: 45 + Name: Sensitivity Slider Text + IsActive: true + NumberOfChildren: 0 + Components: + Transform Component: + Translate: {x: 0, y: -100, z: 1} + Rotate: {x: 0, y: 0, z: 0} + Scale: {x: 75, y: 75, z: 1} + IsActive: true + Text Renderer Component: + Text: 100 + Font: 174412429 + Color: {x: 0, y: 0, z: 0, w: 1} + Text Size: {x: 1, y: 1, z: 1} + IsActive: true + UI Component: + Canvas ID: 19 + Hovered: false + Clicked: false + IsActive: true + Scripts: + - Type: SHADE_Scripting.UI.SliderText + Enabled: true + sliderObj: 38 - EID: 443 Name: SubMenuBackGround IsActive: true @@ -1364,7 +1437,7 @@ NumberOfChildren: 0 Components: Transform Component: - Translate: {x: -250, y: 400, z: 0.100000001} + Translate: {x: -150, y: 400, z: 0.100000001} Rotate: {x: 0, y: 0, z: 0} Scale: {x: 100, y: 100, z: 1} IsActive: true @@ -1426,7 +1499,7 @@ Transform Component: Translate: {x: -600, y: 0, z: 0} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 345, y: 800, z: 1} + Scale: {x: 380, y: 879, z: 1} IsActive: true Renderable Component: Mesh: 141771688 @@ -1434,8 +1507,8 @@ IsActive: true Button Component: Default Texture: 55897117 - Hovered Texture: 56658801 - Clicked Texture: 58281309 + Hovered Texture: 55897117 + Clicked Texture: 55897117 IsActive: true UI Component: Canvas ID: 50 @@ -1454,7 +1527,7 @@ Transform Component: Translate: {x: 0, y: 0, z: 0} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 345, y: 800, z: 1} + Scale: {x: 380, y: 879, z: 1} IsActive: true Renderable Component: Mesh: 141771688 @@ -1462,8 +1535,8 @@ IsActive: true Button Component: Default Texture: 52151774 - Hovered Texture: 66730012 - Clicked Texture: 59730316 + Hovered Texture: 52151774 + Clicked Texture: 52151774 IsActive: true UI Component: Canvas ID: 50 @@ -1482,7 +1555,7 @@ Transform Component: Translate: {x: 600, y: 0, z: 0} Rotate: {x: 0, y: 0, z: 0} - Scale: {x: 345, y: 800, z: 1} + Scale: {x: 380, y: 879, z: 1} IsActive: true Renderable Component: Mesh: 141771688 @@ -1490,8 +1563,8 @@ IsActive: true Button Component: Default Texture: 51704639 - Hovered Texture: 66852283 - Clicked Texture: 53081657 + Hovered Texture: 51704639 + Clicked Texture: 51704639 IsActive: true UI Component: Canvas ID: 50 diff --git a/Assets/Scripts/Gameplay/Item/SC_Item.cs b/Assets/Scripts/Gameplay/Item/SC_Item.cs index 86b605c0..91bdf835 100644 --- a/Assets/Scripts/Gameplay/Item/SC_Item.cs +++ b/Assets/Scripts/Gameplay/Item/SC_Item.cs @@ -30,6 +30,8 @@ public class Item : Script private bool caputurePos = false; private Vector3 firstPostion; private Vector3 firstRotation; + private Collider collider; + public float density = 1.0f; public bool dontReturn = false; @@ -50,6 +52,9 @@ public class Item : Script { transform = GetComponent(); rb = GetComponent(); + collider = GetComponent(); + if(collider) + collider.GetCollisionShape(0).Density = density; rend = GetComponent(); if (!rend) @@ -151,8 +156,10 @@ public class Item : Script Audio.DetachAudioClipFromObject(AudioHandler.audioClipHandlers["SFXImpactElastic"]); Audio.DetachAudioClipFromObject(AudioHandler.audioClipHandlers["SFXImpactHard"]); + Debug.Log("ENTER"); if(emitter) emitter.Emit(); + } if (info.GameObject.GetScript() && homeownerOnce) diff --git a/Assets/Scripts/Gameplay/Player/SC_PickAndThrow.cs b/Assets/Scripts/Gameplay/Player/SC_PickAndThrow.cs index 7aa31c4b..3a536529 100644 --- a/Assets/Scripts/Gameplay/Player/SC_PickAndThrow.cs +++ b/Assets/Scripts/Gameplay/Player/SC_PickAndThrow.cs @@ -1,4 +1,4 @@ -using SHADE; +using SHADE; using SHADE_Scripting; using SHADE_Scripting.Audio; using System; @@ -212,14 +212,6 @@ public class PickAndThrow : Script } } - public void SetItemGravityBack() - { - if(itemRidigBody) - itemRidigBody.IsGravityEnabled = true; - if(itemCollider) - itemCollider.GetCollisionShape(0).IsTrigger = false; - } - public void ResetItemObject() { itemRidigBody = null; diff --git a/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs b/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs index 74c72239..66b951d4 100644 --- a/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs +++ b/Assets/Scripts/Gameplay/Player/SC_PlayerController.cs @@ -340,13 +340,7 @@ public class PlayerController : Script if (stateMachine && !stateMachine.IsState(typeof(PlayerRunState))) stateMachine.SetState(typeof(PlayerRunState)); - if (pat && holdItem) - { - holdItem = false; - pat.SetItemGravityBack(); - pat.ResetItemObject(); - } - + holdItem = false; if (!sprintIncreaseOnce) { sprintIncreaseOnce = true; @@ -519,9 +513,8 @@ public class PlayerController : Script if (holdItem) { holdItem = false; + Debug.Log("PLAYER RETURN"); pat.item.GetScript().returnBack = true; - pat.SetItemGravityBack(); - pat.ResetItemObject(); } if (isAiming) { diff --git a/Assets/Scripts/UI/SC_InverseCamera.cs b/Assets/Scripts/UI/SC_InverseCamera.cs index 81985d8a..34c97d7c 100644 --- a/Assets/Scripts/UI/SC_InverseCamera.cs +++ b/Assets/Scripts/UI/SC_InverseCamera.cs @@ -12,7 +12,6 @@ public class InverseCamera : Script public bool inverseX = false; public bool inverseY = false; - protected override void awake() { UIElement ui = GetComponent(); @@ -30,17 +29,19 @@ public class InverseCamera : Script Debug.LogError("Failed to register Toggle action for inverse"); } } - protected override void update() + protected override void start() { UIElement ui = GetComponent(); if (ui) { - Toggle toggle = ui.GetComponent(); - - if (inverseX) - Settings.inverseX = toggle.GetValue(); - if (inverseY) - Settings.inverseY = toggle.GetValue(); + ui.OnClick.RegisterAction(() => + { + Toggle toggle = ui.GetComponent(); + if(inverseX) + Settings.inverseX = toggle.GetValue(); + if(inverseY) + Settings.inverseY = toggle.GetValue(); + }); } else { diff --git a/Assets/Scripts/UI/SC_Options.cs b/Assets/Scripts/UI/SC_Options.cs index ed0f1ffe..4ff727dd 100644 --- a/Assets/Scripts/UI/SC_Options.cs +++ b/Assets/Scripts/UI/SC_Options.cs @@ -13,6 +13,7 @@ namespace SHADE_Scripting.UI public GameObject sfxVolSlider; public GameObject bgmVolSlider; public GameObject fovSlider; + public GameObject sensitivitySlider; protected override void awake() { @@ -20,6 +21,7 @@ namespace SHADE_Scripting.UI Slider sfx = sfxVolSlider.GetComponent(); Slider bgm = bgmVolSlider.GetComponent(); Slider fov = fovSlider.GetComponent(); + Slider sens = sensitivitySlider.GetComponent(); if (mv != null) { @@ -40,6 +42,12 @@ namespace SHADE_Scripting.UI fov.ScaledValue = Settings.cameraFOV; } + if (sens != null) + { + sens.ScaledValue = Settings.cameraSensitivity; + + } + } @@ -50,6 +58,7 @@ namespace SHADE_Scripting.UI Slider sfx = sfxVolSlider.GetComponent(); Slider bgm = bgmVolSlider.GetComponent(); Slider fov = fovSlider.GetComponent(); + Slider sens = sensitivitySlider.GetComponent(); if (mv != null) { @@ -71,6 +80,11 @@ namespace SHADE_Scripting.UI { Settings.cameraFOV = fov.ScaledValue; } + if (sens != null) + { + Settings.cameraSensitivity = sens.ScaledValue; + } + } diff --git a/Assets/Texture/UI/Credits/Credits.shtex.shmeta b/Assets/Texture/UI/Credits/Credits.shtex.shmeta deleted file mode 100644 index d23c3107..00000000 --- a/Assets/Texture/UI/Credits/Credits.shtex.shmeta +++ /dev/null @@ -1,3 +0,0 @@ -Name: Credits -ID: 55278388 -Type: 3 diff --git a/Assets/Texture/UI/Credits/Credits.dds b/Assets/Texture/UI/Credits/Credits_Placeholder.dds similarity index 59% rename from Assets/Texture/UI/Credits/Credits.dds rename to Assets/Texture/UI/Credits/Credits_Placeholder.dds index 2adfa0f6..65b7c0b6 100644 Binary files a/Assets/Texture/UI/Credits/Credits.dds and b/Assets/Texture/UI/Credits/Credits_Placeholder.dds differ diff --git a/Assets/Texture/UI/Credits/Credits.shtex b/Assets/Texture/UI/Credits/Credits_Placeholder.shtex similarity index 58% rename from Assets/Texture/UI/Credits/Credits.shtex rename to Assets/Texture/UI/Credits/Credits_Placeholder.shtex index 318f5273..39fbc4ee 100644 Binary files a/Assets/Texture/UI/Credits/Credits.shtex and b/Assets/Texture/UI/Credits/Credits_Placeholder.shtex differ diff --git a/Assets/Texture/UI/Credits/Credits_Placeholder.shtex.shmeta b/Assets/Texture/UI/Credits/Credits_Placeholder.shtex.shmeta new file mode 100644 index 00000000..80b9d641 --- /dev/null +++ b/Assets/Texture/UI/Credits/Credits_Placeholder.shtex.shmeta @@ -0,0 +1,3 @@ +Name: Credits_Placeholder +ID: 59379300 +Type: 3 diff --git a/Assets/Texture/UI/Level Select/LevelSelect_1_hover.dds b/Assets/Texture/UI/Level Select/LevelSelect_1_hover.dds deleted file mode 100644 index 8ba8ba30..00000000 Binary files a/Assets/Texture/UI/Level Select/LevelSelect_1_hover.dds and /dev/null differ diff --git a/Assets/Texture/UI/Level Select/LevelSelect_1_hover.shtex b/Assets/Texture/UI/Level Select/LevelSelect_1_hover.shtex deleted file mode 100644 index fe6e7338..00000000 Binary files a/Assets/Texture/UI/Level Select/LevelSelect_1_hover.shtex and /dev/null differ diff --git a/Assets/Texture/UI/Level Select/LevelSelect_1_hover.shtex.shmeta b/Assets/Texture/UI/Level Select/LevelSelect_1_hover.shtex.shmeta deleted file mode 100644 index e6c33efc..00000000 --- a/Assets/Texture/UI/Level Select/LevelSelect_1_hover.shtex.shmeta +++ /dev/null @@ -1,3 +0,0 @@ -Name: LevelSelect_1_hover -ID: 56658801 -Type: 3 diff --git a/Assets/Texture/UI/Level Select/LevelSelect_1_pressed.dds b/Assets/Texture/UI/Level Select/LevelSelect_1_pressed.dds deleted file mode 100644 index 3e7a0e52..00000000 Binary files a/Assets/Texture/UI/Level Select/LevelSelect_1_pressed.dds and /dev/null differ diff --git a/Assets/Texture/UI/Level Select/LevelSelect_1_pressed.shtex b/Assets/Texture/UI/Level Select/LevelSelect_1_pressed.shtex deleted file mode 100644 index b3710ac0..00000000 Binary files a/Assets/Texture/UI/Level Select/LevelSelect_1_pressed.shtex and /dev/null differ diff --git a/Assets/Texture/UI/Level Select/LevelSelect_1_pressed.shtex.shmeta b/Assets/Texture/UI/Level Select/LevelSelect_1_pressed.shtex.shmeta deleted file mode 100644 index e13db45b..00000000 --- a/Assets/Texture/UI/Level Select/LevelSelect_1_pressed.shtex.shmeta +++ /dev/null @@ -1,3 +0,0 @@ -Name: LevelSelect_1_pressed -ID: 58281309 -Type: 3 diff --git a/Assets/Texture/UI/Level Select/LevelSelect_2_hover.dds b/Assets/Texture/UI/Level Select/LevelSelect_2_hover.dds deleted file mode 100644 index 1466a5c1..00000000 Binary files a/Assets/Texture/UI/Level Select/LevelSelect_2_hover.dds and /dev/null differ diff --git a/Assets/Texture/UI/Level Select/LevelSelect_2_hover.shtex b/Assets/Texture/UI/Level Select/LevelSelect_2_hover.shtex deleted file mode 100644 index 91c54703..00000000 Binary files a/Assets/Texture/UI/Level Select/LevelSelect_2_hover.shtex and /dev/null differ diff --git a/Assets/Texture/UI/Level Select/LevelSelect_2_hover.shtex.shmeta b/Assets/Texture/UI/Level Select/LevelSelect_2_hover.shtex.shmeta deleted file mode 100644 index 94091187..00000000 --- a/Assets/Texture/UI/Level Select/LevelSelect_2_hover.shtex.shmeta +++ /dev/null @@ -1,3 +0,0 @@ -Name: LevelSelect_2_hover -ID: 66730012 -Type: 3 diff --git a/Assets/Texture/UI/Level Select/LevelSelect_2_pressed.dds b/Assets/Texture/UI/Level Select/LevelSelect_2_pressed.dds deleted file mode 100644 index a3064fd0..00000000 Binary files a/Assets/Texture/UI/Level Select/LevelSelect_2_pressed.dds and /dev/null differ diff --git a/Assets/Texture/UI/Level Select/LevelSelect_2_pressed.shtex b/Assets/Texture/UI/Level Select/LevelSelect_2_pressed.shtex deleted file mode 100644 index 99fdfa44..00000000 Binary files a/Assets/Texture/UI/Level Select/LevelSelect_2_pressed.shtex and /dev/null differ diff --git a/Assets/Texture/UI/Level Select/LevelSelect_2_pressed.shtex.shmeta b/Assets/Texture/UI/Level Select/LevelSelect_2_pressed.shtex.shmeta deleted file mode 100644 index 1b23a485..00000000 --- a/Assets/Texture/UI/Level Select/LevelSelect_2_pressed.shtex.shmeta +++ /dev/null @@ -1,3 +0,0 @@ -Name: LevelSelect_2_pressed -ID: 59730316 -Type: 3 diff --git a/Assets/Texture/UI/Level Select/LevelSelect_3_hover.dds b/Assets/Texture/UI/Level Select/LevelSelect_3_hover.dds deleted file mode 100644 index 994afa9a..00000000 Binary files a/Assets/Texture/UI/Level Select/LevelSelect_3_hover.dds and /dev/null differ diff --git a/Assets/Texture/UI/Level Select/LevelSelect_3_hover.shtex b/Assets/Texture/UI/Level Select/LevelSelect_3_hover.shtex deleted file mode 100644 index a7ea89ec..00000000 Binary files a/Assets/Texture/UI/Level Select/LevelSelect_3_hover.shtex and /dev/null differ diff --git a/Assets/Texture/UI/Level Select/LevelSelect_3_hover.shtex.shmeta b/Assets/Texture/UI/Level Select/LevelSelect_3_hover.shtex.shmeta deleted file mode 100644 index e005a4f5..00000000 --- a/Assets/Texture/UI/Level Select/LevelSelect_3_hover.shtex.shmeta +++ /dev/null @@ -1,3 +0,0 @@ -Name: LevelSelect_3_hover -ID: 66852283 -Type: 3 diff --git a/Assets/Texture/UI/Level Select/LevelSelect_3_pressed.dds b/Assets/Texture/UI/Level Select/LevelSelect_3_pressed.dds deleted file mode 100644 index 0886d6ac..00000000 Binary files a/Assets/Texture/UI/Level Select/LevelSelect_3_pressed.dds and /dev/null differ diff --git a/Assets/Texture/UI/Level Select/LevelSelect_3_pressed.shtex b/Assets/Texture/UI/Level Select/LevelSelect_3_pressed.shtex deleted file mode 100644 index 514fcea5..00000000 Binary files a/Assets/Texture/UI/Level Select/LevelSelect_3_pressed.shtex and /dev/null differ diff --git a/Assets/Texture/UI/Level Select/LevelSelect_3_pressed.shtex.shmeta b/Assets/Texture/UI/Level Select/LevelSelect_3_pressed.shtex.shmeta deleted file mode 100644 index 87bdf222..00000000 --- a/Assets/Texture/UI/Level Select/LevelSelect_3_pressed.shtex.shmeta +++ /dev/null @@ -1,3 +0,0 @@ -Name: LevelSelect_3_pressed -ID: 53081657 -Type: 3 diff --git a/Dependencies.bat b/Dependencies.bat index 30c5e24f..5445a36a 100644 --- a/Dependencies.bat +++ b/Dependencies.bat @@ -21,10 +21,11 @@ echo "N - dotnet" echo "O - tinyddsloader" echo "P - fmod" echo "Q - vswhere" +echo "R - ShaderCompiler" echo --------------------------------------------------- echo. -choice /C ABCDEFGHIJKLMNOPQ +choice /C ABCDEFGHIJKLMNOPQR set _e=%ERRORLEVEL% if %_e%==1 goto VMA @@ -44,6 +45,7 @@ if %_e%==14 goto dotnet if %_e%==15 goto tinyddsloader if %_e%==16 goto fmod if %_e%==17 goto vswhere +if %_e%==18 goto ShaderCompiler :VMA echo -----------------------VMA---------------------------- @@ -163,6 +165,13 @@ echo -----------------------vswhere---------------------------- rmdir "Dependencies/vswhere" /S /Q mkdir "Dependencies/vswhere" powershell -Command "& {wget https://github.com/microsoft/vswhere/releases/download/3.1.1/vswhere.exe -OutFile "Dependencies/vswhere/vswhere.exe"}" +if %_e%==17 (goto:done) else (goto:ShaderCompiler) + +:ShaderCompiler +echo ------------------ShaderCompiler------------------ +rmdir "Dependencies/ShaderCompiler" /S /Q +mkdir "Dependencies/ShaderCompiler" +git clone https://github.com/SHADE-DP/ShaderCompiler.git "Dependencies/ShaderCompiler" :done echo DONE! diff --git a/Dependencies.lua b/Dependencies.lua index 2694fe35..974fbbce 100644 --- a/Dependencies.lua +++ b/Dependencies.lua @@ -17,4 +17,5 @@ IncludeDir["VULKAN"] = "$(VULKAN_SDK)" IncludeDir["dotnet"] = "%{wks.location}\\Dependencies\\dotnet" IncludeDir["tinyddsloader"] = "%{wks.location}\\Dependencies\\tinyddsloader" IncludeDir["fmod"] = "%{wks.location}\\Dependencies\\fmod" -IncludeDir["vswhere"] = "%{wks.location}\\Dependencies\\vswhere" \ No newline at end of file +IncludeDir["vswhere"] = "%{wks.location}\\Dependencies\\vswhere" +IncludeDir["ShaderCompiler"] = "%{wks.location}\\Dependencies\\ShaderCompiler" \ No newline at end of file diff --git a/SHADE_Engine/premake5.lua b/SHADE_Engine/premake5.lua index 17ca5be8..fbb8b19e 100644 --- a/SHADE_Engine/premake5.lua +++ b/SHADE_Engine/premake5.lua @@ -67,7 +67,6 @@ project "SHADE_Engine" "vulkan-1.lib", "SDL2.lib", "SDL2main.lib", - "shaderc_shared.lib", "shlwapi.lib" } @@ -120,9 +119,6 @@ project "SHADE_Engine" filter "configurations:Debug" postbuildcommands { - "xcopy /r /y /q \"%{IncludeDir.ModelCompiler}\\bin\\Debug\\assimp-vc142-mtd.dll\" \"$(OutDir)\"", - "xcopy /r /y /q \"%{IncludeDir.ModelCompiler}\\bin\\Debug\\ModelCompiler.exe\" \"$(OutDir)\"", - "xcopy /r /y /q \"%{IncludeDir.FontCompiler}\\bin\\Debug\\FontCompiler.exe\" \"$(OutDir)\"", "xcopy /r /y /q \"%{IncludeDir.fmod}\\lib\\fmodL.dll\" \"$(OutDir)\"", "xcopy /r /y /q \"%{IncludeDir.fmod}\\lib\\fmodstudioL.dll\" \"$(OutDir)\"", "xcopy /r /y /q \"%{IncludeDir.vswhere}\\vswhere.exe\" \"$(OutDir)\"" @@ -131,9 +127,6 @@ project "SHADE_Engine" filter "configurations:Release" postbuildcommands { - "xcopy /r /y /q \"%{IncludeDir.ModelCompiler}\\bin\\Release\\assimp-vc142-mt.dll\" \"$(OutDir)\"", - "xcopy /r /y /q \"%{IncludeDir.ModelCompiler}\\bin\\Release\\ModelCompiler.exe\" \"$(OutDir)\"", - "xcopy /r /y /q \"%{IncludeDir.FontCompiler}\\bin\\Release\\FontCompiler.exe\" \"$(OutDir)\"", "xcopy /r /y /q \"%{IncludeDir.fmod}\\lib\\fmod.dll\" \"$(OutDir)\"", "xcopy /r /y /q \"%{IncludeDir.fmod}\\lib\\fmodstudio.dll\" \"$(OutDir)\"", "xcopy /r /y /q \"%{IncludeDir.vswhere}\\vswhere.exe\" \"$(OutDir)\"" @@ -147,12 +140,6 @@ project "SHADE_Engine" "xcopy /r /y /q \"%{IncludeDir.fmod}\\lib\\fmodstudio.dll\" \"$(OutDir)\"" } - filter "configurations:Publish" - postbuildcommands - { - --"xcopy /r /y /q \"%{IncludeDir.assimp}\\bin\\Release\\assimp-vc142-mt.dll\" \"$(OutDir)\"" - } - warnings 'Extra' filter "configurations:Debug" diff --git a/SHADE_Engine/src/Assets/Libraries/Compilers/SHShaderSourceCompiler.cpp b/SHADE_Engine/src/Assets/Libraries/Compilers/SHShaderSourceCompiler.cpp deleted file mode 100644 index 0bde59c7..00000000 --- a/SHADE_Engine/src/Assets/Libraries/Compilers/SHShaderSourceCompiler.cpp +++ /dev/null @@ -1,164 +0,0 @@ -/*************************************************************************//** - * \file SHShaderSourceCompiler.cpp - * \author Loh Xiao Qi - * \date 23 10 2022 - * \brief - * - * Copyright (C) 2022 DigiPen Institute of Technology. Reproduction or - * disclosure of this file or its contents without the prior written consent - * of DigiPen Institute of Technology is prohibited. - *****************************************************************************/ -#include "SHpch.h" -#include "SHShaderSourceCompiler.h" -#include "shaderc/shaderc.hpp" -#include "Events/SHEventManager.hpp" - -#include -#include -#include -#include - -namespace SHADE -{ - std::string SHShaderSourceCompiler::CompileShaderSourceToBinary(AssetPath path, SHShaderAsset const& data) noexcept - { - std::string newPath{ path.string() }; - newPath = newPath.substr(0, newPath.find_last_of('.')); - newPath += SHADER_BUILT_IN_EXTENSION.data(); - - std::ofstream file{ newPath, std::ios::binary | std::ios::out | std::ios::trunc }; - - file.write( - reinterpret_cast(& data.shaderType), sizeof(uint8_t) - ); - - size_t const byteCount = sizeof(uint32_t) * data.spirvBinary.size(); - - file.write( - reinterpret_cast(&byteCount), sizeof(size_t) - ); - - file.write( - reinterpret_cast(data.spirvBinary.data()), byteCount - ); - - file.close(); - - return newPath; - } - - SHShaderAsset const* SHShaderSourceCompiler::CompileShaderSourceToMemory(std::string const& data, std::string const& name, SH_SHADER_TYPE type) noexcept - { - // shaderc compiler - shaderc::Compiler compiler; - shaderc::CompileOptions options; - - options.AddMacroDefinition("MY_DEFINE", "1"); - - //TODO: Check if we need optimisation levels when compiling into spirv - // Set optimization levels - //if (opLevel != shaderc_optimization_level_zero) - // options.SetOptimizationLevel(opLevel); - - // Attempt to get the shaderc equivalent shader stage - shaderc_shader_kind shaderKind; - switch (type) - { - case SH_SHADER_TYPE::VERTEX: - shaderKind = shaderc_shader_kind::shaderc_glsl_vertex_shader; - break; - case SH_SHADER_TYPE::FRAGMENT: - shaderKind = shaderc_shader_kind::shaderc_glsl_fragment_shader; - break; - case SH_SHADER_TYPE::COMPUTE: - shaderKind = shaderc_shader_kind::shaderc_glsl_compute_shader; - break; - default: - shaderKind = shaderc_shader_kind::shaderc_glsl_vertex_shader; - break; - } - - // Compile the shader and get the result - shaderc::SpvCompilationResult compileResult = compiler.CompileGlslToSpv(data, shaderKind, name.c_str(), options); - - if (compileResult.GetCompilationStatus() != shaderc_compilation_status_success) - { - SHLOG_ERROR("Shaderc failed to compile GLSL shader to binary | " + compileResult.GetErrorMessage()); - return nullptr; - } - - auto result = new SHShaderAsset(); - result->spirvBinary.resize(compileResult.end() - compileResult.begin()); - - std::ranges::copy(compileResult.begin(), compileResult.end(), result->spirvBinary.data()); - - result->name = name; - result->shaderType = type; - - return result; - } - - SH_SHADER_TYPE SHShaderSourceCompiler::GetShaderTypeFromFilename(std::string name) noexcept - { - for (auto i { 0 }; i < SHADER_TYPE_MAX_COUNT; ++i) - { - const auto& [SHADER_SUFFIX, SHADER_TYPE] = SHADER_IDENTIFIERS[i]; - if (name.find(SHADER_SUFFIX.data()) != std::string::npos) - { - return SHADER_TYPE; - } - } - - return SH_SHADER_TYPE::INAVLID_TYPE; - } - - std::optional SHShaderSourceCompiler::LoadAndCompileShader(AssetPath path) noexcept - { - auto type = GetShaderTypeFromFilename(path.filename().string()); - - if (type == SH_SHADER_TYPE::INAVLID_TYPE) - { - SHLOG_ERROR("Invalid filename for shaders, follow suffix in SHAssetMacros.h: {}", path.string()); - return {}; - } - - path.make_preferred(); - - std::ifstream file{ path.string(), std::ios::in }; - - if (file.is_open()) - { - std::stringstream stream; - - stream << file.rdbuf(); - - std::string const content = stream.str(); - - auto data = CompileShaderSourceToMemory(content, path.filename().string(), type); - - if (data == nullptr) - { - return{}; - } - - return CompileShaderSourceToBinary(path, *data); - } - - SHLOG_ERROR("Unable to open shader file: {}", path.string()); - - return {}; - } - - std::optional SHShaderSourceCompiler::CompileShaderFromString - (std::string const& string, AssetPath path, SH_SHADER_TYPE type) noexcept - { - auto const data = CompileShaderSourceToMemory(string, path.filename().string(), type); - - if (data == nullptr) - { - return{}; - } - - return CompileShaderSourceToBinary(path, *data); - } -} diff --git a/SHADE_Engine/src/Assets/Libraries/Compilers/SHShaderSourceCompiler.h b/SHADE_Engine/src/Assets/Libraries/Compilers/SHShaderSourceCompiler.h deleted file mode 100644 index 4ba87050..00000000 --- a/SHADE_Engine/src/Assets/Libraries/Compilers/SHShaderSourceCompiler.h +++ /dev/null @@ -1,31 +0,0 @@ -/*************************************************************************//** - * \file SHShaderSourceCompiler.h - * \author Loh Xiao Qi - * \date 23 10 2022 - * \brief - * - * Copyright (C) 2022 DigiPen Institute of Technology. Reproduction or - * disclosure of this file or its contents without the prior written consent - * of DigiPen Institute of Technology is prohibited. - *****************************************************************************/ -#pragma once - -#include "Assets/SHAssetMacros.h" -#include "Assets/Asset Types/SHShaderAsset.h" - -namespace SHADE -{ - class SHShaderSourceCompiler - { - private: - static std::string CompileShaderSourceToBinary(AssetPath path, SHShaderAsset const& data) noexcept; - static SHShaderAsset const* CompileShaderSourceToMemory(std::string const& data, std::string const& name, SH_SHADER_TYPE type) noexcept; - - static SH_SHADER_TYPE GetShaderTypeFromFilename(std::string name) noexcept; - - public: - static std::optional LoadAndCompileShader(AssetPath path) noexcept; - static std::optional CompileShaderFromString - (std::string const& string, AssetPath path, SH_SHADER_TYPE type) noexcept; - }; -} diff --git a/SHADE_Engine/src/Assets/SHAssetMacros.h b/SHADE_Engine/src/Assets/SHAssetMacros.h index 0616471c..0f037d07 100644 --- a/SHADE_Engine/src/Assets/SHAssetMacros.h +++ b/SHADE_Engine/src/Assets/SHAssetMacros.h @@ -78,6 +78,7 @@ constexpr std::string_view BUILT_IN_ASSET_ROOT{ "../../Built_In" }; // COMPILER EXE constexpr std::string_view MODEL_COMPILER_EXE{ "ModelCompiler.exe" }; constexpr std::string_view FONT_COMPILER_EXE{ "FontCompiler.exe" }; +constexpr std::string_view SHADER_COMPILER_EXE{ "ShaderCompiler.exe" }; // INTERNAL ASSET PATHS constexpr std::string_view SCENE_FOLDER{ "/Scenes/" }; diff --git a/SHADE_Engine/src/Assets/SHAssetManager.cpp b/SHADE_Engine/src/Assets/SHAssetManager.cpp index 14b5b0a7..1a141023 100644 --- a/SHADE_Engine/src/Assets/SHAssetManager.cpp +++ b/SHADE_Engine/src/Assets/SHAssetManager.cpp @@ -29,7 +29,6 @@ #include "Asset Types/SHAnimClipContainerAsset.h" #include "Libraries/Compilers/SHTextureCompiler.h" -#include "Libraries/Compilers/SHShaderSourceCompiler.h" #include "Filesystem/SHFileSystem.h" #include @@ -483,13 +482,13 @@ namespace SHADE auto const ext{ path.extension().string() }; if (ext == GLSL_EXTENSION.data()) { - auto value { SHShaderSourceCompiler::LoadAndCompileShader(path) }; - if (!value.has_value()) - { - SHLOG_ERROR("Shader compile failed: {}", path.string()); - return; - } - newPath = value.value(); + std::string command {SHADER_COMPILER_EXE.data()}; + command += " " + path.string(); + std::system(command.c_str()); + + std::string shaderPath = path.string().substr(0, path.string().find_last_of('.')); + shaderPath += SHADER_BUILT_IN_EXTENSION; + newPath = shaderPath; } else if (ext == GLTF_EXTENSION.data() || ext == FBX_EXTENSION.data()) { diff --git a/premake5.lua b/premake5.lua index 26f181b5..23ab63ac 100644 --- a/premake5.lua +++ b/premake5.lua @@ -27,9 +27,9 @@ workspace "SHADE" group "Dependencies" include "Dependencies/FontCompiler/Dependencies/msdf" include "Dependencies/imgui" - --include "Dependencies/tracy" include "Dependencies/yamlcpp" include "Dependencies/reactphysics3d" include "Dependencies/ModelCompiler" include "Dependencies/FontCompiler" + include "Dependencies/ShaderCompiler" group ""