Commit 5bc3a4b4 authored by Martin Turski's avatar Martin Turski

Merge branch 'master' of http://tohjo.eu/amd-design/krtcore

parents 6d94c9d3 02e1d92a
Pipeline #69 skipped
...@@ -48,6 +48,7 @@ void* InitializeD3D(HWND hWnd, int width, int height) ...@@ -48,6 +48,7 @@ void* InitializeD3D(HWND hWnd, int width, int height)
// store device // store device
rw::d3d::device = devicePtr; rw::d3d::device = devicePtr;
rw::d3d::isP8supported = false;
return devicePtr; return devicePtr;
} }
......
...@@ -112,7 +112,10 @@ void Camera::BeginUpdate( void *gpuContext ) ...@@ -112,7 +112,10 @@ void Camera::BeginUpdate( void *gpuContext )
device->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE); device->SetRenderState(D3DRS_CULLMODE, D3DCULL_NONE);
device->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA); device->SetRenderState(D3DRS_SRCBLEND, D3DBLEND_SRCALPHA);
device->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA); device->SetRenderState(D3DRS_DESTBLEND, D3DBLEND_INVSRCALPHA);
device->SetRenderState(D3DRS_ALPHABLENDENABLE, 1); device->SetRenderState(D3DRS_ALPHABLENDENABLE, 0);
device->SetRenderState(D3DRS_ALPHATESTENABLE, 1);
device->SetRenderState(D3DRS_ALPHAREF, 128);
device->SetRenderState(D3DRS_ALPHAFUNC, D3DCMP_GREATEREQUAL);
device->SetTextureStageState(0, D3DTSS_ALPHAOP, D3DTOP_MODULATE); device->SetTextureStageState(0, D3DTSS_ALPHAOP, D3DTOP_MODULATE);
// Set projection stuff. // Set projection stuff.
......
...@@ -39,6 +39,12 @@ void GameUniverse::Load() ...@@ -39,6 +39,12 @@ void GameUniverse::Load()
vfs::DevicePtr device = std::make_shared<vfs::RelativeDevice>(m_configuration.rootPath); vfs::DevicePtr device = std::make_shared<vfs::RelativeDevice>(m_configuration.rootPath);
vfs::Mount(device, GetMountPoint()); vfs::Mount(device, GetMountPoint());
// load generic.txd if the game has one
if (m_configuration.gameName == "gta3" || m_configuration.gameName == "gtavc")
{
m_game->GetTextureManager().RegisterResource("generic", device, GetMountPoint() + "models/generic.txd");
}
// enqueue pre-cached IMG files // enqueue pre-cached IMG files
for (const auto& imageFile : m_configuration.imageFiles) for (const auto& imageFile : m_configuration.imageFiles)
{ {
......
...@@ -57,8 +57,8 @@ void World::PutEntitiesOnGrid( void ) ...@@ -57,8 +57,8 @@ void World::PutEntitiesOnGrid( void )
// Try putting all the world entities on the grid. // Try putting all the world entities on the grid.
LIST_FOREACH_BEGIN( Entity, this->entityList.root, worldNode ) LIST_FOREACH_BEGIN( Entity, this->entityList.root, worldNode )
// ignore LODs and transparent models (the latter as there's no depth sorting yet) // ignore LODs
if (item->GetModelInfo() && item->GetModelInfo()->GetLODDistance() < 300.0f && (item->GetModelInfo()->GetFlags() & 12) == 0) if (item->GetModelInfo() && item->GetModelInfo()->GetLODDistance() < 300.0f)
{ {
this->staticEntityGrid.PutEntity(item); this->staticEntityGrid.PutEntity(item);
} }
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment