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

Drop assimp in favor of custom .X loader #68

Merged
merged 3 commits into from
Dec 4, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
5 changes: 3 additions & 2 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
Expand Up @@ -49,7 +49,7 @@ jobs:
run: |
Start-Service audio*
Invoke-WebRequest https://github.com/duncanthrax/scream/releases/download/3.6/Scream3.6.zip -OutFile C:\Scream3.6.zip
Extract-7Zip -Path C:\Scream3.6.zip -DestinationPath C:\Scream
7z x C:\Scream3.6.zip -oC:\Scream
$cert = (Get-AuthenticodeSignature C:\Scream\Install\driver\Scream.sys).SignerCertificate
$store = [System.Security.Cryptography.X509Certificates.X509Store]::new("TrustedPublisher", "LocalMachine")
$store.Open("ReadWrite")
Expand All @@ -62,7 +62,7 @@ jobs:
shell: pwsh
run: |
Invoke-WebRequest https://github.com/pal1000/mesa-dist-win/releases/download/23.0.0/mesa3d-23.0.0-release-msvc.7z -OutFile mesa3d.7z
Extract-7Zip -Path mesa3d.7z -DestinationPath mesa
7z x mesa3d.7z -omesa
cp mesa\$env:platform\*.dll _release\bin\
ls _release\bin

Expand Down Expand Up @@ -210,6 +210,7 @@ jobs:
with:
submodules: recursive
- run: ./env.sh emscripten make emscripten
- run: ./env.sh emscripten ./test/suite.sh emscripten

nx:
name: Switch
Expand Down
1 change: 1 addition & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -45,6 +45,7 @@ _release/bin/**/*.xml
_release/bin/**/*.toml
_release/bin/blitzcc
_release/bin/ide2
_release/bin/mediaview
_release/cfg/blitzide.prefs
_release/cfg/blitzide.toml
_release/help/index.html
Expand Down
3 changes: 0 additions & 3 deletions .gitmodules
Original file line number Diff line number Diff line change
Expand Up @@ -4,9 +4,6 @@
[submodule "freeimage"]
path = deps/freeimage/src
url = https://github.com/blitz3d-ng/freeimage
[submodule "assimp"]
path = deps/assimp/tree
url = https://github.com/assimp/assimp.git
[submodule "enet"]
path = deps/enet/tree
url = https://github.com/lsalzman/enet.git
Expand Down
1 change: 1 addition & 0 deletions CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -180,6 +180,7 @@ ENDIF()
IF(BB_EMSCRIPTEN)
set (BB_WEB true)
add_definitions(-DBB_WEB)
set(CMAKE_SYSTEM_PROCESSOR wasm) # defaults to x86? not sure that makes sense.
ENDIF()

IF(NOT BB_ENV)
Expand Down
7 changes: 3 additions & 4 deletions _release/mediaview/mediaview.bb
Original file line number Diff line number Diff line change
Expand Up @@ -4,8 +4,7 @@
;Create executable in 'bin'

AppTitle CommandLine$()
fil$=Lower$( CommandLine$() )

fil$=CommandLine$()
index=Instr( fil$,"." )
If index>0 ext$=Mid$( fil$,index+1 )
Select ext$
Expand All @@ -20,7 +19,7 @@ Case "wav"
Case "mp3","mid","mod","x3m","xm","it"
ShowMusic( fil$ )
Default
RuntimeError "Unknown File Extension"
RuntimeError "Unknown File Extension: "+ext
End Select

End
Expand All @@ -35,7 +34,7 @@ Function ShowModel( fil$,md2 )
model=LoadMD2( fil$ )
If model ScaleEntity model,.025,.025,.025
Else
model=LoadAnimMesh( fil$ )
model=LoadMesh( fil$ )
If model FitMesh model,-1,-1,-1,2,2,2,True
EndIf
If model=0 RuntimeError "Unable to load 3D mesh:"+fil$
Expand Down
1 change: 0 additions & 1 deletion deps/CMakeLists.txt
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,6 @@ add_subdirectory(sdl)
add_subdirectory(libpng)
add_subdirectory(freeimage)
add_subdirectory(dxsdk)
add_subdirectory(assimp)

# audio
add_subdirectory(fmod)
Expand Down
168 changes: 0 additions & 168 deletions deps/assimp/CMakeLists.txt

This file was deleted.

7 changes: 0 additions & 7 deletions deps/assimp/include/revision.h

This file was deleted.

1 change: 0 additions & 1 deletion deps/assimp/tree
Submodule tree deleted from a8673d
Loading