Skip to content

Commit

Permalink
Browse files Browse the repository at this point in the history
namespace aether -> zinc
  • Loading branch information
avagordon01 committed Nov 21, 2018
1 parent 3a06b8c commit b7939b9
Show file tree
Hide file tree
Showing 7 changed files with 188 additions and 188 deletions.
4 changes: 2 additions & 2 deletions libzinc/AABB.hh
Expand Up @@ -13,7 +13,7 @@
#include <libzinc/region.hh>
#include <immintrin.h>

namespace aether {
namespace zinc {

namespace morton {

Expand Down Expand Up @@ -289,4 +289,4 @@ std::pair<morton_code<Dimension, BitsPerDimension>, morton_code<Dimension, BitsP

} //::morton

} //::aether
} //::zinc
4 changes: 2 additions & 2 deletions libzinc/cell.hh
Expand Up @@ -24,12 +24,12 @@ struct tree_cell {
return (c.data >> (level * c.dimension)) == (c.data >> (level * c.dimension));
}

aether::morton::region<2,32> region() const {
zinc::morton::region<2,32> region() const {
return {{{code, code + (1 << (level * 2)) - 1}}};
}

template<typename T>
aether::morton::region<2,32, T> region(T data) const {
zinc::morton::region<2,32, T> region(T data) const {
return {{{code, code + (1 << (level * 2)) - 1}, data}};
}
};
18 changes: 9 additions & 9 deletions libzinc/encoding.hh
Expand Up @@ -14,15 +14,15 @@ struct morton_code {
"only 2D and 32 bits, or 3D and 21 bits are currently supported.");
};

using aether::morton::__morton_2_x_mask;
using aether::morton::__morton_2_y_mask;
using aether::morton::__morton_3_x_mask;
using aether::morton::__morton_3_y_mask;
using aether::morton::__morton_3_z_mask;
using aether::morton::expand_bits_2;
using aether::morton::compact_bits_2;
using aether::morton::expand_bits_3;
using aether::morton::compact_bits_3;
using zinc::morton::__morton_2_x_mask;
using zinc::morton::__morton_2_y_mask;
using zinc::morton::__morton_3_x_mask;
using zinc::morton::__morton_3_y_mask;
using zinc::morton::__morton_3_z_mask;
using zinc::morton::expand_bits_2;
using zinc::morton::compact_bits_2;
using zinc::morton::expand_bits_3;
using zinc::morton::compact_bits_3;

template<>
struct morton_code<2, 32> {
Expand Down
4 changes: 2 additions & 2 deletions libzinc/interval.hh
Expand Up @@ -11,7 +11,7 @@
#include <libzinc/util.hh>
#include <immintrin.h>

namespace aether {
namespace zinc {

namespace morton {

Expand Down Expand Up @@ -194,4 +194,4 @@ static interval<Dimension, BitsPerDimension, T> get_parent_cell(const interval<D

} //::morton

} //::aether
} //::zinc
4 changes: 2 additions & 2 deletions libzinc/region.hh
Expand Up @@ -13,7 +13,7 @@
#include <libzinc/interval.hh>
#include <immintrin.h>

namespace aether {
namespace zinc {

namespace morton {

Expand Down Expand Up @@ -288,4 +288,4 @@ static region<2,32,T> cell_to_region(uint64_t code, uint64_t level, T data) {

} //::morton

}//aether
}//zinc
4 changes: 2 additions & 2 deletions libzinc/util.hh
Expand Up @@ -6,7 +6,7 @@
#include <libzinc/encoding.hh>
#include <immintrin.h>

namespace aether {
namespace zinc {

namespace morton {

Expand Down Expand Up @@ -129,4 +129,4 @@ static inline constexpr Integer compact_bits_2(Integer x) {

} //::morton

} //::aether
} //::zinc

0 comments on commit b7939b9

Please sign in to comment.