Skip to content

Commit

Permalink
update to v4.0 (#247)
Browse files Browse the repository at this point in the history
* fix recording path error

* add updated lib for linux

* Add Vsync in SK sample code

* clean scenes parameters

* initial commit

* release 3.5

* 3.5 release

* modify AR settings panel to AR Pass-through settings

* change SK example scene (model + settings)

* first commit + remove API errors

* fix SK sample for unity 2020

* remove svo path (used for debug) in zedmanager

* update linux wrapper

* add unity version check and fix hasXRDevice() function

* remove debug log from last commit

* initial commit

* multi cam - wip

* 3.6 - WIP

* add multicam scripts

* add missings files

* clean local repo / add missing shaders

* update plugin version to 4.0

* New SK API - WIP

* fix new Body tracking sample with new fitting API

* Improve SK readme

* add comments in SK sample scripts

* clean SK sampleé

* add missing meta file

* update dll calls

* fix dll call

* release_3.6

* remove debug logs

* fix object_class enum

* clean repo

* fix dll fonction name

* merge xr compatibility branch - need more QA

* add custom od sample

* update OD readme

* add is_grounded + body_34

* final update for 3.6

* update linux wrapper

* modify grab error code to public variable

* wip fix sk rigging

* add new svo compression modes

* initial commit

* initial commit - add RPdefiner + remove LWRP

* update linux wrapper

* add hdrp/urp files

* update shaders for planetarium scene

* add option to convert zed prefab to srp

* update mats

* update planetarium materials

* change VR rig to use only one cam

* fix mat + add missing include

* fix last materials + update readme

* add new RT params : remove satured areas

* add height offset slider

* add keyboard bindings for height offset

* update with new api (3.7)

* prepare 3.7 release

* update linux wrapper for 3.7

* update api to 3.8

* add new 3.8 params

* prepare for release

* add last api change for 3.8

* fix set value methods and setROI

* push to 4.0

* add fusion sk api

* add zedfusionmanager script

* add v0 of foot IK & move bone animation to OnAnimatorIK callback

* update gitignore

* update avatar prefab for foot ik

* add foot orientation to floor normal

* IK on right foot

* add foot IK, expose parameters, clean code

* fix lerp start

* clean code

* set culling mode to "always animate" in prefab

* add manual height offset

* fix automatic height offset

* debug commit

* manual offset + foot IK no jitter

* automatic + fik with issue when crouching

* wip fix automatic crouch

* wip : automatic and fik and manual work, but maybe issue with bending knees

* dirty working commit - apply height offset whether feet visible or not

* fix foot always parallel to ground issue

* fix wrong error code

* fix opencv api change

* add gt exporter

* fix missing avatar

* update opencv sample with latest opencv version api

* add missing metadata

* fix svo frame counting

* update wrapper

* update api to

* fix svo loop

* add isnan to common

* update win wrapper

* update dll

* update dll

* OD frame -> body tracking frame

* rename var

* add setfloorasorigin setting in the editor

* update variable setfloorasorigin name

* update to 4.0 skeletons

* update scene/prefab

* clean code & project

* move some variables

* disable auto offset with 0 conf

* variable name change

* fix merge conflict

* optim ai model in background - need QA

* put body_34 back in the project

* change debug logs & add body34 body parts

* add timeout and time tracking to neural parallel optim - still needs QA

* split bt_model-od_model & adjust some var names

* remove neural fast & rename to _fast

* fix custom ob script

* fix bt

* update body parts naming

* fix ai optim check

* refactor code to remove switches/ifs on body_format everywhere

* remove GTExporter files

* add fill mode

* update default param of bt scene

* hide GMSL res for USB camera

* change height offset type -> float

* fix zedmanager editor

* fix loop with real time

* make hands bones/nodes display smaller

* rename skeletontracking to bodytracking

* udpate linux wrapper and fix conflicts

* remove plane

---------

Co-authored-by: obraun <[email protected]>
Co-authored-by: Jean-Loup Macarit <[email protected]>
  • Loading branch information
3 people committed Mar 30, 2023
1 parent 307ae26 commit 6ad09d1
Show file tree
Hide file tree
Showing 156 changed files with 9,564 additions and 2,877 deletions.
9 changes: 8 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -43,4 +43,11 @@ sysinfo.txt
ZEDCamera/Assets/SteamVR/
ZEDCamera/Assets/Oculus/
ZEDCamera/ProjectSettings/
ZEDCamera/Assets/Benjamin
ZEDCamera/Assets/Benjamin
ZEDCamera/Assets/LocalTests/
ZEDCamera/Assets/LocalTest/

ZEDCamera/Logs/
ZEDCamera/Packages/
ZEDCamera/UserSettings/
ZEDCamera/.vsconfig
16 changes: 11 additions & 5 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,6 +10,8 @@ Features include:
- Inside-out positional tracking
- Spatial mapping
- Real-time plane detection
- Object detection
- Body tracking

## Getting Started

Expand Down Expand Up @@ -163,13 +165,19 @@ Print out ArUco markers, put them in view of your ZED, and let the battle begin.

### Greenscreen

https://user-images.githubusercontent.com/113181784/202203983-01d323ce-4f57-4ce5-b8cf-f22d891c6319.mp4
[![](https://thumbs.gfycat.com/PalatableDesertedHorse-size_restricted.gif)](https://gfycat.com/PalatableDesertedHorse)

Aim your ZED at a greenscreen and hit Play to see your subject standing in a small town in the desert. You'll see that the nearby crates still have all the proper occlusion, but the greenscreen background is replaced with the virtual background. Attach the ZED to a controller or Vive Tracker and specify it in **ZEDControllerTracker** to move the ZED around in your tracked VR space.

Aim your ZED at a greenscreen and hit Play to see your subject standing in a small town in the desert. You'll see that the nearby crates still have all the proper occlusion, but the greenscreen background is replaced with the virtual background. Attach the ZED to a controller or Vive Tracker and specify it in **ZEDControllerTracker** to move the ZED around in your tracked VR space.

### Mixed Reality Calibration

https://user-images.githubusercontent.com/113181784/202201972-7e199704-1057-4a40-a7ac-ca82a5f2ce53.mp4
[![](https://thumbs.gfycat.com/NegativeLazyHuman-size_restricted.gif)](https://gfycat.com/NegativeLazyHuman)

Use our interactive, in-VR app to calibrate your ZED with a tracked object, like a controller or Vive Tracker, to make capturing mixed reality videos easier than ever.



Use our interactive, in-VR app to calibrate your ZED with a tracked object, like a controller or Vive Tracker, to make capturing mixed reality videos easier than ever.

Expand Down Expand Up @@ -402,9 +410,7 @@ To use, create an empty GameObject and add the **ZEDPlaneDetectionManager** comp

- **Visible in Scene** governs whether you see planes in the Scene window.
- **Visible in Game** governs whether you see planes in the Game view. Disabling can be useful if you just want planes for collisions.
- **Override Material** will replace the default wireframe material

on created planes with the material you specify.
- **Override Material** will replace the default wireframe material on created planes with the material you specify.
- **Add Collider** causes the manager to add a Mesh Collider to planes once spawned, enabling collisions.

See the two included Plane Detection samples to explore further.
Expand Down
4 changes: 4 additions & 0 deletions ZEDCamera/Assets/ZED/Editor/Scripts/BuildScript.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

358 changes: 250 additions & 108 deletions ZEDCamera/Assets/ZED/Editor/Scripts/ZEDCameraEditor.cs

Large diffs are not rendered by default.

4 changes: 4 additions & 0 deletions ZEDCamera/Assets/ZED/Editor/Scripts/ZEDCameraEditor.cs.meta

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,15 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Alpha_Body_MAT
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_ValidKeywords: []
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand Down Expand Up @@ -55,6 +56,7 @@ Material:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
Expand All @@ -73,5 +75,6 @@ Material:
- _UVSec: 0
- _ZWrite: 1
m_Colors:
- _Color: {r: 0.09657001, g: 0.4216198, b: 0.522, a: 1}
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
@@ -0,0 +1,105 @@
%YAML 1.1
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: M_Armature_Arms
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ValidKeywords:
- _METALLICGLOSSMAP
- _NORMALMAP
- _PARALLAXMAP
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
m_CustomRenderQueue: -1
stringTagMap: {}
disabledShaderPasses: []
m_SavedProperties:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 2800000, guid: 4da23c18156b43e408ec72d87df4d8a1, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _CameraTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DepthXYZTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailMask:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailNormalMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _EmissionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _LightTexture0:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _LightTextureB0:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 2800000, guid: bd2f0b88649ccbc4d9d058e3343ef81f, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MaskTex:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 2800000, guid: fe2d500e67b371e4598c2c2e11440426, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 2800000, guid: a97318aa980d58c40bd8e17743a2fc47, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.4472136
- _GlossyReflections: 1
- _MaxDepth: 20
- _Metallic: 0
- _Mode: 0
- _OcclusionStrength: 1
- _Parallax: 0.02
- _SmoothnessTextureChannel: 0
- _SpecularHighlights: 1
- _SrcBlend: 1
- _UVSec: 0
- _ZWrite: 1
- directionalLightEffect: 1
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Original file line number Diff line number Diff line change
Expand Up @@ -2,14 +2,18 @@
%TAG !u! tag:unity3d.com,2011:
--- !u!21 &2100000
Material:
serializedVersion: 6
serializedVersion: 8
m_ObjectHideFlags: 0
m_CorrespondingSourceObject: {fileID: 0}
m_PrefabInstance: {fileID: 0}
m_PrefabAsset: {fileID: 0}
m_Name: Avatar_mat
m_Name: M_Armature_Body
m_Shader: {fileID: 46, guid: 0000000000000000f000000000000000, type: 0}
m_ShaderKeywords:
m_ValidKeywords:
- _METALLICGLOSSMAP
- _NORMALMAP
- _PARALLAXMAP
m_InvalidKeywords: []
m_LightmapFlags: 4
m_EnableInstancingVariants: 0
m_DoubleSidedGI: 0
Expand All @@ -20,7 +24,7 @@ Material:
serializedVersion: 3
m_TexEnvs:
- _BumpMap:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 2e0ee2c84b9126144b80a4d8f4019fe2, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _DetailAlbedoMap:
Expand All @@ -40,28 +44,29 @@ Material:
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MainTex:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 289a172148e527f44997a3d5170cd955, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _MetallicGlossMap:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 46f00e0b9a66dfa44949f3f2b813cc3b, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _OcclusionMap:
m_Texture: {fileID: 0}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
- _ParallaxMap:
m_Texture: {fileID: 0}
m_Texture: {fileID: 2800000, guid: 616705178f22e5849bf009caa82e5037, type: 3}
m_Scale: {x: 1, y: 1}
m_Offset: {x: 0, y: 0}
m_Ints: []
m_Floats:
- _BumpScale: 1
- _Cutoff: 0.5
- _DetailNormalMapScale: 1
- _DstBlend: 0
- _GlossMapScale: 1
- _Glossiness: 0.5
- _Glossiness: 0.4472136
- _GlossyReflections: 1
- _Metallic: 0
- _Mode: 0
Expand All @@ -75,3 +80,4 @@ Material:
m_Colors:
- _Color: {r: 1, g: 1, b: 1, a: 1}
- _EmissionColor: {r: 0, g: 0, b: 0, a: 1}
m_BuildTextureStacks: []

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

Loading

0 comments on commit 6ad09d1

Please sign in to comment.