Fixed iterators, added more tests, reorganized glium.rs, formating done. by igorbologovv · Pull Request #4 · Dimev/lodtree

igorbologovv · 2023-02-14T13:41:14Z

glium:

shader implementation was moved into it's own function
declaration of the render context was structured and implemented separately
After changes in glium, state: selected was fixed, when rendering somehow;

iter.rs:
-fixed unit test test_bounds and renamed into test_bounds_quadtree
-added unit test for octree named test_bounds_octree()
-parameter depth was changed from u64 to u8 in all files(2.pow(256) is a bit too much);

coords.rs:

was implemented PartialOrd for OctVec and QuadVec too, particularly comparison of the depth is important;

tree.rs:
implemented with_capacity for initing preallocated memory for chunks and nodes;

lib.rs:
all doctests are fixed, warnings are fixed;

# Conflicts: # Cargo.lock # Cargo.toml # src/iter.rs # src/traits.rs

Dimev · 2023-02-14T15:41:28Z

Nice!
I'll take a better look in the weekend, looks good from a quick glance.

Dimev

What I found on first glance (will try running all changes later.

Not sure if I agree with making ChunkContainer public API.

Thanks for the extra tests!

Dimev · 2023-02-19T14:29:52Z

src/coords.rs

 /// A Lod Vector for use in a quadtree.
 /// It subdivides into 4 children of equal size.
-#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Default, Debug, Hash)]
+//#[derive(Copy, Clone, PartialEq, Eq, PartialOrd, Ord, Default, Debug, Hash)]


This comment probably doesn't need to be here anymore

Dimev · 2023-02-19T14:30:09Z

src/coords.rs

        let min_difference = min.depth - level;
        let max_difference = max.depth - level;
-
+        // println!("diff {:?},  {:?}, {:?}", self_difference, min_difference,max_difference);


This comment too

Dimev · 2023-02-19T14:30:17Z

src/coords.rs

        let max_x = max.x >> max_difference;
        let max_y = max.y >> max_difference;
-
+        // dbg!(min_x, min_y, max_x, max_y);


This one too

Dimev · 2023-02-19T14:31:19Z

src/iter.rs

-        max_depth: u64,
+        max_depth: u8,
    ) -> ChunksInBoundIter<L> {
+        debug_assert!(


Not sure if I like this.

For me it would make more sense that it simply returns no chunks if the bounds are empty

Dimev · 2023-02-19T14:31:39Z

src/iter.rs

+    }
+
+    impl SafeRngRange for rand::rngs::ThreadRng {
+        //#[no_panic]


Remove this comment

Dimev · 2023-02-19T14:32:38Z

src/iter.rs

+        ((b.x - a.x) + 1) * ((b.y - a.y) + 1) * ((b.z - a.z) + 1)
+    }
+    ///The same unit test as test_bounds juts for OctVec:
+    /// //todo check it once again


This one too, and add a space for the doc comment

Dimev · 2023-02-19T14:33:14Z

src/iter.rs

+        struct Chunk {
+            visible: bool,
+            cache_state: i32,
+            // 0 is new, 1 is merged, 2 is cached, 3 is both


These can also be removed

Dimev · 2023-02-19T14:33:23Z

src/iter.rs

+                4 => (position.x as i32 - r).pow(2) + (position.y as i32 - r).pow(2) < r,
+                _ => false,
+            };
+            // dbg!(position);


Dimev · 2023-02-19T14:33:59Z

src/traits.rs

    ///
    /// // then check if we are inside the AABB
-    /// self.depth as u64 <= max_depth
+    /// self.depth  <= max_depth


Remove the extra space

Dimev · 2023-02-19T14:34:25Z

src/tree.rs

-    pub(crate) chunk: C,
-    pub(crate) index: usize,
-    pub(crate) position: L,
+pub struct ChunkContainer<C: Sized, L: LodVec> {


This isn't intended to be public API IMO

…ric storage)

Dimev · 2023-03-04T10:21:30Z

src/lib.rs

@@ -1,3 +1,4 @@
+//#![feature(generic_const_exprs)]


I'd prefere this to not need nightly

turist and others added 7 commits February 10, 2023 09:38

Drawing a circle, reorganized code

320eb0f

Updated unittest test_bound for QuadTree

302e713

Finalize unittests for tree iterators

476b12e

Merge remote-tracking branch 'origin/main'

fb34306

# Conflicts: # Cargo.lock # Cargo.toml # src/iter.rs # src/traits.rs

Updated unittests for test_bounds

aecfb77

fix gitignore

2a9b8c5

Fixet all tests in lib.rs, fixed warnings etc. cleaning up done

099562c

Dimev requested changes Feb 19, 2023

View reviewed changes

igorbologovv and others added 6 commits February 27, 2023 10:35

Added criterion bench test, little clean up

c49c72d

Changed sintature in prepare_update on Fn() trait

4bdd3ad

Added insert operation to lodtree (useful when using lodtree for gene…

c463f5b

…ric storage)

reduce memory overhead by 30 percent

6ac3906

format

e92836c

Fixed prepare_insert

95ea133

Dimev reviewed Mar 4, 2023

View reviewed changes

src/lib.rs

@@ -1,3 +1,4 @@

//#![feature(generic_const_exprs)]

Copy link

Owner

Dimev Mar 4, 2023

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I'd prefere this to not need nightly

alexpyattaev and others added 4 commits March 6, 2023 11:14

remove unnecessary vec

23ccedf

Replace Fn with FnMut

dce9fa2

change fn trait

42ced87

tune down benches

b332a5a

Conversation

igorbologovv commented Feb 14, 2023

Uh oh!

Dimev commented Feb 14, 2023

Uh oh!

Dimev left a comment

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

3 participants