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

Staging #13

Merged
merged 92 commits into from
Sep 26, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
92 commits
Select commit Hold shift + click to select a range
99c7984
Updated readme.md
Im-Rises Sep 15, 2022
9b9953e
vector3d.h
clemos38 Sep 15, 2022
fe5dfc8
test compilation
Im-Rises Sep 16, 2022
b2dee2d
wip
Im-Rises Sep 16, 2022
8c10ed1
class Vector3D
clemos38 Sep 16, 2022
4765b63
Corrected Readme
Im-Rises Sep 16, 2022
506bed4
Merge pull request #1 from Im-Rises/testCompilation
Im-Rises Sep 16, 2022
8e39bf6
Added PhysicalEngine class
Im-Rises Sep 16, 2022
71ea255
Added Glad
Im-Rises Sep 16, 2022
044968b
Implementing Triangle drawing
Im-Rises Sep 16, 2022
3aa80e1
Hello Triangle
Im-Rises Sep 17, 2022
ade88e6
Reformatted code
Im-Rises Sep 17, 2022
86a9cc7
Added two triangle display
Im-Rises Sep 18, 2022
1291f90
Creating shader class
Im-Rises Sep 18, 2022
b8e3536
Changed math.h lib to cmath lib
Im-Rises Sep 18, 2022
78ef081
Merge pull request #2 from Im-Rises/vector
Im-Rises Sep 18, 2022
cd00fdf
wip
Im-Rises Sep 19, 2022
5097bb0
Added some code example
Im-Rises Sep 19, 2022
d0847c6
Merge branch 'develop' into opengl
Im-Rises Sep 19, 2022
cc47caa
wip
Im-Rises Sep 19, 2022
43da002
Merge pull request #4 from Im-Rises/opengl
Im-Rises Sep 19, 2022
97db0bf
retake syntax vector
clemos38 Sep 19, 2022
1dc4e4a
syntaxe retake vector
clemos38 Sep 19, 2022
5d38a32
distance, egalite et affichage
clemos38 Sep 19, 2022
5378bb0
wip
Im-Rises Sep 19, 2022
5ab6f56
Integrator
spiryti Sep 19, 2022
5e8a26b
Merge branch 'develop' into Particule
spiryti Sep 19, 2022
ca6ac1a
Reformatted code
Im-Rises Sep 21, 2022
d5ef13d
wip
Im-Rises Sep 21, 2022
eb05648
Added demo
Im-Rises Sep 22, 2022
a954f7d
wip
Im-Rises Sep 22, 2022
e63dd76
Merge branch 'develop' into opengl
Im-Rises Sep 22, 2022
99f1a54
Merge pull request #5 from Im-Rises/opengl
Im-Rises Sep 22, 2022
fcb60b0
mesh et integrator
spiryti Sep 22, 2022
c73735f
Merge branch 'develop' into Particule
spiryti Sep 22, 2022
6186a44
Cmake Conflict
spiryti Sep 22, 2022
30d741f
Merge pull request #6 from Im-Rises/Particule
spiryti Sep 22, 2022
ea55ccb
wip
Im-Rises Sep 22, 2022
b3c1822
Updated cmake
Im-Rises Sep 22, 2022
5a6e8ab
Merge branch 'vector' into Particule
spiryti Sep 22, 2022
07f2f41
Merge pull request #7 from Im-Rises/Particule
spiryti Sep 22, 2022
48bdef0
Added handle events fuction
Im-Rises Sep 23, 2022
77c56af
Merge branch 'develop' of https://github.com/Im-Rises/PlysicalEngine …
Im-Rises Sep 23, 2022
a9503b6
Reorganized project
Im-Rises Sep 23, 2022
dc0f214
wip
Im-Rises Sep 23, 2022
ec7346f
Added scene
Im-Rises Sep 23, 2022
dbcb999
Correcting issue with vector
Im-Rises Sep 23, 2022
f63fbf6
Corrected gameObject displayement
Im-Rises Sep 23, 2022
899950c
wip
Im-Rises Sep 23, 2022
1a05bff
wip
Im-Rises Sep 23, 2022
cd4e4f0
Corrected Cmake file
Im-Rises Sep 23, 2022
6ce7042
wip
Im-Rises Sep 23, 2022
29aba51
Added some code
Im-Rises Sep 23, 2022
23b57b9
Added some code
Im-Rises Sep 23, 2022
8372f06
wip
Im-Rises Sep 23, 2022
b1357d1
wip
Im-Rises Sep 24, 2022
735cb33
wip
Im-Rises Sep 24, 2022
659c721
wip
Im-Rises Sep 24, 2022
4309f60
Corrected CMakeé
Im-Rises Sep 24, 2022
dd8f0cf
wip
Im-Rises Sep 24, 2022
c0a3273
wip
Im-Rises Sep 24, 2022
210075f
Updated readme
Im-Rises Sep 24, 2022
3f7e13c
Updated readme
Im-Rises Sep 24, 2022
ced8bb9
Merge pull request #8 from Im-Rises/opengl
Im-Rises Sep 24, 2022
0ba6c1c
wip
Im-Rises Sep 24, 2022
55620ed
Merge branch 'opengl' into develop
Im-Rises Sep 24, 2022
8d385fa
Added deo cube
Im-Rises Sep 24, 2022
c807441
wip
Im-Rises Sep 24, 2022
6895672
Corrected simultaneous display
Im-Rises Sep 24, 2022
ae971ea
wip
Im-Rises Sep 24, 2022
4c0b3c6
wip
Im-Rises Sep 24, 2022
ad798e2
wip
Im-Rises Sep 24, 2022
e902f6b
wip
Im-Rises Sep 24, 2022
2508627
Merge pull request #9 from Im-Rises/opengl
Im-Rises Sep 24, 2022
be5547c
Test Suplémentaire
spiryti Sep 25, 2022
558ebb5
wip
Im-Rises Sep 25, 2022
7e8546d
Everything working
Im-Rises Sep 25, 2022
95ea9db
wip
Im-Rises Sep 25, 2022
9e713c4
wip
Im-Rises Sep 25, 2022
9f7abf7
Corrected include bug
Im-Rises Sep 25, 2022
9053f92
Wip
Im-Rises Sep 25, 2022
0670f46
wip
Im-Rises Sep 25, 2022
e8c1943
Merge pull request #10 from Im-Rises/inputHandler
spiryti Sep 25, 2022
eda9aea
Added integrator
Im-Rises Sep 25, 2022
ecc7e0d
Corrected linux
Im-Rises Sep 25, 2022
250b524
Corrected linux 2
Im-Rises Sep 25, 2022
e2a00ee
Corrected linux 3
Im-Rises Sep 25, 2022
55475a2
Corrected tests
Im-Rises Sep 25, 2022
20bf32b
Merge pull request #11 from Im-Rises/inputHandler
Im-Rises Sep 25, 2022
1cb2b05
Corrected translation
Im-Rises Sep 25, 2022
092aa9a
Updated controls
Im-Rises Sep 25, 2022
ef13cf8
Merge pull request #12 from Im-Rises/develop
Im-Rises Sep 25, 2022
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
3 changes: 2 additions & 1 deletion .editorconfig
Original file line number Diff line number Diff line change
Expand Up @@ -6,4 +6,5 @@ root = true
# Unix-style newlines with a newline ending every file
[*]
end_of_line = lf
insert_final_newline = true
insert_final_newline = true
charset = utf-8
4 changes: 2 additions & 2 deletions .gitattributes
Original file line number Diff line number Diff line change
@@ -1,3 +1,3 @@
* text=auto eol=lf
PhysicalEngine/imgui/** linguist-vendored
PhysicalEngine/glfw/** linguist-vendored
dependencies/** linguist-vendored

3 changes: 3 additions & 0 deletions .github/labeler.yml
Original file line number Diff line number Diff line change
Expand Up @@ -15,3 +15,6 @@ src:

main:
- 'PhysicalEngine/main.*'

test:
- 'test/**/*.{cpp,hpp}'
5 changes: 2 additions & 3 deletions .github/workflows/cmake.yml
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@ jobs:

