Skip to content

Commit

Permalink
Updating for 2.5, adding new samples
Browse files Browse the repository at this point in the history
  • Loading branch information
nesnes committed Jul 13, 2018
1 parent 7faf6fd commit 7bad6fd
Show file tree
Hide file tree
Showing 290 changed files with 480,490 additions and 1,482 deletions.
51 changes: 32 additions & 19 deletions ZEDCamera/Assets/ZED/Doc/ReleaseNotes.md
Original file line number Diff line number Diff line change
@@ -1,30 +1,43 @@
<!------------------------- Release notes ------------------------------------->
### 2.5.0
- **Features**:
- Add USB Headset detection function in non-play mode.
- Improve tracking status with "Camera not tracked" status if no headset connected and camera tracking is disabled

- **Examples**:
- Add Drone Shooter example. This example reproduces the ZEDWorld drone demo app.
- Add Movie Screen example. This example reproduces the ZEDWorld movie demo app.
- Add VR Only Plane Detection. Advanced plane detection sample to show how the place the bunny and make collisions.

###2.4.1
- **Features**:
- Add Full IMUData access to get angular velocity and linear acceleration through ZEDCamera.GetInternalIMUData() function.

- **Examples**:
- Modified Dark room sample into a AR "night club" light show to show how to use ZED Manager's camera brightness settings and ZEDLight script.
- Update Object Placement sample and doc.
- **Compatibility**:
- Compatible with ZED SDK 2.5, CUDA 9.0 or 9.2.

- **Bug Fixes**:
- Fix ZEDManager's camera brightness settings through scripting.
- Fix Normal and Center on plane's detection. Refactor ZEDPlaneGameObject as MonoBehavior.
- Fix ZED Rig Mono image when game is built due to rendering path.
- Fix crash when moving SVO playback playhead.
- Fix Camera settings spamming errors due to pluginIsReady value not set.
- Fix loading screen blank on left eye at specific rotations (180deg).
- Fix Depth occlusion setting in Rig mono.
- Fix greenscreen wrong config file that breaks the GreenScreen example if not found.
- Remove "Restart Camera" when changing Depth occlusions as it was not needed.

- **Compatibility**:
- Add Vive Pro support as VR headset (not with the Vive's cameras).
### 2.4.1
- **Features**:
- Add Full IMUData access to get angular velocity and linear acceleration through ZEDCamera.GetInternalIMUData() function.

- **Examples**:
- Modified Dark room sample into a AR "night club" light show to show how to use ZED Manager's camera brightness settings and ZEDLight script.
- Update Object Placement sample and doc.

- **Bug Fixes**:
- Fix ZEDManager's camera brightness settings through scripting.
- Fix Normal and Center on plane's detection. Refactor ZEDPlaneGameObject as MonoBehavior.
- Fix ZED Rig Mono image when game is built due to rendering path.
- Fix crash when moving SVO playback playhead.
- Fix Camera settings spamming errors due to pluginIsReady value not set.
- Fix loading screen blank on left eye at specific rotations (180deg).
- Fix Depth occlusion setting in Rig mono.
- Fix greenscreen wrong config file that breaks the GreenScreen example if not found.
- Remove "Restart Camera" when changing Depth occlusions as it was not needed.

- **Compatibility**:
- Add Vive Pro support as VR headset (not with the Vive's cameras).


###2.4
### 2.4.0
- **Features**:
- Added plane detection :
- ZEDPlaneDetectionManager.cs interfaces with the SDK. Click on the screen to add planes when detected, or specify a screen-space location with DetectPlaneAtHit(). A specific function for floor detection DetectFloorPlane() is provided (as well as a GUI button access). ZEDPlaneDetectionManager inherits from MonoBehavior and must be used to have access to plane detection in Unity Scene.
Expand Down
Binary file removed ZEDCamera/Assets/ZED/Editor/Resources/logo.png
Binary file not shown.
27 changes: 25 additions & 2 deletions ZEDCamera/Assets/ZED/Editor/Scripts/ZEDCameraEditor.cs
Original file line number Diff line number Diff line change
Expand Up @@ -18,9 +18,12 @@ public class ZEDCameraEditor : Editor
bool usepostprocessing;

bool pendingchange = false;


private void OnEnable()
{


manager = (ZEDManager)target;

resolution = manager.resolution;
Expand Down Expand Up @@ -68,6 +71,10 @@ public override void OnInspectorGUI()

}

GUIStyle standardStyle = new GUIStyle(EditorStyles.textField);
GUIStyle errorStyle = new GUIStyle(EditorStyles.textField);
errorStyle.normal.textColor = Color.red;

GUILayout.Space(10);

//Status window
Expand All @@ -76,8 +83,24 @@ public override void OnInspectorGUI()
EditorGUILayout.TextField("SDK Version:", manager.versionZED);
EditorGUILayout.TextField("Engine FPS:", manager.engineFPS);
EditorGUILayout.TextField("Camera FPS:", manager.cameraFPS);
EditorGUILayout.TextField("HMD Device:", manager.HMDDevice);
EditorGUILayout.TextField("Tracking State:", manager.trackingState);

if (manager.IsCameraTracked)
EditorGUILayout.TextField ("Tracking State:", manager.trackingState, standardStyle);
else
EditorGUILayout.TextField ("Tracking State:", manager.trackingState,errorStyle);


if (Application.isPlaying)
EditorGUILayout.TextField ("HMD Device:", manager.HMDDevice);
else {
//Detect through USB
if (sl.ZEDCamera.CheckUSBDeviceConnected(sl.USB_DEVICE.USB_DEVICE_OCULUS))
EditorGUILayout.TextField ("HMD Device:", "Oculus USB Detected");
else if (sl.ZEDCamera.CheckUSBDeviceConnected(sl.USB_DEVICE.USB_DEVICE_OCULUS))
EditorGUILayout.TextField ("HMD Device:", "HTC USB Detected");
else
EditorGUILayout.TextField ("HMD Device:", "-");
}
EditorGUI.EndDisabledGroup();

GUILayout.Space(20);
Expand Down
5 changes: 4 additions & 1 deletion ZEDCamera/Assets/ZED/Editor/Scripts/ZEDPluginInspector.cs
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,7 @@ static void OnInit()
EditorApplication.update += UpdateLog;

EditorApplication.update += UpdateSettingsWnd;

}

void OnEnable()
Expand All @@ -71,7 +72,6 @@ void OnEnable()
}



static public void addMissingTag()
{
// Open tag manager
Expand Down Expand Up @@ -161,8 +161,11 @@ static void UpdateWnd()
}

EditorApplication.update -= UpdateWnd;

}



void OnGUI()
{
if (showErrorMode) {
Expand Down
31 changes: 0 additions & 31 deletions ZEDCamera/Assets/ZED/Examples/Dark Room/Scripts/BallOscillator.cs

This file was deleted.

This file was deleted.

Loading

0 comments on commit 7bad6fd

Please sign in to comment.