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

add missing files, and make some functions virtual to allow compilation

Browse Source
This commit is contained in:
Erwin Coumans
2013-03-16 10:14:07 -07:00
parent d91d18b5f5
commit 74a422dfa9
2 changed files with 5 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
demo/gpudemo/premake4.lua
View File

@@ -65,6 +65,9 @@ function createProject(vendor)
"../../opencl/parallel_primitives/host/btPrefixScanCL.h", "../../opencl/parallel_primitives/host/btPrefixScanCL.h",
"../../opencl/parallel_primitives/host/btRadixSort32CL.cpp", "../../opencl/parallel_primitives/host/btRadixSort32CL.cpp",
"../../opencl/parallel_primitives/host/btRadixSort32CL.h", "../../opencl/parallel_primitives/host/btRadixSort32CL.h",
"../../opencl/gpu_rigidbody/host/**.cpp",
"../../opencl/gpu_rigidbody/host/**.h",
} }
if os.is("Windows") then if os.is("Windows") then

4
opencl/gpu_rigidbody/host/btTypedConstraint.h
View File

@@ -322,10 +322,10 @@ public:
///return the local value of parameter ///return the local value of parameter
virtual btScalar getParam(int num, int axis = -1) const = 0; virtual btScalar getParam(int num, int axis = -1) const = 0;
virtual int calculateSerializeBufferSize() const; virtual int calculateSerializeBufferSize() const=0;
///fills the dataBuffer and returns the struct name (and 0 on failure) ///fills the dataBuffer and returns the struct name (and 0 on failure)
virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const; virtual const char* serialize(void* dataBuffer, btSerializer* serializer) const=0;
}; };