mirror of
https://github.com/TorqueGameEngines/Torque3D.git
synced 2026-07-15 08:34:40 +00:00
update bullet so it actually works
Moved the addSourceDirectory for physics/Bullet into the Engine/Source/CMakeLists.txt file that way it can actually appear where we expect it to in the solution explorer.
This commit is contained in:
parent
c7be48130a
commit
13fa178cf6
5986 changed files with 1811270 additions and 453803 deletions
|
|
@ -15,43 +15,43 @@
|
|||
|
||||
namespace Gwen
|
||||
{
|
||||
//
|
||||
// Texture
|
||||
//
|
||||
struct Texture
|
||||
//
|
||||
// Texture
|
||||
//
|
||||
struct Texture
|
||||
{
|
||||
TextObject name;
|
||||
void* data;
|
||||
int m_intData;
|
||||
|
||||
bool failed;
|
||||
int width;
|
||||
int height;
|
||||
|
||||
Texture()
|
||||
{
|
||||
TextObject name;
|
||||
void* data;
|
||||
int m_intData;
|
||||
|
||||
bool failed;
|
||||
int width;
|
||||
int height;
|
||||
data = NULL;
|
||||
m_intData = 0;
|
||||
width = 4;
|
||||
height = 4;
|
||||
failed = false;
|
||||
}
|
||||
|
||||
Texture()
|
||||
{
|
||||
data = NULL;
|
||||
m_intData = 0;
|
||||
width = 4;
|
||||
height = 4;
|
||||
failed = false;
|
||||
}
|
||||
~Texture()
|
||||
{
|
||||
}
|
||||
|
||||
~Texture()
|
||||
{
|
||||
}
|
||||
void Load(const TextObject& str, Gwen::Renderer::Base* render)
|
||||
{
|
||||
name = str;
|
||||
render->LoadTexture(this);
|
||||
}
|
||||
|
||||
void Load( const TextObject& str, Gwen::Renderer::Base* render )
|
||||
{
|
||||
name = str;
|
||||
render->LoadTexture( this );
|
||||
}
|
||||
void Release(Gwen::Renderer::Base* render)
|
||||
{
|
||||
render->FreeTexture(this);
|
||||
}
|
||||
};
|
||||
|
||||
void Release( Gwen::Renderer::Base* render )
|
||||
{
|
||||
render->FreeTexture( this );
|
||||
}
|
||||
};
|
||||
|
||||
}
|
||||
} // namespace Gwen
|
||||
#endif
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue