From 4ca088dcf930d81ba35134f85f0cc3b4e64d0c74 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Fri, 22 Nov 2013 10:10:14 +0000 Subject: [PATCH] Clean up of line endings --- include/osgShadow/ShadowSettings | 6 ++-- include/osgViewer/Keystone | 34 +++++++++--------- src/osg/glu/libutil/error.cpp | 2 +- src/osgViewer/config/WoWVxDisplay.cpp | 50 +++++++++++++-------------- 4 files changed, 46 insertions(+), 46 deletions(-) diff --git a/include/osgShadow/ShadowSettings b/include/osgShadow/ShadowSettings index 6750e4a2c..58020dcb0 100644 --- a/include/osgShadow/ShadowSettings +++ b/include/osgShadow/ShadowSettings @@ -38,7 +38,7 @@ class OSGSHADOW_EXPORT ShadowSettings : public osg::Object void setComputeNearFarModeOverride(osg::CullSettings::ComputeNearFarMode cnfn) { _computeNearFearModeOverride = cnfn; } osg::CullSettings::ComputeNearFarMode getComputeNearFarModeOverride() const { return _computeNearFearModeOverride; } - + /** Set the LightNum of the light in the scene to assign a shadow for. * Default value is -1, which signifies that shadow technique should automatically select an active light * to assign a shadow, typically this will be the first active light found. */ @@ -67,7 +67,7 @@ class OSGSHADOW_EXPORT ShadowSettings : public osg::Object void setMaximumShadowMapDistance(double distance) { _maximumShadowMapDistance = distance; } double getMaximumShadowMapDistance() const { return _maximumShadowMapDistance; } - + enum ShadowMapProjectionHint { @@ -144,4 +144,4 @@ class OSGSHADOW_EXPORT ShadowSettings : public osg::Object } -#endif \ No newline at end of file +#endif diff --git a/include/osgViewer/Keystone b/include/osgViewer/Keystone index d13a64b3b..e009ab113 100644 --- a/include/osgViewer/Keystone +++ b/include/osgViewer/Keystone @@ -24,23 +24,23 @@ namespace osgViewer { - + class OSGVIEWER_EXPORT Keystone : public osg::Object { public: Keystone(); Keystone(const Keystone& rhs, const osg::CopyOp& copop=osg::CopyOp::SHALLOW_COPY); - + META_Object(osgViewer, Keystone) void reset(); Keystone& operator = (const Keystone& rhs); - + void setKeystoneEditingEnabled(bool flag) { keystoneEditingEnabled = flag; } bool getKeystoneEditingEnabled() const { return keystoneEditingEnabled; } - + void setGridColor(const osg::Vec4& color) { gridColour = color; } osg::Vec4& getGridColor() { return gridColour; } const osg::Vec4& getGridColor() const { return gridColour; } @@ -61,23 +61,23 @@ public: osg::Vec2d& getTopRight() { return top_right; } const osg::Vec2d& getTopRight() const { return top_right; } - - + + void compute3DPositions(osg::DisplaySettings* ds, osg::Vec3& tl, osg::Vec3& tr, osg::Vec3& br, osg::Vec3& bl) const; - + osg::Geode* createKeystoneDistortionMesh(); - + osg::Node* createGrid(); - + /** Write the file specified by the "filename" user value field. Return true if file successfully written. */ bool writeToFile(); - + /** convinience function that loads and assigns any keystone files specified in the DisplaySettings::KeystoneFileNames list, return true if Keystone's assigned to DisplaySettings.*/ static bool loadKeystoneFiles(osg::DisplaySettings* ds); -protected: - +protected: + bool keystoneEditingEnabled; osg::Vec4 gridColour; @@ -91,8 +91,8 @@ protected: protected: virtual ~Keystone() {} - - + + }; class OSGVIEWER_EXPORT KeystoneHandler : public osgGA::GUIEventHandler @@ -125,7 +125,7 @@ public: osg::Vec2d incrementScale(const osgGA::GUIEventAdapter& ea) const; Region computeRegion(const osgGA::GUIEventAdapter& ea) const; void move(Region region, const osg::Vec2d& delta); - + protected: @@ -138,7 +138,7 @@ protected: osg::Vec2d _startPosition; osg::ref_ptr _startControlPoints; - + Region _selectedRegion; osg::ref_ptr _currentControlPoints; @@ -146,4 +146,4 @@ protected: } -#endif \ No newline at end of file +#endif diff --git a/src/osg/glu/libutil/error.cpp b/src/osg/glu/libutil/error.cpp index 1f886e3cc..d52e76ebf 100644 --- a/src/osg/glu/libutil/error.cpp +++ b/src/osg/glu/libutil/error.cpp @@ -150,4 +150,4 @@ const GLubyte* gluErrorString(GLenum errorCode) return (const GLubyte *) 0; } -} // end of namespace osg \ No newline at end of file +} // end of namespace osg diff --git a/src/osgViewer/config/WoWVxDisplay.cpp b/src/osgViewer/config/WoWVxDisplay.cpp index b5d82c1be..17a369df6 100644 --- a/src/osgViewer/config/WoWVxDisplay.cpp +++ b/src/osgViewer/config/WoWVxDisplay.cpp @@ -724,7 +724,7 @@ static const GLubyte patternCheckerboard[] = { void View::setUpViewForStereo() { - osg::DisplaySettings* ds = _displaySettings.valid() ? _displaySettings.get() : osg::DisplaySettings::instance().get(); + osg::DisplaySettings* ds = _displaySettings.valid() ? _displaySettings.get() : osg::DisplaySettings::instance().get(); if (!ds->getStereo()) return; ds->setUseSceneViewForStereoHint(false); @@ -741,13 +741,13 @@ void View::setUpViewForStereo() if (keystone) keystones.push_back(keystone); } } - + if (ds->getKeystoneHint()) { while(keystones.size()<2) keystones.push_back(new Keystone); } - + // set up view's main camera { double height = osg::DisplaySettings::instance()->getScreenHeight(); @@ -757,7 +757,7 @@ void View::setUpViewForStereo() getCamera()->setProjectionMatrixAsPerspective( vfov, width/height, 1.0f,10000.0f); } - + int screenNum = 0; @@ -769,7 +769,7 @@ void View::setUpViewForStereo() } // unsigned int numScreens = wsi->getNumScreens(si); - + osg::GraphicsContext::ScreenIdentifier si; si.readDISPLAY(); @@ -825,7 +825,7 @@ void View::setUpViewForStereo() // left keystone camera to render to left buffer // left keystone camera to render to right buffer // one keystone and editing for the one window - + if (!keystones.empty()) { // for keystone: @@ -834,7 +834,7 @@ void View::setUpViewForStereo() // left keystone camera to render to left viewport/window // right keystone camera to render to right viewport/window // two keystone, one for each of the left and right viewports/windows - + osg::ref_ptr keystone = keystones.front(); // create distortion texture @@ -863,7 +863,7 @@ void View::setUpViewForStereo() // attach the texture and use it as the color buffer. right_camera->attach(osg::Camera::COLOR_BUFFER, right_texture.get()); - + // create Keystone left distortion camera keystone->setGridColor(osg::Vec4(1.0f,0.0f,0.0,1.0)); @@ -877,7 +877,7 @@ void View::setUpViewForStereo() // attach Keystone editing event handler. left_keystone_camera->addEventCallback(new KeystoneHandler(keystone.get())); - + // create Keystone right distortion camera osg::ref_ptr right_keystone_camera = assignKeystoneDistortionCamera(ds, gc.get(), 0, 0, traits->width, traits->height, @@ -886,7 +886,7 @@ void View::setUpViewForStereo() right_keystone_camera->setRenderOrder(osg::Camera::NESTED_RENDER, 3); right_keystone_camera->setAllowEventFocus(false); - + } break; @@ -947,7 +947,7 @@ void View::setUpViewForStereo() texture.get(), keystone.get()); camera->setRenderOrder(osg::Camera::NESTED_RENDER, 2); - + // attach Keystone editing event handler. camera->addEventCallback(new KeystoneHandler(keystone.get())); } @@ -978,7 +978,7 @@ void View::setUpViewForStereo() // left keystone camera to render to left viewport/window // right keystone camera to render to right viewport/window // two keystone, one for each of the left and right viewports/windows - + osg::ref_ptr left_keystone = keystones[0]; osg::ref_ptr right_keystone = keystones[1]; @@ -1010,7 +1010,7 @@ void View::setUpViewForStereo() // attach the texture and use it as the color buffer. right_camera->attach(osg::Camera::COLOR_BUFFER, right_texture.get()); - + // create Keystone left distortion camera left_keystone->setGridColor(osg::Vec4(1.0f,0.0f,0.0,1.0)); @@ -1038,9 +1038,9 @@ void View::setUpViewForStereo() right_keystone_camera->addEventCallback(new KeystoneHandler(right_keystone.get())); getCamera()->setAllowEventFocus(false); - + } - + break; } case(osg::DisplaySettings::VERTICAL_SPLIT): @@ -1048,7 +1048,7 @@ void View::setUpViewForStereo() bool left_eye_bottom_viewport = ds->getSplitStereoVerticalEyeMapping()==osg::DisplaySettings::LEFT_EYE_BOTTOM_VIEWPORT; int left_start = (left_eye_bottom_viewport) ? 0 : traits->height/2; int right_start = (left_eye_bottom_viewport) ? traits->height/2 : 0; - + // bottom viewport Camera osg::ref_ptr left_camera = assignStereoCamera(ds, gc.get(), 0, left_start, traits->width, traits->height/2, traits->doubleBuffer ? GL_BACK : GL_FRONT, @@ -1106,7 +1106,7 @@ void View::setUpViewForStereo() // attach the texture and use it as the color buffer. right_camera->attach(osg::Camera::COLOR_BUFFER, right_texture.get()); - + // create Keystone left distortion camera left_keystone->setGridColor(osg::Vec4(1.0f,0.0f,0.0,1.0)); @@ -1134,7 +1134,7 @@ void View::setUpViewForStereo() right_keystone_camera->addEventCallback(new KeystoneHandler(right_keystone.get())); getCamera()->setAllowEventFocus(false); - + } break; @@ -1181,7 +1181,7 @@ void View::setUpViewForStereo() texture.get(), keystone.get()); camera->setRenderOrder(osg::Camera::NESTED_RENDER, 2); - + // attach Keystone editing event handler. camera->addEventCallback(new KeystoneHandler(keystone.get())); } @@ -1228,7 +1228,7 @@ void View::setUpViewForStereo() texture.get(), keystone.get()); camera->setRenderOrder(osg::Camera::NESTED_RENDER, 1); - + // attach Keystone editing event handler. camera->addEventCallback(new KeystoneHandler(keystone.get())); } @@ -1257,7 +1257,7 @@ void View::setUpViewForStereo() camera->addChild(geode.get()); geode->setCullingActive(false); - + osg::ref_ptr stateset = geode->getOrCreateStateSet(); // set up stencil @@ -1319,7 +1319,7 @@ void View::setUpViewForStereo() void View::setUpViewForKeystone(Keystone* keystone) { int screenNum = 0; - + osg::GraphicsContext::WindowingSystemInterface* wsi = osg::GraphicsContext::getWindowingSystemInterface(); if (!wsi) { @@ -1360,7 +1360,7 @@ void View::setUpViewForKeystone(Keystone* keystone) return; } - osg::DisplaySettings* ds = _displaySettings.valid() ? _displaySettings.get() : osg::DisplaySettings::instance().get(); + osg::DisplaySettings* ds = _displaySettings.valid() ? _displaySettings.get() : osg::DisplaySettings::instance().get(); // create distortion texture osg::ref_ptr texture = createDistortionTexture(width, height); @@ -1375,7 +1375,7 @@ void View::setUpViewForKeystone(Keystone* keystone) texture.get(), keystone); // attach Keystone editing event handler. camera->addEventCallback(new KeystoneHandler(keystone)); - + } -#endif \ No newline at end of file +#endif