Skip to content

Commit 040d32d

Browse files
committed
Fixed camera publishing too fast and updated Unity version.
1 parent aa74a94 commit 040d32d

File tree

14 files changed

+290
-26
lines changed

14 files changed

+290
-26
lines changed
37.6 KB
Loading

Assets/Materials/circle_logo_background.png.meta

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

Assets/Models/barrel/barrel.prefab

Lines changed: 114 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,114 @@
1+
%YAML 1.1
2+
%TAG !u! tag:unity3d.com,2011:
3+
--- !u!1 &2838599279520243243
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: 7745488649448463971}
12+
m_Layer: 0
13+
m_Name: barrel
14+
m_TagString: Untagged
15+
m_Icon: {fileID: 0}
16+
m_NavMeshLayer: 0
17+
m_StaticEditorFlags: 0
18+
m_IsActive: 1
19+
--- !u!4 &7745488649448463971
20+
Transform:
21+
m_ObjectHideFlags: 0
22+
m_CorrespondingSourceObject: {fileID: 0}
23+
m_PrefabInstance: {fileID: 0}
24+
m_PrefabAsset: {fileID: 0}
25+
m_GameObject: {fileID: 2838599279520243243}
26+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
27+
m_LocalPosition: {x: 0, y: 0, z: 0}
28+
m_LocalScale: {x: 1, y: 1, z: 1}
29+
m_Children:
30+
- {fileID: 2483449190887008458}
31+
m_Father: {fileID: 0}
32+
m_RootOrder: 0
33+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
34+
--- !u!1 &2885686510593183035
35+
GameObject:
36+
m_ObjectHideFlags: 0
37+
m_CorrespondingSourceObject: {fileID: 0}
38+
m_PrefabInstance: {fileID: 0}
39+
m_PrefabAsset: {fileID: 0}
40+
serializedVersion: 6
41+
m_Component:
42+
- component: {fileID: 2483449190887008458}
43+
- component: {fileID: 5831510538604118531}
44+
- component: {fileID: 4093312189634767124}
45+
m_Layer: 0
46+
m_Name: barrel_0
47+
m_TagString: Untagged
48+
m_Icon: {fileID: 0}
49+
m_NavMeshLayer: 0
50+
m_StaticEditorFlags: 0
51+
m_IsActive: 1
52+
--- !u!4 &2483449190887008458
53+
Transform:
54+
m_ObjectHideFlags: 0
55+
m_CorrespondingSourceObject: {fileID: 0}
56+
m_PrefabInstance: {fileID: 0}
57+
m_PrefabAsset: {fileID: 0}
58+
m_GameObject: {fileID: 2885686510593183035}
59+
m_LocalRotation: {x: 0, y: 0, z: 0, w: 1}
60+
m_LocalPosition: {x: 0, y: 0, z: 0}
61+
m_LocalScale: {x: 1, y: 1, z: 1}
62+
m_Children: []
63+
m_Father: {fileID: 7745488649448463971}
64+
m_RootOrder: 0
65+
m_LocalEulerAnglesHint: {x: 0, y: 0, z: 0}
66+
--- !u!33 &5831510538604118531
67+
MeshFilter:
68+
m_ObjectHideFlags: 0
69+
m_CorrespondingSourceObject: {fileID: 0}
70+
m_PrefabInstance: {fileID: 0}
71+
m_PrefabAsset: {fileID: 0}
72+
m_GameObject: {fileID: 2885686510593183035}
73+
m_Mesh: {fileID: 4300000, guid: 7d1df9e46426208439a7e51cbcff6d82, type: 2}
74+
--- !u!23 &4093312189634767124
75+
MeshRenderer:
76+
m_ObjectHideFlags: 0
77+
m_CorrespondingSourceObject: {fileID: 0}
78+
m_PrefabInstance: {fileID: 0}
79+
m_PrefabAsset: {fileID: 0}
80+
m_GameObject: {fileID: 2885686510593183035}
81+
m_Enabled: 1
82+
m_CastShadows: 1
83+
m_ReceiveShadows: 1
84+
m_DynamicOccludee: 1
85+
m_MotionVectors: 1
86+
m_LightProbeUsage: 1
87+
m_ReflectionProbeUsage: 1
88+
m_RayTracingMode: 2
89+
m_RayTraceProcedural: 0
90+
m_RenderingLayerMask: 1
91+
m_RendererPriority: 0
92+
m_Materials:
93+
- {fileID: 10302, guid: 0000000000000000f000000000000000, type: 0}
94+
m_StaticBatchInfo:
95+
firstSubMesh: 0
96+
subMeshCount: 0
97+
m_StaticBatchRoot: {fileID: 0}
98+
m_ProbeAnchor: {fileID: 0}
99+
m_LightProbeVolumeOverride: {fileID: 0}
100+
m_ScaleInLightmap: 1
101+
m_ReceiveGI: 1
102+
m_PreserveUVs: 0
103+
m_IgnoreNormalsForChartDetection: 0
104+
m_ImportantGI: 0
105+
m_StitchLightmapSeams: 1
106+
m_SelectedEditorRenderState: 3
107+
m_MinimumChartSize: 4
108+
m_AutoUVMaxDistance: 0.5
109+
m_AutoUVMaxAngle: 89
110+
m_LightmapParameters: {fileID: 0}
111+
m_SortingLayerID: 0
112+
m_SortingLayer: 0
113+
m_SortingOrder: 0
114+
m_AdditionalVertexStreams: {fileID: 0}

