1 | /* |
1 | /* |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
2 | * This file is part of Deliantra, the Roguelike Realtime MMORPG. |
3 | * |
3 | * |
4 | * Copyright (©) 2011 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
4 | * Copyright (©) 2011,2012 Marc Alexander Lehmann / Robin Redeker / the Deliantra team |
5 | * |
5 | * |
6 | * Deliantra is free software: you can redistribute it and/or modify it under |
6 | * Deliantra is free software: you can redistribute it and/or modify it under |
7 | * the terms of the Affero GNU General Public License as published by the |
7 | * the terms of the Affero GNU General Public License as published by the |
8 | * Free Software Foundation, either version 3 of the License, or (at your |
8 | * Free Software Foundation, either version 3 of the License, or (at your |
9 | * option) any later version. |
9 | * option) any later version. |
… | |
… | |
52 | |
52 | |
53 | if (wall->flag [FLAG_IS_QUAD] && visible) |
53 | if (wall->flag [FLAG_IS_QUAD] && visible) |
54 | { |
54 | { |
55 | maptile *m = wall->map; |
55 | maptile *m = wall->map; |
56 | |
56 | |
57 | if (m->tile_path [TILE_UP]) |
57 | if (ob->map->tile_path [TILE_UP] && wall->map->tile_path [TILE_UP]) |
|
|
58 | { |
58 | if (maptile *up = m->tile_available (TILE_UP)) |
59 | maptile *wall_up = wall->map->tile_available (TILE_UP); |
|
|
60 | maptile *ob_up = ob ->map->tile_available (TILE_UP); |
|
|
61 | |
|
|
62 | if (wall_up && ob_up) |
59 | { |
63 | { |
60 | if (ob->blocked (up, ob->x, ob->y) || has_floor (up, ob->x, ob->y)) |
64 | if (ob->blocked (ob_up, ob->x, ob->y) || has_floor (ob_up, ob->x, ob->y)) |
61 | ob->failmsg (format ("Ouch, you hit your head while climbing the %s! H<Didn't you see the ceiling?>", query_name (wall))); |
65 | ob->failmsg (format ("Ouch, you hit your head while climbing the %s! H<Didn't you see the ceiling? :)>", query_name (wall))); |
62 | //TODO: reduce health |
66 | //TODO: reduce health |
63 | else if (ob->blocked (up, wall->x, wall->y)) |
67 | else if (ob->blocked (wall_up, wall->x, wall->y)) |
64 | ob->failmsg (format ("You try to climb up, but the %s is too high for you!", query_name (wall))); |
68 | ob->failmsg (format ("You try to climb up, but the %s is too high for you! H<No free space on top of this block.>", query_name (wall))); |
65 | //TODO: reduce health |
69 | //TODO: reduce health |
66 | else |
70 | else |
67 | { |
71 | { |
68 | ob->statusmsg (format ("You successfully climb up the %s.", query_name (wall))); |
72 | ob->statusmsg (format ("You successfully climb up the %s.", query_name (wall))); |
69 | // here we assume that ob is a player... |
73 | // here we assume that ob is a player... |
70 | ob->enter_map (up, wall->x, wall->y); |
74 | ob->enter_map (wall_up, wall->x, wall->y); |
71 | } |
75 | } |
72 | } |
76 | } |
73 | else |
77 | else |
74 | ob->failmsg (format ("You try to climb the %s, but you fall down! H<Try again.>", query_name (wall))); |
78 | ob->failmsg (format ("You try to climb the %s, but you fall down! H<Try again.>", query_name (wall))); |
|
|
79 | } |
75 | else |
80 | else |
76 | ob->failmsg (format ("You fail to climb up the %s! H<You cannot climb up here.>", query_name (wall))); |
81 | ob->failmsg (format ("You fail to climb up the %s! H<You cannot climb up here.>", query_name (wall))); |
77 | |
82 | |
78 | |
83 | |
79 | return; |
84 | return; |
… | |
… | |
90 | } |
95 | } |
91 | } |
96 | } |
92 | |
97 | |
93 | ///////////////////////////////////////////////////////////////////////////// |
98 | ///////////////////////////////////////////////////////////////////////////// |
94 | |
99 | |
95 | // this mapspace has changed - potentialyl activate dormant physics objects |
100 | physics_queue::physics_queue () |
96 | // in the vicinity |
101 | { |
|
|
102 | i = 0; |
|
|
103 | } |
|
|
104 | |
|
|
105 | physics_queue::~physics_queue () |
|
|
106 | { |
|
|
107 | while (object *ob = pop ()) |
|
|
108 | ob->refcnt_dec (); |
|
|
109 | } |
|
|
110 | |
|
|
111 | object * |
|
|
112 | physics_queue::pop () |
|
|
113 | { |
|
|
114 | if (expect_true (i < size ())) |
|
|
115 | return (*this)[i++]; |
|
|
116 | |
|
|
117 | i = 0; |
|
|
118 | clear (); //TODO: this frees, but we do not want to free, unless really a lot of objects were queued |
|
|
119 | return 0; |
|
|
120 | } |
|
|
121 | |
|
|
122 | inline unsigned int |
|
|
123 | queue_of (tick_t tick) |
|
|
124 | { |
|
|
125 | return tick & (PHYSICS_QUEUES - 1); |
|
|
126 | } |
97 | |
127 | |
98 | void update_physics (maptile *m, int x, int y) |
128 | void update_physics (maptile *m, int x, int y) |
99 | { |
129 | { |
100 | } |
130 | } |
101 | |
131 | |
102 | // handle physics updates |
132 | // handle physics updates |
103 | void move_physics (object *ob) |
133 | void move_physics (object *ob) |
104 | { |
134 | { |
|
|
135 | } |
|
|
136 | |
|
|
137 | // preliminary slots docs |
|
|
138 | // level - water level 1..7 |
|
|
139 | // value - pressure |
|
|
140 | // |
|
|
141 | |
|
|
142 | static object * |
|
|
143 | flow_to (maptile *m, sint16 x, sint16 y) |
|
|
144 | { |
|
|
145 | if (!xy_normalise (m, x, y)) |
|
|
146 | return 0; |
|
|
147 | |
|
|
148 | mapspace &ms = m->at (x, y); |
|
|
149 | |
|
|
150 | ms.update (); |
|
|
151 | if (ms.move_block & MOVE_WALK) |
|
|
152 | return 0; |
|
|
153 | |
|
|
154 | for (object *w = ms.top; w; w = w->below) |
|
|
155 | if (w->type == PHYSICS) |
|
|
156 | if (w->subtype == ST_WATER_SOURCE) |
|
|
157 | return 0; |
|
|
158 | else if (w->subtype == ST_WATER_FLOW) |
|
|
159 | return w; |
|
|
160 | |
|
|
161 | printf ("creating flow at %d,%d\n", x, y);//D |
|
|
162 | object *w = archetype::get (shstr_quad_water_flow); |
|
|
163 | w->level = 0; |
|
|
164 | w->value = 0; |
|
|
165 | |
|
|
166 | m->insert (w, x, y); |
|
|
167 | m->queue_physics (w, 1); |
|
|
168 | |
|
|
169 | return w; |
|
|
170 | } |
|
|
171 | |
|
|
172 | static int |
|
|
173 | find_ortho_flow (object *src, object **result) |
|
|
174 | { |
|
|
175 | object **res = result; |
|
|
176 | |
|
|
177 | for (int dir = 1; dir < 8; dir += 2) |
|
|
178 | { |
|
|
179 | mapxy pos (src->map, src->x, src->y); |
|
|
180 | pos.move (dir); |
|
|
181 | if (pos.normalise ()) |
|
|
182 | if (object *w = flow_to (pos.m, pos.x, pos.y)) |
|
|
183 | *res++ = w; |
|
|
184 | } |
|
|
185 | |
|
|
186 | return res - result; |
|
|
187 | } |
|
|
188 | |
|
|
189 | static bool |
|
|
190 | water_set (object *w, int level, int pressure = -1) |
|
|
191 | { |
|
|
192 | if (!level) |
|
|
193 | { |
|
|
194 | w->destroy (); |
|
|
195 | return true; |
|
|
196 | } |
|
|
197 | |
|
|
198 | bool activity = false; |
|
|
199 | |
|
|
200 | min_it (level, 7); |
|
|
201 | |
|
|
202 | if (level != w->level) |
|
|
203 | { |
|
|
204 | w->level = level; |
|
|
205 | // update face |
|
|
206 | activity = true; |
|
|
207 | } |
|
|
208 | |
|
|
209 | if (pressure != w->value && pressure >= 0) |
|
|
210 | { |
|
|
211 | w->value = pressure; |
|
|
212 | activity = true; |
|
|
213 | } |
|
|
214 | |
|
|
215 | if (activity) // this is overkill, but... |
|
|
216 | w->map->queue_physics_at (w->x, w->y); |
|
|
217 | |
|
|
218 | return activity; |
|
|
219 | } |
|
|
220 | |
|
|
221 | static void |
|
|
222 | run_physics (object *ob) |
|
|
223 | { |
|
|
224 | //TODO: behaviour objects with virtual methods? |
|
|
225 | switch (ob->subtype) |
|
|
226 | { |
|
|
227 | case ST_WATER_SOURCE: |
|
|
228 | { |
|
|
229 | bool activity = false; |
|
|
230 | |
|
|
231 | // water sources generate flowing water "everywhere", but are currently |
|
|
232 | // very simple otherwise. |
|
|
233 | if (!has_floor (ob->map, ob->x, ob->y) && ob->map->tile_path [TILE_DOWN]) |
|
|
234 | if (maptile *m = ob->map->tile_available (TILE_DOWN)) |
|
|
235 | { |
|
|
236 | if (object *w = flow_to (m, ob->x, ob->y)) |
|
|
237 | activity = activity || water_set (w, 7); |
|
|
238 | } |
|
|
239 | else |
|
|
240 | activity = true; |
|
|
241 | |
|
|
242 | #if 0 |
|
|
243 | object *w [4]; |
|
|
244 | int w_cnt = find_ortho_flow (ob, w); |
|
|
245 | |
|
|
246 | while (w_cnt--) |
|
|
247 | activity = activity || water_set (w [w_cnt], 7); |
|
|
248 | |
|
|
249 | if (activity) |
|
|
250 | ob->map->queue_physics (ob, 1); |
|
|
251 | #endif |
|
|
252 | } |
|
|
253 | break; |
|
|
254 | |
|
|
255 | case ST_WATER_FLOW: |
|
|
256 | #if 0 |
|
|
257 | // flow down as much as possible |
|
|
258 | if (!has_floor (ob->map, ob->x, ob->y) && ob->map->tile_path [TILE_DOWN]) |
|
|
259 | if (maptile *m = ob->map->tile_available (TILE_DOWN)) |
|
|
260 | { |
|
|
261 | if (object *w = flow_to (m, ob->x, ob->y)) |
|
|
262 | { |
|
|
263 | if (int flow = min (ob->level, 7 - w->level)) |
|
|
264 | { |
|
|
265 | water_set (w, w->level + flow); |
|
|
266 | water_set (ob, w->level - flow); |
|
|
267 | if (!ob->level) |
|
|
268 | return; // we escaped downwards |
|
|
269 | } |
|
|
270 | else if (ob->level >= 5) // exert pressure -> does not count as activity |
|
|
271 | water_set (w, w->level, ob->value - 1); |
|
|
272 | } |
|
|
273 | } |
|
|
274 | |
|
|
275 | if (ob->level >= 2) |
|
|
276 | { |
|
|
277 | object *ws [4]; |
|
|
278 | int w_cnt = find_ortho_flow (ob, ws); |
|
|
279 | |
|
|
280 | bool activity = false; |
|
|
281 | |
|
|
282 | // distribute 1 to every neighbour that has less - should use some random ordering of course |
|
|
283 | |
|
|
284 | while (w_cnt--) |
|
|
285 | { |
|
|
286 | object *w = ws [w_cnt]; |
|
|
287 | |
|
|
288 | if (w->level < ob->level - 1) |
|
|
289 | { |
|
|
290 | water_set (w, w->level + 1); |
|
|
291 | --ob->level; |
|
|
292 | activity = true; |
|
|
293 | } |
|
|
294 | } |
|
|
295 | |
|
|
296 | if (activity) |
|
|
297 | ob->map->queue_physics (ob, 1); |
|
|
298 | } |
|
|
299 | else if (ob->level) |
|
|
300 | ; |
|
|
301 | else |
|
|
302 | ob->destroy (); |
|
|
303 | #endif |
|
|
304 | |
|
|
305 | // TODO: flow up with pressure |
|
|
306 | break; |
|
|
307 | |
|
|
308 | default: |
|
|
309 | LOG (llevError, "object with unsupported physics subtype %d: %s\n", ob->subtype, ob->debug_desc ()); |
|
|
310 | break; |
|
|
311 | } |
|
|
312 | } |
|
|
313 | |
|
|
314 | int |
|
|
315 | maptile::run_physics (tick_t tick, int max_objects) |
|
|
316 | { |
|
|
317 | if (state != MAP_ACTIVE) |
|
|
318 | return 0; |
|
|
319 | |
|
|
320 | int orig_max_object = max_objects; |
|
|
321 | physics_queue &q = pq [queue_of (server_tick)]; |
|
|
322 | |
|
|
323 | //if (q.size()) printf ("q %d < %d\n", q.i, (int)q.size());//D |
|
|
324 | |
|
|
325 | while (object *ob = q.pop ()) |
|
|
326 | { |
|
|
327 | ob->flag [FLAG_PHYSICS_QUEUE] = false; |
|
|
328 | ob->refcnt_dec (); |
|
|
329 | |
|
|
330 | if (ob->map != this) |
|
|
331 | { |
|
|
332 | if (!ob->flag [FLAG_FREED]) |
|
|
333 | { |
|
|
334 | LOG (llevError, "%s: physical object on wrong map\n", ob->debug_desc ()); |
|
|
335 | //ob->map->queue_physics (ob); |
|
|
336 | } |
|
|
337 | } |
|
|
338 | else |
|
|
339 | { |
|
|
340 | //printf ("handling ob %s\n", ob->debug_desc());//D |
|
|
341 | ::run_physics (ob); |
|
|
342 | } |
|
|
343 | |
|
|
344 | if (--max_objects <= 0) |
|
|
345 | break; |
|
|
346 | } |
|
|
347 | |
|
|
348 | return orig_max_object - max_objects; |
|
|
349 | } |
|
|
350 | |
|
|
351 | void |
|
|
352 | maptile::queue_physics (object *ob, int after) |
|
|
353 | { |
|
|
354 | if (!after) after = 14; //D |
|
|
355 | if (!ob->flag [FLAG_PHYSICS_QUEUE]) |
|
|
356 | { |
|
|
357 | ob->flag [FLAG_PHYSICS_QUEUE] = true; |
|
|
358 | ob->refcnt_inc (); |
|
|
359 | |
|
|
360 | pq [queue_of (server_tick + min (PHYSICS_QUEUES - 2, after))].push_back (ob); |
|
|
361 | } |
|
|
362 | } |
|
|
363 | |
|
|
364 | static void |
|
|
365 | queue_physics_at (maptile *m, int x, int y) |
|
|
366 | { |
|
|
367 | mapspace &ms = m->at (x, y); |
|
|
368 | |
|
|
369 | for (object *ob = ms.bot; ob; ob = ob->above) |
|
|
370 | if (ob->type == PHYSICS) |
|
|
371 | m->queue_physics (ob, 1); |
|
|
372 | } |
|
|
373 | |
|
|
374 | // this mapspace has changed - potentially activate dormant physics objects |
|
|
375 | // in the vicinity. vicinity is the 4 spaces around in the same z layer, and above and below. |
|
|
376 | // TODO: maybe include diagonals in the same z-layer? |
|
|
377 | // TODO: do not go through floors? |
|
|
378 | void |
|
|
379 | maptile::queue_physics_at (int x, int y) |
|
|
380 | { |
|
|
381 | if (maptile *m = tile_available (TILE_DOWN)) |
|
|
382 | ::queue_physics_at (m, x, y); |
|
|
383 | |
|
|
384 | if (maptile *m = tile_available (TILE_UP)) |
|
|
385 | ::queue_physics_at (m, x, y); |
|
|
386 | |
|
|
387 | ::queue_physics_at (this, x, y); |
|
|
388 | |
|
|
389 | for (int dir = 1; dir < 8; dir += 2) |
|
|
390 | { |
|
|
391 | mapxy pos (this, x, y); |
|
|
392 | pos.move (dir); |
|
|
393 | if (pos.normalise ()) |
|
|
394 | ::queue_physics_at (pos.m, pos.x, pos.y); |
|
|
395 | } |
|
|
396 | } |
|
|
397 | |
|
|
398 | void |
|
|
399 | maptile::activate_physics () |
|
|
400 | { |
|
|
401 | // most of this is total overkill, but better be safe than sorry, eh? |
|
|
402 | |
|
|
403 | coroapi::cede_to_tick (); |
|
|
404 | |
|
|
405 | if (maptile *m = tile_map [TILE_UP]) |
|
|
406 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
|
|
407 | ms->invalidate (); // invalidate faces, in case... |
|
|
408 | |
|
|
409 | coroapi::cede_to_tick (); |
|
|
410 | |
|
|
411 | for (mapspace *ms = spaces + size (); ms-- > spaces; ) |
|
|
412 | for (object *op = ms->bot; op; op = op->above) |
|
|
413 | if (op->type == PHYSICS) |
|
|
414 | queue_physics (op, 0); |
105 | } |
415 | } |
106 | |
416 | |
107 | ///////////////////////////////////////////////////////////////////////////// |
417 | ///////////////////////////////////////////////////////////////////////////// |
108 | |
418 | |
109 | #define FANCY_GRAPHICS 0 |
419 | #define FANCY_GRAPHICS 0 |
… | |
… | |
144 | |
454 | |
145 | const float N = (25000 - 1) * continent_scale; |
455 | const float N = (25000 - 1) * continent_scale; |
146 | |
456 | |
147 | // we clip a large border on the perturbed shape, to get irregular coastline |
457 | // we clip a large border on the perturbed shape, to get irregular coastline |
148 | // and then clip a smaller border around the real shape |
458 | // and then clip a smaller border around the real shape |
149 | continent = border_blend (-1.f, continent, P_continent , N, 400 * continent_scale); |
459 | //continent = border_blend (-1.f, continent, P_continent , N, 400 * continent_scale); |
150 | continent = border_blend (-1.f, continent, P * continent_scale + perturb * 0.1, N, 100 * continent_scale); |
460 | continent = border_blend (-1.f, continent, P * continent_scale + perturb * 0.1, N, 100 * continent_scale); |
151 | |
461 | |
152 | enum { |
462 | enum { |
153 | T_NONE, |
463 | T_NONE, |
154 | T_OCEAN, |
464 | T_OCEAN, |
… | |
… | |
165 | int h = 1000000; // height form heightmap |
475 | int h = 1000000; // height form heightmap |
166 | |
476 | |
167 | // the continent increases in height from 0 to ~700 levels in the absence of anything else |
477 | // the continent increases in height from 0 to ~700 levels in the absence of anything else |
168 | // thats about one step every 7 maps. |
478 | // thats about one step every 7 maps. |
169 | int base_height = blend (0, 300, xy_gradient, 0.2f, 0.9f); |
479 | int base_height = blend (0, 300, xy_gradient, 0.2f, 0.9f); |
170 | int river_height = base_height * 9 / 10; |
480 | int river_height = base_height; // * 9 / 10; |
171 | |
481 | |
172 | // add this to rivers to "dry them out" |
482 | // add this to rivers to "dry them out" |
173 | float dry_out = max (0.f, lerp (xy_gradient, 0.7f, 1.f, 0.f, 0.3f)); |
483 | float dry_out = max (0.f, lerp (xy_gradient, 0.7f, 1.f, 0.f, 0.3f)); |
174 | |
484 | |
175 | static frac2d river_gen (2); |
485 | static frac2d river_gen (2); |
176 | float river1 = abs (river_gen.fBm (P * 0.001 + perturb * 4)) + dry_out; |
486 | float river1 = abs (river_gen.fBm (P * 0.001 + perturb * 4)) + dry_out; |
177 | float river2 = river_gen.ridgedmultifractal (P * 0.04, 0.8, 10) - y_gradient * 0.2 - 0.16 - dry_out; |
487 | float river2 = river_gen.ridgedmultifractal (P * 0.04, 0.8, 10) - y_gradient * 0.2 - 0.16 - dry_out; |
178 | |
488 | |
179 | float valley = river1 - 0.2f; |
489 | float valley = river1 - 0.2f; |
180 | |
490 | |
181 | static frac2d mountain_gen (8, 2.14, 0.5); |
491 | static frac2d mountain_gen (6, 2.14, 0.5); |
182 | float mountain = mountain_gen.ridgedmultifractal (P * 0.004); |
492 | float mountain = mountain_gen.ridgedmultifractal (P * 0.004); |
183 | |
493 | |
184 | //TODO: mountains should not lower the height, should they? |
494 | //TODO: mountains should not lower the height, should they? |
185 | t = valley < 0 ? T_VALLEY : T_MOUNTAIN; |
495 | t = valley < 0 ? T_VALLEY : T_MOUNTAIN; |
186 | c = blend0 (vec3d (0, 0.8, 0), vec3d (0.8, 0, 0), valley, 0.1f); |
496 | c = blend0 (vec3d (0, 0.8, 0), vec3d (0.8, 0, 0), valley, 0.1f); |
187 | h = blend0 (base_height + continent * 300, base_height + mountain * xy_gradient * 400, valley, 0.1f); |
497 | h = blend0 (base_height + continent * 0, base_height + mountain * xy_gradient * 100, valley, 0.1f); |
188 | |
498 | |
189 | if (river1 < 0.01f) |
499 | if (river1 < 0.01f) |
190 | { |
500 | { |
191 | // main rivers - they cut deeply into the mountains (base_height * 0.9f) |
501 | // main rivers - they cut deeply into the mountains (base_height * 0.9f) |
|
|
502 | // well, silly, they don't |
192 | t = T_RIVER; |
503 | t = T_RIVER; |
193 | c = vec3d (0.2, 0.2, 1); |
504 | c = vec3d (0.2, 0.2, 1); |
194 | h0 = river_height; |
505 | h0 = river_height; |
195 | min_it (h, river_height + lerp<float> (river1, 0.f, 0.01f, -20, -1)); |
506 | min_it (h, river_height + lerp<float> (river1, 0.f, 0.01f, -10, -1)); |
196 | } |
507 | } |
197 | |
508 | |
198 | if (river2 > 0) |
509 | if (river2 > 0) |
199 | { |
510 | { |
200 | t = T_RIVER; |
511 | t = T_RIVER; |
201 | c = vec3d (0.2, 0.2, 1); |
512 | c = vec3d (0.2, 0.2, 1); |
202 | h0 = river_height; |
513 | h0 = river_height; |
203 | min_it (h, river_height + lerp<float> (river1, 0.f, 0.01f, -5, -1)); |
514 | min_it (h, river_height + max (-5, lerp<float> (river2, 0.01f, 0, -4, -1))); |
204 | } |
515 | } |
205 | |
516 | |
206 | if (continent < 0) |
517 | if (continent < 0) |
207 | { |
518 | { |
208 | t = T_OCEAN; |
519 | t = T_OCEAN; |
|
|
520 | h0 = 0; |
209 | min_it (h, min (continent * 200, -1)); |
521 | min_it (h, min (continent * 200, -1)); |
210 | c = vec3d (0, 0, 1); |
522 | c = vec3d (0, 0, 1); |
211 | } |
523 | } |
212 | |
524 | |
213 | // now we have the base height, and base terrain |
525 | // now we have the base height, and base terrain |
… | |
… | |
232 | { |
544 | { |
233 | t = T_ACQUIFER; |
545 | t = T_ACQUIFER; |
234 | c = vec3d (1,1,1); |
546 | c = vec3d (1,1,1); |
235 | } |
547 | } |
236 | } |
548 | } |
|
|
549 | |
|
|
550 | //printf ("+%d+%d %d z %d h %d,%d P%g,%g\n", mx, my, t, z, h,h0, P[0],P[1]);//D |
237 | |
551 | |
238 | // TODO: caves |
552 | // TODO: caves |
239 | // TODO: chees areas |
553 | // TODO: chees areas |
240 | // TODO: minerals |
554 | // TODO: minerals |
241 | // TODO: monsters |
555 | // TODO: monsters |
… | |
… | |
255 | // water above the surface |
569 | // water above the surface |
256 | switch (t) |
570 | switch (t) |
257 | { |
571 | { |
258 | case T_OCEAN: |
572 | case T_OCEAN: |
259 | if (z < h0) |
573 | if (z < h0) |
260 | arch_wall = shstr ("quad_water_wall"); |
574 | arch_wall = shstr_quad_water_source; |
261 | else if (z == h0) |
575 | else if (z == h0) |
262 | arch_floor = shstr ("quad_ocean_floor"); |
576 | arch_floor = shstr ("quad_ocean_floor"); |
263 | break; |
577 | break; |
264 | |
578 | |
265 | case T_RIVER: |
579 | case T_RIVER: |
266 | if (z < h0) |
580 | if (z < h0) |
267 | arch_wall = shstr ("quad_water_wall"); |
581 | arch_wall = shstr_quad_water_source; |
268 | else if (z == h0) |
582 | else if (z == h0) |
269 | arch_floor = shstr ("quad_water_floor"); |
583 | arch_floor = shstr ("quad_water_floor"); |
270 | break; |
584 | break; |
271 | |
585 | |
272 | case T_VALLEY: |
586 | case T_VALLEY: |
… | |
… | |
281 | |
595 | |
282 | case T_UNDERGROUND: |
596 | case T_UNDERGROUND: |
283 | // todo, use a fractal |
597 | // todo, use a fractal |
284 | if (z < h - 10) |
598 | if (z < h - 10) |
285 | { |
599 | { |
|
|
600 | arch_floor = shstr ("quad_stone_floor"); |
|
|
601 | arch_wall = shstr ("quad_stone_wall"); |
|
|
602 | } |
|
|
603 | else |
|
|
604 | { |
286 | arch_floor = shstr ("quad_dirt_floor"); |
605 | arch_floor = shstr ("quad_dirt_floor"); |
287 | arch_wall = shstr ("quad_dirt_wall"); |
606 | arch_wall = shstr ("quad_dirt_wall"); |
288 | } |
607 | } |
289 | else |
|
|
290 | { |
|
|
291 | arch_floor = shstr ("quad_stone_floor"); |
|
|
292 | arch_wall = shstr ("quad_stone_wall"); |
|
|
293 | } |
|
|
294 | break; |
608 | break; |
295 | |
609 | |
296 | case T_ACQUIFER: |
610 | case T_ACQUIFER: |
297 | arch_wall = shstr ("quad_water_wall"); |
611 | arch_wall = shstr_quad_water_source; |
298 | break; |
612 | break; |
299 | |
613 | |
300 | default: |
614 | default: |
301 | abort (); |
615 | abort (); |
302 | } |
616 | } |
… | |
… | |
343 | { |
657 | { |
344 | if (!(y&63))fprintf (stderr, "y %d\n", y * 50 / Nw+50);//D |
658 | if (!(y&63))fprintf (stderr, "y %d\n", y * 50 / Nw+50);//D |
345 | |
659 | |
346 | for (int x = 0; x < Nw; ++x) gen_quadspace (0, 0, 0, x + 1000, y + 22000, 0); |
660 | for (int x = 0; x < Nw; ++x) gen_quadspace (0, 0, 0, x + 1000, y + 22000, 0); |
347 | for (int x = 0; x < Nw; ++x) gen_quadspace (0, 0, 0, x + 12500, y + 12500, 0); |
661 | for (int x = 0; x < Nw; ++x) gen_quadspace (0, 0, 0, x + 12500, y + 12500, 0); |
348 | for (int x = 0; x < Nw; ++x) gen_quadspace (0, 0, 0, x + 22000, y + 22500, 0); |
662 | for (int x = 0; x < Nw; ++x) gen_quadspace (0, 0, 0, x + 22000, y + 22000, 0); |
349 | } |
663 | } |
350 | |
664 | |
351 | //putc (127 * gen.noise (vec2d (x * 0.01, y * 0.01)) + 128, stdout); |
665 | //putc (127 * gen.noise (vec2d (x * 0.01, y * 0.01)) + 128, stdout); |
352 | //putc (256 * gen.terrain2 (x * 0.004, y * 0.004, 8), stdout); |
666 | //putc (256 * gen.terrain2 (x * 0.004, y * 0.004, 8), stdout); |
353 | //putc (256 * gen.fBm (vec2d(x * 0.01, y * 0.01), 16), stdout); |
667 | //putc (256 * gen.fBm (vec2d(x * 0.01, y * 0.01), 16), stdout); |
… | |
… | |
412 | } |
726 | } |
413 | #endif |
727 | #endif |
414 | |
728 | |
415 | exit (0); |
729 | exit (0); |
416 | } |
730 | } |
|
|
731 | |