diff --git a/terrain.c b/terrain.c index 12787cc..788d9fb 100644 --- a/terrain.c +++ b/terrain.c @@ -67,33 +67,35 @@ // Generation consts / things for looks #define COLOREDTERRAIN // Some cost, not much #define LANDHEIGHT 4.0 -#define LANDCOL 0xF6D2 // 0xF4E1 +#define LANDCOL 0xF7C3 // 0xF4E1 #define FLANDCOL 0xF260 // 0xF3A0 // 0xF4E1 #define UWLANDCOL 0xF026 #define SEACOL 0xF28D // 0xF26C #define SKYCOL 0xF96E // 0xF77F #define SKYCOL2 0xFFAF // 0xF77F -#define CLOUDCOL 0xFFFF +#define CLOUDCOL 0xFFDE #define TREECOL 0xF070 #define TREETRUNKCOL 0xF950 #define REDFLOWERCOL 0xFF46 // 0xFF9A #define YELLOWFLOWERCOL 0xFEE0 #define TOWERCOL 0xF111 #define LIGHTCOL 0xFF00 +#define SANDCOL 0xFDD8 #define TOWERLOW 0.755 // small changes to this make a huge difference #define TOWERLIGHTMINSIZE (CHUNKSCALE * 0.1) -#define TOWERLIGHTMAXSIZE (CHUNKSCALE * 0.5) +#define TOWERLIGHTMAXSIZE (CHUNKSCALE * 0.3) #define TOWERLIGHTMINTRANS 0 #define TOWERLIGHTMAXTRANS 0.4 #define TOWERLIGHTRATE 1.5 +#define SANDSTART 0.085 #define TREEBOTTOM -0.333 #define TREETRUNKWIDTH 0.2 #define SEATRANS 0.75 #define CLOUDTRANSMIN 0.1 #define CLOUDTRANSMAX 0.2 -#define CLOUDHEIGHT 2 +#define CLOUDHEIGHT 1.8 #define CLOUDSTRETCH 2 -#define CLOUDCHANCE 0.12 +#define CLOUDCHANCE 0.1 #define INIT_LIGHTPITCH (MPI_2 * 1.65) #define INIT_LIGHTYAW (MPI_2 * 0.65) #define INIT_MINLIGHT 0.2 @@ -223,7 +225,7 @@ uint16_t gen_terrain(struct vec3i pos, haloo3d_obj *model, tecs *ecs, (float)i / LCOLSTEP)); // 0xF2C0); landcols[i + LCOLSTEP + 1] = // 0xFDE6 - COMCOL(model, haloo3d_col_lerp(0xFCD5, UWLANDCOL, + COMCOL(model, haloo3d_col_lerp(SANDCOL, UWLANDCOL, (float)i / LCOLSTEP)); // 0xF2C0); } fnl_state ns = fnlCreateState(); @@ -285,7 +287,7 @@ uint16_t gen_terrain(struct vec3i pos, haloo3d_obj *model, tecs *ecs, float nlayer = fnlGetNoise2D(&ns, noisex + model->vertices[tfvi].x, noisey + model->vertices[tfvi].z); int landcol; - if (highys[t] < 0.085) { + if (highys[t] < SANDSTART) { landcol = LCOLSTEP + 1 + LCOLSTEP * fabs(highys[t]); } else { landcol = LCOLSTEP * fabs(lowys[t]) * (1 + nlayer) * 0.5;