From 84ec88cc251d6d4f1c016df96995d04f90285186 Mon Sep 17 00:00:00 2001 From: Robert Osfield Date: Wed, 26 Nov 2014 17:07:07 +0000 Subject: [PATCH] Removed redundent line endings git-svn-id: http://svn.openscenegraph.org/osg/OpenSceneGraph/branches/OpenSceneGraph-3.2@14547 16af8721-9629-0410-8352-f15c8da7e697 --- applications/present3D/Cluster.cpp | 18 ++-- applications/present3D/Cluster.h | 132 ++++++++++++++--------------- 2 files changed, 75 insertions(+), 75 deletions(-) diff --git a/applications/present3D/Cluster.cpp b/applications/present3D/Cluster.cpp index 361dfe862..dd38c909d 100644 --- a/applications/present3D/Cluster.cpp +++ b/applications/present3D/Cluster.cpp @@ -1,12 +1,12 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield * - * This software is open source and may be redistributed and/or modified under + * This software is open source and may be redistributed and/or modified under * the terms of the GNU General Public License (GPL) version 2.0. * The full license is in LICENSE.txt file included with this distribution,. - * + * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * include LICENSE.txt for more details. */ @@ -39,9 +39,9 @@ #elif defined(__sgi) #include #include -#elif defined(__CYGWIN__) +#elif defined(__CYGWIN__) #include -#elif defined(__sun) +#elif defined(__sun) #include #include #elif defined (__APPLE__) @@ -249,7 +249,7 @@ void CameraPacket::writeEventQueue(osgViewer::Viewer& viewer) ////////////////////////////////////////////////////////////////////////////// // -// Reciever +// Reciever // Receiver::Receiver( void ) { @@ -338,7 +338,7 @@ void Receiver::sync( void ) #if defined(__linux) || defined(__FreeBSD__) || defined( __APPLE__ ) || \ defined(__DragonFly__) - socklen_t + socklen_t #else int #endif @@ -381,7 +381,7 @@ void Receiver::sync( void ) ////////////////////////////////////////////////////////////////////////////// // -// Broadcaster +// Broadcaster // Broadcaster::Broadcaster( void ) { diff --git a/applications/present3D/Cluster.h b/applications/present3D/Cluster.h index 4fb4176b5..a1b48ca96 100644 --- a/applications/present3D/Cluster.h +++ b/applications/present3D/Cluster.h @@ -1,12 +1,12 @@ -/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield +/* -*-c++-*- Present3D - Copyright (C) 1999-2006 Robert Osfield * - * This software is open source and may be redistributed and/or modified under + * This software is open source and may be redistributed and/or modified under * the terms of the GNU General Public License (GPL) version 2.0. * The full license is in LICENSE.txt file included with this distribution,. - * + * * This software is distributed in the hope that it will be useful, * but WITHOUT ANY WARRANTY; without even the implied warranty of - * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * include LICENSE.txt for more details. */ @@ -29,7 +29,7 @@ // // Class definition for the recipient of a broadcasted message // -class Receiver +class Receiver { public : @@ -68,7 +68,7 @@ class Receiver // // Class definition for broadcasting a buffer to a LAN // -class Broadcaster +class Broadcaster { public : @@ -84,7 +84,7 @@ class Broadcaster // Set a recipient host. If this is used, the Broadcaster // no longer broadcasts, but rather directs UDP packets at // host. - void setHost( const char *hostname ); + void setHost( const char *hostname ); // Sync broadcasts the buffer void sync( void ); @@ -112,15 +112,15 @@ class Broadcaster class CameraPacket { public: - + static const unsigned int MAX_NUM_EVENTS; static const unsigned int SWAP_BYTES_COMPARE; - - CameraPacket():_masterKilled(false) + + CameraPacket():_masterKilled(false) { _byte_order = SWAP_BYTES_COMPARE; } - + void setPacket(const osg::Matrix& matrix,const osg::FrameStamp* frameStamp) { _matrix = matrix; @@ -129,20 +129,20 @@ class CameraPacket { _frameStamp = *frameStamp; } } - + void getModelView(osg::Matrix& matrix,float angle_offset=0.0f) { - + matrix = _matrix * osg::Matrix::rotate(osg::DegreesToRadians(angle_offset),0.0f,1.0f,0.0f); } - + void readEventQueue(osgViewer::Viewer& viewer); - + void writeEventQueue(osgViewer::Viewer& viewer); void setMasterKilled(const bool flag) { _masterKilled = flag; } const bool getMasterKilled() const { return _masterKilled; } - + unsigned int _byte_order; bool _masterKilled; osg::Matrix _matrix; @@ -150,11 +150,11 @@ class CameraPacket { // note don't use a ref_ptr as used elsewhere for FrameStamp // since we don't want to copy the pointer - but the memory. // FrameStamp doesn't have a private destructor to allow - // us to do this, even though its a reference counted object. + // us to do this, even though its a reference counted object. osg::FrameStamp _frameStamp; - + osgGA::EventQueue::Events _events; - + }; class DataConverter @@ -186,22 +186,22 @@ class DataConverter { if (_currentPtr+1>=_endPtr) return; - *(_currentPtr++) = *(ptr); + *(_currentPtr++) = *(ptr); } inline void read1(char* ptr) { if (_currentPtr+1>=_endPtr) return; - *(ptr) = *(_currentPtr++); + *(ptr) = *(_currentPtr++); } inline void write2(char* ptr) { if (_currentPtr+2>=_endPtr) return; - *(_currentPtr++) = *(ptr++); - *(_currentPtr++) = *(ptr); + *(_currentPtr++) = *(ptr++); + *(_currentPtr++) = *(ptr); } inline void read2(char* ptr) @@ -210,13 +210,13 @@ class DataConverter if (_swapBytes) { - *(ptr+1) = *(_currentPtr++); - *(ptr) = *(_currentPtr++); + *(ptr+1) = *(_currentPtr++); + *(ptr) = *(_currentPtr++); } else { - *(ptr++) = *(_currentPtr++); - *(ptr) = *(_currentPtr++); + *(ptr++) = *(_currentPtr++); + *(ptr) = *(_currentPtr++); } } @@ -224,10 +224,10 @@ class DataConverter { if (_currentPtr+4>=_endPtr) return; - *(_currentPtr++) = *(ptr++); - *(_currentPtr++) = *(ptr++); - *(_currentPtr++) = *(ptr++); - *(_currentPtr++) = *(ptr); + *(_currentPtr++) = *(ptr++); + *(_currentPtr++) = *(ptr++); + *(_currentPtr++) = *(ptr++); + *(_currentPtr++) = *(ptr); } inline void read4(char* ptr) @@ -236,17 +236,17 @@ class DataConverter if (_swapBytes) { - *(ptr+3) = *(_currentPtr++); - *(ptr+2) = *(_currentPtr++); - *(ptr+1) = *(_currentPtr++); - *(ptr) = *(_currentPtr++); + *(ptr+3) = *(_currentPtr++); + *(ptr+2) = *(_currentPtr++); + *(ptr+1) = *(_currentPtr++); + *(ptr) = *(_currentPtr++); } else { - *(ptr++) = *(_currentPtr++); - *(ptr++) = *(_currentPtr++); - *(ptr++) = *(_currentPtr++); - *(ptr) = *(_currentPtr++); + *(ptr++) = *(_currentPtr++); + *(ptr++) = *(_currentPtr++); + *(ptr++) = *(_currentPtr++); + *(ptr) = *(_currentPtr++); } } @@ -254,15 +254,15 @@ class DataConverter { if (_currentPtr+8>=_endPtr) return; - *(_currentPtr++) = *(ptr++); - *(_currentPtr++) = *(ptr++); - *(_currentPtr++) = *(ptr++); - *(_currentPtr++) = *(ptr++); + *(_currentPtr++) = *(ptr++); + *(_currentPtr++) = *(ptr++); + *(_currentPtr++) = *(ptr++); + *(_currentPtr++) = *(ptr++); - *(_currentPtr++) = *(ptr++); - *(_currentPtr++) = *(ptr++); - *(_currentPtr++) = *(ptr++); - *(_currentPtr++) = *(ptr); + *(_currentPtr++) = *(ptr++); + *(_currentPtr++) = *(ptr++); + *(_currentPtr++) = *(ptr++); + *(_currentPtr++) = *(ptr); } inline void read8(char* ptr) @@ -272,27 +272,27 @@ class DataConverter if (_swapBytes) { - *(ptr+7) = *(_currentPtr++); - *(ptr+6) = *(_currentPtr++); - *(ptr+5) = *(_currentPtr++); - *(ptr+4) = *(_currentPtr++); + *(ptr+7) = *(_currentPtr++); + *(ptr+6) = *(_currentPtr++); + *(ptr+5) = *(_currentPtr++); + *(ptr+4) = *(_currentPtr++); - *(ptr+3) = *(_currentPtr++); - *(ptr+2) = *(_currentPtr++); - *(ptr+1) = *(_currentPtr++); - *(ptr) = *(_currentPtr++); + *(ptr+3) = *(_currentPtr++); + *(ptr+2) = *(_currentPtr++); + *(ptr+1) = *(_currentPtr++); + *(ptr) = *(_currentPtr++); } else { - *(ptr++) = *(_currentPtr++); - *(ptr++) = *(_currentPtr++); - *(ptr++) = *(_currentPtr++); - *(ptr++) = *(_currentPtr++); + *(ptr++) = *(_currentPtr++); + *(ptr++) = *(_currentPtr++); + *(ptr++) = *(_currentPtr++); + *(ptr++) = *(_currentPtr++); - *(ptr++) = *(_currentPtr++); - *(ptr++) = *(_currentPtr++); - *(ptr++) = *(_currentPtr++); - *(ptr) = *(_currentPtr++); + *(ptr++) = *(_currentPtr++); + *(ptr++) = *(_currentPtr++); + *(ptr++) = *(_currentPtr++); + *(ptr) = *(_currentPtr++); } } @@ -322,13 +322,13 @@ class DataConverter void write(const osgGA::GUIEventAdapter& event); void read(osgGA::GUIEventAdapter& event); - + void write(CameraPacket& cameraPacket); void read(CameraPacket& cameraPacket); char* startPtr() { return _startPtr; } unsigned int numBytes() { return _numBytes; } - + protected: char* _startPtr; @@ -341,4 +341,4 @@ class DataConverter -#endif +#endif