ada/re-proceduralcity
Archived
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Play with noise

Browse source
This commit is contained in:
Riley Trautman 2017-11-18 22:15:16 -06:00
parent bd03665407
commit 27d1ac08d2
2 changed files with 23 additions and 37 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
data/test.obj
View file

@ -12,14 +12,6 @@ v 1 0 3
v 1 1 3
v 1 1 0
v 1 0 0
v 2 0 0
v 2 1 3
v 2 1 0
v 2 0 3
v 3 0 3
v 3 1 3
v 3 1 0
v 3 0 0
# 0 UV coordinates
@ -46,16 +38,4 @@ f 1//5 7//5 8//5
f 7//5 1//5 3//5
f 1//6 5//6 4//6
f 5//6 1//6 8//6
f 9//1 10//1 11//1
f 10//1 9//1 12//1
f 10//2 13//2 14//2
f 13//2 10//2 12//2
f 13//3 15//3 14//3
f 15//3 13//3 16//3
f 15//4 10//4 14//4
f 10//4 15//4 11//4
f 9//5 15//5 16//5
f 15//5 9//5 11//5
f 9//6 13//6 12//6
f 13//6 9//6 16//6

40
src/main.rs
View file

@ -13,7 +13,7 @@ use std::io::Write;
use obj::{Obj, SimplePolygon, IndexTuple};
use noise::Fbm;
//use noise::Seedable;
//use noise::MultiFractal;
use noise::MultiFractal;
use noise::NoiseModule;
use cgmath::Vector3;
use cgmath::ElementWise;
@ -47,12 +47,11 @@ fn distance_a_to_b(ax: f32, ay: f32, bx: f32, by: f32) -> f32 {
}
fn return_at(x: f32, y: f32, fbmnoise: &Fbm<f32>) -> f32 {
let n = 20.0 * fbmnoise.get([x, y]);
let n = n - n.floor();
let zero_to_one_noise = (1.0 + fbmnoise.get([x, y])) * 0.5;
let z = 0.0f32;
let m = z.max(1.0 - 1.0 * distance_a_to_b(x, y, 0.5, 0.5));
let m = distance_a_to_b(x, y, 0.5, 0.5);
return (m * 0.15) + (n * 0.85);
return (zero_to_one_noise * 0.90) + (m * 0.10);
}
fn find_l_w(obj: &Obj<SimplePolygon>) -> (f32, f32) {
@ -98,7 +97,7 @@ fn duplicate(
Vector3::new(
point.x + translation.x,
point.y + translation.y,
point.z * height_scalar,
point.z * height_scalar * 2.0,
)
})
.collect()
@ -114,16 +113,23 @@ fn generate_city(
let length = length + spacing;
let width = width + spacing;
let fbm: Fbm<f32> = Fbm::new();
let fbm: Fbm<f32> = Fbm::new()
.set_octaves(1)
.set_frequency(6.0)
.set_persistence(3.0)
.set_lacunarity(30.0);
let mut output_positions = Vec::new();
output_positions.extend_from_slice(positions);
let mut output_positions = duplicate(
positions,
Vector3::new(0.0, 0.0, 0.0),
return_at(0.5, 0.5, &fbm),
);
let rest_vec: Vec<_> = (1..layers)
.into_par_iter()
// .into_par_iter()
.flat_map(|current_layer| {
(0..(current_layer * 8))
.into_par_iter()
// .into_par_iter()
.flat_map(|current_duplicate| {
let current_ratio = current_duplicate as f32 / (current_layer as f32 * 8.0);
@ -142,14 +148,14 @@ fn generate_city(
// gets into range -1 to +1
let coord =
translation.mul_element_wise(
Vector3::new(1.0 / layers as f32, 1.0 / layers as f32, 0.0),
1.0/layers as f32 * translation.mul_element_wise(
Vector3::new(1.0 / length as f32, 1.0 / width as f32, 0.0),
);
// gets into range -0.5 to +0.5
let coord = coord.mul_element_wise(Vector3::new(1.0 / 2.0, 1.0 / 2.0, 0.0));
// gets into range -0.4 to +0.4
let coord = 0.4 * coord;
// gets into range 0 to 1.0
// gets into range 0.1 to 0.9
let coord = coord + Vector3::new(0.5, 0.5, 0.0);
let height_scalar = return_at(coord.x, coord.y, &fbm);