commit 3fa5f24bfe933c47c897eba8d460a005dba00f11 Author: Sergey Lapin Date: Wed Jul 9 13:55:13 2025 +0300 Initial commit diff --git a/.gitmodules b/.gitmodules new file mode 100644 index 0000000..2117128 --- /dev/null +++ b/.gitmodules @@ -0,0 +1,64 @@ +[submodule "SDL"] + path = SDL + url = https://github.com/libsdl-org/SDL + branch = release-2.32.8 +[submodule "SPIRV-Cross"] + path = SPIRV-Cross + url = https://github.com/KhronosGroup/SPIRV-Cross +[submodule "SPIRV-Headers"] + path = SPIRV-Headers + url = https://github.com/KhronosGroup/SPIRV-Headers +[submodule "SPIRV-Tools"] + path = SPIRV-Tools + url = https://github.com/KhronosGroup/SPIRV-tools +[submodule "assimp"] + path = assimp + url = https://github.com/assimp/assimp +[submodule "blender2ogre"] + path = blender2ogre + url = https://github.com/OGRECave/blender2ogre + branch = master +[submodule "glslang"] + path = glslang + url = https://github.com/KhronosGroup/glslang + branch = main +[submodule "ogitor"] + path = ogitor + url = https://github.com/OGRECave/ogitor + branch = master +[submodule "ogre"] + path = ogre + url = https://github.com/OGRECave/ogre + branch = master +[submodule "ogre-meshviewer"] + path = ogre-meshviewer + url = https://github.com/OGRECave/ogre-meshviewer + branch = master +[submodule "ogre-pagedgeometry"] + path = ogre-pagedgeometry + url = https://github.com/OGRECave/ogre-pagedgeometry + branch = master +[submodule "ogre-procedural"] + path = ogre-procedural + url = https://github.com/OGRECave/ogre-procedural + branch = master +[submodule "ogre-projects/world2"] + path = ogre-projects/world2 + url = ssh://git@git.slapin.net:4022/slapin/ogre-prototype.git + branch = master +[submodule "ogrewater"] + path = ogrewater + url = https://github.com/OGRECave/ogrewater + branch = master +[submodule "zlib"] + path = zlib + url = https://github.com/madler/zlib + branch = develop +[submodule "ogre-audiovideo"] + path = ogre-audiovideo + url = https://github.com/OGRECave/ogre-audiovideo + branch = master +[submodule "OgreCrowd"] + path = OgreCrowd + url = https://github.com/OGRECave/OgreCrowd + branch = master diff --git a/OgreCrowd b/OgreCrowd new file mode 160000 index 0000000..fe5ab22 --- /dev/null +++ b/OgreCrowd @@ -0,0 +1 @@ +Subproject commit fe5ab2211dbfe807d2120255d98e8af8d38561e7 diff --git a/SDL b/SDL new file mode 160000 index 0000000..98d1f3a --- /dev/null +++ b/SDL @@ -0,0 +1 @@ +Subproject commit 98d1f3a45aae568ccd6ed5fec179330f47d4d356 diff --git a/SPIRV-Cross b/SPIRV-Cross new file mode 160000 index 0000000..d8e3e2b --- /dev/null +++ b/SPIRV-Cross @@ -0,0 +1 @@ +Subproject commit d8e3e2b141b8c8a167b2e3984736a6baacff316c diff --git a/SPIRV-Headers b/SPIRV-Headers new file mode 160000 index 0000000..c8ad050 --- /dev/null +++ b/SPIRV-Headers @@ -0,0 +1 @@ +Subproject commit c8ad050fcb29e42a2f57d9f59e97488f465c436d diff --git a/SPIRV-Tools b/SPIRV-Tools new file mode 160000 index 0000000..54fc952 --- /dev/null +++ b/SPIRV-Tools @@ -0,0 +1 @@ +Subproject commit 54fc95232ced45f39348c091f6f95545588e350a diff --git a/assimp b/assimp new file mode 160000 index 0000000..db0bde7 --- /dev/null +++ b/assimp @@ -0,0 +1 @@ +Subproject commit db0bde758e5043546cb2f45126c5693d2d9550f3 diff --git a/blender2ogre b/blender2ogre new file mode 160000 index 0000000..ef1d926 --- /dev/null +++ b/blender2ogre @@ -0,0 +1 @@ +Subproject commit ef1d9263b49277f9e9107104ce4cde851d588880 diff --git a/build-ogre.sh b/build-ogre.sh new file mode 100755 index 0000000..459b0fe --- /dev/null +++ b/build-ogre.sh @@ -0,0 +1,212 @@ +#!/bin/sh +OGRE_INSTALL_PATH=$(pwd)/ogre-sdk +QT_PATH=/usr/lib/qt +# -DQt5_ROOT=/Path/To/QtInstallationFolder/5.12.5 +set -e +#rm -Rf ogre/build +#mkdir -p ogre/build +#cd ogre/build +#cmake .. -DCMAKE_BUILD_TYPE=Debug -DOGRE_BUILD_RENDERSYSTEM_VULKAN:BOOL=TRUE -DOGRE_STATIC:BOOL=TRUE -DBUILD_SHARED_LIBS=ON -DCMAKE_INSTALL_PREFIX=${OGRE_INSTALL_PATH} +#make -j8 +#make install +#cd ../.. +#rm -Rf assimp/build +#mkdir -p assimp/build +#cd assimp/build +#cmake .. -DCMAKE_INSTALL_PREFIX=${OGRE_INSTALL_PATH} -DCMAKE_PREFIX_PATH=${OGRE_INSTALL_PATH} -DASSIMP_BUILD_ASSIMP_TOOLS=ON -DBUILD_SHARED_LIBS=OFF +#make -j8 +#make install +#cd ../.. + +build_cmake_stuff() { + set -e + NOINSTALL=false + BSTATIC=false + BCLEAN=false + BDEBUG=false + BRELEASE=false + EXTRA_FLAGS="" + BTYPE="" + INSTALL_PATH=${OGRE_INSTALL_PATH} + + while true; do + case $1 in + noinstall) + shift + NOINSTALL=true + ;; + static) + shift + BSTATIC=true + ;; + clean) + shift + BCLEAN=true + ;; + debug) + shift + BDEBUG=true + ;; + release) + shift + BRELEASE=true + ;; + --) + shift + break + ;; + *) + break + ;; + esac + done + if [ x$BDEBUG = xtrue -a x$BRELEASE = xtrue ]; then + BTYPE="-DCMAKE_BUILD_TYPE=RelWidthDebInfo" + elif [ x$BDEBUG = xtrue ]; then + BTYPE="-DCMAKE_BUILD_TYPE=Debug" + elif [ x$BRELEASE = xtrue ]; then + BTYPE="-DCMAKE_BUILD_TYPE=Release" + fi + BUILD_DIR=$1/build + if [ x$BSTATIC = xtrue ]; then + BUILD_DIR=$1/build-static + EXTRA_FLAGS="-DBUILD_SHARED_LIBS=OFF ${EXTRA_FLAGS}" + INSTALL_PATH=${OGRE_INSTALL_PATH}-static + fi + if [ x$1 = xogre ]; then + EXTRA_FLAGS="-DASSIMP_BUILD_ASSIMP_TOOLS=ON ${EXTRA_FLAGS}" + if [ x$BSTATIC = xtrue ]; then + EXTRA_FLAGS="-DOGRE_STATIC=TRUE ${EXTRA_FLAGS}" + fi + elif [ "$1" = "SPIRV-Tools" ]; then + EXTRA_FLAGS="-DSPIRV-Headers_SOURCE_DIR=${INSTALL_PATH} ${EXTRA_FLAGS}" + fi + MDIR=$(pwd) + if [ x$BCLEAN = xtrue ]; then + rm -Rf ${BUILD_DIR} + fi + mkdir -p ${BUILD_DIR} + cd ${BUILD_DIR} + export PKG_CONFIG_PATH=${INSTALL_PATH}/lib/pkgconfig + DISPLAY= cmake .. ${BTYPE} -DCMAKE_PREFIX_PATH=${INSTALL_PATH} -DCMAKE_INSTALL_PREFIX=${INSTALL_PATH} -DCMAKE_MODULE_DIR=${INSTALL_PATH} ${EXTRA_FLAGS} $2 + DISPLAY= make VERBOSE=1 -j10 + if [ x$NOINSTALL = xfalse ]; then + DISPLAY= make install + fi + cd $MDIR +} + +rm -Rf assimp/build assimp/build-static +rm -Rf ogre/build ogre/build-static ogre-sdk ogre-sdk-static +rm -Rf ogre-procedural/build ogre-procedural/build-static +rm -Rf ogre-projects/world2/build ogre-projects/world2/build-static +#(cd bzip2-1.0.8 && make all && make install PREFIX=${OGRE_INSTALL_PATH}) +#(cd bzip2-1.0.8 && make all && make install PREFIX=${OGRE_INSTALL_PATH}-static) +build_cmake_stuff clean debug release SDL "-DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DSDL_SHARED=OFF -DSDL_STATIC=ON -DSDL_STATIC_PIC=ON -DSDL_X11=ON \ + -DSDL_X11_SHARED=OFF -DSDL_X11_XCURSOR=ON -DSDL_X11_XDBE=ON \ + -DSDL_X11_XINPUT=ON -DSDL_X11_XRANDR=ON -DSDL_X11_XSCRNSAVER=ON -DSDL_X11_XSHAPE=ON -DSDL_WAYLAND=ON \ + -DSDL_WAYLAND_SHARED=OFF -DSDL_WAYLAND_LIBDECOR=ON -DSDL_WAYLAND_LIBDECOR_SHARED=OFF -DSDL_KMSDRM=ON -DSDL_KMSDRM_SHARED=OFF -DSDL_OPENGL=ON \ + -DSDL_OPENGLES=ON -DSDL_VULKAN=ON-DSDL_ALSA=ON -DSDL_ALSA_SHARED=OFF -DSDL_PIPEWIRE=ON -DSDL_PIPEWIRE_SHARED=OFF \ + -DSDL_PULSEAUDIO=ON -DSDL_PULSEAUDIO_SHARED=OFF -DSDL_RPATH=OFF -DSDL_HIDAPI=ON -DSDL_HIDAPI_JOYSTICK=ON" +build_cmake_stuff clean debug release static SDL "-DCMAKE_BUILD_TYPE=RelWithDebInfo \ + -DSDL_SHARED=OFF -DSDL_STATIC=ON -DSDL_X11=ON \ + -DSDL_X11_SHARED=OFF -DSDL_X11_XCURSOR=ON -DSDL_X11_XDBE=ON \ + -DSDL_X11_XINPUT=ON -DSDL_X11_XRANDR=ON -DSDL_X11_XSCRNSAVER=ON -DSDL_X11_XSHAPE=ON -DSDL_WAYLAND=ON \ + -DSDL_WAYLAND_SHARED=OFF -DSDL_WAYLAND_LIBDECOR=ON -DSDL_WAYLAND_LIBDECOR_SHARED=OFF -DSDL_KMSDRM=ON -DSDL_KMSDRM_SHARED=OFF -DSDL_OPENGL=ON \ + -DSDL_OPENGLES=ON -DSDL_VULKAN=ON-DSDL_ALSA=ON -DSDL_ALSA_SHARED=OFF -DSDL_PIPEWIRE=ON -DSDL_PIPEWIRE_SHARED=OFF \ + -DSDL_PULSEAUDIO=ON -DSDL_PULSEAUDIO_SHARED=OFF -DSDL_RPATH=OFF -DSDL_HIDAPI=ON -DSDL_HIDAPI_JOYSTICK=ON" +build_cmake_stuff clean debug release zlib "-DZLIB_BUILD_STATIC=OFF -DZLIB_BUILD_SHARED=ON -DZLIB_BUILD_MINIZIP=OFF" +build_cmake_stuff clean debug release static zlib "-DZLIB_BUILD_STATIC=ON -DZLIB_BUILD_SHARED=OFF -DZLIB_BUILD_MINIZIP=OFF" +build_cmake_stuff clean debug release zlib "-DZLIB_BUILD_STATIC=OFF -DZLIB_BUILD_SHARED=ON -DZLIB_BUILD_MINIZIP=ON -DMINIZIP_BUILD_SHARED=ON -DMINIZIP_BUILD_STATIC=OFF -DMINIZIP_ENABLE_BZIP2=OFF" +build_cmake_stuff clean debug release static zlib "-DZLIB_BUILD_STATIC=ON -DZLIB_BUILD_SHARED=OFF -DZLIB_BUILD_MINIZIP=ON -DMINIZIP_BUILD_SHARED=OFF -DMINIZIP_BUILD_STATIC=ON -DMINIZIP_ENABLE_BZIP2=OFF" +build_cmake_stuff debug release assimp "-DASSIMP_BUILD_ZLIB=ON -DBUILD_SHARED_LIBS=OFF" +build_cmake_stuff debug release static assimp "-DASSIMP_BUILD_ZLIB=ON -DBUILD_SHARED_LIBS=OFF" +build_cmake_stuff release SPIRV-Headers "" +build_cmake_stuff release SPIRV-Tools "-DBUILD_SHARED_LIBS=OFF -DSPIRV_TOOLS_BUILD_STATIC=ON -DSPIRV_TOOLS_LIBRARY_TYPE=STATIC" +build_cmake_stuff release noinstall glslang "-DBUILD_SHARED_LIBS=OFF -DENABLE_HLSL=TRUE -DENABLE_SPIRV=TRUE" +build_cmake_stuff release noinstall static glslang "-DBUILD_SHARED_LIBS=OFF -DENABLE_HLSL=TRUE -DENABLE_SPIRV=TRUE" +install -m 755 -d ogre-sdk/bin +install -m 755 -d ogre-sdk-static/bin +install -m 755 -c glslang/build/StandAlone/glslangValidator ogre-sdk/bin/ +install -m 755 -c glslang/build-static/StandAlone/glslangValidator ogre-sdk-static/bin/ +build_cmake_stuff debug release SPIRV-Cross "-DBUILD_SHARED_LIBS=OFF" +build_cmake_stuff debug release static SPIRV-Cross "-DBUILD_SHARED_LIBS=OFF" +build_cmake_stuff ogre "-DOGRE_GLSUPPORT_USE_EGL:BOOL=FALSE -DOGRE_BUILD_RENDERSYSTEM_VULKAN:BOOL=TRUE -DOGRE_INSTALL_DEPENDENCIES:BOOL=TRUE" +build_cmake_stuff static ogre "-DOGRE_GLSUPPORT_USE_EGL:BOOL=FALSE -DOGRE_BUILD_RENDERSYSTEM_VULKAN:BOOL=TRUE -DOGRE_INSTALL_DEPENDENCIES:BOOL=TRUE" +build_cmake_stuff debug release ogre-procedural "-DOgreProcedural_BUILD_DOCS:BOOL=FALSE" +build_cmake_stuff debug release static ogre-procedural "-DOgreProcedural_BUILD_DOCS:BOOL=FALSE -DOgreProcedural_STATIC=TRUE -DOgreProcedural_BUILD_SAMPLES=FALSE" +build_cmake_stuff debug release noinstall clean ogrewater "" +build_cmake_stuff debug release noinstall clean static ogrewater "" +build_cmake_stuff debug noinstall clean ogre-projects/world2 "" +build_cmake_stuff debug noinstall clean static ogre-projects/world2 "-DOGRE_DYNAMIC=OFF" +exit 0 + +#rm -Rf ogre/build +mkdir -p ogre/build +cd ogre/build +#cmake .. -DCMAKE_BUILD_TYPE=Debug -DOGRE_BUILD_RENDERSYSTEM_VULKAN:BOOL=TRUE -DCMAKE_INSTALL_PREFIX=${OGRE_INSTALL_PATH} +cmake .. -DOGRE_GLSUPPORT_USE_EGL:BOOL=FALSE -DOGRE_BUILD_RENDERSYSTEM_VULKAN:BOOL=TRUE -DOGRE_INSTALL_DEPENDENCIES:BOOL=TRUE -DCMAKE_INSTALL_PREFIX=${OGRE_INSTALL_PATH} +make -j8 + make install +#cd ../.. + +#rm -Rf ogre-pagedgeometry/build +#mkdir -p ogre-pagedgeometry/build +#cd ogre-pagedgeometry/build +#cmake .. -DCMAKE_PREFIX_PATH=${OGRE_INSTALL_PATH} -DCMAKE_INSTALL_PREFIX=${OGRE_INSTALL_PATH} +#make -j8 +#make install + +#exit +cd ../.. +#rm -Rf ${OGRE_INSTALL_PATH}/include/bullet +#cp -a ogre/build/Dependencies/include/bullet ${OGRE_INSTALL_PATH}/include/bullet + +#rm -Rf mygui/build +#mkdir -p mygui/build +#cd mygui/build +#cmake .. -DMYGUI_STATIC=TRUE -DMYGUI_RENDER_SYSTEM=3 -DCMAKE_INSTALL_PREFIX=${OGRE_INSTALL_PATH} -DCMAKE_PREFIX_PATH=${OGRE_INSTALL_PATH} +#make -j8 +#cd ../.. + +#rm -Rf ogitor/build +#mkdir -p ogitor/build +#cd ogitor/build +##cmake .. -DCMAKE_BUILD_TYPE=Debug -DBUILD_SHARED_LIBS=OFF -DCMAKE_INSTALL_PREFIX=${OGRE_INSTALL_PATH} # -DOGITOR_DIST:BOOL=TRUE +#cmake .. -DBUILD_SHARED_LIBS=OFF -DOGRE_DIR=${OGRE_INSTALL_PATH} -DCMAKE_PREFIX_PATH=${OGRE_INSTALL_PATH} -DCMAKE_INSTALL_PREFIX=${OGRE_INSTALL_PATH} #-DCMAKE_POLICY_VERSION_MINIMUM=3.5 # -DOGITOR_DIST:BOOL=TRUE +#make -j8 +#make install +#cd ../.. +#mkdir -p ogre-caelum/build +#cd ogre-caelum/build +#cmake .. -DCMAKE_PREFIX_PATH=${OGRE_INSTALL_PATH} -DCMAKE_INSTALL_PREFIX=${OGRE_INSTALL_PATH} -DCAELUM_BUILD_SAMPLES=TRUE #-DCMAKE_POLICY_VERSION_MINIMUM=3.5 # -DOGITOR_DIST:BOOL=TRUE +#make -j8 +#make install +#cd ../.. + +build_cmake_stuff ogre-procedural "-DOgreProcedural_BUILD_DOCS:BOOL=FALSE" + +mkdir -p ogrewater/build +cd ogrewater/build +cmake .. -DBUILD_SHARED_LIBS=ON -DOGRE_DIR=${OGRE_INSTALL_PATH} -DCMAKE_INSTALL_PREFIX=${OGRE_INSTALL_PATH} #-DCMAKE_POLICY_VERSION_MINIMUM=3.5 # -DOGITOR_DIST:BOOL=TRUE +make -j8 +#make install +cd ../.. + +#build_cmake_stuff ogre-projects/world2 "-DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=${OGRE_INSTALL_PATH}" + +rm -Rf ogre-projects/world2/build +mkdir -p ogre-projects/world2/build +cd ogre-projects/world2/build +#cmake .. -DCMAKE_BUILD_TYPE=Debug -DOGRE_DIR=${OGRE_INSTALL_PATH} -DOGRE_STATIC:BOOL=TRUE -DCMAKE_PREFIX_PATH=${OGRE_INSTALL_PATH} #-DCMAKE_INSTALL_PREFIX=${OGRE_INSTALL_PATH} # -DOGITOR_DIST:BOOL=TRUE +#cmake .. -DOGRE_DIR=${OGRE_INSTALL_PATH} -DOGRE_STATIC:BOOL=TRUE -DCMAKE_PREFIX_PATH=${OGRE_INSTALL_PATH} #-DCMAKE_INSTALL_PREFIX=${OGRE_INSTALL_PATH} # -DOGITOR_DIST:BOOL=TRUE +cmake .. -DCMAKE_BUILD_TYPE=Debug -DCMAKE_PREFIX_PATH=${OGRE_INSTALL_PATH} #-DCMAKE_INSTALL_PREFIX=${OGRE_INSTALL_PATH} # -DOGITOR_DIST:BOOL=TRUE +make -j8 +#make install +#rm -f ../characters/female/vroid-normal-female.scene characters/male/vroid-normal-male.scene + +#rm -Rf ../characters/female ../characters/male ../characters/shapes +#make import_vrm + + diff --git a/glslang b/glslang new file mode 160000 index 0000000..2e24222 --- /dev/null +++ b/glslang @@ -0,0 +1 @@ +Subproject commit 2e24222cd9d19e737f8c790a2f485d5ba0d62166 diff --git a/ogitor b/ogitor new file mode 160000 index 0000000..1bdc495 --- /dev/null +++ b/ogitor @@ -0,0 +1 @@ +Subproject commit 1bdc4955350a7dfd4a0441a1e01fd41fba47f47a diff --git a/ogre b/ogre new file mode 160000 index 0000000..9e10100 --- /dev/null +++ b/ogre @@ -0,0 +1 @@ +Subproject commit 9e1010058df0096453809828580e8d7151b9b800 diff --git a/ogre-audiovideo b/ogre-audiovideo new file mode 160000 index 0000000..2d37345 --- /dev/null +++ b/ogre-audiovideo @@ -0,0 +1 @@ +Subproject commit 2d373450b5c63849eeacfa1fefc9d101b52fd447 diff --git a/ogre-meshviewer b/ogre-meshviewer new file mode 160000 index 0000000..6e31318 --- /dev/null +++ b/ogre-meshviewer @@ -0,0 +1 @@ +Subproject commit 6e31318a14086115f563183f8923ceb3d16b2293 diff --git a/ogre-pagedgeometry b/ogre-pagedgeometry new file mode 160000 index 0000000..5776681 --- /dev/null +++ b/ogre-pagedgeometry @@ -0,0 +1 @@ +Subproject commit 5776681bb56b63e9d2012c9eb0885608968b2d44 diff --git a/ogre-procedural b/ogre-procedural new file mode 160000 index 0000000..4ca681b --- /dev/null +++ b/ogre-procedural @@ -0,0 +1 @@ +Subproject commit 4ca681bf88de5c05b863555cf0a34cd0c44ad794 diff --git a/ogre-projects/world2 b/ogre-projects/world2 new file mode 160000 index 0000000..cb42299 --- /dev/null +++ b/ogre-projects/world2 @@ -0,0 +1 @@ +Subproject commit cb4229905d18dc625a8e2cc9193567eb60e59056 diff --git a/ogrewater b/ogrewater new file mode 160000 index 0000000..6630c4a --- /dev/null +++ b/ogrewater @@ -0,0 +1 @@ +Subproject commit 6630c4a1902f0fb0e1d33b26f329dd98cd229623 diff --git a/zlib b/zlib new file mode 160000 index 0000000..5a82f71 --- /dev/null +++ b/zlib @@ -0,0 +1 @@ +Subproject commit 5a82f71ed1dfc0bec044d9702463dbdf84ea3b71