- name: Install libs
run: |
sudo apt-get install xorg-dev libglu1-mesa-dev
sudo apt-get install libglfw3-dev

- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
Expand Down Expand Up @@ -63,8 +63,7 @@ jobs:

- name: Install libs
run: |
echo "No libs to install"
# brew install sfml|
brew install glfw

- name: Configure CMake
# Configure CMake in a 'build' subdirectory. `CMAKE_BUILD_TYPE` is only required if you are using a single-configuration generator such as make.
Expand Down
149 changes: 149 additions & 0 deletions .github/workflows/cpp-cmake-publish.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,149 @@
name: Cpp Cmake Publish

on:
push:
branches: [ main ]

permissions:
contents: write

env:
BUILD_TYPE: Release

jobs:
build-windows:
name: Build windows
runs-on: windows-latest
steps:
- uses: actions/checkout@v3
- name: Configure CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
- name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
- name: Copy exe to root
run: |
cp ./build/PhysicalEngine/Release/PhysicalEngine.exe .
- name: Upload artifact release
uses: actions/upload-artifact@v2
with:
name: artifact-windows
path: |
./PhysicalEngine.exe
build-ubuntu:
name: Build ubuntu
runs-on: ubuntu-latest
steps:
- uses: actions/checkout@v3
- name: Install libs
run: |
sudo apt-get install libsfml-dev
sudo apt install xorg-dev
- name: Configure CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
- name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
- name: Copy exe to root
run: cp ./build/PhysicalEngine/PhysicalEngine ./PhysicalEngineLauncher
- name: Upload artifact release
uses: actions/upload-artifact@v2
with:
name: artifact-ubuntu
path: |
./PhysicalEngineLauncher
build-macos:
name: Build macos
runs-on: macos-latest
steps:
- uses: actions/checkout@v3
- name: Install libs
run: brew install sfml
- name: Configure CMake
run: cmake -B ${{github.workspace}}/build -DCMAKE_BUILD_TYPE=${{env.BUILD_TYPE}}
- name: Build
run: cmake --build ${{github.workspace}}/build --config ${{env.BUILD_TYPE}}
- name: Copy exe to root
run: cp ./build/PhysicalEngine/PhysicalEngine ./PhysicalEngineLauncher
- name: Upload artifact release
uses: actions/upload-artifact@v2
with:
name: artifact-macos
path: |
./PhysicalEngineLauncher
release-project:
name: Release project
runs-on: ubuntu-latest
needs: [ build-windows, build-ubuntu, build-macos ]
steps:
- name: Download windows artifact content
uses: actions/download-artifact@v2
with:
name: artifact-windows
- name: View content
run: ls -R
- name: Create GitHub release
id: create-new-release
uses: actions/create-release@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
tag_name: ${{ github.run_number }}
release_name: Release ${{ github.run_number }}
- name: Archive windows release
uses: thedoctor0/zip-release@master
with:
filename: release-windows.zip
- name: Upload release asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create-new-release.outputs.upload_url }}
asset_path: release-windows.zip
asset_name: PhysicalEngine-windows-v${{ github.run_number }}.zip
asset_content_type: application/zip
- name: Delete windows release files
run: |
rm release-windows.zip
rm PhysicalEngine.exe
- name: Download ubuntu artifact content
uses: actions/download-artifact@v2
with:
name: artifact-ubuntu
- name: View content
run: ls -R
- name: Archive ubuntu release
uses: thedoctor0/zip-release@master
with:
filename: release-linux.tar.gz
- name: Upload release asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create-new-release.outputs.upload_url }}
asset_path: release-linux.tar.gz
asset_name: PhysicalEngine-linux-v${{ github.run_number }}.tar.gz
asset_content_type: application/zip
- name: Delete ubuntu release files
run: |
rm release-linux.tar.gz
rm PhysicalEngineLauncher
- name: Download macos artifact content
uses: actions/download-artifact@v2
with:
name: artifact-macos
- name: View content
run: ls -R
- name: Archive macos release
uses: thedoctor0/zip-release@master
with:
filename: release-macos.tar.gz
- name: Upload release asset
uses: actions/upload-release-asset@v1
env:
GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
with:
upload_url: ${{ steps.create-new-release.outputs.upload_url }}
asset_path: release-macos.tar.gz
asset_name: PhysicalEngine-macos-v${{ github.run_number }}.tar.gz
asset_content_type: application/zip
148 changes: 50 additions & 98 deletions CMakePresets.json
Original file line number Diff line number Diff line change
@@ -1,101 +1,53 @@
{
"version": 3,
"configurePresets": [
{
"name": "windows-base",
"hidden": true,
"generator": "Ninja",
"binaryDir": "${sourceDir}/out/build/${presetName}",
"installDir": "${sourceDir}/out/install/${presetName}",
"cacheVariables": {
"CMAKE_C_COMPILER": "cl.exe",
"CMAKE_CXX_COMPILER": "cl.exe"
},
"condition": {
"type": "equals",
"lhs": "${hostSystemName}",
"rhs": "Windows"
}
},
{
"name": "x64-debug",
"displayName": "x64 Debug",
"inherits": "windows-base",
"architecture": {
"value": "x64",
"strategy": "external"
},
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug"
}
},
{
"name": "x64-release",
"displayName": "x64 Release",
"inherits": "x64-debug",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release"
}
},
{
"name": "x86-debug",
"displayName": "x86 Debug",
"inherits": "windows-base",
"architecture": {
"value": "x86",
"strategy": "external"
},
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug"
}
},
{
"name": "x86-release",
"displayName": "x86 Release",
"inherits": "x86-debug",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Release"
}
},
{
"name": "linux-debug",
"displayName": "Linux Debug",
"generator": "Ninja",
"binaryDir": "${sourceDir}/out/build/${presetName}",
"installDir": "${sourceDir}/out/install/${presetName}",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug"
},
"condition": {
"type": "equals",
"lhs": "${hostSystemName}",
"rhs": "Linux"
},
"vendor": {
"microsoft.com/VisualStudioRemoteSettings/CMake/1.0": {
"sourceDir": "$env{HOME}/.vs/$ms{projectDirName}"
}
}
},
{
"name": "macos-debug",
"displayName": "macOS Debug",
"generator": "Ninja",
"binaryDir": "${sourceDir}/out/build/${presetName}",
"installDir": "${sourceDir}/out/install/${presetName}",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug"
},
"condition": {
"type": "equals",
"lhs": "${hostSystemName}",
"rhs": "Darwin"
},
"vendor": {
"microsoft.com/VisualStudioRemoteSettings/CMake/1.0": {
"sourceDir": "$env{HOME}/.vs/$ms{projectDirName}"
}
}
"version": 3,
"configurePresets": [
{
"name": "windows-base",
"hidden": true,
"generator": "Ninja",
"binaryDir": "${sourceDir}/out/build/${presetName}",
"installDir": "${sourceDir}/out/install/${presetName}",
"cacheVariables": {
"CMAKE_C_COMPILER": "cl.exe",
"CMAKE_CXX_COMPILER": "cl.exe"
},
"condition": {
"type": "equals",
"lhs": "${hostSystemName}",
"rhs": "Windows"
}
},
{
"name": "x64-debug",
"displayName": "x64 Debug",
"inherits": "windows-base",
"architecture": {
"value": "x64",
"strategy": "external"
},
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug"
}
},
{
"name": "linux-debug",
"displayName": "Linux Debug",
"generator": "Ninja",
"binaryDir": "${sourceDir}/out/build/${presetName}",
"installDir": "${sourceDir}/out/install/${presetName}",
"cacheVariables": {
"CMAKE_BUILD_TYPE": "Debug"
},
"condition": {
"type": "equals",
"lhs": "${hostSystemName}",
"rhs": "Linux"
},
"vendor": {
"microsoft.com/VisualStudioRemoteSettings/CMake/1.0": {
"sourceDir": "$env{HOME}/.vs/$ms{projectDirName}"
}
]
}
}
]
}
29 changes: 29 additions & 0 deletions CMakeSettings.json
Original file line number Diff line number Diff line change
@@ -0,0 +1,29 @@
{
"configurations": [
{
"name": "x64-Debug",
"generator": "Ninja",
"configurationType": "Debug",
"inheritEnvironments": [ "msvc_x64_x64" ],
"buildRoot": "${projectDir}\\out\\build\\${name}",
"installRoot": "${projectDir}\\out\\install\\${name}",
"cmakeCommandArgs": "",
"buildCommandArgs": "",
"ctestCommandArgs": ""
},
{
"name": "WSL-GCC-Debug",
"generator": "Ninja",
"configurationType": "Debug",
"buildRoot": "${projectDir}\\out\\build\\${name}",
"installRoot": "${projectDir}\\out\\install\\${name}",
"cmakeExecutable": "cmake",
"cmakeCommandArgs": "",
"buildCommandArgs": "",
"ctestCommandArgs": "",
"inheritEnvironments": [ "linux_x64" ],
"wslPath": "${defaultWSLPath}",
"variables": []
}
]
}
Loading