From 6cc32a56b9f7b6f9b6794b66be5c858e197b2094 Mon Sep 17 00:00:00 2001 From: curt Date: Tue, 24 Apr 2001 20:01:52 +0000 Subject: [PATCH] Added some convenience functions to point3d. --- Makefile.am | 3 +- SimGear.dsp | 427 +++++++++++++++++++++++++++++++++++++-- simgear/math/point3d.hxx | 20 ++ 3 files changed, 429 insertions(+), 21 deletions(-) diff --git a/Makefile.am b/Makefile.am index c9d11af4..dda5f79a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -73,7 +73,8 @@ distclean: # dist-hook: - (cd $(top_srcdir); $(HOME)/projects/FlightGear-0.7/admin/am2dsp.pl) + (cd $(top_srcdir); \ + $(HOME)/projects/FlightGear-0.7/admin/am2dsp.pl --lib) tar cf - simgear/metar | (cd $(distdir); tar xvf -) @list='@subdirs@'; \ target=distclean; \ diff --git a/SimGear.dsp b/SimGear.dsp index 87264772..da5f2eb0 100644 --- a/SimGear.dsp +++ b/SimGear.dsp @@ -2,7 +2,7 @@ # Microsoft Developer Studio Generated Build File, Format Version 6.00 # ** DO NOT EDIT ** -# TARGTYPE "Win32 (x86) Console Application" 0x0103 +# TARGTYPE "Win32 (x86) Static Library" 0x0104 CFG=SimGear - Win32 Debug !MESSAGE This is not a valid makefile. To build this project using NMAKE, @@ -17,8 +17,8 @@ CFG=SimGear - Win32 Debug !MESSAGE !MESSAGE Possible choices for configuration are: !MESSAGE -!MESSAGE "SimGear - Win32 Release" (based on "Win32 (x86) Console Application") -!MESSAGE "SimGear - Win32 Debug" (based on "Win32 (x86) Console Application") +!MESSAGE "SimGear - Win32 Release" (based on "Win32 (x86) Static Library") +!MESSAGE "SimGear - Win32 Debug" (based on "Win32 (x86) Static Library") !MESSAGE # Begin Project @@ -40,17 +40,16 @@ RSC=rc.exe # PROP Output_Dir "Release" # PROP Intermediate_Dir "Release" # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /c -# ADD CPP /nologo /W3 /GX /O2 /I ".\src" /I ".\src\Include" /I "\usr\include" /D "NDEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /FD /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0xc09 /d "NDEBUG" -# ADD RSC /l 0xc09 /d "NDEBUG" +# ADD BASE CPP /nologo /W3 /GX /O2 /D "WIN32" /D "NDEBUG" /D "_MBCS" /YX /FD /c +# ADD CPP /nologo /W3 /GX /O2 /I "\usr\include" /D "NDEBUG" /D "WIN32" /D "_MBCS" /D "HAVE_CONFIG_H" /FD /c +# ADD BASE RSC /l 0x409 /d "NDEBUG" +# ADD RSC /l 0x409 /d "NDEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 -# ADD LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /machine:I386 +LINK32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo !ELSEIF "$(CFG)" == "SimGear - Win32 Debug" @@ -63,19 +62,17 @@ LINK32=link.exe # PROP Use_Debug_Libraries 1 # PROP Output_Dir "Debug" # PROP Intermediate_Dir "Debug" -# PROP Ignore_Export_Lib 0 # PROP Target_Dir "" -# ADD BASE CPP /nologo /W3 /Gm /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_CONSOLE" /D "_MBCS" /YX /FD /GZ /c -# ADD CPP /nologo /W3 /Gm /GX /ZI /Od /I ".\src" /I ".\src\Include" /I "\usr\include" /D "_DEBUG" /D "WIN32" /D "_CONSOLE" /D "_MBCS" /D "HAVE_CONFIG_H" /FR /FD /GZ /c -# SUBTRACT CPP /YX -# ADD BASE RSC /l 0xc09 /d "_DEBUG" -# ADD RSC /l 0xc09 /d "_DEBUG" +# ADD BASE CPP /nologo /W3 /GX /ZI /Od /D "WIN32" /D "_DEBUG" /D "_MBCS" /YX /FD /GZ /c +# ADD CPP /nologo /W3 /GX /ZI /Od /I "\usr\include" /D "_DEBUG" /D "WIN32" /D "_MBCS" /D "HAVE_CONFIG_H" /FR /FD /GZ /c +# ADD BASE RSC /l 0x409 /d "_DEBUG" +# ADD RSC /l 0x409 /d "_DEBUG" BSC32=bscmake.exe # ADD BASE BSC32 /nologo # ADD BSC32 /nologo -LINK32=link.exe -# ADD BASE LINK32 kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib kernel32.lib user32.lib gdi32.lib winspool.lib comdlg32.lib advapi32.lib shell32.lib ole32.lib oleaut32.lib uuid.lib odbc32.lib odbccp32.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept -# ADD LINK32 kernel32.lib user32.lib winspool.lib comdlg32.lib gdi32.lib shell32.lib glut32.lib wsock32.lib simgear.lib fnt.lib pui.lib sg.lib sl.lib ssg.lib mk4vc60_d.lib /nologo /subsystem:console /debug /machine:I386 /pdbtype:sept /libpath:"\lib" /libpath:"\lib\simgear" /libpath:"\lib\plib" +LINK32=link.exe -lib +# ADD BASE LIB32 /nologo +# ADD LIB32 /nologo !ENDIF @@ -243,6 +240,21 @@ SOURCE=.\simgear\ephemeris\neptune.cxx # End Source File # Begin Source File +SOURCE=.\simgear\ephemeris\pluto.hxx + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgephem" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgephem" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\simgear\ephemeris\saturn.cxx !IF "$(CFG)" == "SimGear - Win32 Release" @@ -416,6 +428,21 @@ SOURCE=.\simgear\io\sg_socket.cxx # PROP Default_Filter "" # Begin Source File +SOURCE=.\simgear\magvar\coremag.hxx + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgmagvar" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgmagvar" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\simgear\magvar\coremag.cxx !IF "$(CFG)" == "SimGear - Win32 Release" @@ -634,6 +661,36 @@ SOURCE=.\simgear\metar\Fracpart.cpp # End Source File # Begin Source File +SOURCE=.\simgear\metar\Local.h + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgmetar" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgmetar" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\simgear\metar\Metar.h + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgmetar" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgmetar" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\simgear\metar\MetarReport.cpp !IF "$(CFG)" == "SimGear - Win32 Release" @@ -871,6 +928,21 @@ SOURCE=.\simgear\screen\GLBitmaps.cxx # End Source File # Begin Source File +SOURCE=.\simgear\screen\GLBitmaps.h + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgscreen" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgscreen" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\simgear\screen\screen-dump.cxx !IF "$(CFG)" == "SimGear - Win32 Release" @@ -883,6 +955,21 @@ SOURCE=.\simgear\screen\screen-dump.cxx !ENDIF +# End Source File +# Begin Source File + +SOURCE=.\simgear\screen\win32-printer.h + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgscreen" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgscreen" + +!ENDIF + # End Source File # End Group # Begin Group "Lib_sgserial" @@ -1135,6 +1222,21 @@ SOURCE=.\simgear\xgl\xglUtils.c # PROP Default_Filter "" # Begin Source File +SOURCE=.\simgear\xml\asciitab.h + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgxml" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgxml" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\simgear\xml\easyxml.cxx !IF "$(CFG)" == "SimGear - Win32 Release" @@ -1150,6 +1252,21 @@ SOURCE=.\simgear\xml\easyxml.cxx # End Source File # Begin Source File +SOURCE=.\simgear\xml\hashtable.h + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgxml" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgxml" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\simgear\xml\hashtable.c !IF "$(CFG)" == "SimGear - Win32 Release" @@ -1165,6 +1282,96 @@ SOURCE=.\simgear\xml\hashtable.c # End Source File # Begin Source File +SOURCE=.\simgear\xml\iasciitab.h + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgxml" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgxml" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\simgear\xml\latin1tab.h + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgxml" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgxml" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\simgear\xml\nametab.h + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgxml" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgxml" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\simgear\xml\utf8tab.h + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgxml" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgxml" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\simgear\xml\xmldef.h + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgxml" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgxml" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\simgear\xml\xmlparse.h + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgxml" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgxml" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\simgear\xml\xmlparse.c !IF "$(CFG)" == "SimGear - Win32 Release" @@ -1180,6 +1387,21 @@ SOURCE=.\simgear\xml\xmlparse.c # End Source File # Begin Source File +SOURCE=.\simgear\xml\xmlrole.h + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgxml" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgxml" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\simgear\xml\xmlrole.c !IF "$(CFG)" == "SimGear - Win32 Release" @@ -1195,6 +1417,21 @@ SOURCE=.\simgear\xml\xmlrole.c # End Source File # Begin Source File +SOURCE=.\simgear\xml\xmltok.h + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgxml" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgxml" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\simgear\xml\xmltok.c !IF "$(CFG)" == "SimGear - Win32 Release" @@ -1207,6 +1444,21 @@ SOURCE=.\simgear\xml\xmltok.c !ENDIF +# End Source File +# Begin Source File + +SOURCE=.\simgear\xml\xmltok_impl.h + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgxml" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgxml" + +!ENDIF + # End Source File # End Group # Begin Group "Lib_z" @@ -1274,6 +1526,21 @@ SOURCE=.\simgear\zlib\deflate.c # End Source File # Begin Source File +SOURCE=.\simgear\zlib\deflate.h + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_z" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_z" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\simgear\zlib\gzio.c !IF "$(CFG)" == "SimGear - Win32 Release" @@ -1304,6 +1571,21 @@ SOURCE=.\simgear\zlib\infblock.c # End Source File # Begin Source File +SOURCE=.\simgear\zlib\infblock.h + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_z" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_z" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\simgear\zlib\infcodes.c !IF "$(CFG)" == "SimGear - Win32 Release" @@ -1319,6 +1601,21 @@ SOURCE=.\simgear\zlib\infcodes.c # End Source File # Begin Source File +SOURCE=.\simgear\zlib\infcodes.h + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_z" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_z" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\simgear\zlib\inffast.c !IF "$(CFG)" == "SimGear - Win32 Release" @@ -1334,6 +1631,36 @@ SOURCE=.\simgear\zlib\inffast.c # End Source File # Begin Source File +SOURCE=.\simgear\zlib\inffast.h + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_z" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_z" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\simgear\zlib\inffixed.h + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_z" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_z" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\simgear\zlib\inflate.c !IF "$(CFG)" == "SimGear - Win32 Release" @@ -1364,6 +1691,21 @@ SOURCE=.\simgear\zlib\inftrees.c # End Source File # Begin Source File +SOURCE=.\simgear\zlib\inftrees.h + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_z" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_z" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\simgear\zlib\infutil.c !IF "$(CFG)" == "SimGear - Win32 Release" @@ -1379,6 +1721,21 @@ SOURCE=.\simgear\zlib\infutil.c # End Source File # Begin Source File +SOURCE=.\simgear\zlib\infutil.h + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_z" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_z" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\simgear\zlib\trees.c !IF "$(CFG)" == "SimGear - Win32 Release" @@ -1394,6 +1751,21 @@ SOURCE=.\simgear\zlib\trees.c # End Source File # Begin Source File +SOURCE=.\simgear\zlib\trees.h + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_z" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_z" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\simgear\zlib\uncompr.c !IF "$(CFG)" == "SimGear - Win32 Release" @@ -1421,6 +1793,21 @@ SOURCE=.\simgear\zlib\zutil.c !ENDIF +# End Source File +# Begin Source File + +SOURCE=.\simgear\zlib\zutil.h + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_z" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_z" + +!ENDIF + # End Source File # End Group # End Target diff --git a/simgear/math/point3d.hxx b/simgear/math/point3d.hxx index 0cc469b9..3537d45c 100644 --- a/simgear/math/point3d.hxx +++ b/simgear/math/point3d.hxx @@ -108,6 +108,10 @@ public: void setx(const double x); void sety(const double y); void setz(const double z); + void setlon(const double x); + void setlat(const double y); + void setradius(const double z); + void setelev(const double z); // Queries @@ -240,6 +244,22 @@ inline void Point3D::setz(const double z) { n[PZ] = z; } +inline void Point3D::setlon(const double x) { + n[PX] = x; +} + +inline void Point3D::setlat(const double y) { + n[PY] = y; +} + +inline void Point3D::setradius(const double z) { + n[PZ] = z; +} + +inline void Point3D::setelev(const double z) { + n[PZ] = z; +} + // QUERIES inline double& Point3D::operator [] ( int i) -- 2.39.5