gauthiier/RefractiveIndex
1
0
Fork 0
Code Issues 1 Pull Requests Releases Wiki Activity

removed the ofxArcBall.h and related calls as it was producing runtime locking errors

Browse Source
This commit is contained in:
Jamie Allen 2012-05-27 22:42:20 +02:00
parent 80847c5439
commit 7e422dca80
11 changed files with 86 additions and 125 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

103
config.refindx
View File

@ -1,15 +1,18 @@
<!-- THIS FILE NEEDS TO GO IN THE APPLICATION /data/ folder --> <!-- THIS FILE NEEDS TO GO IN THE APPLICATION /data/ folder -->
<config> <config>
<mode>analysing</mode> <mode>analysis</mode>
<camera> <camera>
<id>1</id> <id>1</id>
<width>640</width> <width>640</width>
<height>480</height> <height>480</height>
</camera> </camera>
<display> <display>
<fps>30</fps> <fps>30</fps>
</display> </display>
<locale> <locale>
<name>FUTURE</name> <name>FUTURE</name>
</locale> </locale>
@ -27,89 +30,47 @@
</analysis_NUM_RUN> </analysis_NUM_RUN>
<analysis_time> <analysis_time>
<acquiretime_shadowscapes> 5 </acquiretime_shadowscapes> <acquiretime_shadowscapes> 7 </acquiretime_shadowscapes>
<acquiretime_relaxrate> 5 </acquiretime_relaxrate> <acquiretime_relaxrate> 10 </acquiretime_relaxrate>
<acquiretime_iresponse> 5 </acquiretime_iresponse> <acquiretime_iresponse> 30 </acquiretime_iresponse>
<acquiretime_shapefromshading> 5 </acquiretime_shapefromshading> <acquiretime_shapefromshading> 30 </acquiretime_shapefromshading>
<acquiretime_strobe> 5 </acquiretime_strobe> <acquiretime_strobe> 30 </acquiretime_strobe>
<acquiretime_camnoise> 5 </acquiretime_camnoise> <acquiretime_camnoise> 30 </acquiretime_camnoise>
<acquiretime_colorsingle> 5 </acquiretime_colorsingle> <acquiretime_colorsingle> 40 </acquiretime_colorsingle>
<acquiretime_colormulti> 5 </acquiretime_colormulti> <acquiretime_colormulti> 15 </acquiretime_colormulti>
<acquiretime_diffnoise> 5 </acquiretime_diffnoise> <acquiretime_diffnoise> 30 </acquiretime_diffnoise>
</analysis_time> </analysis_time>
<viewport>
<tx>0</tx>
<ty>-20</ty>
<tz>-400</tz>
<rx>-10</rx>
<ry>0</ry>
<rz>0</rz>
</viewport>
<algorithms> <algorithms>
<vertices_per_frame>1000</vertices_per_frame> <vertices_per_frame>1000</vertices_per_frame>
<pixel_per_vertex>4</pixel_per_vertex> <pixel_per_vertex>4</pixel_per_vertex>
<colormulti> <colormulti>
<algo>2</algo> <algo>2</algo>
<scale>1</scale> <scale>2</scale>
<draw_style>2</draw_style> <draw_style>3</draw_style>
<line_width>0.5</line_width> <line_width>2</line_width>
</colormulti> </colormulti>
<colorsingle>
<algo>2</algo>
<scale>1</scale>
<draw_style>2</draw_style>
<line_width>0.5</line_width>
</colorsingle>
<relaxrate> <relaxrate>
<algo>1</algo>
<scale>500</scale>
<draw_style>1</draw_style>
<line_width>2</line_width>
<point_size>2</point_size>
</relaxrate>
<diffnoise>
<algo>1</algo>
<scale>500</scale>
<draw_style>1</draw_style>
<line_width>2</line_width>
<point_size>2</point_size>
</diffnoise>
<shapeshade>
<algo>1</algo>
<scale>500</scale>
<draw_style>1</draw_style>
<line_width>2</line_width>
<point_size>2</point_size>
</shapeshade>
<strobe>
<algo>1</algo>
<scale>500</scale>
<draw_style>1</draw_style>
<line_width>2</line_width>
<point_size>2</point_size>
</strobe>
<camnoise>
<algo>1</algo>
<scale>500</scale>
<draw_style>1</draw_style>
<line_width>2</line_width>
<point_size>2</point_size>
</camnoise>
<shadowscapes>
<algo>4</algo> <algo>4</algo>
<scale>500</scale> <scale>600</scale>
<draw_style>2</draw_style> <draw_style>2</draw_style>
<line_width>2</line_width> <line_width>4</line_width>
</shadowscapes> </relaxrate>
<iresponse>
<shadowscapes>
<algo>1</algo> <algo>1</algo>
<scale>500</scale> <scale>650</scale>
<draw_style>1</draw_style> <draw_style>1</draw_style>
<line_width>2</line_width> <line_width>1</line_width>
<point_size>2</point_size> </shadowscapes>
</iresponse>
</algorithms> </algorithms>
<relaxrate>
<treshold>51</treshold>
<maxblobs>25</maxblobs>
</relaxrate>
</config> </config>

