Skip to content

Commit 44184df

Browse files
authored
Merge pull request #6 from SoonerRobotics/feat/BadNetworkingFixed
2 parents b66358c + 353f88e commit 44184df

File tree

66 files changed

+56213
-4035
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

66 files changed

+56213
-4035
lines changed
Lines changed: 79 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,79 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!114 &11400000
4+
MonoBehaviour:
5+
m_ObjectHideFlags: 0
6+
m_CorrespondingSourceObject: {fileID: 0}
7+
m_PrefabInstance: {fileID: 0}
8+
m_PrefabAsset: {fileID: 0}
9+
m_GameObject: {fileID: 0}
10+
m_Enabled: 1
11+
m_EditorHideFlags: 0
12+
m_Script: {fileID: 11500000, guid: 809a625d30e28c24481abbdb813740b7, type: 3}
13+
m_Name: Danger Zone
14+
m_EditorClassIdentifier:
15+
id: 2024/IGVC/DangerZone
16+
name: Danger Zone
17+
year: 2024
18+
prefab: {fileID: 2183161118067911390, guid: c2f78b2880b8bba40bae7d62d6dce213, type: 3}
19+
options:
20+
- key: topics.input
21+
type: 0
22+
value: /autonav/MotorInput
23+
- key: topics.input.type
24+
type: 0
25+
value: autonav_msgs/MotorInput
26+
- key: topics.feedback
27+
type: 0
28+
value: /autonav/MotorFeedback
29+
- key: topics.feedback.type
30+
type: 0
31+
value: autonav_msgs/MotorFeedback
32+
- key: topics.camera
33+
type: 0
34+
value: /autonav/camera/compressed
35+
- key: topics.camera.type
36+
type: 0
37+
value: sensor_msgs/CompressedImage
38+
- key: topics.camera.fps
39+
type: 1
40+
value: 12
41+
- key: topics.camera.width
42+
type: 1
43+
value: 640
44+
- key: topics.camera.height
45+
type: 1
46+
value: 480
47+
- key: topics.camera.quality
48+
type: 1
49+
value: 75
50+
- key: topics.feedback.deltax
51+
type: 0
52+
value: delta_x
53+
- key: topics.feedback.deltay
54+
type: 0
55+
value: delta_y
56+
- key: topics.feedback.deltatheta
57+
type: 0
58+
value: delta_theta
59+
- key: topics.gps
60+
type: 0
61+
value: /autonav/gps
62+
- key: topics.gps.type
63+
type: 0
64+
value: autonav_msgs/GPSFeedback
65+
- key: topics.gps.lat_field
66+
type: 0
67+
value: latitude
68+
- key: topics.gps.lon_field
69+
type: 0
70+
value: longitude
71+
- key: topics.gps.rate
72+
type: 2
73+
value: 2.0
74+
- key: topics.gps.lat_noise
75+
type: 2
76+
value: 0.0
77+
- key: topics.gps.lon_noise
78+
type: 2
79+
value: 0.0

Assets/Scrabby/Settings/URP-HighFidelity-Renderer.asset.meta renamed to Assets/Scrabby/Content/Robots/Danger Zone.asset.meta

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.
7.83 MB
Binary file not shown.

Assets/Scrabby/Models/Robots/dangerzone.fbx.meta

Lines changed: 109 additions & 0 deletions
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

Assets/Scrabby/Prefabs/Global.prefab

