Integrated fixes for Solaris from Noerghel, http://continuousphysics.com/Bullet/phpBB2/viewtopic.php?t=673
This commit is contained in:
@@ -73,8 +73,8 @@ renderTexture* raytracePicture = 0;
|
|||||||
|
|
||||||
//this applies to the raytracer virtual screen/image buffer
|
//this applies to the raytracer virtual screen/image buffer
|
||||||
int screenWidth = 128;
|
int screenWidth = 128;
|
||||||
float aspectRatio = (3.f/4.f);
|
//float aspectRatio = (3.f/4.f);
|
||||||
int screenHeight = screenWidth * aspectRatio;
|
int screenHeight = 128;//screenWidth * aspectRatio;
|
||||||
GLuint glTextureId;
|
GLuint glTextureId;
|
||||||
|
|
||||||
btSphereShape mySphere(1);
|
btSphereShape mySphere(1);
|
||||||
@@ -99,7 +99,7 @@ int main(int argc,char** argv)
|
|||||||
|
|
||||||
raytraceDemo->setCameraDistance(6.f);
|
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()
|
void Raytracer::initPhysics()
|
||||||
|
|||||||
@@ -15,7 +15,9 @@ subject to the following restrictions:
|
|||||||
|
|
||||||
/// September 2006: VehicleDemo is work in progress, this file is mostly just a placeholder
|
/// 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
|
/// 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"
|
#include "btBulletDynamicsCommon.h"
|
||||||
|
|
||||||
|
|
||||||
|
|||||||
@@ -101,6 +101,7 @@ protected:
|
|||||||
virtual bool processOverlap(btBroadphasePair& pair)
|
virtual bool processOverlap(btBroadphasePair& pair)
|
||||||
{
|
{
|
||||||
assert(0);
|
assert(0);
|
||||||
|
return false;
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
@@ -46,6 +46,10 @@
|
|||||||
typedef uint64_t __int64;
|
typedef uint64_t __int64;
|
||||||
#endif
|
#endif
|
||||||
|
|
||||||
|
#if defined (SUNOS) || defined (__SUNOS__)
|
||||||
|
#include <stdio.h>
|
||||||
|
#endif
|
||||||
|
|
||||||
#if defined(WIN32) || defined(_WIN32)
|
#if defined(WIN32) || defined(_WIN32)
|
||||||
#define USE_WINDOWS_TIMERS
|
#define USE_WINDOWS_TIMERS
|
||||||
#include <windows.h>
|
#include <windows.h>
|
||||||
|
|||||||
Reference in New Issue
Block a user