From 4cae1734025bf125096a8cda4a7ea70f9feb87e9 Mon Sep 17 00:00:00 2001 From: Allanis Date: Sat, 25 Nov 2017 16:41:05 +0000 Subject: [PATCH] [Change] Made Ejecta crater lighter than rest of planet. --- src/planet.cpp | 25 ++++--------------------- 1 file changed, 4 insertions(+), 21 deletions(-) diff --git a/src/planet.cpp b/src/planet.cpp index de6254f..2103eba 100644 --- a/src/planet.cpp +++ b/src/planet.cpp @@ -47,23 +47,6 @@ static void subdivide(vector3d& v1, vector3d& v2, vector3d& v3, vector3d& v4, in v8.Normalize(); v9.Normalize(); - /* XXX WRONG, need to do projection stuff! */ -#if 0 - /* Front-facing. */ - bool ff1, ff2, ff3, ff4, ff5, ff6, ff7, ff8, ff9; - const matrix4x4d& r = L3D::world_view->viewingRotation; - - ff1 = (r*v1).z > 0; - ff2 = (r*v2).z > 0; - ff3 = (r*v3).z > 0; - ff4 = (r*v4).z > 0; - ff5 = (r*v5).z > 0; - ff6 = (r*v6).z > 0; - ff7 = (r*v7).z > 0; - ff8 = (r*v8).z > 0; - ff9 = (r*v9).z > 0; -#endif - subdivide(v1, v5, v9, v8, depth); subdivide(v5, v2, v6, v9, depth); subdivide(v9, v6, v3, v7, depth); @@ -436,8 +419,6 @@ static void SubdivideVeryLongTri(vector3d& tip, vector3d& v1, vector3d& v2, int static void SphereBlobTess(vector3d& center, std::vector& edgeVerts) { const int s = edgeVerts.size(); std::vector vDead(s); - for(unsigned int i = 0; i < vDead.size(); i++) vDead[i] = 0; - //vDead.reserve(s); int iters = 0; int v1 = 0; int v2 = 0; @@ -614,8 +595,9 @@ void Planet::DrawRockyPlanet(void) { float blue[4] = { .2, .2, 1, 1 }; float green[4] = { .2, .8, .2, 1 }; float white[4] = { 1, 1, 1, 1 }; - ColRangeObj_t barrenBodyCol = { { .3, .3, .3, 1 }, { 0, 0, 0, 0 }, .3 }; - ColRangeObj_t barrenContCol = { { .2, .2, .2, 1 }, { 0, 0, 0, 0 }, .3 }; + ColRangeObj_t barrenBodyCol = { { .3, .3, .3, 1 }, { 0, 0, 0, 0 }, .3 }; + ColRangeObj_t barrenContCol = { { .2, .2, .2, 1 }, { 0, 0, 0, 0 }, .3 }; + ColRangeObj_t barrenEjectaCraterCol = { { .5, .5, .5, 1 }, { 0, 0, 0, 0 }, .2 }; switch(sbody.type) { case StarSystem::TYPE_PLANET_DWARF: @@ -653,6 +635,7 @@ void Planet::DrawRockyPlanet(void) { DrawCircle(r); SetMaterialColor(col); } else { + barrenEjectaCraterCol.GenCol(col, rng); SetMaterialColor(col); DrawEjecta(r*0.6, 3*r, 6); SetMaterialColor(col2);