Skip to content

Commit

Permalink
Drop assimp in favor of custom .X loader
Browse files Browse the repository at this point in the history
  • Loading branch information
kfprimm committed Dec 4, 2023
1 parent 93c3673 commit d46b198
Show file tree
Hide file tree
Showing 20 changed files with 1,101 additions and 272 deletions.
1 change: 1 addition & 0 deletions .github/workflows/ci.yml
Original file line number Diff line number Diff line change
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

0 comments on commit d46b198

Please sign in to comment.