Tweaks in preparation for the 0.3.6-pre1 release.

diff --git a/Doxyfile b/Doxyfile
index 8a879db777a4d3db87ad83501b271d70ceda123e..fb3e30bd915b1134bf2ef8873f80ed4e468099ad 100644 (file)
--- 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 f4c8249cf7573328daeb745a6741ffd7c161f267..cf1c35b3184e5463eaaf29198ad77403234a02ed 100644 (file)
--- 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 18f71e28afb4981b5a1be2f51d447bbd0c0f4665..3e0c3ccab1b910c1b114c22096ead5eebe982ab0 100644 (file)
--- 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 7b6d5f2f2aa7b691aa97fb54525ece9dc1be481b..6794ce358678b1ec410daa8ed89b0cfc81059e1a 100644 (file)
--- a/SimGear.dsp
+++ b/SimGear.dsp
@@ -1094,6 +1094,21 @@ SOURCE=.\simgear\scene\model\animation.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\scene\model\custtrans.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgmodel"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgmodel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\scene\model\location.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -1139,6 +1154,21 @@ SOURCE=.\simgear\scene\model\modellib.cxx
 # End Source File\r
 # Begin Source File\r
 \r
+SOURCE=.\simgear\scene\model\personality.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgmodel"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgmodel"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
 SOURCE=.\simgear\scene\model\placement.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
@@ -2363,7 +2393,22 @@ SOURCE=.\simgear\serial\serial.cxx
 # PROP Default_Filter ""\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\sound\sound.cxx\r
+SOURCE=.\simgear\sound\sample_openal.cxx\r
+\r
+!IF  "$(CFG)" == "SimGear - Win32 Release"\r
+\r
+# PROP Intermediate_Dir "Release\Lib_sgsound"\r
+\r
+!ELSEIF  "$(CFG)" == "SimGear - Win32 Debug"\r
+\r
+# PROP Intermediate_Dir "Debug\Lib_sgsound"\r
+\r
+!ENDIF \r
+\r
+# End Source File\r
+# Begin Source File\r
+\r
+SOURCE=.\simgear\sound\soundmgr_openal.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r
@@ -2378,7 +2423,7 @@ SOURCE=.\simgear\sound\sound.cxx
 # End Source File\r
 # Begin Source File\r
 \r
-SOURCE=.\simgear\sound\soundmgr.cxx\r
+SOURCE=.\simgear\sound\xmlsound.cxx\r
 \r
 !IF  "$(CFG)" == "SimGear - Win32 Release"\r
 \r

diff --git a/configure.ac b/configure.ac
index 7a87af310795cfd6459151cec4ddf4693b6b3597..5b90c440121d6c4f1b48ec2cf689bc5b8e24586e 100644 (file)
--- 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 b07bc525198db0b6b7687ece684108b63712988f..0b962c4624b25d329579475e80f41d4fa545c00c 100644 (file)
--- 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 5139ea6e5b84972bf035bc406d84ec904bf7cf57..a59b07522511304d3651dac356307ed35d6b4bf3 100644 (file)
--- 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.