Assets/Models/barrel/barrel.prefab.meta

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

Assets/Robots/IGVC_Robot_2022.prefab

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -251,6 +251,7 @@ MonoBehaviour:
251251
lonNoiseStdDev: 2.138
252252
lat0Pos: 35.19488
253253
lon0Pos: -97.43862
254+
pubPeriod: 1
254255
--- !u!114 &6116572216260438484
255256
MonoBehaviour:
256257
m_ObjectHideFlags: 0

Assets/RosSharp/Scripts/RosBridgeClient/RosCommuncation/ImagePublisher.cs

Lines changed: 8 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,8 @@ public class ImagePublisher : UnityPublisher<MessageTypes.Sensor.CompressedImage
2929
[Range(0, 100)]
3030
public int qualityLevel = 50;
3131

32+
private float previousScanTime = 0;
33+
3234
private MessageTypes.Sensor.CompressedImage message;
3335
private Texture2D texture2D;
3436
private Rect rect;
@@ -49,8 +51,12 @@ protected override void Start()
4951
private void UpdateImage(Camera _camera)
5052
{
5153
if (texture2D != null && _camera == this.ImageCamera)
52-
UpdateMessage();
53-
}
54+
if (Time.realtimeSinceStartup >= previousScanTime + 0.5)
55+
{
56+
UpdateMessage();
57+
previousScanTime = Time.realtimeSinceStartup;
58+
}
59+
}
5460

5561
private void InitializeGameObject()
5662
{

Assets/Scenes/Untitled_v1.fbx

41.6 KB
Binary file not shown.

Assets/Scenes/Untitled_v1.fbx.meta

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

Packages/manifest.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@
22
"dependencies": {
33
"com.unity.ext.nunit": "1.0.6",
44
"com.unity.ide.rider": "2.0.7",
5-
"com.unity.ide.visualstudio": "2.0.12",
6-
"com.unity.ide.vscode": "1.2.4",
7-
"com.unity.test-framework": "1.1.29",
5+
"com.unity.ide.visualstudio": "2.0.14",
6+
"com.unity.ide.vscode": "1.2.5",
7+
"com.unity.test-framework": "1.1.31",
88
"com.unity.textmeshpro": "3.0.6",
99
"com.unity.timeline": "1.4.8",
1010
"com.unity.toolchain.win-x86_64-linux-x86_64": "0.1.18-preview",

Packages/packages-lock.json

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@
1717
"url": "https://packages.unity.com"
1818
},
1919
"com.unity.ide.visualstudio": {
20-
"version": "2.0.12",
20+
"version": "2.0.14",
2121
"depth": 0,
2222
"source": "registry",
2323
"dependencies": {
@@ -26,7 +26,7 @@
2626
"url": "https://packages.unity.com"
2727
},
2828
"com.unity.ide.vscode": {
29-
"version": "1.2.4",
29+
"version": "1.2.5",
3030
"depth": 0,
3131
"source": "registry",
3232
"dependencies": {},
@@ -49,7 +49,7 @@
4949
"url": "https://packages.unity.com"
5050
},
5151
"com.unity.test-framework": {
52-
"version": "1.1.29",
52+
"version": "1.1.31",
5353
"depth": 0,
5454
"source": "registry",
5555
"dependencies": {

0 commit comments

Comments
 (0)