last updates

random stuff
This commit is contained in:
Erik Persson 2013-12-20 11:10:36 +01:00
parent be39365a27
commit d3721fcada
7 changed files with 7946 additions and 2 deletions

8
Bin/Content/crate.mtl Normal file
View File

@ -0,0 +1,8 @@
newmtl matCrateSG
illum 4
Kd 0.00 0.00 0.00
Ka 0.00 0.00 0.00
Tf 1.00 1.00 1.00
map_Kd tex_crate.png
Ni 1.00
Ks 0.50 0.50 0.50

BIN
Bin/Content/crate.png Normal file

Binary file not shown.

After

Width:  |  Height:  |  Size: 4.4 KiB

Binary file not shown.

After

Width:  |  Height:  |  Size: 1.6 MiB

View File

@ -0,0 +1,8 @@
newmtl matWorldSG
illum 4
Kd 0.00 0.00 0.00
Ka 0.00 0.00 0.00
Tf 1.00 1.00 1.00
map_Kd tex_worldDummy.jpg
Ni 1.00
Ks 0.50 0.50 0.50

7928
Bin/Content/worldDummy.obj Normal file

File diff suppressed because it is too large Load Diff

View File

@ -165,7 +165,7 @@ bool GameState::Render()
Oyster::Graphics::API::SetView(privData->view); Oyster::Graphics::API::SetView(privData->view);
Oyster::Graphics::API::SetProjection(privData->proj); Oyster::Graphics::API::SetProjection(privData->proj);
Oyster::Graphics::API::NewFrame(); Oyster::Graphics::API::NewFrame();
for (int i = 0; i < privData->modelCount; i++) for (int i = 0; i < privData->object.size(); i++)
{ {
privData->object[i]->Render(); privData->object[i]->Render();
} }

View File

@ -18,7 +18,7 @@ int WINAPI WinMain( HINSTANCE hinst, HINSTANCE prevInst, PSTR cmdLine, int cmdSh
DanBias::DanBiasGameDesc gameDesc; DanBias::DanBiasGameDesc gameDesc;
gameDesc.port = 15151; gameDesc.port = 15151;
//gameDesc.IP = "193.11.184.196"; //gameDesc.IP = "193.11.184.196";
gameDesc.IP = "193.11.186.101"; gameDesc.IP = "193.11.184.31";
//gameDesc.IP = "127.0.0.1"; //gameDesc.IP = "127.0.0.1";
gameDesc.hinst = hinst; gameDesc.hinst = hinst;
gameDesc.nCmdShow = cmdShow; gameDesc.nCmdShow = cmdShow;