mirrors/Terra
1
0 Fork 0
mirror of https://github.com/PolyhedralDev/Terra.git synced 2026-10-20 15:27:24 +00:00
Code Issues Packages Projects Releases Wiki Activity

Clean up imports

Browse Source
This commit is contained in:
dfsek committed 2020-10-26 10:58:28 -07:00
1 parent f198b371e0
commit 224dfbe638
109 files changed
+833 -637
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

src/test/java/DistributionTest.java
+13 -14
View File
@@ -1,9 +1,7 @@
import org.polydev.gaea.biome.NormalizationUtil;
import org.polydev.gaea.math.FastNoiseLite;
public class DistributionTest {
private static final double[] normalMap = new double[] {-0.8408907651901245D, -0.8200346231460571D, -0.8070776462554932D, -0.7970088720321655D, -0.7890776991844177D, -0.7819743156433105D, -0.7759857773780823D, -0.7706204056739807D, -0.765608549118042D, -0.7611993551254272D, -0.7569039463996887D, -0.7528656125068665D, -0.7492497563362122D, -0.7458332777023315D, -0.7424643039703369D, -0.7392163872718811D, -0.736059844493866D, -0.7332375049591064D, -0.7305010557174683D, -0.7277776598930359D, -0.7251102924346924D, -0.7227165699005127D, -0.7203239798545837D, -0.7179931998252869D, -0.7157421112060547D, -0.7135322690010071D, -0.71131432056427D, -0.7092097997665405D, -0.7071162462234497D, -0.7050217390060425D, -0.703119695186615D, -0.7011850476264954D, -0.6992706060409546D, -0.6974170207977295D, -0.6955324411392212D, -0.6937324404716492D, -0.6919872760772705D, -0.690233588218689D, -0.6885692477226257D, -0.6869722008705139D, -0.6852975487709045D, -0.683682382106781D, -0.6821723580360413D, -0.6806833744049072D, -0.679179310798645D, -0.6776503324508667D, -0.676136314868927D, -0.6746450662612915D, -0.6731522083282471D, -0.6717588305473328D, -0.6702994704246521D, -0.6689524054527283D, -0.6675862073898315D, -0.6662633419036865D, -0.6649606823921204D, -0.6636543273925781D, -0.6623714566230774D, -0.6610865592956543D, -0.6598274111747742D, -0.6585804224014282D, -0.6573819518089294D, -0.6561920642852783D, -0.6549379825592041D, -0.6537073254585266D, -0.6525376439094543D, -0.6513495445251465D, -0.650168240070343D, -0.649040162563324D, -0.6479091048240662D, -0.6467820405960083D, -0.6456737518310547D, -0.6445609331130981D, -0.6434952020645142D, -0.6424031257629395D, -0.6413089632987976D, -0.640256941318512D, -0.6391684412956238D, -0.638137936592102D, -0.6371254324913025D, -0.6361099481582642D, -0.6350630521774292D, -0.6339953541755676D, -0.6330388188362122D, -0.632024347782135D, -0.6310704946517944D, -0.6300620436668396D, -0.6290494799613953D, -0.6280747056007385D, -0.6271024346351624D, -0.6261362433433533D, -0.6251688599586487D, -0.6242944002151489D, -0.6233505606651306D, -0.622406542301178D, -0.6214921474456787D, -0.6205630302429199D, -0.619683563709259D, -0.6187522411346436D, -0.6178513169288635D, -0.6170046925544739D, -0.6161392331123352D, -0.615269660949707D, -0.6144152879714966D, -0.6135557293891907D, -0.6127009391784668D, -0.6117991209030151D, -0.6109536290168762D, -0.6101033091545105D, -0.6092590689659119D, -0.6084139347076416D, -0.6075553894042969D, -0.6067432165145874D, -0.6058894991874695D, -0.6050370335578918D, -0.6042441725730896D, -0.6034530401229858D, -0.6026210784912109D, -0.6018084287643433D, -0.6010326743125916D, -0.6002528071403503D, -0.5994450449943542D, -0.5986629128456116D, -0.5978666543960571D, -0.5971032977104187D, -0.5963031649589539D, -0.5955566167831421D, -0.5947844982147217D, -0.5940142869949341D, -0.5932715535163879D, -0.5925368666648865D, -0.5917928218841553D, -0.591031014919281D, -0.5903055667877197D, -0.5895851850509644D, -0.5888315439224243D, -0.5880893468856812D, -0.5873630046844482D, -0.5866444110870361D, -0.5859208106994629D, -0.5852057933807373D, -0.5844889879226685D, -0.5837893486022949D, -0.5830587148666382D, -0.582359254360199D, -0.5816157460212708D, -0.5809139013290405D, -0.5802302956581116D, -0.5795474052429199D, -0.5788565874099731D, -0.5781614184379578D, -0.5774743556976318D, -0.5767905712127686D, -0.5760961771011353D, -0.5754467248916626D, -0.5747898817062378D, -0.5741211175918579D, -0.5734619498252869D, -0.5728112459182739D, -0.5721414089202881D, -0.5714717507362366D, -0.5708272457122803D, -0.5701769590377808D, -0.5695428252220154D, -0.568885087966919D, -0.5682525038719177D, -0.5675948262214661D, -0.5669249296188354D, -0.5663014054298401D, -0.5656630992889404D, -0.5650165677070618D, -0.5643728971481323D, -0.5637710094451904D, -0.5631371736526489D, -0.562507152557373D, -0.5618733167648315D, -0.5612503290176392D, -0.560631513595581D, -0.5600159168243408D, -0.559416651725769D, -0.5587995052337646D, -0.5581864714622498D, -0.5575871467590332D, -0.556957483291626D, -0.5563494563102722D, -0.555757999420166D, -0.5551457405090332D, -0.5545571446418762D, -0.5539442300796509D, -0.5533522367477417D, -0.5527352094650269D, -0.5521476864814758D, -0.5515644550323486D, -0.5509964823722839D, -0.550428032875061D, -0.5498668551445007D, -0.5492658615112305D, -0.5486577749252319D, -0.5480945110321045D, -0.5475296378135681D, -0.5469772815704346D, -0.5463858246803284D, -0.5458088517189026D, -0.545259952545166D, -0.5447098016738892D, -0.5441542863845825D, -0.5436179041862488D, -0.5430275201797485D, -0.5424584746360779D, -0.5419116616249084D, -0.5413541197776794D, -0.5408090353012085D, -0.5402546525001526D, -0.5396901369094849D, -0.539120078086853D, -0.5385692715644836D, -0.5380025506019592D, -0.5374376773834229D, -0.5369035601615906D, -0.5363785624504089D, -0.5358348488807678D, -0.5352905988693237D, -0.5347356796264648D, -0.5341591238975525D, -0.5336212515830994D, -0.5330695509910583D, -0.53253978490829Line truncated
private static final double[] normalMap = new double[] {- 0.8408907651901245D, - 0.8200346231460571D, - 0.8070776462554932D, - 0.7970088720321655D, - 0.7890776991844177D, - 0.7819743156433105D, - 0.7759857773780823D, - 0.7706204056739807D, - 0.765608549118042D, - 0.7611993551254272D, - 0.7569039463996887D, - 0.7528656125068665D, - 0.7492497563362122D, - 0.7458332777023315D, - 0.7424643039703369D, - 0.7392163872718811D, - 0.736059844493866D, - 0.7332375049591064D, - 0.7305010557174683D, - 0.7277776598930359D, - 0.7251102924346924D, - 0.7227165699005127D, - 0.7203239798545837D, - 0.7179931998252869D, - 0.7157421112060547D, - 0.7135322690010071D, - 0.71131432056427D, - 0.7092097997665405D, - 0.7071162462234497D, - 0.7050217390060425D, - 0.703119695186615D, - 0.7011850476264954D, - 0.6992706060409546D, - 0.6974170207977295D, - 0.6955324411392212D, - 0.6937324404716492D, - 0.6919872760772705D, - 0.690233588218689D, - 0.6885692477226257D, - 0.6869722008705139D, - 0.6852975487709045D, - 0.683682382106781D, - 0.6821723580360413D, - 0.6806833744049072D, - 0.679179310798645D, - 0.6776503324508667D, - 0.676136314868927D, - 0.6746450662612915D, - 0.6731522083282471D, - 0.6717588305473328D, - 0.6702994704246521D, - 0.6689524054527283D, - 0.6675862073898315D, - 0.6662633419036865D, - 0.6649606823921204D, - 0.6636543273925781D, - 0.6623714566230774D, - 0.6610865592956543D, - 0.6598274111747742D, - 0.6585804224014282D, - 0.6573819518089294D, - 0.6561920642852783D, - 0.6549379825592041D, - 0.6537073254585266D, - 0.6525376439094543D, - 0.6513495445251465D, - 0.650168240070343D, - 0.649040162563324D, - 0.6479091048240662D, - 0.6467820405960083D, - 0.6456737518310547D, - 0.6445609331130981D, - 0.6434952020645142D, - 0.6424031257629395D, - 0.6413089632987976D, - 0.640256941318512D, - 0.6391684412956238D, - 0.638137936592102D, - 0.6371254324913025D, - 0.6361099481582642D, - 0.6350630521774292D, - 0.6339953541755676D, - 0.6330388188362122D, - 0.632024347782135D, - 0.6310704946517944D, - 0.6300620436668396D, - 0.6290494799613953D, - 0.6280747056007385D, - 0.6271024346351624D, - 0.6261362433433533D, - 0.6251688599586487D, - 0.6242944002151489D, - 0.6233505606651306D, - 0.622406542301178D, - 0.6214921474456787D, - 0.6205630302429199D, - 0.619683563709259D, - 0.6187522411346436D, - 0.6178513169288635D, - 0.6170046925544739D, - 0.6161392331123352D, - 0.615269660949707D, - 0.6144152879714966D, - 0.6135557293891907D, - 0.6127009391784668D, - 0.6117991209030151D, - 0.6109536290168762D, - 0.6101033091545105D, - 0.6092590689659119D, - 0.6084139347076416D, - 0.6075553894042969D, - 0.6067432165145874D, - 0.6058894991874695D, - 0.6050370335578918D, - 0.6042441725730896D, - 0.6034530401229858D, - 0.6026210784912109D, - 0.6018084287643433D, - 0.6010326743125916D, - 0.6002528071403503D, - 0.5994450449943542D, - 0.5986629128456116D, - 0.5978666543960571D, - 0.5971032977104187D, - 0.5963031649589539D, - 0.5955566167831421D, - 0.5947844982147217D, - 0.5940142869949341D, - 0.5932715535163879D, - 0.5925368666648865D, - 0.5917928218841553D, - 0.591031014919281D, - 0.5903055667877197D, - 0.5895851850509644D, - 0.5888315439224243D, - 0.5880893468856812D, - 0.5873630046844482D, - 0.5866444110870361D, - 0.5859208106994629D, - 0.5852057933807373D, - 0.5844889879226685D, - 0.5837893486022949D, - 0.5830587148666382D, - 0.582359254360199D, - 0.5816157460212708D, - 0.5809139013290405D, - 0.5802302956581116D, - 0.5795474052429199D, - 0.5788565874099731D, - 0.5781614184379578D, - 0.5774743556976318D, - 0.5767905712127686D, - 0.5760961771011353D, - 0.5754467248916626D, - 0.5747898817062378D, - 0.5741211175918579D, - 0.5734619498252869D, - 0.5728112459182739D, - 0.5721414089202881D, - 0.5714717507362366D, - 0.5708272457122803D, - 0.5701769590377808D, - 0.5695428252220154D, - 0.568885087966919D, - 0.5682525038719177D, - 0.5675948262214661D, - 0.5669249296188354D, - 0.5663014054298401D, - 0.5656630992889404D, - 0.5650165677070618D, - 0.5643728971481323D, - 0.5637710094451904D, - 0.5631371736526489D, - 0.562507152557373D, - 0.5618733167648315D, - 0.5612503290176392D, - 0.560631513595581D, - 0.5600159168243408D, - 0.559416651725769D, - 0.5587995052337646D, - 0.5581864714622498D, - 0.5575871467590332D, - 0.556957483291626D, - 0.5563494563102722D, - 0.555757999420166D, - 0.5551457405090332D, - 0.5545571446418762D, - 0.5539442300796509D, - 0.5533522367477417D, - 0.5527352094650269D, - 0.5521476864814758D, - 0.5515644550323486D, - 0.5509964823722839D, - 0.550428032875061D, - 0.5498668551445007D, - 0.5492658615112305D, - 0.5486577749252319D, - 0.5480945110321045D, - 0.5475296378135681D, - 0.5469772815704346D, - 0.5463858246803284D, - 0.5458088517189026D, - 0.545259952545166D, - 0.5447098016738892D, - 0.5441542863845825D, - 0.5436179041862488D, - 0.5430275201797485D, - 0.5424584746360779D, - 0.5419116616249084D, - 0.5413541197776794D, - 0.5408090353012085D, - 0.5402546525001526D, - 0.5396901369094849D, - 0.539120078086853D, - 0.5385692715644836D, - 0.5380025506019592D,Line truncated
public static void main(String[] args) {
@@ -20,7 +18,6 @@ public class DistributionTest {
double max = Integer.MIN_VALUE;
for(int i = 0; i < attempts; i++) {
numbers[i] = 0;
}
@@ -32,8 +29,8 @@ public class DistributionTest {
min = Math.min(min, n);
numbers[normalize(n, attempts)]++;
}
long l2 = System.nanoTime()-l;
System.out.println("Took " + (double)l2/1000000 + "ms (" + ((double)l2/1000000) + "ns per.");
long l2 = System.nanoTime() - l;
System.out.println("Took " + (double) l2 / 1000000 + "ms (" + ((double) l2 / 1000000) + "ns per.");
l = System.nanoTime();
for(int i = 0; i < 1000000; i++) {
@@ -41,15 +38,15 @@ public class DistributionTest {
max = Math.max(max, n);
min = Math.min(min, n);
}
l2 = System.nanoTime()-l;
System.out.println("Took " + (double)l2/1000000 + "ms (" + ((double)l2/1000000) + "ns per.");
l2 = System.nanoTime() - l;
System.out.println("Took " + (double) l2 / 1000000 + "ms (" + ((double) l2 / 1000000) + "ns per.");
for(int i = 0; i < attempts; i++) {
System.out.println(i + ": " + numbers[i]);
}
for(int i = 0; i < attempts; i++) {
System.out.print(i + " |");
for(int j = 0; j < numbers[i]/250; j++) {
for(int j = 0; j < numbers[i] / 250; j++) {
System.out.print("-");
}
System.out.println("|");
@@ -57,16 +54,18 @@ public class DistributionTest {
System.out.println("max: " + max);
System.out.println("min: " + min);
}
public static int normal(double d, int max) {
double ranged = Math.max(0, Math.min((d+1)/2D, 1));
return (int) (ranged*max);
double ranged = Math.max(0, Math.min((d + 1) / 2D, 1));
return (int) (ranged * max);
}
public static int normalize(double d, int num) {
int start = 0;
int end = normalMap.length - 1;
while (start + 1 < end) {
while(start + 1 < end) {
int mid = start + (end - start) / 2;
if (normalMap[mid] <= d) {
if(normalMap[mid] <= d) {
start = mid;
} else {
end = mid;
@@ -74,7 +73,7 @@ public class DistributionTest {
}
double left = Math.abs(normalMap[start] - d);
double right = Math.abs(normalMap[end] - d);
if (left <= right) {
if(left <= right) {
return start * (num) / (normalMap.length);
}
return end * (num) / (normalMap.length);
src/test/java/LookupGenerator.java
+16 -17
View File
@@ -1,11 +1,8 @@
import com.dfsek.terra.biome.BiomeZone;
import com.sun.corba.se.spi.orbutil.threadpool.Work;
import org.polydev.gaea.math.FastNoiseLite;
import java.util.ArrayList;
import java.util.Collections;
import java.util.List;
import java.util.Random;
public class LookupGenerator {
private static double[] lookup;
@@ -50,8 +47,8 @@ public class LookupGenerator {
System.out.println(i + ": " + numbers[i]);
}
for(int i = 0; i < dist; i++) {
System.out.print(i + (String.valueOf(i).length() ==1 ? " " : "") + " |");
for(int j = 0; j < numbers[i]/300; j++) {
System.out.print(i + (String.valueOf(i).length() == 1 ? " " : "") + " |");
for(int j = 0; j < numbers[i] / 300; j++) {
System.out.print("-");
}
System.out.println("|");
@@ -63,12 +60,12 @@ public class LookupGenerator {
lookup = new double[dist];
StringBuilder s = new StringBuilder("{");
for(int i = 0; i < dist; i++) {
int current = vals.size()/dist;
System.out.println(i + ", max: " + vals.get(current*(i+1)-1));
lookup[i] = vals.get(current*(i+1)-1);
s.append(vals.get(current*(i+1)-1) + "D, ");
int current = vals.size() / dist;
System.out.println(i + ", max: " + vals.get(current * (i + 1) - 1));
lookup[i] = vals.get(current * (i + 1) - 1);
s.append(vals.get(current * (i + 1) - 1) + "D, ");
}
s.delete(s.length()-2, s.length());
s.delete(s.length() - 2, s.length());
s.append("}");
numbers = new int[dist];
vals = new ArrayList<>();
@@ -82,8 +79,8 @@ public class LookupGenerator {
System.out.println(i + ": " + numbers[i]);
}
for(int i = 0; i < dist; i++) {
System.out.print(i + (String.valueOf(i).length() ==1 ? " " : "") + " |");
for(int j = 0; j < numbers[i]/100; j++) {
System.out.print(i + (String.valueOf(i).length() == 1 ? " " : "") + " |");
for(int j = 0; j < numbers[i] / 100; j++) {
System.out.print("-");
}
System.out.println("|");
@@ -91,23 +88,25 @@ public class LookupGenerator {
System.out.println(s.toString());
}
public static int normalize(double i, int n) {
i*=1.42; // Magic simplex value (sqrt(2) plus a little)
i = Math.min(Math.max(i, -1),1);
return Math.min((int) Math.floor((i+1)*((double)n/2)), n-1);
i *= 1.42; // Magic simplex value (sqrt(2) plus a little)
i = Math.min(Math.max(i, - 1), 1);
return Math.min((int) Math.floor((i + 1) * ((double) n / 2)), n - 1);
}
public static int normalizeNew(double d) {
for(int i = 0; i < lookup.length; i++) {
if(d < lookup[i]) return i;
}
return lookup.length-1;
return lookup.length - 1;
}
private static class Worker extends Thread {
private final List<Double> l;
private final int searches;
private final FastNoiseLite noise;
public Worker(List<Double> l, int searches, FastNoiseLite noise) {
this.l = l;
this.searches = searches;
@@ -127,7 +126,7 @@ public class LookupGenerator {
}
public String getStatus() {
return "Generating values. " + l.size() + "/" + searches + " (" + ((long)l.size()*100L)/searches + "%)";
return "Generating values. " + l.size() + "/" + searches + " (" + ((long) l.size() * 100L) / searches + "%)";
}
}
}
src/test/java/RangeTest.java
+4 -1
View File
@@ -1,5 +1,6 @@
import org.polydev.gaea.math.Range;
import org.junit.jupiter.api.Test;
import org.polydev.gaea.math.Range;
import static org.junit.jupiter.api.Assertions.assertEquals;
import static org.junit.jupiter.api.Assertions.assertNull;
@@ -14,6 +15,7 @@ public class RangeTest {
}
assertEquals(100, i);
}
@Test
public void intersect() {
Range one = new Range(10, 100);
@@ -26,6 +28,7 @@ public class RangeTest {
one = new Range(25, 50);
assertNull(one.intersects(two));
}
@Test
public void reflect() {
Range t = new Range(3, 10);