From c9b4dccd7eaeed68ce96cf5167916417d0baa6a7 Mon Sep 17 00:00:00 2001
From: mat <27899617+mat-1@users.noreply.github.com>
Date: Sun, 2 Oct 2022 12:29:47 -0500
Subject: All block shapes & collisions (#22)

* start adding shapes

* add more collision stuff

* DiscreteCubeMerger

* more mergers

* start adding BitSetDiscreteVoxelShape::join

* i love rust :smiley: :smiley: :smiley:

* r

* IT COMPILES????

* fix warning

* fix error

* fix more clippy issues

* add box_shape

* more shape stuff

* make DiscreteVoxelShape an enum

* Update shape.rs

* also make VoxelShape an enum

* implement BitSet::clear

* add more missing things

* it compiles

W

* start block shape codegen

* optimize shape codegen

* make az-block/blocks.rs look better (broken)

* almost new block macro

* make the codegen not generate 'type'

* try to fix

* work more on the blocks macro

* wait it compiles

* fix clippy issues

* shapes codegen works

* well it's almost working

* simplify some shape codegen

* enum type names are correct

* W it compiles

* cargo check no longer warns

* fix some clippy issues

* start making it so the shape impl is on BlockStates

* insane code

* new impl compiles

* fix wrong find_bits + TESTS PASS!

* add a test for slab collision

* fix clippy issues

* ok rust

* fix error that happens when on stairs

* add test for top slabs

* start adding join_is_not_empty

* add more to join_is_not_empty

* top slabs still don't work!!

* x..=0 doesn't work in rust :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley: :smiley:

* remove comment since i added more useful names

* remove some printlns

* fix walls in some configurations erroring

* fix some warnings

* change comment to \`\`\`ignore instead of \`\`\`no_run

* players are .6 wide not .8

* fix clippy's complaints

* i missed one clippy warning
---
 azalea-physics/src/collision/mod.rs | 11 +++++++----
 1 file changed, 7 insertions(+), 4 deletions(-)

(limited to 'azalea-physics/src/collision/mod.rs')

diff --git a/azalea-physics/src/collision/mod.rs b/azalea-physics/src/collision/mod.rs
index 1f9064b3..a18440b7 100644
--- a/azalea-physics/src/collision/mod.rs
+++ b/azalea-physics/src/collision/mod.rs
@@ -1,10 +1,13 @@
+mod blocks;
 mod dimension_collisions;
 mod discrete_voxel_shape;
+mod mergers;
 mod shape;
 
 use azalea_core::{Axis, PositionXYZ, Vec3, AABB, EPSILON};
 use azalea_world::entity::{EntityData, EntityMut};
 use azalea_world::{Dimension, MoveEntityError};
+pub use blocks::BlockWithShape;
 use dimension_collisions::CollisionGetter;
 pub use discrete_voxel_shape::*;
 pub use shape::*;
@@ -192,10 +195,9 @@ fn collide_bounding_box(
     movement: &Vec3,
     entity_bounding_box: &AABB,
     dimension: &Dimension,
-    entity_collisions: Vec<Box<dyn VoxelShape>>,
+    entity_collisions: Vec<VoxelShape>,
 ) -> Vec3 {
-    let mut collision_boxes: Vec<Box<dyn VoxelShape>> =
-        Vec::with_capacity(entity_collisions.len() + 1);
+    let mut collision_boxes: Vec<VoxelShape> = Vec::with_capacity(entity_collisions.len() + 1);
 
     if !entity_collisions.is_empty() {
         collision_boxes.extend(entity_collisions);
@@ -205,6 +207,7 @@ fn collide_bounding_box(
 
     let block_collisions =
         dimension.get_block_collisions(entity, entity_bounding_box.expand_towards(movement));
+    let block_collisions = block_collisions.collect::<Vec<_>>();
     collision_boxes.extend(block_collisions);
     collide_with_shapes(movement, *entity_bounding_box, &collision_boxes)
 }
@@ -212,7 +215,7 @@ fn collide_bounding_box(
 fn collide_with_shapes(
     movement: &Vec3,
     mut entity_box: AABB,
-    collision_boxes: &Vec<Box<dyn VoxelShape>>,
+    collision_boxes: &Vec<VoxelShape>,
 ) -> Vec3 {
     if collision_boxes.is_empty() {
         return *movement;
-- 
cgit v1.2.3