Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Portability Fix #12

Open
wants to merge 2 commits into
base: master
Choose a base branch
from
Open

Portability Fix #12

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
1090e02
portability issue fix, .gitignore edit
eranws Jun 2, 2012
39e337e
depth is starting from 450mm
eranws Jun 2, 2012
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 10 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,13 @@ build/
/example/obj/
/example/build/
example/*.layout

examples/bin
examples/ipch
examples/obj

*.opensdf
*.sdf

*.sdf
*.suo
0 ...s/openNI-demoAllFeatures/Project.xcconfig → examples/Project.xcconfig
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 examples/openNI-demoAllFeatures/makefile → examples/makefile
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...demoAllFeatures/openFrameworks-Info.plist → examples/openFrameworks-Info.plist
100755 → 100644
View file
Open in desktop
File renamed without changes.
7 changes: 0 additions & 7 deletions examples/openNI-demoAllFeatures/bin/data/openni/config/FeatureExtraction.ini
View file
Open in desktop

This file was deleted.

186 changes: 0 additions & 186 deletions examples/openNI-demoAllFeatures/bin/data/openni/config/GlobalDefaultsKinect.ini
View file
Open in desktop

This file was deleted.

3 changes: 0 additions & 3 deletions examples/openNI-demoAllFeatures/bin/data/openni/config/Nite.ini
View file
Open in desktop

This file was deleted.

31 changes: 0 additions & 31 deletions examples/openNI-demoAllFeatures/bin/data/openni/config/SamplesConfig.xml
View file
Open in desktop

This file was deleted.

Binary file removed examples/openNI-demoAllFeatures/bin/data/openni/config/h.dat
View file
Open in desktop
Binary file not shown.
3 changes: 0 additions & 3 deletions examples/openNI-demoAllFeatures/bin/data/openni/config/licenses.xml
View file
Open in desktop

This file was deleted.

10 changes: 0 additions & 10 deletions examples/openNI-demoAllFeatures/bin/data/openni/config/modules.xml
View file
Open in desktop

This file was deleted.

37 changes: 0 additions & 37 deletions examples/openNI-demoAllFeatures/bin/data/openni/config/ofxopenni_config.xml
View file
Open in desktop

This file was deleted.

Binary file removed examples/openNI-demoAllFeatures/bin/data/openni/config/s.dat
View file
Open in desktop
Binary file not shown.
Binary file removed examples/openNI-demoAllFeatures/openNISample007.sdf
View file
Open in desktop
Binary file not shown.
Binary file removed examples/openNI-demoAllFeatures/openNISample007.suo
View file
Open in desktop
Binary file not shown.
0 ...penNI-demoAllFeatures/openNISample007.cbp → examples/openNISample007.cbp
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...NI-demoAllFeatures/openNISample007.depend → examples/openNISample007.depend
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...NI-demoAllFeatures/openNISample007.layout → examples/openNISample007.layout
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...penNI-demoAllFeatures/openNISample007.sln → examples/openNISample007.sln
100755 → 100644
View file
Open in desktop
File renamed without changes.
4 changes: 2 additions & 2 deletions ...I-demoAllFeatures/openNISample007.vcxproj → examples/openNISample007.vcxproj
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,7 +66,7 @@
<Link>
<AdditionalDependencies>openframeworksLibDebug.lib;cairo-static.lib;pixman-1.lib;msimg32.lib;OpenGL32.lib;GLu32.lib;kernel32.lib;setupapi.lib;Vfw32.lib;comctl32.lib;glut32.lib;rtAudioD.lib;videoInput.lib;libfreetype.lib;FreeImage.lib;qtmlClient.lib;dsound.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;glew32s.lib;fmodex_vc.lib;glu32.lib;PocoFoundationmdd.lib;PocoNetmdd.lib;PocoUtilmdd.lib;PocoXMLmdd.lib;Ws2_32.lib;tess2.lib;OpenNI.lib;%(AdditionalDependencies)</AdditionalDependencies>
<OutputFile>$(OutDir)$(TargetName)$(TargetExt)</OutputFile>
<AdditionalLibraryDirectories>..\..\..\libs\glut\lib\vs2010;..\..\..\libs\rtAudio\lib\vs2010;..\..\..\libs\FreeImage\lib\vs2010;..\..\..\libs\freetype\lib\vs2010;..\..\..\libs\quicktime\lib\vs2010;..\..\..\libs\fmodex\lib\vs2010;..\..\..\libs\videoInput\lib\vs2010;..\..\..\libs\cairo\lib\vs2010;..\..\..\libs\glew\lib\vs2010;..\..\..\libs\glu\lib\vs2010;..\..\..\libs\Poco\lib\vs2010;..\..\..\libs\openFrameworksCompiled\lib\vs2010;..\..\..\libs\tess2\lib\vs2010;bin\data\openni\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\..\libs\glut\lib\vs2010;..\..\..\libs\rtAudio\lib\vs2010;..\..\..\libs\FreeImage\lib\vs2010;..\..\..\libs\freetype\lib\vs2010;..\..\..\libs\quicktime\lib\vs2010;..\..\..\libs\fmodex\lib\vs2010;..\..\..\libs\videoInput\lib\vs2010;..\..\..\libs\cairo\lib\vs2010;..\..\..\libs\glew\lib\vs2010;..\..\..\libs\glu\lib\vs2010;..\..\..\libs\Poco\lib\vs2010;..\..\..\libs\openFrameworksCompiled\lib\vs2010;..\..\..\libs\tess2\lib\vs2010;..\..\..\libs\openni\lib\vs2010;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreSpecificDefaultLibraries>atlthunk.lib; LIBC.lib; LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>true</GenerateDebugInformation>
<ProgramDatabaseFile>$(TargetDir)$(TargetName)_debugInfo.pdb</ProgramDatabaseFile>
Expand Down Expand Up @@ -97,7 +97,7 @@ if not exist "$(ProjectDir)bin\data" mkdir "$(ProjectDir)bin\data"
</ClCompile>
<Link>
<AdditionalDependencies>openframeworksLib.lib;cairo-static.lib;pixman-1.lib;msimg32.lib;OpenGL32.lib;GLu32.lib;kernel32.lib;setupapi.lib;glut32.lib;rtAudio.lib;videoInput.lib;libfreetype.lib;FreeImage.lib;qtmlClient.lib;dsound.lib;user32.lib;gdi32.lib;winspool.lib;comdlg32.lib;advapi32.lib;shell32.lib;ole32.lib;oleaut32.lib;uuid.lib;glew32s.lib;fmodex_vc.lib;glu32.lib;PocoFoundationmd.lib;PocoNetmd.lib;PocoUtilmd.lib;PocoXMLmd.lib;tess2.lib;OpenNI.lib;%(AdditionalDependencies)</AdditionalDependencies>
<AdditionalLibraryDirectories>..\..\..\libs\glut\lib\vs2010;..\..\..\libs\rtAudio\lib\vs2010;..\..\..\libs\FreeImage\lib\vs2010;..\..\..\libs\freetype\lib\vs2010;..\..\..\libs\quicktime\lib\vs2010;..\..\..\libs\fmodex\lib\vs2010;..\..\..\libs\videoInput\lib\vs2010;..\..\..\libs\cairo\lib\vs2010;..\..\..\libs\glew\lib\vs2010;..\..\..\libs\glu\lib\vs2010;..\..\..\libs\Poco\lib\vs2010;..\..\..\libs\openFrameworksCompiled\lib\vs2010;..\..\..\libs\tess2\lib\vs2010;bin\data\openni\lib;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<AdditionalLibraryDirectories>..\..\..\libs\glut\lib\vs2010;..\..\..\libs\rtAudio\lib\vs2010;..\..\..\libs\FreeImage\lib\vs2010;..\..\..\libs\freetype\lib\vs2010;..\..\..\libs\quicktime\lib\vs2010;..\..\..\libs\fmodex\lib\vs2010;..\..\..\libs\videoInput\lib\vs2010;..\..\..\libs\cairo\lib\vs2010;..\..\..\libs\glew\lib\vs2010;..\..\..\libs\glu\lib\vs2010;..\..\..\libs\Poco\lib\vs2010;..\..\..\libs\openFrameworksCompiled\lib\vs2010;..\..\..\libs\tess2\lib\vs2010;..\..\..\libs\openni\lib\vs2010;%(AdditionalLibraryDirectories)</AdditionalLibraryDirectories>
<IgnoreAllDefaultLibraries>false</IgnoreAllDefaultLibraries>
<IgnoreSpecificDefaultLibraries>atlthunk.lib; LIBC.lib; LIBCMT;%(IgnoreSpecificDefaultLibraries)</IgnoreSpecificDefaultLibraries>
<GenerateDebugInformation>false</GenerateDebugInformation>
Expand Down
0 ...lFeatures/openNISample007.vcxproj.filters → examples/openNISample007.vcxproj.filters
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...oAllFeatures/openNISample007.vcxproj.user → examples/openNISample007.vcxproj.user
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...demoAllFeatures/openNISample007.workspace → examples/openNISample007.workspace
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...emoAllFeatures/openNISample007Linux64.cbp → examples/openNISample007Linux64.cbp
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...Features/openNISample007Linux64.workspace → examples/openNISample007Linux64.workspace
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...openNiSample007.xcodeproj/project.pbxproj → ...openNiSample007.xcodeproj/project.pbxproj
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...ject.xcworkspace/contents.xcworkspacedata → ...ject.xcworkspace/contents.xcworkspacedata
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...cuserdatad/UserInterfaceState.xcuserstate → ...cuserdatad/UserInterfaceState.xcuserstate
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ....xcuserdatad/WorkspaceSettings.xcsettings → ....xcuserdatad/WorkspaceSettings.xcsettings
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...rdatad/xcschemes/openNISample007.xcscheme → ...rdatad/xcschemes/openNISample007.xcscheme
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 ...rdatad/xcschemes/xcschememanagement.plist → ...rdatad/xcschemes/xcschememanagement.plist
100755 → 100644
View file
Open in desktop
File renamed without changes.
0 examples/openNI-demoAllFeatures/src/main.cpp → examples/src/main.cpp
100755 → 100644
View file
Open in desktop
File renamed without changes.
2 changes: 1 addition & 1 deletion ...es/openNI-demoAllFeatures/src/testApp.cpp → examples/src/testApp.cpp
100755 → 100644
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ void testApp::setup() {
isCPBkgnd = true;
isMasking = true;

nearThreshold = 500;
nearThreshold = 400;
farThreshold = 1000;

filterFactor = 0.1f;
Expand Down
0 ...ples/openNI-demoAllFeatures/src/testApp.h → examples/src/testApp.h
100755 → 100644
View file
Open in desktop
File renamed without changes.