Skip to content

Commit

Permalink
Fixed some performance bugs, starting to add IMU Sensor
Browse files Browse the repository at this point in the history
  • Loading branch information
@jedjoud10
jedjoud10 committed Dec 7, 2019
1 parent d6323f1 commit 2a096f5
Show file tree
Hide file tree
Showing 20 changed files with 323 additions and 759 deletions.
Binary file added ...ts/Player/Building Mechanic/Pieces/DamageCube/DamageCube_ TextureSmoothness.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
13 changes: 9 additions & 4 deletions Assets/Player/Building Mechanic/Pieces/DamageCube/DamageCube_MAT.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: DamageCube_MAT
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_ShaderKeywords: _METALLICGLOSSMAP
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand Down Expand Up @@ -44,7 +44,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 834f4769f486cce419aa4bde49b7e68a, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
Expand All @@ -55,13 +55,17 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _SpecGlossMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 0.4
- _Glossiness: 0
- _GlossMapScale: 1
- _Glossiness: 0.996
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
Expand All @@ -75,3 +79,4 @@ Material:
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
- _SpecColor: {r: 1, g: 1, b: 1, a: 0}
6 changes: 3 additions & 3 deletions Assets/Player/Building Mechanic/Pieces/DistanceSensorPiece/DistanceSensor_MAT.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: DistanceSensor_MAT
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_ShaderKeywords: _METALLICGLOSSMAP
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand Down Expand Up @@ -44,7 +44,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 71d9db41038688a44bd02b6f7d258832, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
Expand All @@ -60,7 +60,7 @@ Material:
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 0
- _GlossMapScale: 1
- _Glossiness: 0
- _GlossyReflections: 1
- _Metallic: 0
Expand Down
Binary file added ...ilding Mechanic/Pieces/DistanceSensorPiece/DistanceSensor_TextureSmoothness.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file added Assets/Player/Building Mechanic/Pieces/IMUSensorPiece/GyroAccelIMU.blend
View file
Binary file not shown.
Binary file added Assets/Player/Building Mechanic/Pieces/IMUSensorPiece/IMUSensorPiece.blend
View file
Binary file not shown.
8 changes: 4 additions & 4 deletions Assets/Player/Building Mechanic/Pieces/StructuralPieceWheel/StructuralPieceWheel_MAT.mat
View file
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ Material:
m_PrefabAsset: {fileID: 0}
m_Name: StructuralPieceWheel_MAT
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords: _SMOOTHNESS_TEXTURE_ALBEDO_CHANNEL_A
m_ShaderKeywords: _METALLICGLOSSMAP
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand Down Expand Up @@ -44,7 +44,7 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 920b193ce1ee06847bde81d367448645, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
Expand All @@ -60,14 +60,14 @@ Material:
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 0
- _GlossMapScale: 0.712
- _Glossiness: 1
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 1
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
Expand Down
Binary file added ...Mechanic/Pieces/StructuralPieceWheel/WheelStructuralPiece_TextureSmoothness.png
View file
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
67 changes: 34 additions & 33 deletions Assets/Resources/Pieces prefabs/ControlUnit.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -159,13 +159,13 @@ ReflectionProbe:
m_Mode: 1
m_RefreshMode: 1
m_TimeSlicingMode: 0
m_Resolution: 128
m_Resolution: 32
m_UpdateFrequency: 0
m_BoxSize: {x: 1, y: 1, z: 1}
m_BoxOffset: {x: 0, y: 0, z: 0}
m_NearClip: 0.3
m_FarClip: 1000
m_ShadowDistance: 100
m_FarClip: 100
m_ShadowDistance: 0
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_CullingMask:
Expand Down Expand Up @@ -273,6 +273,7 @@ MonoBehaviour:
m_EditorClassIdentifier:
health: 0
max_health: 100
myParentPiece: {fileID: 0}
myrigidbody: {fileID: 8173728015489032248}
myjoint: {fileID: 3177270699153397169}
myname: ControlUnit
Expand All @@ -283,6 +284,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 9194485915667703389}
m_Modifications:
- target: {fileID: 5465372477067484597, guid: b939cd4509d57a441b201854140f4dfc,
type: 3}
propertyPath: m_Name
value: Z2
objectReference: {fileID: 0}
- target: {fileID: 8634717553174820471, guid: b939cd4509d57a441b201854140f4dfc,
type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -338,11 +344,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5465372477067484597, guid: b939cd4509d57a441b201854140f4dfc,
type: 3}
propertyPath: m_Name
value: Z2
objectReference: {fileID: 0}
- target: {fileID: 5365440421407594045, guid: b939cd4509d57a441b201854140f4dfc,
type: 3}
propertyPath: parent
Expand All @@ -363,6 +364,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 9194485915667703389}
m_Modifications:
- target: {fileID: 5465372477067484597, guid: b939cd4509d57a441b201854140f4dfc,
type: 3}
propertyPath: m_Name
value: Y2
objectReference: {fileID: 0}
- target: {fileID: 8634717553174820471, guid: b939cd4509d57a441b201854140f4dfc,
type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -418,11 +424,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5465372477067484597, guid: b939cd4509d57a441b201854140f4dfc,
type: 3}
propertyPath: m_Name
value: Y2
objectReference: {fileID: 0}
- target: {fileID: 5365440421407594045, guid: b939cd4509d57a441b201854140f4dfc,
type: 3}
propertyPath: parent
Expand All @@ -443,6 +444,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 9194485915667703389}
m_Modifications:
- target: {fileID: 5465372477067484597, guid: b939cd4509d57a441b201854140f4dfc,
type: 3}
propertyPath: m_Name
value: X2
objectReference: {fileID: 0}
- target: {fileID: 8634717553174820471, guid: b939cd4509d57a441b201854140f4dfc,
type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -498,11 +504,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 90.309006
objectReference: {fileID: 0}
- target: {fileID: 5465372477067484597, guid: b939cd4509d57a441b201854140f4dfc,
type: 3}
propertyPath: m_Name
value: X2
objectReference: {fileID: 0}
- target: {fileID: 5365440421407594045, guid: b939cd4509d57a441b201854140f4dfc,
type: 3}
propertyPath: parent
Expand All @@ -523,6 +524,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 9194485915667703389}
m_Modifications:
- target: {fileID: 5465372477067484597, guid: b939cd4509d57a441b201854140f4dfc,
type: 3}
propertyPath: m_Name
value: Y1
objectReference: {fileID: 0}
- target: {fileID: 8634717553174820471, guid: b939cd4509d57a441b201854140f4dfc,
type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -578,11 +584,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5465372477067484597, guid: b939cd4509d57a441b201854140f4dfc,
type: 3}
propertyPath: m_Name
value: Y1
objectReference: {fileID: 0}
- target: {fileID: 5365440421407594045, guid: b939cd4509d57a441b201854140f4dfc,
type: 3}
propertyPath: parent
Expand All @@ -603,6 +604,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 9194485915667703389}
m_Modifications:
- target: {fileID: 5465372477067484597, guid: b939cd4509d57a441b201854140f4dfc,
type: 3}
propertyPath: m_Name
value: X1
objectReference: {fileID: 0}
- target: {fileID: 8634717553174820471, guid: b939cd4509d57a441b201854140f4dfc,
type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -658,11 +664,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: -90.00001
objectReference: {fileID: 0}
- target: {fileID: 5465372477067484597, guid: b939cd4509d57a441b201854140f4dfc,
type: 3}
propertyPath: m_Name
value: X1
objectReference: {fileID: 0}
- target: {fileID: 5365440421407594045, guid: b939cd4509d57a441b201854140f4dfc,
type: 3}
propertyPath: parent
Expand All @@ -683,6 +684,11 @@ PrefabInstance:
m_Modification:
m_TransformParent: {fileID: 9194485915667703389}
m_Modifications:
- target: {fileID: 5465372477067484597, guid: b939cd4509d57a441b201854140f4dfc,
type: 3}
propertyPath: m_Name
value: Z1
objectReference: {fileID: 0}
- target: {fileID: 8634717553174820471, guid: b939cd4509d57a441b201854140f4dfc,
type: 3}
propertyPath: m_LocalPosition.x
Expand Down Expand Up @@ -738,11 +744,6 @@ PrefabInstance:
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5465372477067484597, guid: b939cd4509d57a441b201854140f4dfc,
type: 3}
propertyPath: m_Name
value: Z1
objectReference: {fileID: 0}
- target: {fileID: 5365440421407594045, guid: b939cd4509d57a441b201854140f4dfc,
type: 3}
propertyPath: parent
Expand Down
6 changes: 3 additions & 3 deletions Assets/Resources/Pieces prefabs/DamageCubePiece.prefab
View file
Original file line number Diff line number Diff line change
Expand Up @@ -265,13 +265,13 @@ ReflectionProbe:
m_Mode: 1
m_RefreshMode: 1
m_TimeSlicingMode: 0
m_Resolution: 128
m_Resolution: 32
m_UpdateFrequency: 0
m_BoxSize: {x: 1, y: 1, z: 1}
m_BoxOffset: {x: 0, y: 0, z: 0}
m_NearClip: 0.3
m_FarClip: 1000
m_ShadowDistance: 100
m_FarClip: 100
m_ShadowDistance: 0
m_ClearFlags: 1
m_BackGroundColor: {r: 0.19215687, g: 0.3019608, b: 0.4745098, a: 0}
m_CullingMask:
Expand Down
Loading

0 comments on commit 2a096f5

Please sign in to comment.