Lines changed: 9 additions & 50 deletions
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,5 @@
11
%YAML 1.1
22
%TAG !u! tag:unity3d.com,2011:
3-
--- !u!1 &790176057401116702
4-
GameObject:
5-
m_ObjectHideFlags: 0
6-
m_CorrespondingSourceObject: {fileID: 0}
7-
m_PrefabInstance: {fileID: 0}
8-
m_PrefabAsset: {fileID: 0}
9-
serializedVersion: 6
10-
m_Component:
11-
- component: {fileID: 8091851257964939719}
12-
- component: {fileID: 1548305950119527905}
13-
m_Layer: 0
14-
m_Name: Cloud
15-
m_TagString: Untagged
16-
m_Icon: {fileID: 0}
17-
m_NavMeshLayer: 0
18-
m_StaticEditorFlags: 0
19-
m_IsActive: 1
20-
--- !u!4 &8091851257964939719
21-
Transform:
22-
m_ObjectHideFlags: 0
23-
m_CorrespondingSourceObject: {fileID: 0}
24-
m_PrefabInstance: {fileID: 0}
25-
m_PrefabAsset: {fileID: 0}
26-
m_GameObject: {fileID: 790176057401116702}
27-
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
28-
m_LocalPosition: {x: 0, y: 0, z: 0}
29-
m_LocalScale: {x: 1, y: 1, z: 1}
30-
m_ConstrainProportionsScale: 0
31-
m_Children: []
32-
m_Father: {fileID: 2379813361525904022}
33-
m_RootOrder: -2
34-
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
35-
--- !u!114 &1548305950119527905
36-
MonoBehaviour:
37-
m_ObjectHideFlags: 0
38-
m_CorrespondingSourceObject: {fileID: 0}
39-
m_PrefabInstance: {fileID: 0}
40-
m_PrefabAsset: {fileID: 0}
41-
m_GameObject: {fileID: 790176057401116702}
42-
m_Enabled: 1
43-
m_EditorHideFlags: 0
44-
m_Script: {fileID: 11500000, guid: 72676a8be539430f8e4f5ae7d41ce596, type: 3}
45-
m_Name:
46-
m_EditorClassIdentifier:
47-
apiVersion: v1
483
--- !u!1 &1257713567776025616
494
GameObject:
505
m_ObjectHideFlags: 0
@@ -76,10 +31,9 @@ Transform:
7631
m_ConstrainProportionsScale: 0
7732
m_Children:
7833
- {fileID: 8919753316510952228}
79-
- {fileID: 8091851257964939719}
8034
- {fileID: 5121674719873298845}
8135
m_Father: {fileID: 0}
82-
m_RootOrder: 3
36+
m_RootOrder: 0
8337
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
8438
--- !u!114 &1954536190277721762
8539
MonoBehaviour:
@@ -151,6 +105,7 @@ MonoBehaviour:
151105
m_EditorClassIdentifier:
152106
enabledNetworks: 3
153107
robots:
108+
- {fileID: 11400000, guid: 247e2a8924ff6bd48b0eb0f3a9b2e85d, type: 2}
154109
- {fileID: 11400000, guid: 4beeaea5b7be41d418900deefdca842b, type: 2}
155110
maps:
156111
- {fileID: 11400000, guid: 909fdd8f9329cc4439e5db9256bcdadc, type: 2}
@@ -168,7 +123,7 @@ GameObject:
168123
serializedVersion: 6
169124
m_Component:
170125
- component: {fileID: 8919753316510952228}
171-
- component: {fileID: 8348653697671578163}
126+
- component: {fileID: 8292326052271004997}
172127
m_Layer: 0
173128
m_Name: Network
174129
m_TagString: Untagged
@@ -191,7 +146,7 @@ Transform:
191146
m_Father: {fileID: 2379813361525904022}
192147
m_RootOrder: -2
193148
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
194-
--- !u!114 &8348653697671578163
149+
--- !u!114 &8292326052271004997
195150
MonoBehaviour:
196151
m_ObjectHideFlags: 0
197152
m_CorrespondingSourceObject: {fileID: 0}
@@ -200,6 +155,10 @@ MonoBehaviour:
200155
m_GameObject: {fileID: 8119374511398643187}
201156
m_Enabled: 1
202157
m_EditorHideFlags: 0
203-
m_Script: {fileID: 11500000, guid: efc985f3fc06407e8d812a5dd02cd344, type: 3}
158+
m_Script: {fileID: 11500000, guid: 63220d6adf51442db6ca4326df9101f3, type: 3}
204159
m_Name:
205160
m_EditorClassIdentifier:
161+
port: 9090
162+
host: 127.0.0.1
163+
secure: 0
164+
reconnectDelay: 0.5

0 commit comments

Comments
 (0)