/Graphics Fixed stable pipeline with no warnings
This commit is contained in:
parent
faa6efba57
commit
ab0b9a925a
|
@ -88,6 +88,7 @@ namespace Oyster
|
||||||
Model::ModelInfo* mi = (Model::ModelInfo*)m->info;
|
Model::ModelInfo* mi = (Model::ModelInfo*)m->info;
|
||||||
if(mi->Vertices->GetBufferPointer() == NULL)
|
if(mi->Vertices->GetBufferPointer() == NULL)
|
||||||
{
|
{
|
||||||
|
delete m;
|
||||||
return NULL;
|
return NULL;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
|
@ -161,10 +161,10 @@ HRESULT InitDirect3D()
|
||||||
|
|
||||||
m = Oyster::Graphics::API::CreateModel(L"crate2");
|
m = Oyster::Graphics::API::CreateModel(L"crate2");
|
||||||
if(m==NULL)
|
if(m==NULL)
|
||||||
m = Oyster::Graphics::API::CreateModel(L"crate");
|
m = Oyster::Graphics::API::CreateModel(L"christmastree");
|
||||||
m2 = Oyster::Graphics::API::CreateModel(L"crate");
|
m2 = Oyster::Graphics::API::CreateModel(L"christmastree");
|
||||||
m2->WorldMatrix = Oyster::Math3D::OrientationMatrix(Oyster::Math::Float3::null,Oyster::Math::Float3(0,5,0),Oyster::Math::Float3::null);
|
m2->WorldMatrix = Oyster::Math3D::OrientationMatrix(Oyster::Math::Float3::null,Oyster::Math::Float3(0,5,0),Oyster::Math::Float3::null);
|
||||||
m3 = Oyster::Graphics::API::CreateModel(L"crate");
|
m3 = Oyster::Graphics::API::CreateModel(L"christmastree");
|
||||||
m3->WorldMatrix = Oyster::Math3D::OrientationMatrix(Oyster::Math::Float3::null,Oyster::Math::Float3(0,5,0),Oyster::Math::Float3::null);
|
m3->WorldMatrix = Oyster::Math3D::OrientationMatrix(Oyster::Math::Float3::null,Oyster::Math::Float3(0,5,0),Oyster::Math::Float3::null);
|
||||||
|
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue