Skip to content

Commit

Permalink
Merge pull request #1 from LeweC/merge_parent_fork
Browse files Browse the repository at this point in the history
Merge parent fork
  • Loading branch information
LeweC authored May 20, 2024
2 parents 459356b + 807b196 commit 6055ad2
Show file tree
Hide file tree
Showing 38 changed files with 7,529 additions and 2,290 deletions.
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/setup-msbuild@v1.0.2
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

0 comments on commit 6055ad2

Please sign in to comment.