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

Diff Legend

Removed lines
+ Added lines
< Changed lines
> Changed lines