diff --git a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/FastNoiseLite.java b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/FastNoiseLite.java deleted file mode 100644 index d77b7791f..000000000 --- a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/FastNoiseLite.java +++ /dev/null @@ -1,2658 +0,0 @@ -package com.dfsek.terra.api.math.noise.samplers;// MIT License - -import com.dfsek.terra.api.math.noise.NoiseSampler; -import com.dfsek.terra.api.math.vector.Vector2; -import com.dfsek.terra.api.math.vector.Vector3; -import net.jafama.FastMath; - -/* - -Copyright(c) 2020 Jordan Peck (jordan.me2@gmail.com) -Copyright(c) 2020 Contributors - -Permission is hereby granted, free of charge, to any person obtaining a copy -of this software and associated documentation files(the "Software"), to deal -in the Software without restriction, including without limitation the rights -to use, copy, modify, merge, publish, distribute, sublicense, and / or sell -copies of the Software, and to permit persons to whom the Software is -furnished to do so, subject to the following conditions : - -The above copyright notice and this permission notice shall be included in all -copies or substantial portions of the Software. - -THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR -IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, -FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.IN NO EVENT SHALL THE -AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER -LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, -OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE -SOFTWARE. - -VERSION: 1.0.1 -https://github.com/Auburn/FastNoise - */ -@SuppressWarnings({"ManualMinMaxCalculation", "unused"}) -public class FastNoiseLite implements NoiseSampler { - private static final double[] GRADIENTS_2_D = { - 0.130526192220052f, 0.99144486137381f, 0.38268343236509f, 0.923879532511287f, 0.608761429008721f, 0.793353340291235f, - 0.793353340291235f, 0.608761429008721f, 0.923879532511287f, 0.38268343236509f, 0.99144486137381f, 0.130526192220051f, - 0.99144486137381f, -0.130526192220051f, 0.923879532511287f, -0.38268343236509f, 0.793353340291235f, -0.60876142900872f, - 0.608761429008721f, -0.793353340291235f, 0.38268343236509f, -0.923879532511287f, 0.130526192220052f, -0.99144486137381f, - -0.130526192220052f, -0.99144486137381f, -0.38268343236509f, -0.923879532511287f, -0.608761429008721f, -0.793353340291235f, - -0.793353340291235f, -0.608761429008721f, -0.923879532511287f, -0.38268343236509f, -0.99144486137381f, -0.130526192220052f, - -0.99144486137381f, 0.130526192220051f, -0.923879532511287f, 0.38268343236509f, -0.793353340291235f, 0.608761429008721f, - -0.608761429008721f, 0.793353340291235f, -0.38268343236509f, 0.923879532511287f, -0.130526192220052f, 0.99144486137381f, - 0.130526192220052f, 0.99144486137381f, 0.38268343236509f, 0.923879532511287f, 0.608761429008721f, 0.793353340291235f, - 0.793353340291235f, 0.608761429008721f, 0.923879532511287f, 0.38268343236509f, 0.99144486137381f, 0.130526192220051f, - 0.99144486137381f, -0.130526192220051f, 0.923879532511287f, -0.38268343236509f, 0.793353340291235f, -0.60876142900872f, - 0.608761429008721f, -0.793353340291235f, 0.38268343236509f, -0.923879532511287f, 0.130526192220052f, -0.99144486137381f, - -0.130526192220052f, -0.99144486137381f, -0.38268343236509f, -0.923879532511287f, -0.608761429008721f, -0.793353340291235f, - -0.793353340291235f, -0.608761429008721f, -0.923879532511287f, -0.38268343236509f, -0.99144486137381f, -0.130526192220052f, - -0.99144486137381f, 0.130526192220051f, -0.923879532511287f, 0.38268343236509f, -0.793353340291235f, 0.608761429008721f, - -0.608761429008721f, 0.793353340291235f, -0.38268343236509f, 0.923879532511287f, -0.130526192220052f, 0.99144486137381f, - 0.130526192220052f, 0.99144486137381f, 0.38268343236509f, 0.923879532511287f, 0.608761429008721f, 0.793353340291235f, - 0.793353340291235f, 0.608761429008721f, 0.923879532511287f, 0.38268343236509f, 0.99144486137381f, 0.130526192220051f, - 0.99144486137381f, -0.130526192220051f, 0.923879532511287f, -0.38268343236509f, 0.793353340291235f, -0.60876142900872f, - 0.608761429008721f, -0.793353340291235f, 0.38268343236509f, -0.923879532511287f, 0.130526192220052f, -0.99144486137381f, - -0.130526192220052f, -0.99144486137381f, -0.38268343236509f, -0.923879532511287f, -0.608761429008721f, -0.793353340291235f, - -0.793353340291235f, -0.608761429008721f, -0.923879532511287f, -0.38268343236509f, -0.99144486137381f, -0.130526192220052f, - -0.99144486137381f, 0.130526192220051f, -0.923879532511287f, 0.38268343236509f, -0.793353340291235f, 0.608761429008721f, - -0.608761429008721f, 0.793353340291235f, -0.38268343236509f, 0.923879532511287f, -0.130526192220052f, 0.99144486137381f, - 0.130526192220052f, 0.99144486137381f, 0.38268343236509f, 0.923879532511287f, 0.608761429008721f, 0.793353340291235f, - 0.793353340291235f, 0.608761429008721f, 0.923879532511287f, 0.38268343236509f, 0.99144486137381f, 0.130526192220051f, - 0.99144486137381f, -0.130526192220051f, 0.923879532511287f, -0.38268343236509f, 0.793353340291235f, -0.60876142900872f, - 0.608761429008721f, -0.793353340291235f, 0.38268343236509f, -0.923879532511287f, 0.130526192220052f, -0.99144486137381f, - -0.130526192220052f, -0.99144486137381f, -0.38268343236509f, -0.923879532511287f, -0.608761429008721f, -0.793353340291235f, - -0.793353340291235f, -0.608761429008721f, -0.923879532511287f, -0.38268343236509f, -0.99144486137381f, -0.130526192220052f, - -0.99144486137381f, 0.130526192220051f, -0.923879532511287f, 0.38268343236509f, -0.793353340291235f, 0.608761429008721f, - -0.608761429008721f, 0.793353340291235f, -0.38268343236509f, 0.923879532511287f, -0.130526192220052f, 0.99144486137381f, - 0.130526192220052f, 0.99144486137381f, 0.38268343236509f, 0.923879532511287f, 0.608761429008721f, 0.793353340291235f, - 0.793353340291235f, 0.608761429008721f, 0.923879532511287f, 0.38268343236509f, 0.99144486137381f, 0.130526192220051f, - 0.99144486137381f, -0.130526192220051f, 0.923879532511287f, -0.38268343236509f, 0.793353340291235f, -0.60876142900872f, - 0.608761429008721f, -0.793353340291235f, 0.38268343236509f, -0.923879532511287f, 0.130526192220052f, -0.99144486137381f, - -0.130526192220052f, -0.99144486137381f, -0.38268343236509f, -0.923879532511287f, -0.608761429008721f, -0.793353340291235f, - -0.793353340291235f, -0.608761429008721f, -0.923879532511287f, -0.38268343236509f, -0.99144486137381f, -0.130526192220052f, - -0.99144486137381f, 0.130526192220051f, -0.923879532511287f, 0.38268343236509f, -0.793353340291235f, 0.608761429008721f, - -0.608761429008721f, 0.793353340291235f, -0.38268343236509f, 0.923879532511287f, -0.130526192220052f, 0.99144486137381f, - 0.38268343236509f, 0.923879532511287f, 0.923879532511287f, 0.38268343236509f, 0.923879532511287f, -0.38268343236509f, - 0.38268343236509f, -0.923879532511287f, -0.38268343236509f, -0.923879532511287f, -0.923879532511287f, -0.38268343236509f, - -0.923879532511287f, 0.38268343236509f, -0.38268343236509f, 0.923879532511287f, - }; - - private static final double[] RAND_VECS_2D = { - -0.2700222198f, -0.9628540911f, 0.3863092627f, -0.9223693152f, 0.04444859006f, -0.999011673f, -0.5992523158f, -0.8005602176f, - -0.7819280288f, 0.6233687174f, 0.9464672271f, 0.3227999196f, -0.6514146797f, -0.7587218957f, 0.9378472289f, 0.347048376f, - -0.8497875957f, -0.5271252623f, -0.879042592f, 0.4767432447f, -0.892300288f, -0.4514423508f, -0.379844434f, -0.9250503802f, - -0.9951650832f, 0.0982163789f, 0.7724397808f, -0.6350880136f, 0.7573283322f, -0.6530343002f, -0.9928004525f, -0.119780055f, - -0.0532665713f, 0.9985803285f, 0.9754253726f, -0.2203300762f, -0.7665018163f, 0.6422421394f, 0.991636706f, 0.1290606184f, - -0.994696838f, 0.1028503788f, -0.5379205513f, -0.84299554f, 0.5022815471f, -0.8647041387f, 0.4559821461f, -0.8899889226f, - -0.8659131224f, -0.5001944266f, 0.0879458407f, -0.9961252577f, -0.5051684983f, 0.8630207346f, 0.7753185226f, -0.6315704146f, - -0.6921944612f, 0.7217110418f, -0.5191659449f, -0.8546734591f, 0.8978622882f, -0.4402764035f, -0.1706774107f, 0.9853269617f, - -0.9353430106f, -0.3537420705f, -0.9992404798f, 0.03896746794f, -0.2882064021f, -0.9575683108f, -0.9663811329f, 0.2571137995f, - -0.8759714238f, -0.4823630009f, -0.8303123018f, -0.5572983775f, 0.05110133755f, -0.9986934731f, -0.8558373281f, -0.5172450752f, - 0.09887025282f, 0.9951003332f, 0.9189016087f, 0.3944867976f, -0.2439375892f, -0.9697909324f, -0.8121409387f, -0.5834613061f, - -0.9910431363f, 0.1335421355f, 0.8492423985f, -0.5280031709f, -0.9717838994f, -0.2358729591f, 0.9949457207f, 0.1004142068f, - 0.6241065508f, -0.7813392434f, 0.662910307f, 0.7486988212f, -0.7197418176f, 0.6942418282f, -0.8143370775f, -0.5803922158f, - 0.104521054f, -0.9945226741f, -0.1065926113f, -0.9943027784f, 0.445799684f, -0.8951327509f, 0.105547406f, 0.9944142724f, - -0.992790267f, 0.1198644477f, -0.8334366408f, 0.552615025f, 0.9115561563f, -0.4111755999f, 0.8285544909f, -0.5599084351f, - 0.7217097654f, -0.6921957921f, 0.4940492677f, -0.8694339084f, -0.3652321272f, -0.9309164803f, -0.9696606758f, 0.2444548501f, - 0.08925509731f, -0.996008799f, 0.5354071276f, -0.8445941083f, -0.1053576186f, 0.9944343981f, -0.9890284586f, 0.1477251101f, - 0.004856104961f, 0.9999882091f, 0.9885598478f, 0.1508291331f, 0.9286129562f, -0.3710498316f, -0.5832393863f, -0.8123003252f, - 0.3015207509f, 0.9534596146f, -0.9575110528f, 0.2883965738f, 0.9715802154f, -0.2367105511f, 0.229981792f, 0.9731949318f, - 0.955763816f, -0.2941352207f, 0.740956116f, 0.6715534485f, -0.9971513787f, -0.07542630764f, 0.6905710663f, -0.7232645452f, - -0.290713703f, -0.9568100872f, 0.5912777791f, -0.8064679708f, -0.9454592212f, -0.325740481f, 0.6664455681f, 0.74555369f, - 0.6236134912f, 0.7817328275f, 0.9126993851f, -0.4086316587f, -0.8191762011f, 0.5735419353f, -0.8812745759f, -0.4726046147f, - 0.9953313627f, 0.09651672651f, 0.9855650846f, -0.1692969699f, -0.8495980887f, 0.5274306472f, 0.6174853946f, -0.7865823463f, - 0.8508156371f, 0.52546432f, 0.9985032451f, -0.05469249926f, 0.1971371563f, -0.9803759185f, 0.6607855748f, -0.7505747292f, - -0.03097494063f, 0.9995201614f, -0.6731660801f, 0.739491331f, -0.7195018362f, -0.6944905383f, 0.9727511689f, 0.2318515979f, - 0.9997059088f, -0.0242506907f, 0.4421787429f, -0.8969269532f, 0.9981350961f, -0.061043673f, -0.9173660799f, -0.3980445648f, - -0.8150056635f, -0.5794529907f, -0.8789331304f, 0.4769450202f, 0.0158605829f, 0.999874213f, -0.8095464474f, 0.5870558317f, - -0.9165898907f, -0.3998286786f, -0.8023542565f, 0.5968480938f, -0.5176737917f, 0.8555780767f, -0.8154407307f, -0.5788405779f, - 0.4022010347f, -0.9155513791f, -0.9052556868f, -0.4248672045f, 0.7317445619f, 0.6815789728f, -0.5647632201f, -0.8252529947f, - -0.8403276335f, -0.5420788397f, -0.9314281527f, 0.363925262f, 0.5238198472f, 0.8518290719f, 0.7432803869f, -0.6689800195f, - -0.985371561f, -0.1704197369f, 0.4601468731f, 0.88784281f, 0.825855404f, 0.5638819483f, 0.6182366099f, 0.7859920446f, - 0.8331502863f, -0.553046653f, 0.1500307506f, 0.9886813308f, -0.662330369f, -0.7492119075f, -0.668598664f, 0.743623444f, - 0.7025606278f, 0.7116238924f, -0.5419389763f, -0.8404178401f, -0.3388616456f, 0.9408362159f, 0.8331530315f, 0.5530425174f, - -0.2989720662f, -0.9542618632f, 0.2638522993f, 0.9645630949f, 0.124108739f, -0.9922686234f, -0.7282649308f, -0.6852956957f, - 0.6962500149f, 0.7177993569f, -0.9183535368f, 0.3957610156f, -0.6326102274f, -0.7744703352f, -0.9331891859f, -0.359385508f, - -0.1153779357f, -0.9933216659f, 0.9514974788f, -0.3076565421f, -0.08987977445f, -0.9959526224f, 0.6678496916f, 0.7442961705f, - 0.7952400393f, -0.6062947138f, -0.6462007402f, -0.7631674805f, -0.2733598753f, 0.9619118351f, 0.9669590226f, -0.254931851f, - -0.9792894595f, 0.2024651934f, -0.5369502995f, -0.8436138784f, -0.270036471f, -0.9628500944f, -0.6400277131f, 0.7683518247f, - -0.7854537493f, -0.6189203566f, 0.06005905383f, -0.9981948257f, -0.02455770378f, 0.9996984141f, -0.65983623f, 0.751409442f, - -0.6253894466f, -0.7803127835f, -0.6210408851f, -0.7837781695f, 0.8348888491f, 0.5504185768f, -0.1592275245f, 0.9872419133f, - 0.8367622488f, 0.5475663786f, -0.8675753916f, -0.4973056806f, -0.2022662628f, -0.9793305667f, 0.9399189937f, 0.3413975472f, - 0.9877404807f, -0.1561049093f, -0.9034455656f, 0.4287028224f, 0.1269804218f, -0.9919052235f, -0.3819600854f, 0.924178821f, - 0.9754625894f, 0.2201652486f, -0.3204015856f, -0.9472818081f, -0.9874760884f, 0.1577687387f, 0.02535348474f, -0.9996785487f, - 0.4835130794f, -0.8753371362f, -0.2850799925f, -0.9585037287f, -0.06805516006f, -0.99768156f, -0.7885244045f, -0.6150034663f, - 0.3185392127f, -0.9479096845f, 0.8880043089f, 0.4598351306f, 0.6476921488f, -0.7619021462f, 0.9820241299f, 0.1887554194f, - 0.9357275128f, -0.3527237187f, -0.8894895414f, 0.4569555293f, 0.7922791302f, 0.6101588153f, 0.7483818261f, 0.6632681526f, - -0.7288929755f, -0.6846276581f, 0.8729032783f, -0.4878932944f, 0.8288345784f, 0.5594937369f, 0.08074567077f, 0.9967347374f, - 0.9799148216f, -0.1994165048f, -0.580730673f, -0.8140957471f, -0.4700049791f, -0.8826637636f, 0.2409492979f, 0.9705377045f, - 0.9437816757f, -0.3305694308f, -0.8927998638f, -0.4504535528f, -0.8069622304f, 0.5906030467f, 0.06258973166f, 0.9980393407f, - -0.9312597469f, 0.3643559849f, 0.5777449785f, 0.8162173362f, -0.3360095855f, -0.941858566f, 0.697932075f, -0.7161639607f, - -0.002008157227f, -0.9999979837f, -0.1827294312f, -0.9831632392f, -0.6523911722f, 0.7578824173f, -0.4302626911f, -0.9027037258f, - -0.9985126289f, -0.05452091251f, -0.01028102172f, -0.9999471489f, -0.4946071129f, 0.8691166802f, -0.2999350194f, 0.9539596344f, - 0.8165471961f, 0.5772786819f, 0.2697460475f, 0.962931498f, -0.7306287391f, -0.6827749597f, -0.7590952064f, -0.6509796216f, - -0.907053853f, 0.4210146171f, -0.5104861064f, -0.8598860013f, 0.8613350597f, 0.5080373165f, 0.5007881595f, -0.8655698812f, - -0.654158152f, 0.7563577938f, -0.8382755311f, -0.545246856f, 0.6940070834f, 0.7199681717f, 0.06950936031f, 0.9975812994f, - 0.1702942185f, -0.9853932612f, 0.2695973274f, 0.9629731466f, 0.5519612192f, -0.8338697815f, 0.225657487f, -0.9742067022f, - 0.4215262855f, -0.9068161835f, 0.4881873305f, -0.8727388672f, -0.3683854996f, -0.9296731273f, -0.9825390578f, 0.1860564427f, - 0.81256471f, 0.5828709909f, 0.3196460933f, -0.9475370046f, 0.9570913859f, 0.2897862643f, -0.6876655497f, -0.7260276109f, - -0.9988770922f, -0.047376731f, -0.1250179027f, 0.992154486f, -0.8280133617f, 0.560708367f, 0.9324863769f, -0.3612051451f, - 0.6394653183f, 0.7688199442f, -0.01623847064f, -0.9998681473f, -0.9955014666f, -0.09474613458f, -0.81453315f, 0.580117012f, - 0.4037327978f, -0.9148769469f, 0.9944263371f, 0.1054336766f, -0.1624711654f, 0.9867132919f, -0.9949487814f, -0.100383875f, - -0.6995302564f, 0.7146029809f, 0.5263414922f, -0.85027327f, -0.5395221479f, 0.841971408f, 0.6579370318f, 0.7530729462f, - 0.01426758847f, -0.9998982128f, -0.6734383991f, 0.7392433447f, 0.639412098f, -0.7688642071f, 0.9211571421f, 0.3891908523f, - -0.146637214f, -0.9891903394f, -0.782318098f, 0.6228791163f, -0.5039610839f, -0.8637263605f, -0.7743120191f, -0.6328039957f, - }; - - private static final double[] GRADIENTS_3D = { - 0, 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, - 1, 0, 1, 0, -1, 0, 1, 0, 1, 0, -1, 0, -1, 0, -1, 0, - 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, 0, - 0, 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, - 1, 0, 1, 0, -1, 0, 1, 0, 1, 0, -1, 0, -1, 0, -1, 0, - 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, 0, - 0, 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, - 1, 0, 1, 0, -1, 0, 1, 0, 1, 0, -1, 0, -1, 0, -1, 0, - 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, 0, - 0, 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, - 1, 0, 1, 0, -1, 0, 1, 0, 1, 0, -1, 0, -1, 0, -1, 0, - 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, 0, - 0, 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, - 1, 0, 1, 0, -1, 0, 1, 0, 1, 0, -1, 0, -1, 0, -1, 0, - 1, 1, 0, 0, -1, 1, 0, 0, 1, -1, 0, 0, -1, -1, 0, 0, - 1, 1, 0, 0, 0, -1, 1, 0, -1, 1, 0, 0, 0, -1, -1, 0 - }; - - private static final double[] RAND_VECS_3D = { - -0.7292736885f, -0.6618439697f, 0.1735581948f, 0, 0.790292081f, -0.5480887466f, -0.2739291014f, 0, 0.7217578935f, 0.6226212466f, - -0.3023380997f, 0, 0.565683137f, -0.8208298145f, -0.0790000257f, 0, 0.760049034f, -0.5555979497f, -0.3370999617f, 0, - 0.3713945616f, 0.5011264475f, 0.7816254623f, 0, -0.1277062463f, -0.4254438999f, -0.8959289049f, 0, -0.2881560924f, - -0.5815838982f, 0.7607405838f, 0, 0.5849561111f, -0.662820239f, -0.4674352136f, 0, 0.3307171178f, 0.0391653737f, 0.94291689f, 0, - 0.8712121778f, -0.4113374369f, -0.2679381538f, 0, 0.580981015f, 0.7021915846f, 0.4115677815f, 0, 0.503756873f, 0.6330056931f, - -0.5878203852f, 0, 0.4493712205f, 0.601390195f, 0.6606022552f, 0, -0.6878403724f, 0.09018890807f, -0.7202371714f, 0, - -0.5958956522f, -0.6469350577f, 0.475797649f, 0, -0.5127052122f, 0.1946921978f, -0.8361987284f, 0, -0.9911507142f, - -0.05410276466f, -0.1212153153f, 0, -0.2149721042f, 0.9720882117f, -0.09397607749f, 0, -0.7518650936f, -0.5428057603f, - 0.3742469607f, 0, 0.5237068895f, 0.8516377189f, -0.02107817834f, 0, 0.6333504779f, 0.1926167129f, -0.7495104896f, 0, - -0.06788241606f, 0.3998305789f, 0.9140719259f, 0, -0.5538628599f, -0.4729896695f, -0.6852128902f, 0, -0.7261455366f, - -0.5911990757f, 0.3509933228f, 0, -0.9229274737f, -0.1782808786f, 0.3412049336f, 0, -0.6968815002f, 0.6511274338f, - 0.3006480328f, 0, 0.9608044783f, -0.2098363234f, -0.1811724921f, 0, 0.06817146062f, -0.9743405129f, 0.2145069156f, 0, - -0.3577285196f, -0.6697087264f, -0.6507845481f, 0, -0.1868621131f, 0.7648617052f, -0.6164974636f, 0, -0.6541697588f, - 0.3967914832f, 0.6439087246f, 0, 0.6993340405f, -0.6164538506f, 0.3618239211f, 0, -0.1546665739f, 0.6291283928f, 0.7617583057f, - 0, -0.6841612949f, -0.2580482182f, -0.6821542638f, 0, 0.5383980957f, 0.4258654885f, 0.7271630328f, 0, -0.5026987823f, - -0.7939832935f, -0.3418836993f, 0, 0.3202971715f, 0.2834415347f, 0.9039195862f, 0, 0.8683227101f, -0.0003762656404f, - -0.4959995258f, 0, 0.791120031f, -0.08511045745f, 0.6057105799f, 0, -0.04011016052f, -0.4397248749f, 0.8972364289f, 0, - 0.9145119872f, 0.3579346169f, -0.1885487608f, 0, -0.9612039066f, -0.2756484276f, 0.01024666929f, 0, 0.6510361721f, - -0.2877799159f, -0.7023778346f, 0, -0.2041786351f, 0.7365237271f, 0.644859585f, 0, -0.7718263711f, 0.3790626912f, 0.5104855816f, - 0, -0.3060082741f, -0.7692987727f, 0.5608371729f, 0, 0.454007341f, -0.5024843065f, 0.7357899537f, 0, 0.4816795475f, - 0.6021208291f, -0.6367380315f, 0, 0.6961980369f, -0.3222197429f, 0.641469197f, 0, -0.6532160499f, -0.6781148932f, 0.3368515753f, - 0, 0.5089301236f, -0.6154662304f, -0.6018234363f, 0, -0.1635919754f, -0.9133604627f, -0.372840892f, 0, 0.52408019f, - -0.8437664109f, 0.1157505864f, 0, 0.5902587356f, 0.4983817807f, -0.6349883666f, 0, 0.5863227872f, 0.494764745f, 0.6414307729f, - 0, 0.6779335087f, 0.2341345225f, 0.6968408593f, 0, 0.7177054546f, -0.6858979348f, 0.120178631f, 0, -0.5328819713f, - -0.5205125012f, 0.6671608058f, 0, -0.8654874251f, -0.0700727088f, -0.4960053754f, 0, -0.2861810166f, 0.7952089234f, - 0.5345495242f, 0, -0.04849529634f, 0.9810836427f, -0.1874115585f, 0, -0.6358521667f, 0.6058348682f, 0.4781800233f, 0, - 0.6254794696f, -0.2861619734f, 0.7258696564f, 0, -0.2585259868f, 0.5061949264f, -0.8227581726f, 0, 0.02136306781f, - 0.5064016808f, -0.8620330371f, 0, 0.200111773f, 0.8599263484f, 0.4695550591f, 0, 0.4743561372f, 0.6014985084f, -0.6427953014f, - 0, 0.6622993731f, -0.5202474575f, -0.5391679918f, 0, 0.08084972818f, -0.6532720452f, 0.7527940996f, 0, -0.6893687501f, - 0.0592860349f, 0.7219805347f, 0, -0.1121887082f, -0.9673185067f, 0.2273952515f, 0, 0.7344116094f, 0.5979668656f, -0.3210532909f, - 0, 0.5789393465f, -0.2488849713f, 0.7764570201f, 0, 0.6988182827f, 0.3557169806f, -0.6205791146f, 0, -0.8636845529f, - -0.2748771249f, -0.4224826141f, 0, -0.4247027957f, -0.4640880967f, 0.777335046f, 0, 0.5257722489f, -0.8427017621f, - 0.1158329937f, 0, 0.9343830603f, 0.316302472f, -0.1639543925f, 0, -0.1016836419f, -0.8057303073f, -0.5834887393f, 0, - -0.6529238969f, 0.50602126f, -0.5635892736f, 0, -0.2465286165f, -0.9668205684f, -0.06694497494f, 0, -0.9776897119f, - -0.2099250524f, -0.007368825344f, 0, 0.7736893337f, 0.5734244712f, 0.2694238123f, 0, -0.6095087895f, 0.4995678998f, - 0.6155736747f, 0, 0.5794535482f, 0.7434546771f, 0.3339292269f, 0, -0.8226211154f, 0.08142581855f, 0.5627293636f, 0, - -0.510385483f, 0.4703667658f, 0.7199039967f, 0, -0.5764971849f, -0.07231656274f, -0.8138926898f, 0, 0.7250628871f, - 0.3949971505f, -0.5641463116f, 0, -0.1525424005f, 0.4860840828f, -0.8604958341f, 0, -0.5550976208f, -0.4957820792f, - 0.667882296f, 0, -0.1883614327f, 0.9145869398f, 0.357841725f, 0, 0.7625556724f, -0.5414408243f, -0.3540489801f, 0, - -0.5870231946f, -0.3226498013f, -0.7424963803f, 0, 0.3051124198f, 0.2262544068f, -0.9250488391f, 0, 0.6379576059f, 0.577242424f, - -0.5097070502f, 0, -0.5966775796f, 0.1454852398f, -0.7891830656f, 0, -0.658330573f, 0.6555487542f, -0.3699414651f, 0, - 0.7434892426f, 0.2351084581f, 0.6260573129f, 0, 0.5562114096f, 0.8264360377f, -0.0873632843f, 0, -0.3028940016f, -0.8251527185f, - 0.4768419182f, 0, 0.1129343818f, -0.985888439f, -0.1235710781f, 0, 0.5937652891f, -0.5896813806f, 0.5474656618f, 0, - 0.6757964092f, -0.5835758614f, -0.4502648413f, 0, 0.7242302609f, -0.1152719764f, 0.6798550586f, 0, -0.9511914166f, - 0.0753623979f, -0.2992580792f, 0, 0.2539470961f, -0.1886339355f, 0.9486454084f, 0, 0.571433621f, -0.1679450851f, -0.8032795685f, - 0, -0.06778234979f, 0.3978269256f, 0.9149531629f, 0, 0.6074972649f, 0.733060024f, -0.3058922593f, 0, -0.5435478392f, - 0.1675822484f, 0.8224791405f, 0, -0.5876678086f, -0.3380045064f, -0.7351186982f, 0, -0.7967562402f, 0.04097822706f, - -0.6029098428f, 0, -0.1996350917f, 0.8706294745f, 0.4496111079f, 0, -0.02787660336f, -0.9106232682f, -0.4122962022f, 0, - -0.7797625996f, -0.6257634692f, 0.01975775581f, 0, -0.5211232846f, 0.7401644346f, -0.4249554471f, 0, 0.8575424857f, - 0.4053272873f, -0.3167501783f, 0, 0.1045223322f, 0.8390195772f, -0.5339674439f, 0, 0.3501822831f, 0.9242524096f, -0.1520850155f, - 0, 0.1987849858f, 0.07647613266f, 0.9770547224f, 0, 0.7845996363f, 0.6066256811f, -0.1280964233f, 0, 0.09006737436f, - -0.9750989929f, -0.2026569073f, 0, -0.8274343547f, -0.542299559f, 0.1458203587f, 0, -0.3485797732f, -0.415802277f, 0.840000362f, - 0, -0.2471778936f, -0.7304819962f, -0.6366310879f, 0, -0.3700154943f, 0.8577948156f, 0.3567584454f, 0, 0.5913394901f, - -0.548311967f, -0.5913303597f, 0, 0.1204873514f, -0.7626472379f, -0.6354935001f, 0, 0.616959265f, 0.03079647928f, 0.7863922953f, - 0, 0.1258156836f, -0.6640829889f, -0.7369967419f, 0, -0.6477565124f, -0.1740147258f, -0.7417077429f, 0, 0.6217889313f, - -0.7804430448f, -0.06547655076f, 0, 0.6589943422f, -0.6096987708f, 0.4404473475f, 0, -0.2689837504f, -0.6732403169f, - -0.6887635427f, 0, -0.3849775103f, 0.5676542638f, 0.7277093879f, 0, 0.5754444408f, 0.8110471154f, -0.1051963504f, 0, - 0.9141593684f, 0.3832947817f, 0.131900567f, 0, -0.107925319f, 0.9245493968f, 0.3654593525f, 0, 0.377977089f, 0.3043148782f, - 0.8743716458f, 0, -0.2142885215f, -0.8259286236f, 0.5214617324f, 0, 0.5802544474f, 0.4148098596f, -0.7008834116f, 0, - -0.1982660881f, 0.8567161266f, -0.4761596756f, 0, -0.03381553704f, 0.3773180787f, -0.9254661404f, 0, -0.6867922841f, - -0.6656597827f, 0.2919133642f, 0, 0.7731742607f, -0.2875793547f, -0.5652430251f, 0, -0.09655941928f, 0.9193708367f, - -0.3813575004f, 0, 0.2715702457f, -0.9577909544f, -0.09426605581f, 0, 0.2451015704f, -0.6917998565f, -0.6792188003f, 0, - 0.977700782f, -0.1753855374f, 0.1155036542f, 0, -0.5224739938f, 0.8521606816f, 0.02903615945f, 0, -0.7734880599f, - -0.5261292347f, 0.3534179531f, 0, -0.7134492443f, -0.269547243f, 0.6467878011f, 0, 0.1644037271f, 0.5105846203f, -0.8439637196f, - 0, 0.6494635788f, 0.05585611296f, 0.7583384168f, 0, -0.4711970882f, 0.5017280509f, -0.7254255765f, 0, -0.6335764307f, - -0.2381686273f, -0.7361091029f, 0, -0.9021533097f, -0.270947803f, -0.3357181763f, 0, -0.3793711033f, 0.872258117f, - 0.3086152025f, 0, -0.6855598966f, -0.3250143309f, 0.6514394162f, 0, 0.2900942212f, -0.7799057743f, -0.5546100667f, 0, - -0.2098319339f, 0.85037073f, 0.4825351604f, 0, -0.4592603758f, 0.6598504336f, -0.5947077538f, 0, 0.8715945488f, 0.09616365406f, - -0.4807031248f, 0, -0.6776666319f, 0.7118504878f, -0.1844907016f, 0, 0.7044377633f, 0.312427597f, 0.637304036f, 0, - -0.7052318886f, -0.2401093292f, -0.6670798253f, 0, 0.081921007f, -0.7207336136f, -0.6883545647f, 0, -0.6993680906f, - -0.5875763221f, -0.4069869034f, 0, -0.1281454481f, 0.6419895885f, 0.7559286424f, 0, -0.6337388239f, -0.6785471501f, - -0.3714146849f, 0, 0.5565051903f, -0.2168887573f, -0.8020356851f, 0, -0.5791554484f, 0.7244372011f, -0.3738578718f, 0, - 0.1175779076f, -0.7096451073f, 0.6946792478f, 0, -0.6134619607f, 0.1323631078f, 0.7785527795f, 0, 0.6984635305f, - -0.02980516237f, -0.715024719f, 0, 0.8318082963f, -0.3930171956f, 0.3919597455f, 0, 0.1469576422f, 0.05541651717f, - -0.9875892167f, 0, 0.708868575f, -0.2690503865f, 0.6520101478f, 0, 0.2726053183f, 0.67369766f, -0.68688995f, 0, -0.6591295371f, - 0.3035458599f, -0.6880466294f, 0, 0.4815131379f, -0.7528270071f, 0.4487723203f, 0, 0.9430009463f, 0.1675647412f, -0.2875261255f, - 0, 0.434802957f, 0.7695304522f, -0.4677277752f, 0, 0.3931996188f, 0.594473625f, 0.7014236729f, 0, 0.7254336655f, -0.603925654f, - 0.3301814672f, 0, 0.7590235227f, -0.6506083235f, 0.02433313207f, 0, -0.8552768592f, -0.3430042733f, 0.3883935666f, 0, - -0.6139746835f, 0.6981725247f, 0.3682257648f, 0, -0.7465905486f, -0.5752009504f, 0.3342849376f, 0, 0.5730065677f, 0.810555537f, - -0.1210916791f, 0, -0.9225877367f, -0.3475211012f, -0.167514036f, 0, -0.7105816789f, -0.4719692027f, -0.5218416899f, 0, - -0.08564609717f, 0.3583001386f, 0.929669703f, 0, -0.8279697606f, -0.2043157126f, 0.5222271202f, 0, 0.427944023f, 0.278165994f, - 0.8599346446f, 0, 0.5399079671f, -0.7857120652f, -0.3019204161f, 0, 0.5678404253f, -0.5495413974f, -0.6128307303f, 0, - -0.9896071041f, 0.1365639107f, -0.04503418428f, 0, -0.6154342638f, -0.6440875597f, 0.4543037336f, 0, 0.1074204368f, - -0.7946340692f, 0.5975094525f, 0, -0.3595449969f, -0.8885529948f, 0.28495784f, 0, -0.2180405296f, 0.1529888965f, 0.9638738118f, - 0, -0.7277432317f, -0.6164050508f, -0.3007234646f, 0, 0.7249729114f, -0.00669719484f, 0.6887448187f, 0, -0.5553659455f, - -0.5336586252f, 0.6377908264f, 0, 0.5137558015f, 0.7976208196f, -0.3160000073f, 0, -0.3794024848f, 0.9245608561f, - -0.03522751494f, 0, 0.8229248658f, 0.2745365933f, -0.4974176556f, 0, -0.5404114394f, 0.6091141441f, 0.5804613989f, 0, - 0.8036581901f, -0.2703029469f, 0.5301601931f, 0, 0.6044318879f, 0.6832968393f, 0.4095943388f, 0, 0.06389988817f, 0.9658208605f, - -0.2512108074f, 0, 0.1087113286f, 0.7402471173f, -0.6634877936f, 0, -0.713427712f, -0.6926784018f, 0.1059128479f, 0, - 0.6458897819f, -0.5724548511f, -0.5050958653f, 0, -0.6553931414f, 0.7381471625f, 0.159995615f, 0, 0.3910961323f, 0.9188871375f, - -0.05186755998f, 0, -0.4879022471f, -0.5904376907f, 0.6429111375f, 0, 0.6014790094f, 0.7707441366f, -0.2101820095f, 0, - -0.5677173047f, 0.7511360995f, 0.3368851762f, 0, 0.7858573506f, 0.226674665f, 0.5753666838f, 0, -0.4520345543f, -0.604222686f, - -0.6561857263f, 0, 0.002272116345f, 0.4132844051f, -0.9105991643f, 0, -0.5815751419f, -0.5162925989f, 0.6286591339f, 0, - -0.03703704785f, 0.8273785755f, 0.5604221175f, 0, -0.5119692504f, 0.7953543429f, -0.3244980058f, 0, -0.2682417366f, - -0.9572290247f, -0.1084387619f, 0, -0.2322482736f, -0.9679131102f, -0.09594243324f, 0, 0.3554328906f, -0.8881505545f, - 0.2913006227f, 0, 0.7346520519f, -0.4371373164f, 0.5188422971f, 0, 0.9985120116f, 0.04659011161f, -0.02833944577f, 0, - -0.3727687496f, -0.9082481361f, 0.1900757285f, 0, 0.91737377f, -0.3483642108f, 0.1925298489f, 0, 0.2714911074f, 0.4147529736f, - -0.8684886582f, 0, 0.5131763485f, -0.7116334161f, 0.4798207128f, 0, -0.8737353606f, 0.18886992f, -0.4482350644f, 0, - 0.8460043821f, -0.3725217914f, 0.3814499973f, 0, 0.8978727456f, -0.1780209141f, -0.4026575304f, 0, 0.2178065647f, - -0.9698322841f, -0.1094789531f, 0, -0.1518031304f, -0.7788918132f, -0.6085091231f, 0, -0.2600384876f, -0.4755398075f, - -0.8403819825f, 0, 0.572313509f, -0.7474340931f, -0.3373418503f, 0, -0.7174141009f, 0.1699017182f, -0.6756111411f, 0, - -0.684180784f, 0.02145707593f, -0.7289967412f, 0, -0.2007447902f, 0.06555605789f, -0.9774476623f, 0, -0.1148803697f, - -0.8044887315f, 0.5827524187f, 0, -0.7870349638f, 0.03447489231f, 0.6159443543f, 0, -0.2015596421f, 0.6859872284f, - 0.6991389226f, 0, -0.08581082512f, -0.10920836f, -0.9903080513f, 0, 0.5532693395f, 0.7325250401f, -0.396610771f, 0, - -0.1842489331f, -0.9777375055f, -0.1004076743f, 0, 0.0775473789f, -0.9111505856f, 0.4047110257f, 0, 0.1399838409f, - 0.7601631212f, -0.6344734459f, 0, 0.4484419361f, -0.845289248f, 0.2904925424f, 0 - }; - - // Hashing - private static final int PRIME_X = 501125321; - private static final int PRIME_Y = 1136930381; - private static final int PRIME_Z = 1720413743; - private static final NoiseSampler CELLULAR_LOOKUP_DEFAULT = new FastNoiseLite(); - private static final NoiseSampler DOMAIN_WARP_DEFAULT = new FastNoiseLite(); - private static final long POSITIVE_POW1 = 0b01111111111L << 52; // Bits that when applied to the exponent/sign section of a double, produce a positive number with a power of 1. - private int mSeed = 1337; - private double mFrequency = 0.01; - private NoiseType mNoiseType = NoiseType.OpenSimplex2; - private RotationType3D mRotationType3D = RotationType3D.None; - private TransformType3D mTransformType3D = TransformType3D.DefaultOpenSimplex2; - private FractalType mFractalType = FractalType.None; - private int mOctaves = 3; - private double mLacunarity = 2.0; - private double mGain = 0.5f; - private double mWeightedStrength = 0.0; - private double mPingPongStrength = 2.0; - private double mFractalBounding = 1 / 1.75; - private CellularDistanceFunction mCellularDistanceFunction = CellularDistanceFunction.EuclideanSq; - private CellularReturnType mCellularReturnType = CellularReturnType.Distance; - private double mCellularJitterModifier = 1.0; - private DomainWarpType mDomainWarpType = DomainWarpType.OpenSimplex2; - private TransformType3D mWarpTransformType3D = TransformType3D.DefaultOpenSimplex2; - private double mDomainWarpAmp = 1.0; - private NoiseSampler cellularNoiseLookup = CELLULAR_LOOKUP_DEFAULT; - private NoiseSampler domainWarpFunction = DOMAIN_WARP_DEFAULT; - - /** - * Create new FastNoise object with default seed - */ - public FastNoiseLite() { - - } - - /** - * Create new FastNoise object with specified seed - */ - public FastNoiseLite(int seed) { - setSeed(seed); - } - - private static double fastMin(double a, double b) { - return a < b ? a : b; - } - - private static double fastMax(double a, double b) { - return a > b ? a : b; - } - - private static double fastSqrt(double f) { - return FastMath.sqrt(f); - } - - private static int fastFloor(double f) { - return f >= 0 ? (int) f : (int) f - 1; - } - - private static int fastRound(double f) { - return f >= 0 ? (int) (f + 0.5f) : (int) (f - 0.5); - } - - private static double lerp(double a, double b, double t) { - return a + t * (b - a); - } - - private static double interpHermite(double t) { - return t * t * (3 - 2 * t); - } - - private static double interpQuintic(double t) { - return t * t * t * (t * (t * 6 - 15) + 10); - } - - private static double cubicLerp(double a, double b, double c, double d, double t) { - double p = (d - c) - (a - b); - return t * t * t * p + t * t * ((a - b) - p) + t * (c - a) + b; - } - - private static double pingPong(double t) { - t -= (int) (t * 0.5f) << 1; - return t < 1 ? t : 2 - t; - } - - private static int hash(int seed, int xPrimed, int yPrimed) { - int hash = seed ^ xPrimed ^ yPrimed; - - hash *= 0x27d4eb2d; - return hash; - } - - private static int hash(int seed, int xPrimed, int yPrimed, int zPrimed) { - int hash = seed ^ xPrimed ^ yPrimed ^ zPrimed; - - hash *= 0x27d4eb2d; - return hash; - } - - private static double valCoord(int seed, int xPrimed, int yPrimed) { - int hash = hash(seed, xPrimed, yPrimed); - - hash *= hash; - hash ^= hash << 19; - return hash * (1 / 2147483648.0); - } - - private static double valCoord(int seed, int xPrimed, int yPrimed, int zPrimed) { - int hash = hash(seed, xPrimed, yPrimed, zPrimed); - - hash *= hash; - hash ^= hash << 19; - return hash * (1 / 2147483648.0); - } - - private static double gradCoord(int seed, int xPrimed, int yPrimed, double xd, double yd) { - int hash = hash(seed, xPrimed, yPrimed); - hash ^= hash >> 15; - hash &= 127 << 1; - - double xg = GRADIENTS_2_D[hash]; - double yg = GRADIENTS_2_D[hash | 1]; - - return xd * xg + yd * yg; - } - - private static double gradCoord(int seed, int xPrimed, int yPrimed, int zPrimed, double xd, double yd, double zd) { - int hash = hash(seed, xPrimed, yPrimed, zPrimed); - hash ^= hash >> 15; - hash &= 63 << 2; - - double xg = GRADIENTS_3D[hash]; - double yg = GRADIENTS_3D[hash | 1]; - double zg = GRADIENTS_3D[hash | 2]; - - return xd * xg + yd * yg + zd * zg; - } - - private static double fastAbs(double f) { - return f < 0 ? -f : f; - } - - public NoiseSampler getCellularNoiseLookup() { - return cellularNoiseLookup; - } - - public void setCellularNoiseLookup(NoiseSampler cellularNoiseLookup) { - this.cellularNoiseLookup = cellularNoiseLookup; - } - - public NoiseSampler getDomainWarpFunction() { - return domainWarpFunction; - } - - public void setDomainWarpFunction(NoiseSampler domainWarpFunction) { - this.domainWarpFunction = domainWarpFunction; - } - - /** - * Sets seed used for all noise types - *

