[Opende-svn] SF.net SVN: opende: [1034] trunk/ode/src/heightfield.cpp

[<hid...@us...>]

Revision: 1034
Author:   hidden_asbestos
Date:     2006-08-08 06:01:19 -0700 (Tue, 08 Aug 2006)
ViewCVS:  http://svn.sourceforge.net/opende/?rev=1034&view=rev

Log Message:
-----------
Heightfield: Fixed a serious problem with the double path which was still using floats in dGeomHeightfieldDataBuildDouble.

Made a cleaner destructor for dxHeightfieldData which shouldn't be calling delete on a variable of void type. GCC should be happier with this code, but that is untested.

Modified Paths:
--------------
    trunk/ode/src/heightfield.cpp
Modified: trunk/ode/src/heightfield.cpp
===================================================================
--- trunk/ode/src/heightfield.cpp	2006-08-03 20:00:29 UTC (rev 1033)
+++ trunk/ode/src/heightfield.cpp	2006-08-08 13:01:19 UTC (rev 1034)
@@ -306,13 +306,48 @@
 // dxHeightfieldData destructor
 dxHeightfieldData::~dxHeightfieldData()
 {
+	static unsigned char *data_byte;
+	static short *data_short;
+	static float *data_float;
+	static double *data_double;
+
+	dIASSERT( m_pHeightData );
+
 	if ( m_bCopyHeightData )
 	{
-		// Cast from const void* to plain void* for MinGW warning.
-		void* p_nonconst = const_cast< void* >( m_pHeightData );
+		switch ( m_nGetHeightMode )
+		{
 
-		dIASSERT( m_pHeightData );
-		delete [] p_nonconst;
+		// callback
+		case 0:
+			// do nothing
+			break;
+
+		// byte
+		case 1:
+			data_byte = (unsigned char*)m_pHeightData;
+			delete [] data_byte;
+			break;
+
+		// short
+		case 2:
+			data_short = (short*)m_pHeightData;
+			delete [] data_short;
+			break;
+
+		// float
+		case 3:
+			data_float = (float*)m_pHeightData;
+			delete [] data_float;
+			break;
+
+		// double
+		case 4:
+			data_double = (double*)m_pHeightData;
+			delete [] data_double;
+			break;
+
+		}
 	}
 }
 
@@ -609,12 +644,12 @@
 	else
 	{
 		// We own the height data, allocate storage
-		d->m_pHeightData = new float[ d->m_nWidthSamples * d->m_nDepthSamples ];
+		d->m_pHeightData = new double[ d->m_nWidthSamples * d->m_nDepthSamples ];
 		dIASSERT( d->m_pHeightData );
 
 		// Copy data.
 		memcpy( (void*)d->m_pHeightData, pHeightData,
-			sizeof( float ) * d->m_nWidthSamples * d->m_nDepthSamples );
+			sizeof( double ) * d->m_nWidthSamples * d->m_nDepthSamples );
 	}
 
 	// Find height bounds


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.