2
example/RefractiveIndex.cpp
View File

@ -64,7 +64,7 @@ ofxXmlSettings RefractiveIndex::XML;
ofShader RefractiveIndex::_shader; ofShader RefractiveIndex::_shader;
ofVboMesh RefractiveIndex::_mesh_vbo; ofVboMesh RefractiveIndex::_mesh_vbo;
ofxArcBall RefractiveIndex::cam; //ofxArcBall RefractiveIndex::cam;
string msg; string msg;

4
src/CamNoiseAnalysis.cpp
View File

@ -322,7 +322,7 @@ void CamNoiseAnalysis::draw()
glPointSize(point_size); glPointSize(point_size);
glEnable(GL_POINT_SMOOTH); glEnable(GL_POINT_SMOOTH);
RefractiveIndex::cam.begin(); //RefractiveIndex::cam.begin();
ofTranslate(tx, ty, tz); ofTranslate(tx, ty, tz);
ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz); ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz);
@ -355,7 +355,7 @@ void CamNoiseAnalysis::draw()
image2.unbind(); image2.unbind();
RefractiveIndex::cam.end(); //RefractiveIndex::cam.end();
break; break;

4
src/ColorMultiAnalysis.cpp
View File

@ -309,7 +309,7 @@ void ColorMultiAnalysis::draw()
glShadeModel(GL_SMOOTH); glShadeModel(GL_SMOOTH);
glLineWidth(line_width); glLineWidth(line_width);
RefractiveIndex::cam.begin(); //RefractiveIndex::cam.begin();
ofTranslate(tx, ty, tz); ofTranslate(tx, ty, tz);
ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz); ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz);
@ -342,7 +342,7 @@ void ColorMultiAnalysis::draw()
image2.unbind(); image2.unbind();
RefractiveIndex::cam.end(); //RefractiveIndex::cam.end();
_RUN_DONE = true; _RUN_DONE = true;
break; break;

4
src/ColorSingleAnalysis.cpp
View File

@ -325,7 +325,7 @@ void ColorSingleAnalysis::draw()
glShadeModel(GL_SMOOTH); glShadeModel(GL_SMOOTH);
glLineWidth(line_width); glLineWidth(line_width);
RefractiveIndex::cam.begin(); //RefractiveIndex::cam.begin();
ofTranslate(tx, ty, tz); ofTranslate(tx, ty, tz);
ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz); ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz);
@ -358,7 +358,7 @@ void ColorSingleAnalysis::draw()
image2.unbind(); image2.unbind();
RefractiveIndex::cam.end(); //RefractiveIndex::cam.end();
_RUN_DONE = true; _RUN_DONE = true;
break; break;

4
src/DiffNoiseAnalysis.cpp
View File

@ -333,7 +333,7 @@ void DiffNoiseAnalysis::draw()
glPointSize(point_size); glPointSize(point_size);
glEnable(GL_POINT_SMOOTH); glEnable(GL_POINT_SMOOTH);
RefractiveIndex::cam.begin(); //RefractiveIndex::cam.begin();
ofTranslate(tx, ty, tz); ofTranslate(tx, ty, tz);
ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz); ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz);
@ -366,7 +366,7 @@ void DiffNoiseAnalysis::draw()
image2.unbind(); image2.unbind();
RefractiveIndex::cam.end(); //RefractiveIndex::cam.end();
break; break;

4
src/IResponseAnalysis.cpp
View File

@ -298,7 +298,7 @@ void IResponseAnalysis::draw()
glPointSize(point_size); glPointSize(point_size);
glEnable(GL_POINT_SMOOTH); glEnable(GL_POINT_SMOOTH);
RefractiveIndex::cam.begin(); //RefractiveIndex::cam.begin();
ofTranslate(tx, ty, tz); ofTranslate(tx, ty, tz);
ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz); ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz);
@ -331,7 +331,7 @@ void IResponseAnalysis::draw()
image2.unbind(); image2.unbind();
RefractiveIndex::cam.end(); //RefractiveIndex::cam.end();
break; break;

4
src/RelaxRateAnalysis.cpp
View File

@ -295,7 +295,7 @@ void RelaxRateAnalysis::draw()
glPointSize(point_size); glPointSize(point_size);
glEnable(GL_POINT_SMOOTH); glEnable(GL_POINT_SMOOTH);
RefractiveIndex::cam.begin(); //RefractiveIndex::cam.begin();
ofTranslate(tx, ty, tz); ofTranslate(tx, ty, tz);
ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz); ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz);
@ -328,7 +328,7 @@ void RelaxRateAnalysis::draw()
image2.unbind(); image2.unbind();
RefractiveIndex::cam.end(); //RefractiveIndex::cam.end();
break; break;

4
src/ShadowScapesAnalysis.cpp
View File

@ -338,7 +338,7 @@ void ShadowScapesAnalysis::draw()
glShadeModel(GL_SMOOTH); glShadeModel(GL_SMOOTH);
glLineWidth(line_width); glLineWidth(line_width);
RefractiveIndex::cam.begin(); //RefractiveIndex::cam.begin();
ofTranslate(tx, ty, tz); ofTranslate(tx, ty, tz);
ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz); ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz);
@ -371,7 +371,7 @@ void ShadowScapesAnalysis::draw()
image2.unbind(); image2.unbind();
RefractiveIndex::cam.end(); //RefractiveIndex::cam.end();
_RUN_DONE = true; _RUN_DONE = true;
break; break;

4
src/ShapeFromShadingAnalysis.cpp
View File

@ -491,7 +491,7 @@ void ShapeFromShadingAnalysis::draw()
glPointSize(point_size); glPointSize(point_size);
glEnable(GL_POINT_SMOOTH); glEnable(GL_POINT_SMOOTH);
RefractiveIndex::cam.begin(); //RefractiveIndex::cam.begin();
ofTranslate(tx, ty, tz); ofTranslate(tx, ty, tz);
ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz); ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz);
@ -524,7 +524,7 @@ void ShapeFromShadingAnalysis::draw()
image2.unbind(); image2.unbind();
RefractiveIndex::cam.end(); //RefractiveIndex::cam.end();
break; break;

4
src/StrobeAnalysis.cpp
View File

@ -320,7 +320,7 @@ void StrobeAnalysis::draw()
glPointSize(point_size); glPointSize(point_size);
glEnable(GL_POINT_SMOOTH); glEnable(GL_POINT_SMOOTH);
RefractiveIndex::cam.begin(); //RefractiveIndex::cam.begin();
ofTranslate(tx, ty, tz); ofTranslate(tx, ty, tz);
ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz); ofRotateX(rx); ofRotateY(ry); ofRotateZ(rz);
@ -353,7 +353,7 @@ void StrobeAnalysis::draw()
image2.unbind(); image2.unbind();
RefractiveIndex::cam.end(); //RefractiveIndex::cam.end();
break; break;