Skip to content

C
car-sim-remaster
Commit 936a9011 authored by Danial KordModanlou's avatar Danial KordModanlou
Browse files
Options

distance system updated

parent 098c4aaa
Show whitespace changes
Inline Side-by-side
Showing with 197 additions and 284 deletions
.idea/.idea.car-sim-remaster/.idea/indexLayout.xml
View file @ 936a9011
...@@ -19,6 +19,7 @@ ...@@ -19,6 +19,7 @@
<Path>.vs</Path> <Path>.vs</Path>
<Path>Library</Path> <Path>Library</Path>
<Path>Logs</Path> <Path>Logs</Path>
<Path>Temp</Path>
<Path>obj</Path> <Path>obj</Path>
</explicitExcludes> </explicitExcludes>
</component> </component>
......
.idea/.idea.car-sim-remaster/.idea/workspace.xml
View file @ 936a9011
...@@ -3,8 +3,9 @@ ...@@ -3,8 +3,9 @@
<component name="ChangeListManager"> <component name="ChangeListManager">
<list default="true" id="63a78b22-9aa4-4157-97bc-72b63425d4fc" name="Default Changelist" comment=""> <list default="true" id="63a78b22-9aa4-4157-97bc-72b63425d4fc" name="Default Changelist" comment="">
<change beforePath="$PROJECT_DIR$/.idea/.idea.car-sim-remaster/.idea/indexLayout.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.car-sim-remaster/.idea/indexLayout.xml" afterDir="false" /> <change beforePath="$PROJECT_DIR$/.idea/.idea.car-sim-remaster/.idea/indexLayout.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.car-sim-remaster/.idea/indexLayout.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/.idea/.idea.car-sim-remaster/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/.idea.car-sim-remaster/.idea/workspace.xml" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/CSV/p1.csv" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CSV/p1.csv" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assets/CSV/p1.csv" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/CSV/p1.csv" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/scripts/DataSaver.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/scripts/DataSaver.cs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assets/Scenes/SampleScene.unity" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/Scenes/SampleScene.unity" afterDir="false" />
<change beforePath="$PROJECT_DIR$/Assets/scripts/Wall.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/scripts/Wall.cs" afterDir="false" /> <change beforePath="$PROJECT_DIR$/Assets/scripts/Wall.cs" beforeDir="false" afterPath="$PROJECT_DIR$/Assets/scripts/Wall.cs" afterDir="false" />
</list> </list>
<option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" /> <option name="EXCLUDED_CONVERTED_TO_IGNORED" value="true" />
...@@ -29,11 +30,11 @@ ...@@ -29,11 +30,11 @@
</component> </component>
<component name="FileEditorManager"> <component name="FileEditorManager">
<leaf SIDE_TABS_SIZE_LIMIT_KEY="300"> <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
<file pinned="false" current-in-tab="true"> <file pinned="false" current-in-tab="false">
<entry file="file://$PROJECT_DIR$/Assets/scripts/DataSaver.cs"> <entry file="file://$PROJECT_DIR$/Assets/scripts/DataSaver.cs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="332"> <state relative-caret-position="177">
<caret line="116" column="44" selection-start-line="116" selection-start-column="44" selection-end-line="116" selection-end-column="44" /> <caret line="102" column="7" selection-start-line="102" selection-start-column="7" selection-end-line="102" selection-end-column="7" />
<folding> <folding>
<marker date="1593164590767" expanded="true" signature="7:181" ph="..." /> <marker date="1593164590767" expanded="true" signature="7:181" ph="..." />
<marker date="1593164590767" expanded="true" signature="221:6851" ph="{...}" /> <marker date="1593164590767" expanded="true" signature="221:6851" ph="{...}" />
...@@ -83,22 +84,22 @@ ...@@ -83,22 +84,22 @@
</provider> </provider>
</entry> </entry>
</file> </file>
<file pinned="false" current-in-tab="false"> <file pinned="false" current-in-tab="true">
<entry file="file://$PROJECT_DIR$/Assets/scripts/Wall.cs"> <entry file="file://$PROJECT_DIR$/Assets/scripts/Wall.cs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="312"> <state relative-caret-position="371">
<caret line="82" column="27" selection-start-line="82" selection-start-column="27" selection-end-line="82" selection-end-column="27" /> <caret line="79" column="17" selection-start-line="79" selection-start-column="8" selection-end-line="79" selection-end-column="17" />
<folding> <folding>
<marker date="1593164435901" expanded="true" signature="6:111" ph="..." /> <marker date="1593182337612" expanded="true" signature="6:111" ph="..." />
<marker date="1593164435901" expanded="true" signature="205:2573" ph="{...}" /> <marker date="1593182337612" expanded="true" signature="205:2815" ph="{...}" />
<marker date="1593164435901" expanded="true" signature="404:560" ph="{...}" /> <marker date="1593182337612" expanded="true" signature="404:560" ph="{...}" />
<marker date="1593164435901" expanded="true" signature="607:941" ph="{...}" /> <marker date="1593182337612" expanded="true" signature="607:1103" ph="{...}" />
<marker date="1593164435901" expanded="true" signature="1037:1104" ph="{...}" /> <marker date="1593182337612" expanded="true" signature="1199:1298" ph="{...}" />
<marker date="1593164435901" expanded="true" signature="1188:2390" ph="{...}" /> <marker date="1593182337612" expanded="true" signature="1382:2632" ph="{...}" />
<marker date="1593164435901" expanded="true" signature="1558:1960" ph="{...}" /> <marker date="1593182337612" expanded="true" signature="1752:2154" ph="{...}" />
<marker date="1593164435901" expanded="true" signature="1698:1808" ph="{...}" /> <marker date="1593182337612" expanded="true" signature="1892:2002" ph="{...}" />
<marker date="1593164435901" expanded="true" signature="1860:1950" ph="{...}" /> <marker date="1593182337612" expanded="true" signature="2054:2144" ph="{...}" />
<marker date="1593164435901" expanded="true" signature="2426:2566" ph="{...}" /> <marker date="1593182337612" expanded="true" signature="2668:2808" ph="{...}" />
</folding> </folding>
</state> </state>
</provider> </provider>
...@@ -440,8 +441,8 @@ ...@@ -440,8 +441,8 @@
<option value="$PROJECT_DIR$/Assets/scripts/CarCustom.cs" /> <option value="$PROJECT_DIR$/Assets/scripts/CarCustom.cs" />
<option value="$PROJECT_DIR$/Assets/TurnTheGameOn/IK Driver/Scripts/Utility/IKD_DemoController.cs" /> <option value="$PROJECT_DIR$/Assets/TurnTheGameOn/IK Driver/Scripts/Utility/IKD_DemoController.cs" />
<option value="$PROJECT_DIR$/Assets/scripts/menuSystem.cs" /> <option value="$PROJECT_DIR$/Assets/scripts/menuSystem.cs" />
<option value="$PROJECT_DIR$/Assets/scripts/Wall.cs" />
<option value="$PROJECT_DIR$/Assets/scripts/DataSaver.cs" /> <option value="$PROJECT_DIR$/Assets/scripts/DataSaver.cs" />
<option value="$PROJECT_DIR$/Assets/scripts/Wall.cs" />
</list> </list>
</option> </option>
</component> </component>
...@@ -540,12 +541,12 @@ ...@@ -540,12 +541,12 @@
<workItem from="1593094252552" duration="2199000" /> <workItem from="1593094252552" duration="2199000" />
<workItem from="1593109187851" duration="1718000" /> <workItem from="1593109187851" duration="1718000" />
<workItem from="1593113545384" duration="1808000" /> <workItem from="1593113545384" duration="1808000" />
<workItem from="1593157840945" duration="5288000" /> <workItem from="1593157840945" duration="9231000" />
</task> </task>
<servers /> <servers />
</component> </component>
<component name="TimeTrackingManager"> <component name="TimeTrackingManager">
<option name="totallyTimeSpent" value="64259000" /> <option name="totallyTimeSpent" value="68202000" />
</component> </component>
<component name="TodoView"> <component name="TodoView">
<todo-panel id="selected-file"> <todo-panel id="selected-file">
...@@ -557,7 +558,7 @@ ...@@ -557,7 +558,7 @@
</todo-panel> </todo-panel>
</component> </component>
<component name="ToolWindowManager"> <component name="ToolWindowManager">
<frame x="-7" y="-7" width="1550" height="838" extended-state="7" /> <frame x="-7" y="-7" width="1550" height="838" extended-state="6" />
<layout> <layout>
<window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.3286385" /> <window_info active="true" content_ui="combo" id="Project" order="0" visible="true" weight="0.3286385" />
<window_info id="Structure" order="1" side_tool="true" weight="0.25" /> <window_info id="Structure" order="1" side_tool="true" weight="0.25" />
...@@ -1178,29 +1179,10 @@ ...@@ -1178,29 +1179,10 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Assets/scripts/Wall.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="312">
<caret line="82" column="27" selection-start-line="82" selection-start-column="27" selection-end-line="82" selection-end-column="27" />
<folding>
<marker date="1593164435901" expanded="true" signature="6:111" ph="..." />
<marker date="1593164435901" expanded="true" signature="205:2573" ph="{...}" />
<marker date="1593164435901" expanded="true" signature="404:560" ph="{...}" />
<marker date="1593164435901" expanded="true" signature="607:941" ph="{...}" />
<marker date="1593164435901" expanded="true" signature="1037:1104" ph="{...}" />
<marker date="1593164435901" expanded="true" signature="1188:2390" ph="{...}" />
<marker date="1593164435901" expanded="true" signature="1558:1960" ph="{...}" />
<marker date="1593164435901" expanded="true" signature="1698:1808" ph="{...}" />
<marker date="1593164435901" expanded="true" signature="1860:1950" ph="{...}" />
<marker date="1593164435901" expanded="true" signature="2426:2566" ph="{...}" />
</folding>
</state>
</provider>
</entry>
<entry file="file://$PROJECT_DIR$/Assets/scripts/DataSaver.cs"> <entry file="file://$PROJECT_DIR$/Assets/scripts/DataSaver.cs">
<provider selected="true" editor-type-id="text-editor"> <provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="332"> <state relative-caret-position="177">
<caret line="116" column="44" selection-start-line="116" selection-start-column="44" selection-end-line="116" selection-end-column="44" /> <caret line="102" column="7" selection-start-line="102" selection-start-column="7" selection-end-line="102" selection-end-column="7" />
<folding> <folding>
<marker date="1593164590767" expanded="true" signature="7:181" ph="..." /> <marker date="1593164590767" expanded="true" signature="7:181" ph="..." />
<marker date="1593164590767" expanded="true" signature="221:6851" ph="{...}" /> <marker date="1593164590767" expanded="true" signature="221:6851" ph="{...}" />
...@@ -1231,5 +1213,24 @@ ...@@ -1231,5 +1213,24 @@
</state> </state>
</provider> </provider>
</entry> </entry>
<entry file="file://$PROJECT_DIR$/Assets/scripts/Wall.cs">
<provider selected="true" editor-type-id="text-editor">
<state relative-caret-position="371">
<caret line="79" column="17" selection-start-line="79" selection-start-column="8" selection-end-line="79" selection-end-column="17" />
<folding>
<marker date="1593182337612" expanded="true" signature="6:111" ph="..." />
<marker date="1593182337612" expanded="true" signature="205:2815" ph="{...}" />
<marker date="1593182337612" expanded="true" signature="404:560" ph="{...}" />
<marker date="1593182337612" expanded="true" signature="607:1103" ph="{...}" />
<marker date="1593182337612" expanded="true" signature="1199:1298" ph="{...}" />
<marker date="1593182337612" expanded="true" signature="1382:2632" ph="{...}" />
<marker date="1593182337612" expanded="true" signature="1752:2154" ph="{...}" />
<marker date="1593182337612" expanded="true" signature="1892:2002" ph="{...}" />
<marker date="1593182337612" expanded="true" signature="2054:2144" ph="{...}" />
<marker date="1593182337612" expanded="true" signature="2668:2808" ph="{...}" />
</folding>
</state>
</provider>
</entry>
</component> </component>
</project> </project>
\ No newline at end of file
Assets/Scenes/SampleScene.unity
View file @ 936a9011
...@@ -121,6 +121,38 @@ NavMeshSettings: ...@@ -121,6 +121,38 @@ NavMeshSettings:
debug: debug:
m_Flags: 0 m_Flags: 0
m_NavMeshData: {fileID: 0} m_NavMeshData: {fileID: 0}
--- !u!1 &125301449 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5903998474558691662, guid: 1e88c95a7a1f988488ee8076c968fcb5,
type: 3}
m_PrefabInstance: {fileID: 281076911}
m_PrefabAsset: {fileID: 0}
--- !u!114 &125301451
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 125301449}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 498ca4c8961158d47bf0a0bcbfd4d63e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!64 &125301452
MeshCollider:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 125301449}
m_Material: {fileID: 13400000, guid: 3aeb7dadc0c69d54d9e5777e9d5631f1, type: 2}
m_IsTrigger: 0
m_Enabled: 1
serializedVersion: 3
m_Convex: 0
m_CookingOptions: 30
m_Mesh: {fileID: -4058646288771621125, guid: 1e88c95a7a1f988488ee8076c968fcb5, type: 3}
--- !u!1 &202245376 --- !u!1 &202245376
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -151,6 +183,95 @@ Transform: ...@@ -151,6 +183,95 @@ Transform:
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 15 m_RootOrder: 15
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1001 &281076911
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1093116804}
m_Modifications:
- target: {fileID: -8370616676172183064, guid: 1e88c95a7a1f988488ee8076c968fcb5,
type: 3}
propertyPath: m_LocalPosition.y
value: 533
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 1e88c95a7a1f988488ee8076c968fcb5,
type: 3}
propertyPath: m_LocalPosition.x
value: 152.94739
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 1e88c95a7a1f988488ee8076c968fcb5,
type: 3}
propertyPath: m_LocalPosition.y
value: -511
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 1e88c95a7a1f988488ee8076c968fcb5,
type: 3}
propertyPath: m_LocalPosition.z
value: 79.82196
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 1e88c95a7a1f988488ee8076c968fcb5,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 1e88c95a7a1f988488ee8076c968fcb5,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 1e88c95a7a1f988488ee8076c968fcb5,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 1e88c95a7a1f988488ee8076c968fcb5,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 1e88c95a7a1f988488ee8076c968fcb5,
type: 3}
propertyPath: m_RootOrder
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 1e88c95a7a1f988488ee8076c968fcb5,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 1e88c95a7a1f988488ee8076c968fcb5,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 1e88c95a7a1f988488ee8076c968fcb5,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 1e88c95a7a1f988488ee8076c968fcb5,
type: 3}
propertyPath: m_LocalScale.x
value: 2
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 1e88c95a7a1f988488ee8076c968fcb5,
type: 3}
propertyPath: m_LocalScale.y
value: 2
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: 1e88c95a7a1f988488ee8076c968fcb5,
type: 3}
propertyPath: m_LocalScale.z
value: 1.425
objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: 1e88c95a7a1f988488ee8076c968fcb5,
type: 3}
propertyPath: m_Name
value: rah-shane3
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 1e88c95a7a1f988488ee8076c968fcb5, type: 3}
--- !u!1 &354712830 --- !u!1 &354712830
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1011,121 +1132,6 @@ PrefabInstance: ...@@ -1011,121 +1132,6 @@ PrefabInstance:
objectReference: {fileID: 0} objectReference: {fileID: 0}
m_RemovedComponents: [] m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: 93ab9d7bcd8b80744ab77a800f1db95b, type: 3} m_SourcePrefab: {fileID: 100100000, guid: 93ab9d7bcd8b80744ab77a800f1db95b, type: 3}
--- !u!1001 &911709159
PrefabInstance:
m_ObjectHideFlags: 0
serializedVersion: 2
m_Modification:
m_TransformParent: {fileID: 1093116804}
m_Modifications:
- target: {fileID: -4546720636104537858, guid: a24922c25d312c84fa08aaca5994f19f,
type: 3}
propertyPath: m_Mesh
value:
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a24922c25d312c84fa08aaca5994f19f,
type: 3}
propertyPath: m_LocalPosition.x
value: 152.94739
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a24922c25d312c84fa08aaca5994f19f,
type: 3}
propertyPath: m_LocalPosition.y
value: -511
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a24922c25d312c84fa08aaca5994f19f,
type: 3}
propertyPath: m_LocalPosition.z
value: 79.82196
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a24922c25d312c84fa08aaca5994f19f,
type: 3}
propertyPath: m_LocalRotation.x
value: -0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a24922c25d312c84fa08aaca5994f19f,
type: 3}
propertyPath: m_LocalRotation.y
value: -0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a24922c25d312c84fa08aaca5994f19f,
type: 3}
propertyPath: m_LocalRotation.z
value: -0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a24922c25d312c84fa08aaca5994f19f,
type: 3}
propertyPath: m_LocalRotation.w
value: 1
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a24922c25d312c84fa08aaca5994f19f,
type: 3}
propertyPath: m_RootOrder
value: 1
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a24922c25d312c84fa08aaca5994f19f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.x
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a24922c25d312c84fa08aaca5994f19f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.y
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a24922c25d312c84fa08aaca5994f19f,
type: 3}
propertyPath: m_LocalEulerAnglesHint.z
value: 0
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a24922c25d312c84fa08aaca5994f19f,
type: 3}
propertyPath: m_LocalScale.x
value: 2
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a24922c25d312c84fa08aaca5994f19f,
type: 3}
propertyPath: m_LocalScale.y
value: 2
objectReference: {fileID: 0}
- target: {fileID: -4216859302048453862, guid: a24922c25d312c84fa08aaca5994f19f,
type: 3}
propertyPath: m_LocalScale.z
value: 1.425
objectReference: {fileID: 0}
- target: {fileID: -927199367670048503, guid: a24922c25d312c84fa08aaca5994f19f,
type: 3}
propertyPath: m_Name
value: rah-shane
objectReference: {fileID: 0}
- target: {fileID: 47230535109714336, guid: a24922c25d312c84fa08aaca5994f19f,
type: 3}
propertyPath: m_IsActive
value: 1
objectReference: {fileID: 0}
- target: {fileID: 2659090837685034640, guid: a24922c25d312c84fa08aaca5994f19f,
type: 3}
propertyPath: m_LocalPosition.y
value: 138.2
objectReference: {fileID: 0}
- target: {fileID: 2977867299062781255, guid: a24922c25d312c84fa08aaca5994f19f,
type: 3}
propertyPath: m_Convex
value: 0
objectReference: {fileID: 0}
- target: {fileID: 5903998474558691662, guid: a24922c25d312c84fa08aaca5994f19f,
type: 3}
propertyPath: m_IsActive
value: 0
objectReference: {fileID: 0}
m_RemovedComponents: []
m_SourcePrefab: {fileID: 100100000, guid: a24922c25d312c84fa08aaca5994f19f, type: 3}
--- !u!4 &911709160 stripped
Transform:
m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: a24922c25d312c84fa08aaca5994f19f,
type: 3}
m_PrefabInstance: {fileID: 911709159}
m_PrefabAsset: {fileID: 0}
--- !u!1 &921569260 stripped --- !u!1 &921569260 stripped
GameObject: GameObject:
m_CorrespondingSourceObject: {fileID: 2202606020465897630, guid: 128c80cc77445014fb3f8deb2e41a075, m_CorrespondingSourceObject: {fileID: 2202606020465897630, guid: 128c80cc77445014fb3f8deb2e41a075,
...@@ -1278,28 +1284,10 @@ Transform: ...@@ -1278,28 +1284,10 @@ Transform:
m_LocalPosition: {x: -476.66888, y: 136.60072, z: -822.82196} m_LocalPosition: {x: -476.66888, y: 136.60072, z: -822.82196}
m_LocalScale: {x: 1, y: 1, z: 1} m_LocalScale: {x: 1, y: 1, z: 1}
m_Children: m_Children:
- {fileID: 911709160} - {fileID: 1491121497}
m_Father: {fileID: 0} m_Father: {fileID: 0}
m_RootOrder: 18 m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0} m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1142727743 stripped
GameObject:
m_CorrespondingSourceObject: {fileID: 5903998474558691662, guid: a24922c25d312c84fa08aaca5994f19f,
type: 3}
m_PrefabInstance: {fileID: 911709159}
m_PrefabAsset: {fileID: 0}
--- !u!114 &1142727748
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1142727743}
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 498ca4c8961158d47bf0a0bcbfd4d63e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!1 &1195730325 --- !u!1 &1195730325
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
...@@ -1595,17 +1583,17 @@ PrefabInstance: ...@@ -1595,17 +1583,17 @@ PrefabInstance:
- target: {fileID: 2202606020465897624, guid: 128c80cc77445014fb3f8deb2e41a075, - target: {fileID: 2202606020465897624, guid: 128c80cc77445014fb3f8deb2e41a075,
type: 3} type: 3}
propertyPath: m_LocalPosition.x propertyPath: m_LocalPosition.x
value: -302.8 value: -688.62
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2202606020465897624, guid: 128c80cc77445014fb3f8deb2e41a075, - target: {fileID: 2202606020465897624, guid: 128c80cc77445014fb3f8deb2e41a075,
type: 3} type: 3}
propertyPath: m_LocalPosition.y propertyPath: m_LocalPosition.y
value: 94.61 value: 711.35
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2202606020465897624, guid: 128c80cc77445014fb3f8deb2e41a075, - target: {fileID: 2202606020465897624, guid: 128c80cc77445014fb3f8deb2e41a075,
type: 3} type: 3}
propertyPath: m_LocalPosition.z propertyPath: m_LocalPosition.z
value: -381.07 value: 97.92
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2202606020465897624, guid: 128c80cc77445014fb3f8deb2e41a075, - target: {fileID: 2202606020465897624, guid: 128c80cc77445014fb3f8deb2e41a075,
type: 3} type: 3}
...@@ -1615,7 +1603,7 @@ PrefabInstance: ...@@ -1615,7 +1603,7 @@ PrefabInstance:
- target: {fileID: 2202606020465897624, guid: 128c80cc77445014fb3f8deb2e41a075, - target: {fileID: 2202606020465897624, guid: 128c80cc77445014fb3f8deb2e41a075,
type: 3} type: 3}
propertyPath: m_LocalRotation.y propertyPath: m_LocalRotation.y
value: -0.9597563 value: -0.9219004
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2202606020465897624, guid: 128c80cc77445014fb3f8deb2e41a075, - target: {fileID: 2202606020465897624, guid: 128c80cc77445014fb3f8deb2e41a075,
type: 3} type: 3}
...@@ -1625,7 +1613,7 @@ PrefabInstance: ...@@ -1625,7 +1613,7 @@ PrefabInstance:
- target: {fileID: 2202606020465897624, guid: 128c80cc77445014fb3f8deb2e41a075, - target: {fileID: 2202606020465897624, guid: 128c80cc77445014fb3f8deb2e41a075,
type: 3} type: 3}
propertyPath: m_LocalRotation.w propertyPath: m_LocalRotation.w
value: 0.28083423 value: 0.38742706
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2202606020465897624, guid: 128c80cc77445014fb3f8deb2e41a075, - target: {fileID: 2202606020465897624, guid: 128c80cc77445014fb3f8deb2e41a075,
type: 3} type: 3}
...@@ -1640,7 +1628,7 @@ PrefabInstance: ...@@ -1640,7 +1628,7 @@ PrefabInstance:
- target: {fileID: 2202606020465897624, guid: 128c80cc77445014fb3f8deb2e41a075, - target: {fileID: 2202606020465897624, guid: 128c80cc77445014fb3f8deb2e41a075,
type: 3} type: 3}
propertyPath: m_LocalEulerAnglesHint.y propertyPath: m_LocalEulerAnglesHint.y
value: -147.38 value: -134.41101
objectReference: {fileID: 0} objectReference: {fileID: 0}
- target: {fileID: 2202606020465897624, guid: 128c80cc77445014fb3f8deb2e41a075, - target: {fileID: 2202606020465897624, guid: 128c80cc77445014fb3f8deb2e41a075,
type: 3} type: 3}
...@@ -2101,113 +2089,32 @@ RectTransform: ...@@ -2101,113 +2089,32 @@ RectTransform:
type: 3} type: 3}
m_PrefabInstance: {fileID: 1281597507} m_PrefabInstance: {fileID: 1281597507}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
--- !u!1 &1584725895 --- !u!4 &1491121497 stripped
GameObject: Transform:
m_ObjectHideFlags: 0 m_CorrespondingSourceObject: {fileID: -4216859302048453862, guid: 1e88c95a7a1f988488ee8076c968fcb5,
m_CorrespondingSourceObject: {fileID: 0} type: 3}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 281076911}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
serializedVersion: 6 --- !u!1 &1557101206 stripped
m_Component: GameObject:
- component: {fileID: 1584725900} m_CorrespondingSourceObject: {fileID: 6109345853503012401, guid: 1e88c95a7a1f988488ee8076c968fcb5,
- component: {fileID: 1584725899} type: 3}
- component: {fileID: 1584725898} m_PrefabInstance: {fileID: 281076911}
- component: {fileID: 1584725897}
- component: {fileID: 1584725896}
m_Layer: 0
m_Name: Layer:0 1 (1)
m_TagString: Untagged
m_Icon: {fileID: 0}
m_NavMeshLayer: 0
m_StaticEditorFlags: 0
m_IsActive: 1
--- !u!114 &1584725896
MonoBehaviour:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1584725895} --- !u!64 &1557101208
m_Enabled: 1
m_EditorHideFlags: 0
m_Script: {fileID: 11500000, guid: 498ca4c8961158d47bf0a0bcbfd4d63e, type: 3}
m_Name:
m_EditorClassIdentifier:
--- !u!64 &1584725897
MeshCollider: MeshCollider:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0} m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0} m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0} m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1584725895} m_GameObject: {fileID: 1557101206}
m_Material: {fileID: 0} m_Material: {fileID: 0}
m_IsTrigger: 0 m_IsTrigger: 0
m_Enabled: 1 m_Enabled: 1
serializedVersion: 3 serializedVersion: 3
m_Convex: 0 m_Convex: 0
m_CookingOptions: 30 m_CookingOptions: 30
m_Mesh: {fileID: -4058646288771621125, guid: a24922c25d312c84fa08aaca5994f19f, type: 3} m_Mesh: {fileID: -2973236226089877102, guid: 1e88c95a7a1f988488ee8076c968fcb5, type: 3}
--- !u!23 &1584725898
MeshRenderer:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1584725895}
m_Enabled: 1
m_CastShadows: 1
m_ReceiveShadows: 1
m_DynamicOccludee: 1
m_MotionVectors: 1
m_LightProbeUsage: 1
m_ReflectionProbeUsage: 1
m_RayTracingMode: 2
m_RenderingLayerMask: 1
m_RendererPriority: 0
m_Materials:
- {fileID: 6718947497816898733, guid: a24922c25d312c84fa08aaca5994f19f, type: 3}
m_StaticBatchInfo:
firstSubMesh: 0
subMeshCount: 0
m_StaticBatchRoot: {fileID: 0}
m_ProbeAnchor: {fileID: 0}
m_LightProbeVolumeOverride: {fileID: 0}
m_ScaleInLightmap: 1
m_ReceiveGI: 1
m_PreserveUVs: 0
m_IgnoreNormalsForChartDetection: 0
m_ImportantGI: 0
m_StitchLightmapSeams: 1
m_SelectedEditorRenderState: 3
m_MinimumChartSize: 4
m_AutoUVMaxDistance: 0.5
m_AutoUVMaxAngle: 89
m_LightmapParameters: {fileID: 0}
m_SortingLayerID: 0
m_SortingLayer: 0
m_SortingOrder: 0
--- !u!33 &1584725899
MeshFilter:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1584725895}
m_Mesh: {fileID: -4058646288771621125, guid: a24922c25d312c84fa08aaca5994f19f, type: 3}
--- !u!4 &1584725900
Transform:
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_GameObject: {fileID: 1584725895}
m_LocalRotation: {x: -0.7071068, y: -0, z: -0, w: 0.7071068}
m_LocalPosition: {x: -436.43915, y: -99.775925, z: 55.89276}
m_LocalScale: {x: 200, y: 142.50003, z: 200.00008}
m_Children: []
m_Father: {fileID: 0}
m_RootOrder: 17
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
--- !u!1 &1614892418 --- !u!1 &1614892418
GameObject: GameObject:
m_ObjectHideFlags: 0 m_ObjectHideFlags: 0
......
Assets/scripts/Wall.cs
View file @ 936a9011
...@@ -26,11 +26,13 @@ public class Wall : MonoBehaviour ...@@ -26,11 +26,13 @@ public class Wall : MonoBehaviour
public Vector3 distanceToCar(Vector3 car) public Vector3 distanceToCar(Vector3 car)
{ {
car = transform.InverseTransformPoint(car); //car = transform.InverseTransformPoint(car);
Debug.Log(GetComponent<MeshCollider>().name); Debug.Log(GetComponent<MeshCollider>().name);
Vector3 closestPoint = GetComponent<MeshCollider>().ClosestPointOnBounds(car); Vector3 closestPoint = this.transform.GetComponent<MeshCollider>().ClosestPointOnBounds(car);
Debug.Log("--> "+ car +" " +transform.TransformPoint(closestPoint)); Debug.Log("--> "+ car +" " +transform.TransformPoint(closestPoint));
lastPos = closestPoint;//transform.TransformPoint(closestPoint);//closestPoint;
lastPoint = car;//transform.TransformPoint(car);
return closestPoint; return closestPoint;
} }
...@@ -41,6 +43,7 @@ public class Wall : MonoBehaviour ...@@ -41,6 +43,7 @@ public class Wall : MonoBehaviour
public void newMethod(Vector3 point,Action<Vector3,float> onComplete) public void newMethod(Vector3 point,Action<Vector3,float> onComplete)
{ {
// distanceToCar(point);
StartCoroutine(findVertex(point, onComplete)); StartCoroutine(findVertex(point, onComplete));
} }
...@@ -73,14 +76,15 @@ public class Wall : MonoBehaviour ...@@ -73,14 +76,15 @@ public class Wall : MonoBehaviour
} }
} }
// convert nearest vertex back to world space // convert nearest vertex back to world space
lastPos = transform.TransformPoint(nearestVertex);
lastPoint = transform.TransformPoint(point);
Debug.Log("--> "+ point +" " +minDistanceSqr + " " + transform.TransformPoint(nearestVertex)); minDistanceSqr = Vector3.Distance(transform.TransformPoint(nearestVertex), lastPoint);
Debug.Log("--> "+ point +" " +minDistanceSqr + " " );
onComplete(transform.TransformPoint(nearestVertex), minDistanceSqr); onComplete(transform.TransformPoint(nearestVertex), minDistanceSqr);
lastPos = transform.TransformPoint(nearestVertex); // Debug.Log(lastPoint);
lastPoint = transform.TransformPoint(point);
Debug.Log(lastPoint);
yield break; yield break;
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment