add commandline arguments to serialize demo for xml export and Bullet import file name

update AntTweakBar version in CDTestFramework
add btCompoundShape support in BulletXmlWorldImporter (this importer is still premature/work-in-progress)
This commit is contained in:
erwin.coumans
2012-09-26 19:47:18 +00:00
parent 60c1b1918a
commit 4442a826ed
85 changed files with 59310 additions and 18485 deletions

View File

@@ -1,16 +1,14 @@
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
//
// @file TwPrecomp.h
// @brief Precompiled header
// @author Philippe Decaudin - http://www.antisphere.com
// @file TwPrecomp.h
// @brief Precompiled header
// @author Philippe Decaudin - http://www.antisphere.com
// @license This file is part of the AntTweakBar library.
// Copyright © 2005, 2006 Philippe Decaudin.
// For conditions of distribution and use, see License.txt
//
// notes: Private header
// TAB=4
// note: Private header
//
// ---------------------------------------------------------------------------
// ---------------------------------------------------------------------------
#if !defined ANT_TW_PRECOMP_INCLUDED
@@ -18,48 +16,78 @@
#if defined _MSC_VER
# pragma warning(disable: 4514) // unreferenced inline function has been removed
# pragma warning(disable: 4710) // function not inlined
# pragma warning(disable: 4786) // template name truncated
# pragma warning(disable: 4530) // exceptions not handled
# define _CRT_SECURE_NO_DEPRECATE // visual 8 secure crt warning
# pragma warning(disable: 4514) // unreferenced inline function has been removed
# pragma warning(disable: 4710) // function not inlined
# pragma warning(disable: 4786) // template name truncated
# pragma warning(disable: 4530) // exceptions not handled
# define _CRT_SECURE_NO_DEPRECATE // visual 8 secure crt warning
#endif
#include <stdio.h>
#include <assert.h>
#include <math.h>
#include <float.h>
#include <cstdio>
#include <cassert>
#include <cmath>
#include <cfloat>
#include <cstring>
#include <cstdlib>
#include <memory.h>
#if defined(_MSC_VER) && _MSC_VER<=1200
# pragma warning(push, 3)
# pragma warning(push, 3)
#endif
#include <string>
#include <sstream>
#include <vector>
#include <map>
#include <list>
#include <set>
#if defined(_MSC_VER) && _MSC_VER<=1200
# pragma warning(pop)
# pragma warning(pop)
#endif
#if defined(_UNIX)
# define ANT_UNIX
# include <X11/cursorfont.h>
# include <GL/glx.h>
# undef _WIN32
# undef WIN32
# undef _WIN64
# undef WIN64
# undef _WINDOWS
# undef ANT_WINDOWS
# define ANT_UNIX
# include <X11/cursorfont.h>
# define GLX_GLXEXT_LEGACY
# include <GL/glx.h>
# include <X11/Xatom.h>
# include <unistd.h>
# include <malloc.h>
# undef _WIN32
# undef WIN32
# undef _WIN64
# undef WIN64
# undef _WINDOWS
# undef ANT_WINDOWS
# undef ANT_OSX
#elif defined(_MACOSX)
# define ANT_OSX
# include <unistd.h>
# include <Foundation/Foundation.h>
# include <AppKit/NSImage.h>
# include <AppKit/NSCursor.h>
# undef _WIN32
# undef WIN32
# undef _WIN64
# undef WIN64
# undef _WINDOWS
# undef ANT_WINDOWS
# undef ANT_UNIX
#elif defined(_WINDOWS) || defined(WIN32) || defined(WIN64) || defined(_WIN32) || defined(_WIN64)
# define ANT_WINDOWS
# define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
# include <windows.h>
# include <shellapi.h>
#endif // defined _WINDOWS
# define ANT_WINDOWS
# ifndef WIN32_LEAN_AND_MEAN
# define WIN32_LEAN_AND_MEAN // Exclude rarely-used stuff from Windows headers
# endif
# include <windows.h>
# include <shellapi.h>
#endif
#include <GL/gl.h> // must be included after windows.h
#define ANT_OGL_HEADER_INCLUDED
#if !defined(ANT_OGL_HEADER_INCLUDED)
# if defined(ANT_OSX)
# include <OpenGL/gl.h>
# else
# include <GL/gl.h> // must be included after windows.h
# endif
# define ANT_OGL_HEADER_INCLUDED
#endif
#endif // !defined ANT_TW_PRECOMP_INCLUDED
#endif // !defined ANT_TW_PRECOMP_INCLUDED