FGFS-4.1/OpenSceneGraph
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Code comments, log strings and some variable spell fixes.

Browse Source
This commit is contained in:
Alberto Luaces
2020-10-28 17:05:06 +01:00
committed by Robert Osfield
parent 300ba7aa02
commit 2ade061ced
88 changed files with 143 additions and 143 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
src/osgVolume/FixedFunctionTechnique.cpp
View File

@@ -106,7 +106,7 @@ void FixedFunctionTechnique::init()
if (_volumeTile->getLayer()==0)
{
OSG_NOTICE<<"FixedFunctionTechnique::init(), error no layer assigend to volume tile."<<std::endl;
OSG_NOTICE<<"FixedFunctionTechnique::init(), error no layer assigned to volume tile."<<std::endl;
return;
}

8
src/osgVolume/MultipassTechnique.cpp
View File

@@ -399,7 +399,7 @@ void MultipassTechnique::init()
if (_volumeTile->getLayer()==0)
{
OSG_NOTICE<<"MultipassTechnique::init(), error no layer assigend to volume tile."<<std::endl;
OSG_NOTICE<<"MultipassTechnique::init(), error no layer assigned to volume tile."<<std::endl;
return;
}
@@ -1066,15 +1066,15 @@ void MultipassTechnique::cull(osgUtil::CullVisitor* cv)
switch(renderingMode)
{
case(CUBE):
// OSG_NOTICE<<"Travering Transform for CUBE rendering"<<std::endl;
// OSG_NOTICE<<"Traversing Transform for CUBE rendering"<<std::endl;
_transform->accept(*cv);
break;
case(HULL):
// OSG_NOTICE<<"Travering children for HULL rendering"<<std::endl;
// OSG_NOTICE<<"Traversing children for HULL rendering"<<std::endl;
getVolumeTile()->osg::Group::traverse(*cv);
break;
case(CUBE_AND_HULL):
// OSG_NOTICE<<"Travering Transform for CUBE_AND_HULL rendering"<<std::endl;
// OSG_NOTICE<<"Traversing Transform for CUBE_AND_HULL rendering"<<std::endl;
_transform->accept(*cv);
//getVolumeTile()->osg::Group::traverse(*cv);
break;

2
src/osgVolume/RayTracedTechnique.cpp
View File

@@ -63,7 +63,7 @@ void RayTracedTechnique::init()
if (_volumeTile->getLayer()==0)
{
OSG_NOTICE<<"RayTracedTechnique::init(), error no layer assigend to volume tile."<<std::endl;
OSG_NOTICE<<"RayTracedTechnique::init(), error no layer assigned to volume tile."<<std::endl;
return;
}

10
src/osgVolume/Shaders/volume_multipass_cube_and_hull_frag.cpp
View File

@@ -23,7 +23,7 @@ char volume_multipass_cube_and_hull_frag[] = "#version 110\n"
" fragColor = mix(scene_color, fragColor, fragColor.a);\n"
" if (fragColor.a>=1.0) return fragColor;\n"
"\n"
" // compute rear segement color and blend with accumulated_color\n"
" // compute rear segment color and blend with accumulated_color\n"
" return mix( fragColor, computeRayColor(fragColor, px, py, depth_start, scene_depth), transparencyFactor);\n"
" }\n"
" else\n"
@@ -39,7 +39,7 @@ char volume_multipass_cube_and_hull_frag[] = "#version 110\n"
" fragColor = mix(scene_color, fragColor, fragColor.a);\n"
" if (fragColor.a>=1.0) return fragColor;\n"
"\n"
" // compute rear segement color and blend with accumulated_color\n"
" // compute rear segment color and blend with accumulated_color\n"
" return computeRayColor(fragColor, px, py, depth_start, scene_depth) * transparencyFactor;\n"
" }\n"
" else\n"
@@ -78,7 +78,7 @@ char volume_multipass_cube_and_hull_frag[] = "#version 110\n"
"\n"
" if (back_depth<gl_FragCoord.z)\n"
" {\n"
" // segment front_depth to 0.0, exterior transparancy\n"
" // segment front_depth to 0.0, exterior transparency\n"
" // segment back_depth to front_depth, interior transparency\n"
" // segment gl_FragCoord.z to back_depth, exterior transparency\n"
" fragColor = computeSegment(fragColor, gl_FragCoord.x, gl_FragCoord.y, front_depth, 0.0, ExteriorTransparencyFactorValue, color, texture_depth);\n"
@@ -93,8 +93,8 @@ char volume_multipass_cube_and_hull_frag[] = "#version 110\n"
" }\n"
" else if (front_depth<gl_FragCoord.z)\n"
" {\n"
" // segment front_depth to 0, exterior transparancy\n"
" // segement gl_FragCoord.z to front_depth, interior transparancy\n"
" // segment front_depth to 0, exterior transparency\n"
" // segment gl_FragCoord.z to front_depth, interior transparency\n"
" // back_depth behind gl_FragCoord.z so clipped out by cube and not required.\n"
" fragColor = computeSegment(fragColor, gl_FragCoord.x, gl_FragCoord.y, front_depth, 0.0, ExteriorTransparencyFactorValue, color, texture_depth);\n"
" if (fragColor.a<1.0)\n"