Rtch/Lephisto
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[Change] Made Ejecta crater lighter than rest of planet.

Browse Source
This commit is contained in:
Rtch90 2017-11-25 16:41:05 +00:00
parent dfc4b31e75
commit 9de8eb3fb9
1 changed files with 4 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/planet.cpp
View File

@ -47,23 +47,6 @@ static void subdivide(vector3d& v1, vector3d& v2, vector3d& v3, vector3d& v4, in
v8.Normalize(); v8.Normalize();
v9.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(v1, v5, v9, v8, depth);
subdivide(v5, v2, v6, v9, depth); subdivide(v5, v2, v6, v9, depth);
subdivide(v9, v6, v3, v7, 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<vector3d>& edgeVerts) { static void SphereBlobTess(vector3d& center, std::vector<vector3d>& edgeVerts) {
const int s = edgeVerts.size(); const int s = edgeVerts.size();
std::vector<char> vDead(s); std::vector<char> vDead(s);
for(unsigned int i = 0; i < vDead.size(); i++) vDead[i] = 0;
//vDead.reserve(s);
int iters = 0; int iters = 0;
int v1 = 0; int v1 = 0;
int v2 = 0; int v2 = 0;
@ -616,6 +597,7 @@ void Planet::DrawRockyPlanet(void) {
float white[4] = { 1, 1, 1, 1 }; float white[4] = { 1, 1, 1, 1 };
ColRangeObj_t barrenBodyCol = { { .3, .3, .3, 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 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) { switch(sbody.type) {
case StarSystem::TYPE_PLANET_DWARF: case StarSystem::TYPE_PLANET_DWARF:
@ -653,6 +635,7 @@ void Planet::DrawRockyPlanet(void) {
DrawCircle(r); DrawCircle(r);
SetMaterialColor(col); SetMaterialColor(col);
} else { } else {
barrenEjectaCraterCol.GenCol(col, rng);
SetMaterialColor(col); SetMaterialColor(col);
DrawEjecta(r*0.6, 3*r, 6); DrawEjecta(r*0.6, 3*r, 6);
SetMaterialColor(col2); SetMaterialColor(col2);