Skip to content

Commit

Permalink
Added final models
Browse files Browse the repository at this point in the history
  • Loading branch information
alekasm committed Jan 18, 2021
1 parent 29740e8 commit fd51862
Show file tree
Hide file tree
Showing 7 changed files with 4 additions and 26 deletions.
27 changes: 1 addition & 26 deletions SC2KRender/Scene.cpp
Original file line number Diff line number Diff line change
Expand Up @@ -799,31 +799,8 @@ void Scene::MultiplyMovementSpeed(float value)
void Scene::SetRenderModels(bool value)
{
render_models = value;
for (unsigned int y = 0; y < TILES_DIMENSION; ++y)
{
for (unsigned int x = 0; x < TILES_DIMENSION; ++x)
{
const MapSceneTile* t = tiles[x + TILES_DIMENSION * y];
if (XBLD_IS_HYDROELECTRIC(t->map_tile->xbld))
{
if (t->map_tile->xter == XTER_WATERFALL)
{
if (render_models)
{
//t.SetHeight(t.map_tile->height);
}
else
{
//t.FillAttributes(t.map_tile);
}

}
}
}
}
}


void Scene::Render()
{

Expand All @@ -835,10 +812,8 @@ void Scene::Render()

if (render_scene)
{

if (render_models)
{

Matrix view_proj = m_view * m_proj;
Plane frustum_planes[6];

Expand Down Expand Up @@ -945,7 +920,7 @@ void Scene::Render()
for (const QuadSceneTile* qst : fill_tiles)
{
m_batch->DrawQuad(qst->vpc[0], qst->vpc[1], qst->vpc[2], qst->vpc[3]);
}
}

for (unsigned int i = 0; i < ARRAY_LENGTH; ++i)
{
Expand Down
3 changes: 3 additions & 0 deletions SC2KRender/assets/assetmap.cfg
Original file line number Diff line number Diff line change
Expand Up @@ -249,6 +249,9 @@
250,250_desalination
251,251_plymouth_arc
252,252_forest_arc
253,253_darco_arc
254,254_launch_arc
255,255_braun_llama_dome
306,306_tree_trunks
307,307_tree_trunks
308,308_tree_trunks
Expand Down
Binary file modified SC2KRender/assets/models/223_pier.cmo
Binary file not shown.
Binary file modified SC2KRender/assets/models/233_subway_station.cmo
Binary file not shown.
Binary file added SC2KRender/assets/models/253_darco_arc.cmo
Binary file not shown.
Binary file added SC2KRender/assets/models/254_launch_arc.cmo
Binary file not shown.
Binary file not shown.

0 comments on commit fd51862

Please sign in to comment.