From 3ddf81e1bc0b1ef8bbc297325af5f1e99a2260fb Mon Sep 17 00:00:00 2001 From: alemuntoni Date: Thu, 14 May 2020 16:00:17 +0200 Subject: [PATCH] fix wrong call for Log templated function --- .../edit_mutualcorrs/edit_mutualcorrs.cpp | 12 +++--- src/meshlabplugins/filter_ao/filter_ao.cpp | 34 ++++++++--------- .../filter_camera/filter_camera.cpp | 38 +++++++++---------- src/meshlabplugins/filter_csg/filter_csg.cpp | 14 +++---- .../filter_mutualinfo/filter_mutualinfo.cpp | 14 +++---- .../filter_sdfgpu/filter_sdfgpu.cpp | 34 ++++++++--------- 6 files changed, 73 insertions(+), 73 deletions(-) diff --git a/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.cpp b/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.cpp index ddcfcfe56..c3673173c 100644 --- a/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.cpp +++ b/src/meshlabplugins/edit_mutualcorrs/edit_mutualcorrs.cpp @@ -699,14 +699,14 @@ Point2m EditMutualCorrsPlugin::fromImageToGL(Point2m picked) bool EditMutualCorrsPlugin::initGL() { - Log(0, "GL Initialization"); + Log(GLLogStream::SYSTEM, "GL Initialization"); if (!GLExtensionsManager::initializeGLextensions_notThrowing()) { - Log(0, "GLEW initialization error!"); + Log(GLLogStream::SYSTEM, "GLEW initialization error!"); return false; } if (!glewIsSupported("GL_EXT_framebuffer_object")) { - Log(0, "Graphics hardware does not support FBOs"); + Log(GLLogStream::SYSTEM, "Graphics hardware does not support FBOs"); return false; } if (!glewIsSupported("GL_ARB_vertex_shader") || !glewIsSupported("GL_ARB_fragment_shader") || @@ -716,11 +716,11 @@ bool EditMutualCorrsPlugin::initGL() } if (!glewIsSupported("GL_ARB_texture_non_power_of_two")) { - Log(0, "Graphics hardware does not support non-power-of-two textures"); + Log(GLLogStream::SYSTEM, "Graphics hardware does not support non-power-of-two textures"); return false; } if (!glewIsSupported("GL_ARB_vertex_buffer_object")) { - Log(0, "Graphics hardware does not support vertex buffer objects"); + Log(GLLogStream::SYSTEM, "Graphics hardware does not support vertex buffer objects"); return false; } @@ -737,6 +737,6 @@ bool EditMutualCorrsPlugin::initGL() align.resize(800); //assert(glGetError() == 0); - Log(0, "GL Initialization done"); + Log(GLLogStream::SYSTEM, "GL Initialization done"); return true; } diff --git a/src/meshlabplugins/filter_ao/filter_ao.cpp b/src/meshlabplugins/filter_ao/filter_ao.cpp index 3b1e57f9e..4ad2d1a29 100644 --- a/src/meshlabplugins/filter_ao/filter_ao.cpp +++ b/src/meshlabplugins/filter_ao/filter_ao.cpp @@ -339,7 +339,7 @@ bool AmbientOcclusionPlugin::processGL(MeshModel &m, vector &posVect) } } - Log(0,"Successfully calculated A.O. after %3.2f sec, %3.2f of which is due to initialization", ((float)tAll.elapsed()/1000.0f), ((float)tInitElapsed/1000.0f) ); + Log(GLLogStream::SYSTEM,"Successfully calculated A.O. after %3.2f sec, %3.2f of which is due to initialization", ((float)tAll.elapsed()/1000.0f), ((float)tInitElapsed/1000.0f) ); /********** Clean up the mess ************/ @@ -380,7 +380,7 @@ void AmbientOcclusionPlugin::initGL(vcg::CallBackPos *cb, unsigned int numVertic cb(0, "Initializing: Glew and Hardware Capabilities"); if (GLExtensionsManager::initializeGLextensions_notThrowing()) { - Log(0, "Error initializing OpenGL extensions"); + Log(GLLogStream::SYSTEM, "Error initializing OpenGL extensions"); errInit = true; return; } @@ -391,13 +391,13 @@ void AmbientOcclusionPlugin::initGL(vcg::CallBackPos *cb, unsigned int numVertic if (depthTexSize < 16) { - Log(0, "Texture size is too small, 16x16 used instead"); + Log(GLLogStream::SYSTEM, "Texture size is too small, 16x16 used instead"); depthTexSize = 16; depthTexArea = depthTexSize*depthTexSize; } if (depthTexSize > maxTexSize) { - Log(0, "Texture size is too large, %dx%d used instead",maxTexSize,maxTexSize); + Log(GLLogStream::SYSTEM, "Texture size is too large, %dx%d used instead",maxTexSize,maxTexSize); depthTexSize = maxTexSize; depthTexArea = depthTexSize*depthTexSize; } @@ -414,14 +414,14 @@ void AmbientOcclusionPlugin::initGL(vcg::CallBackPos *cb, unsigned int numVertic { if (!glewIsSupported("GL_EXT_vertex_shader GL_EXT_fragment_shader")) { - Log(0, "Your hardware doesn't support Shaders, which are required for hw occlusion"); + Log(GLLogStream::SYSTEM, "Your hardware doesn't support Shaders, which are required for hw occlusion"); errInit = true; return; } } if ( !glewIsSupported("GL_EXT_framebuffer_object") ) { - Log(0, "Your hardware doesn't support FBOs, which are required for hw occlusion"); + Log(GLLogStream::SYSTEM, "Your hardware doesn't support FBOs, which are required for hw occlusion"); errInit = true; return; } @@ -433,7 +433,7 @@ void AmbientOcclusionPlugin::initGL(vcg::CallBackPos *cb, unsigned int numVertic //colorFormat = GL_RGB16F_ARB; //dataTypeFP = GL_HALF_FLOAT_ARB; - Log(0,"Your hardware can't do FP32 blending, and currently the FP16 version is not yet implemented."); + Log(GLLogStream::SYSTEM,"Your hardware can't do FP32 blending, and currently the FP16 version is not yet implemented."); errInit = true; return; } @@ -443,7 +443,7 @@ void AmbientOcclusionPlugin::initGL(vcg::CallBackPos *cb, unsigned int numVertic } else { - Log(0,"Your hardware doesn't support floating point textures, which are required for hw occlusion"); + Log(GLLogStream::SYSTEM,"Your hardware doesn't support floating point textures, which are required for hw occlusion"); errInit = true; return; } @@ -454,7 +454,7 @@ void AmbientOcclusionPlugin::initGL(vcg::CallBackPos *cb, unsigned int numVertic //******* CHECK MODEL SIZE ***********/ if ((maxTexSize*maxTexSize*maxTexPages) < numVertices && useGPU) { - Log(0, "That's a really huge model, I can't handle it in hardware, sorry.."); + Log(GLLogStream::SYSTEM, "That's a really huge model, I can't handle it in hardware, sorry.."); errInit = true; return; } @@ -466,7 +466,7 @@ void AmbientOcclusionPlugin::initGL(vcg::CallBackPos *cb, unsigned int numVertic if (smartTexSize > maxTexSize) { //should ever enter this point, just exit with error - Log(0,"There was an error while determining best texture size, unable to continue"); + Log(GLLogStream::SYSTEM,"There was an error while determining best texture size, unable to continue"); errInit = true; return; } @@ -616,25 +616,25 @@ bool AmbientOcclusionPlugin::checkFramebuffer() switch (fboStatus) { case GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT: - Log(0, "FBO Incomplete: Attachment"); + Log(GLLogStream::SYSTEM, "FBO Incomplete: Attachment"); break; case GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT: - Log(0, "FBO Incomplete: Missing Attachment"); + Log(GLLogStream::SYSTEM, "FBO Incomplete: Missing Attachment"); break; case GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT: - Log(0, "FBO Incomplete: Dimensions"); + Log(GLLogStream::SYSTEM, "FBO Incomplete: Dimensions"); break; case GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT: - Log(0, "FBO Incomplete: Formats"); + Log(GLLogStream::SYSTEM, "FBO Incomplete: Formats"); break; case GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT: - Log(0, "FBO Incomplete: Draw Buffer"); + Log(GLLogStream::SYSTEM, "FBO Incomplete: Draw Buffer"); break; case GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT: - Log(0, "FBO Incomplete: Read Buffer"); + Log(GLLogStream::SYSTEM, "FBO Incomplete: Read Buffer"); break; default: - Log(0, "Undefined FBO error"); + Log(GLLogStream::SYSTEM, "Undefined FBO error"); assert(0); } diff --git a/src/meshlabplugins/filter_camera/filter_camera.cpp b/src/meshlabplugins/filter_camera/filter_camera.cpp index 5457f6847..8c9aca2e6 100644 --- a/src/meshlabplugins/filter_camera/filter_camera.cpp +++ b/src/meshlabplugins/filter_camera/filter_camera.cpp @@ -221,7 +221,7 @@ bool FilterCameraPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPara case 0: if (rm == NULL) { - Log(0, "You need a Raster Model to apply this filter!"); + Log(GLLogStream::SYSTEM, "You need a Raster Model to apply this filter!"); return false; } tranVec=rm->shot.Extrinsics.Tra(); @@ -229,7 +229,7 @@ bool FilterCameraPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPara case 1: if (cm == NULL) { - Log(0, "You need a Mesh Model to apply this filter!"); + Log(GLLogStream::SYSTEM, "You need a Mesh Model to apply this filter!"); return false; } tranVec=cm->shot.Extrinsics.Tra(); @@ -285,7 +285,7 @@ bool FilterCameraPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPara { if (rm == NULL) { - Log(0, "You need a Raster Model to apply this filter!"); + Log(GLLogStream::SYSTEM, "You need a Raster Model to apply this filter!"); return false; } rm->shot.ApplyRigidTransformation(transf); @@ -295,7 +295,7 @@ bool FilterCameraPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPara { if (cm == NULL) { - Log(0, "You need a Mesh Model to apply this filter!"); + Log(GLLogStream::SYSTEM, "You need a Mesh Model to apply this filter!"); return false; } cm->shot.ApplyRigidTransformation(transf); @@ -326,7 +326,7 @@ bool FilterCameraPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPara case 0: if (rm == NULL) { - Log(0, "You need a Raster Model to apply this filter!"); + Log(GLLogStream::SYSTEM, "You need a Raster Model to apply this filter!"); return false; } tranVec=rm->shot.Extrinsics.Tra(); @@ -334,7 +334,7 @@ bool FilterCameraPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPara case 1: if (cm == NULL) { - Log(0, "You need a Mesh Model to apply this filter!"); + Log(GLLogStream::SYSTEM, "You need a Mesh Model to apply this filter!"); return false; } tranVec=cm->shot.Extrinsics.Tra(); @@ -395,7 +395,7 @@ bool FilterCameraPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPara { if (rm == NULL) { - Log(0, "You need a Raster Model to apply this filter!"); + Log(GLLogStream::SYSTEM, "You need a Raster Model to apply this filter!"); return false; } rm->shot.ApplyRigidTransformation(trTran); @@ -407,7 +407,7 @@ bool FilterCameraPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPara { if (cm == NULL) { - Log(0, "You need a Mesh Model to apply this filter!"); + Log(GLLogStream::SYSTEM, "You need a Mesh Model to apply this filter!"); return false; } cm->shot.ApplyRigidTransformation(trTran); @@ -435,7 +435,7 @@ bool FilterCameraPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPara case 0: if (rm == NULL) { - Log(0, "You need a Raster Model to apply this filter!"); + Log(GLLogStream::SYSTEM, "You need a Raster Model to apply this filter!"); return false; } trTran.SetTranslate(-rm->shot.Extrinsics.Tra()); @@ -443,7 +443,7 @@ bool FilterCameraPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPara case 1: if (cm == NULL) { - Log(0, "You need a Mesh Model to apply this filter!"); + Log(GLLogStream::SYSTEM, "You need a Mesh Model to apply this filter!"); return false; } trTran.SetTranslate(-cm->shot.Extrinsics.Tra()); @@ -486,7 +486,7 @@ bool FilterCameraPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPara { if (rm == NULL) { - Log(0, "You need a Raster Model to apply this filter!"); + Log(GLLogStream::SYSTEM, "You need a Raster Model to apply this filter!"); return false; } rm->shot.ApplyRigidTransformation(trTran); @@ -496,7 +496,7 @@ bool FilterCameraPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPara { if (cm == NULL) { - Log(0, "You need a Mesh Model to apply this filter!"); + Log(GLLogStream::SYSTEM, "You need a Mesh Model to apply this filter!"); return false; } cm->shot.ApplyRigidTransformation(trTran); @@ -516,7 +516,7 @@ bool FilterCameraPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPara { if (rm == NULL) { - Log(0, "You need a Raster Model to apply this filter!"); + Log(GLLogStream::SYSTEM, "You need a Raster Model to apply this filter!"); return false; } inv = rm->shot.Extrinsics.Rot(); @@ -563,7 +563,7 @@ bool FilterCameraPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPara { if (rm == NULL) { - Log(0, "You need a Raster Model to apply this filter!"); + Log(GLLogStream::SYSTEM, "You need a Raster Model to apply this filter!"); return false; } rm->shot.ApplyRigidTransformation(mat); @@ -573,7 +573,7 @@ bool FilterCameraPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPara { if (cm == NULL) { - Log(0, "You need a Mesh Model to apply this filter!"); + Log(GLLogStream::SYSTEM, "You need a Mesh Model to apply this filter!"); return false; } cm->shot.ApplyRigidTransformation(mat); @@ -588,7 +588,7 @@ bool FilterCameraPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPara { if (rm == NULL) { - Log(0, "You need a Raster Model to apply this filter!"); + Log(GLLogStream::SYSTEM, "You need a Raster Model to apply this filter!"); return false; } Shotm shotGot=par.getShotm("Shot"); @@ -605,7 +605,7 @@ bool FilterCameraPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPara case FP_SET_MESH_CAMERA : if (cm == NULL) { - Log(0, "You need a Mesh Model to apply this filter!"); + Log(GLLogStream::SYSTEM, "You need a Mesh Model to apply this filter!"); return false; } cm->shot = par.getShotm("Shot"); @@ -614,7 +614,7 @@ bool FilterCameraPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPara { if (cm == NULL) { - Log(0, "You need a Mesh Model to apply this filter!"); + Log(GLLogStream::SYSTEM, "You need a Mesh Model to apply this filter!"); return false; } if(!cm->shot.IsValid()) @@ -656,7 +656,7 @@ bool FilterCameraPlugin::applyFilter(QAction *filter, MeshDocument &md, RichPara { if (cm == NULL) { - Log(0, "You need a Mesh Model to apply this filter!"); + Log(GLLogStream::SYSTEM, "You need a Mesh Model to apply this filter!"); return false; } struct Correspondence{unsigned int id_img;float padding[3];}; diff --git a/src/meshlabplugins/filter_csg/filter_csg.cpp b/src/meshlabplugins/filter_csg/filter_csg.cpp index e6e5e5f84..58cf7a3cd 100644 --- a/src/meshlabplugins/filter_csg/filter_csg.cpp +++ b/src/meshlabplugins/filter_csg/filter_csg.cpp @@ -172,27 +172,27 @@ bool FilterCSG::applyFilter(QAction *filter, MeshDocument &md, RichParameterSet const Scalarm d = par.getFloat("Delta"); const Point3m delta(d, d, d); const int subFreq = par.getInt("SubDelta"); - Log(0, "Rasterizing first volume..."); + Log(GLLogStream::SYSTEM, "Rasterizing first volume..."); InterceptVolume v = InterceptSet3(tmpfirstmesh.cm, delta, subFreq, cb); - Log(0, "Rasterizing second volume..."); + Log(GLLogStream::SYSTEM, "Rasterizing second volume..."); InterceptVolume tmp = InterceptSet3(tmpsecondmesh.cm, delta, subFreq, cb); MeshModel *mesh; switch(par.getEnum("Operator")){ case CSG_OPERATION_INTERSECTION: - Log(0, "Intersection..."); + Log(GLLogStream::SYSTEM, "Intersection..."); v &= tmp; mesh = md.addNewMesh("","intersection"); break; case CSG_OPERATION_UNION: - Log(0, "Union..."); + Log(GLLogStream::SYSTEM, "Union..."); v |= tmp; mesh = md.addNewMesh("","union"); break; case CSG_OPERATION_DIFFERENCE: - Log(0, "Difference..."); + Log(GLLogStream::SYSTEM, "Difference..."); v -= tmp; mesh = md.addNewMesh("","difference"); break; @@ -202,13 +202,13 @@ bool FilterCSG::applyFilter(QAction *filter, MeshDocument &md, RichParameterSet return true; } - Log(0, "Building mesh..."); + Log(GLLogStream::SYSTEM, "Building mesh..."); typedef vcg::intercept::Walker MyWalker; typedef vcg::tri::MarchingCubes MyMarchingCubes; MyWalker walker; MyMarchingCubes mc(mesh->cm, walker); walker.BuildMesh(mesh->cm, v, mc, cb); - Log(0, "Done"); + Log(GLLogStream::SYSTEM, "Done"); vcg::tri::UpdateBounding::Box(mesh->cm); vcg::tri::UpdateNormal::PerFaceFromCurrentVertexNormal(mesh->cm); diff --git a/src/meshlabplugins/filter_mutualinfo/filter_mutualinfo.cpp b/src/meshlabplugins/filter_mutualinfo/filter_mutualinfo.cpp index cbcec9dd9..ed09c1c7b 100644 --- a/src/meshlabplugins/filter_mutualinfo/filter_mutualinfo.cpp +++ b/src/meshlabplugins/filter_mutualinfo/filter_mutualinfo.cpp @@ -38,7 +38,7 @@ bool MutualInfoPlugin::applyFilter( const QString& filterName,MeshDocument& md,E MutualInfo mutual; if (md.rasterList.size()==0) { - Log(0, "You need a Raster Model to apply this filter!"); + Log(GLLogStream::SYSTEM, "You need a Raster Model to apply this filter!"); return false; } else @@ -136,14 +136,14 @@ bool MutualInfoPlugin::applyFilter( const QString& filterName,MeshDocument& md,E bool MutualInfoPlugin::initGL() { - Log(0, "GL Initialization"); + Log(GLLogStream::SYSTEM, "GL Initialization"); if (!GLExtensionsManager::initializeGLextensions_notThrowing()) { - Log(0, "GLEW initialization error!"); + Log(GLLogStream::SYSTEM, "GLEW initialization error!"); return false; } if (!glewIsSupported("GL_EXT_framebuffer_object")) { - Log(0, "Graphics hardware does not support FBOs"); + Log(GLLogStream::SYSTEM, "Graphics hardware does not support FBOs"); return false; } if (!glewIsSupported("GL_ARB_vertex_shader") || !glewIsSupported("GL_ARB_fragment_shader") || @@ -153,11 +153,11 @@ bool MutualInfoPlugin::initGL() } if (!glewIsSupported("GL_ARB_texture_non_power_of_two")) { - Log(0,"Graphics hardware does not support non-power-of-two textures"); + Log(GLLogStream::SYSTEM,"Graphics hardware does not support non-power-of-two textures"); return false; } if (!glewIsSupported("GL_ARB_vertex_buffer_object")) { - Log(0, "Graphics hardware does not support vertex buffer objects"); + Log(GLLogStream::SYSTEM, "Graphics hardware does not support vertex buffer objects"); return false; } @@ -174,7 +174,7 @@ bool MutualInfoPlugin::initGL() align.resize(800); //assert(glGetError() == 0); - Log(0, "GL Initialization done"); + Log(GLLogStream::SYSTEM, "GL Initialization done"); return true; } MESHLAB_PLUGIN_NAME_EXPORTER(MutualInfoPlugin) diff --git a/src/meshlabplugins/filter_sdfgpu/filter_sdfgpu.cpp b/src/meshlabplugins/filter_sdfgpu/filter_sdfgpu.cpp index cb6c9bad6..dc39b3a58 100644 --- a/src/meshlabplugins/filter_sdfgpu/filter_sdfgpu.cpp +++ b/src/meshlabplugins/filter_sdfgpu/filter_sdfgpu.cpp @@ -179,8 +179,8 @@ bool SdfGpuPlugin::applyFilter(QAction */*filter*/, MeshDocument &md, RichParame std::vector unifDirVec; GenNormal::Fibonacci(numViews,unifDirVec); - Log(0, "Number of rays: %i ", unifDirVec.size() ); - Log(0, "Number of rays for GPU outliers removal: %i ", coneDirVec.size() ); + Log(GLLogStream::SYSTEM, "Number of rays: %i ", unifDirVec.size() ); + Log(GLLogStream::SYSTEM, "Number of rays for GPU outliers removal: %i ", coneDirVec.size() ); coneDirVec.clear(); @@ -221,14 +221,14 @@ bool SdfGpuPlugin::applyFilter(QAction */*filter*/, MeshDocument &md, RichParame - Log(0, "Mesh depth complexity %i (The accuracy of the result depends on the value you provided for the max number of peeling iterations, \n if you get warnings try increasing" + Log(GLLogStream::SYSTEM, "Mesh depth complexity %i (The accuracy of the result depends on the value you provided for the max number of peeling iterations, \n if you get warnings try increasing" " the peeling iteration parameter)\n", mDepthComplexity ); //Depth complexity distribution log. Useful to know which is the probability to find a number of layers looking at the mesh or scene. - Log(0, "Depth complexity NumberOfViews\n", mDepthComplexity ); + Log(GLLogStream::SYSTEM, "Depth complexity NumberOfViews\n", mDepthComplexity ); for(int j = 0; j < peel; j++) { - Log(0, " %i %i\n", j, mDepthDistrib[j] ); + Log(GLLogStream::SYSTEM, " %i %i\n", j, mDepthDistrib[j] ); } //Clean & Exit @@ -265,7 +265,7 @@ bool SdfGpuPlugin::initGL(MeshModel& mm) if (!GLExtensionsManager::initializeGLextensions_notThrowing()) { - Log(0, "Error initializing OpenGL extensions."); + Log(GLLogStream::SYSTEM, "Error initializing OpenGL extensions."); return false; } @@ -274,13 +274,13 @@ bool SdfGpuPlugin::initGL(MeshModel& mm) { if (!glewIsSupported("GL_EXT_vertex_shader GL_EXT_fragment_shader")) { - Log(0, "Your hardware doesn't support Shaders, which are required for hw occlusion"); + Log(GLLogStream::SYSTEM, "Your hardware doesn't support Shaders, which are required for hw occlusion"); return false; } } if ( !glewIsSupported("GL_EXT_framebuffer_object") ) { - Log(0, "Your hardware doesn't support FBOs, which are required for hw occlusion"); + Log(GLLogStream::SYSTEM, "Your hardware doesn't support FBOs, which are required for hw occlusion"); return false; } @@ -288,13 +288,13 @@ bool SdfGpuPlugin::initGL(MeshModel& mm) { if ( !glewIsSupported("GL_EXT_gpu_shader4") ) //Only DX10-grade cards support FP32 blending { - Log(0,"Your hardware can't do FP32 blending, and currently the FP16 version is not yet implemented."); + Log(GLLogStream::SYSTEM,"Your hardware can't do FP32 blending, and currently the FP16 version is not yet implemented."); return false; } } else { - Log(0,"Your hardware doesn't support floating point textures, which are required for hw occlusion"); + Log(GLLogStream::SYSTEM,"Your hardware doesn't support floating point textures, which are required for hw occlusion"); return false; } @@ -313,12 +313,12 @@ bool SdfGpuPlugin::initGL(MeshModel& mm) unsigned int maxTexSize; glGetIntegerv(GL_MAX_TEXTURE_SIZE, reinterpret_cast(&maxTexSize) ); - Log(0, "QUERY HARDWARE FOR: MAX TEX SIZE: %i ", maxTexSize ); + Log(GLLogStream::SYSTEM, "QUERY HARDWARE FOR: MAX TEX SIZE: %i ", maxTexSize ); //CHECK MODEL SIZE if ((maxTexSize*maxTexSize) < numElems) { - Log(0, "That's a really huge model, I can't handle it in hardware, sorry.."); + Log(GLLogStream::SYSTEM, "That's a really huge model, I can't handle it in hardware, sorry.."); return false; } @@ -326,10 +326,10 @@ bool SdfGpuPlugin::initGL(MeshModel& mm) mNumberOfTexRows = ceil( ((float)numElems) / ((float)mResTextureDim)); - Log(0, "Mesh has %i vertices\n", numVertices ); - Log(0, "Mesh has %i faces\n", numFaces); - Log(0, "Number of tex rows used %i",mNumberOfTexRows); - Log(0, "Result texture is %i X %i = %i", mResTextureDim, mResTextureDim, mResTextureDim*mResTextureDim); + Log(GLLogStream::SYSTEM, "Mesh has %i vertices\n", numVertices ); + Log(GLLogStream::SYSTEM, "Mesh has %i faces\n", numFaces); + Log(GLLogStream::SYSTEM, "Number of tex rows used %i",mNumberOfTexRows); + Log(GLLogStream::SYSTEM, "Result texture is %i X %i = %i", mResTextureDim, mResTextureDim, mResTextureDim*mResTextureDim); mVertexCoordsTexture = new FloatTexture2D( TextureFormat( GL_TEXTURE_2D, mResTextureDim, mResTextureDim, GL_RGBA32F_ARB, GL_RGBA, GL_FLOAT ), TextureParams( GL_NEAREST, GL_NEAREST ) ); mVertexNormalsTexture = new FloatTexture2D( TextureFormat( GL_TEXTURE_2D, mResTextureDim, mResTextureDim, GL_RGBA32F_ARB, GL_RGBA, GL_FLOAT ), TextureParams( GL_NEAREST, GL_NEAREST ) ); @@ -1036,7 +1036,7 @@ void SdfGpuPlugin::TraceRay(int peelingIteration,const Point3f& dir, MeshModel* return; else if(i==(peelingIteration-1)) - Log(0,"WARNING: You may have underestimated the depth complexity of the mesh. Run the filter with a higher number of peeling iteration."); + Log(GLLogStream::SYSTEM,"WARNING: You may have underestimated the depth complexity of the mesh. Run the filter with a higher number of peeling iteration."); mFboArray[j]->unbind(); //we use 3 FBOs to avoid z-fighting (Inspired from Woo's shadow mapping method)