diff --git a/makepanda/makepanda.py b/makepanda/makepanda.py index 694681db00..60006096e3 100755 --- a/makepanda/makepanda.py +++ b/makepanda/makepanda.py @@ -4862,7 +4862,6 @@ if (PkgSkip("ODE")==0 and not RUNTIME): OPTS=['DIR:panda/src/ode', 'ODE'] IGATEFILES=GetDirectoryContents('panda/src/ode', ["*.h", "*_composite*.cxx"]) IGATEFILES.remove("odeConvexGeom.h") - IGATEFILES.remove("odeHeightFieldGeom.h") IGATEFILES.remove("odeHelperStructs.h") TargetAdd('libpandaode.in', opts=OPTS, input=IGATEFILES) TargetAdd('libpandaode.in', opts=['IMOD:panda3d.ode', 'ILIB:libpandaode', 'SRCDIR:panda/src/ode']) diff --git a/panda/src/ode/odeHeightFieldGeom.h b/panda/src/ode/odeHeightFieldGeom.h deleted file mode 100644 index 2093ebe55b..0000000000 --- a/panda/src/ode/odeHeightFieldGeom.h +++ /dev/null @@ -1,119 +0,0 @@ -/** - * PANDA 3D SOFTWARE - * Copyright (c) Carnegie Mellon University. All rights reserved. - * - * All use of this software is subject to the terms of the revised BSD - * license. You should have received a copy of this license along - * with this source code in a file named "LICENSE." - * - * @file odeHeightFieldGeom.h - * @author joswilso - * @date 2006-12-27 - */ - -#ifndef ODEHEIGHTFIELDGEOM_H -#define ODEHEIGHTFIELDGEOM_H - -#include "pandabase.h" -#include "typedObject.h" -#include "luse.h" - -#include "ode_includes.h" -#include "odeGeom.h" - -/** - * - */ -class EXPCL_PANDAODE OdeHeightfieldGeom : public OdeGeom { - friend class OdeGeom; - -public: - OdeHeightfieldGeom(dGeomID id); - -PUBLISHED: - OdeHeightfieldGeom(); - virtual ~OdeHeightfieldGeom(); - - INLINE dHeightfieldDataID heightfield_data_create(); - INLINE void heightfield_data_destroy(dHeightfieldDataID d); - INLINE void heightfield_data_build_callback(dHeightfieldDataID d, - void* p_user_data, - dHeightfieldGetHeight* p_callback, - dReal width, - dReal depth, - int width_samples, - int depth_samples, - dReal scale, - dReal offset, - dReal thickness, - int b_wrap); - INLINE void heightfield_data_build_byte(dHeightfieldDataID d, - const unsigned char* p_height_data, - int b_copy_height_data, - dReal width, - dReal depth, - int width_samples, - int depth_samples, - dReal scale, - dReal offset, - dReal thickness, - int b_wrap); - INLINE void heightfield_data_build_short(dHeightfieldDataID d, - const short* p_height_data, - int b_copy_height_data, - dReal width, - dReal depth, - int width_samples, - int depth_samples, - dReal scale, - dReal offset, - dReal thickness, - int b_wrap); - INLINE void heightfield_data_build_single(dHeightfieldDataID d, - const float* p_height_data, - int b_copy_height_data, - dReal width, - dReal depth, - int width_samples, - int depth_samples, - dReal scale, - dReal offset, - dReal thickness, - int b_wrap); - INLINE void heightfield_data_build_double(dHeightfieldDataID d, - const double* p_height_data, - int b_copy_height_data, - dReal width, - dReal depth, - int width_samples, - int depth_samples, - dReal scale, - dReal offset, - dReal thickness, - int b_wrap); - INLINE void heightfield_data_set_bounds(dHeightfieldDataID d, - dReal min_height, - dReal max_height); - INLINE void heightfield_set_heightfield_data(dHeightfieldDataID d); - -public: - static TypeHandle get_class_type() { - return _type_handle; - } - static void init_type() { - OdeGeom::init_type(); - register_type(_type_handle, "OdeHeightfieldGeom", - OdeGeom::get_class_type()); - } - virtual TypeHandle get_type() const { - return get_class_type(); - } - virtual TypeHandle force_init_type() {init_type(); return get_class_type();} - -private: - static TypeHandle _type_handle; -}; - -#include "odeHeightfieldGeom.I" - -#endif