From 6a673c24a0e80e1b4593b167af8fcb7b32fef4ff Mon Sep 17 00:00:00 2001 From: Sammy Pfeiffer Date: Thu, 24 Apr 2014 01:15:41 +0200 Subject: [PATCH 01/13] Fix typo --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index c91e93f2..9c14e8cc 100644 --- a/README +++ b/README @@ -3,7 +3,7 @@ OpenNI Website: www.openni.org -Buliding Prerequisites +Building Prerequisites ====================== Windows ------- From 299557b8180f286a68c1f1ac4cc89ec6cbb06b5f Mon Sep 17 00:00:00 2001 From: Phil Nelson Date: Wed, 23 Apr 2014 16:59:30 -0700 Subject: [PATCH 02/13] Fixed dead link. --- README | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README b/README index 9c14e8cc..6e8332fc 100644 --- a/README +++ b/README @@ -1,7 +1,7 @@ OpenNI ------ -Website: www.openni.org +Website: http://structure.io/openni Building Prerequisites ====================== From e355c316e0561f58922257235204909a6c46d251 Mon Sep 17 00:00:00 2001 From: Jeff Powers Date: Sat, 17 May 2014 14:52:58 -0700 Subject: [PATCH 03/13] Allow warnings to fix compile on OS X 10.9 --- Makefile | 1 + 1 file changed, 1 insertion(+) diff --git a/Makefile b/Makefile index a436a84f..4c666529 100644 --- a/Makefile +++ b/Makefile @@ -12,6 +12,7 @@ # make FORCE_BUILD_CLR=1 # ############################################################################# +export ALLOW_WARNINGS = 1 include ThirdParty/PSCommon/BuildSystem/CommonDefs.mak From a988950f5ef989c1b6673c4ff1c22851586a6dfb Mon Sep 17 00:00:00 2001 From: Francisco Facioni Date: Tue, 22 Jul 2014 11:44:36 -0300 Subject: [PATCH 04/13] fix error when building it in OS x 10.9 with libc++ --- ThirdParty/GL/glh/glh_convenience.h | 6 ------ .../PSCommon/XnLib/ThirdParty/GL/glh/glh_convenience.h | 7 ------- 2 files changed, 13 deletions(-) diff --git a/ThirdParty/GL/glh/glh_convenience.h b/ThirdParty/GL/glh/glh_convenience.h index 9dae8c90..6700ac45 100644 --- a/ThirdParty/GL/glh/glh_convenience.h +++ b/ThirdParty/GL/glh/glh_convenience.h @@ -47,12 +47,6 @@ // with opengl... - -// debugging hack... -#include - -using namespace std; - #ifdef MACOS #include #else diff --git a/ThirdParty/PSCommon/XnLib/ThirdParty/GL/glh/glh_convenience.h b/ThirdParty/PSCommon/XnLib/ThirdParty/GL/glh/glh_convenience.h index 9dae8c90..c8e7e61e 100644 --- a/ThirdParty/PSCommon/XnLib/ThirdParty/GL/glh/glh_convenience.h +++ b/ThirdParty/PSCommon/XnLib/ThirdParty/GL/glh/glh_convenience.h @@ -46,13 +46,6 @@ // Convenience methods for using glh_linear objects // with opengl... - - -// debugging hack... -#include - -using namespace std; - #ifdef MACOS #include #else From 6d02884b53011a95477a85a462b9217643c6788a Mon Sep 17 00:00:00 2001 From: Nicolas Tisserand Date: Wed, 6 Aug 2014 14:00:30 -0700 Subject: [PATCH 05/13] Converting README to Markdown and adding more Android instructions. --- README | 94 -------------------------------- README.md | 158 ++++++++++++++++++++++++++++++++++++++++++++++++++++++ 2 files changed, 158 insertions(+), 94 deletions(-) delete mode 100644 README create mode 100644 README.md diff --git a/README b/README deleted file mode 100644 index 6e8332fc..00000000 --- a/README +++ /dev/null @@ -1,94 +0,0 @@ -OpenNI ------- - -Website: http://structure.io/openni - -Building Prerequisites -====================== -Windows -------- -- Microsoft Visual Studio 2010 - From: http://msdn.microsoft.com/en-us/vstudio/bb984878.aspx -- Microsoft Kinect SDK v1.6 - From: http://go.microsoft.com/fwlink/?LinkID=262831 -- Python 2.6+/3.x - From: http://www.python.org/download/ -- PyWin32 - From: http://sourceforge.net/projects/pywin32/files/pywin32/ - Please make sure you download the version that matches your exact python version. -- JDK 6.0 - From: http://www.oracle.com/technetwork/java/javase/downloads/jdk-6u32-downloads-1594644.html - You must also define an environment variable called "JAVA_HOME" that points to the JDK installation directory. - For example: set JAVA_HOME=c:\Program Files (x86)\Java\jdk1.6.0_32 -- WIX 3.5 - From: http://wix.codeplex.com/releases/view/60102 -- Doxygen - From: http://www.stack.nl/~dimitri/doxygen/download.html#latestsrc -- GraphViz - From: http://www.graphviz.org/Download_windows.php - -Linux ------ -- GCC 4.x - From: http://gcc.gnu.org/releases.html - Or via apt: - sudo apt-get install g++ -- Python 2.6+/3.x - From: http://www.python.org/download/ - Or via apt: - sudo apt-get install python -- LibUSB 1.0.x - From: http://sourceforge.net/projects/libusb/files/libusb-1.0/ - Or via apt: - sudo apt-get install libusb-1.0-0-dev -- LibUDEV - sudo apt-get install libudev-dev -- JDK 6.0 - From: http://www.oracle.com/technetwork/java/javase/downloads/jdk-6u32-downloads-1594644.html - Or via apt: - Ubuntu 10.x: - sudo add-apt-repository "deb http://archive.canonical.com/ lucid partner" - sudo apt-get update - sudo apt-get install sun-java6-jdk - Ubuntu 12.x: - sudo apt-get install openjdk-6-jdk -- FreeGLUT3 - From: http://freeglut.sourceforge.net/index.php#download - Or via apt: - sudo apt-get install freeglut3-dev -- Doxygen - From: http://www.stack.nl/~dimitri/doxygen/download.html#latestsrc - Or via apt: - sudo apt-get install doxygen -- GraphViz - From: http://www.graphviz.org/Download_linux_ubuntu.php - Or via apt: - sudo apt-get install graphviz - -Android -------- -- Android NDK r8d - From: http://developer.android.com/tools/sdk/ndk/index.html#Downloads - -Building -======== -Building on Windows: - Open the solution OpenNI.sln - -Building on Linux: - Run: - $ make - -Cross-Compiling for ARM on Linux: - The following environment variables should be defined: - - ARM_CXX= - - ARM_STAGING= - Then, run: - $ PLATFORM=Arm make - -Creating OpenNI2 package: - - Go into the directory 'Packaging' - - Run ReleaseVersion.py [x86|x64|arm|android] - NOTE: for android, NDK_ROOT must be defined, pointing to the NDK installation dir. - - Installer will be placed in the 'Final' directory - diff --git a/README.md b/README.md new file mode 100644 index 00000000..e6ef588a --- /dev/null +++ b/README.md @@ -0,0 +1,158 @@ +# OpenNI + + +Website: http://structure.io/openni + +## Building Prerequisites + +### Windows + +- Microsoft Visual Studio 2010 + + - Download and install from: http://msdn.microsoft.com/en-us/vstudio/bb984878.aspx + +- Microsoft Kinect SDK v1.6 + + - Download and install from: http://go.microsoft.com/fwlink/?LinkID=262831 + +- Python 2.6+/3.x + + - Download and install from: http://www.python.org/download/ + +- PyWin32 + + - Download and install from: http://sourceforge.net/projects/pywin32/files/pywin32/ + + Please make sure you download the version that matches your exact python version. + +- JDK 6.0 + + - Download and install from: http://www.oracle.com/technetwork/java/javase/downloads/jdk-6u32-downloads-1594644.html + + You must also define an environment variable called `JAVA_HOME` that points to the JDK installation directory. For example: + + set JAVA_HOME=c:\Program Files (x86)\Java\jdk1.6.0_32 + +- WIX 3.5 + + - Download and install from: http://wix.codeplex.com/releases/view/60102 + +- Doxygen + + - Download and install from: http://www.stack.nl/~dimitri/doxygen/download.html#latestsrc + +- GraphViz + + - Download and install from: http://www.graphviz.org/Download_windows.php + +### Linux + +- GCC 4.x + + - Download and install from: http://gcc.gnu.org/releases.html + + - Or use `apt`: + + sudo apt-get install g++ + +- Python 2.6+/3.x + + - Download and install from: http://www.python.org/download/ + + - Or use `apt`: + + sudo apt-get install python + +- LibUSB 1.0.x + + - Download and install from: http://sourceforge.net/projects/libusb/files/libusb-1.0/ + + - Or use `apt`: + + sudo apt-get install libusb-1.0-0-dev + +- LibUDEV + + sudo apt-get install libudev-dev + +- JDK 6.0 + + - Download and install from: http://www.oracle.com/technetwork/java/javase/downloads/jdk-6u32-downloads-1594644.html + + - Or use `apt`: + + - On Ubuntu 10.x: + + sudo add-apt-repository "deb http://archive.canonical.com/ lucid partner" + sudo apt-get update + sudo apt-get install sun-java6-jdk + + - On Ubuntu 12.x: + + sudo apt-get install openjdk-6-jdk + +- FreeGLUT3 + + - Download and install from: http://freeglut.sourceforge.net/index.php#download + + - Or use `apt`: + + sudo apt-get install freeglut3-dev + +- Doxygen + + - Download and install from: http://www.stack.nl/~dimitri/doxygen/download.html#latestsrc + + - Or use `apt`: + + sudo apt-get install doxygen + +- GraphViz + + - Download and install from: http://www.graphviz.org/Download_linux_ubuntu.php + + - Or use `apt`: + + sudo apt-get install graphviz + +### Android + +- Download and install the Android NDK version **r8d**. Newer versions will **NOT** work. + +- For Mac OS X: http://dl.google.com/android/ndk/android-ndk-r8d-darwin-x86.tar.bz2 +- For Windows: http://dl.google.com/android/ndk/android-ndk-r8d-windows.zip +- For Linux: http://dl.google.com/android/ndk/android-ndk-r8d-linux-x86.tar.bz2 + + Building Android packages requires the NDK_ROOT environment variable to be defined, and its value must be pointing to the NDK installation dir: `NDK_ROOT=/path/to/android-ndk-r8d` + +## Building + +### Building on Windows: + + Open the solution `OpenNI.sln` + +### Building on Linux: + + Run: + + make + +### Cross-Compiling for ARM on Linux + + The following environment variables should be defined: + +- `ARM_CXX=path-to-cross-compilation-g++` +- `ARM_STAGING=path-to-cross-compilation-staging-dir` + +Then, run: + + PLATFORM=Arm make + +### Creating OpenNI2 packages + + - Go into the directory `Packaging` + - Run: + + ReleaseVersion.py [x86|x64|arm|android] + + - The installer will be placed in the `Final` directory From 716cffb2888bb2a0fa3264a22085caf8ce26368f Mon Sep 17 00:00:00 2001 From: Pedro Asad Date: Wed, 8 Oct 2014 18:18:57 -0300 Subject: [PATCH 06/13] Added a missing -lpthread flag to one Makefile The lack of the -lpthread flag on Source/Tools/NiViewer/Makefile prevented the whole project from compiling correctly on Ubuntu 14.04 64 bit. Just added the missing flag to this Makefile, according to the same solution for issue 47 of the old OpenNI2 Github repository, that boils down to a similar problem and can be found here, on Github https://github.com/OpenNI/OpenNI2/issues/47 --- Source/Tools/NiViewer/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/Source/Tools/NiViewer/Makefile b/Source/Tools/NiViewer/Makefile index 1eba049a..1b5714d1 100644 --- a/Source/Tools/NiViewer/Makefile +++ b/Source/Tools/NiViewer/Makefile @@ -26,7 +26,7 @@ else endif LIB_DIRS += ../../../ThirdParty/PSCommon/XnLib/Bin/$(PLATFORM)-$(CFG) -USED_LIBS += OpenNI2 XnLib +USED_LIBS += OpenNI2 XnLib pthread EXE_NAME = NiViewer From baf8a709dd16fe3d4422378ed9187ceea5fbddb9 Mon Sep 17 00:00:00 2001 From: Nicolas Tisserand Date: Sun, 21 Dec 2014 23:18:37 -0800 Subject: [PATCH 07/13] Fix Kinect VS project build settings. --- Source/Drivers/Kinect/Kinect.vcxproj | 4 ---- 1 file changed, 4 deletions(-) diff --git a/Source/Drivers/Kinect/Kinect.vcxproj b/Source/Drivers/Kinect/Kinect.vcxproj index f54e8b2f..cb29d9ff 100644 --- a/Source/Drivers/Kinect/Kinect.vcxproj +++ b/Source/Drivers/Kinect/Kinect.vcxproj @@ -68,15 +68,11 @@ $(SolutionDir)Bin\$(Platform)-$(Configuration)\OpenNI2\Drivers\ $(SolutionDir)Bin\Intermediate\$(Platform)-$(Configuration)\$(ProjectName)\ - $(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include - $(VCInstallDir)lib;$(VCInstallDir)atlmfc\lib;$(WindowsSdkDir)lib;$(FrameworkSDKDir)\lib; true $(SolutionDir)Bin\$(Platform)-$(Configuration)\OpenNI2\Drivers\ $(SolutionDir)Bin\Intermediate\$(Platform)-$(Configuration)\$(ProjectName)\ - $(VCInstallDir)include;$(VCInstallDir)atlmfc\include;$(WindowsSdkDir)include;$(FrameworkSDKDir)\include; - $(VCInstallDir)lib\amd64;$(VCInstallDir)atlmfc\lib\amd64;$(WindowsSdkDir)lib\x64; true From 9da7c4410e2e163dd115a0fc812dc5b876518544 Mon Sep 17 00:00:00 2001 From: Nicolas Tisserand Date: Sun, 21 Dec 2014 23:17:08 -0800 Subject: [PATCH 08/13] Fix MSVC12 warnings. --- ThirdParty/PSCommon/XnLib/Source/Win32/XnWin32Network.cpp | 3 +++ ThirdParty/PSCommon/XnLib/Source/Win32/XnWin32OS.cpp | 8 ++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/ThirdParty/PSCommon/XnLib/Source/Win32/XnWin32Network.cpp b/ThirdParty/PSCommon/XnLib/Source/Win32/XnWin32Network.cpp index ea003c2f..3ab5ee53 100644 --- a/ThirdParty/PSCommon/XnLib/Source/Win32/XnWin32Network.cpp +++ b/ThirdParty/PSCommon/XnLib/Source/Win32/XnWin32Network.cpp @@ -21,6 +21,9 @@ //--------------------------------------------------------------------------- // Includes //--------------------------------------------------------------------------- + +#define _WINSOCK_DEPRECATED_NO_WARNINGS 1 + #include #include #include diff --git a/ThirdParty/PSCommon/XnLib/Source/Win32/XnWin32OS.cpp b/ThirdParty/PSCommon/XnLib/Source/Win32/XnWin32OS.cpp index bd7571ed..c4448c16 100644 --- a/ThirdParty/PSCommon/XnLib/Source/Win32/XnWin32OS.cpp +++ b/ThirdParty/PSCommon/XnLib/Source/Win32/XnWin32OS.cpp @@ -197,8 +197,12 @@ XN_C_API XnStatus xnOSGetInfo(xnOSInfo* pOSInfo) // Get OS Info OSVERSIONINFOEX osVersionInfo; osVersionInfo.dwOSVersionInfoSize = sizeof(OSVERSIONINFOEX); - if (0 == GetVersionEx((LPOSVERSIONINFO)&osVersionInfo)) - { + +#pragma warning(push) +#pragma warning(disable:4996) + if (0 == GetVersionEx((LPOSVERSIONINFO)&osVersionInfo)) +#pragma warning(pop) + { DWORD nErr = GetLastError(); xnLogWarning(XN_MASK_OS, "Failed getting OS version information. Error code: %d", nErr); return XN_STATUS_ERROR; From 468332b6cbb44b87a150d9c862a386ed1af3f467 Mon Sep 17 00:00:00 2001 From: Nicolas Tisserand Date: Wed, 28 Jan 2015 12:43:14 -0800 Subject: [PATCH 09/13] Add contributing section to README. --- README.md | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e6ef588a..b8799d14 100644 --- a/README.md +++ b/README.md @@ -1,7 +1,12 @@ # OpenNI +http://structure.io/openni -Website: http://structure.io/openni +## Contributing ## + +Pull requests that do not apply cleanly on top of the [`develop` branch head](http://github.com/occipital/OpenNI2/tree/develop) will be rejected. + +Other than that, sensible and meaningful contributions are very welcome! ## Building Prerequisites From e123b61befd45eb3a241379a119c4a7dc669349b Mon Sep 17 00:00:00 2001 From: jselikof Date: Tue, 12 May 2015 12:35:52 -0400 Subject: [PATCH 10/13] Update README.md Added note about using the develop branch. --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index b8799d14..4e250e34 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,10 @@ http://structure.io/openni +## Develop branch ## + +The latest ongoing development is currently being done in the develop branch. Refer to README and ReleasesNotes in the develop branch for build instructions. + ## Contributing ## Pull requests that do not apply cleanly on top of the [`develop` branch head](http://github.com/occipital/OpenNI2/tree/develop) will be rejected. From 6857677beee08e264fc5aeecb1adf647a7d616ab Mon Sep 17 00:00:00 2001 From: jselikof Date: Tue, 12 May 2015 13:14:55 -0400 Subject: [PATCH 11/13] Update README.md minor tweak --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 4e250e34..5a6e9c0d 100644 --- a/README.md +++ b/README.md @@ -4,7 +4,7 @@ http://structure.io/openni ## Develop branch ## -The latest ongoing development is currently being done in the develop branch. Refer to README and ReleasesNotes in the develop branch for build instructions. +The latest ongoing development is currently being done in the develop branch. Refer to README and ReleasesNotes in the develop branch for up to date build instructions. ## Contributing ## From 1fce8edffab43c4a4cf201cff86f415b07a2d37f Mon Sep 17 00:00:00 2001 From: Dustin Hopper Date: Wed, 19 Aug 2015 12:37:57 -0500 Subject: [PATCH 12/13] OniStream:convertDepthToWorldCoordinates Function now checks the stream pixel format to return millimeters if the pixel format is set to PIXEL_FORMAT_DEPTH_100_UM --- Source/Core/OniStream.cpp | 12 +++++++++--- 1 file changed, 9 insertions(+), 3 deletions(-) diff --git a/Source/Core/OniStream.cpp b/Source/Core/OniStream.cpp index 435dde69..096c158a 100644 --- a/Source/Core/OniStream.cpp +++ b/Source/Core/OniStream.cpp @@ -399,9 +399,15 @@ OniStatus VideoStream::convertDepthToWorldCoordinates(float depthX, float depthY float normalizedX = depthX / m_worldConvertCache.resolutionX - .5f; float normalizedY = .5f - depthY / m_worldConvertCache.resolutionY; - *pWorldX = normalizedX * depthZ * m_worldConvertCache.xzFactor; - *pWorldY = normalizedY * depthZ * m_worldConvertCache.yzFactor; - *pWorldZ = depthZ; + OniVideoMode videoMode; + int size = sizeof(videoMode); + getProperty(ONI_STREAM_PROPERTY_VIDEO_MODE, &videoMode, &size); + + float const convertToMillimeters = (videoMode.pixelFormat == ONI_PIXEL_FORMAT_DEPTH_100_UM) ? 10.f : 1.f; + *pWorldX = (normalizedX * depthZ * m_worldConvertCache.xzFactor) / convertToMillimeters; + *pWorldY = (normalizedY * depthZ * m_worldConvertCache.yzFactor) / convertToMillimeters; + *pWorldZ = depthZ / convertToMillimeters; + return ONI_STATUS_OK; } From 3b787cc8b06e4129d1c5d7daf99e04413ac42266 Mon Sep 17 00:00:00 2001 From: Phil Nelson Date: Thu, 4 Apr 2019 10:27:36 -0700 Subject: [PATCH 13/13] Update README with Structure Core information. --- README.md | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index 5a6e9c0d..91443b07 100644 --- a/README.md +++ b/README.md @@ -1,6 +1,9 @@ # OpenNI -http://structure.io/openni +**Structure Core customers:** OpenNI does not currently support Structure Core. To start developing with Structure Core download *Structure SDK (Cross-Platform)* on the [Developer Portal](https://developer.structure.io/sdk). + + +OpenNI2 homepage: http://structure.io/openni ## Develop branch ##