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

fix a few warnings, and matching class/struct in forward declaration

Browse Source
This commit is contained in:
Erwin Coumans
2014-08-22 18:15:17 -07:00
parent 2c19a27694
commit 8e64ee57c9
7 changed files with 12 additions and 12 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
Demos3/AllBullet2Demos/GwenProfileWindow.cpp
View File

@@ -1,3 +1,4 @@
#include "GwenProfileWindow.h"
#include "../GpuDemos/gwenUserInterface.h"
#include "../GpuDemos/gwenInternalData.h"
#include "LinearMath/btQuickprof.h"

3
Demos3/AllBullet2Demos/GwenProfileWindow.h
View File

@@ -1,8 +1,7 @@
#ifndef GWEN_PROFILE_WINDOW_H
#define GWEN_PROFILE_WINDOW_H
struct MyProfileWindow* setupProfileWindow(struct GwenInternalData* data);
class MyProfileWindow* setupProfileWindow(struct GwenInternalData* data);
void processProfileData(MyProfileWindow* window, bool idle);
void profileWindowSetVisible(MyProfileWindow* window, bool visible);
void destroyProfileWindow(MyProfileWindow* window);

2
Demos3/AllBullet2Demos/GwenTextureWindow.cpp
View File

@@ -78,7 +78,7 @@ public:
}
};
struct MyGraphWindow* setupTextureWindow(const MyGraphInput& input)
MyGraphWindow* setupTextureWindow(const MyGraphInput& input)
{
MyGraphWindow* graphWindow = new MyGraphWindow(input);
MyMenuItems2* menuItems = new MyMenuItems2(graphWindow);

2
Demos3/AllBullet2Demos/GwenTextureWindow.h
View File

@@ -25,7 +25,7 @@ struct MyGraphInput
{
}
};
struct MyGraphWindow* setupTextureWindow(const MyGraphInput& input);
class MyGraphWindow* setupTextureWindow(const MyGraphInput& input);
void destroyTextureWindow(MyGraphWindow* window);

4
Demos3/GpuDemos/main_opengl3core.cpp
View File

@@ -55,8 +55,8 @@ bool dump_timings = false;
int maxFrameCount = 102;
extern char OpenSansData[];
extern char* gPairBenchFileName;
extern float shadowMapWidth;
extern float shadowMapHeight;
extern int shadowMapWidth;
extern int shadowMapHeight;
extern bool gDebugLauncherCL;
extern bool gAllowCpuOpenCL;
extern bool gUseLargeBatches;