- * Default: 1337 - */ - public void setSeed(int seed) { - mSeed = seed; - } - - /** - * Sets frequency for all noise types - *

- * Default: 0.01 - */ - public void setFrequency(double frequency) { - mFrequency = frequency; - } - - /** - * Sets noise algorithm used for GetNoise(...) - *

- * Default: OpenSimplex2Sampler - */ - public void setNoiseType(NoiseType noiseType) { - mNoiseType = noiseType; - UpdateTransformType3D(); - } - - private void UpdateTransformType3D() { - switch(mRotationType3D) { - case ImproveXYPlanes: - mTransformType3D = TransformType3D.ImproveXYPlanes; - break; - case ImproveXZPlanes: - mTransformType3D = TransformType3D.ImproveXZPlanes; - break; - default: - switch(mNoiseType) { - case OpenSimplex2: - case OpenSimplex2S: - mTransformType3D = TransformType3D.DefaultOpenSimplex2; - break; - default: - mTransformType3D = TransformType3D.None; - break; - } - break; - } - } - - /** - * Sets domain rotation type for 3D Noise and 3D DomainWarp. - * Can aid in reducing directional artifacts when sampling a 2D plane in 3D - *

- * Default: None - */ - public void setRotationType3D(RotationType3D rotationType3D) { - mRotationType3D = rotationType3D; - UpdateTransformType3D(); - updateWarpTransformType3D(); - } - - private void updateWarpTransformType3D() { - switch(mRotationType3D) { - case ImproveXYPlanes: - mWarpTransformType3D = TransformType3D.ImproveXYPlanes; - break; - case ImproveXZPlanes: - mWarpTransformType3D = TransformType3D.ImproveXZPlanes; - break; - default: - switch(mDomainWarpType) { - case OpenSimplex2: - case OpenSimplex2Reduced: - mWarpTransformType3D = TransformType3D.DefaultOpenSimplex2; - break; - default: - mWarpTransformType3D = TransformType3D.None; - break; - } - break; - } - } - - /** - * Sets method for combining octaves in all fractal noise types - *

- * Default: None - * Note: FractalType.DomainWarp... only affects DomainWarp(...) - */ - public void setFractalType(FractalType fractalType) { - mFractalType = fractalType; - } - - /** - * Sets octave count for all fractal noise types - *

- * Default: 3 - */ - public void setFractalOctaves(int octaves) { - mOctaves = octaves; - calculateFractalBounding(); - } - - private void calculateFractalBounding() { - double gain = fastAbs(mGain); - double amp = gain; - double ampFractal = 1.0; - for(int i = 1; i < mOctaves; i++) { - ampFractal += amp; - amp *= gain; - } - mFractalBounding = 1 / ampFractal; - } - - /** - * Sets octave lacunarity for all fractal noise types - *

- * Default: 2.0 - */ - public void setFractalLacunarity(double lacunarity) { - mLacunarity = lacunarity; - } - - /** - * Sets octave gain for all fractal noise types - *

- * Default: 0.5 - */ - public void setFractalGain(double gain) { - mGain = gain; - calculateFractalBounding(); - } - - /** - * Sets octave weighting for all none DomainWarp fratal types - *

- * Default: 0.0 - * Note: Keep between 0...1 to maintain -1...1 output bounding - */ - public void setFractalWeightedStrength(double weightedStrength) { - mWeightedStrength = weightedStrength; - } - - /** - * Sets strength of the fractal ping pong effect - *

- * Default: 2.0 - */ - public void setFractalPingPongStrength(double pingPongStrength) { - mPingPongStrength = pingPongStrength; - } - - /** - * Sets distance function used in cellular noise calculations - *

- * Default: Distance - */ - public void setCellularDistanceFunction(CellularDistanceFunction cellularDistanceFunction) { - mCellularDistanceFunction = cellularDistanceFunction; - } - - /** - * Sets return type from cellular noise calculations - *

- * Default: EuclideanSq - */ - public void setCellularReturnType(CellularReturnType cellularReturnType) { - mCellularReturnType = cellularReturnType; - } - - /** - * Sets the maximum distance a cellular point can move from it's grid position - *

- * Default: 1.0 - * Note: Setting this higher than 1 will cause artifacts - */ - public void setCellularJitter(double cellularJitter) { - mCellularJitterModifier = cellularJitter; - } - - /** - * Sets the warp algorithm when using DomainWarp(...) - *

- * Default: OpenSimplex2Sampler - */ - public void setDomainWarpType(DomainWarpType domainWarpType) { - mDomainWarpType = domainWarpType; - updateWarpTransformType3D(); - } - - /** - * Sets the maximum warp distance from original position when using DomainWarp(...) - *

- * Default: 1.0 - */ - public void setDomainWarpAmp(double domainWarpAmp) { - mDomainWarpAmp = domainWarpAmp; - } - - /** - * 2D noise at given position using current settings - *

- * Noise output bounded between -1...1 - */ - @Override - public double getNoise(double x, double y) { - return getNoiseSeeded(mSeed, x, y); - } - - /** - * 3D noise at given position using current settings - *

- * Noise output bounded between -1...1 - */ - @Override - public double getNoise(double x, double y, double z) { - return getNoiseSeeded(mSeed, x, y, z); - } - - @Override - public double getNoiseSeeded(int seed, double x, double y) { - x *= mFrequency; - y *= mFrequency; - - switch(mNoiseType) { - case OpenSimplex2: - case OpenSimplex2S: { - - final double SQRT3 = 1.7320508075688772935274463415059; - final double F2 = 0.5f * (SQRT3 - 1); - - double t = (x + y) * F2; - x += t; - y += t; - } - break; - default: - break; - } - - switch(mFractalType) { - default: - return getNoiseRaw(seed, x, y); - case FBm: - return genFractalFBm(seed, x, y); - case Ridged: - return genFractalRidged(seed, x, y); - case PingPong: - return genFractalPingPong(seed, x, y); - } - } - - @Override - public double getNoiseSeeded(int seed, double x, double y, double z) { - x *= mFrequency; - y *= mFrequency; - z *= mFrequency; - - switch(mTransformType3D) { - case ImproveXYPlanes: { - - double xy = x + y; - - double s2 = xy * -0.211324865405187D; - - z *= 0.577350269189626; - x += s2 - z; - y = y + s2 - z; - - z += xy * 0.577350269189626; - } - break; - case ImproveXZPlanes: { - - double xz = x + z; - - double s2 = xz * -0.211324865405187D; - - y *= 0.577350269189626; - x += s2 - y; - z += s2 - y; - - y += xz * 0.577350269189626; - } - break; - case DefaultOpenSimplex2: { - - final double R3 = 2.0 / 3.0; - - double r = (x + y + z) * R3; // Rotation, not skew - x = r - x; - y = r - y; - z = r - z; - } - break; - default: - break; - } - - switch(mFractalType) { - default: - return getNoiseRaw(seed, x, y, z); - case FBm: - return genFractalFBm(seed, x, y, z); - case Ridged: - return genFractalRidged(seed, x, y, z); - case PingPong: - return genFractalPingPong(seed, x, y, z); - } - } - - public double getNoiseRaw(int seed, double x, double y) { - switch(mNoiseType) { - case OpenSimplex2: - return singleSimplex(seed, x, y); - case OpenSimplex2S: - return singleOpenSimplex2S(seed, x, y); - case Cellular: - return singleCellular(seed, x, y); - case Perlin: - return singlePerlin(seed, x, y); - case ValueCubic: - return singleValueCubic(seed, x, y); - case Value: - return singleValue(seed, x, y); - case WhiteNoise: - return singleWhiteNoise(seed, x, y); - default: - return 0; - } - } - - public double getNoiseRaw(int seed, double x, double y, double z) { - switch(mNoiseType) { - case OpenSimplex2: - return singleOpenSimplex2(seed, x, y, z); - case OpenSimplex2S: - return singleOpenSimplex2S(seed, x, y, z); - case Cellular: - return singleCellular(seed, x, y, z); - case Perlin: - return singlePerlin(seed, x, y, z); - case ValueCubic: - return singleValueCubic(seed, x, y, z); - case Value: - return singleValue(seed, x, y, z); - case WhiteNoise: - return singleWhiteNoise(seed, x, y, z); - default: - return 0; - } - } - - /** - * 2D warps the input position using current domain warp settings - *

- * Example usage with GetNoise - * DomainWarp(coord) - * noise = GetNoise(x, y) - */ - public void domainWarp(Vector2 coord) { - switch(mFractalType) { - default: - domainWarpSingle(mSeed, coord); - break; - case DomainWarpProgressive: - domainWarpFractalProgressive(mSeed, coord); - break; - case DomainWarpIndependent: - domainWarpFractalIndependent(mSeed, coord); - break; - } - } - - /** - * 3D warps the input position using current domain warp settings - *

- * Example usage with GetNoise - * DomainWarp(coord) - * noise = GetNoise(x, y, z) - */ - public void domainWarp(Vector3 coord) { - switch(mFractalType) { - default: - domainWarpSingle(mSeed, coord); - break; - case DomainWarpProgressive: - domainWarpFractalProgressive(mSeed, coord); - break; - case DomainWarpIndependent: - domainWarpFractalIndependent(mSeed, coord); - break; - } - } - - private double genFractalFBm(int seed, double x, double y) { - double sum = 0; - double amp = mFractalBounding; - - for(int i = 0; i < mOctaves; i++) { - double noise = getNoiseRaw(seed++, x, y); - sum += noise * amp; - amp *= lerp(1.0, fastMin(noise + 1, 2) * 0.5, mWeightedStrength); - - x *= mLacunarity; - y *= mLacunarity; - amp *= mGain; - } - - return sum; - } - - private double genFractalFBm(int seed, double x, double y, double z) { - double sum = 0; - double amp = mFractalBounding; - - for(int i = 0; i < mOctaves; i++) { - double noise = getNoiseRaw(seed++, x, y, z); - sum += noise * amp; - amp *= lerp(1.0, (noise + 1) * 0.5, mWeightedStrength); - - x *= mLacunarity; - y *= mLacunarity; - z *= mLacunarity; - amp *= mGain; - } - - return sum; - } - - private double genFractalRidged(int seed, double x, double y) { - double sum = 0; - double amp = mFractalBounding; - - for(int i = 0; i < mOctaves; i++) { - double noise = fastAbs(getNoiseRaw(seed++, x, y)); - sum += (noise * -2 + 1) * amp; - amp *= lerp(1.0, 1 - noise, mWeightedStrength); - - x *= mLacunarity; - y *= mLacunarity; - amp *= mGain; - } - - return sum; - } - - // Generic noise gen - private double genFractalRidged(int seed, double x, double y, double z) { - double sum = 0; - double amp = mFractalBounding; - - for(int i = 0; i < mOctaves; i++) { - double noise = fastAbs(getNoiseRaw(seed++, x, y, z)); - sum += (noise * -2 + 1) * amp; - amp *= lerp(1.0, 1 - noise, mWeightedStrength); - - x *= mLacunarity; - y *= mLacunarity; - z *= mLacunarity; - amp *= mGain; - } - - return sum; - } - - private double genFractalPingPong(int seed, double x, double y) { - double sum = 0; - double amp = mFractalBounding; - - for(int i = 0; i < mOctaves; i++) { - double noise = pingPong((getNoiseRaw(seed++, x, y) + 1) * mPingPongStrength); - sum += (noise - 0.5) * 2 * amp; - amp *= lerp(1.0, noise, mWeightedStrength); - - x *= mLacunarity; - y *= mLacunarity; - amp *= mGain; - } - - return sum; - } - - // Noise Coordinate Transforms (frequency, and possible skew or rotation) - private double genFractalPingPong(int seed, double x, double y, double z) { - double sum = 0; - double amp = mFractalBounding; - - for(int i = 0; i < mOctaves; i++) { - double noise = pingPong((getNoiseRaw(seed++, x, y, z) + 1) * mPingPongStrength); - sum += (noise - 0.5) * 2 * amp; - amp *= lerp(1.0, noise, mWeightedStrength); - - x *= mLacunarity; - y *= mLacunarity; - z *= mLacunarity; - amp *= mGain; - } - - return sum; - } - - private double singleSimplex(int seed, double x, double y) { - // 2D OpenSimplex2 case uses the same algorithm as ordinary Simplex. - final double SQRT3 = 1.7320508075688772935274463415059; - final double G2 = (3 - SQRT3) / 6; - - /* - * --- Skew moved to switch statements before fractal evaluation --- - * final FNLdouble F2 = 0.5f * (SQRT3 - 1); - * FNLdouble s = (x + y) * F2; - * x += s; y += s; - */ - - int i = fastFloor(x); - int j = fastFloor(y); - double xi = x - i; - double yi = y - j; - - double t = (xi + yi) * G2; - double x0 = xi - t; - double y0 = yi - t; - - i *= PRIME_X; - j *= PRIME_Y; - - double n0, n1, n2; - - double a = 0.5 - x0 * x0 - y0 * y0; - if(a <= 0) n0 = 0; - else { - n0 = (a * a) * (a * a) * gradCoord(seed, i, j, x0, y0); - } - - double c = 2 * (1 - 2 * G2) * (1 / G2 - 2) * t + ((-2 * (1 - 2 * G2) * (1 - 2 * G2)) + a); - if(c <= 0) n2 = 0; - else { - double x2 = x0 + (2 * G2 - 1); - double y2 = y0 + (2 * G2 - 1); - n2 = (c * c) * (c * c) * gradCoord(seed, i + PRIME_X, j + PRIME_Y, x2, y2); - } - - if(y0 > x0) { - double x1 = x0 + G2; - double y1 = y0 + (G2 - 1); - double b = 0.5 - x1 * x1 - y1 * y1; - if(b <= 0) n1 = 0; - else { - n1 = (b * b) * (b * b) * gradCoord(seed, i, j + PRIME_Y, x1, y1); - } - } else { - double x1 = x0 + (G2 - 1); - double y1 = y0 + G2; - double b = 0.5 - x1 * x1 - y1 * y1; - if(b <= 0) n1 = 0; - else { - n1 = (b * b) * (b * b) * gradCoord(seed, i + PRIME_X, j, x1, y1); - } - } - - return (n0 + n1 + n2) * 99.83685446303647f; - } - - // Fractal FBm - private double singleOpenSimplex2(int seed, double x, double y, double z) { - // 3D OpenSimplex2Sampler case uses two offset rotated cube grids. - /* - * --- Rotation moved to switch statements before fractal evaluation --- - * final FNLdouble R3 = (FNLdouble)(2.0 / 3.0); - * FNLdouble r = (x + y + z) * R3; // Rotation, not skew - * x = r - x; y = r - y; z = r - z; - */ - - int i = fastRound(x); - int j = fastRound(y); - int k = fastRound(z); - double x0 = x - i; - double y0 = y - j; - double z0 = z - k; - - int xNSign = (int) (-1.0 - x0) | 1; - int yNSign = (int) (-1.0 - y0) | 1; - int zNSign = (int) (-1.0 - z0) | 1; - - double ax0 = xNSign * -x0; - double ay0 = yNSign * -y0; - double az0 = zNSign * -z0; - - i *= PRIME_X; - j *= PRIME_Y; - k *= PRIME_Z; - - double value = 0; - double a = (0.6f - x0 * x0) - (y0 * y0 + z0 * z0); - - for(int l = 0; ; l++) { - if(a > 0) { - value += (a * a) * (a * a) * gradCoord(seed, i, j, k, x0, y0, z0); - } - - if(ax0 >= ay0 && ax0 >= az0) { - double b = a + ax0 + ax0; - if(b > 1) { - b -= 1; - value += (b * b) * (b * b) * gradCoord(seed, i - xNSign * PRIME_X, j, k, x0 + xNSign, y0, z0); - } - } else if(ay0 > ax0 && ay0 >= az0) { - double b = a + ay0 + ay0; - if(b > 1) { - b -= 1; - value += (b * b) * (b * b) * gradCoord(seed, i, j - yNSign * PRIME_Y, k, x0, y0 + yNSign, z0); - } - } else { - double b = a + az0 + az0; - if(b > 1) { - b -= 1; - value += (b * b) * (b * b) * gradCoord(seed, i, j, k - zNSign * PRIME_Z, x0, y0, z0 + zNSign); - } - } - - if(l == 1) break; - - ax0 = 0.5 - ax0; - ay0 = 0.5 - ay0; - az0 = 0.5 - az0; - - x0 = xNSign * ax0; - y0 = yNSign * ay0; - z0 = zNSign * az0; - - a += (0.75 - ax0) - (ay0 + az0); - - i += (xNSign >> 1) & PRIME_X; - j += (yNSign >> 1) & PRIME_Y; - k += (zNSign >> 1) & PRIME_Z; - - xNSign = -xNSign; - yNSign = -yNSign; - zNSign = -zNSign; - - seed = ~seed; - } - - return value * 32.69428253173828125; - } - - @SuppressWarnings("NumericOverflow") - private double singleOpenSimplex2S(int seed, double x, double y) { - // 2D OpenSimplex2S case is a modified 2D simplex noise. - - final double SQRT3 = 1.7320508075688772935274463415059; - final double G2 = (3 - SQRT3) / 6; - - /* - * --- Skew moved to TransformNoiseCoordinate method --- - * final FNLdouble F2 = 0.5f * (SQRT3 - 1); - * FNLdouble s = (x + y) * F2; - * x += s; y += s; - */ - - int i = fastFloor(x); - int j = fastFloor(y); - double xi = x - i; - double yi = y - j; - - i *= PRIME_X; - j *= PRIME_Y; - int i1 = i + PRIME_X; - int j1 = j + PRIME_Y; - - double t = (xi + yi) * G2; - double x0 = xi - t; - double y0 = yi - t; - - double a0 = (2.0 / 3.0) - x0 * x0 - y0 * y0; - double value = (a0 * a0) * (a0 * a0) * gradCoord(seed, i, j, x0, y0); - - double a1 = 2 * (1 - 2 * G2) * (1 / G2 - 2) * t + ((-2 * (1 - 2 * G2) * (1 - 2 * G2)) + a0); - double x1 = x0 - (1 - 2 * G2); - double y1 = y0 - (1 - 2 * G2); - value += (a1 * a1) * (a1 * a1) * gradCoord(seed, i1, j1, x1, y1); - - // Nested conditionals were faster than compact bit logic/arithmetic. - double xmyi = xi - yi; - if(t > G2) { - if(xi + xmyi > 1) { - double x2 = x0 + (3 * G2 - 2); - double y2 = y0 + (3 * G2 - 1); - double a2 = (2.0 / 3.0) - x2 * x2 - y2 * y2; - if(a2 > 0) { - value += (a2 * a2) * (a2 * a2) * gradCoord(seed, i + (PRIME_X << 1), j + PRIME_Y, x2, y2); - } - } else { - double x2 = x0 + G2; - double y2 = y0 + (G2 - 1); - double a2 = (2.0 / 3.0) - x2 * x2 - y2 * y2; - if(a2 > 0) { - value += (a2 * a2) * (a2 * a2) * gradCoord(seed, i, j + PRIME_Y, x2, y2); - } - } - - if(yi - xmyi > 1) { - double x3 = x0 + (3 * G2 - 1); - double y3 = y0 + (3 * G2 - 2); - double a3 = (2.0 / 3.0) - x3 * x3 - y3 * y3; - if(a3 > 0) { - value += (a3 * a3) * (a3 * a3) * gradCoord(seed, i + PRIME_X, j + (PRIME_Y << 1), x3, y3); - } - } else { - double x3 = x0 + (G2 - 1); - double y3 = y0 + G2; - double a3 = (2.0 / 3.0) - x3 * x3 - y3 * y3; - if(a3 > 0) { - value += (a3 * a3) * (a3 * a3) * gradCoord(seed, i + PRIME_X, j, x3, y3); - } - } - } else { - if(xi + xmyi < 0) { - double x2 = x0 + (1 - G2); - double y2 = y0 - G2; - double a2 = (2.0 / 3.0) - x2 * x2 - y2 * y2; - if(a2 > 0) { - value += (a2 * a2) * (a2 * a2) * gradCoord(seed, i - PRIME_X, j, x2, y2); - } - } else { - double x2 = x0 + (G2 - 1); - double y2 = y0 + G2; - double a2 = (2.0 / 3.0) - x2 * x2 - y2 * y2; - if(a2 > 0) { - value += (a2 * a2) * (a2 * a2) * gradCoord(seed, i + PRIME_X, j, x2, y2); - } - } - - if(yi < xmyi) { - double x2 = x0 - G2; - double y2 = y0 - (G2 - 1); - double a2 = (2.0 / 3.0) - x2 * x2 - y2 * y2; - if(a2 > 0) { - value += (a2 * a2) * (a2 * a2) * gradCoord(seed, i, j - PRIME_Y, x2, y2); - } - } else { - double x2 = x0 + G2; - double y2 = y0 + (G2 - 1); - double a2 = (2.0 / 3.0) - x2 * x2 - y2 * y2; - if(a2 > 0) { - value += (a2 * a2) * (a2 * a2) * gradCoord(seed, i, j + PRIME_Y, x2, y2); - } - } - } - - return value * 18.24196194486065; - } - - // Fractal Ridged - @SuppressWarnings("NumericOverflow") - private double singleOpenSimplex2S(int seed, double x, double y, double z) { - // 3D OpenSimplex2S case uses two offset rotated cube grids. - /* - * --- Rotation moved to TransformNoiseCoordinate method --- - * final FNLdouble R3 = (FNLdouble)(2.0 / 3.0); - * FNLdouble r = (x + y + z) * R3; // Rotation, not skew - * x = r - x; y = r - y; z = r - z; - */ - - int i = fastFloor(x); - int j = fastFloor(y); - int k = fastFloor(z); - double xi = x - i; - double yi = y - j; - double zi = z - k; - - i *= PRIME_X; - j *= PRIME_Y; - k *= PRIME_Z; - int seed2 = seed + 1293373; - - int xNMask = (int) (-0.5 - xi); - int yNMask = (int) (-0.5 - yi); - int zNMask = (int) (-0.5 - zi); - - double x0 = xi + xNMask; - double y0 = yi + yNMask; - double z0 = zi + zNMask; - double a0 = 0.75 - x0 * x0 - y0 * y0 - z0 * z0; - double value = (a0 * a0) * (a0 * a0) * gradCoord(seed, i + (xNMask & PRIME_X), j + (yNMask & PRIME_Y), k + (zNMask & PRIME_Z), x0, y0, - z0); - - double x1 = xi - 0.5; - double y1 = yi - 0.5; - double z1 = zi - 0.5; - double a1 = 0.75 - x1 * x1 - y1 * y1 - z1 * z1; - value += (a1 * a1) * (a1 * a1) * gradCoord(seed2, i + PRIME_X, j + PRIME_Y, k + PRIME_Z, x1, y1, z1); - - double xAFlipMask0 = ((xNMask | 1) << 1) * x1; - double yAFlipMask0 = ((yNMask | 1) << 1) * y1; - double zAFlipMask0 = ((zNMask | 1) << 1) * z1; - double xAFlipMask1 = (-2 - (xNMask << 2)) * x1 - 1.0; - double yAFlipMask1 = (-2 - (yNMask << 2)) * y1 - 1.0; - double zAFlipMask1 = (-2 - (zNMask << 2)) * z1 - 1.0; - - boolean skip5 = false; - double a2 = xAFlipMask0 + a0; - if(a2 > 0) { - double x2 = x0 - (xNMask | 1); - value += (a2 * a2) * (a2 * a2) * gradCoord(seed, i + (~xNMask & PRIME_X), j + (yNMask & PRIME_Y), k + (zNMask & PRIME_Z), x2, y0, - z0); - } else { - double a3 = yAFlipMask0 + zAFlipMask0 + a0; - if(a3 > 0) { - double y3 = y0 - (yNMask | 1); - double z3 = z0 - (zNMask | 1); - value += (a3 * a3) * (a3 * a3) * gradCoord(seed, i + (xNMask & PRIME_X), j + (~yNMask & PRIME_Y), k + (~zNMask & PRIME_Z), x0, - y3, z3); - } - - double a4 = xAFlipMask1 + a1; - if(a4 > 0) { - double x4 = (xNMask | 1) + x1; - value += (a4 * a4) * (a4 * a4) * gradCoord(seed2, i + (xNMask & (PRIME_X << 1)), j + PRIME_Y, k + PRIME_Z, x4, y1, z1); - skip5 = true; - } - } - - boolean skip9 = false; - double a6 = yAFlipMask0 + a0; - if(a6 > 0) { - double y6 = y0 - (yNMask | 1); - value += (a6 * a6) * (a6 * a6) * gradCoord(seed, i + (xNMask & PRIME_X), j + (~yNMask & PRIME_Y), k + (zNMask & PRIME_Z), x0, y6, - z0); - } else { - double a7 = xAFlipMask0 + zAFlipMask0 + a0; - if(a7 > 0) { - double x7 = x0 - (xNMask | 1); - double z7 = z0 - (zNMask | 1); - value += (a7 * a7) * (a7 * a7) * gradCoord(seed, i + (~xNMask & PRIME_X), j + (yNMask & PRIME_Y), k + (~zNMask & PRIME_Z), x7, - y0, z7); - } - - double a8 = yAFlipMask1 + a1; - if(a8 > 0) { - double y8 = (yNMask | 1) + y1; - value += (a8 * a8) * (a8 * a8) * gradCoord(seed2, i + PRIME_X, j + (yNMask & (PRIME_Y << 1)), k + PRIME_Z, x1, y8, z1); - skip9 = true; - } - } - - boolean skipD = false; - double aA = zAFlipMask0 + a0; - if(aA > 0) { - double zA = z0 - (zNMask | 1); - value += (aA * aA) * (aA * aA) * gradCoord(seed, i + (xNMask & PRIME_X), j + (yNMask & PRIME_Y), k + (~zNMask & PRIME_Z), x0, y0, - zA); - } else { - double aB = xAFlipMask0 + yAFlipMask0 + a0; - if(aB > 0) { - double xB = x0 - (xNMask | 1); - double yB = y0 - (yNMask | 1); - value += (aB * aB) * (aB * aB) * gradCoord(seed, i + (~xNMask & PRIME_X), j + (~yNMask & PRIME_Y), k + (zNMask & PRIME_Z), xB, - yB, z0); - } - - double aC = zAFlipMask1 + a1; - if(aC > 0) { - double zC = (zNMask | 1) + z1; - value += (aC * aC) * (aC * aC) * gradCoord(seed2, i + PRIME_X, j + PRIME_Y, k + (zNMask & (PRIME_Z << 1)), x1, y1, zC); - skipD = true; - } - } - - if(!skip5) { - double a5 = yAFlipMask1 + zAFlipMask1 + a1; - if(a5 > 0) { - double y5 = (yNMask | 1) + y1; - double z5 = (zNMask | 1) + z1; - value += (a5 * a5) * (a5 * a5) * gradCoord(seed2, i + PRIME_X, j + (yNMask & (PRIME_Y << 1)), k + (zNMask & (PRIME_Z << 1)), - x1, y5, z5); - } - } - - if(!skip9) { - double a9 = xAFlipMask1 + zAFlipMask1 + a1; - if(a9 > 0) { - double x9 = (xNMask | 1) + x1; - double z9 = (zNMask | 1) + z1; - value += (a9 * a9) * (a9 * a9) * gradCoord(seed2, i + (xNMask & (PRIME_X << 1)), j + PRIME_Y, k + (zNMask & (PRIME_Z << 1)), x9, - y1, z9); - } - } - - if(!skipD) { - double aD = xAFlipMask1 + yAFlipMask1 + a1; - if(aD > 0) { - double xD = (xNMask | 1) + x1; - double yD = (yNMask | 1) + y1; - value += (aD * aD) * (aD * aD) * gradCoord(seed2, i + (xNMask & (PRIME_X << 1)), j + (yNMask & (PRIME_Y << 1)), k + PRIME_Z, - xD, yD, z1); - } - } - - return value * 9.046026385208288; - } - - private double singleCellular(int seed, double x, double y) { - int xr = fastRound(x); - int yr = fastRound(y); - - double distance0 = Double.MAX_VALUE; - double distance1 = Double.MAX_VALUE; - double distance2 = Double.MAX_VALUE; - - int closestHash = 0; - - double cellularJitter = 0.43701595 * mCellularJitterModifier; - - int xPrimed = (xr - 1) * PRIME_X; - int yPrimedBase = (yr - 1) * PRIME_Y; - - Vector2 center = new Vector2(x, y); - - switch(mCellularDistanceFunction) { - default: - case Euclidean: - case EuclideanSq: - for(int xi = xr - 1; xi <= xr + 1; xi++) { - int yPrimed = yPrimedBase; - - for(int yi = yr - 1; yi <= yr + 1; yi++) { - int hash = hash(seed, xPrimed, yPrimed); - int idx = hash & (255 << 1); - - double vecX = (xi - x) + RAND_VECS_2D[idx] * cellularJitter; - double vecY = (yi - y) + RAND_VECS_2D[idx | 1] * cellularJitter; - - double newDistance = vecX * vecX + vecY * vecY; - - distance1 = fastMax(fastMin(distance1, newDistance), distance0); - if(newDistance < distance0) { - distance0 = newDistance; - closestHash = hash; - center.setX((xi + RAND_VECS_2D[idx] * cellularJitter) / mFrequency); - center.setZ((yi + RAND_VECS_2D[idx | 1] * cellularJitter) / mFrequency); - } else if(newDistance < distance1) { - distance2 = distance1; - distance1 = newDistance; - } else if(newDistance < distance2) { - distance2 = newDistance; - } - yPrimed += PRIME_Y; - } - xPrimed += PRIME_X; - } - break; - case Manhattan: - for(int xi = xr - 1; xi <= xr + 1; xi++) { - int yPrimed = yPrimedBase; - - for(int yi = yr - 1; yi <= yr + 1; yi++) { - int hash = hash(seed, xPrimed, yPrimed); - int idx = hash & (255 << 1); - - double vecX = (xi - x) + RAND_VECS_2D[idx] * cellularJitter; - double vecY = (yi - y) + RAND_VECS_2D[idx | 1] * cellularJitter; - - double newDistance = fastAbs(vecX) + fastAbs(vecY); - - distance1 = fastMax(fastMin(distance1, newDistance), distance0); - if(newDistance < distance0) { - distance0 = newDistance; - closestHash = hash; - center.setX((xi + RAND_VECS_2D[idx] * cellularJitter) / mFrequency); - center.setZ((yi + RAND_VECS_2D[idx | 1] * cellularJitter) / mFrequency); - } else if(newDistance < distance1) { - distance2 = distance1; - distance1 = newDistance; - } else if(newDistance < distance2) { - distance2 = newDistance; - } - yPrimed += PRIME_Y; - } - xPrimed += PRIME_X; - } - break; - case Hybrid: - for(int xi = xr - 1; xi <= xr + 1; xi++) { - int yPrimed = yPrimedBase; - - for(int yi = yr - 1; yi <= yr + 1; yi++) { - int hash = hash(seed, xPrimed, yPrimed); - int idx = hash & (255 << 1); - - double vecX = (xi - x) + RAND_VECS_2D[idx] * cellularJitter; - double vecY = (yi - y) + RAND_VECS_2D[idx | 1] * cellularJitter; - - double newDistance = (fastAbs(vecX) + fastAbs(vecY)) + (vecX * vecX + vecY * vecY); - - distance1 = fastMax(fastMin(distance1, newDistance), distance0); - if(newDistance < distance0) { - distance0 = newDistance; - closestHash = hash; - center.setX((xi + RAND_VECS_2D[idx] * cellularJitter) / mFrequency); - center.setZ((yi + RAND_VECS_2D[idx | 1] * cellularJitter) / mFrequency); - } else if(newDistance < distance1) { - distance2 = distance1; - distance1 = newDistance; - } else if(newDistance < distance2) { - distance2 = newDistance; - } - yPrimed += PRIME_Y; - } - xPrimed += PRIME_X; - } - break; - } - - if(mCellularDistanceFunction == CellularDistanceFunction.Euclidean && mCellularReturnType != CellularReturnType.CellValue) { - distance0 = fastSqrt(distance0); - if(mCellularReturnType != CellularReturnType.CellValue) { - distance1 = fastSqrt(distance1); - } - } - - switch(mCellularReturnType) { - case CellValue: - return closestHash * (1 / 2147483648.0); - case Distance: - return distance0 - 1; - case Distance2: - return distance1 - 1; - case Distance2Add: - return (distance1 + distance0) * 0.5 - 1; - case Distance2Sub: - return distance1 - distance0 - 1; - case Distance2Mul: - return distance1 * distance0 * 0.5 - 1; - case Distance2Div: - return distance0 / distance1 - 1; - case NoiseLookup: - return cellularNoiseLookup.getNoise(center.getX(), center.getZ()); - case Distance3: - return distance2 - 1; - case Distance3Add: - return (distance2 + distance0) * 0.5 - 1; - case Distance3Sub: - return distance2 - distance0 - 1; - case Distance3Mul: - return distance2 * distance0 - 1; - case Distance3Div: - return distance0 / distance2 - 1; - default: - return 0; - } - } - - // Fractal pingPong - private double singleCellular(int seed, double x, double y, double z) { - int xr = fastRound(x); - int yr = fastRound(y); - int zr = fastRound(z); - - double distance0 = Double.MAX_VALUE; - double distance1 = Double.MAX_VALUE; - double distance2 = Double.MAX_VALUE; - int closestHash = 0; - - double cellularJitter = 0.39614353 * mCellularJitterModifier; - - int xPrimed = (xr - 1) * PRIME_X; - int yPrimedBase = (yr - 1) * PRIME_Y; - int zPrimedBase = (zr - 1) * PRIME_Z; - - Vector3 center = new Vector3(x, y, z); - - switch(mCellularDistanceFunction) { - case Euclidean: - case EuclideanSq: - for(int xi = xr - 1; xi <= xr + 1; xi++) { - int yPrimed = yPrimedBase; - - for(int yi = yr - 1; yi <= yr + 1; yi++) { - int zPrimed = zPrimedBase; - - for(int zi = zr - 1; zi <= zr + 1; zi++) { - int hash = hash(seed, xPrimed, yPrimed, zPrimed); - int idx = hash & (255 << 2); - - double vecX = (xi - x) + RAND_VECS_3D[idx] * cellularJitter; - double vecY = (yi - y) + RAND_VECS_3D[idx | 1] * cellularJitter; - double vecZ = (zi - z) + RAND_VECS_3D[idx | 2] * cellularJitter; - - double newDistance = vecX * vecX + vecY * vecY + vecZ * vecZ; - - if(newDistance < distance0) { - distance0 = newDistance; - closestHash = hash; - center.setX((xi + RAND_VECS_3D[idx] * cellularJitter) / mFrequency); - center.setY((yi + RAND_VECS_3D[idx | 1] * cellularJitter) / mFrequency); - center.setZ((zi + RAND_VECS_3D[idx | 2] * cellularJitter) / mFrequency); - } else if(newDistance < distance1) { - distance2 = distance1; - distance1 = newDistance; - } else if(newDistance < distance2) { - distance2 = newDistance; - } - zPrimed += PRIME_Z; - } - yPrimed += PRIME_Y; - } - xPrimed += PRIME_X; - } - break; - case Manhattan: - for(int xi = xr - 1; xi <= xr + 1; xi++) { - int yPrimed = yPrimedBase; - - for(int yi = yr - 1; yi <= yr + 1; yi++) { - int zPrimed = zPrimedBase; - - for(int zi = zr - 1; zi <= zr + 1; zi++) { - int hash = hash(seed, xPrimed, yPrimed, zPrimed); - int idx = hash & (255 << 2); - - double vecX = (xi - x) + RAND_VECS_3D[idx] * cellularJitter; - double vecY = (yi - y) + RAND_VECS_3D[idx | 1] * cellularJitter; - double vecZ = (zi - z) + RAND_VECS_3D[idx | 2] * cellularJitter; - - double newDistance = fastAbs(vecX) + fastAbs(vecY) + fastAbs(vecZ); - - if(newDistance < distance0) { - distance0 = newDistance; - closestHash = hash; - center.setX((xi + RAND_VECS_3D[idx] * cellularJitter) / mFrequency); - center.setY((yi + RAND_VECS_3D[idx | 1] * cellularJitter) / mFrequency); - center.setZ((zi + RAND_VECS_3D[idx | 2] * cellularJitter) / mFrequency); - } else if(newDistance < distance1) { - distance2 = distance1; - distance1 = newDistance; - } else if(newDistance < distance2) { - distance2 = newDistance; - } - zPrimed += PRIME_Z; - } - yPrimed += PRIME_Y; - } - xPrimed += PRIME_X; - } - break; - case Hybrid: - for(int xi = xr - 1; xi <= xr + 1; xi++) { - int yPrimed = yPrimedBase; - - for(int yi = yr - 1; yi <= yr + 1; yi++) { - int zPrimed = zPrimedBase; - - for(int zi = zr - 1; zi <= zr + 1; zi++) { - int hash = hash(seed, xPrimed, yPrimed, zPrimed); - int idx = hash & (255 << 2); - - double vecX = (xi - x) + RAND_VECS_3D[idx] * cellularJitter; - double vecY = (yi - y) + RAND_VECS_3D[idx | 1] * cellularJitter; - double vecZ = (zi - z) + RAND_VECS_3D[idx | 2] * cellularJitter; - - double newDistance = (fastAbs(vecX) + fastAbs(vecY) + fastAbs(vecZ)) + - (vecX * vecX + vecY * vecY + vecZ * vecZ); - - distance1 = fastMax(fastMin(distance1, newDistance), distance0); - if(newDistance < distance0) { - distance0 = newDistance; - closestHash = hash; - center.setX((xi + RAND_VECS_3D[idx] * cellularJitter) / mFrequency); - center.setY((yi + RAND_VECS_3D[idx | 1] * cellularJitter) / mFrequency); - center.setZ((zi + RAND_VECS_3D[idx | 2] * cellularJitter) / mFrequency); - } else if(newDistance < distance1) { - distance2 = distance1; - distance1 = newDistance; - } else if(newDistance < distance2) { - distance2 = newDistance; - } - zPrimed += PRIME_Z; - } - yPrimed += PRIME_Y; - } - xPrimed += PRIME_X; - } - break; - default: - break; - } - - if(mCellularDistanceFunction == CellularDistanceFunction.Euclidean && mCellularReturnType != CellularReturnType.CellValue) { - distance0 = fastSqrt(distance0); - if(mCellularReturnType != CellularReturnType.CellValue) { - distance1 = fastSqrt(distance1); - } - } - - switch(mCellularReturnType) { - case CellValue: - return closestHash * (1 / 2147483648.0); - case Distance: - return distance0 - 1; - case Distance2: - return distance1 - 1; - case Distance2Add: - return (distance1 + distance0) * 0.5 - 1; - case Distance2Sub: - return distance1 - distance0 - 1; - case Distance2Mul: - return distance1 * distance0 * 0.5 - 1; - case Distance2Div: - return distance0 / distance1 - 1; - case NoiseLookup: - return cellularNoiseLookup.getNoise(center.getX(), center.getY(), center.getZ()); - case Distance3: - return distance2 - 1; - case Distance3Add: - return (distance2 + distance0) * 0.5 - 1; - case Distance3Sub: - return distance2 - distance0 - 1; - case Distance3Mul: - return distance2 * distance0 - 1; - case Distance3Div: - return distance0 / distance2 - 1; - default: - return 0; - } - } - - private double singlePerlin(int seed, double x, double y) { - int x0 = fastFloor(x); - int y0 = fastFloor(y); - - double xd0 = x - x0; - double yd0 = y - y0; - double xd1 = xd0 - 1; - double yd1 = yd0 - 1; - - double xs = interpQuintic(xd0); - double ys = interpQuintic(yd0); - - x0 *= PRIME_X; - y0 *= PRIME_Y; - int x1 = x0 + PRIME_X; - int y1 = y0 + PRIME_Y; - - double xf0 = lerp(gradCoord(seed, x0, y0, xd0, yd0), gradCoord(seed, x1, y0, xd1, yd0), xs); - double xf1 = lerp(gradCoord(seed, x0, y1, xd0, yd1), gradCoord(seed, x1, y1, xd1, yd1), xs); - - return lerp(xf0, xf1, ys) * 1.4247691104677813; - } - - private long murmur64(long h) { - h ^= h >>> 33; - h *= 0xff51afd7ed558ccdL; - h ^= h >>> 33; - h *= 0xc4ceb9fe1a85ec53L; - h ^= h >>> 33; - return h; - } - - private double singleWhiteNoise(int seed, double x, double y, double z) { - long hashX = murmur64(Double.doubleToRawLongBits(x) ^ seed); - long hashZ = murmur64(Double.doubleToRawLongBits(y) ^ seed); - long hash = (((hashX ^ (hashX >>> 32)) + ((hashZ ^ (hashZ >>> 32)) << 32)) ^ seed) + Double.doubleToRawLongBits(z); - long base = ((murmur64(hash)) & 0x000fffffffffffffL) - + POSITIVE_POW1; // Sign and exponent - return (Double.longBitsToDouble(base) - 1.5) * 2; - } - - private double singleWhiteNoise(int seed, double x, double y) { - long hashX = murmur64(Double.doubleToRawLongBits(x) ^ seed); - long hashZ = murmur64(Double.doubleToRawLongBits(y) ^ seed); - long hash = ((hashX ^ (hashX >>> 32)) + ((hashZ ^ (hashZ >>> 32)) << 32)) ^ seed; - long base = (murmur64(hash) & 0x000fffffffffffffL) - + POSITIVE_POW1; // Sign and exponent - return (Double.longBitsToDouble(base) - 1.5) * 2; - } - - // Simplex/OpenSimplex2Sampler Noise - private double singlePerlin(int seed, double x, double y, double z) { - int x0 = fastFloor(x); - int y0 = fastFloor(y); - int z0 = fastFloor(z); - - double xd0 = x - x0; - double yd0 = y - y0; - double zd0 = z - z0; - double xd1 = xd0 - 1; - double yd1 = yd0 - 1; - double zd1 = zd0 - 1; - - double xs = interpQuintic(xd0); - double ys = interpQuintic(yd0); - double zs = interpQuintic(zd0); - - x0 *= PRIME_X; - y0 *= PRIME_Y; - z0 *= PRIME_Z; - int x1 = x0 + PRIME_X; - int y1 = y0 + PRIME_Y; - int z1 = z0 + PRIME_Z; - - double xf00 = lerp(gradCoord(seed, x0, y0, z0, xd0, yd0, zd0), gradCoord(seed, x1, y0, z0, xd1, yd0, zd0), xs); - double xf10 = lerp(gradCoord(seed, x0, y1, z0, xd0, yd1, zd0), gradCoord(seed, x1, y1, z0, xd1, yd1, zd0), xs); - double xf01 = lerp(gradCoord(seed, x0, y0, z1, xd0, yd0, zd1), gradCoord(seed, x1, y0, z1, xd1, yd0, zd1), xs); - double xf11 = lerp(gradCoord(seed, x0, y1, z1, xd0, yd1, zd1), gradCoord(seed, x1, y1, z1, xd1, yd1, zd1), xs); - - double yf0 = lerp(xf00, xf10, ys); - double yf1 = lerp(xf01, xf11, ys); - - return lerp(yf0, yf1, zs) * 0.964921414852142333984375; - } - - private double singleValueCubic(int seed, double x, double y) { - int x1 = fastFloor(x); - int y1 = fastFloor(y); - - double xs = x - x1; - double ys = y - y1; - - x1 *= PRIME_X; - y1 *= PRIME_Y; - int x0 = x1 - PRIME_X; - int y0 = y1 - PRIME_Y; - int x2 = x1 + PRIME_X; - int y2 = y1 + PRIME_Y; - int x3 = x1 + (PRIME_X << 1); - int y3 = y1 + (PRIME_Y << 1); - - return cubicLerp( - cubicLerp(valCoord(seed, x0, y0), valCoord(seed, x1, y0), valCoord(seed, x2, y0), valCoord(seed, x3, y0), - xs), - cubicLerp(valCoord(seed, x0, y1), valCoord(seed, x1, y1), valCoord(seed, x2, y1), valCoord(seed, x3, y1), - xs), - cubicLerp(valCoord(seed, x0, y2), valCoord(seed, x1, y2), valCoord(seed, x2, y2), valCoord(seed, x3, y2), - xs), - cubicLerp(valCoord(seed, x0, y3), valCoord(seed, x1, y3), valCoord(seed, x2, y3), valCoord(seed, x3, y3), - xs), - ys) * (1 / (1.5 * 1.5)); - } - - // OpenSimplex2S Noise - private double singleValueCubic(int seed, double x, double y, double z) { - int x1 = fastFloor(x); - int y1 = fastFloor(y); - int z1 = fastFloor(z); - - double xs = x - x1; - double ys = y - y1; - double zs = z - z1; - - x1 *= PRIME_X; - y1 *= PRIME_Y; - z1 *= PRIME_Z; - - int x0 = x1 - PRIME_X; - int y0 = y1 - PRIME_Y; - int z0 = z1 - PRIME_Z; - int x2 = x1 + PRIME_X; - int y2 = y1 + PRIME_Y; - int z2 = z1 + PRIME_Z; - int x3 = x1 + (PRIME_X << 1); - int y3 = y1 + (PRIME_Y << 1); - int z3 = z1 + (PRIME_Z << 1); - - return cubicLerp( - cubicLerp( - cubicLerp(valCoord(seed, x0, y0, z0), valCoord(seed, x1, y0, z0), valCoord(seed, x2, y0, z0), - valCoord(seed, x3, y0, z0), xs), - cubicLerp(valCoord(seed, x0, y1, z0), valCoord(seed, x1, y1, z0), valCoord(seed, x2, y1, z0), - valCoord(seed, x3, y1, z0), xs), - cubicLerp(valCoord(seed, x0, y2, z0), valCoord(seed, x1, y2, z0), valCoord(seed, x2, y2, z0), - valCoord(seed, x3, y2, z0), xs), - cubicLerp(valCoord(seed, x0, y3, z0), valCoord(seed, x1, y3, z0), valCoord(seed, x2, y3, z0), - valCoord(seed, x3, y3, z0), xs), - ys), - cubicLerp( - cubicLerp(valCoord(seed, x0, y0, z1), valCoord(seed, x1, y0, z1), valCoord(seed, x2, y0, z1), - valCoord(seed, x3, y0, z1), xs), - cubicLerp(valCoord(seed, x0, y1, z1), valCoord(seed, x1, y1, z1), valCoord(seed, x2, y1, z1), - valCoord(seed, x3, y1, z1), xs), - cubicLerp(valCoord(seed, x0, y2, z1), valCoord(seed, x1, y2, z1), valCoord(seed, x2, y2, z1), - valCoord(seed, x3, y2, z1), xs), - cubicLerp(valCoord(seed, x0, y3, z1), valCoord(seed, x1, y3, z1), valCoord(seed, x2, y3, z1), - valCoord(seed, x3, y3, z1), xs), - ys), - cubicLerp( - cubicLerp(valCoord(seed, x0, y0, z2), valCoord(seed, x1, y0, z2), valCoord(seed, x2, y0, z2), - valCoord(seed, x3, y0, z2), xs), - cubicLerp(valCoord(seed, x0, y1, z2), valCoord(seed, x1, y1, z2), valCoord(seed, x2, y1, z2), - valCoord(seed, x3, y1, z2), xs), - cubicLerp(valCoord(seed, x0, y2, z2), valCoord(seed, x1, y2, z2), valCoord(seed, x2, y2, z2), - valCoord(seed, x3, y2, z2), xs), - cubicLerp(valCoord(seed, x0, y3, z2), valCoord(seed, x1, y3, z2), valCoord(seed, x2, y3, z2), - valCoord(seed, x3, y3, z2), xs), - ys), - cubicLerp( - cubicLerp(valCoord(seed, x0, y0, z3), valCoord(seed, x1, y0, z3), valCoord(seed, x2, y0, z3), - valCoord(seed, x3, y0, z3), xs), - cubicLerp(valCoord(seed, x0, y1, z3), valCoord(seed, x1, y1, z3), valCoord(seed, x2, y1, z3), - valCoord(seed, x3, y1, z3), xs), - cubicLerp(valCoord(seed, x0, y2, z3), valCoord(seed, x1, y2, z3), valCoord(seed, x2, y2, z3), - valCoord(seed, x3, y2, z3), xs), - cubicLerp(valCoord(seed, x0, y3, z3), valCoord(seed, x1, y3, z3), valCoord(seed, x2, y3, z3), - valCoord(seed, x3, y3, z3), xs), - ys), - zs) * (1 / (1.5 * 1.5 * 1.5)); - } - - private double singleValue(int seed, double x, double y) { - int x0 = fastFloor(x); - int y0 = fastFloor(y); - - double xs = interpHermite(x - x0); - double ys = interpHermite(y - y0); - - x0 *= PRIME_X; - y0 *= PRIME_Y; - int x1 = x0 + PRIME_X; - int y1 = y0 + PRIME_Y; - - double xf0 = lerp(valCoord(seed, x0, y0), valCoord(seed, x1, y0), xs); - double xf1 = lerp(valCoord(seed, x0, y1), valCoord(seed, x1, y1), xs); - - return lerp(xf0, xf1, ys); - } - - // Cellular Noise - private double singleValue(int seed, double x, double y, double z) { - int x0 = fastFloor(x); - int y0 = fastFloor(y); - int z0 = fastFloor(z); - - double xs = interpHermite(x - x0); - double ys = interpHermite(y - y0); - double zs = interpHermite(z - z0); - - x0 *= PRIME_X; - y0 *= PRIME_Y; - z0 *= PRIME_Z; - int x1 = x0 + PRIME_X; - int y1 = y0 + PRIME_Y; - int z1 = z0 + PRIME_Z; - - double xf00 = lerp(valCoord(seed, x0, y0, z0), valCoord(seed, x1, y0, z0), xs); - double xf10 = lerp(valCoord(seed, x0, y1, z0), valCoord(seed, x1, y1, z0), xs); - double xf01 = lerp(valCoord(seed, x0, y0, z1), valCoord(seed, x1, y0, z1), xs); - double xf11 = lerp(valCoord(seed, x0, y1, z1), valCoord(seed, x1, y1, z1), xs); - - double yf0 = lerp(xf00, xf10, ys); - double yf1 = lerp(xf01, xf11, ys); - - return lerp(yf0, yf1, zs); - } - - private void doSingleDomainWarp(int seed, double amp, double freq, double x, double y, Vector2 coord) { - switch(mDomainWarpType) { - case OpenSimplex2: - singleDomainWarpSimplexGradient(seed, amp * 38.283687591552734375, freq, x, y, coord, false); - break; - case OpenSimplex2Reduced: - singleDomainWarpSimplexGradient(seed, amp * 16.0, freq, x, y, coord, true); - break; - case BasicGrid: - singleDomainWarpBasicGrid(seed, amp, freq, x, y, coord); - break; - case Function: - singleFunctionDomainWarp(seed, amp, x, y, freq, coord); - break; - } - } - - // Perlin Noise - private void doSingleDomainWarp(int seed, double amp, double freq, double x, double y, - double z, - Vector3 coord) { - switch(mDomainWarpType) { - case OpenSimplex2: - singleDomainWarpOpenSimplex2Gradient(seed, amp * 32.69428253173828125, freq, x, y, z, coord, false); - break; - case OpenSimplex2Reduced: - singleDomainWarpOpenSimplex2Gradient(seed, amp * 7.71604938271605, freq, x, y, z, coord, true); - break; - case BasicGrid: - singleDomainWarpBasicGrid(seed, amp, freq, x, y, z, coord); - break; - case Function: - singleFunctionDomainWarp(seed, amp, x, y, z, freq, coord); - break; - } - } - - private void singleFunctionDomainWarp(int seed, double amp, double x, double y, double freq, Vector2 coord) { - coord.add(domainWarpFunction.getNoiseSeeded(seed + 1, x, y) * amp, - domainWarpFunction.getNoiseSeeded(seed + 2, x, y) * amp); - } - - private void singleFunctionDomainWarp(int seed, double amp, double x, double y, double z, double freq, Vector3 coord) { - coord.add(domainWarpFunction.getNoiseSeeded(seed + 1, x, y, z) * amp, - domainWarpFunction.getNoiseSeeded(seed + 3, x, y, z) * amp, - domainWarpFunction.getNoiseSeeded(seed + 2, x, y, z) * amp); - } - - private void domainWarpSingle(int seed, Vector2 coord) { - double amp = mDomainWarpAmp * mFractalBounding; - double freq = mFrequency; - - - double xs = coord.getX(); - - double ys = coord.getZ(); - switch(mDomainWarpType) { - case OpenSimplex2: - case OpenSimplex2Reduced: { - - final double SQRT3 = 1.7320508075688772935274463415059; - final double F2 = 0.5 * (SQRT3 - 1); - - double t = (xs + ys) * F2; - xs += t; - ys += t; - } - break; - default: - break; - } - - doSingleDomainWarp(seed, amp, freq, xs, ys, coord); - } - - // Value Cubic Noise - private void domainWarpSingle(int seed, Vector3 coord) { - double amp = mDomainWarpAmp * mFractalBounding; - double freq = mFrequency; - - - double xs = coord.getX(); - - double ys = coord.getY(); - - double zs = coord.getZ(); - switch(mWarpTransformType3D) { - case ImproveXYPlanes: { - - double xy = xs + ys; - - double s2 = xy * -0.211324865405187D; - - zs *= 0.577350269189626; - xs += s2 - zs; - ys = ys + s2 - zs; - - zs += xy * 0.577350269189626; - } - break; - case ImproveXZPlanes: { - - double xz = xs + zs; - - double s2 = xz * -0.211324865405187D; - - ys *= 0.577350269189626; - xs += s2 - ys; - zs += s2 - ys; - - ys += xz * 0.577350269189626; - } - break; - case DefaultOpenSimplex2: { - - final double R3 = 2.0 / 3.0; - - double r = (xs + ys + zs) * R3; // Rotation, not skew - xs = r - xs; - ys = r - ys; - zs = r - zs; - } - break; - default: - break; - } - - doSingleDomainWarp(seed, amp, freq, xs, ys, zs, coord); - } - - private void domainWarpFractalProgressive(int seed, Vector2 coord) { - double amp = mDomainWarpAmp * mFractalBounding; - double freq = mFrequency; - - for(int i = 0; i < mOctaves; i++) { - - double xs = coord.getX(); - - double ys = coord.getZ(); - switch(mDomainWarpType) { - case OpenSimplex2: - case OpenSimplex2Reduced: { - - final double SQRT3 = 1.7320508075688772935274463415059; - final double F2 = 0.5 * (SQRT3 - 1); - - double t = (xs + ys) * F2; - xs += t; - ys += t; - } - break; - default: - break; - } - - doSingleDomainWarp(seed, amp, freq, xs, ys, coord); - - seed++; - amp *= mGain; - freq *= mLacunarity; - } - } - - // Value Noise - private void domainWarpFractalProgressive(int seed, Vector3 coord) { - double amp = mDomainWarpAmp * mFractalBounding; - double freq = mFrequency; - - for(int i = 0; i < mOctaves; i++) { - - double xs = coord.getX(); - - double ys = coord.getY(); - - double zs = coord.getZ(); - switch(mWarpTransformType3D) { - case ImproveXYPlanes: { - - double xy = xs + ys; - - double s2 = xy * -0.211324865405187D; - - zs *= 0.577350269189626; - xs += s2 - zs; - ys = ys + s2 - zs; - - zs += xy * 0.577350269189626; - } - break; - case ImproveXZPlanes: { - - double xz = xs + zs; - - double s2 = xz * -0.211324865405187D; - - ys *= 0.577350269189626; - xs += s2 - ys; - zs += s2 - ys; - - ys += xz * 0.577350269189626; - } - break; - case DefaultOpenSimplex2: { - - final double R3 = 2.0 / 3.0; - - double r = (xs + ys + zs) * R3; // Rotation, not skew - xs = r - xs; - ys = r - ys; - zs = r - zs; - } - break; - default: - break; - } - - doSingleDomainWarp(seed, amp, freq, xs, ys, zs, coord); - - seed++; - amp *= mGain; - freq *= mLacunarity; - } - } - - // Domain Warp Fractal Independant - private void domainWarpFractalIndependent(int seed, Vector2 coord) { - - double xs = coord.getX(); - - double ys = coord.getZ(); - switch(mDomainWarpType) { - case OpenSimplex2: - case OpenSimplex2Reduced: { - - final double SQRT3 = 1.7320508075688772935274463415059; - final double F2 = 0.5 * (SQRT3 - 1); - - double t = (xs + ys) * F2; - xs += t; - ys += t; - } - break; - default: - break; - } - - double amp = mDomainWarpAmp * mFractalBounding; - double freq = mFrequency; - - for(int i = 0; i < mOctaves; i++) { - doSingleDomainWarp(seed, amp, freq, xs, ys, coord); - - seed++; - amp *= mGain; - freq *= mLacunarity; - } - } - - // Domain Warp - private void domainWarpFractalIndependent(int seed, Vector3 coord) { - - double xs = coord.getX(); - - double ys = coord.getY(); - - double zs = coord.getZ(); - switch(mWarpTransformType3D) { - case ImproveXYPlanes: { - - double xy = xs + ys; - - double s2 = xy * -0.211324865405187D; - - zs *= 0.577350269189626; - xs += s2 - zs; - ys = ys + s2 - zs; - - zs += xy * 0.577350269189626; - } - break; - case ImproveXZPlanes: { - - double xz = xs + zs; - - double s2 = xz * -0.211324865405187D; - - ys *= 0.577350269189626; - xs += s2 - ys; - zs += s2 - ys; - - ys += xz * 0.577350269189626; - } - break; - case DefaultOpenSimplex2: { - - final double R3 = 2.0 / 3.0; - - double r = (xs + ys + zs) * R3; // Rotation, not skew - xs = r - xs; - ys = r - ys; - zs = r - zs; - } - break; - default: - break; - } - - double amp = mDomainWarpAmp * mFractalBounding; - double freq = mFrequency; - - for(int i = 0; i < mOctaves; i++) { - doSingleDomainWarp(seed, amp, freq, xs, ys, zs, coord); - - seed++; - amp *= mGain; - freq *= mLacunarity; - } - } - - private void singleDomainWarpBasicGrid(int seed, double warpAmp, double frequency, double x, double y, - Vector2 coord) { - - double xf = x * frequency; - - double yf = y * frequency; - - int x0 = fastFloor(xf); - int y0 = fastFloor(yf); - - double xs = interpHermite(xf - x0); - double ys = interpHermite(yf - y0); - - x0 *= PRIME_X; - y0 *= PRIME_Y; - int x1 = x0 + PRIME_X; - int y1 = y0 + PRIME_Y; - - int hash0 = hash(seed, x0, y0) & (255 << 1); - int hash1 = hash(seed, x1, y0) & (255 << 1); - - double lx0x = lerp(RAND_VECS_2D[hash0], RAND_VECS_2D[hash1], xs); - double ly0x = lerp(RAND_VECS_2D[hash0 | 1], RAND_VECS_2D[hash1 | 1], xs); - - hash0 = hash(seed, x0, y1) & (255 << 1); - hash1 = hash(seed, x1, y1) & (255 << 1); - - double lx1x = lerp(RAND_VECS_2D[hash0], RAND_VECS_2D[hash1], xs); - double ly1x = lerp(RAND_VECS_2D[hash0 | 1], RAND_VECS_2D[hash1 | 1], xs); - - coord.add(lerp(lx0x, lx1x, ys) * warpAmp, - lerp(ly0x, ly1x, ys) * warpAmp); - } - - // Domain Warp Single Wrapper - private void singleDomainWarpBasicGrid(int seed, double warpAmp, double frequency, double x, - double y, double z, Vector3 coord) { - - double xf = x * frequency; - - double yf = y * frequency; - - double zf = z * frequency; - - int x0 = fastFloor(xf); - int y0 = fastFloor(yf); - int z0 = fastFloor(zf); - - double xs = interpHermite(xf - x0); - double ys = interpHermite(yf - y0); - double zs = interpHermite(zf - z0); - - x0 *= PRIME_X; - y0 *= PRIME_Y; - z0 *= PRIME_Z; - int x1 = x0 + PRIME_X; - int y1 = y0 + PRIME_Y; - int z1 = z0 + PRIME_Z; - - int hash0 = hash(seed, x0, y0, z0) & (255 << 2); - int hash1 = hash(seed, x1, y0, z0) & (255 << 2); - - double lx0x = lerp(RAND_VECS_3D[hash0], RAND_VECS_3D[hash1], xs); - double ly0x = lerp(RAND_VECS_3D[hash0 | 1], RAND_VECS_3D[hash1 | 1], xs); - double lz0x = lerp(RAND_VECS_3D[hash0 | 2], RAND_VECS_3D[hash1 | 2], xs); - - hash0 = hash(seed, x0, y1, z0) & (255 << 2); - hash1 = hash(seed, x1, y1, z0) & (255 << 2); - - double lx1x = lerp(RAND_VECS_3D[hash0], RAND_VECS_3D[hash1], xs); - double ly1x = lerp(RAND_VECS_3D[hash0 | 1], RAND_VECS_3D[hash1 | 1], xs); - double lz1x = lerp(RAND_VECS_3D[hash0 | 2], RAND_VECS_3D[hash1 | 2], xs); - - double lx0y = lerp(lx0x, lx1x, ys); - double ly0y = lerp(ly0x, ly1x, ys); - double lz0y = lerp(lz0x, lz1x, ys); - - hash0 = hash(seed, x0, y0, z1) & (255 << 2); - hash1 = hash(seed, x1, y0, z1) & (255 << 2); - - lx0x = lerp(RAND_VECS_3D[hash0], RAND_VECS_3D[hash1], xs); - ly0x = lerp(RAND_VECS_3D[hash0 | 1], RAND_VECS_3D[hash1 | 1], xs); - lz0x = lerp(RAND_VECS_3D[hash0 | 2], RAND_VECS_3D[hash1 | 2], xs); - - hash0 = hash(seed, x0, y1, z1) & (255 << 2); - hash1 = hash(seed, x1, y1, z1) & (255 << 2); - - lx1x = lerp(RAND_VECS_3D[hash0], RAND_VECS_3D[hash1], xs); - ly1x = lerp(RAND_VECS_3D[hash0 | 1], RAND_VECS_3D[hash1 | 1], xs); - lz1x = lerp(RAND_VECS_3D[hash0 | 2], RAND_VECS_3D[hash1 | 2], xs); - - coord.add(lerp(lx0y, lerp(lx0x, lx1x, ys), zs) * warpAmp, - lerp(ly0y, lerp(ly0x, ly1x, ys), zs) * warpAmp, - lerp(lz0y, lerp(lz0x, lz1x, ys), zs) * warpAmp); - } - - // Domain Warp Simplex/OpenSimplex2Sampler - private void singleDomainWarpSimplexGradient(int seed, double warpAmp, double frequency, double x, double y, - Vector2 coord, boolean outGradOnly) { - final double SQRT3 = 1.7320508075688772935274463415059; - final double G2 = (3 - SQRT3) / 6; - - x *= frequency; - y *= frequency; - - /* - * --- Skew moved to switch statements before fractal evaluation --- - * final FNLdouble F2 = 0.5f * (SQRT3 - 1); - * FNLdouble s = (x + y) * F2; - * x += s; y += s; - */ - - int i = fastFloor(x); - int j = fastFloor(y); - double xi = x - i; - double yi = y - j; - - double t = (xi + yi) * G2; - double x0 = xi - t; - double y0 = yi - t; - - i *= PRIME_X; - j *= PRIME_Y; - - double vx, vy; - vx = vy = 0; - - double a = 0.5 - x0 * x0 - y0 * y0; - if(a > 0) { - double aaaa = (a * a) * (a * a); - double xo, yo; - if(outGradOnly) { - int hash = hash(seed, i, j) & (255 << 1); - xo = RAND_VECS_2D[hash]; - yo = RAND_VECS_2D[hash | 1]; - } else { - int hash = hash(seed, i, j); - int index1 = hash & (127 << 1); - int index2 = (hash >> 7) & (255 << 1); - double xg = GRADIENTS_2_D[index1]; - double yg = GRADIENTS_2_D[index1 | 1]; - double value = x0 * xg + y0 * yg; - double xgo = RAND_VECS_2D[index2]; - double ygo = RAND_VECS_2D[index2 | 1]; - xo = value * xgo; - yo = value * ygo; - } - vx += aaaa * xo; - vy += aaaa * yo; - } - - double c = 2 * (1 - 2 * G2) * (1 / G2 - 2) * t + ((-2 * (1 - 2 * G2) * (1 - 2 * G2)) + a); - if(c > 0) { - double x2 = x0 + (2 * G2 - 1); - double y2 = y0 + (2 * G2 - 1); - double cccc = (c * c) * (c * c); - double xo, yo; - if(outGradOnly) { - int hash = hash(seed, i + PRIME_X, j + PRIME_Y) & (255 << 1); - xo = RAND_VECS_2D[hash]; - yo = RAND_VECS_2D[hash | 1]; - } else { - int hash = hash(seed, i + PRIME_X, j + PRIME_Y); - int index1 = hash & (127 << 1); - int index2 = (hash >> 7) & (255 << 1); - double xg = GRADIENTS_2_D[index1]; - double yg = GRADIENTS_2_D[index1 | 1]; - double value = x2 * xg + y2 * yg; - double xgo = RAND_VECS_2D[index2]; - double ygo = RAND_VECS_2D[index2 | 1]; - xo = value * xgo; - yo = value * ygo; - } - vx += cccc * xo; - vy += cccc * yo; - } - - if(y0 > x0) { - double x1 = x0 + G2; - double y1 = y0 + (G2 - 1); - double b = 0.5 - x1 * x1 - y1 * y1; - if(b > 0) { - double bbbb = (b * b) * (b * b); - double xo, yo; - if(outGradOnly) { - int hash = hash(seed, i, j + PRIME_Y) & (255 << 1); - xo = RAND_VECS_2D[hash]; - yo = RAND_VECS_2D[hash | 1]; - } else { - int hash = hash(seed, i, j + PRIME_Y); - int index1 = hash & (127 << 1); - int index2 = (hash >> 7) & (255 << 1); - double xg = GRADIENTS_2_D[index1]; - double yg = GRADIENTS_2_D[index1 | 1]; - double value = x1 * xg + y1 * yg; - double xgo = RAND_VECS_2D[index2]; - double ygo = RAND_VECS_2D[index2 | 1]; - xo = value * xgo; - yo = value * ygo; - } - vx += bbbb * xo; - vy += bbbb * yo; - } - } else { - double x1 = x0 + (G2 - 1); - double y1 = y0 + G2; - double b = 0.5 - x1 * x1 - y1 * y1; - if(b > 0) { - double bbbb = (b * b) * (b * b); - double xo, yo; - if(outGradOnly) { - int hash = hash(seed, i + PRIME_X, j) & (255 << 1); - xo = RAND_VECS_2D[hash]; - yo = RAND_VECS_2D[hash | 1]; - } else { - int hash = hash(seed, i + PRIME_X, j); - int index1 = hash & (127 << 1); - int index2 = (hash >> 7) & (255 << 1); - double xg = GRADIENTS_2_D[index1]; - double yg = GRADIENTS_2_D[index1 | 1]; - double value = x1 * xg + y1 * yg; - double xgo = RAND_VECS_2D[index2]; - double ygo = RAND_VECS_2D[index2 | 1]; - xo = value * xgo; - yo = value * ygo; - } - vx += bbbb * xo; - vy += bbbb * yo; - } - } - - coord.add(vx * warpAmp, - vy * warpAmp); - } - - // Domain Warp Fractal Progressive - private void singleDomainWarpOpenSimplex2Gradient(int seed, double warpAmp, double frequency, double x, - double y, double z, Vector3 coord, boolean outGradOnly) { - x *= frequency; - y *= frequency; - z *= frequency; - - /* - * --- Rotation moved to switch statements before fractal evaluation --- - * final FNLdouble R3 = (FNLdouble)(2.0 / 3.0); - * FNLdouble r = (x + y + z) * R3; // Rotation, not skew - * x = r - x; y = r - y; z = r - z; - */ - - int i = fastRound(x); - int j = fastRound(y); - int k = fastRound(z); - double x0 = x - i; - double y0 = y - j; - double z0 = z - k; - - int xNSign = (int) (-x0 - 1.0) | 1; - int yNSign = (int) (-y0 - 1.0) | 1; - int zNSign = (int) (-z0 - 1.0) | 1; - - double ax0 = xNSign * -x0; - double ay0 = yNSign * -y0; - double az0 = zNSign * -z0; - - i *= PRIME_X; - j *= PRIME_Y; - k *= PRIME_Z; - - double vx, vy, vz; - vx = vy = vz = 0; - - double a = (0.6 - x0 * x0) - (y0 * y0 + z0 * z0); - for(int l = 0; ; l++) { - if(a > 0) { - double aaaa = (a * a) * (a * a); - double xo, yo, zo; - if(outGradOnly) { - int hash = hash(seed, i, j, k) & (255 << 2); - xo = RAND_VECS_3D[hash]; - yo = RAND_VECS_3D[hash | 1]; - zo = RAND_VECS_3D[hash | 2]; - } else { - int hash = hash(seed, i, j, k); - int index1 = hash & (63 << 2); - int index2 = (hash >> 6) & (255 << 2); - double xg = GRADIENTS_3D[index1]; - double yg = GRADIENTS_3D[index1 | 1]; - double zg = GRADIENTS_3D[index1 | 2]; - double value = x0 * xg + y0 * yg + z0 * zg; - double xgo = RAND_VECS_3D[index2]; - double ygo = RAND_VECS_3D[index2 | 1]; - double zgo = RAND_VECS_3D[index2 | 2]; - xo = value * xgo; - yo = value * ygo; - zo = value * zgo; - } - vx += aaaa * xo; - vy += aaaa * yo; - vz += aaaa * zo; - } - - double b = a; - int i1 = i; - int j1 = j; - int k1 = k; - double x1 = x0; - double y1 = y0; - double z1 = z0; - - if(ax0 >= ay0 && ax0 >= az0) { - x1 += xNSign; - b = b + ax0 + ax0; - i1 -= xNSign * PRIME_X; - } else if(ay0 > ax0 && ay0 >= az0) { - y1 += yNSign; - b = b + ay0 + ay0; - j1 -= yNSign * PRIME_Y; - } else { - z1 += zNSign; - b = b + az0 + az0; - k1 -= zNSign * PRIME_Z; - } - - if(b > 1) { - b -= 1; - double bbbb = (b * b) * (b * b); - double xo, yo, zo; - if(outGradOnly) { - int hash = hash(seed, i1, j1, k1) & (255 << 2); - xo = RAND_VECS_3D[hash]; - yo = RAND_VECS_3D[hash | 1]; - zo = RAND_VECS_3D[hash | 2]; - } else { - int hash = hash(seed, i1, j1, k1); - int index1 = hash & (63 << 2); - int index2 = (hash >> 6) & (255 << 2); - double xg = GRADIENTS_3D[index1]; - double yg = GRADIENTS_3D[index1 | 1]; - double zg = GRADIENTS_3D[index1 | 2]; - double value = x1 * xg + y1 * yg + z1 * zg; - double xgo = RAND_VECS_3D[index2]; - double ygo = RAND_VECS_3D[index2 | 1]; - double zgo = RAND_VECS_3D[index2 | 2]; - xo = value * xgo; - yo = value * ygo; - zo = value * zgo; - } - vx += bbbb * xo; - vy += bbbb * yo; - vz += bbbb * zo; - } - - if(l == 1) break; - - ax0 = 0.5 - ax0; - ay0 = 0.5 - ay0; - az0 = 0.5 - az0; - - x0 = xNSign * ax0; - y0 = yNSign * ay0; - z0 = zNSign * az0; - - a += (0.75 - ax0) - (ay0 + az0); - - i += (xNSign >> 1) & PRIME_X; - j += (yNSign >> 1) & PRIME_Y; - k += (zNSign >> 1) & PRIME_Z; - - xNSign = -xNSign; - yNSign = -yNSign; - zNSign = -zNSign; - - seed += 1293373; - } - - coord.add(vx * warpAmp, - vy * warpAmp, - vz * warpAmp); - } - - public enum NoiseType { - OpenSimplex2, - OpenSimplex2S, - Cellular, - Perlin, - ValueCubic, - Value, - WhiteNoise, - Constant - } - - - public enum RotationType3D { - None, - ImproveXYPlanes, - ImproveXZPlanes - } - - - public enum FractalType { - None, - FBm, - Ridged, - PingPong, - DomainWarpProgressive, - DomainWarpIndependent - } - - // Domain Warp Basic Grid - - - public enum CellularDistanceFunction { - Euclidean, - EuclideanSq, - Manhattan, - Hybrid - } - - - public enum CellularReturnType { - CellValue, - Distance, - Distance2, - Distance2Add, - Distance2Sub, - Distance2Mul, - Distance2Div, - NoiseLookup, - Distance3, - Distance3Add, - Distance3Sub, - Distance3Mul, - Distance3Div - } - - - public enum DomainWarpType { - OpenSimplex2, - OpenSimplex2Reduced, - BasicGrid, - Function - } - - - private enum TransformType3D { - None, - ImproveXYPlanes, - ImproveXZPlanes, - DefaultOpenSimplex2 - } -} \ No newline at end of file diff --git a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/CellularSampler.java b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/CellularSampler.java index a44a47cd1..d0b2b3b7a 100644 --- a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/CellularSampler.java +++ b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/CellularSampler.java @@ -187,7 +187,12 @@ public class CellularSampler extends NoiseFunction { private ReturnType returnType = ReturnType.Distance; private double jitterModifier = 1.0; - private NoiseSampler noiseLookup = new OpenSimplex2Sampler(); + private NoiseSampler noiseLookup; + + public CellularSampler(int seed) { + super(seed); + noiseLookup = new OpenSimplex2Sampler(seed); + } public void setDistanceFunction(DistanceFunction distanceFunction) { this.distanceFunction = distanceFunction; diff --git a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/ConstantSampler.java b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/ConstantSampler.java similarity index 53% rename from common/src/main/java/com/dfsek/terra/api/math/noise/samplers/ConstantSampler.java rename to common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/ConstantSampler.java index 0def98ac1..4ad942076 100644 --- a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/ConstantSampler.java +++ b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/ConstantSampler.java @@ -1,27 +1,16 @@ -package com.dfsek.terra.api.math.noise.samplers; - -import com.dfsek.terra.api.math.noise.NoiseSampler; +package com.dfsek.terra.api.math.noise.samplers.noise; /** * Sampler implementation that returns a constant. */ -public class ConstantSampler implements NoiseSampler { +public class ConstantSampler extends NoiseFunction { private final double constant; public ConstantSampler(double constant) { + super(0); this.constant = constant; } - @Override - public double getNoise(double x, double y) { - return constant; - } - - @Override - public double getNoise(double x, double y, double z) { - return constant; - } - @Override public double getNoiseSeeded(int seed, double x, double y) { return constant; diff --git a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/NoiseFunction.java b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/NoiseFunction.java index d1fabbe91..9aff174b6 100644 --- a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/NoiseFunction.java +++ b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/NoiseFunction.java @@ -3,6 +3,7 @@ package com.dfsek.terra.api.math.noise.samplers.noise; import com.dfsek.terra.api.math.noise.NoiseSampler; import net.jafama.FastMath; +@SuppressWarnings("ManualMinMaxCalculation") public abstract class NoiseFunction implements NoiseSampler { // Hashing protected static final int PRIME_X = 501125321; @@ -13,6 +14,10 @@ public abstract class NoiseFunction implements NoiseSampler { protected double frequency = 0.02d; protected int seed = 2403; + public NoiseFunction(int seed) { + this.seed = seed; + } + protected static int fastFloor(double f) { return f >= 0 ? (int) f : (int) f - 1; } diff --git a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/WhiteNoiseSampler.java b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/WhiteNoiseSampler.java index 2fe8ed992..1f01e423e 100644 --- a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/WhiteNoiseSampler.java +++ b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/WhiteNoiseSampler.java @@ -3,6 +3,10 @@ package com.dfsek.terra.api.math.noise.samplers.noise; public class WhiteNoiseSampler extends NoiseFunction { private static final long POSITIVE_POW1 = 0b01111111111L << 52; // Bits that when applied to the exponent/sign section of a double, produce a positive number with a power of 1. + public WhiteNoiseSampler(int seed) { + super(seed); + } + @Override public double getNoiseSeeded(int seed, double x, double y) { long hashX = Double.doubleToRawLongBits(x) ^ seed; diff --git a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/fractal/BrownianMotionSampler.java b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/fractal/BrownianMotionSampler.java index 4a138c7dd..cb3a6f5f4 100644 --- a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/fractal/BrownianMotionSampler.java +++ b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/fractal/BrownianMotionSampler.java @@ -3,8 +3,8 @@ package com.dfsek.terra.api.math.noise.samplers.noise.fractal; import com.dfsek.terra.api.math.noise.NoiseSampler; public class BrownianMotionSampler extends FractalNoiseFunction { - public BrownianMotionSampler(NoiseSampler input) { - super(input); + public BrownianMotionSampler(int seed, NoiseSampler input) { + super(seed, input); } @Override diff --git a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/fractal/FractalNoiseFunction.java b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/fractal/FractalNoiseFunction.java index da5798d2f..39def1cea 100644 --- a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/fractal/FractalNoiseFunction.java +++ b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/fractal/FractalNoiseFunction.java @@ -11,7 +11,8 @@ public abstract class FractalNoiseFunction extends NoiseFunction { protected double lacunarity = 2.0d; protected double weightedStrength = 0.0d; - public FractalNoiseFunction(NoiseSampler input) { + public FractalNoiseFunction(int seed, NoiseSampler input) { + super(seed); this.input = input; } diff --git a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/fractal/PingPongSampler.java b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/fractal/PingPongSampler.java index de30a20e3..baee4b89d 100644 --- a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/fractal/PingPongSampler.java +++ b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/fractal/PingPongSampler.java @@ -5,10 +5,11 @@ import com.dfsek.terra.api.math.noise.NoiseSampler; public class PingPongSampler extends FractalNoiseFunction { private double pingPongStrength = 2.0; - public PingPongSampler(NoiseSampler input) { - super(input); + public PingPongSampler(int seed, NoiseSampler input) { + super(seed, input); } + private static double pingPong(double t) { t -= (int) (t * 0.5f) << 1; return t < 1 ? t : 2 - t; diff --git a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/fractal/RidgedFractalSampler.java b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/fractal/RidgedFractalSampler.java index e1be7f698..59421c777 100644 --- a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/fractal/RidgedFractalSampler.java +++ b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/fractal/RidgedFractalSampler.java @@ -3,8 +3,9 @@ package com.dfsek.terra.api.math.noise.samplers.noise.fractal; import com.dfsek.terra.api.math.noise.NoiseSampler; public class RidgedFractalSampler extends FractalNoiseFunction { - public RidgedFractalSampler(NoiseSampler input) { - super(input); + + public RidgedFractalSampler(int seed, NoiseSampler input) { + super(seed, input); } @Override diff --git a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/simplex/OpenSimplex2SSampler.java b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/simplex/OpenSimplex2SSampler.java index 0e24c0cff..88506d3b4 100644 --- a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/simplex/OpenSimplex2SSampler.java +++ b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/simplex/OpenSimplex2SSampler.java @@ -1,6 +1,10 @@ package com.dfsek.terra.api.math.noise.samplers.noise.simplex; public class OpenSimplex2SSampler extends SimplexStyleSampler { + public OpenSimplex2SSampler(int seed) { + super(seed); + } + @Override @SuppressWarnings("NumericOverflow") public double getNoiseSeeded(int seed, double x, double y) { diff --git a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/simplex/OpenSimplex2Sampler.java b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/simplex/OpenSimplex2Sampler.java index ad94ab9dd..9517a33ef 100644 --- a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/simplex/OpenSimplex2Sampler.java +++ b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/simplex/OpenSimplex2Sampler.java @@ -3,6 +3,10 @@ package com.dfsek.terra.api.math.noise.samplers.noise.simplex; public class OpenSimplex2Sampler extends SimplexStyleSampler { private static final double SQRT3 = 1.7320508075688772935274463415059; + public OpenSimplex2Sampler(int seed) { + super(seed); + } + @Override public double getNoiseSeeded(int seed, double x, double y) { // 2D OpenSimplex2 case uses the same algorithm as ordinary Simplex. diff --git a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/simplex/PerlinSampler.java b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/simplex/PerlinSampler.java index e10ca5778..f10ed7ce6 100644 --- a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/simplex/PerlinSampler.java +++ b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/simplex/PerlinSampler.java @@ -1,6 +1,10 @@ package com.dfsek.terra.api.math.noise.samplers.noise.simplex; public class PerlinSampler extends SimplexStyleSampler { + public PerlinSampler(int seed) { + super(seed); + } + @Override public double getNoiseSeeded(int seed, double x, double y) { int x0 = fastFloor(x); diff --git a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/simplex/SimplexStyleSampler.java b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/simplex/SimplexStyleSampler.java index c45f2960e..b27aed62f 100644 --- a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/simplex/SimplexStyleSampler.java +++ b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/simplex/SimplexStyleSampler.java @@ -68,6 +68,10 @@ public abstract class SimplexStyleSampler extends NoiseFunction { 1, 1, 0, 0, 0, -1, 1, 0, -1, 1, 0, 0, 0, -1, -1, 0 }; + public SimplexStyleSampler(int seed) { + super(seed); + } + protected static double gradCoord(int seed, int xPrimed, int yPrimed, double xd, double yd) { int hash = hash(seed, xPrimed, yPrimed); hash ^= hash >> 15; diff --git a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/value/ValueCubicSampler.java b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/value/ValueCubicSampler.java index ef8bdb033..624522b5f 100644 --- a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/value/ValueCubicSampler.java +++ b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/value/ValueCubicSampler.java @@ -1,6 +1,10 @@ package com.dfsek.terra.api.math.noise.samplers.noise.value; public class ValueCubicSampler extends ValueStyleNoise { + public ValueCubicSampler(int seed) { + super(seed); + } + @Override public double getNoiseSeeded(int seed, double x, double y) { int x1 = fastFloor(x); diff --git a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/value/ValueSampler.java b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/value/ValueSampler.java index 48d778c7c..f6df641c2 100644 --- a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/value/ValueSampler.java +++ b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/value/ValueSampler.java @@ -1,6 +1,10 @@ package com.dfsek.terra.api.math.noise.samplers.noise.value; public class ValueSampler extends ValueStyleNoise { + public ValueSampler(int seed) { + super(seed); + } + @Override public double getNoiseSeeded(int seed, double x, double y) { int x0 = fastFloor(x); diff --git a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/value/ValueStyleNoise.java b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/value/ValueStyleNoise.java index f828d0cba..246d77538 100644 --- a/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/value/ValueStyleNoise.java +++ b/common/src/main/java/com/dfsek/terra/api/math/noise/samplers/noise/value/ValueStyleNoise.java @@ -3,6 +3,10 @@ package com.dfsek.terra.api.math.noise.samplers.noise.value; import com.dfsek.terra.api.math.noise.samplers.noise.NoiseFunction; public abstract class ValueStyleNoise extends NoiseFunction { + public ValueStyleNoise(int seed) { + super(seed); + } + protected static double valCoord(int seed, int xPrimed, int yPrimed) { int hash = hash(seed, xPrimed, yPrimed); diff --git a/common/src/main/java/com/dfsek/terra/config/GenericLoaders.java b/common/src/main/java/com/dfsek/terra/config/GenericLoaders.java index 7d966680e..52cdf965c 100644 --- a/common/src/main/java/com/dfsek/terra/config/GenericLoaders.java +++ b/common/src/main/java/com/dfsek/terra/config/GenericLoaders.java @@ -6,8 +6,8 @@ import com.dfsek.terra.api.core.TerraPlugin; import com.dfsek.terra.api.math.GridSpawn; import com.dfsek.terra.api.math.ProbabilityCollection; import com.dfsek.terra.api.math.Range; -import com.dfsek.terra.api.math.noise.samplers.FastNoiseLite; import com.dfsek.terra.api.math.noise.samplers.ImageSampler; +import com.dfsek.terra.api.math.noise.samplers.noise.CellularSampler; import com.dfsek.terra.api.util.seeded.SourceSeeded; import com.dfsek.terra.api.util.seeded.StageSeeded; import com.dfsek.terra.api.world.palette.holder.PaletteHolder; @@ -37,7 +37,6 @@ import com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator.Repla import com.dfsek.terra.config.loaders.config.biome.templates.stage.mutator.SmoothMutatorTemplate; import com.dfsek.terra.config.loaders.config.function.FunctionTemplate; import com.dfsek.terra.config.loaders.config.sampler.templates.DomainWarpTemplate; -import com.dfsek.terra.config.loaders.config.sampler.templates.FastNoiseTemplate; import com.dfsek.terra.config.loaders.config.sampler.templates.ImageSamplerTemplate; import com.dfsek.terra.config.loaders.config.sampler.templates.normalizer.ClampNormalizerTemplate; import com.dfsek.terra.config.loaders.config.sampler.templates.normalizer.LinearNormalizerTemplate; @@ -75,7 +74,6 @@ public class GenericLoaders implements LoaderRegistrar { .registerLoader(TreeLayer.class, new TreeLayerLoader()) .registerLoader(MaterialSet.class, new MaterialSetLoader()) .registerLoader(OreHolder.class, new OreHolderLoader()) - .registerLoader(FastNoiseTemplate.class, FastNoiseTemplate::new) .registerLoader(ImageSamplerTemplate.class, ImageSamplerTemplate::new) .registerLoader(DomainWarpTemplate.class, DomainWarpTemplate::new) .registerLoader(LinearNormalizerTemplate.class, LinearNormalizerTemplate::new) @@ -98,12 +96,8 @@ public class GenericLoaders implements LoaderRegistrar { .registerLoader(ImageBiomeProvider.Align.class, (t, object, cf) -> ImageBiomeProvider.Align.valueOf((String) object)) .registerLoader(ExpanderStage.Type.class, (t, object, cf) -> ExpanderStage.Type.valueOf((String) object)) .registerLoader(MutatorStage.Type.class, (t, object, cf) -> MutatorStage.Type.valueOf((String) object)) - .registerLoader(FastNoiseLite.NoiseType.class, (t, object, cf) -> FastNoiseLite.NoiseType.valueOf((String) object)) - .registerLoader(FastNoiseLite.FractalType.class, (t, object, cf) -> FastNoiseLite.FractalType.valueOf((String) object)) - .registerLoader(FastNoiseLite.DomainWarpType.class, (t, object, cf) -> FastNoiseLite.DomainWarpType.valueOf((String) object)) - .registerLoader(FastNoiseLite.RotationType3D.class, (t, object, cf) -> FastNoiseLite.RotationType3D.valueOf((String) object)) - .registerLoader(FastNoiseLite.CellularReturnType.class, (t, object, cf) -> FastNoiseLite.CellularReturnType.valueOf((String) object)) - .registerLoader(FastNoiseLite.CellularDistanceFunction.class, (t, object, cf) -> FastNoiseLite.CellularDistanceFunction.valueOf((String) object)) + .registerLoader(CellularSampler.ReturnType.class, (t, object, cf) -> CellularSampler.ReturnType.valueOf((String) object)) + .registerLoader(CellularSampler.DistanceFunction.class, (t, object, cf) -> CellularSampler.DistanceFunction.valueOf((String) object)) .registerLoader(TerraFlora.Search.class, (t, o, l) -> TerraFlora.Search.valueOf(o.toString())); } } diff --git a/common/src/main/java/com/dfsek/terra/config/builder/GeneratorBuilder.java b/common/src/main/java/com/dfsek/terra/config/builder/GeneratorBuilder.java index d64e9ef0c..798e91245 100644 --- a/common/src/main/java/com/dfsek/terra/config/builder/GeneratorBuilder.java +++ b/common/src/main/java/com/dfsek/terra/config/builder/GeneratorBuilder.java @@ -3,8 +3,8 @@ package com.dfsek.terra.config.builder; import com.dfsek.paralithic.eval.parser.Scope; import com.dfsek.paralithic.eval.tokenizer.ParseException; import com.dfsek.terra.api.math.noise.NoiseSampler; -import com.dfsek.terra.api.math.noise.samplers.ConstantSampler; import com.dfsek.terra.api.math.noise.samplers.ExpressionSampler; +import com.dfsek.terra.api.math.noise.samplers.noise.ConstantSampler; import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.api.world.palette.holder.PaletteHolder; import com.dfsek.terra.config.loaders.config.function.FunctionTemplate; diff --git a/common/src/main/java/com/dfsek/terra/config/factories/FloraFactory.java b/common/src/main/java/com/dfsek/terra/config/factories/FloraFactory.java index 49e88a2a5..4d4cae0b1 100644 --- a/common/src/main/java/com/dfsek/terra/config/factories/FloraFactory.java +++ b/common/src/main/java/com/dfsek/terra/config/factories/FloraFactory.java @@ -1,7 +1,7 @@ package com.dfsek.terra.config.factories; import com.dfsek.terra.api.core.TerraPlugin; -import com.dfsek.terra.api.math.noise.samplers.FastNoiseLite; +import com.dfsek.terra.api.math.noise.samplers.noise.WhiteNoiseSampler; import com.dfsek.terra.api.platform.block.BlockData; import com.dfsek.terra.api.world.flora.Flora; import com.dfsek.terra.api.world.palette.NoisePalette; @@ -13,9 +13,7 @@ import com.dfsek.terra.world.population.items.flora.TerraFlora; public class FloraFactory implements TerraFactory { @Override public TerraFlora build(FloraTemplate config, TerraPlugin main) { - FastNoiseLite whiteNoise = new FastNoiseLite(); - whiteNoise.setNoiseType(FastNoiseLite.NoiseType.WhiteNoise); - Palette palette = new NoisePalette<>(whiteNoise, false); + Palette palette = new NoisePalette<>(new WhiteNoiseSampler(2403), false); for(PaletteLayerHolder layer : config.getFloraPalette()) { palette.add(layer.getLayer(), layer.getSize(), layer.getSampler()); } diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/FloraLayerLoader.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/FloraLayerLoader.java index b02a20b98..112c953c8 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/config/FloraLayerLoader.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/FloraLayerLoader.java @@ -6,11 +6,10 @@ import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.TypeLoader; import com.dfsek.terra.api.math.ProbabilityCollection; import com.dfsek.terra.api.math.Range; -import com.dfsek.terra.api.math.noise.samplers.FastNoiseLite; +import com.dfsek.terra.api.math.noise.samplers.noise.WhiteNoiseSampler; import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.api.world.flora.Flora; import com.dfsek.terra.config.loaders.Types; -import com.dfsek.terra.config.loaders.config.sampler.templates.FastNoiseTemplate; import com.dfsek.terra.world.population.items.flora.FloraLayer; import java.lang.reflect.Type; @@ -35,10 +34,7 @@ public class FloraLayerLoader implements TypeLoader { } return new FloraLayer(density, range, items, sampler.apply(2403L)); } - FastNoiseTemplate def = new FastNoiseTemplate(); - def.setType(FastNoiseLite.NoiseType.WhiteNoise); - def.setDimensions(3); - return new FloraLayer(density, range, items, def.apply(2403L)); + return new FloraLayer(density, range, items, new WhiteNoiseSampler(2403)); } } diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java index eac525bbd..feba742bc 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/TreeLayerLoader.java @@ -1,16 +1,14 @@ package com.dfsek.terra.config.loaders.config; -import com.dfsek.tectonic.config.Configuration; -import com.dfsek.tectonic.exception.ConfigException; import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.TypeLoader; import com.dfsek.terra.api.math.ProbabilityCollection; import com.dfsek.terra.api.math.Range; -import com.dfsek.terra.api.math.noise.samplers.FastNoiseLite; +import com.dfsek.terra.api.math.noise.samplers.noise.WhiteNoiseSampler; +import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.api.world.tree.Tree; import com.dfsek.terra.config.loaders.Types; -import com.dfsek.terra.config.loaders.config.sampler.templates.FastNoiseTemplate; import com.dfsek.terra.world.population.items.tree.TreeLayer; import java.lang.reflect.Type; @@ -26,19 +24,11 @@ public class TreeLayerLoader implements TypeLoader { if(range == null) throw new LoadException("Tree range unspecified"); ProbabilityCollection items = (ProbabilityCollection) configLoader.loadType(Types.TREE_PROBABILITY_COLLECTION_TYPE, map.get("items")); - FastNoiseTemplate sampler = new FastNoiseTemplate(); if(map.containsKey("distribution")) { - try { - configLoader.load(sampler, new Configuration((Map) map.get("distribution"))); - } catch(ConfigException e) { - throw new LoadException("Unable to load noise", e); - } - return new TreeLayer(density, range, items, sampler.apply(2403L)); + NoiseSeeded noise = configLoader.loadClass(NoiseSeeded.class, map.get("distribution")); + return new TreeLayer(density, range, items, noise.apply(2403L)); } - sampler.setType(FastNoiseLite.NoiseType.WhiteNoise); - sampler.setDimensions(3); - - return new TreeLayer(density, range, items, sampler.apply(2403L)); + return new TreeLayer(density, range, items, new WhiteNoiseSampler(2403)); } } diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/source/BiomeProviderTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/source/BiomeProviderTemplate.java index 9e2d11d88..b0a65d85e 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/source/BiomeProviderTemplate.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/biome/templates/source/BiomeProviderTemplate.java @@ -4,7 +4,7 @@ import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Value; import com.dfsek.tectonic.loading.object.ObjectTemplate; import com.dfsek.terra.api.math.noise.NoiseSampler; -import com.dfsek.terra.api.math.noise.samplers.ConstantSampler; +import com.dfsek.terra.api.math.noise.samplers.noise.ConstantSampler; import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.biome.provider.BiomeProvider; import com.dfsek.terra.registry.config.BiomeRegistry; diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/NoiseSamplerBuilderLoader.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/NoiseSamplerBuilderLoader.java index a44d3135e..65ebf9d38 100644 --- a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/NoiseSamplerBuilderLoader.java +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/NoiseSamplerBuilderLoader.java @@ -5,52 +5,31 @@ import com.dfsek.tectonic.exception.ConfigException; import com.dfsek.tectonic.exception.LoadException; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.tectonic.loading.TypeLoader; +import com.dfsek.tectonic.loading.object.ObjectTemplate; import com.dfsek.terra.api.util.seeded.NoiseSeeded; -import com.dfsek.terra.config.loaders.config.sampler.templates.DomainWarpTemplate; -import com.dfsek.terra.config.loaders.config.sampler.templates.FastNoiseTemplate; -import com.dfsek.terra.config.loaders.config.sampler.templates.ImageSamplerTemplate; -import com.dfsek.terra.config.loaders.config.sampler.templates.normalizer.NormalizerTemplate; -import com.dfsek.terra.registry.config.NormalizerRegistry; +import com.dfsek.terra.registry.config.NoiseRegistry; import java.lang.reflect.Type; +import java.util.Locale; import java.util.Map; @SuppressWarnings("unchecked") public class NoiseSamplerBuilderLoader implements TypeLoader { - private final NormalizerRegistry normalizerRegistry; + private final NoiseRegistry noiseRegistry; - public NoiseSamplerBuilderLoader(NormalizerRegistry normalizerRegistry) { - this.normalizerRegistry = normalizerRegistry; + public NoiseSamplerBuilderLoader(NoiseRegistry noiseRegistry) { + this.noiseRegistry = noiseRegistry; } @Override public NoiseSeeded load(Type t, Object c, ConfigLoader loader) throws LoadException { Map map = (Map) c; - - String samplerType = "NOISE"; - - if(map.containsKey("sampler-type")) { - samplerType = map.get("sampler-type").toString(); + try { + ObjectTemplate normalizerTemplate = noiseRegistry.get(((String) map.get("type")).toUpperCase(Locale.ROOT)).get(); + loader.load(normalizerTemplate, new Configuration(map)); + return normalizerTemplate.get(); + } catch(ConfigException e) { + throw new LoadException("Unable to load noise function: ", e); } - - switch(samplerType) { - case "NOISE": - return loader.loadClass(FastNoiseTemplate.class, map).get(); - case "NORMALIZER": - try { - NormalizerTemplate normalizerTemplate = normalizerRegistry.get((String) map.get("type")).get(); - loader.load(normalizerTemplate, new Configuration(map)); - return normalizerTemplate; - } catch(ConfigException e) { - throw new LoadException("Unable to load normalizer: ", e); - } - case "IMAGE": { - return loader.loadClass(ImageSamplerTemplate.class, map).get(); - } - case "DOMAIN_WARP": - return loader.loadClass(DomainWarpTemplate.class, map).get(); - } - - throw new LoadException("No such noise sampler type \"" + samplerType + "\""); } } diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/FastNoiseTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/FastNoiseTemplate.java deleted file mode 100644 index 3c9277eee..000000000 --- a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/FastNoiseTemplate.java +++ /dev/null @@ -1,227 +0,0 @@ -package com.dfsek.terra.config.loaders.config.sampler.templates; - -import com.dfsek.tectonic.annotations.Default; -import com.dfsek.tectonic.annotations.Value; -import com.dfsek.terra.api.math.noise.NoiseSampler; -import com.dfsek.terra.api.math.noise.samplers.FastNoiseLite; -import com.dfsek.terra.api.util.seeded.NoiseSeeded; - -@SuppressWarnings({"unused", "FieldMayBeFinal"}) -public class FastNoiseTemplate extends SamplerTemplate implements NoiseSeeded { - @Value("type") - @Default - private FastNoiseLite.NoiseType type = FastNoiseLite.NoiseType.OpenSimplex2; - - @Value("fractal.octaves") - @Default - private int octaves = 1; - - @Value("fractal.type") - @Default - private FastNoiseLite.FractalType fractalType = FastNoiseLite.FractalType.None; - - @Value("frequency") - @Default - private double frequency = 0.02D; - - @Value("fractal.gain") - @Default - private double fractalGain = 0.5D; - - @Value("fractal.lacunarity") - @Default - private double fractalLacunarity = 2.0D; - - @Value("fractal.ping-pong") - @Default - private double pingPong = 2.0D; - - @Value("fractal.weighted-strength") - @Default - private double weightedStrength = 0.0D; - - @Value("salt") - @Default - private int seedOffset = 0; - - @Value("cellular.distance") - @Default - private FastNoiseLite.CellularDistanceFunction cellularDistanceFunction = FastNoiseLite.CellularDistanceFunction.EuclideanSq; - - @Value("cellular.return") - @Default - private FastNoiseLite.CellularReturnType cellularReturnType = FastNoiseLite.CellularReturnType.Distance; - - @Value("cellular.jitter") - @Default - private double cellularJitter = 1.0D; - - @Value("rotation-type") - @Default - private FastNoiseLite.RotationType3D rotationType3D = FastNoiseLite.RotationType3D.None; - - @Value("dimensions") - @Default - private int dimensions = 2; - - @Value("cellular.lookup") - @Default - private NoiseSeeded lookup; - - - @Override - public NoiseSampler apply(Long seed) { - FastNoiseLite noise = new FastNoiseLite((int) (seed + seedOffset)); - if(!fractalType.equals(FastNoiseLite.FractalType.None)) { - noise.setFractalType(fractalType); - noise.setFractalOctaves(octaves); - noise.setFractalGain(fractalGain); - noise.setFractalLacunarity(fractalLacunarity); - if(fractalType.equals(FastNoiseLite.FractalType.PingPong)) noise.setFractalPingPongStrength(pingPong); - noise.setFractalWeightedStrength(weightedStrength); - } - if(type.equals(FastNoiseLite.NoiseType.Cellular)) { - noise.setCellularDistanceFunction(cellularDistanceFunction); - noise.setCellularReturnType(cellularReturnType); - noise.setCellularJitter(cellularJitter); - if(lookup != null) noise.setCellularNoiseLookup(lookup.apply(seed)); - } - - noise.setNoiseType(type); - - noise.setRotationType3D(rotationType3D); - - noise.setFrequency(frequency); - return noise; - } - - public FastNoiseLite.NoiseType getType() { - return type; - } - - public FastNoiseTemplate setType(FastNoiseLite.NoiseType type) { - this.type = type; - return this; - } - - public int getSeedOffset() { - return seedOffset; - } - - public void setSeedOffset(int seedOffset) { - this.seedOffset = seedOffset; - } - - public FastNoiseLite.CellularDistanceFunction getCellularDistanceFunction() { - return cellularDistanceFunction; - } - - public FastNoiseTemplate setCellularDistanceFunction(FastNoiseLite.CellularDistanceFunction cellularDistanceFunction) { - this.cellularDistanceFunction = cellularDistanceFunction; - return this; - } - - public FastNoiseLite.CellularReturnType getCellularReturnType() { - return cellularReturnType; - } - - public FastNoiseTemplate setCellularReturnType(FastNoiseLite.CellularReturnType cellularReturnType) { - this.cellularReturnType = cellularReturnType; - return this; - } - - public double getCellularJitter() { - return cellularJitter; - } - - public FastNoiseTemplate setCellularJitter(double cellularJitter) { - this.cellularJitter = cellularJitter; - return this; - } - - public double getFractalGain() { - return fractalGain; - } - - public FastNoiseTemplate setFractalGain(double fractalGain) { - this.fractalGain = fractalGain; - return this; - } - - public double getFractalLacunarity() { - return fractalLacunarity; - } - - public FastNoiseTemplate setFractalLacunarity(double fractalLacunarity) { - this.fractalLacunarity = fractalLacunarity; - return this; - } - - public double getFrequency() { - return frequency; - } - - public FastNoiseTemplate setFrequency(double frequency) { - this.frequency = frequency; - return this; - } - - public double getPingPong() { - return pingPong; - } - - public FastNoiseTemplate setPingPong(double pingPong) { - this.pingPong = pingPong; - return this; - } - - public double getWeightedStrength() { - return weightedStrength; - } - - public FastNoiseTemplate setWeightedStrength(double weightedStrength) { - this.weightedStrength = weightedStrength; - return this; - } - - public int getOctaves() { - return octaves; - } - - public FastNoiseTemplate setOctaves(int octaves) { - this.octaves = octaves; - return this; - } - - public FastNoiseLite.FractalType getFractalType() { - return fractalType; - } - - public FastNoiseTemplate setFractalType(FastNoiseLite.FractalType fractalType) { - this.fractalType = fractalType; - return this; - } - - public FastNoiseLite.RotationType3D getRotationType3D() { - return rotationType3D; - } - - public FastNoiseTemplate setRotationType3D(FastNoiseLite.RotationType3D rotationType3D) { - this.rotationType3D = rotationType3D; - return this; - } - - public int getDimensions() { - return dimensions; - } - - public void setDimensions(int dimensions) { - this.dimensions = dimensions; - } - - @Override - public NoiseSeeded get() { - return this; - } -} - diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/CellularNoiseTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/CellularNoiseTemplate.java new file mode 100644 index 000000000..556d9fb82 --- /dev/null +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/CellularNoiseTemplate.java @@ -0,0 +1,49 @@ +package com.dfsek.terra.config.loaders.config.sampler.templates.noise; + +import com.dfsek.tectonic.annotations.Default; +import com.dfsek.tectonic.annotations.Value; +import com.dfsek.terra.api.math.noise.NoiseSampler; +import com.dfsek.terra.api.math.noise.samplers.noise.CellularSampler; +import com.dfsek.terra.api.math.noise.samplers.noise.simplex.OpenSimplex2Sampler; +import com.dfsek.terra.api.util.seeded.NoiseSeeded; + +public class CellularNoiseTemplate extends NoiseTemplate { + @Value("distance") + @Default + private CellularSampler.DistanceFunction cellularDistanceFunction = CellularSampler.DistanceFunction.EuclideanSq; + + @Value("return") + @Default + private CellularSampler.ReturnType cellularReturnType = CellularSampler.ReturnType.Distance; + + @Value("jitter") + @Default + private double cellularJitter = 1.0D; + + + @Value("lookup") + @Default + private NoiseSeeded lookup = new NoiseSeeded() { + @Override + public NoiseSampler apply(Long seed) { + + return new OpenSimplex2Sampler((int) (long) seed); + } + + @Override + public int getDimensions() { + return 2; + } + }; + + @Override + public NoiseSampler apply(Long seed) { + CellularSampler sampler = new CellularSampler((int) (long) seed); + sampler.setNoiseLookup(lookup.apply(seed)); + sampler.setFrequency(frequency); + sampler.setJitterModifier(cellularJitter); + sampler.setReturnType(cellularReturnType); + sampler.setDistanceFunction(cellularDistanceFunction); + return sampler; + } +} diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/NoiseTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/NoiseTemplate.java new file mode 100644 index 000000000..dba900856 --- /dev/null +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/NoiseTemplate.java @@ -0,0 +1,16 @@ +package com.dfsek.terra.config.loaders.config.sampler.templates.noise; + +import com.dfsek.tectonic.annotations.Default; +import com.dfsek.tectonic.annotations.Value; +import com.dfsek.terra.api.math.noise.samplers.noise.NoiseFunction; +import com.dfsek.terra.config.loaders.config.sampler.templates.SamplerTemplate; + +public abstract class NoiseTemplate extends SamplerTemplate { + @Value("frequency") + @Default + protected double frequency = 0.02d; + + @Value("salt") + @Default + protected int salt = 0; +} diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/SimpleNoiseTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/SimpleNoiseTemplate.java new file mode 100644 index 000000000..d65d88f84 --- /dev/null +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/SimpleNoiseTemplate.java @@ -0,0 +1,22 @@ +package com.dfsek.terra.config.loaders.config.sampler.templates.noise; + +import com.dfsek.terra.api.math.noise.NoiseSampler; +import com.dfsek.terra.api.math.noise.samplers.noise.NoiseFunction; + +import java.util.function.Function; + +public class SimpleNoiseTemplate extends NoiseTemplate { + private final Function samplerSupplier; + + public SimpleNoiseTemplate(Function samplerSupplier) { + this.samplerSupplier = samplerSupplier; + } + + @Override + public NoiseSampler apply(Long seed) { + NoiseFunction sampler = samplerSupplier.apply((int) (long) seed); + sampler.setSeed((int) (long) seed); + sampler.setFrequency(frequency); + return sampler; + } +} diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/BrownianMotionTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/BrownianMotionTemplate.java new file mode 100644 index 000000000..e90edd378 --- /dev/null +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/BrownianMotionTemplate.java @@ -0,0 +1,17 @@ +package com.dfsek.terra.config.loaders.config.sampler.templates.noise.fractal; + +import com.dfsek.terra.api.math.noise.NoiseSampler; +import com.dfsek.terra.api.math.noise.samplers.noise.fractal.BrownianMotionSampler; + +public class BrownianMotionTemplate extends FractalTemplate { + @Override + public NoiseSampler apply(Long seed) { + BrownianMotionSampler sampler = new BrownianMotionSampler((int) (long) seed, function.apply(seed)); + sampler.setFrequency(frequency); + sampler.setGain(fractalGain); + sampler.setLacunarity(fractalLacunarity); + sampler.setOctaves(octaves); + sampler.setWeightedStrength(weightedStrength); + return sampler; + } +} diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/FractalTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/FractalTemplate.java new file mode 100644 index 000000000..6ab4c26d1 --- /dev/null +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/FractalTemplate.java @@ -0,0 +1,28 @@ +package com.dfsek.terra.config.loaders.config.sampler.templates.noise.fractal; + +import com.dfsek.tectonic.annotations.Default; +import com.dfsek.tectonic.annotations.Value; +import com.dfsek.terra.api.math.noise.samplers.noise.fractal.FractalNoiseFunction; +import com.dfsek.terra.api.util.seeded.NoiseSeeded; +import com.dfsek.terra.config.loaders.config.sampler.templates.noise.NoiseTemplate; + +public abstract class FractalTemplate extends NoiseTemplate { + @Value("octaves") + @Default + protected int octaves = 3; + + @Value("gain") + @Default + protected double fractalGain = 0.5D; + + @Value("lacunarity") + @Default + protected double fractalLacunarity = 2.0D; + + @Value("weighted-strength") + @Default + protected double weightedStrength = 0.0D; + + @Value("function") + protected NoiseSeeded function; +} diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/PingPongTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/PingPongTemplate.java new file mode 100644 index 000000000..781db4371 --- /dev/null +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/PingPongTemplate.java @@ -0,0 +1,24 @@ +package com.dfsek.terra.config.loaders.config.sampler.templates.noise.fractal; + +import com.dfsek.tectonic.annotations.Default; +import com.dfsek.tectonic.annotations.Value; +import com.dfsek.terra.api.math.noise.NoiseSampler; +import com.dfsek.terra.api.math.noise.samplers.noise.fractal.PingPongSampler; + +public class PingPongTemplate extends FractalTemplate { + @Value("ping-pong") + @Default + private double pingPong = 2.0D; + + @Override + public NoiseSampler apply(Long seed) { + PingPongSampler sampler = new PingPongSampler((int) (long) seed, function.apply(seed)); + sampler.setFrequency(frequency); + sampler.setGain(fractalGain); + sampler.setLacunarity(fractalLacunarity); + sampler.setOctaves(octaves); + sampler.setWeightedStrength(weightedStrength); + sampler.setPingPongStrength(pingPong); + return sampler; + } +} diff --git a/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/RidgedFractalTemplate.java b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/RidgedFractalTemplate.java new file mode 100644 index 000000000..d293428c6 --- /dev/null +++ b/common/src/main/java/com/dfsek/terra/config/loaders/config/sampler/templates/noise/fractal/RidgedFractalTemplate.java @@ -0,0 +1,17 @@ +package com.dfsek.terra.config.loaders.config.sampler.templates.noise.fractal; + +import com.dfsek.terra.api.math.noise.NoiseSampler; +import com.dfsek.terra.api.math.noise.samplers.noise.fractal.RidgedFractalSampler; + +public class RidgedFractalTemplate extends FractalTemplate { + @Override + public NoiseSampler apply(Long seed) { + RidgedFractalSampler sampler = new RidgedFractalSampler((int) (long) seed, function.apply(seed)); + sampler.setFrequency(frequency); + sampler.setGain(fractalGain); + sampler.setLacunarity(fractalLacunarity); + sampler.setOctaves(octaves); + sampler.setWeightedStrength(weightedStrength); + return sampler; + } +} diff --git a/common/src/main/java/com/dfsek/terra/config/pack/ConfigPack.java b/common/src/main/java/com/dfsek/terra/config/pack/ConfigPack.java index cc5a8224d..d426c6748 100644 --- a/common/src/main/java/com/dfsek/terra/config/pack/ConfigPack.java +++ b/common/src/main/java/com/dfsek/terra/config/pack/ConfigPack.java @@ -52,7 +52,7 @@ import com.dfsek.terra.registry.config.BiomeRegistry; import com.dfsek.terra.registry.config.CarverRegistry; import com.dfsek.terra.registry.config.FloraRegistry; import com.dfsek.terra.registry.config.LootRegistry; -import com.dfsek.terra.registry.config.NormalizerRegistry; +import com.dfsek.terra.registry.config.NoiseRegistry; import com.dfsek.terra.registry.config.OreRegistry; import com.dfsek.terra.registry.config.PaletteRegistry; import com.dfsek.terra.registry.config.ScriptRegistry; @@ -97,7 +97,7 @@ public class ConfigPack implements LoaderRegistrar { private final CarverRegistry carverRegistry = new CarverRegistry(); - private final NormalizerRegistry normalizerRegistry = new NormalizerRegistry(); + private final NoiseRegistry noiseRegistry = new NoiseRegistry(); private final FunctionRegistry functionRegistry = new FunctionRegistry(); private final AbstractConfigLoader abstractConfigLoader = new AbstractConfigLoader(); @@ -281,7 +281,7 @@ public class ConfigPack implements LoaderRegistrar { .registerLoader(LootTable.class, lootRegistry) .registerLoader(UserDefinedCarver.class, carverRegistry) .registerLoader(BufferedImage.class, new BufferedImageLoader(loader)) - .registerLoader(NoiseSeeded.class, new NoiseSamplerBuilderLoader(normalizerRegistry)) + .registerLoader(NoiseSeeded.class, new NoiseSamplerBuilderLoader(noiseRegistry)) .registerLoader(SingleBiomeProviderTemplate.class, () -> new SingleBiomeProviderTemplate(biomeRegistry)) .registerLoader(BiomePipelineTemplate.class, () -> new BiomePipelineTemplate(biomeRegistry, main)) .registerLoader(ImageSamplerTemplate.class, () -> new ImageProviderTemplate(biomeRegistry)); @@ -311,8 +311,8 @@ public class ConfigPack implements LoaderRegistrar { return functionRegistry; } - public NormalizerRegistry getNormalizerRegistry() { - return normalizerRegistry; + public NoiseRegistry getNormalizerRegistry() { + return noiseRegistry; } public CarverRegistry getCarverRegistry() { diff --git a/common/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java b/common/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java index 6afdeb128..e02883f85 100644 --- a/common/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java +++ b/common/src/main/java/com/dfsek/terra/config/templates/BiomeTemplate.java @@ -11,7 +11,7 @@ import com.dfsek.tectonic.exception.ValidationException; import com.dfsek.terra.api.core.TerraPlugin; import com.dfsek.terra.api.math.ProbabilityCollection; import com.dfsek.terra.api.math.noise.NoiseSampler; -import com.dfsek.terra.api.math.noise.samplers.FastNoiseLite; +import com.dfsek.terra.api.math.noise.samplers.noise.ConstantSampler; import com.dfsek.terra.api.math.parsii.BlankFunction; import com.dfsek.terra.api.math.parsii.defined.UserDefinedFunction; import com.dfsek.terra.api.platform.block.BlockData; @@ -24,7 +24,6 @@ import com.dfsek.terra.api.world.palette.SinglePalette; import com.dfsek.terra.api.world.palette.holder.PaletteHolder; import com.dfsek.terra.carving.UserDefinedCarver; import com.dfsek.terra.config.loaders.config.function.FunctionTemplate; -import com.dfsek.terra.config.loaders.config.sampler.templates.FastNoiseTemplate; import com.dfsek.terra.config.pack.ConfigPack; import com.dfsek.terra.world.population.items.TerraStructure; import com.dfsek.terra.world.population.items.flora.FloraLayer; @@ -248,12 +247,10 @@ public class BiomeTemplate extends AbstractableTemplate implements ValidatedConf public BiomeTemplate(ConfigPack pack, TerraPlugin main) { this.pack = pack; - FastNoiseTemplate builder = new FastNoiseTemplate(); - builder.setType(FastNoiseLite.NoiseType.Constant); biomeNoise = new NoiseSeeded() { @Override public NoiseSampler apply(Long seed) { - return builder.apply(seed); + return new ConstantSampler(0); } @Override diff --git a/common/src/main/java/com/dfsek/terra/config/templates/PaletteTemplate.java b/common/src/main/java/com/dfsek/terra/config/templates/PaletteTemplate.java index 35d385d7f..3bec92cbc 100644 --- a/common/src/main/java/com/dfsek/terra/config/templates/PaletteTemplate.java +++ b/common/src/main/java/com/dfsek/terra/config/templates/PaletteTemplate.java @@ -4,10 +4,9 @@ import com.dfsek.tectonic.annotations.Abstractable; import com.dfsek.tectonic.annotations.Default; import com.dfsek.tectonic.annotations.Value; import com.dfsek.terra.api.math.noise.NoiseSampler; -import com.dfsek.terra.api.math.noise.samplers.FastNoiseLite; +import com.dfsek.terra.api.math.noise.samplers.noise.WhiteNoiseSampler; import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.api.world.palette.holder.PaletteLayerHolder; -import com.dfsek.terra.config.loaders.config.sampler.templates.FastNoiseTemplate; import java.util.List; @@ -26,13 +25,10 @@ public class PaletteTemplate extends AbstractableTemplate { private List palette; public PaletteTemplate() { - FastNoiseTemplate builder = new FastNoiseTemplate(); - builder.setType(FastNoiseLite.NoiseType.WhiteNoise); - builder.setDimensions(3); this.noise = new NoiseSeeded() { @Override public NoiseSampler apply(Long seed) { - return builder.apply(seed); + return new WhiteNoiseSampler((int) (long) seed); } @Override diff --git a/common/src/main/java/com/dfsek/terra/registry/config/NoiseRegistry.java b/common/src/main/java/com/dfsek/terra/registry/config/NoiseRegistry.java index 3382a2a88..af28fbe3e 100644 --- a/common/src/main/java/com/dfsek/terra/registry/config/NoiseRegistry.java +++ b/common/src/main/java/com/dfsek/terra/registry/config/NoiseRegistry.java @@ -1,11 +1,51 @@ package com.dfsek.terra.registry.config; import com.dfsek.tectonic.loading.object.ObjectTemplate; -import com.dfsek.terra.api.math.noise.samplers.noise.NoiseFunction; +import com.dfsek.terra.api.math.noise.samplers.noise.WhiteNoiseSampler; +import com.dfsek.terra.api.math.noise.samplers.noise.simplex.OpenSimplex2SSampler; +import com.dfsek.terra.api.math.noise.samplers.noise.simplex.OpenSimplex2Sampler; +import com.dfsek.terra.api.math.noise.samplers.noise.simplex.PerlinSampler; +import com.dfsek.terra.api.math.noise.samplers.noise.value.ValueCubicSampler; +import com.dfsek.terra.api.math.noise.samplers.noise.value.ValueSampler; +import com.dfsek.terra.api.util.seeded.NoiseSeeded; +import com.dfsek.terra.config.loaders.config.sampler.templates.DomainWarpTemplate; +import com.dfsek.terra.config.loaders.config.sampler.templates.ImageSamplerTemplate; +import com.dfsek.terra.config.loaders.config.sampler.templates.noise.CellularNoiseTemplate; +import com.dfsek.terra.config.loaders.config.sampler.templates.noise.SimpleNoiseTemplate; +import com.dfsek.terra.config.loaders.config.sampler.templates.noise.fractal.BrownianMotionTemplate; +import com.dfsek.terra.config.loaders.config.sampler.templates.noise.fractal.PingPongTemplate; +import com.dfsek.terra.config.loaders.config.sampler.templates.noise.fractal.RidgedFractalTemplate; +import com.dfsek.terra.config.loaders.config.sampler.templates.normalizer.ClampNormalizerTemplate; +import com.dfsek.terra.config.loaders.config.sampler.templates.normalizer.LinearNormalizerTemplate; +import com.dfsek.terra.config.loaders.config.sampler.templates.normalizer.NormalNormalizerTemplate; import com.dfsek.terra.registry.TerraRegistry; import java.util.function.Supplier; -public class NoiseRegistry extends TerraRegistry>> { +public class NoiseRegistry extends TerraRegistry>> { + public NoiseRegistry() { + add("LINEAR", LinearNormalizerTemplate::new); + add("NORMAL", NormalNormalizerTemplate::new); + add("CLAMP", ClampNormalizerTemplate::new); + add("IMAGE", ImageSamplerTemplate::new); + + add("DOMAIN_WARP", DomainWarpTemplate::new); + + add("FBM", BrownianMotionTemplate::new); + add("PINGPONG", PingPongTemplate::new); + add("RIDGED", RidgedFractalTemplate::new); + + add("OPENSIMPLEX2", () -> new SimpleNoiseTemplate(OpenSimplex2Sampler::new)); + add("OPENSIMPLEX2S", () -> new SimpleNoiseTemplate(OpenSimplex2SSampler::new)); + add("PERLIN", () -> new SimpleNoiseTemplate(PerlinSampler::new)); + + + add("VALUE", () -> new SimpleNoiseTemplate(ValueSampler::new)); + add("VALUECUBIC", () -> new SimpleNoiseTemplate(ValueCubicSampler::new)); + + add("CELLULAR", CellularNoiseTemplate::new); + + add("WHITENOISE", () -> new SimpleNoiseTemplate(WhiteNoiseSampler::new)); + } } diff --git a/common/src/main/java/com/dfsek/terra/registry/config/NormalizerRegistry.java b/common/src/main/java/com/dfsek/terra/registry/config/NormalizerRegistry.java deleted file mode 100644 index 900a99fc2..000000000 --- a/common/src/main/java/com/dfsek/terra/registry/config/NormalizerRegistry.java +++ /dev/null @@ -1,17 +0,0 @@ -package com.dfsek.terra.registry.config; - -import com.dfsek.terra.config.loaders.config.sampler.templates.normalizer.ClampNormalizerTemplate; -import com.dfsek.terra.config.loaders.config.sampler.templates.normalizer.LinearNormalizerTemplate; -import com.dfsek.terra.config.loaders.config.sampler.templates.normalizer.NormalNormalizerTemplate; -import com.dfsek.terra.config.loaders.config.sampler.templates.normalizer.NormalizerTemplate; -import com.dfsek.terra.registry.TerraRegistry; - -import java.util.function.Supplier; - -public class NormalizerRegistry extends TerraRegistry>> { - public NormalizerRegistry() { - add("LINEAR", LinearNormalizerTemplate::new); - add("NORMAL", NormalNormalizerTemplate::new); - add("CLAMP", ClampNormalizerTemplate::new); - } -} diff --git a/common/src/main/java/com/dfsek/terra/world/population/items/ores/DeformedSphereOre.java b/common/src/main/java/com/dfsek/terra/world/population/items/ores/DeformedSphereOre.java index 33f2309d8..4396f8028 100644 --- a/common/src/main/java/com/dfsek/terra/world/population/items/ores/DeformedSphereOre.java +++ b/common/src/main/java/com/dfsek/terra/world/population/items/ores/DeformedSphereOre.java @@ -2,7 +2,7 @@ package com.dfsek.terra.world.population.items.ores; import com.dfsek.terra.api.core.TerraPlugin; import com.dfsek.terra.api.math.Range; -import com.dfsek.terra.api.math.noise.samplers.FastNoiseLite; +import com.dfsek.terra.api.math.noise.samplers.noise.simplex.OpenSimplex2Sampler; import com.dfsek.terra.api.math.vector.Vector3; import com.dfsek.terra.api.platform.block.Block; import com.dfsek.terra.api.platform.block.BlockData; @@ -28,8 +28,7 @@ public class DeformedSphereOre extends Ore { @Override public void generate(Vector3 origin, Chunk c, Random r) { WorldHandle handle = main.getWorldHandle(); - FastNoiseLite ore = new FastNoiseLite(r.nextInt()); - ore.setNoiseType(FastNoiseLite.NoiseType.OpenSimplex2); + OpenSimplex2Sampler ore = new OpenSimplex2Sampler(r.nextInt()); ore.setFrequency(deformFrequency); int rad = size.get(r); for(int x = -rad; x <= rad; x++) { diff --git a/common/src/test/java/biome/DistributionTest.java b/common/src/test/java/biome/DistributionTest.java index 3d2d32dcc..f6fc1eb52 100644 --- a/common/src/test/java/biome/DistributionTest.java +++ b/common/src/test/java/biome/DistributionTest.java @@ -36,7 +36,7 @@ import com.dfsek.terra.config.templates.AbstractableTemplate; import com.dfsek.terra.debug.DebugLogger; import com.dfsek.terra.registry.ConfigRegistry; import com.dfsek.terra.registry.config.BiomeRegistry; -import com.dfsek.terra.registry.config.NormalizerRegistry; +import com.dfsek.terra.registry.config.NoiseRegistry; import com.dfsek.terra.world.TerraWorld; import javax.swing.*; @@ -161,7 +161,7 @@ public class DistributionTest { .registerLoader(ImageProviderTemplate.class, () -> new ImageProviderTemplate(biomeRegistry)); new GenericLoaders(null).register(pipeLoader); - pipeLoader.registerLoader(NoiseSeeded.class, new NoiseSamplerBuilderLoader(new NormalizerRegistry())); + pipeLoader.registerLoader(NoiseSeeded.class, new NoiseSamplerBuilderLoader(new NoiseRegistry())); pipeLoader.load(template, folderLoader.get("pack.yml")); return template.getBiomeProviderBuilder().build(seed); diff --git a/common/src/test/java/noise/NoiseTool.java b/common/src/test/java/noise/NoiseTool.java index cc999391b..ef518aa1b 100644 --- a/common/src/test/java/noise/NoiseTool.java +++ b/common/src/test/java/noise/NoiseTool.java @@ -3,16 +3,14 @@ package noise; import com.dfsek.tectonic.exception.ConfigException; import com.dfsek.tectonic.loading.ConfigLoader; import com.dfsek.terra.api.math.ProbabilityCollection; -import com.dfsek.terra.api.math.noise.samplers.noise.NoiseFunction; -import com.dfsek.terra.api.math.noise.samplers.noise.fractal.RidgedFractalSampler; -import com.dfsek.terra.api.math.noise.samplers.noise.simplex.OpenSimplex2Sampler; +import com.dfsek.terra.api.math.noise.NoiseSampler; import com.dfsek.terra.api.util.seeded.NoiseSeeded; import com.dfsek.terra.config.GenericLoaders; import com.dfsek.terra.config.fileloaders.FolderLoader; import com.dfsek.terra.config.loaders.ProbabilityCollectionLoader; import com.dfsek.terra.config.loaders.config.BufferedImageLoader; import com.dfsek.terra.config.loaders.config.sampler.NoiseSamplerBuilderLoader; -import com.dfsek.terra.registry.config.NormalizerRegistry; +import com.dfsek.terra.registry.config.NoiseRegistry; import org.apache.commons.io.FileUtils; import javax.swing.*; @@ -99,7 +97,7 @@ public class NoiseTool { FolderLoader folderLoader = new FolderLoader(Paths.get("./")); ConfigLoader loader = new ConfigLoader(); - loader.registerLoader(NoiseSeeded.class, new NoiseSamplerBuilderLoader(new NormalizerRegistry())) + loader.registerLoader(NoiseSeeded.class, new NoiseSamplerBuilderLoader(new NoiseRegistry())) .registerLoader(BufferedImage.class, new BufferedImageLoader(folderLoader)) .registerLoader(ProbabilityCollection.class, new ProbabilityCollectionLoader()); @@ -130,9 +128,8 @@ public class NoiseTool { loader.load(template, new FileInputStream(file)); System.out.println(template.getBuilder().getDimensions()); - //NoiseSampler noise = template.getBuilder().apply((long) seed); - NoiseFunction noise = new RidgedFractalSampler(new OpenSimplex2Sampler()); - noise.setSeed(seed); + NoiseSampler noise = template.getBuilder().apply((long) seed); + int size = 1024; diff --git a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/DeformedSphereCommand.java b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/DeformedSphereCommand.java index 4e012ce91..716f28517 100644 --- a/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/DeformedSphereCommand.java +++ b/platforms/bukkit/src/main/java/com/dfsek/terra/bukkit/command/command/geometry/DeformedSphereCommand.java @@ -1,6 +1,6 @@ package com.dfsek.terra.bukkit.command.command.geometry; -import com.dfsek.terra.api.math.noise.samplers.FastNoiseLite; +import com.dfsek.terra.api.math.noise.samplers.noise.simplex.OpenSimplex2Sampler; import com.dfsek.terra.api.math.vector.Vector3; import com.dfsek.terra.api.math.voxel.DeformedSphere; import com.dfsek.terra.bukkit.BukkitCommandSender; @@ -44,8 +44,7 @@ public class DeformedSphereCommand extends PlayerCommand { LangUtil.send("command.geometry.deform.invalid-frequency", new BukkitCommandSender(sender), args[2]); return true; } - FastNoiseLite n = new FastNoiseLite((int) sender.getWorld().getSeed()); - n.setNoiseType(FastNoiseLite.NoiseType.OpenSimplex2); + OpenSimplex2Sampler n = new OpenSimplex2Sampler((int) sender.getWorld().getSeed()); n.setFrequency(freq); DeformedSphere sphere = new DeformedSphere(BukkitAdapter.adapt(sender).getLocation().toVector(), radius, deform, n); for(Vector3 v : sphere.getGeometry()) {