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.

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

Merge parent fork #1

Merged
merged 68 commits into from
May 20, 2024
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
68 commits
Select commit Hold shift + click to select a range
54e7b4c
VisitNodesInDFS
attcs Feb 13, 2024
1dfebfd
Replace AdaptorGeneralBase::div to multiply
attcs Feb 13, 2024
8bf564a
Add AdaptorGeneralBase::dot
attcs Feb 13, 2024
fbd4f9d
OrthoTreeContainerBox::PlaneIntersection
attcs Feb 13, 2024
a6f711e
OrthoTreePoint::PlaneSearch
attcs Feb 13, 2024
3104a19
Readme update
attcs Feb 13, 2024
26fd69c
Clang format
attcs Feb 16, 2024
67a9bf6
Naming convention change
attcs Feb 17, 2024
ee7bffa
Readme update
attcs Feb 17, 2024
c4356ae
Benchmark fixes
attcs Feb 18, 2024
0d6c5ec
Benchmark: set seed for shuffle
attcs Feb 19, 2024
e30a751
Remove generateEntitiyIDList
attcs Feb 19, 2024
f6beb82
Better types
attcs Feb 20, 2024
91e2323
Renaming OrthoTree in OrthoTreeContainerBase to OrthoTreeCore
attcs Feb 25, 2024
73fe238
Renaming in is_ray_hit
attcs Feb 25, 2024
0964fc5
Removing const version of cont_at
attcs Feb 25, 2024
36888fe
Changing CollectAllIdInDFS declaration
attcs Feb 25, 2024
4767851
Adding Get/CollectAllIdInBFS/CollectAllIdInDFS to Container types
attcs Feb 25, 2024
9941720
Simplified VisitNodes
attcs Feb 25, 2024
9ff60c4
squash! Changing CollectAllIdInDFS declaration
attcs Feb 25, 2024
49b3dc1
is_normalized_vector for plane normals
attcs Feb 25, 2024
1687cc4
Eigen adapter
attcs Feb 25, 2024
ed5d4fa
Resolving geometry_type warnings from multiply and is_ray_hit
attcs Feb 25, 2024
1605df6
XYZ style vector type adapter
attcs Feb 25, 2024
04be072
Refactoring are_boxes_overlapped
attcs Feb 25, 2024
000990f
Unreal adapter
attcs Feb 25, 2024
99e327f
Update readme
attcs Feb 25, 2024
65dec7d
fixup! Eigen adapter
attcs Feb 28, 2024
734c64c
Few renaming
attcs Feb 28, 2024
f8e692d
Removing entity_id_type
attcs Feb 28, 2024
a8b9e88
Few fixes
attcs Feb 29, 2024
161ea40
Missing std-s
attcs Mar 1, 2024
83f679a
Issue: #11 Frustum culling
attcs Mar 2, 2024
d8d74c5
Update README
attcs Mar 2, 2024
3c617bb
Issue: #18 Major type renaming
attcs Mar 2, 2024
0cda080
Issue: #21 AdaptorBasicsConcept changing to be more capable
attcs Mar 3, 2024
0c83795
Adaptor naming change
attcs Mar 3, 2024
c3ee48d
Issue: #19 Additional adapter functions for Ray and Plane
attcs Mar 3, 2024
af0945c
Issue: #15 boost/geometry adapter
attcs Mar 3, 2024
5e134fa
Adapters: Removed includes
attcs Mar 4, 2024
cdfda3f
Adapter fix: replacement if autoc/autoce
attcs Mar 4, 2024
a070356
Minor adaptor fixes
attcs Mar 6, 2024
15d1676
adaptortests project
attcs Mar 6, 2024
4efac07
alltests solution
attcs Mar 6, 2024
b55b910
Adding header info back to the adapters
attcs Mar 6, 2024
a6d39db
Issue: #22 glm adaptor
attcs Mar 6, 2024
6ed4284
Issue: #23 CGAL adapter
attcs Mar 7, 2024
e7040b7
Update README
attcs Mar 8, 2024
4d663c8
GCC compile fix
attcs Mar 8, 2024
cdcd6a6
gcc_build job
attcs Mar 8, 2024
330681f
Merge branch 'gcc_workflow'
attcs Mar 8, 2024
a0a63ac
Clang compile fix
attcs Mar 9, 2024
b2cc9b7
Optional maxDepthNo
attcs Mar 9, 2024
a3a5070
Non-linear tree compile error
attcs Mar 9, 2024
a1de388
Unreal adaptor: adding FLargeWorldCoordinatesReal = double;
attcs Mar 10, 2024
23bda72
Fix some hidden implicit conversion issues
attcs Mar 10, 2024
43bb42e
Issue: #24 Fix of Insert / Child node attaching with wrong key
attcs Mar 24, 2024
56e667b
Removing volume calculation from rangeSearch
attcs Mar 24, 2024
862c1ba
Few usings and renamings
attcs Mar 24, 2024
ed8c3f9
Adding: HasNode(), GetNodeIDByEntity()
attcs Mar 24, 2024
2b1e855
Issue: #16 Alternative Insert with rebalancing
attcs Mar 24, 2024
75bd3e4
Issue: #25 Remove nodes in Erase()
attcs Mar 25, 2024
561a230
Fix of Insert: Child nodes are attached in order
attcs Mar 26, 2024
9ba4422
Issue: #16 Improved rebalancing insert
attcs Mar 26, 2024
4c3d89b
Issue: #26 Tolerance bug with rays
attcs Apr 18, 2024
6807af4
Issue: #26 Making Ray's tolerance handling exclusive and conform wit…
attcs Apr 21, 2024
48dc070
Update README.md
attcs Apr 28, 2024
807b196
Merge remote-tracking branch 'parent/master' into merge_parent_fork
LeweC May 20, 2024
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
35 changes: 35 additions & 0 deletions .clang-format
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
BasedOnStyle: Microsoft

