Skip to content

Commit b3a36f7

Browse files
nerzhulnerzhul
authoredJun 26, 2017
Isolate irrlicht references and use a singleton (#6041)
* Add Device3D class which will contain IrrlichtDevice interface move getSupportedVideoDrivers to Device3D Add Device3D singleton & use it in various places Rename Device3D to Rendering engine & add helper functions to various device pointers More singleton work RenderingEngine owns draw_load_screen move draw functions to RenderingEngine Reduce IrrlichtDevice exposure and guienvironment RenderingEngine: Expose get_timer_time() to remove device from guiEngine Make irrlichtdevice & scene manager less exposed * Code style fixes * Move porting::getVideoDriverName, getVideoDriverFriendlyName, getDisplayDensity, getDisplaySize to RenderingEngine Fix XORG_USED macro -> RenderingEngine + create_engine_device from RenderingEngine constructor directly * enum paralax => enum parallax
1 parent a8650e7 commit b3a36f7

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

50 files changed

+1568
-1567
lines changed
 

Diff for: ‎build/android/jni/Android.mk

+1-1
Original file line numberDiff line numberDiff line change
@@ -138,7 +138,6 @@ LOCAL_SRC_FILES := \
138138
jni/src/database.cpp \
139139
jni/src/debug.cpp \
140140
jni/src/defaultsettings.cpp \
141-
jni/src/drawscene.cpp \
142141
jni/src/dungeongen.cpp \
143142
jni/src/emerge.cpp \
144143
jni/src/environment.cpp \
@@ -270,6 +269,7 @@ LOCAL_SRC_FILES := \
270269
jni/src/wieldmesh.cpp \
271270
jni/src/client/clientlauncher.cpp \
272271
jni/src/client/inputhandler.cpp \
272+
jni/src/client/renderingengine.cpp \
273273
jni/src/client/tile.cpp \
274274
jni/src/client/joystick_controller.cpp \
275275
jni/src/irrlicht_changes/static_text.cpp

Diff for: ‎src/CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -500,7 +500,6 @@ set(client_SRCS
500500
content_cso.cpp
501501
content_mapblock.cpp
502502
convert_json.cpp
503-
drawscene.cpp
504503
filecache.cpp
505504
fontengine.cpp
506505
game.cpp

0 commit comments

Comments
 (0)