[Freeciv-Dev] (PR#9799) PATCH: rewrited adjust_map()
[Top] [All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index] [Thread Index]
To: |
undisclosed-recipients: ; |
Subject: |
[Freeciv-Dev] (PR#9799) PATCH: rewrited adjust_map() |
From: |
"Marcelo Burda" <mburda@xxxxxxxxx> |
Date: |
Fri, 27 Aug 2004 05:45:15 -0700 |
Reply-to: |
rt@xxxxxxxxxxx |
<URL: http://rt.freeciv.org/Ticket/Display.html?id=9799 >
FIX
mountains, void, capitals in var of mactros
+ best comment
Marcelo
diff -ruN -Xfreeciv/diff_ignore freeciv/server/mapgen.c freeciv_/server/mapgen.c
--- freeciv/server/mapgen.c 2004-08-27 12:14:41.190951440 +0200
+++ freeciv_/server/mapgen.c 2004-08-27 12:35:12.403778640 +0200
@@ -63,7 +63,7 @@
static void mapgenerator4(void);
static void mapgenerator5(void);
static void smooth_map(void);
-static void adjust_map(void);
+static void adjust_hmap(void);
static void adjust_terrain_param(void);
#define RIVERS_MAXTRIES 32767
@@ -76,7 +76,8 @@
static int *river_map;
static int *height_map;
-static int maxval=0;
+static const int maxval = 1000;
+static int seaval=0, mountainsval =0;
static int forests=0;
struct isledata {
@@ -99,6 +100,17 @@
? MAX_TEMP * (3 + 2 * SQSIZE) / (100 * SQSIZE) \
: 5 * MAX_TEMP / 100 /* 5% for all maps */)
+/********************************************************************
+ * used to initialize a array with some value
+ ********************************************************************/
+#define INITIALIZE_ARRAY(_a, _size, _val) \
+ { \
+ int _ini_index = 0; \
+ for(; _ini_index < (_size);_ini_index++) { \
+ (_a)[_ini_index] = (_val); \
+ } \
+ }
+
/****************************************************************************
Returns the temperature of this map position. This is a value in the
range of 0 to MAX_TEMP (inclusive).
@@ -286,28 +298,11 @@
the map.mountains value, so increase map.mountains and you'll get more
hills and mountains (and vice versa).
**************************************************************************/
-static void make_mountains(int thill)
+static void make_mountains(void)
{
- int mount;
- int j;
-
- for (j = 0; j < 10; j++) {
- mount = 0;
- whole_map_iterate(x, y) {
- if (hmap(x, y) > thill) {
- mount++;
- }
- } whole_map_iterate_end;
- if (mount < (map_num_tiles() * map.mountains) / 1000) {
- thill *= 95;
- } else {
- thill *= 105;
- }
- thill /= 100;
- }
-
+ mountainsval = ((maxval - seaval)* (100 - map.mountains)) / 100 + seaval;
whole_map_iterate(x, y) {
- if (hmap(x, y) > thill && !is_ocean(map_get_terrain(x,y))) {
+ if (hmap(x, y) > mountainsval && !is_ocean(map_get_terrain(x,y))) {
/* Randomly place hills and mountains on "high" tiles. But don't
* put hills near the poles (they're too green). */
if (myrand(100) > 75
@@ -1123,37 +1118,20 @@
**************************************************************************/
static void make_land(void)
{
- int tres;
- int count=0;
- int total = (map_num_tiles() * map.landpercent) / 100;
- int forever=0;
-
- adjust_map();
+ adjust_hmap();
normalize_hmap_poles();
- tres = (maxval * map.landpercent) / 100;
-
- do {
- forever++;
- if (forever>50) break; /* loop elimination */
- count=0;
- whole_map_iterate(x, y) {
- if (hmap(x, y) < tres)
- map_set_terrain(x, y, T_OCEAN);
- else {
- map_set_terrain(x, y, T_GRASSLAND);
- count++;
- }
- } whole_map_iterate_end;
- if (count>total)
- tres*=11;
- else
- tres*=9;
- tres/=10;
- } while (abs(total-count)> maxval/40);
+ seaval = (maxval *(100 - map.landpercent)) / 100;
+ whole_map_iterate(x, y) {
+ if (hmap(x, y) < seaval)
+ map_set_terrain(x, y, T_OCEAN);
+ else {
+ map_set_terrain(x, y, T_GRASSLAND);
+ }
+ } whole_map_iterate_end;
renormalize_hmap_poles();
make_polar_land(); /* make extra land at poles*/
- make_mountains(maxval*8/10);
+ make_mountains();
make_arctic();
make_tundra();
make_forests();
@@ -1630,25 +1608,44 @@
}
/**************************************************************************
- Adjust the map so that its minimum height is 0. This raises or lowers
- every position by a fixed amount and sets the "maxval" global variable
- to hold the maximum height.
+ Adjust the hmap to be a linearize distribution of heights
+ form 0 to maxval (maxval is a global const )
+
+ ( hmap[x,y] < 0.13 * maxval) handle the 13% lowerest part of the map
+ slope can globaly be estiamted as maxval*sqrt(num_of_isles)/linear_size
**************************************************************************/
-static void adjust_map(void)
+static void adjust_hmap(void)
{
- int minval = maxval = hnat(0, 0);
+ int i, min = hnat(0, 0), max = min;
+ int count=0, f[maxval];
+
+ INITIALIZE_ARRAY(f,maxval,0);
/* Determine minimum and maximum heights. */
whole_map_iterate(x, y) {
- maxval = MAX(maxval, hmap(x, y));
- minval = MIN(minval, hmap(x, y));
+ max = MAX(max, hmap(x, y));
+ min = MIN(min, hmap(x, y));
} whole_map_iterate_end;
- /* Translate heights so the minimum height is 0. */
- maxval -= minval;
+ /* Translate heights so the minimum height is 0 and maximum is maxval.
+ and count the number of accurnecies in all values */
+ max -= min;
whole_map_iterate(x, y) {
- hmap(x, y) -= minval;
+ hmap(x, y) = (hmap(x, y) - min) * maxval;
+ hmap(x, y) /= max;
+ f[hmap(x, y)]++;
} whole_map_iterate_end;
+
+ /* create the linearize function as a incremental occurrencies count */
+ for(i = -1; i++ < maxval;) {
+ count += f[i];
+ f[i] = (count * maxval) / (map.xsize * map.ysize) ;
+ }
+
+ /* apply the linearize function */
+ whole_map_iterate(x, y) {
+ hmap(x, y) = f[hmap(x, y)];
+ } whole_map_iterate_end;
}
/**************************************************************************
- [Freeciv-Dev] Re: (PR#9799) PATCH: rewrited adjust_map(), Marcelo Burda, 2004/08/25
- [Freeciv-Dev] (PR#9799) PATCH: rewrited adjust_map(), Marcelo Burda, 2004/08/25
- [Freeciv-Dev] Re: (PR#9799) PATCH: rewrited adjust_map(), Jason Short, 2004/08/26
- [Freeciv-Dev] (PR#9799) PATCH: rewrited adjust_map(), Marcelo Burda, 2004/08/27
- [Freeciv-Dev] (PR#9799) PATCH: rewrited adjust_map(),
Marcelo Burda <=
- [Freeciv-Dev] (PR#9799) PATCH: rewrited adjust_map(), Marcelo Burda, 2004/08/31
- [Freeciv-Dev] (PR#9799) PATCH: rewrited adjust_map(), Mateusz Stefek, 2004/08/31
- [Freeciv-Dev] Re: (PR#9799) PATCH: rewrited adjust_map(), Marcelo Burda, 2004/08/31
- [Freeciv-Dev] Re: (PR#9799) PATCH: rewrited adjust_map(), Jason Short, 2004/08/31
- [Freeciv-Dev] Re: (PR#9799) PATCH: rewrited adjust_map(), Jason Short, 2004/08/31
- [Freeciv-Dev] Re: (PR#9799) PATCH: rewrited adjust_map(), Jason Short, 2004/08/31
- [Freeciv-Dev] Re: (PR#9799) PATCH: rewrited adjust_map(), Marcelo Burda, 2004/08/31
- [Freeciv-Dev] (PR#9799) PATCH: rewrited adjust_map(), Mateusz Stefek, 2004/08/31
- [Freeciv-Dev] Re: (PR#9799) PATCH: rewrited adjust_map(), Marcelo Burda, 2004/08/31
- [Freeciv-Dev] (PR#9799) PATCH: rewrited adjust_map(), Mateusz Stefek, 2004/08/31
|
|