Skip to content

Commit 9f775b5

Browse files
authored
Merge pull request #4 from XR-Robotics/bug-fix
Bug fix
2 parents 4c2c611 + 7949d46 commit 9f775b5

29 files changed

+6061
-698
lines changed

Assets/Main.unity

Lines changed: 5752 additions & 592 deletions
Large diffs are not rendered by default.

Assets/Plugins/Android/AndroidManifest.xml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -16,8 +16,9 @@
1616
<category android:name="android.intent.category.LAUNCHER" />
1717
</intent-filter>
1818
<meta-data android:name="unityplayer.UnityActivity" android:value="true" />
19-
<meta-data android:name="enable_mr_safeguard" android:value="1" />
20-
2119
</activity>
20+
<meta-data android:name="pvr.app.type" android:value="vr" />
21+
<!-- The following will be overridden by the PXR_Manager script.-->
22+
<meta-data android:name="enable_mr_safeguard" android:value="1" />
2223
</application>
2324
</manifest>
51.4 KB
Binary file not shown.

Assets/Plugins/Android/robotassistant_lib.aar.meta renamed to Assets/Plugins/Android/robotassistant_lib-i18n-release.aar.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.
-50 KB
Binary file not shown.

Assets/Resources/PXR_ProjectSetting.asset

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ MonoBehaviour:
4141
selfAdaptiveSharpening: 0
4242
handTrackingSupportType: 0
4343
arFoundation: 0
44-
mrSafeguard: 0
44+
mrSafeguard: 1
4545
enableRecommendMSAA: 1
4646
recommendSubsamping: 0
4747
recommendMSAA: 1
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
{"general":{"region":"cn"},"account":{"access_token":""},"package":{"package_name":"com.xrobotoolkit.client","package_version_code":1,"package_version_name":"1.1.0"}}

Assets/Resources/PicoSdkPCConfig.json.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/Scripts/Conf/VideoSourceConfigManager.cs

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -37,6 +37,7 @@ private void Awake()
3737

3838
private void LoadConfiguration(string path)
3939
{
40+
LogWindow.Info($"Loading video sources from {path}");
4041
videoSources = new Dictionary<string, VideoSource>();
4142
// Parse the YAML file
4243
var parsedVideoSources = VideoSourceYamlParser.ParseYamlFile(path);
@@ -52,6 +53,7 @@ private void LoadConfiguration(string path)
5253

5354
isInitialized = true;
5455
Debug.Log($"VideoSourceConfigManager initialized successfully. Loaded {videoSources.Count} video sources.");
56+
LogWindow.Info($"Loaded {videoSources.Count} video sources.");
5557

5658
// Log loaded video sources
5759
foreach (var kvp in videoSources)

Assets/Scripts/Conf/VideoSourceManager.cs

Lines changed: 20 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,7 @@ namespace Robot.Conf
77
public class VideoSourceManager : MonoBehaviour
88
{
99
public RectTransform rawImageRect;
10-
10+
1111
public SetLERE setLere;
1212

1313
public VideoSourceConfigManager videoSourceConfigManager;
@@ -16,7 +16,7 @@ public void UpdateVideoSource(string videoSourceName)
1616
{
1717
var videoSource = videoSourceConfigManager.GetVideoSource(videoSourceName);
1818
if (videoSource == null) return;
19-
19+
2020
UpdateVideoSource(videoSource);
2121
}
2222

@@ -25,42 +25,54 @@ public void UpdateVideoSource(VideoSource videoSource)
2525
if (videoSourceConfigManager == null)
2626
{
2727
Debug.LogError("VideoSourceConfigManager is not set.");
28+
LogWindow.Error("VideoSourceConfigManager is not set.");
2829
return;
2930
}
3031

3132
if (rawImageRect == null)
3233
{
3334
Debug.LogError("RawImage RectTransform is not set.");
35+
LogWindow.Error("RawImage RectTransform is not set.");
3436
return;
3537
}
36-
38+
3739
// Update video source
3840
videoSourceConfigManager.SetVideoSource(videoSource);
3941

4042
// Get camera parameters
4143
var cameraParams = videoSourceConfigManager.CameraParameters;
4244
Debug.Log($"Updating video source to: {videoSource.name}");
45+
LogWindow.Info($"Updating video source to: {videoSource.name}");
4346
Debug.Log($"Camera Parameters: {cameraParams}");
47+
LogWindow.Info($"Camera Parameters: {cameraParams}");
4448
Debug.Log($"type: {videoSource.camera}");
49+
LogWindow.Info($"type: {videoSource.camera}");
4550

4651
// update rect transform size
4752
rawImageRect.sizeDelta =
4853
new Vector2(videoSourceConfigManager.RectWidth, videoSourceConfigManager.RectHeight);
49-
54+
5055
// log rect transform size for debugging
5156
Debug.Log($"RawImage RectTransform Size: {rawImageRect.sizeDelta}");
52-
57+
LogWindow.Info($"RectTransform Size: {rawImageRect.sizeDelta}");
58+
5359
// Update SetLERE component
54-
setLere.UpdateParameters(videoSourceConfigManager.VisibleRatio,
60+
setLere.UpdateParameters(videoSourceConfigManager.VisibleRatio,
5561
videoSourceConfigManager.ContentRatio, videoSourceConfigManager.HeightCompressionFactor);
56-
62+
5763
// log shader properties for debugging
5864
Debug.Log($"Shader Properties - Visible Ratio: {videoSourceConfigManager.VisibleRatio}, " +
5965
$"Content Ratio: {videoSourceConfigManager.ContentRatio}, " +
6066
$"Height Compression Factor: {videoSourceConfigManager.HeightCompressionFactor}");
67+
LogWindow.Info($"Shader Properties - Visible Ratio: {videoSourceConfigManager.VisibleRatio}, " +
68+
$"Content Ratio: {videoSourceConfigManager.ContentRatio}, " +
69+
$"Height Compression Factor: {videoSourceConfigManager.HeightCompressionFactor}");
6170

6271
// Log camera settings for debugging
63-
Debug.Log($"Camera Settings - Width: {cameraParams.width}, Height: {cameraParams.height}, FPS: {cameraParams.fps}, Bitrate: {cameraParams.BitrateInMbps:F1}Mbps");
72+
Debug.Log(
73+
$"Camera Settings - Width: {cameraParams.width}, Height: {cameraParams.height}, FPS: {cameraParams.fps}, Bitrate: {cameraParams.BitrateInMbps:F1}Mbps");
74+
LogWindow.Info(
75+
$"Camera Settings - Width: {cameraParams.width}, Height: {cameraParams.height}, FPS: {cameraParams.fps}, Bitrate: {cameraParams.BitrateInMbps:F1}Mbps");
6476
}
6577

6678
private void OnGUI()

0 commit comments

Comments
 (0)