From 86e32035d767b0ee276f0effe91706f88d69da51 Mon Sep 17 00:00:00 2001 From: Mathias Froehlich Date: Sat, 3 Mar 2012 16:05:23 +0100 Subject: [PATCH] Remove left over from osg/core dependencies. This file should be obsolete doe to the latest changes. --- simgear/CMakeLists.txt | 2 - simgear/scene/util/SGCoreOSGDependant.cxx | 61 ----------------------- 2 files changed, 63 deletions(-) delete mode 100644 simgear/scene/util/SGCoreOSGDependant.cxx diff --git a/simgear/CMakeLists.txt b/simgear/CMakeLists.txt index 3ad734fa..7612bb8d 100644 --- a/simgear/CMakeLists.txt +++ b/simgear/CMakeLists.txt @@ -70,8 +70,6 @@ if(SIMGEAR_SHARED) endif(LIBSVN_FOUND) if(NOT SIMGEAR_HEADLESS) - list(APPEND sceneSources scene/util/SGCoreOSGDependant.cxx) - add_library(SimGearScene SHARED ${sceneSources}) # set_property(TARGET SimGearScene PROPERTY FRAMEWORK 1) # set_property(TARGET SimGearScene PROPERTY PUBLIC_HEADER "${publicHeaders}") diff --git a/simgear/scene/util/SGCoreOSGDependant.cxx b/simgear/scene/util/SGCoreOSGDependant.cxx deleted file mode 100644 index b46064e9..00000000 --- a/simgear/scene/util/SGCoreOSGDependant.cxx +++ /dev/null @@ -1,61 +0,0 @@ - - -// Copyright (C) 2011 Curtis L Olson -// -// This library is free software; you can redistribute it and/or -// modify it under the terms of the GNU Library General Public -// License as published by the Free Software Foundation; either -// version 2 of the License, or (at your option) any later version. -// -// This library 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 GNU -// Library General Public License for more details. -// -// You should have received a copy of the GNU General Public License -// along with this program; if not, write to the Free Software -// Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301, USA. -// - -#ifdef HAVE_CONFIG_H -# include -#endif - -#include - -#include -#include - -osg::Matrix SGGeod::makeSimulationFrameRelative() const -{ - SGQuatd hlOr = SGQuatd::fromLonLat(*this); - return osg::Matrix(toOsg(hlOr)); -} - -osg::Matrix SGGeod::makeSimulationFrame() const -{ - osg::Matrix result(makeSimulationFrameRelative()); - SGVec3d coord; - SGGeodesy::SGGeodToCart(*this, coord); - result.setTrans(toOsg(coord)); - return result; -} - -osg::Matrix SGGeod::makeZUpFrameRelative() const -{ - osg::Matrix result(makeSimulationFrameRelative()); - // 180 degree rotation around Y axis - osg::Quat flip(0.0, 1.0, 0.0, 0.0); - result.preMult(osg::Matrix(flip)); - return result; -} - -osg::Matrix SGGeod::makeZUpFrame() const -{ - osg::Matrix result(makeZUpFrameRelative()); - SGVec3d coord; - SGGeodesy::SGGeodToCart(*this, coord); - result.setTrans(toOsg(coord)); - return result; -} - -- 2.39.5