Skip to content

Commit

Permalink
Tidy up structure and resolve merge conflicts (#31)
Browse files Browse the repository at this point in the history
* Update .gitignore

* Use globbing to include header and source files

* Add more stuffs to ignore

* Fix conflict in CMakeLists.txt

* Move source and header files to `core` dir

* Implement state machine & fix formatting issues

* Address leftover merge conflict issue

* Test GUI with state machine

* Modification to test building

* Implement working state machine with simple GUI

* Strip some unneeded parts

* Feature improvements

* Fix key_callback related bug

* Remove extra unnecessary line

* Restyled by clang-format (#25)

Co-authored-by: Restyled.io <[email protected]>

* GUI + structure improvements

* Clean up unnecessary lines and files

* Rename shared data structure

* Add documentation files

Co-authored-by: restyled-io[bot] <32688539+restyled-io[bot]@users.noreply.github.com>
Co-authored-by: Restyled.io <[email protected]>
  • Loading branch information
3 people authored Mar 8, 2022
1 parent 0033ec9 commit 5a4432e
Show file tree
Hide file tree
Showing 890 changed files with 51,575 additions and 694 deletions.
33 changes: 33 additions & 0 deletions .github/workflows/docs.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,33 @@
name: Generate and deploy documentation

on:
push:
branches:
- main
workflow_dispatch:

jobs:
deploy:
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v2
# Using this approach to make it easier to integrate with cmake

- name: Install Doxygen
run: sudo apt-get install doxygen -y

- name: Change current working directory
run: |
if [ ! -d "build" ]; then mkdir build; elif
cd build
- name: Run doxygen
run: doxygen ../Doxyfile.ini

- name: Commit updated file(s) back to this repository
run: |
git config user.name github-actions
git config user.email [email protected]
git add ../docs
git diff-index --quiet HEAD || git commit -m "Update documentation"
git fetch
git push
6 changes: 6 additions & 0 deletions .gitmodules
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
[submodule "core/thirdparty/doxygen-awesome-css"]
path = core/thirdparty/doxygen-awesome-css
url = https://github.com/jothepro/doxygen-awesome-css.git
[submodule "thirdparty/doxygen-awesome-css"]
path = thirdparty/doxygen-awesome-css
url = https://github.com/jothepro/doxygen-awesome-css.git
2 changes: 1 addition & 1 deletion CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -33,6 +33,6 @@ file(GLOB PROJECT_SOURCES core/src/*.cpp)
source_group("Headers" FILES ${PROJECT_HEADERS})
source_group("Sources" FILES ${PROJECT_SOURCES})

add_executable(${PROJECT_NAME} ${PROJECT_HEADERS} ${PROJECT_SOURCES} core/src/Voxeloop.cpp core/include/Voxeloop.hpp)
add_executable(${PROJECT_NAME} ${PROJECT_HEADERS} ${PROJECT_SOURCES})

target_link_libraries(${PROJECT_NAME} glad glm imgui stb miniaudio)
Loading

0 comments on commit 5a4432e

Please sign in to comment.