From 4ab4fc8bb1a4064fe65b00d01a80b5842b0adaa5 Mon Sep 17 00:00:00 2001 From: ejcoumans Date: Thu, 9 Nov 2006 15:27:02 +0000 Subject: [PATCH] Integrated fixes for Solaris from Noerghel, http://continuousphysics.com/Bullet/phpBB2/viewtopic.php?t=673 --- Demos/Raytracer/Raytracer.cpp | 6 +++--- Demos/VehicleDemo/VehicleDemo.cpp | 4 +++- .../BroadphaseCollision/btSimpleBroadphase.cpp | 1 + src/LinearMath/btQuickprof.h | 4 ++++ 4 files changed, 11 insertions(+), 4 deletions(-) diff --git a/Demos/Raytracer/Raytracer.cpp b/Demos/Raytracer/Raytracer.cpp index 6d536a114..8fedad867 100644 --- a/Demos/Raytracer/Raytracer.cpp +++ b/Demos/Raytracer/Raytracer.cpp @@ -73,8 +73,8 @@ renderTexture* raytracePicture = 0; //this applies to the raytracer virtual screen/image buffer int screenWidth = 128; -float aspectRatio = (3.f/4.f); -int screenHeight = screenWidth * aspectRatio; +//float aspectRatio = (3.f/4.f); +int screenHeight = 128;//screenWidth * aspectRatio; GLuint glTextureId; btSphereShape mySphere(1); @@ -99,7 +99,7 @@ int main(int argc,char** argv) raytraceDemo->setCameraDistance(6.f); - return glutmain(argc, argv,640,480,"Bullet GJK Implicit Shape Raytracer Demo",raytraceDemo); + return glutmain(argc, argv,640,640,"Bullet GJK Implicit Shape Raytracer Demo",raytraceDemo); } void Raytracer::initPhysics() diff --git a/Demos/VehicleDemo/VehicleDemo.cpp b/Demos/VehicleDemo/VehicleDemo.cpp index 1d3d7915d..daa025120 100644 --- a/Demos/VehicleDemo/VehicleDemo.cpp +++ b/Demos/VehicleDemo/VehicleDemo.cpp @@ -15,7 +15,9 @@ subject to the following restrictions: /// September 2006: VehicleDemo is work in progress, this file is mostly just a placeholder /// This VehicleDemo file is very early in development, please check it later - +/// One todo is a basic engine model: +/// A function that maps user input (throttle) into torque/force applied on the wheels +/// with gears etc. #include "btBulletDynamicsCommon.h" diff --git a/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp b/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp index 1a24c7a7a..6281e93ee 100644 --- a/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp +++ b/src/BulletCollision/BroadphaseCollision/btSimpleBroadphase.cpp @@ -101,6 +101,7 @@ protected: virtual bool processOverlap(btBroadphasePair& pair) { assert(0); + return false; } }; diff --git a/src/LinearMath/btQuickprof.h b/src/LinearMath/btQuickprof.h index 801ef07a9..90e1f421f 100644 --- a/src/LinearMath/btQuickprof.h +++ b/src/LinearMath/btQuickprof.h @@ -46,6 +46,10 @@ typedef uint64_t __int64; #endif +#if defined (SUNOS) || defined (__SUNOS__) + #include +#endif + #if defined(WIN32) || defined(_WIN32) #define USE_WINDOWS_TIMERS #include