ViewVC Help
View File | Revision Log | Show Annotations | Download File
/cvs/deliantra/server/random_maps/expand2x.C
(Generate patch)

Comparing deliantra/server/random_maps/expand2x.C (file contents):
Revision 1.5 by root, Sun Dec 31 19:02:24 2006 UTC vs.
Revision 1.8 by root, Tue Apr 15 03:00:24 2008 UTC

1 1
2/* 2/*
3 * Expands a layout by 2x in each dimension. 3 * Expands a layout by 2x in each dimension.
4 * H. S. Teoh 4 * H. S. Teoh
5 * -------------------------------------------------------------------------- 5 * --------------------------------------------------------------------------
6 * $Id: expand2x.C,v 1.5 2006/12/31 19:02:24 root Exp $ 6 * $Id: expand2x.C,v 1.8 2008/04/15 03:00:24 root Exp $
7 * 7 *
8 * ALGORITHM 8 * ALGORITHM
9 * 9 *
10 * ... (TBW) 10 * ... (TBW)
11 */ 11 */
12 12
13#include <stdlib.h> /* just in case */ 13#include "global.h"
14#include <expand2x.h> /* use compiler to do sanity check */ 14#include "random_map.h"
15 15#include "rproto.h"
16
17/* PROTOTYPES */
18
19static void expand_misc (char **newlayout, int i, int j, char **layout, int xsize, int ysize);
20static void expand_wall (char **newlayout, int i, int j, char **layout, int xsize, int ysize);
21static void expand_door (char **newlayout, int i, int j, char **layout, int xsize, int ysize);
22
23
24/* FUNCTIONS */
25
26char **
27expand2x (char **layout, int xsize, int ysize)
28{
29 int i, j;
30 int nxsize = xsize * 2 - 1;
31 int nysize = ysize * 2 - 1;
32
33 /* Allocate new layout */
34 char **newlayout = (char **) calloc (sizeof (char *), nxsize);
35
36 for (i = 0; i < nxsize; i++)
37 {
38 newlayout[i] = (char *) calloc (sizeof (char), nysize);
39 }
40
41 for (i = 0; i < xsize; i++)
42 {
43 for (j = 0; j < ysize; j++)
44 {
45 switch (layout[i][j])
46 {
47 case '#':
48 expand_wall (newlayout, i, j, layout, xsize, ysize);
49 break;
50 case 'D':
51 expand_door (newlayout, i, j, layout, xsize, ysize);
52 break;
53 default:
54 expand_misc (newlayout, i, j, layout, xsize, ysize);
55 }
56 }
57 }
58
59 /* Dump old layout */
60 for (i = 0; i < xsize; i++)
61 {
62 free (layout[i]);
63 }
64 free (layout);
65
66 return newlayout;
67}
68 16
69/* Copy the old tile X into the new one at location (i*2, j*2) and 17/* Copy the old tile X into the new one at location (i*2, j*2) and
70 * fill up the rest of the 2x2 result with \0: 18 * fill up the rest of the 2x2 result with \0:
71 * X ---> X \0 19 * X ---> X \0
72 * \0 \0 20 * \0 \0
73 */ 21 */
74static void 22static void
75expand_misc (char **newlayout, int i, int j, char **layout, int xsize, int ysize) 23expand_misc (Layout newlayout, int i, int j, Layout layout)
76{ 24{
77 newlayout[i * 2][j * 2] = layout[i][j]; 25 newlayout[i * 2][j * 2] = layout[i][j];
78 /* (Note: no need to reset rest of 2x2 area to \0 because calloc does that 26 /* (Note: no need to reset rest of 2x2 area to \0 because calloc does that
79 * for us.) */ 27 * for us.) */
80} 28}
… …
85 * 2 match on (i, j+1) 33 * 2 match on (i, j+1)
86 * 4 match on (i+1, j+1) 34 * 4 match on (i+1, j+1)
87 * and the possible combinations thereof. 35 * and the possible combinations thereof.
88 */ 36 */
89static int 37static int
90calc_pattern (char ch, char **layout, int i, int j, int xsize, int ysize) 38calc_pattern (char ch, Layout layout, int i, int j)
91{ 39{
92 int pattern = 0; 40 int pattern = 0;
93 41
94 if (i + 1 < xsize && layout[i + 1][j] == ch) 42 if (i + 1 < layout->w && layout[i + 1][j] == ch)
95 pattern |= 1; 43 pattern |= 1;
96 44
97 if (j + 1 < ysize) 45 if (j + 1 < layout->h)
98 { 46 {
99 if (layout[i][j + 1] == ch) 47 if (layout[i][j + 1] == ch)
100 pattern |= 2; 48 pattern |= 2;
49
101 if (i + 1 < xsize && layout[i + 1][j + 1] == ch) 50 if (i + 1 < layout->w && layout[i + 1][j + 1] == ch)
102 pattern |= 4; 51 pattern |= 4;
103 } 52 }
104 53
105 return pattern; 54 return pattern;
106} 55}
… …
108/* Expand a wall. This function will try to sensibly connect the resulting 57/* Expand a wall. This function will try to sensibly connect the resulting
109 * wall to adjacent wall squares, so that the result won't have disconnected 58 * wall to adjacent wall squares, so that the result won't have disconnected
110 * walls. 59 * walls.
111 */ 60 */
112static void 61static void
113expand_wall (char **newlayout, int i, int j, char **layout, int xsize, int ysize) 62expand_wall (Layout newlayout, int i, int j, Layout layout)
114{ 63{
115 int wall_pattern = calc_pattern ('#', layout, i, j, xsize, ysize); 64 int wall_pattern = calc_pattern ('#', layout, i, j);
116 int door_pattern = calc_pattern ('D', layout, i, j, xsize, ysize); 65 int door_pattern = calc_pattern ('D', layout, i, j);
117 int both_pattern = wall_pattern | door_pattern; 66 int both_pattern = wall_pattern | door_pattern;
118 67
119 newlayout[i * 2][j * 2] = '#'; 68 newlayout[i * 2][j * 2] = '#';
120 if (i + 1 < xsize) 69
70 if (i + 1 < layout->w)
121 { 71 {
122 if (both_pattern & 1) 72 if (both_pattern & 1)
123 { /* join walls/doors to the right */ 73 { /* join walls/doors to the right */
124
125/* newlayout[i*2+1][j*2] = '#'; */ 74/* newlayout[i*2+1][j*2] = '#'; */
126 newlayout[i * 2 + 1][j * 2] = layout[i + 1][j]; 75 newlayout[i * 2 + 1][j * 2] = layout[i + 1][j];
127 } 76 }
128 } 77 }
129 78
130 if (j + 1 < ysize) 79 if (j + 1 < layout->h)
131 { 80 {
132 if (both_pattern & 2) 81 if (both_pattern & 2)
133 { /* join walls/doors to the bottom */ 82 { /* join walls/doors to the bottom */
134
135/* newlayout[i*2][j*2+1] = '#'; */ 83/* newlayout[i*2][j*2+1] = '#'; */
136 newlayout[i * 2][j * 2 + 1] = layout[i][j + 1]; 84 newlayout[i * 2][j * 2 + 1] = layout[i][j + 1];
137 } 85 }
138 86
139 if (wall_pattern == 7) 87 if (wall_pattern == 7)
… …
147/* This function will try to sensibly connect doors so that they meet up with 95/* This function will try to sensibly connect doors so that they meet up with
148 * adjacent walls. Note that it will also presumptuously delete (ignore) doors 96 * adjacent walls. Note that it will also presumptuously delete (ignore) doors
149 * that it doesn't know how to correctly expand. 97 * that it doesn't know how to correctly expand.
150 */ 98 */
151static void 99static void
152expand_door (char **newlayout, int i, int j, char **layout, int xsize, int ysize) 100expand_door (Layout newlayout, int i, int j, Layout layout)
153{ 101{
154 int wall_pattern = calc_pattern ('#', layout, i, j, xsize, ysize); 102 int wall_pattern = calc_pattern ('#', layout, i, j);
155 int door_pattern = calc_pattern ('D', layout, i, j, xsize, ysize); 103 int door_pattern = calc_pattern ('D', layout, i, j);
156 int join_pattern; 104 int join_pattern;
157 105
158 /* Doors "like" to connect to walls more than other doors. If there is 106 /* Doors "like" to connect to walls more than other doors. If there is
159 * a wall and another door, this door will connect to the wall and 107 * a wall and another door, this door will connect to the wall and
160 * disconnect from the other door. */ 108 * disconnect from the other door. */
161 if (wall_pattern & 3) 109 if (wall_pattern & 3)
162 {
163 join_pattern = wall_pattern; 110 join_pattern = wall_pattern;
164 }
165 else 111 else
166 {
167 join_pattern = door_pattern; 112 join_pattern = door_pattern;
168 }
169 113
170 newlayout[i * 2][j * 2] = 'D'; 114 newlayout[i * 2][j * 2] = 'D';
171 if (i + 1 < xsize) 115
172 { 116 if (i + 1 < layout->w)
173 if (join_pattern & 1) 117 if (join_pattern & 1)
174 { /* there is a door/wall to the right */ 118 /* there is a door/wall to the right */
175 newlayout[i * 2 + 1][j * 2] = 'D'; 119 newlayout[i * 2 + 1][j * 2] = 'D';
120
121 if (j + 1 < layout->h)
122 if (join_pattern & 2)
123 /* there is a door/wall below */
124 newlayout[i * 2][j * 2 + 1] = 'D';
125}
126
127void
128expand2x (Layout layout)
129{
130 Layout newlayout (layout->w * 2 - 1, layout->h * 2 - 1);
131 newlayout->clear ();
132
133 for (int i = 0; i < layout->w; i++)
134 for (int j = 0; j < layout->h; j++)
135 switch (layout[i][j])
136 {
137 case '#': expand_wall (newlayout, i, j, layout); break;
138 case 'D': expand_door (newlayout, i, j, layout); break;
139 default: expand_misc (newlayout, i, j, layout); break;
176 } 140 }
177 }
178 141
179 if (j + 1 < ysize) 142 layout.swap (newlayout);
180 { 143 newlayout.free ();
181 if (join_pattern & 2)
182 { /* there is a door/wall below */
183 newlayout[i * 2][j * 2 + 1] = 'D';
184 }
185 }
186} 144}
145

Diff Legend

– Removed lines
+ Added lines
< Changed lines
> Changed lines