Bart/bullet3
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

fix compile issue(s) in BT_USE_DOUBLE_PRECISION mode

Browse Source
This commit is contained in:
Erwin Coumans
2016-05-26 18:21:57 -07:00
parent 0d50d8c73b
commit 098e0158ea
3 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
examples/StandaloneMain/main_tinyrenderer_single_example.cpp
View File

@@ -170,7 +170,7 @@ struct TinyRendererGUIHelper : public GUIHelperInterface
clearBuffers(clearColor); clearBuffers(clearColor);
ATTRIBUTE_ALIGNED16(float modelMat[16]); ATTRIBUTE_ALIGNED16(btScalar modelMat[16]);
ATTRIBUTE_ALIGNED16(float viewMat[16]); ATTRIBUTE_ALIGNED16(float viewMat[16]);
ATTRIBUTE_ALIGNED16(float projMat[16]); ATTRIBUTE_ALIGNED16(float projMat[16]);
@@ -178,7 +178,7 @@ struct TinyRendererGUIHelper : public GUIHelperInterface
m_camera.getCameraViewMatrix(viewMat); m_camera.getCameraViewMatrix(viewMat);
btVector3 lightDirWorld(-5,200,-40); btVector3 lightDirWorld(-5,200,-40);
switch (1)//app->getUpAxis()) switch (m_upAxis)
{ {
case 1: case 1:
lightDirWorld = btVector3(-50.f,100,30); lightDirWorld = btVector3(-50.f,100,30);

2
src/BulletDynamics/ConstraintSolver/btSliderConstraint.h
View File

@@ -25,6 +25,8 @@ TODO:
#ifndef BT_SLIDER_CONSTRAINT_H #ifndef BT_SLIDER_CONSTRAINT_H
#define BT_SLIDER_CONSTRAINT_H #define BT_SLIDER_CONSTRAINT_H
#include "LinearMath/btScalar.h"//for BT_USE_DOUBLE_PRECISION
#ifdef BT_USE_DOUBLE_PRECISION #ifdef BT_USE_DOUBLE_PRECISION
#define btSliderConstraintData2 btSliderConstraintDoubleData #define btSliderConstraintData2 btSliderConstraintDoubleData
#define btSliderConstraintDataName "btSliderConstraintDoubleData" #define btSliderConstraintDataName "btSliderConstraintDoubleData"

1
src/LinearMath/btScalar.h
View File

@@ -17,6 +17,7 @@ subject to the following restrictions:
#ifndef BT_SCALAR_H #ifndef BT_SCALAR_H
#define BT_SCALAR_H #define BT_SCALAR_H
#ifdef BT_MANAGED_CODE #ifdef BT_MANAGED_CODE
//Aligned data types not supported in managed code //Aligned data types not supported in managed code
#pragma unmanaged #pragma unmanaged