Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: OGRECave/ogre
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v13.5.0
Choose a base ref
...
head repository: OGRECave/ogre
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
Loading
Showing 1,067 changed files with 24,243 additions and 34,359 deletions.
2 changes: 2 additions & 0 deletions .codedocs
Original file line number Diff line number Diff line change
@@ -680,6 +680,8 @@ INPUT = OgreMain/include \
Components/RTShaderSystem/include \
Components/Terrain/include \
Components/Volume/include \
Components/Python/Numpy.py \
Components/Python/HighPy.py \
PlugIns \
PlugIns/PCZSceneManager/docs/readme.md \
PlugIns/DotScene/README.md \
50 changes: 31 additions & 19 deletions .github/workflows/ci-build.yml
Original file line number Diff line number Diff line change
@@ -7,28 +7,25 @@ on:
branches: [master]
jobs:
linux:
runs-on: ubuntu-20.04
runs-on: ubuntu-22.04
steps:
- name: Install Dependencies
run: |
sudo apt update
sudo apt install -y libxrandr-dev \
libgles2-mesa-dev mesa-common-dev libgl1-mesa-dev mesa-vulkan-drivers \
libfreetype6-dev libpugixml-dev libassimp-dev libbullet-dev qtbase5-dev \
nvidia-cg-dev glslang-dev spirv-tools spirv-headers \
libfreetype6-dev libpugixml-dev libassimp-dev libbullet-dev qtbase5-dev cargo \
nvidia-cg-dev glslang-dev spirv-tools spirv-headers libvulkan-volk-dev \
swig4.0 mono-mcs python3-dev \
python3-lxml texlive-binaries texlive-base graphviz doxygen g++-7
- uses: actions/checkout@v2
python3-lxml texlive-binaries texlive-base graphviz doxygen
- uses: actions/checkout@v4
with:
fetch-depth: 2
- name: Build
run: |
cmake -P ci-build.cmake
cmake --build build -- -j 2
cmake --build build -- -j 4
cmake --build build --target OgreDoc > /dev/null
env: # need to fix warnings on newer compilers first
CC: gcc-7
CXX: g++-7
- name: Test
run: |
# doxygen warnings check
@@ -38,21 +35,24 @@ jobs:
build/bin/Test_Ogre
# run visual tests
cd build/bin && ./TestContext -rs "OpenGL 3+ Rendering Subsystem"
./TestContext -rs "OpenGL ES 2.x Rendering Subsystem"
# verify that the python modules are loadable
cd ../lib && python -c "import _Ogre; import _RTShader"
cd ../../
# validate XMLConverter output
build/bin/OgreXMLConverter Samples/Media/models/jaiqua.mesh && build/bin/OgreXMLConverter Samples/Media/models/jaiqua.skeleton
python3 Tools/XMLConverter/docs/validate.py Samples/Media/models/jaiqua.mesh.xml
# MeshUpgrader does not crash
build/bin/OgreMeshUpgrader Samples/Media/models/jaiqua.mesh
# validate DotScene DTD
python3 PlugIns/DotScene/misc/validate.py PlugIns/DotScene/misc/example.scene
# check whitespace
git diff --check HEAD^
android:
runs-on: ubuntu-20.04
steps:
- uses: actions/checkout@v2
- uses: actions/cache@v2
- uses: actions/checkout@v4
- uses: actions/cache@v4
with:
path: android-ndk-r21e
key: ${{ runner.os }}-android-ndk
@@ -61,28 +61,28 @@ jobs:
- name: Build
run: |
cmake -P ci-build.cmake
cmake --build build -- -j 2
cmake --build build -- -j 4
env:
ANDROID: true
- name: zip SDK
id: package
run: |
[[ $GITHUB_REF = refs/tags/* ]] && VERNAME=${GITHUB_REF##*/} || VERNAME="master"
echo "::set-output name=ver::${VERNAME}"
echo "ver=${VERNAME}" >> $GITHUB_OUTPUT
cd build/OgreJNI && zip -qr ogre-sdk-android-${VERNAME}-arm64-v8a.zip *
- name: upload artifact
run: |
test ! -n "$CLOUDSMITH_API_KEY" && exit 0
pip3 install --upgrade cloudsmith-cli
pip3 install --upgrade cloudsmith-cli==1.0.0
~/.local/bin/cloudsmith push raw ogrecave/ogre build/OgreJNI/ogre-sdk-android-*-arm64-v8a.zip --republish --version ${{ steps.package.outputs.ver }} -k $CLOUDSMITH_API_KEY
env:
CLOUDSMITH_API_KEY: ${{ secrets.CLOUDSMITH_API_KEY }}
macos:
runs-on: macos-11
runs-on: macos-13
steps:
- name: Install Dependencies
run: brew update && brew install sdl2 pugixml
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Build
run: |
cmake -P ci-build.cmake
@@ -92,13 +92,25 @@ jobs:
- name: Test
run: build/bin/Debug/Test_Ogre.app/Contents/MacOS/Test_Ogre --gtest_filter=-UseCustomCapabilitiesTests*
ios:
runs-on: macos-11
runs-on: macos-13
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Build
run: |
cmake -P ci-build.cmake
set -o pipefail && cmake --build build | xcpretty
env:
IOS: true

custombuild:
runs-on: ubuntu-20.04
steps:
- name: Install Dependencies
run: |
sudo apt update
sudo apt install -y libwayland-dev libwayland-egl1 pkg-config libegl-dev \
qtwayland5 qtbase5-private-dev
- uses: actions/checkout@v4
- name: Build
run: |
cmake -Bbuild -DOGRE_BUILD_DEPENDENCIES=OFF -DSWIG_EXECUTABLE=none -DOGRE_CONFIG_DOUBLE=ON -DOGRE_ASSERT_MODE=1 -DOGRE_PROFILING=ON -DOGRE_USE_WAYLAND=ON .
cmake --build build -- -j 4
49 changes: 31 additions & 18 deletions .github/workflows/pip-build.yml
Original file line number Diff line number Diff line change
@@ -8,51 +8,64 @@ env:
jobs:
linux:
runs-on: ubuntu-20.04
strategy:
matrix:
pyver: [cp310-cp310, cp312-cp312]
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- name: Docker Image
run: docker build SDK -t pypi
- name: Build
run: |
docker run -e PYVER=cp310-cp310 --rm -v `pwd`:/workspace pypi
docker run -e PYVER=${{ matrix.pyver }} -e SKBUILD_BUILD_OPTIONS=-j4 --rm -v `pwd`:/workspace pypi
f=`ls *.whl`
mv $f ${f/linux/manylinux2014}
mv $f ${f/linux/manylinux_2_28}
pip3 install twine
python -m twine upload --repository pypi *.whl
windows:
runs-on: windows-2019
strategy:
matrix:
pyver: ['3.10', '3.12']
steps:
- uses: actions/checkout@v2
- uses: actions/checkout@v4
- uses: ilammy/msvc-dev-cmd@v1
with:
toolset: 14.1
- uses: actions/setup-python@v3
- uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: ${{ matrix.pyver }}
# see https://github.com/actions/runner-images/issues/6627#issuecomment-1328214957
- name: Remove Perl Strawberry (Workaround)
run: rm -rf C:/Strawberry/
shell: bash
- name: Install Dependencies
run: |
choco install swig -y # need swig 4+ for python 3.8
curl -LO https://sdk.lunarg.com/sdk/download/1.3.224.1/windows/VulkanSDK-1.3.224.1-Installer.exe
.\VulkanSDK-1.3.224.1-Installer.exe --accept-licenses --default-answer --confirm-command install
curl -LO https://sdk.lunarg.com/sdk/download/1.3.275.0/windows/VulkanSDK-1.3.275.0-Installer.exe
.\VulkanSDK-1.3.275.0-Installer.exe --accept-licenses --default-answer --confirm-command install
- name: Build
run: |
python -m pip install --upgrade pip==22.0.4
python -m pip install --upgrade pip==24.0
pip install setuptools wheel twine
pip wheel . --verbose
python -m twine upload --repository pypi *.whl
env:
VULKAN_SDK: C:\VulkanSDK\1.3.224.1
VULKAN_SDK: C:\VulkanSDK\1.3.275.0
SKBUILD_BUILD_OPTIONS: -j4
macos:
runs-on: macos-11
runs-on: macos-13
strategy:
matrix:
pyver: ['3.10', '3.12']
steps:
- name: Install Dependencies
run: brew update && brew install swig
- uses: actions/checkout@v2
- uses: actions/setup-python@v3
- uses: actions/checkout@v4
- uses: actions/setup-python@v5
with:
python-version: '3.10'
python-version: ${{ matrix.pyver }}
- name: Build
run: |
pip install setuptools wheel twine
pip wheel . --verbose
python -m twine upload --repository pypi *.whl
python -m twine upload --repository pypi *.whl
env:
SKBUILD_BUILD_OPTIONS: -j3
6 changes: 5 additions & 1 deletion .gitignore
Original file line number Diff line number Diff line change
@@ -1,7 +1,9 @@
# Ignore CLion project directory and iml files
.idea/
*.iml

*.obj
*.ipch
*.pch
# Ignore build directories
cmake-build-*/
/build/
@@ -10,6 +12,8 @@ cmake-build-*/
/embuild/
/eminstall/
/mingw/
/.cache/
/_skbuild/

# Meta data of macOS's Finder.app
.DS_Store
Loading