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.1 by root, Sun Jul 11 04:01:48 2010 UTC vs.
Revision 1.4 by root, Sat Apr 23 04:46:25 2011 UTC

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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines