From: curt Date: Wed, 14 Jul 2004 22:01:15 +0000 (+0000) Subject: Tweaks in preparation for the 0.3.6-pre1 release. X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=129e3c63260e7fb58a72b8232dc4901b5e2c4f37;p=simgear.git Tweaks in preparation for the 0.3.6-pre1 release. --- diff --git a/Doxyfile b/Doxyfile index 8a879db7..fb3e30bd 100644 --- a/Doxyfile +++ b/Doxyfile @@ -22,7 +22,7 @@ PROJECT_NAME = SimGear # This could be handy for archiving the generated documentation or # if some version control system is used. -PROJECT_NUMBER = 0.3.5 +PROJECT_NUMBER = 0.3.6 # The OUTPUT_DIRECTORY tag is used to specify the (relative or absolute) # base path where the generated documentation will be put. diff --git a/Makefile.am b/Makefile.am index f4c8249c..cf1c35b3 100644 --- a/Makefile.am +++ b/Makefile.am @@ -1,9 +1,8 @@ EXTRA_DIST = \ acinclude.m4 \ autogen.sh \ - DoxygenMain.cxx + DoxygenMain.cxx \ README.MSVC \ - README.metakit \ README.zlib \ SimGear.dsp \ SimGear.dsw diff --git a/NEWS b/NEWS index 18f71e28..3e0c3cca 100644 --- a/NEWS +++ b/NEWS @@ -1,3 +1,12 @@ +New in 0.3.6-pre1 +* Better MinGW support +* Switched audio system from plib's "sl/sm" to OpenAL. +* Add support for scaling an object based on distance. The scaling + factor is determined by a lookup table based on distance. +* Add a "flash" animation type. +* Fix cloud positioning/animation bugs. + + New in 0.3.5 * March 26, 2004 diff --git a/SimGear.dsp b/SimGear.dsp index 7b6d5f2f..6794ce35 100644 --- a/SimGear.dsp +++ b/SimGear.dsp @@ -1094,6 +1094,21 @@ SOURCE=.\simgear\scene\model\animation.cxx # End Source File # Begin Source File +SOURCE=.\simgear\scene\model\custtrans.cxx + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgmodel" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgmodel" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\simgear\scene\model\location.cxx !IF "$(CFG)" == "SimGear - Win32 Release" @@ -1139,6 +1154,21 @@ SOURCE=.\simgear\scene\model\modellib.cxx # End Source File # Begin Source File +SOURCE=.\simgear\scene\model\personality.cxx + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgmodel" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgmodel" + +!ENDIF + +# End Source File +# Begin Source File + SOURCE=.\simgear\scene\model\placement.cxx !IF "$(CFG)" == "SimGear - Win32 Release" @@ -2363,7 +2393,22 @@ SOURCE=.\simgear\serial\serial.cxx # PROP Default_Filter "" # Begin Source File -SOURCE=.\simgear\sound\sound.cxx +SOURCE=.\simgear\sound\sample_openal.cxx + +!IF "$(CFG)" == "SimGear - Win32 Release" + +# PROP Intermediate_Dir "Release\Lib_sgsound" + +!ELSEIF "$(CFG)" == "SimGear - Win32 Debug" + +# PROP Intermediate_Dir "Debug\Lib_sgsound" + +!ENDIF + +# End Source File +# Begin Source File + +SOURCE=.\simgear\sound\soundmgr_openal.cxx !IF "$(CFG)" == "SimGear - Win32 Release" @@ -2378,7 +2423,7 @@ SOURCE=.\simgear\sound\sound.cxx # End Source File # Begin Source File -SOURCE=.\simgear\sound\soundmgr.cxx +SOURCE=.\simgear\sound\xmlsound.cxx !IF "$(CFG)" == "SimGear - Win32 Release" diff --git a/configure.ac b/configure.ac index 7a87af31..5b90c440 100644 --- a/configure.ac +++ b/configure.ac @@ -10,7 +10,7 @@ dnl Require at least automake 2.52 AC_PREREQ(2.52) dnl Initialize the automake stuff -AM_INIT_AUTOMAKE(SimGear, 0.3.5) +AM_INIT_AUTOMAKE(SimGear, 0.3.6-pre1) dnl Specify KAI C++ compiler and flags. dnl Borrowed with slight modification from blitz distribution. diff --git a/simgear/io/sg_binobj.cxx b/simgear/io/sg_binobj.cxx index b07bc525..0b962c46 100644 --- a/simgear/io/sg_binobj.cxx +++ b/simgear/io/sg_binobj.cxx @@ -116,7 +116,7 @@ public: // calculate the center of a list of points, by taking the halfway // point between the min and max points. -static Point3D calc_center( point_list& wgs84_nodes ) { +Point3D sgCalcCenter( point_list& wgs84_nodes ) { Point3D p, min, max; if ( wgs84_nodes.size() ) { @@ -1145,7 +1145,7 @@ bool SGBinObject::write_ascii( const string& base, const string& name, for ( i = start; i < end; ++i ) { for ( j = 0; j < (int)tris_v[i].size(); ++j ) { group_nodes.push_back( wgs84_nodes[ tris_v[i][j] ] ); - bs_center = calc_center( group_nodes ); + bs_center = sgCalcCenter( group_nodes ); bs_radius = sgCalcBoundingRadius( bs_center, group_nodes ); } } @@ -1196,7 +1196,7 @@ bool SGBinObject::write_ascii( const string& base, const string& name, for ( i = start; i < end; ++i ) { for ( j = 0; j < (int)strips_v[i].size(); ++j ) { group_nodes.push_back( wgs84_nodes[ strips_v[i][j] ] ); - bs_center = calc_center( group_nodes ); + bs_center = sgCalcCenter( group_nodes ); bs_radius = sgCalcBoundingRadius( bs_center, group_nodes ); } } diff --git a/simgear/io/sg_binobj.hxx b/simgear/io/sg_binobj.hxx index 5139ea6e..a59b0752 100644 --- a/simgear/io/sg_binobj.hxx +++ b/simgear/io/sg_binobj.hxx @@ -221,6 +221,16 @@ public: }; +/** + * \relates SGBinObject + * Calculate the center of a list of points, by taking the halfway + * point between the min and max points. + * @param wgs84_nodes list of points in wgs84 coordinates + * @return center point + */ +Point3D sgCalcCenter( point_list& wgs84_nodes ); + + /** * \relates SGBinObject * Calculate the bounding sphere of a set of nodes.