Skip to content

Commit

Permalink
* kinect tool fixes
Browse files Browse the repository at this point in the history
  • Loading branch information
fiezi committed Sep 18, 2012
1 parent 19d9feb commit 893253e
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 11 deletions.
Binary file modified Moviesandbox.exe
Binary file not shown.
19 changes: 10 additions & 9 deletions classes/assetInspector.cpp
Expand Up @@ -660,6 +660,16 @@ void AssetInspector::closeKinectTool(){
}

void AssetInspector::openKinectTool(bool bHighZRes){

if (!sceneData->textureList["sharedMemory"] ){
if (bHighZRes)
renderer->createEmptyTexture("sharedMemory",GL_RGBA, GL_FLOAT,1024,512);
else
renderer->createEmptyTexture("sharedMemory",GL_RGBA, GL_UNSIGNED_BYTE,1024,512);
}

if (!bKinectToolOpen)
sceneData->externalInputList["kinectInput"]->startProgram();

if (!sceneData->brush->drawing){
if (sceneData->selectedActors.size()>0 && sceneData->selectedActors[0]->textureID=="sharedMemory"){
Expand All @@ -677,15 +687,6 @@ void AssetInspector::openKinectTool(bool bHighZRes){
}
}

if (!sceneData->textureList["sharedMemory"] ){
if (bHighZRes)
renderer->createEmptyTexture("sharedMemory",GL_RGBA, GL_FLOAT,1024,512);
else
renderer->createEmptyTexture("sharedMemory",GL_RGBA, GL_UNSIGNED_BYTE,1024,512);

sceneData->externalInputList["kinectInput"]->startProgram();
}

inspectorButtons[1]->buttonColor=sceneData->focusButtonColor;
bKinectToolOpen=true;
}
Expand Down
4 changes: 2 additions & 2 deletions tools/msbKinect/userConfig.xml
Expand Up @@ -10,7 +10,7 @@
<BLIGHT>bool 0</BLIGHT>
<BPICKABLE>bool 1</BPICKABLE>
<BSENDSKELETON>bool 0</BSENDSKELETON>
<BSETCUTOFFTOZERO>bool 1</BSETCUTOFFTOZERO>
<BSETCUTOFFTOZERO>bool 0</BSETCUTOFFTOZERO>
<BSHADOWTEXTURED>bool 0</BSHADOWTEXTURED>
<BSHAREMEMORY>bool 1</BSHAREMEMORY>
<BTEXTURED>bool 0</BTEXTURED>
Expand All @@ -20,7 +20,7 @@
<BZWRITE>bool 1</BZWRITE>
<CHANNEL>int 1</CHANNEL>
<COLOR>vec4f 1.000000 1.000000 1.000000 1.000000</COLOR>
<CUTOFFDEPTH>float 1024.000000</CUTOFFDEPTH>
<CUTOFFDEPTH>float 8192.000000</CUTOFFDEPTH>
<DRAWTYPE>int 2</DRAWTYPE>
<GROUPID>string NULL</GROUPID>
<IPADDRESS>string 127.0.1.1</IPADDRESS>
Expand Down

0 comments on commit 893253e

Please sign in to comment.