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

Comparing deliantra/server/common/noise.C (file contents):
Revision 1.2 by root, Fri Apr 22 02:03:10 2011 UTC vs.
Revision 1.8 by root, Tue Apr 26 03:18:06 2011 UTC

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 (©) 2010 Marc Alexander Lehmann / Robin Redeker / the Deliantra team 4 * Copyright (©) 2010,2011 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.
22 22
23#include "noise.h" 23#include "noise.h"
24 24
25///////////////////////////////////////////////////////////////////////////// 25/////////////////////////////////////////////////////////////////////////////
26 26
27// perl -e 'for(0..255) { $p = (atan2 1,0) / 64 * $_; printf " %10g, %10g,\n", sin $p, cos $p }' | sort -R
28static const float charges2[256][2] = {
29 -.975702, -.219101, .893224, .449611, .870087, -.492898, .595699, -.803208,
30 .14673, .989177, .995185, .0980171, .91421, -.405241, -.514103, .857729,
31 -.985278, -.170962, -.689541, -.724247, -.427555, .903989, .83147, -.55557,
32 .999699, -.0245412, .634393, .77301, -.514103, -.857729, -.0735646, -.99729,
33 .514103, -.857729, -.595699, -.803208, -.290285, .95694, .595699, .803208,
34 .266713, .963776, -.33689, .941544, .492898, -.870087, -.471397, -.881921,
35 -.99729, -.0735646, .615232, -.788346, -.91421, -.405241, -.575808, .817585,
36 .0980171, .995185, -.980785, .19509, -.122411, -.99248, .0735646, .99729,
37 -.634393, .77301, -.91421, .405241, .99248, .122411, .903989, -.427555,
38 -.24298, .970031, -.857729, .514103, -.359895, .932993, .382683, .92388,
39 .740951, -.671559, -.893224, .449611, -.95694, -.290285, -.975702, .219101,
40 -.970031, .24298, .999699, .0245412, -.405241, .91421, .985278, .170962,
41 .382683, -.92388, .95694, -.290285, .707107, -.707107, -.817585, -.575808,
42 -.989177, .14673, -.19509, -.980785, -.359895, -.932993, .313682, .949528,
43 -.0980171, .995185, 1, 6.12323e-17, .963776, -.266713, .998795, -.0490677,
44 -.998795, -.0490677, -.970031, -.24298, -.55557, .83147, -.14673, .989177,
45 -.83147, -.55557, -.995185, -.0980171, .870087, .492898, .941544, -.33689,
46 .575808, -.817585, .33689, .941544, .19509, -.980785, 0, 1,
47 .219101, -.975702, -.83147, .55557, .757209, -.653173, -.95694, .290285,
48 -.266713, .963776, -.0490677, .998795, .405241, .91421, -.405241, -.91421,
49 -.689541, .724247, -.534998, -.844854, -.99248, -.122411, .724247, .689541,
50 .492898, .870087, .817585, -.575808, .740951, .671559, -.33689, -.941544,
51 .95694, .290285, .77301, -.634393, .0245412, -.999699, -.77301, -.634393,
52 -.382683, .92388, -.24298, -.970031, -.893224, -.449611, .449611, .893224,
53 .975702, -.219101, -.382683, -.92388, .844854, .534998, -.803208, -.595699,
54 .941544, .33689, .963776, .266713, .932993, .359895, -.0735646, .99729,
55 .634393, -.77301, .405241, -.91421, .33689, -.941544, .99729, .0735646,
56 1.22465e-16, -1, -.941544, -.33689, .0490677, -.998795, -.313682, .949528,
57 .92388, .382683, -.999699, .0245412, .0245412, .999699, .653173, .757209,
58 -.803208, .595699, .980785, -.19509, .817585, .575808, .975702, .219101,
59 -.615232, -.788346, .99248, -.122411, .998795, .0490677, -.707107, .707107,
60 .803208, -.595699, .671559, .740951, -.757209, -.653173, -.949528, .313682,
61 -.989177, -.14673, -.817585, .575808, -.14673, -.989177, -1, -1.83697e-16,
62 .290285, .95694, -.932993, -.359895, .24298, -.970031, .170962, .985278,
63 -.671559, -.740951, .427555, .903989, .427555, -.903989, -.941544, .33689,
64 -.492898, -.870087, -.266713, -.963776, .857729, -.514103, -.724247, .689541,
65 .724247, -.689541, -.653173, .757209, .689541, -.724247, .949528, -.313682,
66 -.19509, .980785, -.740951, .671559, -.999699, -.0245412, .689541, .724247,
67 .803208, .595699, -.170962, .985278, .0735646, -.99729, .970031, -.24298,
68 -.170962, -.985278, .471397, .881921, .91421, .405241, .893224, -.449611,
69 .0490677, .998795, -.615232, .788346, -.998795, .0490677, -.427555, -.903989,
70 -.0245412, .999699, -.534998, .844854, -.313682, -.949528, -.55557, -.83147,
71 -.903989, -.427555, -.724247, -.689541, -.740951, -.671559, .985278, -.170962,
72 -.857729, -.514103, -.99729, .0735646, .881921, -.471397, .534998, .844854,
73 .359895, -.932993, .77301, .634393, .99729, -.0735646, .290285, -.95694,
74 .575808, .817585, .757209, .653173, .903989, .427555, -.995185, .0980171,
75 -.903989, .427555, -.844854, .534998, -.707107, -.707107, -.92388, .382683,
76 -.653173, -.757209, -.881921, -.471397, -.219101, .975702, -.595699, .803208,
77 .0980171, -.995185, -.788346, .615232, -.0980171, -.995185, -.985278, .170962,
78 .122411, .99248, -.449611, -.893224, .170962, -.985278, .788346, .615232,
79 -.492898, .870087, .671559, -.740951, .449611, -.893224, -.757209, .653173,
80 .83147, .55557, -.290285, -.95694, -.932993, .359895, -.870087, -.492898,
81 .266713, -.963776, -.881921, .471397, -.77301, .634393, -.471397, .881921,
82 .844854, -.534998, .707107, .707107, .534998, -.844854, .514103, .857729,
83 .14673, -.989177, .980785, .19509, -.122411, .99248, -.449611, .893224,
84 .995185, -.0980171, -.634393, -.77301, .857729, .514103, .55557, .83147,
85 -.92388, -.382683, -.844854, -.534998, -.963776, .266713, .989177, -.14673,
86 .313682, -.949528, .359895, .932993, .24298, .970031, -.949528, -.313682,
87 .932993, -.359895, .55557, -.83147, .615232, .788346, -.788346, -.615232,
88 -.0245412, -.999699, -.219101, -.975702, .788346, -.615232, -.99248, .122411,
89 -.671559, .740951, -.870087, .492898, .970031, .24298, .881921, .471397,
90 .122411, -.99248, .471397, -.881921, .19509, .980785, -.963776, -.266713,
91 .92388, -.382683, .989177, .14673, -.575808, -.817585, .219101, .975702,
92 -.0490677, -.998795, -.980785, -.19509, .949528, .313682, .653173, -.757209,
93};
94
95// http://www-wales.ch.cam.ac.uk/~wales/CCD/Thomson/table.html, random permutation
96// used as gradient vectors for noise3d
97static const float charges3[256][3] = {
98 6.32096444e-01, -6.11406706e-01, 4.76062943e-01, 5.19172442e-01, 8.08229585e-01, -2.77893708e-01,
99 -8.81072422e-01, -4.68301230e-01, 6.63727731e-02, -1.92122323e-01, 9.81341519e-01, -7.60505942e-03,
100 -2.57478265e-01, 9.34157733e-01, -2.47091628e-01, 8.75501090e-01, -1.48087600e-01, -4.59965112e-01,
101 -6.44086082e-01, 3.21868600e-01, 6.93940720e-01, -4.42053435e-01, -1.94962529e-01, -8.75544615e-01,
102 -6.86776297e-01, 5.34610386e-01, -4.92473403e-01, -8.45541961e-01, -2.41708225e-01, 4.76062943e-01,
103 1.87301993e-01, 3.04913657e-01, 9.33780287e-01, -8.21274139e-01, 4.76841979e-01, -3.13257905e-01,
104 1.82393582e-01, 9.78673695e-01, -9.45006918e-02, -5.13996405e-01, 5.64894294e-01, -6.45524695e-01,
105 -2.85987088e-01, -5.27238900e-01, -8.00144067e-01, 3.72992508e-01, 8.73495087e-01, 3.12862464e-01,
106 3.07149790e-02, -1.36108589e-01, 9.90217674e-01, -9.42965190e-01, -1.13726556e-01, 3.12862464e-01,
107 -7.63495246e-01, -8.89713729e-02, -6.39655457e-01, -4.93181655e-01, 3.84537051e-01, -7.80322441e-01,
108 9.59053138e-01, -6.07981062e-03, -2.83160934e-01, 8.47504655e-02, 6.82510620e-01, -7.25945323e-01,
109 2.72233465e-01, 7.06503091e-01, 6.53255175e-01, -6.69781595e-01, 6.75521448e-01, -3.08323512e-01,
110 -9.83646297e-01, 1.64266522e-01, -7.38679386e-02, -1.33230986e-01, 4.14543427e-02, 9.90217674e-01,
111 -9.68112521e-01, -2.24691711e-01, 1.10778074e-01, 2.60286884e-01, 5.44444585e-01, -7.97390012e-01,
112 -9.59533574e-01, 4.55017306e-02, -2.77893708e-01, 6.34082129e-01, 7.69729420e-01, -7.38679387e-02,
113 8.71590956e-01, -4.57032412e-01, -1.77343115e-01, -5.65998169e-01, -6.84162385e-01, -4.59965112e-01,
114 1.31348131e-01, -9.34573215e-01, 3.30636620e-01, 9.37743461e-01, -2.44096148e-01, -2.47091628e-01,
115 -2.32019785e-03, -9.49665258e-01, -3.13257905e-01, 5.58257270e-01, -6.92564967e-01, -4.56839782e-01,
116 5.79609682e-01, 2.34839316e-01, -7.80322441e-01, 5.21842141e-02, 4.80310769e-01, -8.75544615e-01,
117 5.48696303e-01, -4.14651366e-01, -7.25945323e-01, -5.13713359e-02, -3.67059868e-01, 9.28777712e-01,
118 -8.31597157e-01, -5.26303703e-01, -1.77343115e-01, 7.60006362e-01, -6.75440951e-02, -6.46396260e-01,
119 -6.35840799e-01, -7.53287574e-01, 1.68119925e-01, 6.00789426e-01, 3.96860609e-01, 6.93940720e-01,
120 -3.99937982e-02, 9.83336115e-01, -1.77343115e-01, -4.74261299e-01, 8.33604286e-01, -2.83160934e-01,
121 8.74744319e-01, 8.54351386e-02, -4.76993934e-01, 2.64896284e-01, -6.69736874e-01, 6.93745254e-01,
122 -2.24976555e-01, -1.01696579e-01, -9.69042494e-01, 6.08580404e-01, -2.06649545e-01, 7.66110865e-01,
123 -2.32214607e-01, -7.27581091e-01, -6.45524695e-01, -1.14732673e-01, 7.81826288e-01, -6.12849141e-01,
124 -5.46171508e-01, 5.27060305e-01, 6.51079195e-01, 1.70411976e-01, -3.14665113e-01, 9.33780287e-01,
125 -1.14827108e-01, 9.66494440e-01, 2.29571847e-01, 6.62214703e-01, -4.23664923e-01, 6.18045079e-01,
126 3.43568839e-01, 1.39041052e-01, 9.28777712e-01, 2.65015805e-01, 5.00565290e-01, 8.24136526e-01,
127 -4.26259648e-01, -7.20031380e-01, 5.47592480e-01, 7.57191364e-01, -5.91945814e-01, 2.76154652e-01,
128 9.94315593e-01, 4.60290452e-02, 9.60095232e-02, 9.70286575e-01, -1.74010497e-01, 1.68119925e-01,
129 1.34044431e-01, 9.51719864e-01, 2.76154652e-01, -3.21508279e-01, 6.91956864e-01, -6.46396261e-01,
130 -9.15927355e-01, 3.90047734e-01, -9.45507570e-02, -3.57713970e-01, 9.75145600e-03, 9.33780287e-01,
131 4.58799092e-01, -6.16720593e-01, -6.39655457e-01, -4.06287592e-01, 9.10837959e-01, -7.28327195e-02,
132 7.69084079e-01, -2.21547533e-01, 5.99521785e-01, 4.32966564e-02, -7.18729210e-01, 6.93940720e-01,
133 7.91803580e-01, -4.28020920e-01, 4.35712270e-01, 3.04696154e-01, 7.05691965e-01, -6.39655457e-01,
134 6.46420856e-01, 4.00281039e-01, -6.49549973e-01, 8.31864266e-01, -3.69542234e-01, -4.14053595e-01,
135 8.23594337e-01, 4.72823279e-01, -3.13257905e-01, -5.85665015e-01, -8.07274355e-01, -7.28327193e-02,
136 -5.65385161e-02, -4.32158277e-01, -9.00023678e-01, 2.06686552e-01, -8.22754465e-01, 5.29486316e-01,
137 8.65928642e-01, 3.96271834e-01, 3.05182275e-01, 1.87431189e-02, 4.56064322e-01, 8.89749419e-01,
138 -5.94715001e-01, -2.32669312e-01, 7.69531714e-01, 5.99595825e-01, 1.59473663e-02, -8.00144067e-01,
139 9.58599657e-02, 6.31372955e-01, 7.69531714e-01, 3.20650220e-01, 8.29747462e-01, -4.56839782e-01,
140 -3.13608737e-01, 5.11291534e-01, -8.00144067e-01, -8.67906788e-01, 4.85339988e-01, 1.05749252e-01,
141 3.22455909e-01, 9.12507983e-01, -2.51696976e-01, 5.15563696e-01, 7.07202113e-01, -4.83796700e-01,
142 7.50491607e-01, -5.66571271e-01, -3.40234247e-01, -2.58299208e-01, -3.23551155e-01, -9.10272580e-01,
143 3.49564167e-01, -9.33995942e-01, -7.38679386e-02, 4.02529304e-01, 1.67115347e-01, -9.00023678e-01,
144 9.45927846e-01, -3.24287947e-01, -7.60505937e-03, -4.04334848e-01, -2.11800144e-01, 8.89749419e-01,
145 3.41359400e-01, -4.97637347e-01, -7.97390012e-01, 7.43690080e-01, 5.81037425e-01, 3.30636620e-01,
146 -8.15869544e-01, 2.32381428e-01, 5.29486316e-01, -2.73993936e-01, -4.03941386e-01, 8.72787878e-01,
147 -1.14485896e-01, -9.85759380e-01, -1.23172337e-01, -6.69863977e-01, 3.59676363e-01, -6.49549972e-01,
148 -7.96449717e-01, 5.92027384e-01, -1.23172337e-01, -6.19715090e-01, -4.90274553e-01, -6.12849141e-01,
149 -8.65910917e-01, -3.66659161e-01, -3.40234247e-01, 8.46096973e-01, -5.28880485e-01, 6.63727731e-02,
150 -8.91235794e-01, -3.59774050e-01, 2.76154652e-01, 4.20417732e-01, 3.46935142e-01, 8.38382334e-01,
151 -6.38459078e-01, 7.23512413e-01, 2.62487703e-01, -7.53805524e-01, -6.57053571e-01, -7.60505938e-03,
152 4.47561005e-01, 5.64275348e-01, 6.93745254e-01, 3.49754488e-02, 9.97181715e-01, 6.63727730e-02,
153 -1.28749619e-01, -5.72643486e-01, 8.09631381e-01, -6.36032129e-01, -6.58092804e-01, 4.02960285e-01,
154 -5.37020119e-01, 8.38088040e-01, 9.60095232e-02, -8.78907490e-01, -1.37182495e-01, -4.56839782e-01,
155 -9.33228374e-01, 1.34065997e-01, 3.33333333e-01, 6.80411181e-01, 5.47277055e-01, -4.87368906e-01,
156 -7.12457289e-01, 1.05461526e-01, 6.93745254e-01, 2.30586085e-01, 3.30051738e-01, -9.15366543e-01,
157 2.34431211e-02, -7.59957402e-01, -6.49549973e-01, -6.98011937e-01, -3.61662294e-01, 6.18045079e-01,
158 8.59171516e-01, 2.05105173e-01, 4.68781584e-01, 7.11862181e-01, 6.90797320e-01, 1.26693714e-01,
159 -2.12826534e-01, 4.39256402e-01, 8.72787878e-01, -3.62298594e-01, -9.25543476e-01, -1.10040912e-01,
160 -3.63383159e-01, -8.00268371e-01, -4.76993934e-01, -7.76145796e-01, 5.51780285e-01, 3.05182275e-01,
161 -1.92676248e-01, 7.76820116e-01, 5.99521785e-01, -9.19690664e-01, 2.65359911e-01, -2.89401453e-01,
162 -2.52247996e-02, 8.99732475e-01, 4.35712270e-01, 7.52676085e-01, 4.12472645e-01, 5.13171539e-01,
163 -1.19598027e-01, -8.62070913e-01, -4.92473403e-01, 9.40191063e-01, -1.58443230e-02, 3.40278890e-01,
164 -9.89903836e-01, 3.37653035e-02, 1.37660085e-01, 3.00994355e-01, -4.79793064e-01, 8.24136526e-01,
165 4.35219899e-01, 8.98427220e-01, -5.84137724e-02, -9.54179119e-01, 2.71092073e-01, 1.26693714e-01,
166 9.02457799e-02, -5.37560007e-01, 8.38382334e-01, -9.58991702e-02, 9.05186704e-01, -4.14053596e-01,
167 -8.97828463e-02, -9.48052118e-01, 3.05182275e-01, -7.79595183e-01, -5.82690413e-01, 2.29571847e-01,
168 -6.01646284e-01, -4.68072388e-02, -7.97390012e-01, -6.80265196e-01, -6.90061585e-01, -2.47091628e-01,
169 6.89653756e-01, 6.63795523e-01, -2.89401453e-01, -7.35965096e-01, -5.35644470e-01, -4.14053595e-01,
170 -4.83817118e-01, -8.06307183e-01, 3.40278890e-01, -2.51959468e-01, -8.46616946e-01, 4.68781584e-01,
171 2.89467531e-01, 9.50755892e-01, 1.10778074e-01, -4.31548997e-01, 3.97822184e-01, 8.09631381e-01,
172 1.03460411e-01, 8.29768433e-01, -5.48434400e-01, -7.70330748e-01, -3.25284873e-01, -5.48434400e-01,
173 4.75732892e-01, -5.89012642e-01, 6.53255175e-01, -4.56373945e-01, 8.22151506e-01, 3.40278890e-01,
174 -7.47966357e-01, -1.17490449e-01, 6.53255175e-01, -4.84791839e-01, -8.27524476e-01, -2.83160934e-01,
175 -8.75038211e-01, 3.53535790e-01, 3.30636620e-01, 4.09353123e-01, -6.19180984e-02, -9.10272580e-01,
176 -9.95670746e-01, -7.23021212e-02, -5.84137724e-02, -4.57295474e-01, -8.84117086e-01, 9.60095233e-02,
177 -8.64280276e-02, -6.19376367e-01, -7.80322441e-01, 2.44164564e-02, 2.45683701e-01, -9.69042494e-01,
178 8.94422292e-01, -3.83804027e-01, 2.29571847e-01, -8.62566691e-01, 4.52816156e-03, 5.05923116e-01,
179 9.19909533e-01, 2.42287152e-01, -3.08323512e-01, -4.01126232e-01, 3.46675383e-02, -9.15366543e-01,
180 9.51367455e-01, 2.99880902e-01, 7.05082324e-02, -5.61852646e-01, 1.73058019e-01, -8.08932956e-01,
181 5.60450847e-01, -8.26125099e-01, -5.84137724e-02, -4.83253958e-01, -4.23721318e-01, 7.66110865e-01,
182 -1.91262533e-02, -8.58072933e-01, 5.13171539e-01, 4.27361843e-01, -7.49268748e-01, 5.05923116e-01,
183 8.06374324e-01, 3.27460527e-01, -4.92473403e-01, -3.49075205e-01, -5.94876216e-01, 7.24064077e-01,
184 1.70540147e-01, -3.64719277e-01, -9.15366543e-01, -9.51483049e-01, -1.76998983e-01, -2.51696976e-01,
185 -3.34445776e-01, 9.27298072e-01, 1.68119925e-01, -2.58769450e-02, -2.24111854e-01, -9.74219821e-01,
186 3.50509628e-01, -8.75232478e-01, 3.33333333e-01, -5.11361160e-01, 7.14833233e-01, -4.76993934e-01,
187 2.13445517e-01, 8.53114931e-01, 4.76062943e-01, -7.35388206e-01, 6.73967933e-01, 7.05082324e-02,
188 -5.10663512e-01, 1.90624866e-01, 8.38382334e-01, 2.07025032e-01, 8.96458354e-02, -9.74219821e-01,
189 2.30036908e-01, -9.29155434e-01, -2.89401453e-01, -4.38498083e-01, -6.24412769e-01, -6.46396260e-01,
190 7.56359490e-01, -6.47294323e-01, -9.45006918e-02, -7.33549832e-01, 4.45600288e-01, 5.13171539e-01,
191 5.69972682e-01, -7.59768531e-01, 3.12862464e-01, 1.36366351e-02, -9.94299320e-01, 1.05749252e-01,
192 -1.20108971e-01, 6.12129242e-01, -7.81582770e-01, -6.20394866e-01, 7.76531524e-01, -1.10040912e-01,
193 3.85591729e-01, -2.44264178e-01, 8.89749420e-01, -8.14161423e-01, 3.15614840e-01, -4.87368906e-01,
194 1.15419311e-01, 9.33230432e-01, -3.40234248e-01, 5.90173960e-01, -2.02047201e-01, -7.81582770e-01,
195 8.54270153e-01, 5.08959332e-01, 1.05749252e-01, 7.95754924e-01, 5.98192490e-01, -9.45507571e-02,
196 3.54673147e-01, -8.00092315e-01, -4.83796700e-01, 9.91952607e-01, -1.03563604e-01, -7.28327194e-02,
197 -6.21935152e-02, 2.58972647e-01, 9.63880249e-01, -3.09502921e-01, 8.32249985e-01, -4.59965112e-01,
198 4.65710308e-01, -8.74164521e-01, 1.37660085e-01, 1.33750242e-01, -8.62891895e-01, -4.87368906e-01,
199 -2.51909022e-01, 8.79866384e-01, 4.02960285e-01, -6.67371446e-11, -8.00239945e-11, -1.00000000e+00,
200 -5.76407831e-01, -5.55272584e-01, 5.99521785e-01, -4.70064989e-01, -4.10082041e-01, -7.81582770e-01,
201 8.36695291e-01, -9.13599363e-03, 5.47592480e-01, 5.24193529e-01, 8.40399218e-01, 1.37660085e-01,
202 2.48438744e-01, -7.05895175e-01, -6.63317565e-01, 1.20172431e-01, -9.88240224e-01, -9.45507569e-02,
203 4.30798964e-01, 4.00049655e-01, -8.08932956e-01, -2.50127938e-01, -9.17808600e-01, -3.08323512e-01,
204 6.09182992e-01, 5.90373037e-01, 5.29486316e-01, -3.40640313e-01, 5.99746104e-01, 7.24064077e-01,
205 4.40361132e-01, -8.53731316e-01, -2.77893708e-01, -1.83361859e-01, -7.36528553e-01, 6.51079195e-01,
206 9.82693460e-01, 1.49011952e-01, -1.10040912e-01, 6.29027140e-01, -7.35509000e-01, -2.51696976e-01,
207 -8.70236843e-01, 9.28902018e-02, -4.83796700e-01, 9.45809668e-01, 1.91165575e-01, 2.62487703e-01,
208 2.00560098e-01, -1.43987122e-01, -9.69042494e-01, 1.02516007e-01, 9.46542469e-02, 9.90217674e-01,
209 -6.07212048e-01, 6.41511773e-01, 4.68781584e-01, 2.42316938e-01, -9.61889393e-01, 1.26693714e-01,
210 4.87103783e-01, 5.68101851e-01, -6.63317565e-01, -9.38753073e-01, -3.31379371e-01, -9.45006918e-02,
211 3.89869221e-01, -2.85348240e-01, -8.75544615e-01, -6.33446768e-01, -2.67859254e-01, -7.25945323e-01,
212 5.82718746e-01, 7.41166481e-01, 3.33333333e-01, 6.66870337e-01, -5.04483561e-01, -5.48434400e-01,
213 7.34447763e-01, -2.91551734e-01, -6.12849141e-01, 9.10935613e-01, 3.93731996e-01, -1.23172337e-01,
214 3.57972341e-02, 7.85327217e-01, 6.18045079e-01, -2.92197503e-01, 2.28018816e-01, 9.28777712e-01
215 -1.93180133e-01, -1.83347487e-01, 9.63880249e-01, -2.15979248e-01, -9.73848835e-01, 7.05082325e-02,
216 8.87941151e-01, -2.21773580e-01, 4.02960285e-01, 6.89715518e-01, -4.86988739e-03, 7.24064077e-01,
217 -4.10435643e-01, 7.29167374e-01, 5.47592480e-01, 7.46211012e-01, 1.62686797e-01, -6.45524695e-01,
218 -1.81148087e-01, 1.34466019e-01, -9.74219821e-01, -7.66578780e-01, -4.71711555e-01, 4.35712270e-01,
219 -5.66010160e-01, -2.07722258e-02, 8.24136526e-01, 7.29533368e-01, 2.09468249e-01, 6.51079195e-01,
220 -3.45990788e-01, 2.65042929e-01, -9.00023678e-01, -7.35542526e-01, 1.37793324e-01, -6.63317565e-01,
221 -1.25326447e-01, 6.30370863e-01, 7.66110865e-01, 1.31053682e-01, -5.73107674e-01, -8.08932955e-01,
222 4.86820470e-01, -3.53150162e-02, 8.72787878e-01, 4.35204849e-01, 7.44740586e-01, 5.05923116e-01,
223 4.98855035e-01, -3.98703643e-01, 7.69531714e-01, 2.55373649e-01, -7.56251592e-02, 9.63880249e-01,
224 -1.51053916e-01, 3.85469253e-01, -9.10272580e-01, 6.78644990e-01, -7.26064181e-01, 1.10778074e-01,
225 -3.07350590e-01, -9.14677987e-01, 2.62487703e-01, 5.60298616e-01, 1.74821302e-01, 8.09631381e-01,
226};
227
228/////////////////////////////////////////////////////////////////////////////
229
230template<int N, typename T>
231template<class random_generator>
232void
233permutation<N,T>::seed (random_generator &rng)
234{
235 for (int i = 0; i < N; ++i)
236 pmap[i] = i;
237
238 // fisher-yates to randomly perturb
239 for (int i = N; --i; )
240 ::swap (pmap[i], pmap[rng (i + 1)]);
241}
242
243template class permutation<256, uint8_t>;
244
245/////////////////////////////////////////////////////////////////////////////
246
247static vec2d
248floor (vec2d v)
249{
250 return vec2d (std::floor (v[0]), std::floor (v[1]));
251}
252
253static vec3d
254floor (vec3d v)
255{
256 return vec3d (std::floor (v[0]), std::floor (v[1]), std::floor (v[2]));
257}
258
27noise2d::noise2d (uint32_t seed) 259noise_gen<vec2d>::noise_gen (uint32_t seed)
28{ 260{
29 seedable_rand_gen rng (seed); 261 seedable_rand_gen rng (seed);
30 262
31 for (int i = 0; i < 256; ++i)
32 {
33 for (int j = 0; j < 2; ++j)
34 rvec [i][j] = rng () - 0.5f;
35
36 // normalise
37 float mag = 1.f / sqrtf (rvec [i][0] * rvec [i][0] + rvec [i][1] * rvec [i][1]);
38
39 rvec [i][0] *= mag;
40 rvec [i][1] *= mag;
41 }
42
43 rvmap [0].seed (rng); 263 rvmap[0].seed (rng);
44 rvmap [1].seed (rng); 264 rvmap[1].seed (rng);
45} 265}
46 266
47float 267vec2d::T_numtype
48noise2d::noise (float x, float y) 268noise_gen<vec2d>::operator() (vec2d P)
49{ 269{
50 int ix = floorf (x); float fx = x - ix;
51 int iy = floorf (y); float fy = y - iy;
52
53 float v = 0;
54
55 for (int j = -1; j <= 2; ++j)
56 for (int i = -1; i <= 2; ++i)
57 {
58 float Ax = fx - i;
59 float Ay = fy - j;
60
61 float d = Ax * Ax + Ay * Ay;
62
63 if (d < 4)
64 {
65 int h = rvmap [0](ix + i) ^ rvmap [1](iy + j);
66 float *G = rvec [h & 0xff];
67
68 float t1 = 1 - d / 4;
69 float t2 = t1 * t1;
70 float t4 = t2 * t2;
71
72 float p = (4 * t1 - 3) * t4;
73 v += (Ax * G[0] + Ay * G[1]) * p;
74 }
75 }
76
77 return clamp (v * 2, -.9999999f, .9999999f);
78}
79
80#if 0||ABSTRACTION_PENALTY_IS_GONE
81float
82noise2d::noise (float x, float y)
83{
84 vec2d X = vec2d (x, y);
85 gen_vec<2,int> I = floor (X); 270 vec2d I = floor (P);
86 vec2d F = X - I; 271 vec2d F = P - I;
87 272
88 float v = 0; 273 float v = 0;
89 274
90 for (int j = -1; j <= 2; ++j) 275 for (int j = -1; j <= 2; ++j)
91 for (int i = -1; i <= 2; ++i) 276 for (int i = -1; i <= 2; ++i)
92 { 277 {
93 vec2d A = F - vec2d (i, j); 278 vec2d A = F - vec2d (i, j);
94 279
95 float d = A * A; 280 float d = dot (A, A);
96 281
97 if (d < 4) 282 if (d < 4)
98 { 283 {
99 int h = rvmap [0](I[0] + i) ^ rvmap [1](I[1] + j);
100 float *G = rvec [h & 0xff];
101
102 float t1 = 1 - d / 4; 284 float t1 = 1 - d / 4;
103 float t2 = t1 * t1; 285 float t2 = t1 * t1;
104 float t4 = t2 * t2; 286 float t4 = t2 * t2;
105 287
106 float p = (4 * t1 - 3) * t4; 288 float p = (4 * t1 - 3) * t4;
107 v += A * vec2d (G[0], G[1]) * p; 289
290 int h = rvmap[0](I[0] + i) ^ rvmap[1](I[1] + j);
291 vec2d G = charges2[h & 0xff];
292
293 v += dot (A, G) * p;
108 } 294 }
109 } 295 }
110 296
111 return clamp (v * 2, -.9999999f, .9999999f); 297 return clamp (v, -.9999999, .9999999);
112} 298}
113#endif
114 299
115///////////////////////////////////////////////////////////////////////////// 300/////////////////////////////////////////////////////////////////////////////
116 301
117noise3d::noise3d (uint32_t seed) 302noise_gen<vec3d>::noise_gen (uint32_t seed)
118{ 303{
119 seedable_rand_gen rng (seed); 304 seedable_rand_gen rng (seed);
120
121 for (int i = 0; i < 256; ++i)
122 {
123 for (int j = 0; j < 3; ++j)
124 rvec [i][j] = rng () - 0.5f;
125
126 // normalise
127 float mag = 1.f / sqrtf (rvec [i][0] * rvec [i][0]
128 + rvec [i][1] * rvec [i][1]
129 + rvec [i][2] * rvec [i][2]);
130
131 rvec [i][0] *= mag;
132 rvec [i][1] *= mag;
133 rvec [i][2] *= mag;
134 }
135 305
136 rvmap [0].seed (rng); 306 rvmap [0].seed (rng);
137 rvmap [1].seed (rng); 307 rvmap [1].seed (rng);
138 rvmap [2].seed (rng); 308 rvmap [2].seed (rng);
139} 309}
140 310
141float 311vec3d::T_numtype
142noise3d::noise (float x, float y, float z) 312noise_gen<vec3d>::operator() (vec3d P)
143{ 313{
144 int ix = floorf (x); float fx = x - ix; 314 vec3d I = floor (P);
145 int iy = floorf (y); float fy = y - iy; 315 vec3d F = P - I;
146 int iz = floorf (z); float fz = z - iz;
147 316
148 float v = 0; 317 float v = 0;
149 318
150 for (int j = -1; j <= 2; ++j) 319 for (int j = -1; j <= 2; ++j)
151 for (int i = -1; i <= 2; ++i) 320 for (int i = -1; i <= 2; ++i)
152 for (int k = -1; k <= 2; ++k) 321 for (int k = -1; k <= 2; ++k)
153 { 322 {
154 float Ax = fx - i; 323 vec3d A = F - vec3d (i, j, k);
155 float Ay = fy - j; 324 float d = dot (A, A);
156 float Az = fz - k;
157
158 float d = Ax * Ax + Ay * Ay + Az * Az;
159 325
160 if (d < 4) 326 if (d < 4)
161 { 327 {
162 int h = rvmap [0](ix + i) ^ rvmap [1](iy + j) ^ rvmap [2](iz + k);
163 float *G = rvec [h & 0xff];
164
165 float t1 = 1 - d / 4; 328 float t1 = 1 - d / 4;
166 float t2 = t1 * t1; 329 float t2 = t1 * t1;
167 float t4 = t2 * t2; 330 float t4 = t2 * t2;
168 331
169 // (4t⁵ - 3t⁴) 332 // (4t⁵ - 3t⁴)
170 float p = (4 * t1 - 3) * t4; 333 float p = (4 * t1 - 3) * t4;
171 v += (Ax * G[0] + Ay * G[1] + Az * G[2]) * p; 334
335 int h = rvmap[0](I[0] + i) ^ rvmap[1](I[1] + j) ^ rvmap[2](I[2] + k);
336 const float *G = charges3[h & 0xff];
337
338 v += dot (A, vec3d (G[0], G[1], G[2])) * p;
172 } 339 }
173 } 340 }
174 341
175 return clamp (v * 2, -.9999999f, .9999999f); 342 return clamp (v * 2, -.9999999, .9999999);
176} 343}
177 344
178float 345vec3d::T_numtype
179noise3d::noise (float x, float y, float z, float nx, float ny, float nz) 346noise_gen<vec3d>::operator() (vec3d P, vec3d N)
180{ 347{
181 int ix = floorf (x); float fx = x - ix; 348 vec3d I = floor (P);
182 int iy = floorf (y); float fy = y - iy; 349 vec3d F = P - I;
183 int iz = floorf (z); float fz = z - iz;
184 350
185 float v = 0; 351 float v = 0;
186 352
187 for (int j = -1; j <= 2; ++j) 353 for (int j = -1; j <= 2; ++j)
188 for (int i = -1; i <= 2; ++i) 354 for (int i = -1; i <= 2; ++i)
189 for (int k = -1; k <= 2; ++k) 355 for (int k = -1; k <= 2; ++k)
190 { 356 {
191 float Dx = fx - i; 357 vec3d D = F - vec3d (i, j, k);
192 float Dy = fy - j; 358 float e = dot (D, N);
193 float Dz = fz - k;
194
195 float e = Dx * nx + Dy * ny + Dz * nz;
196
197 float o = 1 - abs (e); 359 float o = 1 - abs (e);
198 360
199 if (o > 0) 361 if (o > 0)
200 { 362 {
201 float Ax = Dx - e * nx; 363 vec3d A = D - e * N;
202 float Ay = Dy - e * ny; 364 float d = dot (A, A);
203 float Az = Dz - e * nz;
204
205 float d = Ax * Ax + Ay * Ay + Az * Az;
206 365
207 if (d < 4) 366 if (d < 4)
208 { 367 {
209 int h = rvmap [0](ix + i) ^ rvmap [1](iy + j) ^ rvmap [2](iz + k);
210 float *G = rvec [h & 0xff];
211
212 float t1 = 1 - d / 4; 368 float t1 = 1 - d / 4;
213 float t2 = t1 * t1; 369 float t2 = t1 * t1;
214 float t4 = t2 * t2; 370 float t4 = t2 * t2;
215 371
216 float o2 = o * o; 372 float o2 = o * o;
217 373
218 // (4t⁵ - 3t⁴) * (3o³ - 2o²) 374 // (4t⁵ - 3t⁴) * (3o³ - 2o²)
375 // alternative? ((o * 6 - 15) * o + 10) * o³
219 float p = (4 * t1 - 3) * t4 * (3 * o2 - 2 * o2 * o); 376 float p = (4 * t1 - 3) * t4 * (3 * o2 - 2 * o2 * o);
220 v += (Ax * G[0] + Ay * G[1] + Az * G[2]) * p; 377
378 int h = rvmap[0](I[0] + i) ^ rvmap[1](I[1] + j) ^ rvmap[2](I[2] + k);
379 const float *G = charges3[h & 0xff];
380
381 v += dot (A, vec3d (G[0], G[1], G[2])) * p;
221 } 382 }
222 } 383 }
223 } 384 }
224 385
225 return clamp (v * 2, -.9999999f, .9999999f); 386 return clamp (v, -.9999999, .9999999);
226} 387}
227 388
389template class noise_gen<vec2d>;
390template class noise_gen<vec3d>;
391
392/////////////////////////////////////////////////////////////////////////////
393
394// find some uncorrelated spot - we assume that noise 2 units away
395// is completely uncorrelated - this is not true for other coordinates,
396// but generally works well.
397template<class vec_t>
398static vec_t
399ith_octave (vec_t P, int i)
400{
401 vec_t r = P;
402 r[0] += i;
403 r[1] += i * 2;
404 return r;
405}
406
407template<class vec_t>
228frac_gen::frac_gen (float hurst_expo, float lacunarity) 408frac_gen<vec_t>::frac_gen (value_t hurst_expo, value_t lacunarity)
229: h (hurst_expo), lac (lacunarity), noise2d (0) 409: h (hurst_expo), lac (lacunarity), noise_gen<vec_t> (0)
230{ 410{
231 float exsum = 0; 411 value_t exsum = 0;
412 value_t phi = noise (vec_t (value_t (0))) * 0.5 + 1;
232 413
233 for (int i = 0; i < MAX_OCTAVES; ++i) 414 for (int i = 0; i < MAX_OCTAVES; ++i)
234 { 415 {
235 ex [i] = powf (lac, -h * i); 416 ex [i] = pow (lac, -h * i);
236 exsum += ex [i]; 417 exsum += ex [i];
237 fbm_mul [i] = 0.5f / (exsum * 0.75f); // .75f is a heuristic 418 fbm_mul [i] = 0.5 / (exsum * 0.75); // .75 is a heuristic
238 rot [i].set (0.4488f * i); 419 rot [i].set (phi * i + 1);
239 } 420 }
240} 421}
241 422
242float 423template<class vec_t>
243frac_gen::fBm (float x, float y, int octaves) 424typename frac_gen<vec_t>::value_t
425frac_gen<vec_t>::fBm (vec_t P, int octaves)
244{ 426{
245 float v = 0.f; 427 value_t v = 0;
246 428
247 for (int i = 0; i < octaves; ++i) 429 for (int i = 0; i < octaves; ++i)
248 { 430 {
249 rot [i](x, y); 431 rot [i](P);
250
251 v += noise (x + i, y) * ex [i]; 432 v += noise (ith_octave (P, i)) * ex [i];
252
253 x *= lac; 433 P *= lac;
254 y *= lac;
255 } 434 }
256 435
257 return clamp (v * fbm_mul [octaves - 1] + 0.5f, 0.f, .9999999f); 436 return clamp<value_t> (v * fbm_mul [octaves - 1] + 0.5, 0, .9999999);
258} 437}
259 438
260float 439template<class vec_t>
261frac_gen::turbulence (float x, float y, int octaves) 440typename frac_gen<vec_t>::value_t
441frac_gen<vec_t>::turbulence (vec_t P, int octaves)
262{ 442{
263 float v = 0.f; 443 value_t v = 0;
264 444
265 for (int i = 0; i < octaves; ++i) 445 for (int i = 0; i < octaves; ++i)
266 { 446 {
267 rot [i](x, y); 447 rot [i](P);
268
269 v += fabsf (noise (x + i, y)) * ex [i]; 448 v += abs (noise (ith_octave (P, i))) * ex [i];
270
271 x *= lac; 449 P *= lac;
272 y *= lac;
273 } 450 }
274 451
275 return clamp (v * fbm_mul [octaves - 1] * 2.f, 0.f, .9999999f); 452 return clamp<value_t> (v * fbm_mul [octaves - 1] * (0.5 / noise_gen<vec_t>::abs_avg ()), 0, .9999999);
276} 453}
277 454
278float 455template<class vec_t>
456typename frac_gen<vec_t>::value_t
279frac_gen::multifractal (float x, float y, int octaves, float offset) 457frac_gen<vec_t>::multifractal (vec_t P, int octaves, value_t offset)
280{ 458{
281 float v = 1.f; 459 value_t v = 1;
282 460
283 for (int i = 0; i < octaves; ++i) 461 for (int i = 0; i < octaves; ++i)
284 { 462 {
285 rot [i](x, y); 463 rot [i](P);
286
287 v *= noise (x, y) * ex [i] + offset; 464 v *= noise (P) * ex [i] + offset;
288
289 x *= lac; 465 P *= lac;
290 y *= lac;
291 } 466 }
292 467
293 return clamp (v * 0.5f, 0.f, .9999999f); 468 return clamp<value_t> (v * 0.5, 0, .9999999);
294} 469}
295 470
296float 471template<class vec_t>
472typename frac_gen<vec_t>::value_t
297frac_gen::heterofractal (float x, float y, int octaves, float offset) 473frac_gen<vec_t>::heterofractal (vec_t P, int octaves, value_t offset)
298{ 474{
299 float v = noise (x, y) + offset; 475 value_t v = noise (P) + offset;
300 int i;
301 476
302 for (i = 1; i < octaves; ++i) 477 for (int i = 1; i < octaves; ++i)
303 { 478 {
304 rot [i](x, y); 479 rot [i](P);
305
306 x *= lac; 480 P *= lac;
307 y *= lac;
308
309 v += v * (noise (x, y) * ex [i] + offset); 481 v += v * (noise (P) * ex [i] + offset);
310 } 482 }
311 483
312 return v / powf (2., octaves); 484 return v / (1 << octaves);
313} 485}
314 486
315float 487template<class vec_t>
316frac_gen::hybridfractal (float x, float y, int octaves, float offset, float gain) 488typename frac_gen<vec_t>::value_t
489frac_gen<vec_t>::hybridfractal (vec_t P, int octaves, value_t offset, value_t gain)
317{ 490{
318 float v = (noise (x, y) + offset) * ex [0]; 491 value_t v = (noise (P) + offset) * ex [0];
319 float weight = v; 492 value_t weight = v;
320 int i;
321 493
322 for (i = 1; i < octaves; ++i) 494 for (int i = 1; i < octaves; ++i)
323 { 495 {
324 rot [i](x, y); 496 rot [i](P);
325
326 x *= lac; 497 P *= lac;
327 y *= lac;
328 498
329 min_it (weight, 1.f); 499 min_it (weight, 1);
330 500
331 float sig = (noise (x, y) + offset) * ex [i]; 501 value_t sig = (noise (P) + offset) * ex [i];
332 v += weight * sig; 502 v += weight * sig;
333 weight *= gain * sig; 503 weight *= gain * sig;
334 } 504 }
335 505
336 return clamp (v * 0.5f + 0.5f, 0.f, .9999999f); 506 return clamp<value_t> (v * 0.5 + 0.5, 0, .9999999);
337} 507}
338 508
339// http://www.gamasutra.com/view/feature/3098/a_realtime_procedural_universe_.php?page=2 509template<class vec_t>
340float 510typename frac_gen<vec_t>::value_t
341frac_gen::terrain (float x, float y, int octaves)
342{
343 float v = 0.f;
344
345 for (int i = 0; i < octaves; ++i)
346 {
347 rot[i] (x, y);
348
349 v += noise (x + i, y) * ex [i];
350
351 x *= lac;
352 y *= lac;
353 }
354
355 v *= fbm_mul [octaves - 1];
356
357 return v <= 0.f ? - powf (-v, 0.7f) : powf (v, 1. + noise (x, y) * v);
358}
359
360float
361frac_gen::terrain2 (float x, float y, int octaves)
362{
363 float a = fBm (x, y, octaves);
364 float b = ridgedmultifractal (x, y, octaves, 1, 8);
365 float fade = fBm (x + 10.3, y + 10.3, octaves);
366
367 const float width = 0.05f;
368
369 if (fade > 0.5f + width)
370 return a;
371 else if (fade < 0.5f - width)
372 return b;
373
374 fade = (fade - 0.5f + width) / (width * 2);
375
376 // sigmoidal curve
377 fade = fade * fade * 2 * (1.5f - fade);
378
379 return a * fade + b * (1 - fade);
380}
381
382float
383frac_gen::ridgedmultifractal (float x, float y, int octaves, float offset, float gain) 511frac_gen<vec_t>::ridgedmultifractal (vec_t P, int octaves, value_t offset, value_t gain)
384{ 512{
385 float sig = offset - fabsf (noise (x, y)); 513 value_t sig = offset - abs (noise (P));
386 sig *= sig; 514 sig *= sig;
387 float v = sig; 515 value_t v = sig;
388 516
389 for (int i = 1; i < octaves; ++i) 517 for (int i = 1; i < octaves; ++i)
390 { 518 {
391 rot [i](x, y); 519 rot [i](P);
392
393 x *= lac; 520 P *= lac;
394 y *= lac;
395 521
396 float w = clamp (sig * gain, 0.f, 1.f); 522 value_t w = clamp (sig * gain, 0, 1);
397 523
398 sig = offset - fabsf (noise (x, y)); 524 sig = offset - abs (noise (P));
399 sig *= sig; 525 sig *= sig;
400 sig *= w; 526 sig *= w;
401 527
402 v += sig * ex [i]; 528 v += sig * ex [i];
403 } 529 }
404 530
405 return clamp (v * 0.25f, 0.f, .9999999f); 531 return clamp<value_t> (v * 0.25, 0, .9999999);
406} 532}
407 533
408#if 0 534template<class vec_t>
409void hack() 535typename frac_gen<vec_t>::value_t
536frac_gen<vec_t>::billowfractal (vec_t P, int octaves, value_t offset, value_t gain)
410{ 537{
538 value_t v = 0;
539
540 offset += 2 * noise_gen<vec_t>::abs_avg () - 1;
541
542 for (int i = 0; i < octaves; ++i)
543 {
544 rot [i](P);
545 v += (abs (noise (ith_octave (P, i))) * gain - offset) * ex [i];
546 P *= lac;
547 }
548
549 return clamp<value_t> (v, -.9999999, .9999999);
550}
551
552// http://www.gamasutra.com/view/feature/3098/a_realtime_procedural_universe_.php?page=2
553template<class vec_t>
554typename frac_gen<vec_t>::value_t
555frac_gen<vec_t>::terrain (vec_t P, int octaves)
556{
557 value_t v = 0;
558
559 for (int i = 0; i < octaves; ++i)
560 {
561 rot [i](P);
562 v += noise (P) * ex [i];
563 P *= lac;
564 }
565
566 v *= fbm_mul [octaves - 1];
567
568 return v <= 0 ? - pow (-v, 0.7) : pow (v, 1 + noise (P) * v);
569}
570
571template<class vec_t>
572typename frac_gen<vec_t>::value_t
573frac_gen<vec_t>::terrain2 (vec_t P, int octaves)
574{
575 value_t a = fBm (P, octaves);
576 value_t b = ridgedmultifractal (P, octaves, 1, 8);
577 value_t fade = fBm (P + vec_t(10.3), octaves);
578
579 const value_t width = 0.05;
580
581 if (fade > 0.5 + width)
582 return a;
583 else if (fade < 0.5 - width)
584 return b;
585
586 fade = (fade - 0.5 + width) / (width * 2);
587
588 // sigmoidal curve
589 fade = fade * fade * 2 * (1.5 - fade);
590
591 return a * fade + b * (1 - fade);
592}
593
594template class frac_gen<vec2d>;
595template class frac_gen<vec3d>;
596
597/////////////////////////////////////////////////////////////////////////////
598
599void noise_test ();
600void noise_test ()
601{
411 frac_gen gen (0.5, 2); 602 frac_gen<vec2d> gen (0.5, 1.9);
412 noise3d n(0); 603 frac_gen<vec3d> gen3;
413 604
414#if 0 605#if 1
415 int N = 1024; 606 int N = 1024;
416 607
417 printf ("P6 %d %d 255\n", N, N); 608 printf ("P5 %d %d 255\n", N, N);
418 // pmake&&server/deliantra-server >x&&convert -depth 8 -size 512xx512 gray:x x.ppm&& cv x.ppm 609 // pmake&&server/deliantra-server >x&&convert -depth 8 -size 512xx512 gray:x x.ppm&& cv x.ppm
419 for (int y = 0; y < N; ++y) 610 for (int y = 0; y < N; ++y)
420 { 611 {
421 if (!(y&63))fprintf (stderr, "y %d\n", y);//D 612 if (!(y&63))fprintf (stderr, "y %d\n", y);//D
422 for (int x = 0; x < N; ++x) 613 for (int x = 0; x < N; ++x)
423 { 614 {
424 putc (128 + 128 * n.noise (x * 0.04 + 0.2, y * 0.04 + 0.2), stdout); 615 //putc (127 * gen.noise (vec2d (x * 0.01, y * 0.01)) + 128, stdout);
425 putc (128 + 128 * n.noise (x * 0.04 + 0.2, y * 0.08 + 0.2), stdout);
426 putc (128 + 128 * n.noise (x * 0.08 + 0.2, y * 0.04 + 0.2), stdout);
427 //putc (256 * gen.terrain2 (x * 0.004, y * 0.004, 8), stdout); 616 //putc (256 * gen.terrain2 (x * 0.004, y * 0.004, 8), stdout);
428 //putc (256 * gen.fBm (x * 0.001, y * 0.001, 3), stdout); 617 //putc (256 * gen.fBm (vec2d(x * 0.01, y * 0.01), 16), stdout);
429 //putc (256 * gen.turbulence (x * 0.004 - 1, y * 0.004 - 1, 8), stdout); 618 putc (256 * gen.turbulence (vec2d (x * 0.004 - 1, y * 0.004 - 1), 10), stdout);
430 //putc (256 * gen.heterofractal (x * 0.008, y * 0.008, 8, -1.1, 2.0), stdout); 619 //putc (256 * gen.heterofractal (vec2d (x * 0.008, y * 0.008), 8, 0.9), stdout);
431 //putc (256 * gen.ridgedmultifractal (x * 0.001, y * 0.001, 32, 1.001, 32), stdout); 620
621 // mountais or somesuch(?)
622 //putc (256 * gen.hybridfractal (vec2d (x * 0.01, y * 0.01), 8, -.4, -4), stdout);
623
624 // temperature
625 //putc (256 * gen.fBm (vec2d (x * 0.002, y * 0.002), 2), stdout);
626 // rain
627
628 //cells
629 //putc (127.49 * gen.billowfractal (vec2d (x * 0.01, y * 0.01), 9) + 128, stdout);
432 } 630 }
433 } 631 }
434#else 632#else
435 int N = 128; 633 int N = 512;
436 634
437 //printf ("P6 %d %d 255\n", N, N); 635 //printf ("P6 %d %d 255\n", N, N);
438 // pmake&&server/deliantra-server >x&&convert -depth 8 -size 512xx512 gray:x x.ppm&& cv x.ppm 636 // pmake&&server/deliantra-server >x&&convert -depth 8 -size 512xx512 gray:x x.ppm&& cv x.ppm
439 for (int z = 0; z < N; ++z) 637 for (int z = 0; z < N; ++z)
440 { 638 {
441 if (!(z&4))fprintf (stderr, "z %d\n", z);//D 639 if (!(z&7))fprintf (stderr, "z %d\n", z);//D
442 for (int y = 0; y < N; ++y) 640 for (int y = 0; y < N; ++y)
443 for (int x = 0; x < N; ++x) 641 for (int x = 0; x < N; ++x)
444 { 642 {
445 float v = n.noise (x * 0.06 + 0.2, y * 0.06 + 0.2, z * 0.06 + 0.2) * 0.5 + 0.5; 643 float v = gen3.ridgedmultifractal (vec3d (x * 0.01 + 0.2, y * 0.01 + 0.2, z * 0.01 + 0.2), 3, 1.03, 2) * 2;
446 644
645#if 0
447 if (z < 64) 646 if (z < 64)
448 v = v * (z * z) / (64 * 64); 647 v = v * (z * z) / (64 * 64);
648#endif
449 649
450 if (v <= 0.1) 650 if (v <= 0.9999)
451 continue; 651 continue;
452 652
453 float r[4]; 653 float r[4];
454 int i[4]; 654 int i[4];
455 655
470 } 670 }
471#endif 671#endif
472 672
473 exit (0); 673 exit (0);
474} 674}
475#endif

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines