Skip to content
Permalink
Browse files

Move client-specific files to 'src/client' (#7902)

Update Android.mk
Remove 'src/client' from include_directories
  • Loading branch information...
Unarelith authored and SmallJoker committed Nov 28, 2018
1 parent ddd9317 commit 5f1cd555cd9d1c64426e173b30b5b792d211c835
Showing with 186 additions and 115 deletions.
  1. +2 −0 .gitignore
  2. +25 −25 build/android/jni/Android.mk
  3. +4 −31 src/CMakeLists.txt
  4. +28 −3 src/client/CMakeLists.txt
  5. 0 src/{ → client}/camera.cpp
  6. 0 src/{ → client}/camera.h
  7. 0 src/{ → client}/client.cpp
  8. 0 src/{ → client}/client.h
  9. 0 src/{ → client}/clientenvironment.cpp
  10. 0 src/{ → client}/clientenvironment.h
  11. 0 src/{ → client}/clientmap.cpp
  12. 0 src/{ → client}/clientmap.h
  13. 0 src/{ → client}/clientmedia.cpp
  14. 0 src/{ → client}/clientmedia.h
  15. 0 src/{ → client}/clientobject.cpp
  16. 0 src/{ → client}/clientobject.h
  17. 0 src/{ → client}/clouds.cpp
  18. 0 src/{ → client}/clouds.h
  19. 0 src/{ → client}/content_cao.cpp
  20. 0 src/{ → client}/content_cao.h
  21. 0 src/{ → client}/content_cso.cpp
  22. 0 src/{ → client}/content_cso.h
  23. 0 src/{ → client}/content_mapblock.cpp
  24. 0 src/{ → client}/content_mapblock.h
  25. 0 src/{ → client}/filecache.cpp
  26. 0 src/{ → client}/filecache.h
  27. 0 src/{ → client}/fontengine.cpp
  28. 0 src/{ → client}/fontengine.h
  29. 0 src/{ → client}/game.cpp
  30. 0 src/{ → client}/game.h
  31. 0 src/{ → client}/guiscalingfilter.cpp
  32. 0 src/{ → client}/guiscalingfilter.h
  33. 0 src/{ → client}/imagefilters.cpp
  34. 0 src/{ → client}/imagefilters.h
  35. 0 src/{ → client}/keycode.cpp
  36. 0 src/{ → client}/keycode.h
  37. 0 src/{ → client}/localplayer.cpp
  38. 0 src/{ → client}/localplayer.h
  39. 0 src/{ → client}/mapblock_mesh.cpp
  40. 0 src/{ → client}/mapblock_mesh.h
  41. 0 src/{ → client}/mesh.cpp
  42. 0 src/{ → client}/mesh.h
  43. 0 src/{ → client}/mesh_generator_thread.cpp
  44. 0 src/{ → client}/mesh_generator_thread.h
  45. +1 −1 src/client/meshgen/collector.cpp
  46. 0 src/{ → client}/minimap.cpp
  47. 0 src/{ → client}/minimap.h
  48. 0 src/{ → client}/particles.cpp
  49. 0 src/{ → client}/particles.h
  50. +5 −5 src/client/render/core.cpp
  51. +2 −2 src/client/render/interlaced.cpp
  52. +1 −1 src/client/render/stereo.cpp
  53. 0 src/{ → client}/shader.cpp
  54. 0 src/{ → client}/shader.h
  55. 0 src/{ → client}/sky.cpp
  56. 0 src/{ → client}/sky.h
  57. 0 src/{ → client}/wieldmesh.cpp
  58. 0 src/{ → client}/wieldmesh.h
  59. +1 −1 src/collision.cpp
  60. +3 −3 src/gui/guiChatConsole.cpp
  61. +1 −1 src/gui/guiConfirmRegistration.cpp
  62. +3 −3 src/gui/guiEngine.cpp
  63. +6 −6 src/gui/guiFormSpecMenu.cpp
  64. +1 −1 src/gui/guiKeyChangeMenu.h
  65. +1 −1 src/gui/guiPasswordChange.cpp
  66. +1 −1 src/gui/guiTable.cpp
  67. +4 −4 src/itemdef.cpp
  68. +1 −1 src/main.cpp
  69. +1 −1 src/mapblock.cpp
  70. +1 −1 src/network/clientopcodes.h
  71. +3 −3 src/network/clientpackethandler.cpp
  72. +3 −3 src/nodedef.cpp
  73. +1 −1 src/script/cpp_api/s_base.cpp
  74. +1 −1 src/script/cpp_api/s_client.cpp
  75. +1 −1 src/script/cpp_api/s_security.cpp
  76. +3 −3 src/script/lua_api/l_camera.cpp
  77. +2 −2 src/script/lua_api/l_client.cpp
  78. +1 −1 src/script/lua_api/l_env.cpp
  79. +1 −1 src/script/lua_api/l_localplayer.cpp
  80. +2 −2 src/script/lua_api/l_minimap.cpp
  81. +1 −1 src/script/lua_api/l_particles.cpp
  82. +2 −2 src/script/lua_api/l_particles_local.cpp
  83. +1 −1 src/script/scripting_client.cpp
  84. +1 −1 src/unittest/test_keycode.cpp
  85. +71 −0 util/travis/clang-format-whitelist.txt
@@ -56,6 +56,7 @@ debug.txt

## Other files generated by minetest
screenshot_*.png
testbm.txt

## Doxygen files
doc/Doxyfile
@@ -95,6 +96,7 @@ cmake-build-release/
cmake_config.h
cmake_config_githash.h
CMakeDoxy*
compile_commands.json

## Android build files
build/android/src/main/assets
@@ -113,20 +113,20 @@ LOCAL_C_INCLUDES := \

LOCAL_SRC_FILES := \
jni/src/ban.cpp \
jni/src/camera.cpp \
jni/src/client/camera.cpp \
jni/src/mapgen/cavegen.cpp \
jni/src/chat.cpp \
jni/src/client.cpp \
jni/src/clientenvironment.cpp \
jni/src/client/client.cpp \
jni/src/client/clientenvironment.cpp \
jni/src/clientiface.cpp \
jni/src/clientmap.cpp \
jni/src/clientmedia.cpp \
jni/src/clientobject.cpp \
jni/src/clouds.cpp \
jni/src/client/clientmap.cpp \
jni/src/client/clientmedia.cpp \
jni/src/client/clientobject.cpp \
jni/src/client/clouds.cpp \
jni/src/collision.cpp \
jni/src/content_cao.cpp \
jni/src/content_cso.cpp \
jni/src/content_mapblock.cpp \
jni/src/client/content_cao.cpp \
jni/src/client/content_cso.cpp \
jni/src/client/content_mapblock.cpp \
jni/src/content_mapnode.cpp \
jni/src/content_nodemeta.cpp \
jni/src/content_sao.cpp \
@@ -147,10 +147,10 @@ LOCAL_SRC_FILES := \
jni/src/emerge.cpp \
jni/src/environment.cpp \
jni/src/face_position_cache.cpp \
jni/src/filecache.cpp \
jni/src/client/filecache.cpp \
jni/src/filesys.cpp \
jni/src/fontengine.cpp \
jni/src/game.cpp \
jni/src/client/fontengine.cpp \
jni/src/client/game.cpp \
jni/src/genericobject.cpp \
jni/src/gettext.cpp \
jni/src/gui/guiChatConsole.cpp \
@@ -162,28 +162,28 @@ LOCAL_SRC_FILES := \
jni/src/gui/guiKeyChangeMenu.cpp \
jni/src/gui/guiPasswordChange.cpp \
jni/src/gui/guiTable.cpp \
jni/src/guiscalingfilter.cpp \
jni/src/client/guiscalingfilter.cpp \
jni/src/gui/guiVolumeChange.cpp \
jni/src/gui/intlGUIEditBox.cpp \
jni/src/gui/modalMenu.cpp \
jni/src/gui/profilergraph.cpp \
jni/src/gui/touchscreengui.cpp \
jni/src/httpfetch.cpp \
jni/src/hud.cpp \
jni/src/imagefilters.cpp \
jni/src/client/imagefilters.cpp \
jni/src/inventory.cpp \
jni/src/inventorymanager.cpp \
jni/src/itemdef.cpp \
jni/src/itemstackmetadata.cpp \
jni/src/keycode.cpp \
jni/src/client/keycode.cpp \
jni/src/light.cpp \
jni/src/localplayer.cpp \
jni/src/client/localplayer.cpp \
jni/src/log.cpp \
jni/src/main.cpp \
jni/src/map.cpp \
jni/src/map_settings_manager.cpp \
jni/src/mapblock.cpp \
jni/src/mapblock_mesh.cpp \
jni/src/client/mapblock_mesh.cpp \
jni/src/mapgen/mapgen.cpp \
jni/src/mapgen/mapgen_carpathian.cpp \
jni/src/mapgen/mapgen_flat.cpp \
@@ -195,14 +195,14 @@ LOCAL_SRC_FILES := \
jni/src/mapgen/mapgen_valleys.cpp \
jni/src/mapnode.cpp \
jni/src/mapsector.cpp \
jni/src/mesh.cpp \
jni/src/mesh_generator_thread.cpp \
jni/src/client/mesh.cpp \
jni/src/client/mesh_generator_thread.cpp \
jni/src/metadata.cpp \
jni/src/mapgen/mg_biome.cpp \
jni/src/mapgen/mg_decoration.cpp \
jni/src/mapgen/mg_ore.cpp \
jni/src/mapgen/mg_schematic.cpp \
jni/src/minimap.cpp \
jni/src/client/minimap.cpp \
jni/src/modchannels.cpp \
jni/src/nameidmapping.cpp \
jni/src/nodedef.cpp \
@@ -211,7 +211,7 @@ LOCAL_SRC_FILES := \
jni/src/noise.cpp \
jni/src/objdef.cpp \
jni/src/object_properties.cpp \
jni/src/particles.cpp \
jni/src/client/particles.cpp \
jni/src/pathfinder.cpp \
jni/src/player.cpp \
jni/src/porting_android.cpp \
@@ -229,8 +229,8 @@ LOCAL_SRC_FILES := \
jni/src/serverenvironment.cpp \
jni/src/serverlist.cpp \
jni/src/serverobject.cpp \
jni/src/shader.cpp \
jni/src/sky.cpp \
jni/src/client/shader.cpp \
jni/src/client/sky.cpp \
jni/src/staticobject.cpp \
jni/src/tileanimation.cpp \
jni/src/translation.cpp \
@@ -275,7 +275,7 @@ LOCAL_SRC_FILES := \
jni/src/unittest/test_voxelalgorithms.cpp \
jni/src/unittest/test_voxelmanipulator.cpp \
jni/src/settings.cpp \
jni/src/wieldmesh.cpp \
jni/src/client/wieldmesh.cpp \
jni/src/client/meshgen/collector.cpp \
jni/src/client/clientlauncher.cpp \
jni/src/client/gameui.cpp \
@@ -397,12 +397,14 @@ set(common_SRCS
genericobject.cpp
gettext.cpp
httpfetch.cpp
hud.cpp
inventory.cpp
inventorymanager.cpp
itemdef.cpp
itemstackmetadata.cpp
light.cpp
log.cpp
main.cpp
map.cpp
map_settings_manager.cpp
mapblock.cpp
@@ -482,34 +484,6 @@ set(client_SRCS
${gui_SRCS}
${client_network_SRCS}
${client_irrlicht_changes_SRCS}
camera.cpp
client.cpp
clientenvironment.cpp
clientmap.cpp
clientmedia.cpp
clientobject.cpp
clouds.cpp
content_cao.cpp
content_cso.cpp
content_mapblock.cpp
convert_json.cpp
filecache.cpp
fontengine.cpp
game.cpp
guiscalingfilter.cpp
hud.cpp
imagefilters.cpp
keycode.cpp
localplayer.cpp
main.cpp
mapblock_mesh.cpp
mesh.cpp
mesh_generator_thread.cpp
minimap.cpp
particles.cpp
shader.cpp
sky.cpp
wieldmesh.cpp
${client_SCRIPT_SRCS}
${UNITTEST_CLIENT_SRCS}
)
@@ -518,7 +492,6 @@ list(SORT client_SRCS)
# Server sources
set(server_SRCS
${common_SRCS}
main.cpp
)
list(SORT server_SRCS)

@@ -829,10 +802,10 @@ if(BUILD_CLIENT)
endif()

if(USE_FREETYPE)
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../fonts" DESTINATION "${SHAREDIR}"
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../fonts" DESTINATION "${SHAREDIR}"
FILES_MATCHING PATTERN "*.ttf" PATTERN "*.txt")
else()
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../fonts" DESTINATION "${SHAREDIR}"
install(DIRECTORY "${CMAKE_CURRENT_SOURCE_DIR}/../fonts" DESTINATION "${SHAREDIR}"
FILES_MATCHING PATTERN "*.png" PATTERN "*.xml")
endif()

@@ -25,12 +25,37 @@ set(client_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/render/plain.cpp
${CMAKE_CURRENT_SOURCE_DIR}/render/sidebyside.cpp
${CMAKE_CURRENT_SOURCE_DIR}/render/stereo.cpp
${CMAKE_CURRENT_SOURCE_DIR}/renderingengine.cpp
${CMAKE_CURRENT_SOURCE_DIR}/camera.cpp
${CMAKE_CURRENT_SOURCE_DIR}/client.cpp
${CMAKE_CURRENT_SOURCE_DIR}/clientenvironment.cpp
${CMAKE_CURRENT_SOURCE_DIR}/clientlauncher.cpp
${CMAKE_CURRENT_SOURCE_DIR}/clientmap.cpp
${CMAKE_CURRENT_SOURCE_DIR}/clientmedia.cpp
${CMAKE_CURRENT_SOURCE_DIR}/clientobject.cpp
${CMAKE_CURRENT_SOURCE_DIR}/clouds.cpp
${CMAKE_CURRENT_SOURCE_DIR}/content_cao.cpp
${CMAKE_CURRENT_SOURCE_DIR}/content_cso.cpp
${CMAKE_CURRENT_SOURCE_DIR}/content_mapblock.cpp
${CMAKE_CURRENT_SOURCE_DIR}/filecache.cpp
${CMAKE_CURRENT_SOURCE_DIR}/fontengine.cpp
${CMAKE_CURRENT_SOURCE_DIR}/game.cpp
${CMAKE_CURRENT_SOURCE_DIR}/gameui.cpp
${CMAKE_CURRENT_SOURCE_DIR}/guiscalingfilter.cpp
${CMAKE_CURRENT_SOURCE_DIR}/hud.cpp
${CMAKE_CURRENT_SOURCE_DIR}/imagefilters.cpp
${CMAKE_CURRENT_SOURCE_DIR}/inputhandler.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tile.cpp
${CMAKE_CURRENT_SOURCE_DIR}/joystick_controller.cpp
${CMAKE_CURRENT_SOURCE_DIR}/hud.cpp
${CMAKE_CURRENT_SOURCE_DIR}/keycode.cpp
${CMAKE_CURRENT_SOURCE_DIR}/localplayer.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mapblock_mesh.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mesh.cpp
${CMAKE_CURRENT_SOURCE_DIR}/mesh_generator_thread.cpp
${CMAKE_CURRENT_SOURCE_DIR}/minimap.cpp
${CMAKE_CURRENT_SOURCE_DIR}/particles.cpp
${CMAKE_CURRENT_SOURCE_DIR}/renderingengine.cpp
${CMAKE_CURRENT_SOURCE_DIR}/shader.cpp
${CMAKE_CURRENT_SOURCE_DIR}/sky.cpp
${CMAKE_CURRENT_SOURCE_DIR}/tile.cpp
${CMAKE_CURRENT_SOURCE_DIR}/wieldmesh.cpp
PARENT_SCOPE
)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -20,7 +20,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "collector.h"
#include <stdexcept>
#include "log.h"
#include "mesh.h"
#include "client/mesh.h"

void MeshCollector::append(const TileSpec &tile, const video::S3DVertex *vertices,
u32 numVertices, const u16 *indices, u32 numIndices)
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -19,11 +19,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
*/

#include "core.h"
#include "camera.h"
#include "client.h"
#include "clientmap.h"
#include "hud.h"
#include "minimap.h"
#include "client/camera.h"
#include "client/client.h"
#include "client/clientmap.h"
#include "client/hud.h"
#include "client/minimap.h"

RenderingCore::RenderingCore(IrrlichtDevice *_device, Client *_client, Hud *_hud)
: device(_device), driver(device->getVideoDriver()), smgr(device->getSceneManager()),
@@ -19,8 +19,8 @@ with this program; if not, write to the Free Software Foundation, Inc.,
*/

#include "interlaced.h"
#include "client.h"
#include "shader.h"
#include "client/client.h"
#include "client/shader.h"
#include "client/tile.h"

RenderingCoreInterlaced::RenderingCoreInterlaced(
@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
*/

#include "stereo.h"
#include "camera.h"
#include "client/camera.h"
#include "constants.h"
#include "settings.h"

File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
File renamed without changes.
@@ -24,7 +24,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "nodedef.h"
#include "gamedef.h"
#ifndef SERVER
#include "clientenvironment.h"
#include "client/clientenvironment.h"
#endif
#include "serverenvironment.h"
#include "serverobject.h"
@@ -19,14 +19,14 @@ with this program; if not, write to the Free Software Foundation, Inc.,

#include "guiChatConsole.h"
#include "chat.h"
#include "client.h"
#include "client/client.h"
#include "debug.h"
#include "gettime.h"
#include "keycode.h"
#include "client/keycode.h"
#include "settings.h"
#include "porting.h"
#include "client/tile.h"
#include "fontengine.h"
#include "client/fontengine.h"
#include "log.h"
#include "gettext.h"
#include <string>
@@ -19,7 +19,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
*/

#include "guiConfirmRegistration.h"
#include "client.h"
#include "client/client.h"
#include <IGUICheckBox.h>
#include <IGUIButton.h>
#include <IGUIStaticText.h>
@@ -32,11 +32,11 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "guiMainMenu.h"
#include "sound.h"
#include "client/sound_openal.h"
#include "clouds.h"
#include "client/clouds.h"
#include "httpfetch.h"
#include "log.h"
#include "fontengine.h"
#include "guiscalingfilter.h"
#include "client/fontengine.h"
#include "client/guiscalingfilter.h"
#include "irrlicht_changes/static_text.h"

#ifdef __ANDROID__
@@ -27,7 +27,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "guiTable.h"
#include "constants.h"
#include "gamedef.h"
#include "keycode.h"
#include "client/keycode.h"
#include "util/strfnd.h"
#include <IGUICheckBox.h>
#include <IGUIEditBox.h>
@@ -47,13 +47,13 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "mainmenumanager.h"
#include "porting.h"
#include "settings.h"
#include "client.h"
#include "fontengine.h"
#include "client/client.h"
#include "client/fontengine.h"
#include "util/hex.h"
#include "util/numeric.h"
#include "util/string.h" // for parseColorString()
#include "irrlicht_changes/static_text.h"
#include "guiscalingfilter.h"
#include "client/guiscalingfilter.h"
#include "guiEditBoxWithScrollbar.h"
#include "intlGUIEditBox.h"

@@ -673,10 +673,10 @@ void GUIFormSpecMenu::parseBackground(parserData* data, const std::string &eleme
pos.Y = stoi(v_pos[1]); //acts as offset
clip = true;
}

if (!data->explicit_size && !clip)
warningstream << "invalid use of unclipped background without a size[] element" << std::endl;

m_backgrounds.emplace_back(name, pos, geom, clip);

return;
@@ -24,7 +24,7 @@
#include "irrlichttypes_extrabloated.h"
#include "modalMenu.h"
#include "gettext.h"
#include "keycode.h"
#include "client/keycode.h"
#include <string>
#include <vector>

0 comments on commit 5f1cd55

Please sign in to comment.
You can’t perform that action at this time.