Cpp11BracedListStyle: false
NamespaceIndentation: All

AccessModifierOffset: -2
AllowAllParametersOfDeclarationOnNextLine: true
AlignAfterOpenBracket: AlwaysBreak
AlignTrailingComments: Always
AlignOperands: AlignAfterOperator
AlignEscapedNewlines: Left
AlignArrayOfStructures: Right
AllowShortCaseLabelsOnASingleLine: true
AllowShortFunctionsOnASingleLine: InlineOnly
AlwaysBreakTemplateDeclarations: true

BinPackArguments: false
BinPackParameters: false
BreakConstructorInitializers: BeforeComma
BreakInheritanceList: BeforeColon
ColumnLimit: 150
ConstructorInitializerIndentWidth: 0
IndentCaseLabels: false
IndentWidth: 2
PenaltyBreakBeforeFirstCallParameter: 100
PenaltyExcessCharacter: 5
PenaltyReturnTypeOnItsOwnLine: 1000
PointerAlignment: Left
SpaceAfterTemplateKeyword: false
BreakBeforeTernaryOperators: true
MaxEmptyLinesToKeep: 2
ContinuationIndentWidth: 2
AllowShortLambdasOnASingleLine: Inline

SpacesInContainerLiterals: false
1 change: 1 addition & 0 deletions .clang-format-ignore
Original file line number Diff line number Diff line change
@@ -0,0 +1 @@
unittests/*
32 changes: 30 additions & 2 deletions .github/workflows/msbuild.yml
Original file line number Diff line number Diff line change
Expand Up @@ -5,22 +5,50 @@ on: [push]
env:
# Path to the solution file relative to the root of the project.
SOLUTION_FILE_PATH: ./unittests/unittests.sln
CMAKE_FILE_PATH: gcc

# Configuration type to build.
# You can convert this to a build matrix if you need coverage of multiple configuration types.
# https://docs.github.com/actions/learn-github-actions/managing-complex-workflows#using-a-build-matrix
BUILD_CONFIGURATION: Release

jobs:
build:
gcc_build:
runs-on: ubuntu-latest

steps:
- uses: actions/checkout@v4
- name: Install dependencies on ubuntu
run: |
sudo apt-get update
sudo apt install libtbb-dev
sudo apt-get install ninja-build cmake
ninja --version
cmake --version
gcc --version
- name: Configure
shell: bash
run: |
mkdir build
mkdir instdir
cmake ${{env.CMAKE_FILE_PATH}} -B build
- name: Build
shell: bash
run: |
make -C build
- name: Run
shell: bash
run: |
./build/octree
msvc_build_and_test:
strategy:
matrix:
targetplatform: [x86, x64]

runs-on: windows-latest

steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4

- name: Add MSBuild to PATH
uses: microsoft/[email protected]
Expand Down
3 changes: 3 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -192,6 +192,9 @@ publish/
# in these scripts will be unencrypted
PublishScripts/

# vcpkg
**/vcpkg_installed/*

# NuGet Packages
*.nupkg
# NuGet Symbol Packages
Expand Down
38 changes: 38 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,38 @@
# Changelog

## 2024-03-02
New features
* New adaptors: Eigen, Unreal Engine, XYZ
* Plane related search and intersection check
* Frustum culling
* User-defined function for Collision detection
* Depth-first search visitor

Refactorizations
* Clang format and naming changes
* entity_id_type and max_element_type are replaced with size_t
* ID generation is removed

## 2024-01-16
* Tolerance is added to the Ray intersection functions
* Bugfixes

## 2023-01-11
* Split strategy performace upgrade
* GCC support
* Bugfixes

## 2022-01-30
New features
* Container type
* Split strategy for boundingbox-type tree
* Collision detection inside the tree
* Ray intersections
* k-Nearest Neighbors

Maintenance
* Benchmarks
* Bugfixes

## 2021-04-26
* First commits
Loading
Loading