Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Use octee for normals and uvs seperatly #32

Draft
wants to merge 6 commits into
base: master
Choose a base branch
from
Draft

Use octee for normals and uvs seperatly #32

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
3ac392b
Use octtree for normals and uvs seperatly
QuantumEntangledAndy Jan 18, 2021
28b4bbb
Bug fix and use AtomicUsize for octtree counter
QuantumEntangledAndy Jan 18, 2021
408d709
Only increment index when inserting a new vert into the octtree
QuantumEntangledAndy Jan 18, 2021
539a327
Use hashmap to remove duplicate vertex indices during bake
QuantumEntangledAndy Jan 19, 2021
8d112a6
Add bounding sphere to amethyst example
QuantumEntangledAndy Jan 19, 2021
30ff802
Bug fixes on the uvmap during bake and other baking tests
QuantumEntangledAndy Jan 19, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
26 changes: 23 additions & 3 deletions gaiku-amethyst/examples/terrain.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -17,6 +17,7 @@ use amethyst::{
palette::{rgb::Rgb, Srgb},
plugins::{RenderShaded3D, RenderSkybox, RenderToWindow},
types::{DefaultBackend, TextureData},
visibility::BoundingSphere,
ActiveCamera, Camera, Material, MaterialDefaults, Mesh, RenderingBundle,
},
ui::{RenderUi, UiBundle},
Expand Down Expand Up @@ -133,7 +134,8 @@ impl GameLoad {
for chunk in chunks.iter() {
let mesh = VoxelBaker::bake::<Chunk, GaikuTexture2d, GaikuMesh>(chunk, &options).unwrap();
if let Some(mesh) = mesh {
meshes.push((mesh, chunk.position()));
let dimensions = [chunk.width(), chunk.height(), chunk.depth()];
meshes.push((mesh, chunk.position(), dimensions));
}
}

Expand All @@ -145,7 +147,7 @@ impl GameLoad {
} else {
Matrix4::identity()
};
for (mut mesh_gox, position) in meshes {
for (mut mesh_gox, position, dimensions) in meshes {
let (mesh, mat) = {
if swap_axes {
// Swap y/z for amethyst coordinate system
Expand Down Expand Up @@ -198,7 +200,25 @@ impl GameLoad {
pos.set_translation(position_trans);
pos.set_scale(scale);

let _voxel = world.create_entity().with(mesh).with(mat).with(pos).build();
let radius =
((dimensions[0].pow(2) + dimensions[1].pow(2) + dimensions[2].pow(2)) as f32).sqrt() * 0.60;
let center = [
dimensions[0] as f32 / 2.,
dimensions[1] as f32 / 2.,
dimensions[2] as f32 / 2.,
];
let bounding_sphere = BoundingSphere {
center: center.into(),
radius,
};

let _voxel = world
.create_entity()
.with(mesh)
.with(mat)
.with(pos)
.with(bounding_sphere)
.build();
}
}
}
1 change: 1 addition & 0 deletions gaiku-common/src/boundary.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -41,6 +41,7 @@ impl Boundary {
&& self.end.z > point.z
}

#[allow(dead_code)]
pub fn intersects(&self, range: &Boundary) -> bool {
!(range.start.x > self.start.x
|| range.start.y > self.start.y
Expand Down
Loading