diff --git a/Assets/Materials/1mGrid.mat b/Assets/Materials/1mGrid.mat new file mode 100644 index 0000000..57ad07d --- /dev/null +++ b/Assets/Materials/1mGrid.mat @@ -0,0 +1,77 @@ +%YAML 1.1 +%TAG !u! tag:unity3d.com,2011: +--- !u!21 &2100000 +Material: + serializedVersion: 6 + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_Name: 1mGrid + m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0} + m_ShaderKeywords: _SPECULARHIGHLIGHTS_OFF + m_LightmapFlags: 4 + m_EnableInstancingVariants: 0 + m_DoubleSidedGI: 0 + m_CustomRenderQueue: -1 + stringTagMap: {} + disabledShaderPasses: [] + m_SavedProperties: + serializedVersion: 3 + m_TexEnvs: + - _BumpMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailAlbedoMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailMask: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _DetailNormalMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _EmissionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 50, y: 50} + m_Offset: {x: 0, y: 0} + - _MainTex: + m_Texture: {fileID: 10309, guid: 0000000000000000f000000000000000, type: 0} + m_Scale: {x: 50, y: 50} + m_Offset: {x: 0, y: 0} + - _MetallicGlossMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _OcclusionMap: + m_Texture: {fileID: 0} + m_Scale: {x: 1, y: 1} + m_Offset: {x: 0, y: 0} + - _ParallaxMap: + 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: 1 + - _Glossiness: 0 + - _GlossyReflections: 1 + - _Metallic: 0 + - _Mode: 0 + - _OcclusionStrength: 1 + - _Parallax: 0.02 + - _SmoothnessTextureChannel: 0 + - _SpecularHighlights: 0 + - _SrcBlend: 1 + - _UVSec: 0 + - _ZWrite: 1 + m_Colors: + - _Color: {r: 1, g: 1, b: 1, a: 1} + - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Materials/1mGrid.mat.meta b/Assets/Materials/1mGrid.mat.meta new file mode 100644 index 0000000..247dd94 --- /dev/null +++ b/Assets/Materials/1mGrid.mat.meta @@ -0,0 +1,8 @@ +fileFormatVersion: 2 +guid: 15086992ae8979e41b41278c8a1e8d9b +NativeFormatImporter: + externalObjects: {} + mainObjectFileID: 0 + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/Models/Drum/Drum.mat b/Assets/Models/Drum/Drum.mat index 5ffdb7e..25305c3 100644 --- a/Assets/Models/Drum/Drum.mat +++ b/Assets/Models/Drum/Drum.mat @@ -61,9 +61,9 @@ Material: - _DetailNormalMapScale: 1 - _DstBlend: 0 - _GlossMapScale: 1 - - _Glossiness: 0 + - _Glossiness: 0.28 - _GlossyReflections: 1 - - _Metallic: 0.306 + - _Metallic: 0.337 - _Mode: 0 - _OcclusionStrength: 1 - _Parallax: 0.02 @@ -73,5 +73,5 @@ Material: - _UVSec: 0 - _ZWrite: 1 m_Colors: - - _Color: {r: 0.6415094, g: 0.0585726, b: 0, a: 1} + - _Color: {r: 0.5471698, g: 0.09459955, b: 0.04903879, a: 1} - _EmissionColor: {r: 0, g: 0, b: 0, a: 1} diff --git a/Assets/Prefabs/UICanvas.prefab b/Assets/Prefabs/UICanvas.prefab index af34736..ea4fbc7 100644 --- a/Assets/Prefabs/UICanvas.prefab +++ b/Assets/Prefabs/UICanvas.prefab @@ -1,5 +1,160 @@ %YAML 1.1 %TAG !u! tag:unity3d.com,2011: +--- !u!1 &658995205750819484 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 904313598384789345} + - component: {fileID: 974785761712433978} + - component: {fileID: 4089095446064027149} + m_Layer: 5 + m_Name: ValueMPH + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &904313598384789345 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658995205750819484} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3803376022326290515} + m_RootOrder: 0 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 27.5} + m_SizeDelta: {x: -20, y: -75} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &974785761712433978 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658995205750819484} + m_CullTransparentMesh: 0 +--- !u!114 &4089095446064027149 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 658995205750819484} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 0 mph + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_outlineColor: + serializedVersion: 2 + rgba: 4278190080 + m_fontSize: 28 + m_fontSizeBase: 28 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_textAlignment: 513 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_firstOverflowCharacterIndex: -1 + m_linkedTextComponent: {fileID: 0} + m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_ignoreRectMaskCulling: 0 + m_ignoreCulling: 1 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_VertexBufferAutoSizeReduction: 1 + m_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_textInfo: + textComponent: {fileID: 4089095446064027149} + characterCount: 5 + spriteCount: 0 + spaceCount: 1 + wordCount: 2 + linkCount: 0 + lineCount: 1 + pageCount: 1 + materialCount: 1 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_hasFontAssetChanged: 0 + m_subTextObjects: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} --- !u!1 &7490659992903673518 GameObject: m_ObjectHideFlags: 0 @@ -311,15 +466,15 @@ RectTransform: m_GameObject: {fileID: 7490659993213235943} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 6, y: 10, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: [] m_Father: {fileID: 7490659994526626361} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0.5, y: 0.5} - m_AnchorMax: {x: 0.5, y: 0.5} - m_AnchoredPosition: {x: 50, y: 0} - m_SizeDelta: {x: 200, y: 50} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: 0} + m_SizeDelta: {x: -20, y: -20} m_Pivot: {x: 0.5, y: 0.5} --- !u!222 &7490659993213235938 CanvasRenderer: @@ -375,10 +530,10 @@ MonoBehaviour: m_outlineColor: serializedVersion: 2 rgba: 4278190080 - m_fontSize: 44.75 - m_fontSizeBase: 36 + m_fontSize: 32 + m_fontSizeBase: 32 m_fontWeight: 400 - m_enableAutoSizing: 1 + m_enableAutoSizing: 0 m_fontSizeMin: 18 m_fontSizeMax: 72 m_fontStyle: 0 @@ -549,6 +704,7 @@ RectTransform: m_Children: - {fileID: 7490659993546846451} - {fileID: 7490659994526626361} + - {fileID: 3803376022326290515} m_Father: {fileID: 0} m_RootOrder: 0 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} @@ -1355,17 +1511,17 @@ RectTransform: m_GameObject: {fileID: 7490659994526626360} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} m_LocalPosition: {x: 0, y: 0, z: 0} - m_LocalScale: {x: 0.1, y: 0.1, z: 1} + m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 7490659993213235936} m_Father: {fileID: 7490659993866479126} m_RootOrder: 1 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} - m_AnchorMin: {x: 0, y: 0} + m_AnchorMin: {x: 1, y: 1} m_AnchorMax: {x: 1, y: 1} - m_AnchoredPosition: {x: 476, y: 243} - m_SizeDelta: {x: 0, y: 0} - m_Pivot: {x: 0.5, y: 0.5} + m_AnchoredPosition: {x: -10, y: -10} + m_SizeDelta: {x: 150, y: 75} + m_Pivot: {x: 1, y: 1} --- !u!222 &7490659994526626356 CanvasRenderer: m_ObjectHideFlags: 0 @@ -1571,3 +1727,249 @@ MonoBehaviour: - {fileID: 0} m_baseMaterial: {fileID: 0} m_maskOffset: {x: 0, y: 0, z: 0, w: 0} +--- !u!1 &7493181846766822533 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 3803376022326290515} + - component: {fileID: 6594808609043690884} + - component: {fileID: 4715550091247745567} + - component: {fileID: 7334580760063416860} + m_Layer: 5 + m_Name: Speedometer + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &3803376022326290515 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7493181846766822533} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: + - {fileID: 904313598384789345} + - {fileID: 5405321938074979013} + m_Father: {fileID: 7490659993866479126} + m_RootOrder: 2 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 1, y: 1} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: -10, y: -95} + m_SizeDelta: {x: 150, y: 120} + m_Pivot: {x: 1, y: 1} +--- !u!222 &6594808609043690884 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7493181846766822533} + m_CullTransparentMesh: 0 +--- !u!114 &4715550091247745567 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7493181846766822533} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: fe87c0e1cc204ed48ad3b37840f39efc, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 0.392} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_Sprite: {fileID: 10907, guid: 0000000000000000f000000000000000, type: 0} + m_Type: 1 + m_PreserveAspect: 0 + m_FillCenter: 1 + m_FillMethod: 4 + m_FillAmount: 1 + m_FillClockwise: 1 + m_FillOrigin: 0 + m_UseSpriteMesh: 0 + m_PixelsPerUnitMultiplier: 1 +--- !u!114 &7334580760063416860 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 7493181846766822533} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 191e2d9bed2cacc4785528a6a3412575, type: 3} + m_Name: + m_EditorClassIdentifier: + textMilesPerHour: {fileID: 4089095446064027149} + textMetersPerSecond: {fileID: 3769667023307713410} + robot: {fileID: 0} +--- !u!1 &8731379560108414760 +GameObject: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + serializedVersion: 6 + m_Component: + - component: {fileID: 5405321938074979013} + - component: {fileID: 7393720651942017326} + - component: {fileID: 3769667023307713410} + m_Layer: 5 + m_Name: ValueMPS + m_TagString: Untagged + m_Icon: {fileID: 0} + m_NavMeshLayer: 0 + m_StaticEditorFlags: 0 + m_IsActive: 1 +--- !u!224 &5405321938074979013 +RectTransform: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8731379560108414760} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalScale: {x: 1, y: 1, z: 1} + m_Children: [] + m_Father: {fileID: 3803376022326290515} + m_RootOrder: 1 + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} + m_AnchorMin: {x: 0, y: 0} + m_AnchorMax: {x: 1, y: 1} + m_AnchoredPosition: {x: 0, y: -27.5} + m_SizeDelta: {x: -20, y: -75} + m_Pivot: {x: 0.5, y: 0.5} +--- !u!222 &7393720651942017326 +CanvasRenderer: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8731379560108414760} + m_CullTransparentMesh: 0 +--- !u!114 &3769667023307713410 +MonoBehaviour: + m_ObjectHideFlags: 0 + m_CorrespondingSourceObject: {fileID: 0} + m_PrefabInstance: {fileID: 0} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 8731379560108414760} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: f4688fdb7df04437aeb418b961361dc5, type: 3} + m_Name: + m_EditorClassIdentifier: + m_Material: {fileID: 0} + m_Color: {r: 1, g: 1, b: 1, a: 1} + m_RaycastTarget: 1 + m_OnCullStateChanged: + m_PersistentCalls: + m_Calls: [] + m_text: 0 m/s + m_isRightToLeft: 0 + m_fontAsset: {fileID: 11400000, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_sharedMaterial: {fileID: 2180264, guid: 8f586378b4e144a9851e7b34d9b748ee, type: 2} + m_fontSharedMaterials: [] + m_fontMaterial: {fileID: 0} + m_fontMaterials: [] + m_fontColor32: + serializedVersion: 2 + rgba: 4294967295 + m_fontColor: {r: 1, g: 1, b: 1, a: 1} + m_enableVertexGradient: 0 + m_colorMode: 3 + m_fontColorGradient: + topLeft: {r: 1, g: 1, b: 1, a: 1} + topRight: {r: 1, g: 1, b: 1, a: 1} + bottomLeft: {r: 1, g: 1, b: 1, a: 1} + bottomRight: {r: 1, g: 1, b: 1, a: 1} + m_fontColorGradientPreset: {fileID: 0} + m_spriteAsset: {fileID: 0} + m_tintAllSprites: 0 + m_overrideHtmlColors: 0 + m_faceColor: + serializedVersion: 2 + rgba: 4294967295 + m_outlineColor: + serializedVersion: 2 + rgba: 4278190080 + m_fontSize: 28 + m_fontSizeBase: 28 + m_fontWeight: 400 + m_enableAutoSizing: 0 + m_fontSizeMin: 18 + m_fontSizeMax: 72 + m_fontStyle: 0 + m_textAlignment: 513 + m_characterSpacing: 0 + m_wordSpacing: 0 + m_lineSpacing: 0 + m_lineSpacingMax: 0 + m_paragraphSpacing: 0 + m_charWidthMaxAdj: 0 + m_enableWordWrapping: 1 + m_wordWrappingRatios: 0.4 + m_overflowMode: 0 + m_firstOverflowCharacterIndex: -1 + m_linkedTextComponent: {fileID: 0} + m_isLinkedTextComponent: 0 + m_isTextTruncated: 0 + m_enableKerning: 1 + m_enableExtraPadding: 0 + checkPaddingRequired: 0 + m_isRichText: 1 + m_parseCtrlCharacters: 1 + m_isOrthographic: 1 + m_isCullingEnabled: 0 + m_ignoreRectMaskCulling: 0 + m_ignoreCulling: 1 + m_horizontalMapping: 0 + m_verticalMapping: 0 + m_uvLineOffset: 0 + m_geometrySortingOrder: 0 + m_VertexBufferAutoSizeReduction: 1 + m_firstVisibleCharacter: 0 + m_useMaxVisibleDescender: 1 + m_pageToDisplay: 1 + m_margin: {x: 0, y: 0, z: 0, w: 0} + m_textInfo: + textComponent: {fileID: 3769667023307713410} + characterCount: 5 + spriteCount: 0 + spaceCount: 1 + wordCount: 3 + linkCount: 0 + lineCount: 1 + pageCount: 1 + materialCount: 1 + m_isUsingLegacyAnimationComponent: 0 + m_isVolumetricText: 0 + m_spriteAnimator: {fileID: 0} + m_hasFontAssetChanged: 0 + m_subTextObjects: + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + - {fileID: 0} + m_baseMaterial: {fileID: 0} + m_maskOffset: {x: 0, y: 0, z: 0, w: 0} diff --git a/Assets/Robots/IGVC_Robot.prefab b/Assets/Robots/IGVC_Robot.prefab index 9128e6c..5c06e12 100644 --- a/Assets/Robots/IGVC_Robot.prefab +++ b/Assets/Robots/IGVC_Robot.prefab @@ -55,6 +55,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -106,7 +107,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6116572216019989485} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: -0.3524, z: -0.3829999} + m_LocalPosition: {x: 0, y: -0.3524, z: -0.751} m_LocalScale: {x: 0.1, y: 0.1, z: 0.1} m_Children: [] m_Father: {fileID: 6116572216260438476} @@ -134,6 +135,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -204,8 +206,8 @@ Transform: m_PrefabInstance: {fileID: 0} m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6116572216260438465} - m_LocalRotation: {x: -0, y: 0.1407904, z: -0, w: 0.99003947} - m_LocalPosition: {x: 0.234, y: 0.365, z: 0.22} + m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} + m_LocalPosition: {x: 0, y: 0.365, z: 0.04} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6116572216309536752} @@ -218,7 +220,7 @@ Transform: - {fileID: 6116572216019989481} m_Father: {fileID: 0} m_RootOrder: 0 - m_LocalEulerAnglesHint: {x: 0, y: 16.187, z: 0} + m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!54 &6116572216260438467 Rigidbody: m_ObjectHideFlags: 0 @@ -247,13 +249,15 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a1d2050cf1070714a80b8fc8266743d7, type: 3} m_Name: m_EditorClassIdentifier: - speedMod: 3 + speedMod: 2.2727273 turnMod: 1 wheelRadius: 0.127 L: 0.6096 drag: 0.85 vl: 0 vr: 0 + leftControl: 0 + rightControl: 0 useController: 1 --- !u!114 &6116572216260438477 MonoBehaviour: @@ -267,9 +271,9 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: ff98778ae051cfd40a6e4effdf851ebd, type: 3} m_Name: m_EditorClassIdentifier: - Timeout: 10 + SecondsTimeout: 10 Serializer: 0 - Protocol: 0 + protocol: 0 RosBridgeServerUrl: ws://localhost:9090 --- !u!114 &6116572216260438479 MonoBehaviour: @@ -360,8 +364,6 @@ MonoBehaviour: m_EditorClassIdentifier: Topic: /igvc/motors_raw TimeStep: 0 - left: 0 - right: 0 --- !u!114 &6116572216260438472 MonoBehaviour: m_ObjectHideFlags: 0 @@ -481,7 +483,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6116572216334250669} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0.3680001} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6116572217397061391} @@ -515,7 +517,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6116572216841258426} m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} - m_LocalPosition: {x: 0.4, y: -0.25699994, z: 0.34559998} + m_LocalPosition: {x: 0.4, y: -0.25699994, z: -0.022400111} m_LocalScale: {x: 0.25400037, y: 0.020000022, z: 0.254} m_Children: [] m_Father: {fileID: 6116572216260438476} @@ -543,6 +545,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -593,7 +596,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6116572216873300086} m_LocalRotation: {x: -0, y: -0, z: 0.7071068, w: 0.7071068} - m_LocalPosition: {x: -0.4, y: -0.25699997, z: 0.34559998} + m_LocalPosition: {x: -0.4, y: -0.25699997, z: -0.022400111} m_LocalScale: {x: 0.25400013, y: 0.020000007, z: 0.254} m_Children: [] m_Father: {fileID: 6116572216260438476} @@ -621,6 +624,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -670,7 +674,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6116572216897894771} m_LocalRotation: {x: 0, y: 0, z: 0, w: 1} - m_LocalPosition: {x: 0, y: 0.268, z: 0.372} + m_LocalPosition: {x: 0, y: 0.268, z: 0.0039999187} m_LocalScale: {x: 1, y: 1, z: 1} m_Children: - {fileID: 6116572217639720015} @@ -815,6 +819,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -866,7 +871,7 @@ Transform: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 6116572217653478589} m_LocalRotation: {x: -0, y: -0, z: -0, w: 1} - m_LocalPosition: {x: 0, y: 0, z: 0} + m_LocalPosition: {x: 0, y: 0, z: -0.3680001} m_LocalScale: {x: 0.762, y: 0.381, z: 0.991} m_Children: [] m_Father: {fileID: 6116572216260438476} @@ -894,6 +899,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: diff --git a/Assets/Robots/NRC_Robot.prefab b/Assets/Robots/NRC_Robot.prefab index 8f799e9..2bec280 100644 --- a/Assets/Robots/NRC_Robot.prefab +++ b/Assets/Robots/NRC_Robot.prefab @@ -440,7 +440,7 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: a1d2050cf1070714a80b8fc8266743d7, type: 3} m_Name: m_EditorClassIdentifier: - speedMod: 1 + speedMod: 2 turnMod: 1 wheelRadius: 0.0635 L: 0.28 diff --git a/Assets/Scenes/Barrel_Maze.unity b/Assets/Scenes/Barrel_Maze.unity index 701961c..82f4802 100644 --- a/Assets/Scenes/Barrel_Maze.unity +++ b/Assets/Scenes/Barrel_Maze.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.44657886, g: 0.4964127, b: 0.57481724, a: 1} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -96,6 +96,7 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 1 --- !u!196 &4 @@ -1685,8 +1686,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 @@ -1868,6 +1870,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 6892051617767838480, guid: 63ab79c8d0b3b054fb3bb3c99e37959c, + type: 3} + propertyPath: onRobotInstantiate.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6892051617767838480, guid: 63ab79c8d0b3b054fb3bb3c99e37959c, type: 3} propertyPath: spawnLocation @@ -1883,6 +1890,31 @@ PrefabInstance: propertyPath: onRobotInstantiate.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: InitCompass objectReference: {fileID: 0} + - target: {fileID: 6892051617767838480, guid: 63ab79c8d0b3b054fb3bb3c99e37959c, + type: 3} + propertyPath: onRobotInstantiate.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6892051617767838480, guid: 63ab79c8d0b3b054fb3bb3c99e37959c, + type: 3} + propertyPath: onRobotInstantiate.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6892051617767838480, guid: 63ab79c8d0b3b054fb3bb3c99e37959c, + type: 3} + propertyPath: onRobotInstantiate.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 1381127165} + - target: {fileID: 6892051617767838480, guid: 63ab79c8d0b3b054fb3bb3c99e37959c, + type: 3} + propertyPath: onRobotInstantiate.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: InitSpeedometer + objectReference: {fileID: 0} + - target: {fileID: 6892051617767838480, guid: 63ab79c8d0b3b054fb3bb3c99e37959c, + type: 3} + propertyPath: onRobotInstantiate.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 6892051617767838482, guid: 63ab79c8d0b3b054fb3bb3c99e37959c, type: 3} propertyPath: m_Name @@ -2224,7 +2256,7 @@ Transform: - {fileID: 771437635} - {fileID: 1407325495} m_Father: {fileID: 0} - m_RootOrder: 5 + m_RootOrder: 6 m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} --- !u!1001 &924265055 PrefabInstance: @@ -2492,10 +2524,11 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: deb4746edafba8242896aeaa33931d15, type: 2} + - {fileID: 2100000, guid: 15086992ae8979e41b41278c8a1e8d9b, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -2914,6 +2947,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 652a74eb839599247ac05a1487e8d291, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1381127165 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7334580760063416860, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + m_PrefabInstance: {fileID: 1381127163} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 191e2d9bed2cacc4785528a6a3412575, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1407325494 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scenes/Empty_World.unity b/Assets/Scenes/Empty_World.unity index 04319a1..a01c1b0 100644 --- a/Assets/Scenes/Empty_World.unity +++ b/Assets/Scenes/Empty_World.unity @@ -38,7 +38,7 @@ RenderSettings: m_ReflectionIntensity: 1 m_CustomReflection: {fileID: 0} m_Sun: {fileID: 705507994} - m_IndirectSpecularColor: {r: 0.44657886, g: 0.4964127, b: 0.57481724, a: 1} + m_IndirectSpecularColor: {r: 0.44657898, g: 0.4964133, b: 0.5748178, a: 1} m_UseRadianceAmbientProbe: 0 --- !u!157 &3 LightmapSettings: @@ -96,6 +96,7 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 1 --- !u!196 &4 @@ -157,8 +158,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 @@ -275,10 +277,11 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: deb4746edafba8242896aeaa33931d15, type: 2} + - {fileID: 2100000, guid: 15086992ae8979e41b41278c8a1e8d9b, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -463,6 +466,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 6892051617767838480, guid: 63ab79c8d0b3b054fb3bb3c99e37959c, + type: 3} + propertyPath: onRobotInstantiate.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6892051617767838480, guid: 63ab79c8d0b3b054fb3bb3c99e37959c, type: 3} propertyPath: spawnLocation @@ -473,6 +481,31 @@ PrefabInstance: propertyPath: onRobotInstantiate.m_PersistentCalls.m_Calls.Array.data[0].m_Target value: objectReference: {fileID: 603466486} + - target: {fileID: 6892051617767838480, guid: 63ab79c8d0b3b054fb3bb3c99e37959c, + type: 3} + propertyPath: onRobotInstantiate.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6892051617767838480, guid: 63ab79c8d0b3b054fb3bb3c99e37959c, + type: 3} + propertyPath: onRobotInstantiate.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6892051617767838480, guid: 63ab79c8d0b3b054fb3bb3c99e37959c, + type: 3} + propertyPath: onRobotInstantiate.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 7490659993956718797} + - target: {fileID: 6892051617767838480, guid: 63ab79c8d0b3b054fb3bb3c99e37959c, + type: 3} + propertyPath: onRobotInstantiate.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: InitSpeedometer + objectReference: {fileID: 0} + - target: {fileID: 6892051617767838480, guid: 63ab79c8d0b3b054fb3bb3c99e37959c, + type: 3} + propertyPath: onRobotInstantiate.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 6892051617767838482, guid: 63ab79c8d0b3b054fb3bb3c99e37959c, type: 3} propertyPath: m_Name @@ -542,6 +575,106 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 3769667023307713410, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + propertyPath: m_textInfo.characterCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3769667023307713410, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + propertyPath: m_textInfo.spaceCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3769667023307713410, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + propertyPath: m_textInfo.wordCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3769667023307713410, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + propertyPath: m_textInfo.lineCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3769667023307713410, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + propertyPath: m_textInfo.pageCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3849768413892530314, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + propertyPath: m_textInfo.characterCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3849768413892530314, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + propertyPath: m_textInfo.spaceCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3849768413892530314, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + propertyPath: m_textInfo.wordCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3849768413892530314, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + propertyPath: m_textInfo.lineCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 3849768413892530314, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + propertyPath: m_textInfo.pageCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4089095446064027149, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + propertyPath: m_textInfo.characterCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4089095446064027149, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + propertyPath: m_textInfo.spaceCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4089095446064027149, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + propertyPath: m_textInfo.wordCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4089095446064027149, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + propertyPath: m_textInfo.lineCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 4089095446064027149, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + propertyPath: m_textInfo.pageCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5324870572876176916, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + propertyPath: m_textInfo.characterCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5324870572876176916, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + propertyPath: m_textInfo.spaceCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5324870572876176916, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + propertyPath: m_textInfo.wordCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5324870572876176916, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + propertyPath: m_textInfo.lineCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 5324870572876176916, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + propertyPath: m_textInfo.pageCount + value: 0 + objectReference: {fileID: 0} - target: {fileID: 7490659993866479126, guid: fcce1d4317d5a2847b55085d008f27f3, type: 3} propertyPath: m_LocalPosition.x @@ -652,5 +785,42 @@ PrefabInstance: propertyPath: m_Name value: UICanvas objectReference: {fileID: 0} + - target: {fileID: 7567380520111487292, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + propertyPath: m_textInfo.characterCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7567380520111487292, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + propertyPath: m_textInfo.spaceCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7567380520111487292, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + propertyPath: m_textInfo.wordCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7567380520111487292, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + propertyPath: m_textInfo.lineCount + value: 0 + objectReference: {fileID: 0} + - target: {fileID: 7567380520111487292, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + propertyPath: m_textInfo.pageCount + value: 0 + objectReference: {fileID: 0} m_RemovedComponents: [] m_SourcePrefab: {fileID: 100100000, guid: fcce1d4317d5a2847b55085d008f27f3, type: 3} +--- !u!114 &7490659993956718797 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7334580760063416860, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + m_PrefabInstance: {fileID: 7490659993956718796} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 191e2d9bed2cacc4785528a6a3412575, type: 3} + m_Name: + m_EditorClassIdentifier: diff --git a/Assets/Scenes/NRC_Land.unity b/Assets/Scenes/NRC_Land.unity index 101e78f..9a34be0 100644 --- a/Assets/Scenes/NRC_Land.unity +++ b/Assets/Scenes/NRC_Land.unity @@ -96,6 +96,7 @@ LightmapSettings: m_PVRFilteringAtrousPositionSigmaAO: 1 m_ExportTrainingData: 0 m_TrainingDataDestination: TrainingData + m_LightProbeSampleCountMultiplier: 4 m_LightingDataAsset: {fileID: 0} m_UseShadowmask: 1 --- !u!196 &4 @@ -152,6 +153,7 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: @@ -443,8 +445,9 @@ Light: m_PrefabAsset: {fileID: 0} m_GameObject: {fileID: 705507993} m_Enabled: 1 - serializedVersion: 9 + serializedVersion: 10 m_Type: 1 + m_Shape: 0 m_Color: {r: 1, g: 0.95686275, b: 0.8392157, a: 1} m_Intensity: 1 m_Range: 10 @@ -713,10 +716,11 @@ MeshRenderer: m_MotionVectors: 1 m_LightProbeUsage: 1 m_ReflectionProbeUsage: 1 + m_RayTracingMode: 2 m_RenderingLayerMask: 1 m_RendererPriority: 0 m_Materials: - - {fileID: 2100000, guid: 0a0addc952942fa4aa4bc73073aae89e, type: 2} + - {fileID: 2100000, guid: 15086992ae8979e41b41278c8a1e8d9b, type: 2} m_StaticBatchInfo: firstSubMesh: 0 subMeshCount: 0 @@ -841,6 +845,11 @@ PrefabInstance: m_Modification: m_TransformParent: {fileID: 0} m_Modifications: + - target: {fileID: 6892051617767838480, guid: 63ab79c8d0b3b054fb3bb3c99e37959c, + type: 3} + propertyPath: onRobotInstantiate.m_PersistentCalls.m_Calls.Array.size + value: 2 + objectReference: {fileID: 0} - target: {fileID: 6892051617767838480, guid: 63ab79c8d0b3b054fb3bb3c99e37959c, type: 3} propertyPath: spawnLocation @@ -856,6 +865,31 @@ PrefabInstance: propertyPath: onRobotInstantiate.m_PersistentCalls.m_Calls.Array.data[0].m_MethodName value: InitCompass objectReference: {fileID: 0} + - target: {fileID: 6892051617767838480, guid: 63ab79c8d0b3b054fb3bb3c99e37959c, + type: 3} + propertyPath: onRobotInstantiate.m_PersistentCalls.m_Calls.Array.data[1].m_Mode + value: 1 + objectReference: {fileID: 0} + - target: {fileID: 6892051617767838480, guid: 63ab79c8d0b3b054fb3bb3c99e37959c, + type: 3} + propertyPath: onRobotInstantiate.m_PersistentCalls.m_Calls.Array.data[1].m_CallState + value: 2 + objectReference: {fileID: 0} + - target: {fileID: 6892051617767838480, guid: 63ab79c8d0b3b054fb3bb3c99e37959c, + type: 3} + propertyPath: onRobotInstantiate.m_PersistentCalls.m_Calls.Array.data[1].m_Target + value: + objectReference: {fileID: 1916494850} + - target: {fileID: 6892051617767838480, guid: 63ab79c8d0b3b054fb3bb3c99e37959c, + type: 3} + propertyPath: onRobotInstantiate.m_PersistentCalls.m_Calls.Array.data[1].m_MethodName + value: InitSpeedometer + objectReference: {fileID: 0} + - target: {fileID: 6892051617767838480, guid: 63ab79c8d0b3b054fb3bb3c99e37959c, + type: 3} + propertyPath: onRobotInstantiate.m_PersistentCalls.m_Calls.Array.data[1].m_Arguments.m_ObjectArgumentAssemblyTypeName + value: UnityEngine.Object, UnityEngine + objectReference: {fileID: 0} - target: {fileID: 6892051617767838482, guid: 63ab79c8d0b3b054fb3bb3c99e37959c, type: 3} propertyPath: m_Name @@ -1260,6 +1294,18 @@ MonoBehaviour: m_Script: {fileID: 11500000, guid: 652a74eb839599247ac05a1487e8d291, type: 3} m_Name: m_EditorClassIdentifier: +--- !u!114 &1916494850 stripped +MonoBehaviour: + m_CorrespondingSourceObject: {fileID: 7334580760063416860, guid: fcce1d4317d5a2847b55085d008f27f3, + type: 3} + m_PrefabInstance: {fileID: 1916494848} + m_PrefabAsset: {fileID: 0} + m_GameObject: {fileID: 0} + m_Enabled: 1 + m_EditorHideFlags: 0 + m_Script: {fileID: 11500000, guid: 191e2d9bed2cacc4785528a6a3412575, type: 3} + m_Name: + m_EditorClassIdentifier: --- !u!1001 &1930664548 PrefabInstance: m_ObjectHideFlags: 0 diff --git a/Assets/Scripts/SimpleCarController.cs b/Assets/Scripts/SimpleCarController.cs index bb078fe..7c10e7a 100644 --- a/Assets/Scripts/SimpleCarController.cs +++ b/Assets/Scripts/SimpleCarController.cs @@ -34,8 +34,10 @@ public void FixedUpdate() if (useController) { - left = Mathf.Pow(Input.GetAxis("Vertical"), 3) * speedMod / wheelRadius; - right = -Mathf.Pow(Input.GetAxis("Vertical2"), 3) * speedMod / wheelRadius; + float horiz = Mathf.Pow(Input.GetAxis("Vertical"), 3); + float vertical = Input.GetAxis("Horizontal"); + left = (horiz * vertical + horiz) * speedMod / wheelRadius; + right = (-horiz * vertical + horiz) * speedMod / wheelRadius; } else { diff --git a/Assets/Scripts/SpeedometerScript.cs b/Assets/Scripts/SpeedometerScript.cs new file mode 100644 index 0000000..8c2fffd --- /dev/null +++ b/Assets/Scripts/SpeedometerScript.cs @@ -0,0 +1,43 @@ +using System; +using System.Collections; +using System.Collections.Generic; +using TMPro; +using UnityEngine; + +public class SpeedometerScript : MonoBehaviour +{ + + public TextMeshProUGUI textMilesPerHour; + public TextMeshProUGUI textMetersPerSecond; + public GameObject robot; + + private float curSpeed = 0.0f; + private Vector3 lastPos = new Vector3(0, 0, 0); + + public void InitSpeedometer() + { + this.robot = LevelInitalizer.robot; + lastPos = this.robot.transform.position; + } + + private void Update() + { + if (robot) + { + textMetersPerSecond.text = $"{curSpeed:0.0} m/s"; + textMilesPerHour.text = $"{curSpeed * 2.237:0.0} mph"; ; + } + } + + void FixedUpdate() + { + if (robot) + { + float instSpeed = (robot.transform.position - lastPos).magnitude / Time.fixedDeltaTime; + + curSpeed = 0.85f * instSpeed + 0.15f * curSpeed; + + lastPos = robot.transform.position; + } + } +} diff --git a/Assets/Scripts/SpeedometerScript.cs.meta b/Assets/Scripts/SpeedometerScript.cs.meta new file mode 100644 index 0000000..552aadb --- /dev/null +++ b/Assets/Scripts/SpeedometerScript.cs.meta @@ -0,0 +1,11 @@ +fileFormatVersion: 2 +guid: 191e2d9bed2cacc4785528a6a3412575 +MonoImporter: + externalObjects: {} + serializedVersion: 2 + defaultReferences: [] + executionOrder: 0 + icon: {instanceID: 0} + userData: + assetBundleName: + assetBundleVariant: diff --git a/Assets/StreamingAssets/build_info b/Assets/StreamingAssets/build_info index 59a7e07..af4cba6 100644 --- a/Assets/StreamingAssets/build_info +++ b/Assets/StreamingAssets/build_info @@ -1 +1 @@ -Build from DESKTOP-D8RUH2C at 2/11/2020 7:25:10 PM \ No newline at end of file +Build from DESKTOP-QVE6E0N at 2/26/2020 8:07:26 PM \ No newline at end of file diff --git a/ProjectSettings/InputManager.asset b/ProjectSettings/InputManager.asset index 90c6024..05407b9 100644 --- a/ProjectSettings/InputManager.asset +++ b/ProjectSettings/InputManager.asset @@ -6,7 +6,7 @@ InputManager: serializedVersion: 2 m_Axes: - serializedVersion: 3 - m_Name: Vertical2 + m_Name: Horizontal descriptiveName: descriptiveNegativeName: negativeButton: left @@ -21,134 +21,6 @@ InputManager: type: 0 axis: 0 joyNum: 0 - - serializedVersion: 3 - m_Name: Vertical - descriptiveName: - descriptiveNegativeName: - negativeButton: down - positiveButton: up - altNegativeButton: s - altPositiveButton: w - gravity: 3 - dead: 0.001 - sensitivity: 3 - snap: 1 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire1 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left ctrl - altNegativeButton: - altPositiveButton: mouse 0 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire2 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left alt - altNegativeButton: - altPositiveButton: mouse 1 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire3 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: left shift - altNegativeButton: - altPositiveButton: mouse 2 - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Jump - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: space - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Mouse X - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0 - sensitivity: 0.1 - snap: 0 - invert: 0 - type: 1 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Mouse Y - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0 - sensitivity: 0.1 - snap: 0 - invert: 0 - type: 1 - axis: 1 - joyNum: 0 - - serializedVersion: 3 - m_Name: Mouse ScrollWheel - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0 - sensitivity: 0.1 - snap: 0 - invert: 0 - type: 1 - axis: 2 - joyNum: 0 - serializedVersion: 3 m_Name: Horizontal descriptiveName: @@ -163,23 +35,23 @@ InputManager: snap: 0 invert: 0 type: 2 - axis: 0 + axis: 3 joyNum: 0 - serializedVersion: 3 - m_Name: Vertical2 + m_Name: Vertical descriptiveName: descriptiveNegativeName: - negativeButton: - positiveButton: - altNegativeButton: - altPositiveButton: - gravity: 0 - dead: 0.19 - sensitivity: 1 - snap: 0 + negativeButton: down + positiveButton: up + altNegativeButton: s + altPositiveButton: w + gravity: 3 + dead: 0.001 + sensitivity: 3 + snap: 1 invert: 0 - type: 2 - axis: 4 + type: 0 + axis: 0 joyNum: 0 - serializedVersion: 3 m_Name: Vertical @@ -197,70 +69,6 @@ InputManager: type: 2 axis: 1 joyNum: 0 - - serializedVersion: 3 - m_Name: Fire1 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 0 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire2 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 1 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Fire3 - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 2 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - - serializedVersion: 3 - m_Name: Jump - descriptiveName: - descriptiveNegativeName: - negativeButton: - positiveButton: joystick button 3 - altNegativeButton: - altPositiveButton: - gravity: 1000 - dead: 0.001 - sensitivity: 1000 - snap: 0 - invert: 0 - type: 0 - axis: 0 - joyNum: 0 - serializedVersion: 3 m_Name: Submit descriptiveName: