Commit b1023aa6 authored by Alexander Wiebel's avatar Alexander Wiebel
Browse files

[STYLE #42]

parent be227636
......@@ -195,7 +195,7 @@ vec4 getHalftoneShading( vec4 inColor, vec2 where )
// Transforming the fragment coordinates into halftoning texture coordinates:
vec2 ditherTexCoord = ditherRotMatrix * gl_FragCoord.xy;
ditherTexCoord = vec2(mod( ditherTexCoord.x, u_ditherTexSize ) / u_ditherTexSize,
ditherTexCoord = vec2( mod( ditherTexCoord.x, u_ditherTexSize ) / u_ditherTexSize,
mod( ditherTexCoord.y, u_ditherTexSize ) / u_ditherTexSize );
// Dither kernel that generates the real halftoning texture.
......@@ -208,11 +208,11 @@ vec4 getHalftoneShading( vec4 inColor, vec2 where )
{
if( fIntensity > ( 1.0 - u_ditherClip ) )
{
col.a=0.0;
col.a = 0.0;
}
else
{
col = vec4(u_hatchColor.rgb,1.0);
col = vec4( u_hatchColor.rgb, 1.0 );
}
}
else
......
......@@ -22,6 +22,7 @@
//
//---------------------------------------------------------------------------
#include <string>
#include <osgGA/TrackballManipulator>
#include "../../common/WLogger.h"
......@@ -48,7 +49,8 @@ void initCamera( std::string const& view )
{
if( WKernel::getRunningKernel()->getGraphicsEngine() )
{
osg::ref_ptr< osgGA::TrackballManipulator > cm = osg::dynamic_pointer_cast< osgGA::TrackballManipulator >( WKernel::getRunningKernel()->getGraphicsEngine()->getViewer()->getCameraManipulator() );
osg::ref_ptr< osgGA::TrackballManipulator > cm = osg::dynamic_pointer_cast< osgGA::TrackballManipulator >(
WKernel::getRunningKernel()->getGraphicsEngine()->getViewer()->getCameraManipulator() );
if( cm )
{
osg::Quat q;
......@@ -96,4 +98,3 @@ void initCamera( std::string const& view )
wlog::error( "Script" ) << "No graphics engine! Cannot set camera preset!";
}
}
......@@ -25,6 +25,8 @@
#ifndef WUTILITYFUNCTIONS_H_
#define WUTILITYFUNCTIONS_H_
#include <string>
/**
* A function that creates a screenshot of the main view as-is.
*/
......@@ -38,4 +40,3 @@ void screenshot();
void initCamera( std::string const& view );
#endif // WUTILITYFUNCTIONS_H_
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment