FGFS-4.1/simgear
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Move some OSG-dependant code into scene/util.

Browse Source
This commit is contained in:
James Turner
2011-11-29 10:23:09 +00:00
parent 75afee59c3
commit 42b7c48671
13 changed files with 10 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files
simgear/math/CMakeLists.txt
-2
View File
@@ -28,7 +28,6 @@ set(HEADERS
beziercurve.hxx
interpolater.hxx
leastsqs.hxx
project.hxx
sg_geodesy.hxx
sg_types.hxx
sg_random.h
@@ -39,7 +38,6 @@ set(SOURCES
SGGeodesy.cxx
interpolater.cxx
leastsqs.cxx
project.cxx
sg_random.c
)
simgear/math/project.cxx
-52
View File
@@ -1,52 +0,0 @@
// Copyright (C) 2010 Tim Moore moore@bricoworks.com
//
// 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 <simgear_config.h>
#endif
#include "project.hxx"
#ifndef NO_OPENSCENEGRAPH_INTERFACE
#include <osg/Math>
#include <osg/Matrixd>
namespace simgear
{
GLint project(GLdouble objX, GLdouble objY, GLdouble objZ,
const GLdouble *model, const GLdouble *proj, const GLint *view,
GLdouble* winX, GLdouble* winY, GLdouble* winZ)
{
using namespace osg;
Vec4d obj(objX, objY, objZ, 1.0);
Matrixd Mmodel(model), Mproj(proj);
Matrixd Mwin = (Matrixd::translate(1.0, 1.0, 1.0)
* Matrixd::scale(0.5 * view[2], 0.5 * view[3], 0.5)
* Matrixd::translate(view[0], view[1], 0.0));
Vec4d result = obj * Mmodel * Mproj * Mwin;
if (equivalent(result.w(), 0.0))
return GL_FALSE;
result = result / result.w();
*winX = result.x(); *winY = result.y(); *winZ = result.z();
return GL_TRUE;
}
}
#endif // of NO_OPENSCENEGRAPH_INTERFACE
simgear/math/project.hxx
-36
View File
@@ -1,36 +0,0 @@
// Copyright (C) 2010 Tim Moore moore@bricoworks.com
//
// 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.
//
#ifndef SIMGEAR_PROJECT_HXX
#define SIMGEAR_PROJECT_HXX 1
#ifndef NO_OPENSCENEGRAPH_INTERFACE
#include <osg/GL>
namespace simgear
{
// Replacement for gluProject. OSG doesn't link in GLU anymore.
extern GLint project(GLdouble objX, GLdouble objY, GLdouble objZ,
const GLdouble *model, const GLdouble *proj,
const GLint *view,
GLdouble* winX, GLdouble* winY, GLdouble* winZ);
}
#endif // of NO_OPENSCENEGRAPH_INTERFACE
#endif