Wuzzy
/
BlockColor-Engine
1
1
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Merge upstream 

Conflicts:
	builtin/mainmenu/tab_simple_main.lua
	src/client/clientlauncher.cpp
	src/game.cpp
	src/guiEngine.cpp
This commit is contained in:
OttoLidenbrock 2015-04-29 19:59:54 +10:00
parent bab9301162 b6475f5448
commit d649afa044
50 changed files with 4044 additions and 3061 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@ -44,6 +44,7 @@ src/script/common/CMakeFiles/*
src/script/cpp_api/CMakeFiles/*
src/script/lua_api/CMakeFiles/*
src/util/CMakeFiles/*
src/unittest/CMakeFiles/*
src/jthread/CMakeFiles/*
src/jthread/Makefile
src/jthread/cmake_config.h
@ -68,7 +69,10 @@ CPackSourceConfig.cmake
Makefile
cmake_install.cmake
locale/
.directory
.kdev4/
*.cbp
*.kdev4
*.layout
*.o

14
CMakeLists.txt
View File

@ -6,8 +6,8 @@ if(${CMAKE_VERSION} STREQUAL "2.8.2")
endif()
# This can be read from ${PROJECT_NAME} after project() is called
project(Minetest)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
project(minetest)
set(PROJECT_NAME_CAPITALIZED "Minetest")
# Also remember to set PROTOCOL_VERSION in network/networkprotocol.h when releasing
@ -65,11 +65,11 @@ if(WIN32)
set(EXAMPLE_CONF_DIR ".")
set(LOCALEDIR "locale")
elseif(APPLE)
set(BUNDLE_NAME ${PROJECT_NAME_LOWER}.app)
set(BUNDLE_NAME ${PROJECT_NAME}.app)
set(BUNDLE_PATH "${BUNDLE_NAME}")
set(BINDIR ${BUNDLE_NAME}/Contents/MacOS)
set(SHAREDIR ${BUNDLE_NAME}/Contents/Resources)
set(DOCDIR "${SHAREDIR}/${PROJECT_NAME_LOWER}")
set(DOCDIR "${SHAREDIR}/${PROJECT_NAME}")
set(EXAMPLE_CONF_DIR ${DOCDIR})
set(LOCALEDIR "${SHAREDIR}/locale")
elseif(UNIX) # Linux, BSD etc
@ -84,15 +84,15 @@ elseif(UNIX) # Linux, BSD etc
set(ICONDIR "unix/icons")
set(LOCALEDIR "locale")
else()
set(SHAREDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME_LOWER}")
set(SHAREDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}")
set(BINDIR "${CMAKE_INSTALL_PREFIX}/bin")
set(DOCDIR "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME_LOWER}")
set(DOCDIR "${CMAKE_INSTALL_PREFIX}/share/doc/${PROJECT_NAME}")
set(MANDIR "${CMAKE_INSTALL_PREFIX}/share/man")
set(EXAMPLE_CONF_DIR ${DOCDIR})
set(XDG_APPS_DIR "${CMAKE_INSTALL_PREFIX}/share/applications")
set(APPDATADIR "${CMAKE_INSTALL_PREFIX}/share/appdata")
set(ICONDIR "${CMAKE_INSTALL_PREFIX}/share/icons")
set(LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME_LOWER}/locale")
set(LOCALEDIR "${CMAKE_INSTALL_PREFIX}/share/${PROJECT_NAME}/locale")
endif()
endif()

17
build/android/jni/Android.mk
View File

@ -198,7 +198,6 @@ LOCAL_SRC_FILES := \
jni/src/sound_openal.cpp \
jni/src/staticobject.cpp \
jni/src/subgame.cpp \
jni/src/test.cpp \
jni/src/tool.cpp \
jni/src/treegen.cpp \
jni/src/version.cpp \
@ -212,6 +211,22 @@ LOCAL_SRC_FILES := \
jni/src/util/sha1.cpp \
jni/src/util/string.cpp \
jni/src/util/timetaker.cpp \
jni/src/unittest/test.cpp \
jni/src/unittest/test_collision.cpp \
jni/src/unittest/test_compression.cpp \
jni/src/unittest/test_connection.cpp \
jni/src/unittest/test_filepath.cpp \
jni/src/unittest/test_inventory.cpp \
jni/src/unittest/test_mapnode.cpp \
jni/src/unittest/test_nodedef.cpp \
jni/src/unittest/test_noise.cpp \
jni/src/unittest/test_profiler.cpp \
jni/src/unittest/test_serialization.cpp \
jni/src/unittest/test_settings.cpp \
jni/src/unittest/test_socket.cpp \
jni/src/unittest/test_utilities.cpp \
jni/src/unittest/test_voxelalgorithms.cpp \
jni/src/unittest/test_voxelmanipulator.cpp \
jni/src/touchscreengui.cpp \
jni/src/database-leveldb.cpp \
jni/src/settings.cpp \

4
builtin/game/register.lua
View File

@ -398,7 +398,9 @@ local function make_registration_wrap(reg_fn_name, clear_fn_name)
local orig_clear_fn = core[clear_fn_name]
core[clear_fn_name] = function()
list = {}
for k in pairs(list) do
list[k] = nil
end
return orig_clear_fn()
end

15
builtin/mainmenu/tab_simple_main.lua
View File

@ -69,16 +69,14 @@ local function get_formspec(tabview, name, tabdata)
-- separator
retval = retval ..
"box[-0.3,3.75;12.4,0.1;#FFFFFF]"
"box[-0.28,3.75;12.4,0.1;#FFFFFF]"
-- checkboxes
retval = retval ..
"checkbox[1.0,3.9;cb_creative;".. fgettext("Creative Mode") .. ";" ..
"checkbox[8.0,3.9;cb_creative;".. fgettext("Creative Mode") .. ";" ..
dump(core.setting_getbool("creative_mode")) .. "]"..
"checkbox[5.0,3.9;cb_damage;".. fgettext("Enable Damage") .. ";" ..
dump(core.setting_getbool("enable_damage")) .. "]" ..
"checkbox[8,3.9;cb_fly_mode;".. fgettext("Fly mode") .. ";" ..
dump(core.setting_getbool("free_move")) .. "]"
"checkbox[8.0,4.4;cb_damage;".. fgettext("Enable Damage") .. ";" ..
dump(core.setting_getbool("enable_damage")) .. "]"
-- buttons
retval = retval ..
"image_button[2.0,4.5;6,1.5;"..minetest.formspec_escape(mm_texture.basetexturedir).."menu_button.png;btn_start_singleplayer;" .. fgettext("Start Singleplayer") .. "]" ..
@ -138,11 +136,6 @@ local function main_button_handler(tabview, fields, name, tabdata)
return true
end
if fields["cb_fly_mode"] then
core.setting_set("free_move", fields["cb_fly_mode"])
return true
end
if fields["btn_mp_connect"] ~= nil or
fields["key_enter"] ~= nil then

1
misc/minetest.desktop
View File

@ -5,6 +5,7 @@ Comment=Multiplayer infinite-world block sandbox
Comment[de]=Mehrspieler-Sandkastenspiel mit unendlichen Blockwelten
Comment[es]=Juego sandbox multijugador con mundos infinitos
Comment[fr]=Jeu multijoueurs de type bac à sable avec des mondes infinis
Comment[ru]=Игра-песочница с безграничным миром, состоящим из блоков
Comment[tr]=Tek-Çok oyuncuyla küplerden sonsuz dünyalar inşa et
Exec=minetest
Icon=minetest-icon

8
misc/winresource.rc
View File

@ -37,15 +37,15 @@ BEGIN
BLOCK "040904b0"
BEGIN
VALUE "Comments", ""
VALUE "CompanyName", PROJECT_NAME " community"
VALUE "FileDescription", PROJECT_NAME " engine main executable"
VALUE "CompanyName", PROJECT_NAME_C " community"
VALUE "FileDescription", PROJECT_NAME_C " engine"
VALUE "FileVersion", VERSION_STRING
VALUE "InternalName", PROJECT_NAME
VALUE "LegalCopyright", "(c) 2014 celeron55"
VALUE "LegalCopyright", "(c) 2011-2015 celeron55"
VALUE "LegalTrademarks", """Minetest"" is the property of the Minetest community, don't use it without permission!"
VALUE "OriginalFilename", "minetest.exe"
VALUE "PrivateBuild", VERSION_EXTRA
VALUE "ProductName", PROJECT_NAME
VALUE "ProductName", PROJECT_NAME_C
VALUE "ProductVersion", PRODUCT_VERSION_STRING
VALUE "SpecialBuild", BUILDMODE
END

116
po/zh_CN/minetest.po
View File

@ -8,8 +8,8 @@ msgstr ""
"Project-Id-Version: minetest\n"
"Report-Msgid-Bugs-To: \n"
"POT-Creation-Date: 2014-12-13 15:24+0100\n"
"PO-Revision-Date: 2013-11-25 10:04+0200\n"
"Last-Translator: Shen Zheyu <arsdragonfly@gmail.com>\n"
"PO-Revision-Date: 2015-04-19 02:00+0800\n"
"Last-Translator: Ang Weijie <fishyWET@hotmail.com>\n"
"Language-Team: LANGUAGE <LL@li.org>\n"
"Language: zh_CN\n"
"MIME-Version: 1.0\n"
@ -20,7 +20,7 @@ msgstr ""
#: builtin/fstk/ui.lua:67
msgid "Ok"
msgstr "OK"
msgstr "确定"
#: builtin/mainmenu/dlg_config_world.lua:26
msgid "World:"
@ -94,19 +94,19 @@ msgstr "创建"
#: builtin/mainmenu/dlg_create_world.lua:68
msgid "You have no subgames installed."
msgstr ""
msgstr "你没有安装任何游戏"
#: builtin/mainmenu/dlg_create_world.lua:69
msgid "Download one from minetest.net"
msgstr ""
msgstr "从minetest.net下载一个"
#: builtin/mainmenu/dlg_create_world.lua:72
msgid "Warning: The minimal development test is meant for developers."
msgstr ""
msgstr "警告: 甚微发展测试只是为了开发人员"
#: builtin/mainmenu/dlg_create_world.lua:73
msgid "Download a subgame, such as minetest_game, from minetest.net"
msgstr ""
msgstr "从minetest.net下载一个游戏，例如:minetest_game"
#: builtin/mainmenu/dlg_create_world.lua:97
msgid "A world named \"$1\" already exists"
@ -181,33 +181,33 @@ msgstr "安装MOD：找不到$1的真正MOD名"
#: builtin/mainmenu/store.lua:88
msgid "Unsorted"
msgstr ""
msgstr "未分类"
#: builtin/mainmenu/store.lua:99 builtin/mainmenu/store.lua:584
msgid "Search"
msgstr ""
msgstr "搜索"
#: builtin/mainmenu/store.lua:125
#, fuzzy
msgid "Downloading"
msgstr "下载"
msgstr "下载中"
#: builtin/mainmenu/store.lua:127
msgid "please wait..."
msgstr ""
msgstr "请稍候..."
#: builtin/mainmenu/store.lua:159
msgid "Successfully installed:"
msgstr ""
msgstr "成功的安装："
#: builtin/mainmenu/store.lua:163
#, fuzzy
msgid "Shortname:"
msgstr "世界名称"
msgstr "短名称"
#: builtin/mainmenu/store.lua:167 src/guiFormSpecMenu.cpp:2866
msgid "ok"
msgstr ""
msgstr "确定"
#: builtin/mainmenu/store.lua:476
msgid "Rating"
@ -223,7 +223,7 @@ msgstr "安装"
#: builtin/mainmenu/store.lua:522
msgid "Close store"
msgstr ""
msgstr "关闭店"
#: builtin/mainmenu/store.lua:530
msgid "Page $1 of $2"
@ -231,19 +231,19 @@ msgstr "第$1页,共$2页"
#: builtin/mainmenu/tab_credits.lua:22
msgid "Credits"
msgstr "关于"
msgstr "归功"
#: builtin/mainmenu/tab_credits.lua:29
msgid "Core Developers"
msgstr "核心开发人员"
msgstr "内部开发人员"
#: builtin/mainmenu/tab_credits.lua:43
msgid "Active Contributors"
msgstr "活跃的贡献者"
msgstr "积极贡献者"
#: builtin/mainmenu/tab_credits.lua:48
msgid "Previous Contributors"
msgstr "以往的贡献者"
msgstr "前贡献者"
#: builtin/mainmenu/tab_mods.lua:30
msgid "Installed Mods:"
@ -251,27 +251,27 @@ msgstr "已安装的MOD："
#: builtin/mainmenu/tab_mods.lua:39
msgid "Online mod repository"
msgstr "在线mod库"
msgstr "网上MOD库"
#: builtin/mainmenu/tab_mods.lua:78
msgid "No mod description available"
msgstr "无可用mod信息"
msgstr "无MOD资料可得"
#: builtin/mainmenu/tab_mods.lua:82
msgid "Mod information:"
msgstr "mod信息："
msgstr "MOD资料："
#: builtin/mainmenu/tab_mods.lua:93
msgid "Rename"
msgstr "重命名"
msgstr "改名"
#: builtin/mainmenu/tab_mods.lua:95
msgid "Uninstall selected modpack"
msgstr "删除选定mod包"
msgstr "删除选中的MOD包"
#: builtin/mainmenu/tab_mods.lua:106
msgid "Uninstall selected mod"
msgstr "删除选中MOD"
msgstr "删除选中的MOD"
#: builtin/mainmenu/tab_mods.lua:121
msgid "Select Mod File:"
@ -333,7 +333,7 @@ msgstr "创造模式"
#: builtin/mainmenu/tab_server.lua:33 builtin/mainmenu/tab_simple_main.lua:65
#: builtin/mainmenu/tab_singleplayer.lua:92
msgid "Enable Damage"
msgstr "开启伤害"
msgstr "开启伤害风险"
#: builtin/mainmenu/tab_server.lua:35
msgid "Public"
@ -341,11 +341,11 @@ msgstr "公共服务器"
#: builtin/mainmenu/tab_server.lua:45
msgid "Bind Address"
msgstr ""
msgstr "绑定地址"
#: builtin/mainmenu/tab_server.lua:47
msgid "Port"
msgstr ""
msgstr "端口"
#: builtin/mainmenu/tab_server.lua:51
msgid "Server Port"
@ -357,11 +357,11 @@ msgstr "服务器"
#: builtin/mainmenu/tab_settings.lua:23
msgid "Are you sure to reset your singleplayer world?"
msgstr ""
msgstr "你确定要重置您的单人世界吗？"
#: builtin/mainmenu/tab_settings.lua:27
msgid "No!!!"
msgstr ""
msgstr "不!!!"
#: builtin/mainmenu/tab_settings.lua:134
msgid "Smooth Lighting"
@ -373,12 +373,12 @@ msgstr "启用粒子效果"
#: builtin/mainmenu/tab_settings.lua:138
msgid "3D Clouds"
msgstr "3D云彩"
msgstr "三维云彩"
#: builtin/mainmenu/tab_settings.lua:140
#, fuzzy
msgid "Fancy Trees"
msgstr "更漂亮的树"
msgstr "花式树"
#: builtin/mainmenu/tab_settings.lua:142
msgid "Opaque Water"
@ -387,11 +387,11 @@ msgstr "不透明的水"
#: builtin/mainmenu/tab_settings.lua:144
#, fuzzy
msgid "Connected Glass"
msgstr "连接"
msgstr "连接的玻璃"
#: builtin/mainmenu/tab_settings.lua:149
msgid "Restart minetest for driver change to take effect"
msgstr ""
msgstr "重启minetest让驱动变化生效"
#: builtin/mainmenu/tab_settings.lua:151
msgid "Mip-Mapping"
@ -420,19 +420,19 @@ msgstr "改变键位设置"
#: builtin/mainmenu/tab_settings.lua:167
#, fuzzy
msgid "Reset singleplayer world"
msgstr "单人游戏"
msgstr "重置单人游戏"
#: builtin/mainmenu/tab_settings.lua:171
msgid "GUI scale factor"
msgstr ""
msgstr "GUI缩放因子"
#: builtin/mainmenu/tab_settings.lua:175
msgid "Scaling factor applied to menu elements: "
msgstr ""
msgstr "菜单元素应用缩放因子"
#: builtin/mainmenu/tab_settings.lua:181
msgid "Touch free target"
msgstr ""
msgstr "自由触摸目标"
#: builtin/mainmenu/tab_settings.lua:187
msgid "Touchthreshold (px)"
@ -445,7 +445,7 @@ msgstr "贴图处理"
#: builtin/mainmenu/tab_settings.lua:196 builtin/mainmenu/tab_settings.lua:209
msgid "Generate Normalmaps"
msgstr ""
msgstr "产生法线贴图"
#: builtin/mainmenu/tab_settings.lua:198 builtin/mainmenu/tab_settings.lua:210
msgid "Parallax Occlusion"
@ -453,15 +453,15 @@ msgstr ""
#: builtin/mainmenu/tab_settings.lua:200 builtin/mainmenu/tab_settings.lua:211
msgid "Waving Water"
msgstr ""
msgstr "摇动的水"
#: builtin/mainmenu/tab_settings.lua:202 builtin/mainmenu/tab_settings.lua:212
msgid "Waving Leaves"
msgstr ""
msgstr "摇动的叶子"
#: builtin/mainmenu/tab_settings.lua:204 builtin/mainmenu/tab_settings.lua:213
msgid "Waving Plants"
msgstr ""
msgstr "摇动的植物"
#: builtin/mainmenu/tab_settings.lua:255
msgid "To enable shaders the OpenGL driver needs to be used."
@ -473,7 +473,7 @@ msgstr "设置"
#: builtin/mainmenu/tab_simple_main.lua:67
msgid "Fly mode"
msgstr ""
msgstr "飞行模式"
#: builtin/mainmenu/tab_simple_main.lua:71
#, fuzzy
@ -483,7 +483,7 @@ msgstr "单人游戏"
#: builtin/mainmenu/tab_simple_main.lua:72
#, fuzzy
msgid "Config mods"
msgstr "配置"
msgstr "配置MOD"
#: builtin/mainmenu/tab_simple_main.lua:191
#, fuzzy
@ -504,7 +504,7 @@ msgstr "选择材质包："
#: builtin/mainmenu/tab_texturepacks.lua:69
msgid "No information available"
msgstr "无可用信息"
msgstr "无资料可得"
#: builtin/mainmenu/tab_texturepacks.lua:114
#, fuzzy
@ -517,7 +517,7 @@ msgstr "物品材质..."
#: src/fontengine.cpp:70 src/fontengine.cpp:226
msgid "needs_fallback_font"
msgstr "yes"
msgstr ""
#: src/game.cpp:1063
msgid "Respawn"
@ -537,11 +537,11 @@ msgstr "媒体..."
#: src/game.cpp:2267
msgid " KB/s"
msgstr ""
msgstr "千字节/秒"
#: src/game.cpp:2271
msgid " MB/s"
msgstr ""
msgstr "兆字节/秒"
#: src/game.cpp:4220
msgid ""
@ -553,11 +553,11 @@ msgstr ""
#: src/guiFormSpecMenu.cpp:2055
msgid "Proceed"
msgstr "继续游戏"
msgstr "继续"
#: src/guiFormSpecMenu.cpp:2846
msgid "Enter "
msgstr ""
msgstr "输入"
#: src/guiKeyChangeMenu.cpp:125
msgid "Keybindings. (If this menu screws up, remove stuff from minetest.conf)"
@ -569,7 +569,7 @@ msgstr "“使用” = 向下爬"
#: src/guiKeyChangeMenu.cpp:180
msgid "Double tap \"jump\" to toggle fly"
msgstr "连按两次“跳”切换飞行状态"
msgstr "连按两次“跳”切换飞行模式"
#: src/guiKeyChangeMenu.cpp:296
msgid "Key already in use"
@ -629,11 +629,11 @@ msgstr "控制台"
#: src/guiKeyChangeMenu.cpp:409
msgid "Toggle fly"
msgstr "切换飞行状态"
msgstr "切换飞行模式"
#: src/guiKeyChangeMenu.cpp:410
msgid "Toggle fast"
msgstr "切换快速移动状态"
msgstr "切换快速移动模式"
#: src/guiKeyChangeMenu.cpp:411
msgid "Toggle noclip"
@ -717,7 +717,7 @@ msgstr "大写"
#: src/keycode.cpp:226
msgid "Control"
msgstr "Ctrl"
msgstr "Ctrl键"
#: src/keycode.cpp:226
msgid "Kana"
@ -969,7 +969,7 @@ msgstr "主菜单"
#: src/main.cpp:1719
msgid "Player name too long."
msgstr ""
msgstr "玩家的名字太长了"
#: src/main.cpp:1757
msgid "Connection error (timed out?)"
@ -981,11 +981,11 @@ msgstr "没有选择世界或提供地址。未执行操作。"
#: src/main.cpp:1926
msgid "Provided world path doesn't exist: "
msgstr ""
msgstr "提供世界地址不存在"
#: src/main.cpp:1935
msgid "Could not find or load game \""
msgstr "无法找到或载入游戏模式“"
msgstr "无法找到或载入游戏模式"
#: src/main.cpp:1953
msgid "Invalid gamespec."
@ -1207,7 +1207,7 @@ msgstr "非法游戏模式规格。"
#~ msgstr "游戏"
#~ msgid "Gamemgr: Unable to copy mod \"$1\" to game \"$2\""
#~ msgstr "Gamemgr: 无法复制MOD“$1”到游戏“$2”"
#~ msgstr "游戏管理: 无法复制MOD“$1”到游戏“$2”"
#~ msgid "Game Name"
#~ msgstr "游戏名"

51
src/CMakeLists.txt
View File

@ -1,7 +1,6 @@
cmake_minimum_required(VERSION 2.6)
project(Minetest)
string(TOLOWER ${PROJECT_NAME} PROJECT_NAME_LOWER)
project(minetest)
INCLUDE(CheckIncludeFiles)
@ -278,13 +277,9 @@ add_custom_target(GenerateVersion
add_subdirectory(jthread)
add_subdirectory(network)
add_subdirectory(script)
add_subdirectory(unittest)
add_subdirectory(util)
set (unittests_SRCS
test.cpp
)
set(common_SRCS
ban.cpp
cavegen.cpp
@ -360,7 +355,7 @@ set(common_SRCS
${JTHREAD_SRCS}
${common_SCRIPT_SRCS}
${UTIL_SRCS}
${unittests_SRCS}
${UNITTEST_SRCS}
)
@ -469,10 +464,10 @@ set(EXECUTABLE_OUTPUT_PATH "${CMAKE_SOURCE_DIR}/bin")
if(BUILD_CLIENT)
add_executable(${PROJECT_NAME_LOWER} ${client_SRCS})
add_dependencies(${PROJECT_NAME_LOWER} GenerateVersion)
add_executable(${PROJECT_NAME} ${client_SRCS})
add_dependencies(${PROJECT_NAME} GenerateVersion)
set(client_LIBS
${PROJECT_NAME_LOWER}
${PROJECT_NAME}
${ZLIB_LIBRARIES}
${IRRLICHT_LIBRARY}
${OPENGL_LIBRARIES}
@ -501,37 +496,37 @@ if(BUILD_CLIENT)
endif()
if(USE_CURL)
target_link_libraries(
${PROJECT_NAME_LOWER}
${PROJECT_NAME}
${CURL_LIBRARY}
)
endif()
if(USE_FREETYPE)
if(FREETYPE_PKGCONFIG_FOUND)
set_target_properties(${PROJECT_NAME_LOWER}
set_target_properties(${PROJECT_NAME}
PROPERTIES
COMPILE_FLAGS "${FREETYPE_CFLAGS_STR}"
)
endif()
target_link_libraries(
${PROJECT_NAME_LOWER}
${PROJECT_NAME}
${FREETYPE_LIBRARY}
${CGUITTFONT_LIBRARY}
)
endif()
if (USE_LEVELDB)
target_link_libraries(${PROJECT_NAME_LOWER} ${LEVELDB_LIBRARY})
target_link_libraries(${PROJECT_NAME} ${LEVELDB_LIBRARY})
endif()
if (USE_REDIS)
target_link_libraries(${PROJECT_NAME_LOWER} ${REDIS_LIBRARY})
target_link_libraries(${PROJECT_NAME} ${REDIS_LIBRARY})
endif()
endif(BUILD_CLIENT)
if(BUILD_SERVER)
add_executable(${PROJECT_NAME_LOWER}server ${server_SRCS})
add_dependencies(${PROJECT_NAME_LOWER}server GenerateVersion)
add_executable(${PROJECT_NAME}server ${server_SRCS})
add_dependencies(${PROJECT_NAME}server GenerateVersion)
target_link_libraries(
${PROJECT_NAME_LOWER}server
${PROJECT_NAME}server
${ZLIB_LIBRARIES}
${SQLITE3_LIBRARY}
${JSON_LIBRARY}
@ -539,17 +534,17 @@ if(BUILD_SERVER)
${LUA_LIBRARY}
${PLATFORM_LIBS}
)
set_target_properties(${PROJECT_NAME_LOWER}server PROPERTIES
set_target_properties(${PROJECT_NAME}server PROPERTIES
COMPILE_DEFINITIONS "SERVER")
if (USE_LEVELDB)
target_link_libraries(${PROJECT_NAME_LOWER}server ${LEVELDB_LIBRARY})
target_link_libraries(${PROJECT_NAME}server ${LEVELDB_LIBRARY})
endif()
if (USE_REDIS)
target_link_libraries(${PROJECT_NAME_LOWER}server ${REDIS_LIBRARY})
target_link_libraries(${PROJECT_NAME}server ${REDIS_LIBRARY})
endif()
if(USE_CURL)
target_link_libraries(
${PROJECT_NAME_LOWER}server
${PROJECT_NAME}server
${CURL_LIBRARY}
)
endif()
@ -650,7 +645,7 @@ if(WIN32)
endif()
if(BUILD_CLIENT)
install(TARGETS ${PROJECT_NAME_LOWER}
install(TARGETS ${PROJECT_NAME}
RUNTIME DESTINATION ${BINDIR}
LIBRARY DESTINATION ${BINDIR}
ARCHIVE DESTINATION ${BINDIR}
@ -668,7 +663,7 @@ if(BUILD_CLIENT)
if(USE_GETTEXT)
foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
set_mo_paths(MO_BUILD_PATH MO_DEST_PATH ${LOCALE})
set(MO_BUILD_PATH "${MO_BUILD_PATH}/${PROJECT_NAME_LOWER}.mo")
set(MO_BUILD_PATH "${MO_BUILD_PATH}/${PROJECT_NAME}.mo")
install(FILES ${MO_BUILD_PATH} DESTINATION ${MO_DEST_PATH})
endforeach()
endif()
@ -689,16 +684,16 @@ if(BUILD_CLIENT)
endif(BUILD_CLIENT)
if(BUILD_SERVER)
install(TARGETS ${PROJECT_NAME_LOWER}server DESTINATION ${BINDIR})
install(TARGETS ${PROJECT_NAME}server DESTINATION ${BINDIR})
endif()
if (USE_GETTEXT)
set(MO_FILES)
foreach(LOCALE ${GETTEXT_AVAILABLE_LOCALES})
set(PO_FILE_PATH "${GETTEXT_PO_PATH}/${LOCALE}/${PROJECT_NAME_LOWER}.po")
set(PO_FILE_PATH "${GETTEXT_PO_PATH}/${LOCALE}/${PROJECT_NAME}.po")
set_mo_paths(MO_BUILD_PATH MO_DEST_PATH ${LOCALE})
set(MO_FILE_PATH "${MO_BUILD_PATH}/${PROJECT_NAME_LOWER}.mo")
set(MO_FILE_PATH "${MO_BUILD_PATH}/${PROJECT_NAME}.mo")
add_custom_command(OUTPUT ${MO_BUILD_PATH}
COMMAND ${CMAKE_COMMAND} -E make_directory ${MO_BUILD_PATH}

2
src/client/clientlauncher.cpp
View File

@ -110,7 +110,7 @@ bool ClientLauncher::run(GameParams &game_params, const Settings &cmd_args)
return false;
}
porting::setXorgClassHint(video_driver->getExposedVideoData(), PROJECT_NAME);
porting::setXorgClassHint(video_driver->getExposedVideoData(), PROJECT_NAME_C);
/*
This changes the minimum allowed number of vertices in a VBO.

36
src/client/tile.cpp
View File

@ -224,10 +224,6 @@ public:
}
}
// Apply the "clean transparent" filter, if configured.
if (g_settings->getBool("texture_clean_transparent"))
imageCleanTransparent(toadd, 127);
if (need_to_grab)
toadd->grab();
m_images[name] = toadd;
@ -676,7 +672,7 @@ video::ITexture* TextureSource::getTexture(const std::string &name, u32 *id)
video::ITexture* TextureSource::getTextureForMesh(const std::string &name, u32 *id)
{
return getTexture(name + "^[autoupscaleformesh", id);
return getTexture(name + "^[applyfiltersformesh", id);
}
void TextureSource::processQueue()
@ -1191,7 +1187,7 @@ bool TextureSource::generateImagePart(std::string part_of_name,
Adds a cracking texture
N = animation frame count, P = crack progression
*/
if (part_of_name.substr(0,6) == "[crack")
if (str_starts_with(part_of_name, "[crack"))
{
if (baseimg == NULL) {
errorstream<<"generateImagePart(): baseimg == NULL "
@ -1228,7 +1224,7 @@ bool TextureSource::generateImagePart(std::string part_of_name,
[combine:WxH:X,Y=filename:X,Y=filename2
Creates a bigger texture from an amount of smaller ones
*/
else if (part_of_name.substr(0,8) == "[combine")
else if (str_starts_with(part_of_name, "[combine"))
{
Strfnd sf(part_of_name);
sf.next(":");
@ -1272,7 +1268,7 @@ bool TextureSource::generateImagePart(std::string part_of_name,
/*
"[brighten"
*/
else if (part_of_name.substr(0,9) == "[brighten")
else if (str_starts_with(part_of_name, "[brighten"))
{
if (baseimg == NULL) {
errorstream<<"generateImagePart(): baseimg==NULL "
@ -1290,7 +1286,7 @@ bool TextureSource::generateImagePart(std::string part_of_name,
that the transparent parts don't look completely black
when simple alpha channel is used for rendering.
*/
else if (part_of_name.substr(0,8) == "[noalpha")
else if (str_starts_with(part_of_name, "[noalpha"))
{
if (baseimg == NULL){
errorstream<<"generateImagePart(): baseimg==NULL "
@ -1314,7 +1310,7 @@ bool TextureSource::generateImagePart(std::string part_of_name,
"[makealpha:R,G,B"
Convert one color to transparent.
*/
else if (part_of_name.substr(0,11) == "[makealpha:")
else if (str_starts_with(part_of_name, "[makealpha:"))
{
if (baseimg == NULL) {
errorstream<<"generateImagePart(): baseimg == NULL "
@ -1370,7 +1366,7 @@ bool TextureSource::generateImagePart(std::string part_of_name,
The resulting transform will be equivalent to one of the
eight existing ones, though (see: dihedral group).
*/
else if (part_of_name.substr(0,10) == "[transform")
else if (str_starts_with(part_of_name, "[transform"))
{
if (baseimg == NULL) {
errorstream<<"generateImagePart(): baseimg == NULL "
@ -1397,7 +1393,7 @@ bool TextureSource::generateImagePart(std::string part_of_name,
Example (a grass block (not actually used in game):
"[inventorycube{grass.png{mud.png&grass_side.png{mud.png&grass_side.png"
*/
else if (part_of_name.substr(0,14) == "[inventorycube")
else if (str_starts_with(part_of_name, "[inventorycube"))
{
if (baseimg != NULL){
errorstream<<"generateImagePart(): baseimg != NULL "
@ -1514,7 +1510,7 @@ bool TextureSource::generateImagePart(std::string part_of_name,
[lowpart:percent:filename
Adds the lower part of a texture
*/
else if (part_of_name.substr(0,9) == "[lowpart:")
else if (str_starts_with(part_of_name, "[lowpart:"))
{
Strfnd sf(part_of_name);
sf.next(":");
@ -1550,7 +1546,7 @@ bool TextureSource::generateImagePart(std::string part_of_name,
Crops a frame of a vertical animation.
N = frame count, I = frame index
*/
else if (part_of_name.substr(0,15) == "[verticalframe:")
else if (str_starts_with(part_of_name, "[verticalframe:"))
{
Strfnd sf(part_of_name);
sf.next(":");
@ -1594,7 +1590,7 @@ bool TextureSource::generateImagePart(std::string part_of_name,
[mask:filename
Applies a mask to an image
*/
else if (part_of_name.substr(0,6) == "[mask:")
else if (str_starts_with(part_of_name, "[mask:"))
{
if (baseimg == NULL) {
errorstream << "generateImage(): baseimg == NULL "
@ -1620,7 +1616,8 @@ bool TextureSource::generateImagePart(std::string part_of_name,
Overlays image with given color
color = color as ColorString
*/
else if (part_of_name.substr(0,10) == "[colorize:") {
else if (str_starts_with(part_of_name, "[colorize:"))
{
Strfnd sf(part_of_name);
sf.next(":");
std::string color_str = sf.next(":");
@ -1657,7 +1654,12 @@ bool TextureSource::generateImagePart(std::string part_of_name,
blit_with_interpolate_overlay(img, baseimg, v2s32(0,0), v2s32(0,0), dim, ratio);
img->drop();
}
else if (part_of_name.substr(0,19) == "[autoupscaleformesh") {
else if (str_starts_with(part_of_name, "[applyfiltersformesh"))
{
// Apply the "clean transparent" filter, if configured.
if (g_settings->getBool("texture_clean_transparent"))
imageCleanTransparent(baseimg, 127);
/* Upscale textures to user's requested minimum size. This is a trick to make
* filters look as good on low-res textures as on high-res ones, by making
* low-res textures BECOME high-res ones. This is helpful for worlds that

2
src/cmake_config.h.in
View File

@ -4,7 +4,7 @@
#define CMAKE_CONFIG_H
#define PROJECT_NAME "@PROJECT_NAME@"
#define PROJECT_NAME_LOWER "@PROJECT_NAME_LOWER@"
#define PROJECT_NAME_C "@PROJECT_NAME_CAPITALIZED@"
#define VERSION_MAJOR @VERSION_MAJOR@
#define VERSION_MINOR @VERSION_MINOR@
#define VERSION_PATCH @VERSION_PATCH@

4
src/config.h
View File

@ -13,8 +13,8 @@
#if defined USE_CMAKE_CONFIG_H
#include "cmake_config.h"
#elif defined (__ANDROID__) || defined (ANDROID)
#define PROJECT_NAME "Minetest"
#define PROJECT_NAME_LOWER "minetest"
#define PROJECT_NAME "minetest"
#define PROJECT_NAME_C "Minetest"
#define STATIC_SHAREDIR ""
#include "android_version.h"
#ifdef NDEBUG

570
src/craftdef.cpp
View File

@ -39,7 +39,7 @@ inline bool isGroupRecipeStr(const std::string &rec_name)
inline u64 getHashForString(const std::string &recipe_str)
{
/*errorstream << "Hashing craft string \"" << recipe_str << "\"";*/
/*errorstream << "Hashing craft string \"" << recipe_str << '"';*/
return murmur_hash_64_ua(recipe_str.data(), recipe_str.length(), 0xdeadbeef);
}
@ -75,7 +75,7 @@ static bool inputItemMatchesRecipe(const std::string &inp_name,
const std::string &rec_name, IItemDefManager *idef)
{
// Exact name
if(inp_name == rec_name)
if (inp_name == rec_name)
return true;
// Group
@ -83,14 +83,14 @@ static bool inputItemMatchesRecipe(const std::string &inp_name,
const struct ItemDefinition &def = idef->get(inp_name);
Strfnd f(rec_name.substr(6));
bool all_groups_match = true;
do{
do {
std::string check_group = f.next(",");
if(itemgroup_get(def.groups, check_group) == 0){
if (itemgroup_get(def.groups, check_group) == 0) {
all_groups_match = false;
break;
}
}while(!f.atend());
if(all_groups_match)
} while (!f.atend());
if (all_groups_match)
return true;
}
@ -111,11 +111,10 @@ static std::vector<std::string> craftGetItemNames(
const std::vector<std::string> &itemstrings, IGameDef *gamedef)
{
std::vector<std::string> result;
for(std::vector<std::string>::const_iterator
i = itemstrings.begin();
i != itemstrings.end(); i++)
{
result.push_back(craftGetItemName(*i, gamedef));
for (std::vector<std::string>::const_iterator
it = itemstrings.begin();
it != itemstrings.end(); it++) {
result.push_back(craftGetItemName(*it, gamedef));
}
return result;
}
@ -125,11 +124,10 @@ static std::vector<std::string> craftGetItemNames(
const std::vector<ItemStack> &items, IGameDef *gamedef)
{
std::vector<std::string> result;
for(std::vector<ItemStack>::const_iterator
i = items.begin();
i != items.end(); i++)
{
result.push_back(i->name);
for (std::vector<ItemStack>::const_iterator
it = items.begin();
it != items.end(); it++) {
result.push_back(it->name);
}
return result;
}
@ -139,11 +137,11 @@ static std::vector<ItemStack> craftGetItems(
const std::vector<std::string> &items, IGameDef *gamedef)
{
std::vector<ItemStack> result;
for(std::vector<std::string>::const_iterator
i = items.begin();
i != items.end(); i++)
{
result.push_back(ItemStack(std::string(*i),(u16)1,(u16)0,"",gamedef->getItemDefManager()));
for (std::vector<std::string>::const_iterator
it = items.begin();
it != items.end(); it++) {
result.push_back(ItemStack(std::string(*it), (u16)1,
(u16)0, "", gamedef->getItemDefManager()));
}
return result;
}
@ -157,32 +155,27 @@ static bool craftGetBounds(const std::vector<std::string> &items, unsigned int w
bool success = false;
unsigned int x = 0;
unsigned int y = 0;
for(std::vector<std::string>::const_iterator
i = items.begin();
i != items.end(); i++)
{
if(*i != "") // Is this an actual item?
{
if(!success)
{
for (std::vector<std::string>::const_iterator
it = items.begin();
it != items.end(); it++) {
// Is this an actual item?
if (*it != "") {
if (!success) {
// This is the first nonempty item
min_x = max_x = x;
min_y = max_y = y;
success = true;
}
else
{
if(x < min_x) min_x = x;
if(x > max_x) max_x = x;
if(y < min_y) min_y = y;
if(y > max_y) max_y = y;
} else {
if (x < min_x) min_x = x;
if (x > max_x) max_x = x;
if (y < min_y) min_y = y;
if (y > max_y) max_y = y;
}
}
// Step coordinate
x++;
if(x == width)
{
if (x == width) {
x = 0;
y++;
}
@ -193,12 +186,11 @@ static bool craftGetBounds(const std::vector<std::string> &items, unsigned int w
// Removes 1 from each item stack
static void craftDecrementInput(CraftInput &input, IGameDef *gamedef)
{
for(std::vector<ItemStack>::iterator
i = input.items.begin();
i != input.items.end(); i++)
{
if(i->count != 0)
i->remove(1);
for (std::vector<ItemStack>::iterator
it = input.items.begin();
it != input.items.end(); it++) {
if (it->count != 0)
it->remove(1);
}
}
@ -209,8 +201,7 @@ static void craftDecrementOrReplaceInput(CraftInput &input,
const CraftReplacements &replacements,
IGameDef *gamedef)
{
if(replacements.pairs.empty())
{
if (replacements.pairs.empty()) {
craftDecrementInput(input, gamedef);
return;
}
@ -218,36 +209,28 @@ static void craftDecrementOrReplaceInput(CraftInput &input,
// Make a copy of the replacements pair list
std::vector<std::pair<std::string, std::string> > pairs = replacements.pairs;
for(std::vector<ItemStack>::iterator
i = input.items.begin();
i != input.items.end(); i++)
{
if(i->count == 1)
{
for (std::vector<ItemStack>::iterator
it = input.items.begin();
it != input.items.end(); it++) {
if (it->count == 1) {
// Find an appropriate replacement
bool found_replacement = false;
for(std::vector<std::pair<std::string, std::string> >::iterator
for (std::vector<std::pair<std::string, std::string> >::iterator
j = pairs.begin();
j != pairs.end(); j++)
{
ItemStack from_item;
from_item.deSerialize(j->first, gamedef->idef());
if(i->name == from_item.name)
{
i->deSerialize(j->second, gamedef->idef());
j != pairs.end(); j++) {
if (it->name == craftGetItemName(j->first, gamedef)) {
it->deSerialize(j->second, gamedef->idef());
found_replacement = true;
pairs.erase(j);
break;
}
}
// No replacement was found, simply decrement count to zero
if(!found_replacement)
i->remove(1);
}
else if(i->count >= 2)
{
if (!found_replacement)
it->remove(1);
} else if (it->count >= 2) {
// Ignore replacements for items with count >= 2
i->remove(1);
it->remove(1);
}
}
}
@ -260,21 +243,17 @@ static std::string craftDumpMatrix(const std::vector<std::string> &items,
os<<"{ ";
unsigned int x = 0;
for(std::vector<std::string>::const_iterator
i = items.begin();
i != items.end(); i++, x++)
{
if(x == width)
{
it = items.begin();
it != items.end(); it++, x++) {
if (x == width) {
os<<"; ";
x = 0;
}
else if(x != 0)
{
} else if (x != 0) {
os<<",";
}
os<<"\""<<(*i)<<"\"";
os << '"' << (*it) << '"';
}
os<<" }";
os << " }";
return os.str();
}
@ -283,24 +262,20 @@ std::string craftDumpMatrix(const std::vector<ItemStack> &items,
unsigned int width)
{
std::ostringstream os(std::ios::binary);
os<<"{ ";
os << "{ ";
unsigned int x = 0;
for(std::vector<ItemStack>::const_iterator
i = items.begin();
i != items.end(); i++, x++)
{
if(x == width)
{
os<<"; ";
for (std::vector<ItemStack>::const_iterator
it = items.begin();
it != items.end(); it++, x++) {
if (x == width) {
os << "; ";
x = 0;
}
else if(x != 0)
{
} else if (x != 0) {
os<<",";
}
os<<"\""<<(i->getItemString())<<"\"";
os << '"' << (it->getItemString()) << '"';
}
os<<" }";
os << " }";
return os.str();
}
@ -312,7 +287,8 @@ std::string craftDumpMatrix(const std::vector<ItemStack> &items,
std::string CraftInput::dump() const
{
std::ostringstream os(std::ios::binary);
os<<"(method="<<((int)method)<<", items="<<craftDumpMatrix(items, width)<<")";
os << "(method=" << ((int)method) << ", items="
<< craftDumpMatrix(items, width) << ")";
return os.str();
}
@ -323,7 +299,7 @@ std::string CraftInput::dump() const
std::string CraftOutput::dump() const
{
std::ostringstream os(std::ios::binary);
os<<"(item=\""<<item<<"\", time="<<time<<")";
os << "(item=\"" << item << "\", time=" << time << ")";
return os.str();
}
@ -336,86 +312,16 @@ std::string CraftReplacements::dump() const
std::ostringstream os(std::ios::binary);
os<<"{";
const char *sep = "";
for(std::vector<std::pair<std::string, std::string> >::const_iterator
i = pairs.begin();
i != pairs.end(); i++)
{
os<<sep<<"\""<<(i->first)<<"\"=>\""<<(i->second)<<"\"";
for (std::vector<std::pair<std::string, std::string> >::const_iterator
it = pairs.begin();
it != pairs.end(); it++) {
os << sep << '"' << (it->first) << "\"=>\"" << (it->second) << '"';
sep = ",";
}
os<<"}";
os << "}";
return os.str();
}
void CraftReplacements::serialize(std::ostream &os) const
{
writeU16(os, pairs.size());
for(u32 i=0; i<pairs.size(); i++)
{
os<<serializeString(pairs[i].first);
os<<serializeString(pairs[i].second);
}
}
void CraftReplacements::deSerialize(std::istream &is)
{
pairs.clear();
u32 count = readU16(is);
for(u32 i=0; i<count; i++)
{
std::string first = deSerializeString(is);
std::string second = deSerializeString(is);
pairs.push_back(std::make_pair(first, second));
}
}
/*
CraftDefinition
*/
void CraftDefinition::serialize(std::ostream &os) const
{
writeU8(os, 1); // version
os<<serializeString(getName());
serializeBody(os);
}
CraftDefinition* CraftDefinition::deSerialize(std::istream &is)
{
int version = readU8(is);
if(version != 1) throw SerializationError(
"unsupported CraftDefinition version");
std::string name = deSerializeString(is);
CraftDefinition *def = NULL;
if(name == "shaped")
{
def = new CraftDefinitionShaped;
}
else if(name == "shapeless")
{
def = new CraftDefinitionShapeless;
}
else if(name == "toolrepair")
{
def = new CraftDefinitionToolRepair;
}
else if(name == "cooking")
{
def = new CraftDefinitionCooking;
}
else if(name == "fuel")
{
def = new CraftDefinitionFuel;
}
else
{
infostream<<"Unknown CraftDefinition name=\""<<name<<"\""<<std::endl;
throw SerializationError("Unknown CraftDefinition name");
}
def->deSerializeBody(is, version);
return def;
}
/*
CraftDefinitionShaped
*/
@ -427,20 +333,21 @@ std::string CraftDefinitionShaped::getName() const
bool CraftDefinitionShaped::check(const CraftInput &input, IGameDef *gamedef) const
{
if(input.method != CRAFT_METHOD_NORMAL)
if (input.method != CRAFT_METHOD_NORMAL)
return false;
// Get input item matrix
std::vector<std::string> inp_names = craftGetItemNames(input.items, gamedef);
unsigned int inp_width = input.width;
if(inp_width == 0)
if (inp_width == 0)
return false;
while(inp_names.size() % inp_width != 0)
while (inp_names.size() % inp_width != 0)
inp_names.push_back("");
// Get input bounds
unsigned int inp_min_x=0, inp_max_x=0, inp_min_y=0, inp_max_y=0;
if(!craftGetBounds(inp_names, inp_width, inp_min_x, inp_max_x, inp_min_y, inp_max_y))
unsigned int inp_min_x = 0, inp_max_x = 0, inp_min_y = 0, inp_max_y = 0;
if (!craftGetBounds(inp_names, inp_width, inp_min_x, inp_max_x,
inp_min_y, inp_max_y))
return false; // it was empty
std::vector<std::string> rec_names;
@ -451,18 +358,19 @@ bool CraftDefinitionShaped::check(const CraftInput &input, IGameDef *gamedef) co
// Get recipe item matrix
unsigned int rec_width = width;
if(rec_width == 0)
if (rec_width == 0)
return false;
while(rec_names.size() % rec_width != 0)
while (rec_names.size() % rec_width != 0)
rec_names.push_back("");
// Get recipe bounds
unsigned int rec_min_x=0, rec_max_x=0, rec_min_y=0, rec_max_y=0;
if(!craftGetBounds(rec_names, rec_width, rec_min_x, rec_max_x, rec_min_y, rec_max_y))
if (!craftGetBounds(rec_names, rec_width, rec_min_x, rec_max_x,
rec_min_y, rec_max_y))
return false; // it was empty
// Different sizes?
if(inp_max_x - inp_min_x != rec_max_x - rec_min_x ||
if (inp_max_x - inp_min_x != rec_max_x - rec_min_x ||
inp_max_y - inp_min_y != rec_max_y - rec_min_y)
return false;
@ -470,18 +378,17 @@ bool CraftDefinitionShaped::check(const CraftInput &input, IGameDef *gamedef) co
unsigned int w = inp_max_x - inp_min_x + 1;
unsigned int h = inp_max_y - inp_min_y + 1;
for(unsigned int y=0; y < h; y++) {
for (unsigned int y=0; y < h; y++) {
unsigned int inp_y = (inp_min_y + y) * inp_width;
unsigned int rec_y = (rec_min_y + y) * rec_width;
for(unsigned int x=0; x < w; x++) {
for (unsigned int x=0; x < w; x++) {
unsigned int inp_x = inp_min_x + x;
unsigned int rec_x = rec_min_x + x;
if(!inputItemMatchesRecipe(
if (!inputItemMatchesRecipe(
inp_names[inp_y + inp_x],
rec_names[rec_y + rec_x], gamedef->idef())
) {
rec_names[rec_y + rec_x], gamedef->idef())) {
return false;
}
}
@ -507,7 +414,7 @@ void CraftDefinitionShaped::decrementInput(CraftInput &input, IGameDef *gamedef)
CraftHashType CraftDefinitionShaped::getHashType() const
{
assert(hash_inited); //pre-condition
assert(hash_inited); // Pre-condition
bool has_group = false;
for (size_t i = 0; i < recipe_names.size(); i++) {
if (isGroupRecipeStr(recipe_names[i])) {
@ -523,16 +430,13 @@ CraftHashType CraftDefinitionShaped::getHashType() const
u64 CraftDefinitionShaped::getHash(CraftHashType type) const
{
assert(hash_inited); //pre-condition
if ((type == CRAFT_HASH_TYPE_ITEM_NAMES) || (type == CRAFT_HASH_TYPE_COUNT)) {
std::vector<std::string> rec_names = recipe_names;
std::sort(rec_names.begin(), rec_names.end());
return getHashForGrid(type, rec_names);
} else {
//illegal hash type for this CraftDefinition (pre-condition)
assert(false);
return 0;
}
assert(hash_inited); // Pre-condition
assert((type == CRAFT_HASH_TYPE_ITEM_NAMES)
|| (type == CRAFT_HASH_TYPE_COUNT)); // Pre-condition
std::vector<std::string> rec_names = recipe_names;
std::sort(rec_names.begin(), rec_names.end());
return getHashForGrid(type, rec_names);
}
void CraftDefinitionShaped::initHash(IGameDef *gamedef)
@ -546,35 +450,12 @@ void CraftDefinitionShaped::initHash(IGameDef *gamedef)
std::string CraftDefinitionShaped::dump() const
{
std::ostringstream os(std::ios::binary);
os<<"(shaped, output=\""<<output
<<"\", recipe="<<craftDumpMatrix(recipe, width)
<<", replacements="<<replacements.dump()<<")";
os << "(shaped, output=\"" << output
<< "\", recipe=" << craftDumpMatrix(recipe, width)
<< ", replacements=" << replacements.dump() << ")";
return os.str();
}
void CraftDefinitionShaped::serializeBody(std::ostream &os) const
{
os<<serializeString(output);
writeU16(os, width);
writeU16(os, recipe.size());
for(u32 i=0; i<recipe.size(); i++)
os<<serializeString(recipe[i]);
replacements.serialize(os);
}
void CraftDefinitionShaped::deSerializeBody(std::istream &is, int version)
{
if(version != 1) throw SerializationError(
"unsupported CraftDefinitionShaped version");
output = deSerializeString(is);
width = readU16(is);
recipe.clear();
u32 count = readU16(is);
for(u32 i=0; i<count; i++)
recipe.push_back(deSerializeString(is));
replacements.deSerialize(is);
}
/*
CraftDefinitionShapeless
*/
@ -586,21 +467,20 @@ std::string CraftDefinitionShapeless::getName() const
bool CraftDefinitionShapeless::check(const CraftInput &input, IGameDef *gamedef) const
{
if(input.method != CRAFT_METHOD_NORMAL)
if (input.method != CRAFT_METHOD_NORMAL)
return false;
// Filter empty items out of input
std::vector<std::string> input_filtered;
for(std::vector<ItemStack>::const_iterator
i = input.items.begin();
i != input.items.end(); i++)
{
if(i->name != "")
input_filtered.push_back(i->name);
for (std::vector<ItemStack>::const_iterator
it = input.items.begin();
it != input.items.end(); it++) {
if (it->name != "")
input_filtered.push_back(it->name);
}
// If there is a wrong number of items in input, no match
if(input_filtered.size() != recipe.size()){
if (input_filtered.size() != recipe.size()) {
/*dstream<<"Number of input items ("<<input_filtered.size()
<<") does not match recipe size ("<<recipe.size()<<") "
<<"of recipe with output="<<output<<std::endl;*/
@ -622,18 +502,18 @@ bool CraftDefinitionShapeless::check(const CraftInput &input, IGameDef *gamedef)
// If all items match, the recipe matches
bool all_match = true;
//dstream<<"Testing recipe (output="<<output<<"):";
for(size_t i=0; i<recipe.size(); i++){
for (size_t i=0; i<recipe.size(); i++) {
//dstream<<" ("<<input_filtered[i]<<" == "<<recipe_copy[i]<<")";
if(!inputItemMatchesRecipe(input_filtered[i], recipe_copy[i],
gamedef->idef())){
if (!inputItemMatchesRecipe(input_filtered[i], recipe_copy[i],
gamedef->idef())) {
all_match = false;
break;
}
}
//dstream<<" -> match="<<all_match<<std::endl;
if(all_match)
if (all_match)
return true;
}while(std::next_permutation(recipe_copy.begin(), recipe_copy.end()));
} while (std::next_permutation(recipe_copy.begin(), recipe_copy.end()));
return false;
}
@ -645,7 +525,7 @@ CraftOutput CraftDefinitionShapeless::getOutput(const CraftInput &input, IGameDe
CraftInput CraftDefinitionShapeless::getInput(const CraftOutput &output, IGameDef *gamedef) const
{
return CraftInput(CRAFT_METHOD_NORMAL,0,craftGetItems(recipe,gamedef));
return CraftInput(CRAFT_METHOD_NORMAL, 0, craftGetItems(recipe, gamedef));
}
void CraftDefinitionShapeless::decrementInput(CraftInput &input, IGameDef *gamedef) const
@ -655,7 +535,7 @@ void CraftDefinitionShapeless::decrementInput(CraftInput &input, IGameDef *gamed
CraftHashType CraftDefinitionShapeless::getHashType() const
{
assert(hash_inited); //pre-condition
assert(hash_inited); // Pre-condition
bool has_group = false;
for (size_t i = 0; i < recipe_names.size(); i++) {
if (isGroupRecipeStr(recipe_names[i])) {
@ -671,14 +551,10 @@ CraftHashType CraftDefinitionShapeless::getHashType() const
u64 CraftDefinitionShapeless::getHash(CraftHashType type) const
{
assert(hash_inited); //pre-condition
if (type == CRAFT_HASH_TYPE_ITEM_NAMES || type == CRAFT_HASH_TYPE_COUNT) {
return getHashForGrid(type, recipe_names);
} else {
//illegal hash type for this CraftDefinition (pre-condition)
assert(false);
return 0;
}
assert(hash_inited); // Pre-condition
assert(type == CRAFT_HASH_TYPE_ITEM_NAMES
|| type == CRAFT_HASH_TYPE_COUNT); // Pre-condition
return getHashForGrid(type, recipe_names);
}
void CraftDefinitionShapeless::initHash(IGameDef *gamedef)
@ -693,33 +569,12 @@ void CraftDefinitionShapeless::initHash(IGameDef *gamedef)
std::string CraftDefinitionShapeless::dump() const
{
std::ostringstream os(std::ios::binary);
os<<"(shapeless, output=\""<<output
<<"\", recipe="<<craftDumpMatrix(recipe, recipe.size())
<<", replacements="<<replacements.dump()<<")";
os << "(shapeless, output=\"" << output
<< "\", recipe=" << craftDumpMatrix(recipe, recipe.size())
<< ", replacements=" << replacements.dump() << ")";
return os.str();
}
void CraftDefinitionShapeless::serializeBody(std::ostream &os) const
{
os<<serializeString(output);
writeU16(os, recipe.size());
for(u32 i=0; i<recipe.size(); i++)
os<<serializeString(recipe[i]);
replacements.serialize(os);
}
void CraftDefinitionShapeless::deSerializeBody(std::istream &is, int version)
{
if(version != 1) throw SerializationError(
"unsupported CraftDefinitionShapeless version");
output = deSerializeString(is);
recipe.clear();
u32 count = readU16(is);
for(u32 i=0; i<count; i++)
recipe.push_back(deSerializeString(is));
replacements.deSerialize(is);
}
/*
CraftDefinitionToolRepair
*/
@ -731,10 +586,9 @@ static ItemStack craftToolRepair(
IGameDef *gamedef)
{
IItemDefManager *idef = gamedef->idef();
if(item1.count != 1 || item2.count != 1 || item1.name != item2.name
if (item1.count != 1 || item2.count != 1 || item1.name != item2.name
|| idef->get(item1.name).type != ITEM_TOOL
|| idef->get(item2.name).type != ITEM_TOOL)
{
|| idef->get(item2.name).type != ITEM_TOOL) {
// Failure
return ItemStack();
}
@ -743,9 +597,9 @@ static ItemStack craftToolRepair(
s32 item2_uses = 65536 - (u32) item2.wear;
s32 new_uses = item1_uses + item2_uses;
s32 new_wear = 65536 - new_uses + floor(additional_wear * 65536 + 0.5);
if(new_wear >= 65536)
if (new_wear >= 65536)
return ItemStack();
if(new_wear < 0)
if (new_wear < 0)
new_wear = 0;
ItemStack repaired = item1;
@ -760,21 +614,19 @@ std::string CraftDefinitionToolRepair::getName() const
bool CraftDefinitionToolRepair::check(const CraftInput &input, IGameDef *gamedef) const
{
if(input.method != CRAFT_METHOD_NORMAL)
if (input.method != CRAFT_METHOD_NORMAL)
return false;
ItemStack item1;
ItemStack item2;
for(std::vector<ItemStack>::const_iterator
i = input.items.begin();
i != input.items.end(); i++)
{
if(!i->empty())
{
if(item1.empty())
item1 = *i;
else if(item2.empty())
item2 = *i;
for (std::vector<ItemStack>::const_iterator
it = input.items.begin();
it != input.items.end(); it++) {
if (!it->empty()) {
if (item1.empty())
item1 = *it;
else if (item2.empty())
item2 = *it;
else
return false;
}
@ -787,16 +639,14 @@ CraftOutput CraftDefinitionToolRepair::getOutput(const CraftInput &input, IGameD
{
ItemStack item1;
ItemStack item2;
for(std::vector<ItemStack>::const_iterator
i = input.items.begin();
i != input.items.end(); i++)
{
if(!i->empty())
{
if(item1.empty())
item1 = *i;
else if(item2.empty())
item2 = *i;
for (std::vector<ItemStack>::const_iterator
it = input.items.begin();
it != input.items.end(); it++) {
if (!it->empty()) {
if (item1.empty())
item1 = *it;
else if (item2.empty())
item2 = *it;
}
}
ItemStack repaired = craftToolRepair(item1, item2, additional_wear, gamedef);
@ -807,7 +657,7 @@ CraftInput CraftDefinitionToolRepair::getInput(const CraftOutput &output, IGameD
{
std::vector<ItemStack> stack;
stack.push_back(ItemStack());
return CraftInput(CRAFT_METHOD_COOKING,additional_wear,stack);
return CraftInput(CRAFT_METHOD_COOKING, additional_wear, stack);
}
void CraftDefinitionToolRepair::decrementInput(CraftInput &input, IGameDef *gamedef) const
@ -818,22 +668,10 @@ void CraftDefinitionToolRepair::decrementInput(CraftInput &input, IGameDef *game
std::string CraftDefinitionToolRepair::dump() const
{
std::ostringstream os(std::ios::binary);
os<<"(toolrepair, additional_wear="<<additional_wear<<")";
os << "(toolrepair, additional_wear=" << additional_wear << ")";
return os.str();
}
void CraftDefinitionToolRepair::serializeBody(std::ostream &os) const
{
writeF1000(os, additional_wear);
}
void CraftDefinitionToolRepair::deSerializeBody(std::istream &is, int version)
{
if(version != 1) throw SerializationError(
"unsupported CraftDefinitionToolRepair version");
additional_wear = readF1000(is);
}
/*
CraftDefinitionCooking
*/
@ -845,27 +683,26 @@ std::string CraftDefinitionCooking::getName() const
bool CraftDefinitionCooking::check(const CraftInput &input, IGameDef *gamedef) const
{
if(input.method != CRAFT_METHOD_COOKING)
if (input.method != CRAFT_METHOD_COOKING)
return false;
// Filter empty items out of input
std::vector<std::string> input_filtered;
for(std::vector<ItemStack>::const_iterator
i = input.items.begin();
i != input.items.end(); i++)
{
if(i->name != "")
input_filtered.push_back(i->name);
for (std::vector<ItemStack>::const_iterator
it = input.items.begin();
it != input.items.end(); it++) {
if (it->name != "")
input_filtered.push_back(it->name);
}
// If there is a wrong number of items in input, no match
if(input_filtered.size() != 1){
if (input_filtered.size() != 1) {
/*dstream<<"Number of input items ("<<input_filtered.size()
<<") does not match recipe size (1) "
<<"of cooking recipe with output="<<output<<std::endl;*/
return false;
}
// Check the single input item
return inputItemMatchesRecipe(input_filtered[0], recipe, gamedef->idef());
}
@ -919,31 +756,13 @@ void CraftDefinitionCooking::initHash(IGameDef *gamedef)
std::string CraftDefinitionCooking::dump() const
{
std::ostringstream os(std::ios::binary);
os<<"(cooking, output=\""<<output
<<"\", recipe=\""<<recipe
<<"\", cooktime="<<cooktime<<")"
<<", replacements="<<replacements.dump()<<")";
os << "(cooking, output=\"" << output
<< "\", recipe=\"" << recipe
<< "\", cooktime=" << cooktime << ")"
<< ", replacements=" << replacements.dump() << ")";
return os.str();
}
void CraftDefinitionCooking::serializeBody(std::ostream &os) const
{
os<<serializeString(output);
os<<serializeString(recipe);
writeF1000(os, cooktime);
replacements.serialize(os);
}
void CraftDefinitionCooking::deSerializeBody(std::istream &is, int version)
{
if(version != 1) throw SerializationError(
"unsupported CraftDefinitionCooking version");
output = deSerializeString(is);
recipe = deSerializeString(is);
cooktime = readF1000(is);
replacements.deSerialize(is);
}
/*
CraftDefinitionFuel
*/
@ -955,27 +774,26 @@ std::string CraftDefinitionFuel::getName() const
bool CraftDefinitionFuel::check(const CraftInput &input, IGameDef *gamedef) const
{
if(input.method != CRAFT_METHOD_FUEL)
if (input.method != CRAFT_METHOD_FUEL)
return false;
// Filter empty items out of input
std::vector<std::string> input_filtered;
for(std::vector<ItemStack>::const_iterator
i = input.items.begin();
i != input.items.end(); i++)
{
if(i->name != "")
input_filtered.push_back(i->name);
for (std::vector<ItemStack>::const_iterator
it = input.items.begin();
it != input.items.end(); it++) {
if (it->name != "")
input_filtered.push_back(it->name);
}
// If there is a wrong number of items in input, no match
if(input_filtered.size() != 1){
if (input_filtered.size() != 1) {
/*dstream<<"Number of input items ("<<input_filtered.size()
<<") does not match recipe size (1) "
<<"of fuel recipe with burntime="<<burntime<<std::endl;*/
return false;
}
// Check the single input item
return inputItemMatchesRecipe(input_filtered[0], recipe, gamedef->idef());
}
@ -1028,28 +846,12 @@ void CraftDefinitionFuel::initHash(IGameDef *gamedef)
std::string CraftDefinitionFuel::dump() const
{
std::ostringstream os(std::ios::binary);
os<<"(fuel, recipe=\""<<recipe
<<"\", burntime="<<burntime<<")"
<<", replacements="<<replacements.dump()<<")";
os << "(fuel, recipe=\"" << recipe
<< "\", burntime=" << burntime << ")"
<< ", replacements=" << replacements.dump() << ")";
return os.str();
}
void CraftDefinitionFuel::serializeBody(std::ostream &os) const
{
os<<serializeString(recipe);
writeF1000(os, burntime);
replacements.serialize(os);
}
void CraftDefinitionFuel::deSerializeBody(std::istream &is, int version)
{
if(version != 1) throw SerializationError(
"unsupported CraftDefinitionFuel version");
recipe = deSerializeString(is);
burntime = readF1000(is);
replacements.deSerialize(is);
}
/*
Craft definition manager
*/
@ -1076,9 +878,9 @@ public:
// If all input items are empty, abort.
bool all_empty = true;
for (std::vector<ItemStack>::const_iterator
i = input.items.begin();
i != input.items.end(); i++) {
if (!i->empty()) {
it = input.items.begin();
it != input.items.end(); it++) {
if (!it->empty()) {
all_empty = false;
break;
}
@ -1108,9 +910,9 @@ public:
// Walk crafting definitions from back to front, so that later
// definitions can override earlier ones.
for (std::vector<CraftDefinition*>::const_reverse_iterator
i = hash_collisions.rbegin();
i != hash_collisions.rend(); i++) {
CraftDefinition *def = *i;
it = hash_collisions.rbegin();
it != hash_collisions.rend(); it++) {
CraftDefinition *def = *it;
/*errorstream << "Checking " << input.dump() << std::endl
<< " against " << def->dump() << std::endl;*/
@ -1158,11 +960,11 @@ public:
os << "Crafting definitions:\n";
for (int type = 0; type <= craft_hash_type_max; type++) {
for (std::map<u64, std::vector<CraftDefinition*> >::const_iterator
i = (m_craft_defs[type]).begin();
i != (m_craft_defs[type]).end(); i++) {
it = (m_craft_defs[type]).begin();
it != (m_craft_defs[type]).end(); it++) {
for (std::vector<CraftDefinition*>::const_iterator
ii = i->second.begin(); ii != i->second.end(); ii++) {
os << "type " << type << " hash " << i->first << (*ii)->dump() << "\n";
iit = it->second.begin(); iit != it->second.end(); iit++) {
os << "type " << type << " hash " << it->first << (*iit)->dump() << "\n";
}
}
}
@ -1170,8 +972,8 @@ public:
}
virtual void registerCraft(CraftDefinition *def, IGameDef *gamedef)
{
verbosestream<<"registerCraft: registering craft definition: "
<<def->dump()<<std::endl;
verbosestream << "registerCraft: registering craft definition: "
<< def->dump() << std::endl;
m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0].push_back(def);
CraftInput input;
@ -1183,13 +985,13 @@ public:
{
for (int type = 0; type <= craft_hash_type_max; type++) {
for (std::map<u64, std::vector<CraftDefinition*> >::iterator
i = m_craft_defs[type].begin();
i != m_craft_defs[type].end(); i++) {
it = m_craft_defs[type].begin();
it != m_craft_defs[type].end(); it++) {
for (std::vector<CraftDefinition*>::iterator
ii = i->second.begin(); ii != i->second.end(); ii++) {
delete *ii;
iit = it->second.begin(); iit != it->second.end(); iit++) {
delete *iit;
}
i->second.clear();
it->second.clear();
}
m_craft_defs[type].clear();
}
@ -1199,9 +1001,9 @@ public:
{
// Move the CraftDefs from the unhashed layer into layers higher up.
for (std::vector<CraftDefinition*>::iterator
i = (m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0]).begin();
i != (m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0]).end(); i++) {
CraftDefinition *def = *i;
it = (m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0]).begin();
it != (m_craft_defs[(int) CRAFT_HASH_TYPE_UNHASHED][0]).end(); it++) {
CraftDefinition *def = *it;
// Initialize and get the definition's hash
def->initHash(gamedef);

32
src/craftdef.h
View File

@ -128,8 +128,6 @@ struct CraftReplacements
pairs(pairs_)
{}
std::string dump() const;
void serialize(std::ostream &os) const;
void deSerialize(std::istream &is);
};
/*
@ -141,9 +139,6 @@ public:
CraftDefinition(){}
virtual ~CraftDefinition(){}
void serialize(std::ostream &os) const;
static CraftDefinition* deSerialize(std::istream &is);
// Returns type of crafting definition
virtual std::string getName() const=0;
@ -164,9 +159,6 @@ public:
virtual void initHash(IGameDef *gamedef) = 0;
virtual std::string dump() const=0;
protected:
virtual void serializeBody(std::ostream &os) const=0;
virtual void deSerializeBody(std::istream &is, int version)=0;
};
/*
@ -204,10 +196,6 @@ public:
virtual std::string dump() const;
protected:
virtual void serializeBody(std::ostream &os) const;
virtual void deSerializeBody(std::istream &is, int version);
private:
// Output itemstring
std::string output;
@ -256,10 +244,6 @@ public:
virtual std::string dump() const;
protected:
virtual void serializeBody(std::ostream &os) const;
virtual void deSerializeBody(std::istream &is, int version);
private:
// Output itemstring
std::string output;
@ -303,10 +287,6 @@ public:
virtual std::string dump() const;
protected:
virtual void serializeBody(std::ostream &os) const;
virtual void deSerializeBody(std::istream &is, int version);
private:
// This is a constant that is added to the wear of the result.
// May be positive or negative, allowed range [-1,1].
@ -349,10 +329,6 @@ public:
virtual std::string dump() const;
protected:
virtual void serializeBody(std::ostream &os) const;
virtual void deSerializeBody(std::istream &is, int version);
private:
// Output itemstring
std::string output;
@ -398,10 +374,6 @@ public:
virtual std::string dump() const;
protected:
virtual void serializeBody(std::ostream &os) const;
virtual void deSerializeBody(std::istream &is, int version);
private:
// Recipe itemstring
std::string recipe;
@ -429,7 +401,7 @@ public:
bool decrementInput, IGameDef *gamedef) const=0;
virtual std::vector<CraftDefinition*> getCraftRecipes(CraftOutput &output,
IGameDef *gamedef, unsigned limit=0) const=0;
// Print crafting recipes for debugging
virtual std::string dump() const=0;
};
@ -443,7 +415,7 @@ public:
// The main crafting function
virtual bool getCraftResult(CraftInput &input, CraftOutput &output,
bool decrementInput, IGameDef *gamedef) const=0;
virtual std::vector<CraftDefinition*> getCraftRecipes(CraftOutput &output,
virtual std::vector<CraftDefinition*> getCraftRecipes(CraftOutput &output,
IGameDef *gamedef, unsigned limit=0) const=0;
// Print crafting recipes for debugging

2
src/defaultsettings.cpp
View File

@ -322,7 +322,7 @@ void set_default_settings(Settings *settings)
settings->setDefault("enable_particles", "false");
settings->setDefault("video_driver", "ogles1");
settings->setDefault("touchtarget", "true");
settings->setDefault("TMPFolder","/sdcard/" PROJECT_NAME "/tmp/");
settings->setDefault("TMPFolder","/sdcard/" PROJECT_NAME_C "/tmp/");
settings->setDefault("touchscreen_threshold","20");
settings->setDefault("smooth_lighting", "false");
settings->setDefault("max_simultaneous_block_sends_per_client", "3");

2
src/emerge.cpp
View File

@ -522,7 +522,7 @@ void *EmergeThread::Thread()
<< "----" << std::endl
<< "\"" << e.what() << "\"" << std::endl
<< "See debug.txt." << std::endl
<< "World probably saved by a newer version of " PROJECT_NAME "."
<< "World probably saved by a newer version of " PROJECT_NAME_C "."
<< std::endl;
m_server->setAsyncFatalError(err.str());
}

5
src/exceptions.h
View File

@ -120,6 +120,11 @@ public:
ClientStateError(std::string s): BaseException(s) {}
};
class PrngException : public BaseException {
public:
PrngException(std::string s): BaseException(s) {}
};
/*
Some "old-style" interrupts:
*/

6
src/filesys.cpp
View File

@ -662,6 +662,12 @@ std::string RemoveRelativePathComponents(std::string path)
return path.substr(0, pos);
}
const char *GetFilenameFromPath(const char *path)
{
const char *filename = strrchr(path, DIR_DELIM_CHAR);
return filename ? filename + 1 : path;
}
bool safeWriteToFile(const std::string &path, const std::string &content)
{
std::string tmp_file = path + ".~mt";

4
src/filesys.h
View File

@ -103,6 +103,10 @@ std::string RemoveLastPathComponent(const std::string &path,
// this does not resolve symlinks and check for existence of directories.
std::string RemoveRelativePathComponents(std::string path);
// Return the filename from a path or the entire path if no directory delimiter
// is found.
const char *GetFilenameFromPath(const char *path);
bool safeWriteToFile(const std::string &path, const std::string &content);
}//fs

5
src/game.cpp
View File

@ -1139,7 +1139,7 @@ static void show_pause_menu(GUIFormSpecMenu **cur_formspec,
<< wide_to_narrow(wstrgettext("Exit to OS")) << "]"
#ifndef __ANDROID__
<< "textarea[7.5,0.25;3.9,6.25;;" << control_text << ";]"
<< "textarea[0.4,0.25;3.5,6;;" << PROJECT_NAME "\n"
<< "textarea[0.4,0.25;3.5,6;;" << PROJECT_NAME_C "\n"
<< g_build_info << "\n"
<< "path_user = " << wrap_rows(porting::path_user, 20)
#endif
@ -1799,7 +1799,7 @@ void Game::run()
cam_view.camera_pitch) * cam_smoothing;
updatePlayerControl(cam_view);
step(&dtime);
processClientEvents(&cam_view, &runData.damage_flash);
processClientEvents(&cam_view_target, &runData.damage_flash);
updateCamera(&flags, draw_times.busy_time, dtime,
runData.time_from_last_punch);
updateSound(dtime);
@ -2036,6 +2036,7 @@ bool Game::createClient(const std::string &playername,
/* Set window caption
*/
std::wstring str = narrow_to_wide("MultiCraft");
str += L" [";
str += driver->getName();
str += L"]";

5
src/gettext.cpp
View File

@ -236,8 +236,9 @@ void init_gettext(const char *path, const std::string &configured_language) {
#endif
#endif
bindtextdomain(PROJECT_NAME_LOWER, path);
textdomain(PROJECT_NAME_LOWER);
static std::string name = lowercase(PROJECT_NAME);
bindtextdomain(name.c_str(), path);
textdomain(name.c_str());
#if defined(_WIN32)
// Set character encoding for Win32

2
src/guiEngine.cpp
View File

@ -572,7 +572,7 @@ bool GUIEngine::downloadFile(std::string url, std::string target)
/******************************************************************************/
void GUIEngine::setTopleftText(std::string append)
{
std::wstring toset = narrow_to_wide(std::string(PROJECT_NAME " ") +
std::wstring toset = narrow_to_wide(std::string(PROJECT_NAME_C " ") +
g_version_hash);
if (append != "")

2
src/httpfetch.cpp
View File

@ -47,7 +47,7 @@ HTTPFetchRequest::HTTPFetchRequest()
connect_timeout = timeout;
multipart = false;
useragent = std::string(PROJECT_NAME "/") + g_version_hash + " (" + porting::get_sysinfo() + ")";
useragent = std::string(PROJECT_NAME_C "/") + g_version_hash + " (" + porting::get_sysinfo() + ")";
}

4
src/main.cpp
View File

@ -32,7 +32,7 @@ with this program; if not, write to the Free Software Foundation, Inc.,
#include "mainmenumanager.h"
#include "irrlichttypes_extrabloated.h"
#include "debug.h"
#include "test.h"
#include "unittest/test.h"
#include "server.h"
#include "filesys.h"
#include "version.h"
@ -347,7 +347,7 @@ static void print_allowed_options(const OptionList &allowed_options)
static void print_version()
{
dstream << PROJECT_NAME " " << g_version_hash << std::endl;
dstream << PROJECT_NAME_C " " << g_version_hash << std::endl;
#ifndef SERVER
dstream << "Using Irrlicht " << IRRLICHT_SDK_VERSION << std::endl;
#endif

6
src/noise.cpp
View File

@ -115,7 +115,9 @@ u32 PcgRandom::range(u32 bound)
s32 PcgRandom::range(s32 min, s32 max)
{
assert(max >= min);
if (max < min)
throw PrngException("Invalid range (max < min)");
u32 bound = max - min + 1;
return range(bound) + min;
}
@ -146,7 +148,7 @@ s32 PcgRandom::randNormalDist(s32 min, s32 max, int num_trials)
s32 accum = 0;
for (int i = 0; i != num_trials; i++)
accum += range(min, max);
return ((float)accum / num_trials) + 0.5f;
return round((float)accum / num_trials);
}
///////////////////////////////////////////////////////////////////////////////

8
src/noise.h
View File

@ -26,8 +26,8 @@
#ifndef NOISE_HEADER
#define NOISE_HEADER
#include "debug.h"
#include "irr_v3d.h"
#include "exceptions.h"
#include "util/string.h"
extern FlagDesc flagdesc_noiseparams[];
@ -56,14 +56,16 @@ public:
inline int range(int min, int max)
{
assert(max >= min);
if (max < min)
throw PrngException("Invalid range (max < min)");
/*
Here, we ensure the range is not too large relative to RANDOM_MAX,
as otherwise the effects of bias would become noticable. Unlike
PcgRandom, we cannot modify this RNG's range as it would change the
output of this RNG for reverse compatibility.
*/
assert((u32)(max - min) <= (RANDOM_RANGE + 1) / 10);
if ((u32)(max - min) > (RANDOM_RANGE + 1) / 10)
throw PrngException("Range too large");
return (next() % (max - min + 1)) + min;
}

15
src/porting.cpp
View File

@ -475,11 +475,11 @@ bool setSystemPaths()
// Use ".\bin\.."
path_share = std::string(buf) + "\\..";
// Use "C:\Documents and Settings\user\Application Data\<PROJECT_NAME_LOWER>"
// Use "C:\Documents and Settings\user\Application Data\<PROJECT_NAME>"
DWORD len = GetEnvironmentVariable("APPDATA", buf, sizeof(buf));
FATAL_ERROR_IF(len == 0 || len > sizeof(buf), "Failed to get APPDATA");
path_user = std::string(buf) + DIR_DELIM PROJECT_NAME_LOWER;
path_user = std::string(buf) + DIR_DELIM + PROJECT_NAME;
return true;
}
@ -511,7 +511,7 @@ bool setSystemPaths()
trylist.push_back(static_sharedir);
trylist.push_back(bindir + DIR_DELIM ".." DIR_DELIM "share"
DIR_DELIM PROJECT_NAME_LOWER);
DIR_DELIM + PROJECT_NAME);
trylist.push_back(bindir + DIR_DELIM "..");
#ifdef __ANDROID__
@ -540,7 +540,7 @@ bool setSystemPaths()
#ifndef __ANDROID__
path_user = std::string(getenv("HOME")) + DIR_DELIM "."
PROJECT_NAME_LOWER;
+ PROJECT_NAME;
#endif
return true;
@ -563,8 +563,9 @@ bool setSystemPaths()
}
CFRelease(resources_url);
path_user = std::string(getenv("HOME")) +
"/Library/Application Support/" PROJECT_NAME_LOWER;
path_user = std::string(getenv("HOME"))
+ "/Library/Application Support/"
+ PROJECT_NAME;
return true;
}
@ -575,7 +576,7 @@ bool setSystemPaths()
{
path_share = STATIC_SHAREDIR;
path_user = std::string(getenv("HOME")) + DIR_DELIM "."
PROJECT_NAME_LOWER;
+ lowercase(PROJECT_NAME);
return true;
}

2468
src/test.cpp
View File

File diff suppressed because it is too large Load Diff

26
src/test.h
View File

@ -1,26 +0,0 @@
/*
Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef TEST_HEADER
#define TEST_HEADER
void run_tests();
#endif

19
src/unittest/CMakeLists.txt Normal file
View File

@ -0,0 +1,19 @@
set (UNITTEST_SRCS
${CMAKE_CURRENT_SOURCE_DIR}/test.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_collision.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_compression.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_connection.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_filepath.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_inventory.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_mapnode.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_nodedef.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_noise.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_profiler.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_random.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_serialization.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_settings.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_socket.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_utilities.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_voxelalgorithms.cpp
${CMAKE_CURRENT_SOURCE_DIR}/test_voxelmanipulator.cpp
PARENT_SCOPE)

547
src/unittest/test.cpp Normal file
View File

@ -0,0 +1,547 @@
/*
Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "test.h"
#include "debug.h"
#include "log.h"
#include "nodedef.h"
#include "itemdef.h"
#include "gamedef.h"
content_t CONTENT_STONE;
content_t CONTENT_GRASS;
content_t CONTENT_TORCH;
////////////////////////////////////////////////////////////////////////////////
////
//// TestGameDef
////
class TestGameDef : public IGameDef {
public:
TestGameDef();
~TestGameDef();
IItemDefManager *getItemDefManager() { return m_itemdef; }
INodeDefManager *getNodeDefManager() { return m_nodedef; }
ICraftDefManager *getCraftDefManager() { return m_craftdef; }
ITextureSource *getTextureSource() { return m_texturesrc; }
IShaderSource *getShaderSource() { return m_shadersrc; }
ISoundManager *getSoundManager() { return m_soundmgr; }
MtEventManager *getEventManager() { return m_eventmgr; }
scene::ISceneManager *getSceneManager() { return m_scenemgr; }
IRollbackManager *getRollbackManager() { return m_rollbackmgr; }
EmergeManager *getEmergeManager() { return m_emergemgr; }
scene::IAnimatedMesh *getMesh(const std::string &filename) { return NULL; }
bool checkLocalPrivilege(const std::string &priv) { return false; }
u16 allocateUnknownNodeId(const std::string &name) { return 0; }
void defineSomeNodes();
private:
IItemDefManager *m_itemdef;
INodeDefManager *m_nodedef;
ICraftDefManager *m_craftdef;
ITextureSource *m_texturesrc;
IShaderSource *m_shadersrc;
ISoundManager *m_soundmgr;
MtEventManager *m_eventmgr;
scene::ISceneManager *m_scenemgr;
IRollbackManager *m_rollbackmgr;
EmergeManager *m_emergemgr;
};
TestGameDef::TestGameDef()
{
m_itemdef = createItemDefManager();
m_nodedef = createNodeDefManager();
defineSomeNodes();
}
TestGameDef::~TestGameDef()
{
delete m_itemdef;
delete m_nodedef;
}
void TestGameDef::defineSomeNodes()
{
IWritableItemDefManager *idef = (IWritableItemDefManager *)m_itemdef;
IWritableNodeDefManager *ndef = (IWritableNodeDefManager *)m_nodedef;
ItemDefinition itemdef;
ContentFeatures f;
//// Stone
itemdef = ItemDefinition();
itemdef.type = ITEM_NODE;
itemdef.name = "default:stone";
itemdef.description = "Stone";
itemdef.groups["cracky"] = 3;
itemdef.inventory_image = "[inventorycube"
"{default_stone.png"
"{default_stone.png"
"{default_stone.png";
f = ContentFeatures();
f.name = itemdef.name;
for(int i = 0; i < 6; i++)
f.tiledef[i].name = "default_stone.png";
f.is_ground_content = true;
idef->registerItem(itemdef);
CONTENT_STONE = ndef->set(f.name, f);
//// Grass
itemdef = ItemDefinition();
itemdef.type = ITEM_NODE;
itemdef.name = "default:dirt_with_grass";
itemdef.description = "Dirt with grass";
itemdef.groups["crumbly"] = 3;
itemdef.inventory_image = "[inventorycube"
"{default_grass.png"
"{default_dirt.png&default_grass_side.png"
"{default_dirt.png&default_grass_side.png";
f = ContentFeatures();
f.name = itemdef.name;
f.tiledef[0].name = "default_grass.png";
f.tiledef[1].name = "default_dirt.png";
for(int i = 2; i < 6; i++)
f.tiledef[i].name = "default_dirt.png^default_grass_side.png";
f.is_ground_content = true;
idef->registerItem(itemdef);
CONTENT_GRASS = ndef->set(f.name, f);
//// Torch (minimal definition for lighting tests)
itemdef = ItemDefinition();
itemdef.type = ITEM_NODE;
itemdef.name = "default:torch";
f = ContentFeatures();
f.name = itemdef.name;
f.param_type = CPT_LIGHT;
f.light_propagates = true;
f.sunlight_propagates = true;
f.light_source = LIGHT_MAX-1;
idef->registerItem(itemdef);
CONTENT_TORCH = ndef->set(f.name, f);
}
////
//// run_tests
////
void run_tests()
{
DSTACK(__FUNCTION_NAME);
u32 t1 = porting::getTime(PRECISION_MILLI);
TestGameDef gamedef;
log_set_lev_silence(LMT_ERROR, true);
u32 num_modules_failed = 0;
u32 num_total_tests_failed = 0;
u32 num_total_tests_run = 0;
std::vector<TestBase *> &testmods = TestManager::getTestModules();
for (size_t i = 0; i != testmods.size(); i++) {
if (!testmods[i]->testModule(&gamedef))
num_modules_failed++;
num_total_tests_failed += testmods[i]->num_tests_failed;
num_total_tests_run += testmods[i]->num_tests_run;
}
u32 tdiff = porting::getTime(PRECISION_MILLI) - t1;
log_set_lev_silence(LMT_ERROR, false);
const char *overall_status = (num_modules_failed == 0) ? "PASSED" : "FAILED";
dstream
<< "++++++++++++++++++++++++++++++++++++++++"
<< "++++++++++++++++++++++++++++++++++++++++" << std::endl
<< "Unit Test Results: " << overall_status << std::endl
<< " " << num_modules_failed << " / " << testmods.size()
<< " failed modules (" << num_total_tests_failed << " / "
<< num_total_tests_run << " failed individual tests)." << std::endl
<< " Testing took " << tdiff << "ms total." << std::endl
<< "++++++++++++++++++++++++++++++++++++++++"
<< "++++++++++++++++++++++++++++++++++++++++" << std::endl;
if (num_modules_failed)
abort();
}
////
//// TestBase
////
bool TestBase::testModule(IGameDef *gamedef)
{
dstream << "======== Testing module " << getName() << std::endl;
u32 t1 = porting::getTime(PRECISION_MILLI);
runTests(gamedef);
u32 tdiff = porting::getTime(PRECISION_MILLI) - t1;
dstream << "======== Module " << getName() << " "
<< (num_tests_failed ? "failed" : "passed") << " (" << num_tests_failed
<< " failures / " << num_tests_run << " tests) - " << tdiff
<< "ms" << std::endl;
return num_tests_failed == 0;
}
/*
NOTE: These tests became non-working then NodeContainer was removed.
These should be redone, utilizing some kind of a virtual
interface for Map (IMap would be fine).
*/
#if 0
struct TestMapBlock: public TestBase
{
class TC : public NodeContainer
{
public:
MapNode node;
bool position_valid;
core::list<v3s16> validity_exceptions;
TC()
{
position_valid = true;
}
virtual bool isValidPosition(v3s16 p)
{
//return position_valid ^ (p==position_valid_exception);
bool exception = false;
for(core::list<v3s16>::Iterator i=validity_exceptions.begin();
i != validity_exceptions.end(); i++)
{
if(p == *i)
{
exception = true;
break;
}
}
return exception ? !position_valid : position_valid;
}
virtual MapNode getNode(v3s16 p)
{
if(isValidPosition(p) == false)
throw InvalidPositionException();
return node;
}
virtual void setNode(v3s16 p, MapNode & n)
{
if(isValidPosition(p) == false)
throw InvalidPositionException();
};
virtual u16 nodeContainerId() const
{
return 666;
}
};
void Run()
{
TC parent;
MapBlock b(&parent, v3s16(1,1,1));
v3s16 relpos(MAP_BLOCKSIZE, MAP_BLOCKSIZE, MAP_BLOCKSIZE);
UASSERT(b.getPosRelative() == relpos);
UASSERT(b.getBox().MinEdge.X == MAP_BLOCKSIZE);
UASSERT(b.getBox().MaxEdge.X == MAP_BLOCKSIZE*2-1);
UASSERT(b.getBox().MinEdge.Y == MAP_BLOCKSIZE);
UASSERT(b.getBox().MaxEdge.Y == MAP_BLOCKSIZE*2-1);
UASSERT(b.getBox().MinEdge.Z == MAP_BLOCKSIZE);
UASSERT(b.getBox().MaxEdge.Z == MAP_BLOCKSIZE*2-1);
UASSERT(b.isValidPosition(v3s16(0,0,0)) == true);
UASSERT(b.isValidPosition(v3s16(-1,0,0)) == false);
UASSERT(b.isValidPosition(v3s16(-1,-142,-2341)) == false);
UASSERT(b.isValidPosition(v3s16(-124,142,2341)) == false);
UASSERT(b.isValidPosition(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1)) == true);
UASSERT(b.isValidPosition(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE,MAP_BLOCKSIZE-1)) == false);
/*
TODO: this method should probably be removed
if the block size isn't going to be set variable
*/
/*UASSERT(b.getSizeNodes() == v3s16(MAP_BLOCKSIZE,
MAP_BLOCKSIZE, MAP_BLOCKSIZE));*/
// Changed flag should be initially set
UASSERT(b.getModified() == MOD_STATE_WRITE_NEEDED);
b.resetModified();
UASSERT(b.getModified() == MOD_STATE_CLEAN);
// All nodes should have been set to
// .d=CONTENT_IGNORE and .getLight() = 0
for(u16 z=0; z<MAP_BLOCKSIZE; z++)
for(u16 y=0; y<MAP_BLOCKSIZE; y++)
for(u16 x=0; x<MAP_BLOCKSIZE; x++)
{
//UASSERT(b.getNode(v3s16(x,y,z)).getContent() == CONTENT_AIR);
UASSERT(b.getNode(v3s16(x,y,z)).getContent() == CONTENT_IGNORE);
UASSERT(b.getNode(v3s16(x,y,z)).getLight(LIGHTBANK_DAY) == 0);
UASSERT(b.getNode(v3s16(x,y,z)).getLight(LIGHTBANK_NIGHT) == 0);
}
{
MapNode n(CONTENT_AIR);
for(u16 z=0; z<MAP_BLOCKSIZE; z++)
for(u16 y=0; y<MAP_BLOCKSIZE; y++)
for(u16 x=0; x<MAP_BLOCKSIZE; x++)
{
b.setNode(v3s16(x,y,z), n);
}
}
/*
Parent fetch functions
*/
parent.position_valid = false;
parent.node.setContent(5);
MapNode n;
// Positions in the block should still be valid
UASSERT(b.isValidPositionParent(v3s16(0,0,0)) == true);
UASSERT(b.isValidPositionParent(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1)) == true);
n = b.getNodeParent(v3s16(0,MAP_BLOCKSIZE-1,0));
UASSERT(n.getContent() == CONTENT_AIR);
// ...but outside the block they should be invalid
UASSERT(b.isValidPositionParent(v3s16(-121,2341,0)) == false);
UASSERT(b.isValidPositionParent(v3s16(-1,0,0)) == false);
UASSERT(b.isValidPositionParent(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE)) == false);
{
bool exception_thrown = false;
try{
// This should throw an exception
MapNode n = b.getNodeParent(v3s16(0,0,-1));
}
catch(InvalidPositionException &e)
{
exception_thrown = true;
}
UASSERT(exception_thrown);
}
parent.position_valid = true;
// Now the positions outside should be valid
UASSERT(b.isValidPositionParent(v3s16(-121,2341,0)) == true);
UASSERT(b.isValidPositionParent(v3s16(-1,0,0)) == true);
UASSERT(b.isValidPositionParent(v3s16(MAP_BLOCKSIZE-1,MAP_BLOCKSIZE-1,MAP_BLOCKSIZE)) == true);
n = b.getNodeParent(v3s16(0,0,MAP_BLOCKSIZE));
UASSERT(n.getContent() == 5);
/*
Set a node
*/
v3s16 p(1,2,0);
n.setContent(4);
b.setNode(p, n);
UASSERT(b.getNode(p).getContent() == 4);
//TODO: Update to new system
/*UASSERT(b.getNodeTile(p) == 4);
UASSERT(b.getNodeTile(v3s16(-1,-1,0)) == 5);*/
/*
propagateSunlight()
*/
// Set lighting of all nodes to 0
for(u16 z=0; z<MAP_BLOCKSIZE; z++){
for(u16 y=0; y<MAP_BLOCKSIZE; y++){
for(u16 x=0; x<MAP_BLOCKSIZE; x++){
MapNode n = b.getNode(v3s16(x,y,z));
n.setLight(LIGHTBANK_DAY, 0);
n.setLight(LIGHTBANK_NIGHT, 0);
b.setNode(v3s16(x,y,z), n);
}
}
}
{
/*
Check how the block handles being a lonely sky block
*/
parent.position_valid = true;
b.setIsUnderground(false);
parent.node.setContent(CONTENT_AIR);
parent.node.setLight(LIGHTBANK_DAY, LIGHT_SUN);
parent.node.setLight(LIGHTBANK_NIGHT, 0);
core::map<v3s16, bool> light_sources;
// The bottom block is invalid, because we have a shadowing node
UASSERT(b.propagateSunlight(light_sources) == false);
UASSERT(b.getNode(v3s16(1,4,0)).getLight(LIGHTBANK_DAY) == LIGHT_SUN);
UASSERT(b.getNode(v3s16(1,3,0)).getLight(LIGHTBANK_DAY) == LIGHT_SUN);
UASSERT(b.getNode(v3s16(1,2,0)).getLight(LIGHTBANK_DAY) == 0);
UASSERT(b.getNode(v3s16(1,1,0)).getLight(LIGHTBANK_DAY) == 0);
UASSERT(b.getNode(v3s16(1,0,0)).getLight(LIGHTBANK_DAY) == 0);
UASSERT(b.getNode(v3s16(1,2,3)).getLight(LIGHTBANK_DAY) == LIGHT_SUN);
UASSERT(b.getFaceLight2(1000, p, v3s16(0,1,0)) == LIGHT_SUN);
UASSERT(b.getFaceLight2(1000, p, v3s16(0,-1,0)) == 0);
UASSERT(b.getFaceLight2(0, p, v3s16(0,-1,0)) == 0);
// According to MapBlock::getFaceLight,
// The face on the z+ side should have double-diminished light
//UASSERT(b.getFaceLight(p, v3s16(0,0,1)) == diminish_light(diminish_light(LIGHT_MAX)));
// The face on the z+ side should have diminished light
UASSERT(b.getFaceLight2(1000, p, v3s16(0,0,1)) == diminish_light(LIGHT_MAX));
}
/*
Check how the block handles being in between blocks with some non-sunlight
while being underground
*/
{
// Make neighbours to exist and set some non-sunlight to them
parent.position_valid = true;
b.setIsUnderground(true);
parent.node.setLight(LIGHTBANK_DAY, LIGHT_MAX/2);
core::map<v3s16, bool> light_sources;
// The block below should be valid because there shouldn't be
// sunlight in there either
UASSERT(b.propagateSunlight(light_sources, true) == true);
// Should not touch nodes that are not affected (that is, all of them)
//UASSERT(b.getNode(v3s16(1,2,3)).getLight() == LIGHT_SUN);
// Should set light of non-sunlighted blocks to 0.
UASSERT(b.getNode(v3s16(1,2,3)).getLight(LIGHTBANK_DAY) == 0);
}
/*
Set up a situation where:
- There is only air in this block
- There is a valid non-sunlighted block at the bottom, and
- Invalid blocks elsewhere.
- the block is not underground.
This should result in bottom block invalidity
*/
{
b.setIsUnderground(false);
// Clear block
for(u16 z=0; z<MAP_BLOCKSIZE; z++){
for(u16 y=0; y<MAP_BLOCKSIZE; y++){
for(u16 x=0; x<MAP_BLOCKSIZE; x++){
MapNode n;
n.setContent(CONTENT_AIR);
n.setLight(LIGHTBANK_DAY, 0);
b.setNode(v3s16(x,y,z), n);
}
}
}
// Make neighbours invalid
parent.position_valid = false;
// Add exceptions to the top of the bottom block
for(u16 x=0; x<MAP_BLOCKSIZE; x++)
for(u16 z=0; z<MAP_BLOCKSIZE; z++)
{
parent.validity_exceptions.push_back(v3s16(MAP_BLOCKSIZE+x, MAP_BLOCKSIZE-1, MAP_BLOCKSIZE+z));
}
// Lighting value for the valid nodes
parent.node.setLight(LIGHTBANK_DAY, LIGHT_MAX/2);
core::map<v3s16, bool> light_sources;
// Bottom block is not valid
UASSERT(b.propagateSunlight(light_sources) == false);
}
}
};
struct TestMapSector: public TestBase
{
class TC : public NodeContainer
{
public:
MapNode node;
bool position_valid;
TC()
{
position_valid = true;
}
virtual bool isValidPosition(v3s16 p)
{
return position_valid;
}
virtual MapNode getNode(v3s16 p)
{
if(position_valid == false)
throw InvalidPositionException();
return node;
}
virtual void setNode(v3s16 p, MapNode & n)
{
if(position_valid == false)
throw InvalidPositionException();
};
virtual u16 nodeContainerId() const
{
return 666;
}
};
void Run()
{
TC parent;
parent.position_valid = false;
// Create one with no heightmaps
ServerMapSector sector(&parent, v2s16(1,1));
UASSERT(sector.getBlockNoCreateNoEx(0) == 0);
UASSERT(sector.getBlockNoCreateNoEx(1) == 0);
MapBlock * bref = sector.createBlankBlock(-2);
UASSERT(sector.getBlockNoCreateNoEx(0) == 0);
UASSERT(sector.getBlockNoCreateNoEx(-2) == bref);
//TODO: Check for AlreadyExistsException
/*bool exception_thrown = false;
try{
sector.getBlock(0);
}
catch(InvalidPositionException &e){
exception_thrown = true;
}
UASSERT(exception_thrown);*/
}
};
#endif

133
src/unittest/test.h Normal file
View File

@ -0,0 +1,133 @@
/*
Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#ifndef TEST_HEADER
#define TEST_HEADER
#include <exception>
#include <vector>
#include "irrlichttypes_extrabloated.h"
#include "porting.h"
#include "filesys.h"
#include "mapnode.h"
class TestFailedException : public std::exception {
};
// Runs a unit test and reports results
#define TEST(fxn, ...) do { \
u32 t1 = porting::getTime(PRECISION_MILLI); \
try { \
fxn(__VA_ARGS__); \
dstream << "[PASS] "; \
} catch (...) { \
dstream << "[FAIL] "; \
num_tests_failed++; \
} \
num_tests_run++; \
u32 tdiff = porting::getTime(PRECISION_MILLI) - t1; \
dstream << #fxn << " - " << tdiff << "ms" << std::endl; \
} while (0)
// Asserts the specified condition is true, or fails the current unit test
#define UASSERT(x) do { \
if (!(x)) { \
dstream << "Test assertion failed: " #x << std::endl \
<< " at " << fs::GetFilenameFromPath(__FILE__) \
<< ":" << __LINE__ << std::endl; \
throw TestFailedException(); \
} \
} while (0)
// Asserts the specified condition is true, or fails the current unit test
// and prints the format specifier fmt
#define UTEST(x, fmt, ...) do { \
if (!(x)) { \
char utest_buf[1024]; \
snprintf(utest_buf, sizeof(utest_buf), fmt, __VA_ARGS__); \
dstream << "Test assertion failed: " << utest_buf << std::endl \
<< " at " << fs::GetFilenameFromPath(__FILE__) \
<< ":" << __LINE__ << std::endl; \
throw TestFailedException(); \
} \
} while (0)
// Asserts the comparison specified by CMP is true, or fails the current unit test
#define UASSERTCMP(T, CMP, actual, expected) do { \
T a = (actual); \
T e = (expected); \
if (!(a CMP e)) { \
dstream << "Test assertion failed: " << #actual << " " << #CMP << " " \
<< #expected << std::endl \
<< " at " << fs::GetFilenameFromPath(__FILE__) << ":" \
<< __LINE__ << std::endl \
<< " actual: " << a << std::endl << " expected: " \
<< e << std::endl; \
throw TestFailedException(); \
} \
} while (0)
#define UASSERTEQ(T, actual, expected) UASSERTCMP(T, ==, actual, expected)
// UASSERTs that the specified exception occurs
#define EXCEPTION_CHECK(EType, code) do { \
bool exception_thrown = false; \
try { \
code; \
} catch (EType &e) { \
exception_thrown = true; \
} \
UASSERT(exception_thrown); \
} while (0)
class IGameDef;
class TestBase {
public:
bool testModule(IGameDef *gamedef);
virtual void runTests(IGameDef *gamedef) = 0;
virtual const char *getName() = 0;
u32 num_tests_failed;
u32 num_tests_run;
};
class TestManager {
public:
static std::vector<TestBase *> &getTestModules()
{
static std::vector<TestBase *> m_modules_to_test;
return m_modules_to_test;
}
static void registerTestModule(TestBase *module)
{
getTestModules().push_back(module);
}
};
// A few item and node definitions for those tests that need them
extern content_t CONTENT_STONE;
extern content_t CONTENT_GRASS;
extern content_t CONTENT_TORCH;
void run_tests();
#endif

180
src/unittest/test_collision.cpp Normal file
View File

@ -0,0 +1,180 @@
/*
Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "test.h"
#include "collision.h"
class TestCollision : public TestBase {
public:
TestCollision() { TestManager::registerTestModule(this); }
const char *getName() { return "TestCollision"; }
void runTests(IGameDef *gamedef);
void testAxisAlignedCollision();
};
static TestCollision g_test_instance;
void TestCollision::runTests(IGameDef *gamedef)
{
TEST(testAxisAlignedCollision);
}
////////////////////////////////////////////////////////////////////////////////
void TestCollision::testAxisAlignedCollision()
{
for (s16 bx = -3; bx <= 3; bx++)
for (s16 by = -3; by <= 3; by++)
for (s16 bz = -3; bz <= 3; bz++) {
// X-
{
aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
aabb3f m(bx-2, by, bz, bx-1, by+1, bz+1);
v3f v(1, 0, 0);
f32 dtime = 0;
UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
UASSERT(fabs(dtime - 1.000) < 0.001);
}
{
aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
aabb3f m(bx-2, by, bz, bx-1, by+1, bz+1);
v3f v(-1, 0, 0);
f32 dtime = 0;
UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == -1);
}
{
aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
aabb3f m(bx-2, by+1.5, bz, bx-1, by+2.5, bz-1);
v3f v(1, 0, 0);
f32 dtime;
UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == -1);
}
{
aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
aabb3f m(bx-2, by-1.5, bz, bx-1.5, by+0.5, bz+1);
v3f v(0.5, 0.1, 0);
f32 dtime;
UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
UASSERT(fabs(dtime - 3.000) < 0.001);
}
{
aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
aabb3f m(bx-2, by-1.5, bz, bx-1.5, by+0.5, bz+1);
v3f v(0.5, 0.1, 0);
f32 dtime;
UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
UASSERT(fabs(dtime - 3.000) < 0.001);
}
// X+
{
aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
aabb3f m(bx+2, by, bz, bx+3, by+1, bz+1);
v3f v(-1, 0, 0);
f32 dtime;
UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
UASSERT(fabs(dtime - 1.000) < 0.001);
}
{
aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
aabb3f m(bx+2, by, bz, bx+3, by+1, bz+1);
v3f v(1, 0, 0);
f32 dtime;
UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == -1);
}
{
aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
aabb3f m(bx+2, by, bz+1.5, bx+3, by+1, bz+3.5);
v3f v(-1, 0, 0);
f32 dtime;
UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == -1);
}
{
aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
aabb3f m(bx+2, by-1.5, bz, bx+2.5, by-0.5, bz+1);
v3f v(-0.5, 0.2, 0);
f32 dtime;
UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 1); // Y, not X!
UASSERT(fabs(dtime - 2.500) < 0.001);
}
{
aabb3f s(bx, by, bz, bx+1, by+1, bz+1);
aabb3f m(bx+2, by-1.5, bz, bx+2.5, by-0.5, bz+1);
v3f v(-0.5, 0.3, 0);
f32 dtime;
UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
UASSERT(fabs(dtime - 2.000) < 0.001);
}
// TODO: Y-, Y+, Z-, Z+
// misc
{
aabb3f s(bx, by, bz, bx+2, by+2, bz+2);
aabb3f m(bx+2.3, by+2.29, bz+2.29, bx+4.2, by+4.2, bz+4.2);
v3f v(-1./3, -1./3, -1./3);
f32 dtime;
UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
UASSERT(fabs(dtime - 0.9) < 0.001);
}
{
aabb3f s(bx, by, bz, bx+2, by+2, bz+2);
aabb3f m(bx+2.29, by+2.3, bz+2.29, bx+4.2, by+4.2, bz+4.2);
v3f v(-1./3, -1./3, -1./3);
f32 dtime;
UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 1);
UASSERT(fabs(dtime - 0.9) < 0.001);
}
{
aabb3f s(bx, by, bz, bx+2, by+2, bz+2);
aabb3f m(bx+2.29, by+2.29, bz+2.3, bx+4.2, by+4.2, bz+4.2);
v3f v(-1./3, -1./3, -1./3);
f32 dtime;
UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 2);
UASSERT(fabs(dtime - 0.9) < 0.001);
}
{
aabb3f s(bx, by, bz, bx+2, by+2, bz+2);
aabb3f m(bx-4.2, by-4.2, bz-4.2, bx-2.3, by-2.29, bz-2.29);
v3f v(1./7, 1./7, 1./7);
f32 dtime;
UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 0);
UASSERT(fabs(dtime - 16.1) < 0.001);
}
{
aabb3f s(bx, by, bz, bx+2, by+2, bz+2);
aabb3f m(bx-4.2, by-4.2, bz-4.2, bx-2.29, by-2.3, bz-2.29);
v3f v(1./7, 1./7, 1./7);
f32 dtime;
UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 1);
UASSERT(fabs(dtime - 16.1) < 0.001);
}
{
aabb3f s(bx, by, bz, bx+2, by+2, bz+2);
aabb3f m(bx-4.2, by-4.2, bz-4.2, bx-2.29, by-2.29, bz-2.3);
v3f v(1./7, 1./7, 1./7);
f32 dtime;
UASSERT(axisAlignedCollision(s, m, v, 0, dtime) == 2);
UASSERT(fabs(dtime - 16.1) < 0.001);
}
}
}

172
src/unittest/test_compression.cpp Normal file
View File

@ -0,0 +1,172 @@
/*
Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "test.h"
#include <sstream>
#include "irrlichttypes_extrabloated.h"
#include "log.h"
#include "serialization.h"
#include "nodedef.h"
#include "noise.h"
class TestCompression : public TestBase {
public:
TestCompression() { TestManager::registerTestModule(this); }
const char *getName() { return "TestCompression"; }
void runTests(IGameDef *gamedef);
void testRLECompression();
void testZlibCompression();
void testZlibLargeData();
};
static TestCompression g_test_instance;
void TestCompression::runTests(IGameDef *gamedef)
{
TEST(testRLECompression);
TEST(testZlibCompression);
TEST(testZlibLargeData);
}
////////////////////////////////////////////////////////////////////////////////
void TestCompression::testRLECompression()
{
SharedBuffer<u8> fromdata(4);
fromdata[0]=1;
fromdata[1]=5;
fromdata[2]=5;
fromdata[3]=1;
std::ostringstream os(std::ios_base::binary);
compress(fromdata, os, 0);
std::string str_out = os.str();
infostream << "str_out.size()="<<str_out.size()<<std::endl;
infostream << "TestCompress: 1,5,5,1 -> ";
for (u32 i = 0; i < str_out.size(); i++)
infostream << (u32)str_out[i] << ",";
infostream << std::endl;
UASSERT(str_out.size() == 10);
UASSERT(str_out[0] == 0);
UASSERT(str_out[1] == 0);
UASSERT(str_out[2] == 0);
UASSERT(str_out[3] == 4);
UASSERT(str_out[4] == 0);
UASSERT(str_out[5] == 1);
UASSERT(str_out[6] == 1);
UASSERT(str_out[7] == 5);
UASSERT(str_out[8] == 0);
UASSERT(str_out[9] == 1);
std::istringstream is(str_out, std::ios_base::binary);
std::ostringstream os2(std::ios_base::binary);
decompress(is, os2, 0);
std::string str_out2 = os2.str();
infostream << "decompress: ";
for (u32 i = 0; i < str_out2.size(); i++)
infostream << (u32)str_out2[i] << ",";
infostream << std::endl;
UASSERTEQ(size_t, str_out2.size(), fromdata.getSize());
for (u32 i = 0; i < str_out2.size(); i++)
UASSERT(str_out2[i] == fromdata[i]);
}
void TestCompression::testZlibCompression()
{
SharedBuffer<u8> fromdata(4);
fromdata[0]=1;
fromdata[1]=5;
fromdata[2]=5;
fromdata[3]=1;
std::ostringstream os(std::ios_base::binary);
compress(fromdata, os, SER_FMT_VER_HIGHEST_READ);
std::string str_out = os.str();
infostream << "str_out.size()=" << str_out.size() <<std::endl;
infostream << "TestCompress: 1,5,5,1 -> ";
for (u32 i = 0; i < str_out.size(); i++)
infostream << (u32)str_out[i] << ",";
infostream << std::endl;
std::istringstream is(str_out, std::ios_base::binary);
std::ostringstream os2(std::ios_base::binary);
decompress(is, os2, SER_FMT_VER_HIGHEST_READ);
std::string str_out2 = os2.str();
infostream << "decompress: ";
for (u32 i = 0; i < str_out2.size(); i++)
infostream << (u32)str_out2[i] << ",";
infostream << std::endl;
UASSERTEQ(size_t, str_out2.size(), fromdata.getSize());
for (u32 i = 0; i < str_out2.size(); i++)
UASSERT(str_out2[i] == fromdata[i]);
}
void TestCompression::testZlibLargeData()
{
infostream << "Test: Testing zlib wrappers with a large amount "
"of pseudorandom data" << std::endl;
u32 size = 50000;
infostream << "Test: Input size of large compressZlib is "
<< size << std::endl;
std::string data_in;
data_in.resize(size);
PseudoRandom pseudorandom(9420);
for (u32 i = 0; i < size; i++)
data_in[i] = pseudorandom.range(0, 255);
std::ostringstream os_compressed(std::ios::binary);
compressZlib(data_in, os_compressed);
infostream << "Test: Output size of large compressZlib is "
<< os_compressed.str().size()<<std::endl;
std::istringstream is_compressed(os_compressed.str(), std::ios::binary);
std::ostringstream os_decompressed(std::ios::binary);
decompressZlib(is_compressed, os_decompressed);
infostream << "Test: Output size of large decompressZlib is "
<< os_decompressed.str().size() << std::endl;
std::string str_decompressed = os_decompressed.str();
UASSERTEQ(size_t, str_decompressed.size(), data_in.size());
for (u32 i = 0; i < size && i < str_decompressed.size(); i++) {
UTEST(str_decompressed[i] == data_in[i],
"index out[%i]=%i differs from in[%i]=%i",
i, str_decompressed[i], i, data_in[i]);
}
}

348
src/unittest/test_connection.cpp Normal file
View File

@ -0,0 +1,348 @@
/*
Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "test.h"
#include "log.h"
#include "socket.h"
#include "settings.h"
#include "util/serialize.h"
#include "network/connection.h"
class TestConnection : public TestBase {
public:
TestConnection()
{
if (INTERNET_SIMULATOR == false)
TestManager::registerTestModule(this);
}
const char *getName() { return "TestConnection"; }
void runTests(IGameDef *gamedef);
void testHelpers();
void testConnectSendReceive();
};
static TestConnection g_test_instance;
void TestConnection::runTests(IGameDef *gamedef)
{
TEST(testHelpers);
TEST(testConnectSendReceive);
}
////////////////////////////////////////////////////////////////////////////////
struct Handler : public con::PeerHandler
{
Handler(const char *a_name)
{
count = 0;
last_id = 0;
name = a_name;
}
void peerAdded(con::Peer *peer)
{
infostream << "Handler(" << name << ")::peerAdded(): "
"id=" << peer->id << std::endl;
last_id = peer->id;
count++;
}
void deletingPeer(con::Peer *peer, bool timeout)
{
infostream << "Handler(" << name << ")::deletingPeer(): "
"id=" << peer->id << ", timeout=" << timeout << std::endl;
last_id = peer->id;
count--;
}
s32 count;
u16 last_id;
const char *name;
};
void TestConnection::testHelpers()
{
// Some constants for testing
u32 proto_id = 0x12345678;
u16 peer_id = 123;
u8 channel = 2;
SharedBuffer<u8> data1(1);
data1[0] = 100;
Address a(127,0,0,1, 10);
const u16 seqnum = 34352;
con::BufferedPacket p1 = con::makePacket(a, data1,
proto_id, peer_id, channel);
/*
We should now have a packet with this data:
Header:
[0] u32 protocol_id
[4] u16 sender_peer_id
[6] u8 channel
Data:
[7] u8 data1[0]
*/
UASSERT(readU32(&p1.data[0]) == proto_id);
UASSERT(readU16(&p1.data[4]) == peer_id);
UASSERT(readU8(&p1.data[6]) == channel);
UASSERT(readU8(&p1.data[7]) == data1[0]);
//infostream<<"initial data1[0]="<<((u32)data1[0]&0xff)<<std::endl;
SharedBuffer<u8> p2 = con::makeReliablePacket(data1, seqnum);
/*infostream<<"p2.getSize()="<<p2.getSize()<<", data1.getSize()="
<<data1.getSize()<<std::endl;
infostream<<"readU8(&p2[3])="<<readU8(&p2[3])
<<" p2[3]="<<((u32)p2[3]&0xff)<<std::endl;
infostream<<"data1[0]="<<((u32)data1[0]&0xff)<<std::endl;*/
UASSERT(p2.getSize() == 3 + data1.getSize());
UASSERT(readU8(&p2[0]) == TYPE_RELIABLE);
UASSERT(readU16(&p2[1]) == seqnum);
UASSERT(readU8(&p2[3]) == data1[0]);
}
void TestConnection::testConnectSendReceive()
{
DSTACK("TestConnection::Run");
/*
Test some real connections
NOTE: This mostly tests the legacy interface.
*/
u32 proto_id = 0xad26846a;
Handler hand_server("server");
Handler hand_client("client");
Address address(0, 0, 0, 0, 30001);
Address bind_addr(0, 0, 0, 0, 30001);
/*
* Try to use the bind_address for servers with no localhost address
* For example: FreeBSD jails
*/
std::string bind_str = g_settings->get("bind_address");
try {
bind_addr.Resolve(bind_str.c_str());
if (!bind_addr.isIPv6()) {
address = bind_addr;
}
} catch (ResolveError &e) {
}
infostream << "** Creating server Connection" << std::endl;
con::Connection server(proto_id, 512, 5.0, false, &hand_server);
server.Serve(address);
infostream << "** Creating client Connection" << std::endl;
con::Connection client(proto_id, 512, 5.0, false, &hand_client);
UASSERT(hand_server.count == 0);
UASSERT(hand_client.count == 0);
sleep_ms(50);
Address server_address(127, 0, 0, 1, 30001);
if (address != Address(0, 0, 0, 0, 30001)) {
server_address = bind_addr;
}
infostream << "** running client.Connect()" << std::endl;
client.Connect(server_address);
sleep_ms(50);
// Client should not have added client yet
UASSERT(hand_client.count == 0);
try {
NetworkPacket pkt;
infostream << "** running client.Receive()" << std::endl;
client.Receive(&pkt);
infostream << "** Client received: peer_id=" << pkt.getPeerId()
<< ", size=" << pkt.getSize() << std::endl;
} catch (con::NoIncomingDataException &e) {
}
// Client should have added server now
UASSERT(hand_client.count == 1);
UASSERT(hand_client.last_id == 1);
// Server should not have added client yet
UASSERT(hand_server.count == 0);
sleep_ms(100);
try {
NetworkPacket pkt;
infostream << "** running server.Receive()" << std::endl;
server.Receive(&pkt);
infostream << "** Server received: peer_id=" << pkt.getPeerId()
<< ", size=" << pkt.getSize()
<< std::endl;
} catch (con::NoIncomingDataException &e) {
// No actual data received, but the client has
// probably been connected
}
// Client should be the same
UASSERT(hand_client.count == 1);
UASSERT(hand_client.last_id == 1);
// Server should have the client
UASSERT(hand_server.count == 1);
UASSERT(hand_server.last_id == 2);
//sleep_ms(50);
while (client.Connected() == false) {
try {
NetworkPacket pkt;
infostream << "** running client.Receive()" << std::endl;
client.Receive(&pkt);
infostream << "** Client received: peer_id=" << pkt.getPeerId()
<< ", size=" << pkt.getSize() << std::endl;
} catch (con::NoIncomingDataException &e) {
}
sleep_ms(50);
}
sleep_ms(50);
try {
NetworkPacket pkt;
infostream << "** running server.Receive()" << std::endl;
server.Receive(&pkt);
infostream << "** Server received: peer_id=" << pkt.getPeerId()
<< ", size=" << pkt.getSize()
<< std::endl;
} catch (con::NoIncomingDataException &e) {
}
/*
Simple send-receive test
*/
{
NetworkPacket pkt;
pkt.putRawPacket((u8*) "Hello World !", 14, 0);
Buffer<u8> sentdata = pkt.oldForgePacket();
infostream<<"** running client.Send()"<<std::endl;
client.Send(PEER_ID_SERVER, 0, &pkt, true);
sleep_ms(50);
NetworkPacket recvpacket;
infostream << "** running server.Receive()" << std::endl;
server.Receive(&recvpacket);
infostream << "** Server received: peer_id=" << pkt.getPeerId()
<< ", size=" << pkt.getSize()
<< ", data=" << (const char*)pkt.getU8Ptr(0)
<< std::endl;
Buffer<u8> recvdata = pkt.oldForgePacket();
UASSERT(memcmp(*sentdata, *recvdata, recvdata.getSize()) == 0);
}
u16 peer_id_client = 2;
/*
Send a large packet
*/
{
const int datasize = 30000;
NetworkPacket pkt(0, datasize);
for (u16 i=0; i<datasize; i++) {
pkt << (u8) i/4;
}
infostream << "Sending data (size=" << datasize << "):";
for (int i = 0; i < datasize && i < 20; i++) {
if (i % 2 == 0)
infostream << " ";
char buf[10];
snprintf(buf, 10, "%.2X",
((int)((const char *)pkt.getU8Ptr(0))[i]) & 0xff);
infostream<<buf;
}
if (datasize > 20)
infostream << "...";
infostream << std::endl;
Buffer<u8> sentdata = pkt.oldForgePacket();
server.Send(peer_id_client, 0, &pkt, true);
//sleep_ms(3000);
Buffer<u8> recvdata;
infostream << "** running client.Receive()" << std::endl;
u16 peer_id = 132;
u16 size = 0;
bool received = false;
u32 timems0 = porting::getTimeMs();
for (;;) {
if (porting::getTimeMs() - timems0 > 5000 || received)
break;
try {
NetworkPacket pkt;
client.Receive(&pkt);
size = pkt.getSize();
peer_id = pkt.getPeerId();
recvdata = pkt.oldForgePacket();
received = true;
} catch (con::NoIncomingDataException &e) {
}
sleep_ms(10);
}
UASSERT(received);
infostream << "** Client received: peer_id=" << peer_id
<< ", size=" << size << std::endl;
infostream << "Received data (size=" << size << "): ";
for (int i = 0; i < size && i < 20; i++) {
if (i % 2 == 0)
infostream << " ";
char buf[10];
snprintf(buf, 10, "%.2X", ((int)(recvdata[i])) & 0xff);
infostream << buf;
}
if (size > 20)
infostream << "...";
infostream << std::endl;
UASSERT(memcmp(*sentdata, *recvdata, recvdata.getSize()) == 0);
UASSERT(peer_id == PEER_ID_SERVER);
}
// Check peer handlers
UASSERT(hand_client.count == 1);
UASSERT(hand_client.last_id == 1);
UASSERT(hand_server.count == 1);
UASSERT(hand_server.last_id == 2);
}

261
src/unittest/test_filepath.cpp Normal file
View File

@ -0,0 +1,261 @@
/*
Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "test.h"
#include <sstream>
#include "log.h"
#include "serialization.h"
#include "nodedef.h"
#include "noise.h"
class TestFilePath : public TestBase {
public:
TestFilePath() { TestManager::registerTestModule(this); }
const char *getName() { return "TestFilePath"; }
void runTests(IGameDef *gamedef);
void testIsDirDelimiter();
void testPathStartsWith();
void testRemoveLastPathComponent();
void testRemoveLastPathComponentWithTrailingDelimiter();
void testRemoveRelativePathComponent();
};
static TestFilePath g_test_instance;
void TestFilePath::runTests(IGameDef *gamedef)
{
TEST(testIsDirDelimiter);
TEST(testPathStartsWith);
TEST(testRemoveLastPathComponent);
TEST(testRemoveLastPathComponentWithTrailingDelimiter);
TEST(testRemoveRelativePathComponent);
}
////////////////////////////////////////////////////////////////////////////////
// adjusts a POSIX path to system-specific conventions
// -> changes '/' to DIR_DELIM
// -> absolute paths start with "C:\\" on windows
std::string p(std::string path)
{
for (size_t i = 0; i < path.size(); ++i) {
if (path[i] == '/') {
path.replace(i, 1, DIR_DELIM);
i += std::string(DIR_DELIM).size() - 1; // generally a no-op
}
}
#ifdef _WIN32
if (path[0] == '\\')
path = "C:" + path;
#endif
return path;
}
void TestFilePath::testIsDirDelimiter()
{
UASSERT(fs::IsDirDelimiter('/') == true);
UASSERT(fs::IsDirDelimiter('A') == false);
UASSERT(fs::IsDirDelimiter(0) == false);
#ifdef _WIN32
UASSERT(fs::IsDirDelimiter('\\') == true);
#else
UASSERT(fs::IsDirDelimiter('\\') == false);
#endif
}
void TestFilePath::testPathStartsWith()
{
const int numpaths = 12;
std::string paths[numpaths] = {
"",
p("/"),
p("/home/user/minetest"),
p("/home/user/minetest/bin"),
p("/home/user/.minetest"),
p("/tmp/dir/file"),
p("/tmp/file/"),
p("/tmP/file"),
p("/tmp"),
p("/tmp/dir"),
p("/home/user2/minetest/worlds"),
p("/home/user2/minetest/world"),
};
/*
expected fs::PathStartsWith results
0 = returns false
1 = returns true
2 = returns false on windows, true elsewhere
3 = returns true on windows, false elsewhere
4 = returns true if and only if
FILESYS_CASE_INSENSITIVE is true
*/
int expected_results[numpaths][numpaths] = {
{1,2,0,0,0,0,0,0,0,0,0,0},
{1,1,0,0,0,0,0,0,0,0,0,0},
{1,1,1,0,0,0,0,0,0,0,0,0},
{1,1,1,1,0,0,0,0,0,0,0,0},
{1,1,0,0,1,0,0,0,0,0,0,0},
{1,1,0,0,0,1,0,0,1,1,0,0},
{1,1,0,0,0,0,1,4,1,0,0,0},
{1,1,0,0,0,0,4,1,4,0,0,0},
{1,1,0,0,0,0,0,0,1,0,0,0},
{1,1,0,0,0,0,0,0,1,1,0,0},
{1,1,0,0,0,0,0,0,0,0,1,0},
{1,1,0,0,0,0,0,0,0,0,0,1},
};
for (int i = 0; i < numpaths; i++)
for (int j = 0; j < numpaths; j++){
/*verbosestream<<"testing fs::PathStartsWith(\""
<<paths[i]<<"\", \""
<<paths[j]<<"\")"<<std::endl;*/
bool starts = fs::PathStartsWith(paths[i], paths[j]);
int expected = expected_results[i][j];
if(expected == 0){
UASSERT(starts == false);
}
else if(expected == 1){
UASSERT(starts == true);
}
#ifdef _WIN32
else if(expected == 2){
UASSERT(starts == false);
}
else if(expected == 3){
UASSERT(starts == true);
}
#else
else if(expected == 2){
UASSERT(starts == true);
}
else if(expected == 3){
UASSERT(starts == false);
}
#endif
else if(expected == 4){
UASSERT(starts == (bool)FILESYS_CASE_INSENSITIVE);
}
}
}
void TestFilePath::testRemoveLastPathComponent()
{
std::string path, result, removed;
UASSERT(fs::RemoveLastPathComponent("") == "");
path = p("/home/user/minetest/bin/..//worlds/world1");
result = fs::RemoveLastPathComponent(path, &removed, 0);
UASSERT(result == path);
UASSERT(removed == "");
result = fs::RemoveLastPathComponent(path, &removed, 1);
UASSERT(result == p("/home/user/minetest/bin/..//worlds"));
UASSERT(removed == p("world1"));
result = fs::RemoveLastPathComponent(path, &removed, 2);
UASSERT(result == p("/home/user/minetest/bin/.."));
UASSERT(removed == p("worlds/world1"));
result = fs::RemoveLastPathComponent(path, &removed, 3);
UASSERT(result == p("/home/user/minetest/bin"));
UASSERT(removed == p("../worlds/world1"));
result = fs::RemoveLastPathComponent(path, &removed, 4);
UASSERT(result == p("/home/user/minetest"));
UASSERT(removed == p("bin/../worlds/world1"));
result = fs::RemoveLastPathComponent(path, &removed, 5);
UASSERT(result == p("/home/user"));
UASSERT(removed == p("minetest/bin/../worlds/world1"));
result = fs::RemoveLastPathComponent(path, &removed, 6);
UASSERT(result == p("/home"));
UASSERT(removed == p("user/minetest/bin/../worlds/world1"));
result = fs::RemoveLastPathComponent(path, &removed, 7);
#ifdef _WIN32
UASSERT(result == "C:");
#else
UASSERT(result == "");
#endif
UASSERT(removed == p("home/user/minetest/bin/../worlds/world1"));
}
void TestFilePath::testRemoveLastPathComponentWithTrailingDelimiter()
{
std::string path, result, removed;
path = p("/home/user/minetest/bin/..//worlds/world1/");
result = fs::RemoveLastPathComponent(path, &removed, 0);
UASSERT(result == path);
UASSERT(removed == "");
result = fs::RemoveLastPathComponent(path, &removed, 1);
UASSERT(result == p("/home/user/minetest/bin/..//worlds"));
UASSERT(removed == p("world1"));
result = fs::RemoveLastPathComponent(path, &removed, 2);
UASSERT(result == p("/home/user/minetest/bin/.."));
UASSERT(removed == p("worlds/world1"));
result = fs::RemoveLastPathComponent(path, &removed, 3);
UASSERT(result == p("/home/user/minetest/bin"));
UASSERT(removed == p("../worlds/world1"));
result = fs::RemoveLastPathComponent(path, &removed, 4);
UASSERT(result == p("/home/user/minetest"));
UASSERT(removed == p("bin/../worlds/world1"));
result = fs::RemoveLastPathComponent(path, &removed, 5);
UASSERT(result == p("/home/user"));
UASSERT(removed == p("minetest/bin/../worlds/world1"));
result = fs::RemoveLastPathComponent(path, &removed, 6);
UASSERT(result == p("/home"));
UASSERT(removed == p("user/minetest/bin/../worlds/world1"));
result = fs::RemoveLastPathComponent(path, &removed, 7);
#ifdef _WIN32
UASSERT(result == "C:");
#else
UASSERT(result == "");
#endif
UASSERT(removed == p("home/user/minetest/bin/../worlds/world1"));
}
void TestFilePath::testRemoveRelativePathComponent()
{
std::string path, result, removed;
path = p("/home/user/minetest/bin");
result = fs::RemoveRelativePathComponents(path);
UASSERT(result == path);
path = p("/home/user/minetest/bin/../worlds/world1");
result = fs::RemoveRelativePathComponents(path);
UASSERT(result == p("/home/user/minetest/worlds/world1"));
path = p("/home/user/minetest/bin/../worlds/world1/");
result = fs::RemoveRelativePathComponents(path);
UASSERT(result == p("/home/user/minetest/worlds/world1"));
path = p(".");
result = fs::RemoveRelativePathComponents(path);
UASSERT(result == "");
path = p("./subdir/../..");
result = fs::RemoveRelativePathComponents(path);
UASSERT(result == "");
path = p("/a/b/c/.././../d/../e/f/g/../h/i/j/../../../..");
result = fs::RemoveRelativePathComponents(path);
UASSERT(result == p("/a/e"));
}

143
src/unittest/test_inventory.cpp Normal file
View File

@ -0,0 +1,143 @@
/*
Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "test.h"
#include <sstream>
#include "gamedef.h"
#include "inventory.h"
class TestInventory : public TestBase {
public:
TestInventory() { TestManager::registerTestModule(this); }
const char *getName() { return "TestInventory"; }
void runTests(IGameDef *gamedef);
void testSerializeDeserialize(IItemDefManager *idef);
static const char *serialized_inventory;
static const char *serialized_inventory_2;
};
static TestInventory g_test_instance;
void TestInventory::runTests(IGameDef *gamedef)
{
TEST(testSerializeDeserialize, gamedef->getItemDefManager());
}
////////////////////////////////////////////////////////////////////////////////
void TestInventory::testSerializeDeserialize(IItemDefManager *idef)
{
Inventory inv(idef);
std::istringstream is(serialized_inventory, std::ios::binary);
inv.deSerialize(is);
UASSERT(inv.getList("0"));
UASSERT(!inv.getList("main"));
inv.getList("0")->setName("main");
UASSERT(!inv.getList("0"));
UASSERT(inv.getList("main"));
UASSERTEQ(u32, inv.getList("main")->getWidth(), 3);
inv.getList("main")->setWidth(5);
std::ostringstream inv_os(std::ios::binary);
inv.serialize(inv_os);
UASSERTEQ(std::string, inv_os.str(), serialized_inventory_2);
}
const char *TestInventory::serialized_inventory =
"List 0 32\n"
"Width 3\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Item default:cobble 61\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Item default:dirt 71\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Item default:dirt 99\n"
"Item default:cobble 38\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"EndInventoryList\n"
"EndInventory\n";
const char *TestInventory::serialized_inventory_2 =
"List main 32\n"
"Width 5\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Item default:cobble 61\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Item default:dirt 71\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Item default:dirt 99\n"
"Item default:cobble 38\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"Empty\n"
"EndInventoryList\n"
"EndInventory\n";

58
src/unittest/test_mapnode.cpp Normal file
View File

@ -0,0 +1,58 @@
/*
Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "test.h"
#include "gamedef.h"
#include "nodedef.h"
#include "content_mapnode.h"
class TestMapNode : public TestBase {
public:
TestMapNode() { TestManager::registerTestModule(this); }
const char *getName() { return "TestMapNode"; }
void runTests(IGameDef *gamedef);
void testNodeProperties(INodeDefManager *nodedef);
};
static TestMapNode g_test_instance;
void TestMapNode::runTests(IGameDef *gamedef)
{
TEST(testNodeProperties, gamedef->getNodeDefManager());
}
////////////////////////////////////////////////////////////////////////////////
void TestMapNode::testNodeProperties(INodeDefManager *nodedef)
{
MapNode n(CONTENT_AIR);
UASSERT(n.getContent() == CONTENT_AIR);
UASSERT(n.getLight(LIGHTBANK_DAY, nodedef) == 0);
UASSERT(n.getLight(LIGHTBANK_NIGHT, nodedef) == 0);
// Transparency
n.setContent(CONTENT_AIR);
UASSERT(nodedef->get(n).light_propagates == true);
n.setContent(LEGN(nodedef, "CONTENT_STONE"));
UASSERT(nodedef->get(n).light_propagates == false);
}

66
src/unittest/test_nodedef.cpp Normal file
View File

@ -0,0 +1,66 @@
/*
Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "test.h"
#include <sstream>
#include "gamedef.h"
#include "nodedef.h"
#include "network/networkprotocol.h"
class TestNodeDef : public TestBase {
public:
TestNodeDef() { TestManager::registerTestModule(this); }
const char *getName() { return "TestNodeDef"; }
void runTests(IGameDef *gamedef);
void testContentFeaturesSerialization();
};
static TestNodeDef g_test_instance;
void TestNodeDef::runTests(IGameDef *gamedef)
{
TEST(testContentFeaturesSerialization);
}
////////////////////////////////////////////////////////////////////////////////
void TestNodeDef::testContentFeaturesSerialization()
{
ContentFeatures f;
f.name = "default:stone";
for (int i = 0; i < 6; i++)
f.tiledef[i].name = "default_stone.png";
f.is_ground_content = true;
std::ostringstream os(std::ios::binary);
f.serialize(os, LATEST_PROTOCOL_VERSION);
//verbosestream<<"Test ContentFeatures size: "<<os.str().size()<<std::endl;
std::istringstream is(os.str(), std::ios::binary);
ContentFeatures f2;
f2.deSerialize(is);
UASSERT(f.walkable == f2.walkable);
UASSERT(f.node_box.type == f2.node_box.type);
}

285
src/unittest/test_noise.cpp Normal file
View File

@ -0,0 +1,285 @@
/*
Minetest
Copyright (C) 2010-2014 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "test.h"
#include "exceptions.h"
#include "noise.h"
class TestNoise : public TestBase {
public:
TestNoise() { TestManager::registerTestModule(this); }
const char *getName() { return "TestNoise"; }
void runTests(IGameDef *gamedef);
void testNoise2dPoint();
void testNoise2dBulk();
void testNoise3dPoint();
void testNoise3dBulk();
void testNoiseInvalidParams();
static const float expected_2d_results[10 * 10];
static const float expected_3d_results[10 * 10 * 10];
};
static TestNoise g_test_instance;
void TestNoise::runTests(IGameDef *gamedef)
{
TEST(testNoise2dPoint);
TEST(testNoise2dBulk);
TEST(testNoise3dPoint);
TEST(testNoise3dBulk);
TEST(testNoiseInvalidParams);
}
////////////////////////////////////////////////////////////////////////////////
void TestNoise::testNoise2dPoint()
{
NoiseParams np_normal(20, 40, v3f(50, 50, 50), 9, 5, 0.6, 2.0);
u32 i = 0;
for (u32 y = 0; y != 10; y++)
for (u32 x = 0; x != 10; x++, i++) {
float actual = NoisePerlin2D(&np_normal, x, y, 1337);
float expected = expected_2d_results[i];
UASSERT(fabs(actual - expected) <= 0.00001);
}
}
void TestNoise::testNoise2dBulk()
{
NoiseParams np_normal(20, 40, v3f(50, 50, 50), 9, 5, 0.6, 2.0);
Noise noise_normal_2d(&np_normal, 1337, 10, 10);
float *noisevals = noise_normal_2d.perlinMap2D(0, 0, NULL);
for (u32 i = 0; i != 10 * 10; i++) {
float actual = noisevals[i];
float expected = expected_2d_results[i];
UASSERT(fabs(actual - expected) <= 0.00001);
}
}
void TestNoise::testNoise3dPoint()
{
NoiseParams np_normal(20, 40, v3f(50, 50, 50), 9, 5, 0.6, 2.0);
u32 i = 0;
for (u32 z = 0; z != 10; z++)
for (u32 y = 0; y != 10; y++)
for (u32 x = 0; x != 10; x++, i++) {
float actual = NoisePerlin3D(&np_normal, x, y, z, 1337);
float expected = expected_3d_results[i];
UASSERT(fabs(actual - expected) <= 0.00001);
}
}
void TestNoise::testNoise3dBulk()
{
NoiseParams np_normal(20, 40, v3f(50, 50, 50), 9, 5, 0.6, 2.0);
Noise noise_normal_3d(&np_normal, 1337, 10, 10, 10);
float *noisevals = noise_normal_3d.perlinMap3D(0, 0, 0, NULL);
for (u32 i = 0; i != 10 * 10 * 10; i++) {
float actual = noisevals[i];
float expected = expected_3d_results[i];
UASSERT(fabs(actual - expected) <= 0.00001);
}
}
void TestNoise::testNoiseInvalidParams()
{
bool exception_thrown = false;
try {
NoiseParams np_highmem(4, 70, v3f(1, 1, 1), 5, 60, 0.7, 10.0);
Noise noise_highmem_3d(&np_highmem, 1337, 200, 200, 200);
noise_highmem_3d.perlinMap3D(0, 0, 0, NULL);
} catch (InvalidNoiseParamsException) {
exception_thrown = true;
}
UASSERT(exception_thrown);
}
const float TestNoise::expected_2d_results[10 * 10] = {
19.11726, 18.49626, 16.48476, 15.02135, 14.75713, 16.26008, 17.54822,
18.06860, 18.57016, 18.48407, 18.49649, 17.89160, 15.94162, 14.54901,
14.31298, 15.72643, 16.94669, 17.55494, 18.58796, 18.87925, 16.08101,
15.53764, 13.83844, 12.77139, 12.73648, 13.95632, 14.97904, 15.81829,
18.37694, 19.73759, 13.19182, 12.71924, 11.34560, 10.78025, 11.18980,
12.52303, 13.45012, 14.30001, 17.43298, 19.15244, 10.93217, 10.48625,
9.30923, 9.18632, 10.16251, 12.11264, 13.19697, 13.80801, 16.39567,
17.66203, 10.40222, 9.86070, 8.47223, 8.45471, 10.04780, 13.54730,
15.33709, 15.48503, 16.46177, 16.52508, 10.80333, 10.19045, 8.59420,
8.47646, 10.22676, 14.43173, 16.48353, 16.24859, 16.20863, 15.52847,
11.01179, 10.45209, 8.98678, 8.83986, 10.43004, 14.46054, 16.29387,
15.73521, 15.01744, 13.85542, 10.55201, 10.33375, 9.85102, 10.07821,
11.58235, 15.62046, 17.35505, 16.13181, 12.66011, 9.51853, 11.50994,
11.54074, 11.77989, 12.29790, 13.76139, 17.81982, 19.49008, 17.79470,
12.34344, 7.78363,
};
const float TestNoise::expected_3d_results[10 * 10 * 10] = {
19.11726, 18.01059, 16.90392, 15.79725, 16.37154, 17.18597, 18.00040,
18.33467, 18.50889, 18.68311, 17.85386, 16.90585, 15.95785, 15.00985,
15.61132, 16.43415, 17.25697, 17.95415, 18.60942, 19.26471, 16.59046,
15.80112, 15.01178, 14.22244, 14.85110, 15.68232, 16.51355, 17.57361,
18.70996, 19.84631, 15.32705, 14.69638, 14.06571, 13.43504, 14.09087,
14.93050, 15.77012, 17.19309, 18.81050, 20.42790, 15.06729, 14.45855,
13.84981, 13.24107, 14.39364, 15.79782, 17.20201, 18.42640, 19.59085,
20.75530, 14.95090, 14.34456, 13.73821, 13.13187, 14.84825, 16.89645,
18.94465, 19.89025, 20.46832, 21.04639, 14.83452, 14.23057, 13.62662,
13.02267, 15.30287, 17.99508, 20.68730, 21.35411, 21.34580, 21.33748,
15.39817, 15.03590, 14.67364, 14.31137, 16.78242, 19.65824, 22.53405,
22.54626, 21.60395, 20.66164, 16.18850, 16.14768, 16.10686, 16.06603,
18.60362, 21.50956, 24.41549, 23.64784, 21.65566, 19.66349, 16.97884,
17.25946, 17.54008, 17.82069, 20.42482, 23.36088, 26.29694, 24.74942,
21.70738, 18.66534, 18.78506, 17.51834, 16.25162, 14.98489, 15.14217,
15.50287, 15.86357, 16.40597, 17.00895, 17.61193, 18.20160, 16.98795,
15.77430, 14.56065, 14.85059, 15.35533, 15.86007, 16.63399, 17.49763,
18.36128, 17.61814, 16.45757, 15.29699, 14.13641, 14.55902, 15.20779,
15.85657, 16.86200, 17.98632, 19.11064, 17.03468, 15.92718, 14.81968,
13.71218, 14.26744, 15.06026, 15.85306, 17.09001, 18.47501, 19.86000,
16.67870, 15.86256, 15.04641, 14.23026, 15.31397, 16.66909, 18.02420,
18.89042, 19.59369, 20.29695, 16.35522, 15.86447, 15.37372, 14.88297,
16.55165, 18.52883, 20.50600, 20.91547, 20.80237, 20.68927, 16.03174,
15.86639, 15.70103, 15.53568, 17.78933, 20.38857, 22.98780, 22.94051,
22.01105, 21.08159, 16.42434, 16.61407, 16.80381, 16.99355, 19.16133,
21.61169, 24.06204, 23.65252, 22.28970, 20.92689, 17.05562, 17.61035,
18.16508, 18.71981, 20.57809, 22.62260, 24.66711, 23.92686, 22.25835,
20.58984, 17.68691, 18.60663, 19.52635, 20.44607, 21.99486, 23.63352,
25.27217, 24.20119, 22.22699, 20.25279, 18.45285, 17.02608, 15.59931,
14.17254, 13.91279, 13.81976, 13.72674, 14.47727, 15.50900, 16.54073,
18.54934, 17.07005, 15.59076, 14.11146, 14.08987, 14.27651, 14.46316,
15.31383, 16.38584, 17.45785, 18.64582, 17.11401, 15.58220, 14.05039,
14.26694, 14.73326, 15.19958, 16.15038, 17.26268, 18.37498, 18.74231,
17.15798, 15.57364, 13.98932, 14.44402, 15.19001, 15.93600, 16.98694,
18.13952, 19.29210, 18.29012, 17.26656, 16.24301, 15.21946, 16.23430,
17.54035, 18.84639, 19.35445, 19.59653, 19.83860, 17.75954, 17.38438,
17.00923, 16.63407, 18.25505, 20.16120, 22.06734, 21.94068, 21.13642,
20.33215, 17.22896, 17.50220, 17.77544, 18.04868, 20.27580, 22.78205,
25.28829, 24.52691, 22.67631, 20.82571, 17.45050, 18.19224, 18.93398,
19.67573, 21.54024, 23.56514, 25.59004, 24.75878, 22.97546, 21.19213,
17.92274, 19.07302, 20.22330, 21.37358, 22.55256, 23.73565, 24.91873,
24.20587, 22.86103, 21.51619, 18.39499, 19.95381, 21.51263, 23.07145,
23.56490, 23.90615, 24.24741, 23.65296, 22.74660, 21.84024, 18.12065,
16.53382, 14.94700, 13.36018, 12.68341, 12.13666, 11.58990, 12.54858,
14.00906, 15.46955, 18.89708, 17.15214, 15.40721, 13.66227, 13.32914,
13.19769, 13.06625, 13.99367, 15.27405, 16.55443, 19.67351, 17.77046,
15.86741, 13.96436, 13.97486, 14.25873, 14.54260, 15.43877, 16.53904,
17.63931, 20.44994, 18.38877, 16.32761, 14.26645, 14.62059, 15.31977,
16.01895, 16.88387, 17.80403, 18.72419, 19.90153, 18.67057, 17.43962,
16.20866, 17.15464, 18.41161, 19.66858, 19.81848, 19.59936, 19.38024,
19.16386, 18.90429, 18.64473, 18.38517, 19.95845, 21.79357, 23.62868,
22.96589, 21.47046, 19.97503, 18.42618, 19.13802, 19.84985, 20.56168,
22.76226, 25.17553, 27.58879, 26.11330, 23.34156, 20.56982, 18.47667,
19.77041, 21.06416, 22.35790, 23.91914, 25.51859, 27.11804, 25.86504,
23.66121, 21.45738, 18.78986, 20.53570, 22.28153, 24.02736, 24.52704,
24.84869, 25.17035, 24.48488, 23.46371, 22.44254, 19.10306, 21.30098,
23.49890, 25.69682, 25.13494, 24.17879, 23.22265, 23.10473, 23.26621,
23.42769, 17.93453, 16.72707, 15.51962, 14.31216, 12.96039, 11.58800,
10.21561, 11.29675, 13.19573, 15.09471, 18.05853, 16.85308, 15.64762,
14.44216, 13.72634, 13.08047, 12.43459, 13.48912, 15.11045, 16.73179,
18.18253, 16.97908, 15.77562, 14.57217, 14.49229, 14.57293, 14.65357,
15.68150, 17.02518, 18.36887, 18.30654, 17.10508, 15.90363, 14.70217,
15.25825, 16.06540, 16.87255, 17.87387, 18.93991, 20.00595, 17.54117,
17.32369, 17.10622, 16.88875, 18.07494, 19.46166, 20.84837, 21.12988,
21.04298, 20.95609, 16.64874, 17.55554, 18.46234, 19.36913, 21.18461,
23.12989, 25.07517, 24.53784, 23.17297, 21.80810, 15.75632, 17.78738,
19.81845, 21.84951, 24.29427, 26.79812, 29.30198, 27.94580, 25.30295,
22.66010, 15.98046, 18.43027, 20.88008, 23.32989, 25.21976, 27.02964,
28.83951, 27.75863, 25.71416, 23.66970, 16.57679, 19.21017, 21.84355,
24.47693, 25.41719, 26.11557, 26.81396, 26.37308, 25.55245, 24.73182,
17.17313, 19.99008, 22.80702, 25.62397, 25.61462, 25.20151, 24.78840,
24.98753, 25.39074, 25.79395, 17.76927, 17.01824, 16.26722, 15.51620,
13.45256, 11.20141, 8.95025, 10.14162, 12.48049, 14.81936, 17.05051,
16.49955, 15.94860, 15.39764, 14.28896, 13.10061, 11.91225, 13.10109,
15.08232, 17.06355, 16.33175, 15.98086, 15.62998, 15.27909, 15.12537,
14.99981, 14.87425, 16.06056, 17.68415, 19.30775, 15.61299, 15.46217,
15.31136, 15.16054, 15.96177, 16.89901, 17.83625, 19.02003, 20.28599,
21.55194, 14.61341, 15.58383, 16.55426, 17.52469, 18.99524, 20.53725,
22.07925, 22.56233, 22.69243, 22.82254, 13.57371, 15.79697, 18.02024,
20.24351, 22.34258, 24.42392, 26.50526, 26.18790, 25.07097, 23.95404,
12.53401, 16.01011, 19.48622, 22.96232, 25.68993, 28.31060, 30.93126,
29.81347, 27.44951, 25.08555, 12.98106, 16.67323, 20.36540, 24.05756,
26.36633, 28.47748, 30.58862, 29.76471, 27.96244, 26.16016, 13.92370,
17.48634, 21.04897, 24.61161, 26.15244, 27.40443, 28.65643, 28.49117,
27.85349, 27.21581, 14.86633, 18.29944, 21.73255, 25.16566, 25.93854,
26.33138, 26.72423, 27.21763, 27.74455, 28.27147, 17.60401, 17.30942,
17.01482, 16.72023, 13.94473, 10.81481, 7.68490, 8.98648, 11.76524,
14.54400, 16.04249, 16.14603, 16.24958, 16.35312, 14.85158, 13.12075,
11.38991, 12.71305, 15.05418, 17.39531, 14.48097, 14.98265, 15.48433,
15.98602, 15.75844, 15.42668, 15.09493, 16.43962, 18.34312, 20.24663,
12.91945, 13.81927, 14.71909, 15.61891, 16.66530, 17.73262, 18.79995,
20.16619, 21.63206, 23.09794, 11.68565, 13.84398, 16.00230, 18.16062,
19.91554, 21.61284, 23.31013, 23.99478, 24.34188, 24.68898, 10.49868,
14.03841, 17.57814, 21.11788, 23.50056, 25.71795, 27.93534, 27.83796,
26.96897, 26.09999, 9.31170, 14.23284, 19.15399, 24.07513, 27.08558,
29.82307, 32.56055, 31.68113, 29.59606, 27.51099, 9.98166, 14.91619,
19.85071, 24.78524, 27.51291, 29.92532, 32.33773, 31.77077, 30.21070,
28.65063, 11.27060, 15.76250, 20.25440, 24.74629, 26.88768, 28.69329,
30.49889, 30.60925, 30.15453, 29.69981, 12.55955, 16.60881, 20.65808,
24.70735, 26.26245, 27.46126, 28.66005, 29.44773, 30.09835, 30.74898,
15.20134, 15.53016, 15.85898, 16.18780, 13.53087, 10.44740, 7.36393,
8.95806, 12.11139, 15.26472, 13.87432, 14.52378, 15.17325, 15.82272,
14.49093, 12.87611, 11.26130, 12.73342, 15.23453, 17.73563, 12.54730,
13.51741, 14.48752, 15.45763, 15.45100, 15.30483, 15.15867, 16.50878,
18.35766, 20.20654, 11.22027, 12.51103, 13.80179, 15.09254, 16.41106,
17.73355, 19.05603, 20.28415, 21.48080, 22.67745, 10.27070, 12.53633,
14.80195, 17.06758, 19.04654, 20.98454, 22.92254, 23.63840, 23.94687,
24.25534, 9.37505, 12.70901, 16.04297, 19.37693, 21.92136, 24.35300,
26.78465, 26.93249, 26.31907, 25.70565, 8.47939, 12.88168, 17.28398,
21.68627, 24.79618, 27.72146, 30.64674, 30.22658, 28.69127, 27.15597,
9.77979, 13.97583, 18.17186, 22.36790, 25.18828, 27.81215, 30.43601,
30.34293, 29.34420, 28.34548, 11.81220, 15.37712, 18.94204, 22.50695,
24.75282, 26.81024, 28.86766, 29.40003, 29.42404, 29.44806, 13.84461,
16.77841, 19.71221, 22.64601, 24.31735, 25.80833, 27.29932, 28.45713,
29.50388, 30.55064, 12.05287, 13.06077, 14.06866, 15.07656, 12.81500,
10.08638, 7.35776, 9.30520, 12.81134, 16.31747, 11.31943, 12.47863,
13.63782, 14.79702, 13.82253, 12.54323, 11.26392, 12.88993, 15.48436,
18.07880, 10.58600, 11.89649, 13.20698, 14.51747, 14.83005, 15.00007,
15.17009, 16.47465, 18.15739, 19.84013, 9.85256, 11.31435, 12.77614,
14.23793, 15.83757, 17.45691, 19.07625, 20.05937, 20.83042, 21.60147,
9.36002, 11.37275, 13.38548, 15.39822, 17.58109, 19.78828, 21.99546,
22.68573, 22.87036, 23.05500, 8.90189, 11.52266, 14.14343, 16.76420,
19.42976, 22.10172, 24.77368, 25.17519, 24.81987, 24.46455, 8.44375,
11.67256, 14.90137, 18.13018, 21.27843, 24.41516, 27.55190, 27.66464,
26.76937, 25.87411, 10.51042, 13.30769, 16.10496, 18.90222, 21.70659,
24.51197, 27.31734, 27.77045, 27.43945, 27.10846, 13.41869, 15.43789,
17.45709, 19.47628, 21.66124, 23.86989, 26.07853, 27.08170, 27.68305,
28.28440, 16.32697, 17.56809, 18.80922, 20.05033, 21.61590, 23.22781,
24.83972, 26.39296, 27.92665, 29.46033, 8.90439, 10.59137, 12.27835,
13.96532, 12.09914, 9.72536, 7.35159, 9.65235, 13.51128, 17.37022,
8.76455, 10.43347, 12.10239, 13.77132, 13.15412, 12.21033, 11.26655,
13.04643, 15.73420, 18.42198, 8.62470, 10.27557, 11.92644, 13.57731,
14.20910, 14.69531, 15.18151, 16.44051, 17.95712, 19.47373, 8.48485,
10.11767, 11.75049, 13.38331, 15.26408, 17.18027, 19.09647, 19.83460,
20.18004, 20.52548, 8.44933, 10.20917, 11.96901, 13.72885, 16.11565,
18.59202, 21.06838, 21.73307, 21.79386, 21.85465, 8.42872, 10.33631,
12.24389, 14.15147, 16.93816, 19.85044, 22.76272, 23.41788, 23.32067,
23.22346, 8.40812, 10.46344, 12.51877, 14.57409, 17.76068, 21.10886,
24.45705, 25.10269, 24.84748, 24.59226, 11.24106, 12.63955, 14.03805,
15.43654, 18.22489, 21.21178, 24.19868, 25.19796, 25.53469, 25.87143,
15.02519, 15.49866, 15.97213, 16.44560, 18.56967, 20.92953, 23.28940,
24.76337, 25.94205, 27.12073, 18.80933, 18.35777, 17.90622, 17.45466,
18.91445, 20.64729, 22.38013, 24.32880, 26.34941, 28.37003,
};

72
src/unittest/test_profiler.cpp Normal file
View File

@ -0,0 +1,72 @@
/*
Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "test.h"
#include "profiler.h"
class TestProfiler : public TestBase {
public:
TestProfiler() { TestManager::registerTestModule(this); }
const char *getName() { return "TestProfiler"; }
void runTests(IGameDef *gamedef);
void testProfilerAverage();
};
static TestProfiler g_test_instance;
void TestProfiler::runTests(IGameDef *gamedef)
{
TEST(testProfilerAverage);
}
////////////////////////////////////////////////////////////////////////////////
void TestProfiler::testProfilerAverage()
{
Profiler p;
p.avg("Test1", 1.f);
UASSERT(p.getValue("Test1") == 1.f);
p.avg("Test1", 2.f);
UASSERT(p.getValue("Test1") == 1.5f);
p.avg("Test1", 3.f);
UASSERT(p.getValue("Test1") == 2.f);
p.avg("Test1", 486.f);
UASSERT(p.getValue("Test1") == 123.f);
p.avg("Test1", 8);
UASSERT(p.getValue("Test1") == 100.f);
p.avg("Test1", 700);
UASSERT(p.getValue("Test1") == 200.f);
p.avg("Test1", 10000);
UASSERT(p.getValue("Test1") == 1600.f);
p.avg("Test2", 123.56);
p.avg("Test2", 123.58);
UASSERT(p.getValue("Test2") == 123.57f);
}

277
src/unittest/test_random.cpp Normal file
View File

@ -0,0 +1,277 @@
/*
Minetest
Copyright (C) 2010-2014 kwolekr, Ryan Kwolek <kwolekr@minetest.net>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "test.h"
#include "util/numeric.h"
#include "exceptions.h"
#include "noise.h"
class TestRandom : public TestBase {
public:
TestRandom() { TestManager::registerTestModule(this); }
const char *getName() { return "TestRandom"; }
void runTests(IGameDef *gamedef);
void testPseudoRandom();
void testPseudoRandomRange();
void testPcgRandom();
void testPcgRandomRange();
void testPcgRandomBytes();
void testPcgRandomNormalDist();
static const int expected_pseudorandom_results[256];
static const u32 expected_pcgrandom_results[256];
static const u8 expected_pcgrandom_bytes_result[24];
static const u8 expected_pcgrandom_bytes_result2[24];
};
static TestRandom g_test_instance;
void TestRandom::runTests(IGameDef *gamedef)
{
TEST(testPseudoRandom);
TEST(testPseudoRandomRange);
TEST(testPcgRandom);
TEST(testPcgRandomRange);
TEST(testPcgRandomBytes);
TEST(testPcgRandomNormalDist);
}
////////////////////////////////////////////////////////////////////////////////
void TestRandom::testPseudoRandom()
{
PseudoRandom pr(814538);
for (u32 i = 0; i != 256; i++)
UASSERTEQ(int, pr.next(), expected_pseudorandom_results[i]);
}
void TestRandom::testPseudoRandomRange()
{
PseudoRandom pr((int)time(NULL));
EXCEPTION_CHECK(PrngException, pr.range(2000, 6000));
EXCEPTION_CHECK(PrngException, pr.range(5, 1));
for (u32 i = 0; i != 32768; i++) {
int min = pr.next() % 3000;
int max = pr.next() % 3000;
if (min > max) {
int temp = min;
min = max;
max = temp;
}
int randval = pr.range(min, max);
UASSERT(randval >= min);
UASSERT(randval <= max);
}
}
void TestRandom::testPcgRandom()
{
PcgRandom pr(814538, 998877);
for (u32 i = 0; i != 256; i++)
UASSERTEQ(u32, pr.next(), expected_pcgrandom_results[i]);
}
void TestRandom::testPcgRandomRange()
{
PcgRandom pr((int)time(NULL));
EXCEPTION_CHECK(PrngException, pr.range(5, 1));
for (u32 i = 0; i != 32768; i++) {
int min = pr.next() % 3000;
int max = pr.next() % 3000;
if (min > max) {
int temp = min;
min = max;
max = temp;
}
int randval = pr.range(min, max);
UASSERT(randval >= min);
UASSERT(randval <= max);
}
}
void TestRandom::testPcgRandomBytes()
{
char buf[32];
PcgRandom r(1538, 877);
memset(buf, 0, sizeof(buf));
r.bytes(buf + 5, 23);
UASSERT(memcmp(buf + 5, expected_pcgrandom_bytes_result,
sizeof(expected_pcgrandom_bytes_result)) == 0);
memset(buf, 0, sizeof(buf));
r.bytes(buf, 17);
UASSERT(memcmp(buf, expected_pcgrandom_bytes_result2,
sizeof(expected_pcgrandom_bytes_result2)) == 0);
}
void TestRandom::testPcgRandomNormalDist()
{
static const int max = 120;
static const int min = -120;
static const int num_trials = 20;
static const u32 num_samples = 61000;
s32 bins[max - min + 1];
memset(bins, 0, sizeof(bins));
PcgRandom r(486456179 + (int)time(NULL));
for (u32 i = 0; i != num_samples; i++) {
s32 randval = r.randNormalDist(min, max, num_trials);
UASSERT(randval <= max);
UASSERT(randval >= min);
bins[randval - min]++;
}
// Note that here we divide variance by the number of trials;
// this is because variance is a biased estimator.
int range = (max - min + 1);
float mean = (max + min) / 2;
float variance = ((range * range - 1) / 12) / num_trials;
float stddev = sqrt(variance);
static const float prediction_intervals[] = {
0.68269f, // 1.0
0.86639f, // 1.5
0.95450f, // 2.0
0.98758f, // 2.5
0.99730f, // 3.0
};
//// Simple normality test using the 68-95-99.7% rule
for (u32 i = 0; i != ARRLEN(prediction_intervals); i++) {
float deviations = i / 2.f + 1.f;
int lbound = round(mean - deviations * stddev);
int ubound = round(mean + deviations * stddev);
UASSERT(lbound >= min);
UASSERT(ubound <= max);
int accum = 0;
for (int i = lbound; i != ubound; i++)
accum += bins[i - min];
float actual = (float)accum / num_samples;
UASSERT(fabs(actual - prediction_intervals[i]) < 0.02);
}
}
const int TestRandom::expected_pseudorandom_results[256] = {
0x02fa, 0x60d5, 0x6c10, 0x606b, 0x098b, 0x5f1e, 0x4f56, 0x3fbd, 0x77af,
0x4fe9, 0x419a, 0x6fe1, 0x177b, 0x6858, 0x36f8, 0x6d83, 0x14fc, 0x2d62,
0x1077, 0x23e2, 0x041b, 0x7a7e, 0x5b52, 0x215d, 0x682b, 0x4716, 0x47e3,
0x08c0, 0x1952, 0x56ae, 0x146d, 0x4b4f, 0x239f, 0x3fd0, 0x6794, 0x7796,
0x7be2, 0x75b7, 0x5691, 0x28ee, 0x2656, 0x40c0, 0x133c, 0x63cd, 0x2aeb,
0x518f, 0x7dbc, 0x6ad8, 0x736e, 0x5b05, 0x160b, 0x589f, 0x6f64, 0x5edc,
0x092c, 0x0a39, 0x199e, 0x1927, 0x562b, 0x2689, 0x3ba3, 0x366f, 0x46da,
0x4e49, 0x0abb, 0x40a1, 0x3846, 0x40db, 0x7adb, 0x6ec1, 0x6efa, 0x01cc,
0x6335, 0x4352, 0x72fb, 0x4b2d, 0x509a, 0x257e, 0x2f7d, 0x5891, 0x2195,
0x6107, 0x5269, 0x56e3, 0x4849, 0x38f7, 0x2791, 0x04f2, 0x4e05, 0x78ff,
0x6bae, 0x50b3, 0x74ad, 0x31af, 0x531e, 0x7d56, 0x11c9, 0x0b5e, 0x405e,
0x1e15, 0x7f6a, 0x5bd3, 0x6649, 0x71b4, 0x3ec2, 0x6ab4, 0x520e, 0x6ad6,
0x287e, 0x10b8, 0x18f2, 0x7107, 0x46ea, 0x1d85, 0x25cc, 0x2689, 0x35c1,
0x3065, 0x6237, 0x3edd, 0x23d9, 0x6fb5, 0x37a1, 0x3211, 0x526a, 0x4b09,
0x23f1, 0x58cc, 0x2e42, 0x341f, 0x5e16, 0x3d1a, 0x5e8c, 0x7a82, 0x4635,
0x2bf8, 0x6577, 0x3603, 0x1daf, 0x539f, 0x2e91, 0x6bd8, 0x42d3, 0x7a93,
0x26e3, 0x5a91, 0x6c67, 0x1b66, 0x3ac7, 0x18bf, 0x20d8, 0x7153, 0x558d,
0x7262, 0x653d, 0x417d, 0x3ed3, 0x3117, 0x600d, 0x6d04, 0x719c, 0x3afd,
0x6ba5, 0x17c5, 0x4935, 0x346c, 0x5479, 0x6ff6, 0x1fcc, 0x1054, 0x3f14,
0x6266, 0x3acc, 0x3b77, 0x71d8, 0x478b, 0x20fa, 0x4e46, 0x7e77, 0x5554,
0x3652, 0x719c, 0x072b, 0x61ad, 0x399f, 0x621d, 0x1bba, 0x41d0, 0x7fdc,
0x3e6c, 0x6a2a, 0x5253, 0x094e, 0x0c10, 0x3f43, 0x73eb, 0x4c5f, 0x1f23,
0x12c9, 0x0902, 0x5238, 0x50c0, 0x1b77, 0x3ffd, 0x0124, 0x302a, 0x26b9,
0x3648, 0x30a6, 0x1abc, 0x3031, 0x4029, 0x6358, 0x6696, 0x74e8, 0x6142,
0x4284, 0x0c00, 0x7e50, 0x41e3, 0x3782, 0x79a5, 0x60fe, 0x2d15, 0x3ed2,
0x7f70, 0x2b27, 0x6366, 0x5100, 0x7c44, 0x3ee0, 0x4e76, 0x7d34, 0x3a60,
0x140e, 0x613d, 0x1193, 0x268d, 0x1e2f, 0x3123, 0x6d61, 0x4e0b, 0x51ce,
0x13bf, 0x58d4, 0x4f43, 0x05c6, 0x4d6a, 0x7eb5, 0x2921, 0x2c36, 0x1c89,
0x63b9, 0x1555, 0x1f41, 0x2d9f,
};
const u32 TestRandom::expected_pcgrandom_results[256] = {
0x48c593f8, 0x054f59f5, 0x0d062dc1, 0x23852a23, 0x7fbbc97b, 0x1f9f141e,
0x364e6ed8, 0x995bba58, 0xc9307dc0, 0x73fb34c4, 0xcd8de88d, 0x52e8ce08,
0x1c4a78e4, 0x25c0882e, 0x8a82e2e0, 0xe3bc3311, 0xb8068d42, 0x73186110,
0x19988df4, 0x69bd970b, 0x7214728c, 0x0aee320c, 0x2a5a536c, 0xaf48d715,
0x00bce504, 0xd2b8f548, 0x520df366, 0x96d8fff5, 0xa1bb510b, 0x63477049,
0xb85990b7, 0x7e090689, 0x275fb468, 0x50206257, 0x8bab4f8a, 0x0d6823db,
0x63faeaac, 0x2d92deeb, 0x2ba78024, 0x0d30f631, 0x338923a0, 0xd07248d8,
0xa5db62d3, 0xddba8af6, 0x0ad454e9, 0x6f0fd13a, 0xbbfde2bf, 0x91188009,
0x966b394d, 0xbb9d2012, 0x7e6926cb, 0x95183860, 0x5ff4c59b, 0x035f628a,
0xb67085ef, 0x33867e23, 0x68d1b887, 0x2e3298d7, 0x84fd0650, 0x8bc91141,
0x6fcb0452, 0x2836fee9, 0x2e83c0a3, 0xf1bafdc5, 0x9ff77777, 0xfdfbba87,
0x527aebeb, 0x423e5248, 0xd1756490, 0xe41148fa, 0x3361f7b4, 0xa2824f23,
0xf4e08072, 0xc50442be, 0x35adcc21, 0x36be153c, 0xc7709012, 0xf0eeb9f2,
0x3d73114e, 0x1c1574ee, 0x92095b9c, 0x1503d01c, 0xd6ce0677, 0x026a8ec1,
0x76d0084d, 0x86c23633, 0x36f75ce6, 0x08fa7bbe, 0x35f6ff2a, 0x31cc9525,
0x2c1a35e6, 0x8effcd62, 0xc782fa07, 0x8a86e248, 0x8fdb7a9b, 0x77246626,
0x5767723f, 0x3a78b699, 0xe548ce1c, 0x5820f37d, 0x148ed9b8, 0xf6796254,
0x32232c20, 0x392bf3a2, 0xe9af6625, 0xd40b0d88, 0x636cfa23, 0x6a5de514,
0xc4a69183, 0xc785c853, 0xab0de901, 0x16ae7e44, 0x376f13b5, 0x070f7f31,
0x34cbc93b, 0xe6184345, 0x1b7f911f, 0x631fbe4b, 0x86d6e023, 0xc689b518,
0x88ef4f7c, 0xddf06b45, 0xc97f18d4, 0x2aaee94b, 0x45694723, 0x6db111d2,
0x91974fce, 0xe33e29e2, 0xc5e99494, 0x8017e02b, 0x3ebd8143, 0x471ffb80,
0xc0d7ca1b, 0x4954c860, 0x48935d6a, 0xf2d27999, 0xb93d608d, 0x40696e90,
0x60b18162, 0x1a156998, 0x09b8bbab, 0xc80a79b6, 0x8adbcfbc, 0xc375248c,
0xa584e2ea, 0x5b46fe11, 0x58e84680, 0x8a8bc456, 0xd668b94f, 0x8b9035be,
0x278509d4, 0x6663a140, 0x81a9817a, 0xd4f9d3cf, 0x6dc5f607, 0x6ae04450,
0x694f22a4, 0x1d061788, 0x2e39ad8b, 0x748f4db2, 0xee569b52, 0xd157166d,
0xdabc161e, 0xc8d50176, 0x7e3110e5, 0x9f7d033b, 0x128df67f, 0xb0078583,
0xa3a75d26, 0xc1ad8011, 0x07dd89ec, 0xef04f456, 0x91bf866c, 0x6aac5306,
0xdd5a1573, 0xf73ff97a, 0x4e1186ad, 0xb9680680, 0xc8894515, 0xdc95a08e,
0xc894fd8e, 0xf84ade15, 0xd787f8c1, 0x40dcecca, 0x1b24743e, 0x1ce6ab23,
0x72321653, 0xb80fbaf7, 0x1bcf099b, 0x1ff26805, 0x78f66c8e, 0xf93bf51a,
0xfb0c06fe, 0xe50d48cf, 0x310947e0, 0x1b78804a, 0xe73e2c14, 0x8deb8381,
0xe576122a, 0xe5a8df39, 0x42397c5e, 0xf5503f3c, 0xbe3dbf8d, 0x1b360e5c,
0x9254caaf, 0x7a9f6744, 0x6d4144fa, 0xd77c65fe, 0x44ca7b12, 0xf58a4c00,
0x159500d0, 0x92769857, 0x7134fdd4, 0xa3fea693, 0xbd044831, 0xeded39a1,
0xe4570204, 0xaea37f2f, 0x9a302971, 0x620f8402, 0x1d2f3e5e, 0xf9c2f49c,
0x738e813a, 0xb3c92251, 0x7ecba63b, 0xbe7eebc7, 0xf800267c, 0x3fdeb760,
0xf12d5e7d, 0x5a18dce1, 0xb35a539c, 0xe565f057, 0x2babf38c, 0xae5800ad,
0x421004dd, 0x6715acb6, 0xff529b64, 0xd520d207, 0x7cb193e7, 0xe9b18e4c,
0xfd2a8a59, 0x47826ae3, 0x56ba43f8, 0x453b3d99, 0x8ae1675f, 0xf66f5c34,
0x057a6ac1, 0x010769e4, 0xa8324158, 0x410379a5, 0x5dfc8c97, 0x72848afe,
0x59f169e5, 0xe32acb78, 0x5dfaa9c4, 0x51bb956a,
};
const u8 TestRandom::expected_pcgrandom_bytes_result[24] = {
0xf3, 0x79, 0x8f, 0x31, 0xac, 0xd9, 0x34, 0xf8, 0x3c, 0x6e, 0x82, 0x37,
0x6b, 0x4b, 0x77, 0xe3, 0xbd, 0x0a, 0xee, 0x22, 0x79, 0x6e, 0x40, 0x00,
};
const u8 TestRandom::expected_pcgrandom_bytes_result2[24] = {
0x47, 0x9e, 0x08, 0x3e, 0xd4, 0x21, 0x2d, 0xf6, 0xb4, 0xb1, 0x9d, 0x7a,
0x60, 0x02, 0x5a, 0xb2, 0x11, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00, 0x00,
};

182
src/unittest/test_serialization.cpp Normal file
View File

@ -0,0 +1,182 @@
/*
Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "test.h"
#include "util/string.h"
#include "util/serialize.h"
class TestSerialization : public TestBase {
public:
TestSerialization() { TestManager::registerTestModule(this); }
const char *getName() { return "TestSerialization"; }
void runTests(IGameDef *gamedef);
void buildTestStrings();
void testSerializeString();
void testSerializeWideString();
void testSerializeLongString();
void testSerializeJsonString();
std::string teststring2;
std::wstring teststring2_w;
std::string teststring2_w_encoded;
};
static TestSerialization g_test_instance;
void TestSerialization::runTests(IGameDef *gamedef)
{
buildTestStrings();
TEST(testSerializeString);
TEST(testSerializeWideString);
TEST(testSerializeLongString);
TEST(testSerializeJsonString);
}
////////////////////////////////////////////////////////////////////////////////
// To be used like this:
// mkstr("Some\0string\0with\0embedded\0nuls")
// since std::string("...") doesn't work as expected in that case.
template<size_t N> std::string mkstr(const char (&s)[N])
{
return std::string(s, N - 1);
}
void TestSerialization::buildTestStrings()
{
std::ostringstream tmp_os;
std::wostringstream tmp_os_w;
std::ostringstream tmp_os_w_encoded;
for (int i = 0; i < 256; i++) {
tmp_os << (char)i;
tmp_os_w << (wchar_t)i;
tmp_os_w_encoded << (char)0 << (char)i;
}
teststring2 = tmp_os.str();
teststring2_w = tmp_os_w.str();
teststring2_w_encoded = tmp_os_w_encoded.str();
}
void TestSerialization::testSerializeString()
{
// Test blank string
UASSERT(serializeString("Hello world!") == mkstr("\0\14Hello world!"));
// Test basic string
UASSERT(serializeString("") == mkstr("\0\0"));
// Test character range
UASSERT(serializeString(teststring2) == mkstr("\1\0") + teststring2);
// Test deserialize
std::istringstream is(serializeString(teststring2), std::ios::binary);
UASSERT(deSerializeString(is) == teststring2);
UASSERT(!is.eof());
is.get();
UASSERT(is.eof());
}
void TestSerialization::testSerializeWideString()
{
// Test blank string
UASSERT(serializeWideString(L"") == mkstr("\0\0"));
// Test basic string
UASSERT(serializeWideString(narrow_to_wide("Hello world!")) ==
mkstr("\0\14\0H\0e\0l\0l\0o\0 \0w\0o\0r\0l\0d\0!"));
// Test character range
UASSERT(serializeWideString(teststring2_w) ==
mkstr("\1\0") + teststring2_w_encoded);
// Test deserialize
std::istringstream is(serializeWideString(teststring2_w), std::ios::binary);
UASSERT(deSerializeWideString(is) == teststring2_w);
UASSERT(!is.eof());
is.get();
UASSERT(is.eof());
}
void TestSerialization::testSerializeLongString()
{
// Test blank string
UASSERT(serializeLongString("") == mkstr("\0\0\0\0"));
// Test basic string
UASSERT(serializeLongString("Hello world!") == mkstr("\0\0\0\14Hello world!"));
// Test character range
UASSERT(serializeLongString(teststring2) == mkstr("\0\0\1\0") + teststring2);
// Test deserialize
std::istringstream is(serializeLongString(teststring2), std::ios::binary);
UASSERT(deSerializeLongString(is) == teststring2);
UASSERT(!is.eof());
is.get();
UASSERT(is.eof());
}
void TestSerialization::testSerializeJsonString()
{
// Test blank string
UASSERT(serializeJsonString("") == "\"\"");
// Test basic string
UASSERT(serializeJsonString("Hello world!") == "\"Hello world!\"");
// MSVC fails when directly using "\\\\"
std::string backslash = "\\";
UASSERT(serializeJsonString(teststring2) ==
mkstr("\"") +
"\\u0000\\u0001\\u0002\\u0003\\u0004\\u0005\\u0006\\u0007" +
"\\b\\t\\n\\u000b\\f\\r\\u000e\\u000f" +
"\\u0010\\u0011\\u0012\\u0013\\u0014\\u0015\\u0016\\u0017" +
"\\u0018\\u0019\\u001a\\u001b\\u001c\\u001d\\u001e\\u001f" +
" !\\\"" + teststring2.substr(0x23, 0x2f-0x23) +
"\\/" + teststring2.substr(0x30, 0x5c-0x30) +
backslash + backslash + teststring2.substr(0x5d, 0x7f-0x5d) + "\\u007f" +
"\\u0080\\u0081\\u0082\\u0083\\u0084\\u0085\\u0086\\u0087" +
"\\u0088\\u0089\\u008a\\u008b\\u008c\\u008d\\u008e\\u008f" +
"\\u0090\\u0091\\u0092\\u0093\\u0094\\u0095\\u0096\\u0097" +
"\\u0098\\u0099\\u009a\\u009b\\u009c\\u009d\\u009e\\u009f" +
"\\u00a0\\u00a1\\u00a2\\u00a3\\u00a4\\u00a5\\u00a6\\u00a7" +
"\\u00a8\\u00a9\\u00aa\\u00ab\\u00ac\\u00ad\\u00ae\\u00af" +
"\\u00b0\\u00b1\\u00b2\\u00b3\\u00b4\\u00b5\\u00b6\\u00b7" +
"\\u00b8\\u00b9\\u00ba\\u00bb\\u00bc\\u00bd\\u00be\\u00bf" +
"\\u00c0\\u00c1\\u00c2\\u00c3\\u00c4\\u00c5\\u00c6\\u00c7" +
"\\u00c8\\u00c9\\u00ca\\u00cb\\u00cc\\u00cd\\u00ce\\u00cf" +
"\\u00d0\\u00d1\\u00d2\\u00d3\\u00d4\\u00d5\\u00d6\\u00d7" +
"\\u00d8\\u00d9\\u00da\\u00db\\u00dc\\u00dd\\u00de\\u00df" +
"\\u00e0\\u00e1\\u00e2\\u00e3\\u00e4\\u00e5\\u00e6\\u00e7" +
"\\u00e8\\u00e9\\u00ea\\u00eb\\u00ec\\u00ed\\u00ee\\u00ef" +
"\\u00f0\\u00f1\\u00f2\\u00f3\\u00f4\\u00f5\\u00f6\\u00f7" +
"\\u00f8\\u00f9\\u00fa\\u00fb\\u00fc\\u00fd\\u00fe\\u00ff" +
"\"");
// Test deserialize
std::istringstream is(serializeJsonString(teststring2), std::ios::binary);
UASSERT(deSerializeJsonString(is) == teststring2);
UASSERT(!is.eof());
is.get();
UASSERT(is.eof());
}

204
src/unittest/test_settings.cpp Normal file
View File

@ -0,0 +1,204 @@
/*
Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "test.h"
#include "settings.h"
#include "noise.h"
class TestSettings : public TestBase {
public:
TestSettings() { TestManager::registerTestModule(this); }
const char *getName() { return "TestSettings"; }
void runTests(IGameDef *gamedef);
void testAllSettings();
static const char *config_text_before;
static const char *config_text_after;
};
static TestSettings g_test_instance;
void TestSettings::runTests(IGameDef *gamedef)
{
TEST(testAllSettings);
}
////////////////////////////////////////////////////////////////////////////////
const char *TestSettings::config_text_before =
"leet = 1337\n"
"leetleet = 13371337\n"
"leetleet_neg = -13371337\n"
"floaty_thing = 1.1\n"
"stringy_thing = asd /( ¤%&(/\" BLÖÄRP\n"
"coord = (1, 2, 4.5)\n"
" # this is just a comment\n"
"this is an invalid line\n"
"asdf = {\n"
" a = 5\n"
" bb = 2.5\n"
" ccc = \"\"\"\n"
"testy\n"
" testa \n"
"\"\"\"\n"
"\n"
"}\n"
"blarg = \"\"\" \n"
"some multiline text\n"
" with leading whitespace!\n"
"\"\"\"\n"
"np_terrain = 5, 40, (250, 250, 250), 12341, 5, 0.7, 2.4\n"
"zoop = true";
const char *TestSettings::config_text_after =
"leet = 1337\n"
"leetleet = 13371337\n"
"leetleet_neg = -13371337\n"
"floaty_thing = 1.1\n"
"stringy_thing = asd /( ¤%&(/\" BLÖÄRP\n"
"coord = (1, 2, 4.5)\n"
" # this is just a comment\n"
"this is an invalid line\n"
"asdf = {\n"
" a = 5\n"
" bb = 2.5\n"
" ccc = \"\"\"\n"
"testy\n"
" testa \n"
"\"\"\"\n"
"\n"
"}\n"
"blarg = \"\"\" \n"
"some multiline text\n"
" with leading whitespace!\n"
"\"\"\"\n"
"np_terrain = {\n"
" flags = defaults\n"
" lacunarity = 2.4\n"
" octaves = 6\n"
" offset = 3.5\n"
" persistence = 0.7\n"
" scale = 40\n"
" seed = 12341\n"
" spread = (250,250,250)\n"
"}\n"
"zoop = true\n"
"coord2 = (1,2,3.3)\n"
"floaty_thing_2 = 1.2\n"
"groupy_thing = {\n"
" animals = cute\n"
" num_apples = 4\n"
" num_oranges = 53\n"
"}\n";
void TestSettings::testAllSettings()
{
try {
Settings s;
// Test reading of settings
std::istringstream is(config_text_before);
s.parseConfigLines(is);
UASSERT(s.getS32("leet") == 1337);
UASSERT(s.getS16("leetleet") == 32767);
UASSERT(s.getS16("leetleet_neg") == -32768);
// Not sure if 1.1 is an exact value as a float, but doesn't matter
UASSERT(fabs(s.getFloat("floaty_thing") - 1.1) < 0.001);
UASSERT(s.get("stringy_thing") == "asd /( ¤%&(/\" BLÖÄRP");
UASSERT(fabs(s.getV3F("coord").X - 1.0) < 0.001);
UASSERT(fabs(s.getV3F("coord").Y - 2.0) < 0.001);
UASSERT(fabs(s.getV3F("coord").Z - 4.5) < 0.001);
// Test the setting of settings too
s.setFloat("floaty_thing_2", 1.2);
s.setV3F("coord2", v3f(1, 2, 3.3));
UASSERT(s.get("floaty_thing_2").substr(0,3) == "1.2");
UASSERT(fabs(s.getFloat("floaty_thing_2") - 1.2) < 0.001);
UASSERT(fabs(s.getV3F("coord2").X - 1.0) < 0.001);
UASSERT(fabs(s.getV3F("coord2").Y - 2.0) < 0.001);
UASSERT(fabs(s.getV3F("coord2").Z - 3.3) < 0.001);
// Test settings groups
Settings *group = s.getGroup("asdf");
UASSERT(group != NULL);
UASSERT(s.getGroupNoEx("zoop", group) == false);
UASSERT(group->getS16("a") == 5);
UASSERT(fabs(group->getFloat("bb") - 2.5) < 0.001);
Settings *group3 = new Settings;
group3->set("cat", "meow");
group3->set("dog", "woof");
Settings *group2 = new Settings;
group2->setS16("num_apples", 4);
group2->setS16("num_oranges", 53);
group2->setGroup("animals", group3);
group2->set("animals", "cute"); //destroys group 3
s.setGroup("groupy_thing", group2);
// Test set failure conditions
UASSERT(s.set("Zoop = Poop\nsome_other_setting", "false") == false);
UASSERT(s.set("sneaky", "\"\"\"\njabberwocky = false") == false);
UASSERT(s.set("hehe", "asdfasdf\n\"\"\"\nsomething = false") == false);
// Test multiline settings
UASSERT(group->get("ccc") == "testy\n testa ");
UASSERT(s.get("blarg") ==
"some multiline text\n"
" with leading whitespace!");
// Test NoiseParams
UASSERT(s.getEntry("np_terrain").is_group == false);
NoiseParams np;
UASSERT(s.getNoiseParams("np_terrain", np) == true);
UASSERT(fabs(np.offset - 5) < 0.001);
UASSERT(fabs(np.scale - 40) < 0.001);
UASSERT(fabs(np.spread.X - 250) < 0.001);
UASSERT(fabs(np.spread.Y - 250) < 0.001);
UASSERT(fabs(np.spread.Z - 250) < 0.001);
UASSERT(np.seed == 12341);
UASSERT(np.octaves == 5);
UASSERT(fabs(np.persist - 0.7) < 0.001);
np.offset = 3.5;
np.octaves = 6;
s.setNoiseParams("np_terrain", np);
UASSERT(s.getEntry("np_terrain").is_group == true);
// Test writing
std::ostringstream os(std::ios_base::binary);
is.clear();
is.seekg(0);
UASSERT(s.updateConfigObject(is, os, "", 0) == true);
//printf(">>>> expected config:\n%s\n", TEST_CONFIG_TEXT_AFTER);
//printf(">>>> actual config:\n%s\n", os.str().c_str());
UASSERT(os.str() == config_text_after);
} catch (SettingNotFoundException &e) {
UASSERT(!"Setting not found!");
}
}

151
src/unittest/test_socket.cpp Normal file
View File

@ -0,0 +1,151 @@
/*
Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "test.h"
#include "log.h"
#include "socket.h"
#include "settings.h"
class TestSocket : public TestBase {
public:
TestSocket()
{
if (INTERNET_SIMULATOR == false)
TestManager::registerTestModule(this);
}
const char *getName() { return "TestSocket"; }
void runTests(IGameDef *gamedef);
void testIPv4Socket();
void testIPv6Socket();
static const int port = 30003;
};
static TestSocket g_test_instance;
void TestSocket::runTests(IGameDef *gamedef)
{
TEST(testIPv4Socket);
if (g_settings->getBool("enable_ipv6"))
TEST(testIPv6Socket);
}
////////////////////////////////////////////////////////////////////////////////
void TestSocket::testIPv4Socket()
{
Address address(0, 0, 0, 0, port);
Address bind_addr(0, 0, 0, 0, port);
/*
* Try to use the bind_address for servers with no localhost address
* For example: FreeBSD jails
*/
std::string bind_str = g_settings->get("bind_address");
try {
bind_addr.Resolve(bind_str.c_str());
if (!bind_addr.isIPv6()) {
address = bind_addr;
}
} catch (ResolveError &e) {
}
UDPSocket socket(false);
socket.Bind(address);
const char sendbuffer[] = "hello world!";
/*
* If there is a bind address, use it.
* It's useful in container environments
*/
if (address != Address(0, 0, 0, 0, port))
socket.Send(address, sendbuffer, sizeof(sendbuffer));
else
socket.Send(Address(127, 0, 0, 1, port), sendbuffer, sizeof(sendbuffer));
sleep_ms(50);
char rcvbuffer[256] = { 0 };
Address sender;
for (;;) {
if (socket.Receive(sender, rcvbuffer, sizeof(rcvbuffer)) < 0)
break;
}
//FIXME: This fails on some systems
UASSERT(strncmp(sendbuffer, rcvbuffer, sizeof(sendbuffer)) == 0);
if (address != Address(0, 0, 0, 0, port)) {
UASSERT(sender.getAddress().sin_addr.s_addr ==
address.getAddress().sin_addr.s_addr);
} else {
UASSERT(sender.getAddress().sin_addr.s_addr ==
Address(127, 0, 0, 1, 0).getAddress().sin_addr.s_addr);
}
}
void TestSocket::testIPv6Socket()
{
Address address6((IPv6AddressBytes *)NULL, port);
UDPSocket socket6;
if (!socket6.init(true, true)) {
/* Note: Failing to create an IPv6 socket is not technically an
error because the OS may not support IPv6 or it may
have been disabled. IPv6 is not /required/ by
minetest and therefore this should not cause the unit
test to fail
*/
dstream << "WARNING: IPv6 socket creation failed (unit test)"
<< std::endl;
return;
}
const char sendbuffer[] = "hello world!";
IPv6AddressBytes bytes;
bytes.bytes[15] = 1;
socket6.Bind(address6);
try {
socket6.Send(Address(&bytes, port), sendbuffer, sizeof(sendbuffer));
sleep_ms(50);
char rcvbuffer[256] = { 0 };
Address sender;
for(;;) {
if (socket6.Receive(sender, rcvbuffer, sizeof(rcvbuffer)) < 0)
break;
}
//FIXME: This fails on some systems
UASSERT(strncmp(sendbuffer, rcvbuffer, sizeof(sendbuffer)) == 0);
UASSERT(memcmp(sender.getAddress6().sin6_addr.s6_addr,
Address(&bytes, 0).getAddress6().sin6_addr.s6_addr, 16) == 0);
} catch (SendFailedException &e) {
errorstream << "IPv6 support enabled but not available!"
<< std::endl;
}
}

241
src/unittest/test_utilities.cpp Normal file
View File

@ -0,0 +1,241 @@
/*
Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "test.h"
#include "util/numeric.h"
#include "util/string.h"
class TestUtilities : public TestBase {
public:
TestUtilities() { TestManager::registerTestModule(this); }
const char *getName() { return "TestUtilities"; }
void runTests(IGameDef *gamedef);
void testAngleWrapAround();
void testLowercase();
void testTrim();
void testIsYes();
void testRemoveStringEnd();
void testUrlEncode();
void testUrlDecode();
void testPadString();
void testStrEqual();
void testStringTrim();
void testStrToIntConversion();
void testStringReplace();
void testStringAllowed();
void testWrapRows();
void testIsNumber();
void testIsPowerOfTwo();
};
static TestUtilities g_test_instance;
void TestUtilities::runTests(IGameDef *gamedef)
{
TEST(testAngleWrapAround);
TEST(testLowercase);
TEST(testTrim);
TEST(testIsYes);
TEST(testRemoveStringEnd);
TEST(testUrlEncode);
TEST(testUrlDecode);
TEST(testPadString);
TEST(testStrEqual);
TEST(testStringTrim);
TEST(testStrToIntConversion);
TEST(testStringReplace);
TEST(testStringAllowed);
TEST(testWrapRows);
TEST(testIsNumber);
TEST(testIsPowerOfTwo);
}
////////////////////////////////////////////////////////////////////////////////
inline float ref_WrapDegrees180(float f)
{
// This is a slower alternative to the wrapDegrees_180() function;
// used as a reference for testing
float value = fmodf(f + 180, 360);
if (value < 0)
value += 360;
return value - 180;
}
inline float ref_WrapDegrees_0_360(float f)
{
// This is a slower alternative to the wrapDegrees_0_360() function;
// used as a reference for testing
float value = fmodf(f, 360);
if (value < 0)
value += 360;
return value < 0 ? value + 360 : value;
}
void TestUtilities::testAngleWrapAround()
{
UASSERT(fabs(modulo360f(100.0) - 100.0) < 0.001);
UASSERT(fabs(modulo360f(720.5) - 0.5) < 0.001);
UASSERT(fabs(modulo360f(-0.5) - (-0.5)) < 0.001);
UASSERT(fabs(modulo360f(-365.5) - (-5.5)) < 0.001);
for (float f = -720; f <= -360; f += 0.25) {
UASSERT(fabs(modulo360f(f) - modulo360f(f + 360)) < 0.001);
}
for (float f = -1440; f <= 1440; f += 0.25) {
UASSERT(fabs(modulo360f(f) - fmodf(f, 360)) < 0.001);
UASSERT(fabs(wrapDegrees_180(f) - ref_WrapDegrees180(f)) < 0.001);
UASSERT(fabs(wrapDegrees_0_360(f) - ref_WrapDegrees_0_360(f)) < 0.001);
UASSERT(wrapDegrees_0_360(fabs(wrapDegrees_180(f) - wrapDegrees_0_360(f))) < 0.001);
}
}
void TestUtilities::testLowercase()
{
UASSERT(lowercase("Foo bAR") == "foo bar");
}
void TestUtilities::testTrim()
{
UASSERT(trim("\n \t\r Foo bAR \r\n\t\t ") == "Foo bAR");
UASSERT(trim("\n \t\r \r\n\t\t ") == "");
}
void TestUtilities::testIsYes()
{
UASSERT(is_yes("YeS") == true);
UASSERT(is_yes("") == false);
UASSERT(is_yes("FAlse") == false);
UASSERT(is_yes("-1") == true);
UASSERT(is_yes("0") == false);
UASSERT(is_yes("1") == true);
UASSERT(is_yes("2") == true);
}
void TestUtilities::testRemoveStringEnd()
{
const char *ends[] = {"abc", "c", "bc", "", NULL};
UASSERT(removeStringEnd("abc", ends) == "");
UASSERT(removeStringEnd("bc", ends) == "b");
UASSERT(removeStringEnd("12c", ends) == "12");
UASSERT(removeStringEnd("foo", ends) == "");
}
void TestUtilities::testUrlEncode()
{
UASSERT(urlencode("\"Aardvarks lurk, OK?\"")
== "%22Aardvarks%20lurk%2C%20OK%3F%22");
}
void TestUtilities::testUrlDecode()
{
UASSERT(urldecode("%22Aardvarks%20lurk%2C%20OK%3F%22")
== "\"Aardvarks lurk, OK?\"");
}
void TestUtilities::testPadString()
{
UASSERT(padStringRight("hello", 8) == "hello ");
}
void TestUtilities::testStrEqual()
{
UASSERT(str_equal(narrow_to_wide("abc"), narrow_to_wide("abc")));
UASSERT(str_equal(narrow_to_wide("ABC"), narrow_to_wide("abc"), true));
}
void TestUtilities::testStringTrim()
{
UASSERT(trim(" a") == "a");
UASSERT(trim(" a ") == "a");
UASSERT(trim("a ") == "a");
UASSERT(trim("") == "");
}
void TestUtilities::testStrToIntConversion()
{
UASSERT(mystoi("123", 0, 1000) == 123);
UASSERT(mystoi("123", 0, 10) == 10);
}
void TestUtilities::testStringReplace()
{
std::string test_str;
test_str = "Hello there";
str_replace(test_str, "there", "world");
UASSERT(test_str == "Hello world");
test_str = "ThisAisAaAtest";
str_replace(test_str, 'A', ' ');
UASSERT(test_str == "This is a test");
}
void TestUtilities::testStringAllowed()
{
UASSERT(string_allowed("hello", "abcdefghijklmno") == true);
UASSERT(string_allowed("123", "abcdefghijklmno") == false);
UASSERT(string_allowed_blacklist("hello", "123") == true);
UASSERT(string_allowed_blacklist("hello123", "123") == false);
}
void TestUtilities::testWrapRows()
{
UASSERT(wrap_rows("12345678",4) == "1234\n5678");
}
void TestUtilities::testIsNumber()
{
UASSERT(is_number("123") == true);
UASSERT(is_number("") == false);
UASSERT(is_number("123a") == false);
}
void TestUtilities::testIsPowerOfTwo()
{
UASSERT(is_power_of_two(0) == false);
UASSERT(is_power_of_two(1) == true);
UASSERT(is_power_of_two(2) == true);
UASSERT(is_power_of_two(3) == false);
for (int exponent = 2; exponent <= 31; ++exponent) {
UASSERT(is_power_of_two((1 << exponent) - 1) == false);
UASSERT(is_power_of_two((1 << exponent)) == true);
UASSERT(is_power_of_two((1 << exponent) + 1) == false);
}
UASSERT(is_power_of_two((u32)-1) == false);
}

204
src/unittest/test_voxelalgorithms.cpp Normal file
View File

@ -0,0 +1,204 @@
/*
Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "test.h"
#include "gamedef.h"
#include "voxelalgorithms.h"
class TestVoxelAlgorithms : public TestBase {
public:
TestVoxelAlgorithms() { TestManager::registerTestModule(this); }
const char *getName() { return "TestVoxelAlgorithms"; }
void runTests(IGameDef *gamedef);
void testPropogateSunlight(INodeDefManager *ndef);
void testClearLightAndCollectSources(INodeDefManager *ndef);
};
static TestVoxelAlgorithms g_test_instance;
void TestVoxelAlgorithms::runTests(IGameDef *gamedef)
{
INodeDefManager *ndef = gamedef->getNodeDefManager();
TEST(testPropogateSunlight, ndef);
TEST(testClearLightAndCollectSources, ndef);
}
////////////////////////////////////////////////////////////////////////////////
void TestVoxelAlgorithms::testPropogateSunlight(INodeDefManager *ndef)
{
VoxelManipulator v;
for (u16 z = 0; z < 3; z++)
for (u16 y = 0; y < 3; y++)
for (u16 x = 0; x < 3; x++) {
v3s16 p(x,y,z);
v.setNodeNoRef(p, MapNode(CONTENT_AIR));
}
VoxelArea a(v3s16(0,0,0), v3s16(2,2,2));
{
std::set<v3s16> light_sources;
voxalgo::setLight(v, a, 0, ndef);
voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
v, a, true, light_sources, ndef);
//v.print(dstream, ndef, VOXELPRINT_LIGHT_DAY);
UASSERT(res.bottom_sunlight_valid == true);
UASSERT(v.getNode(v3s16(1,1,1)).getLight(LIGHTBANK_DAY, ndef)
== LIGHT_SUN);
}
v.setNodeNoRef(v3s16(0,0,0), MapNode(CONTENT_STONE));
{
std::set<v3s16> light_sources;
voxalgo::setLight(v, a, 0, ndef);
voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
v, a, true, light_sources, ndef);
UASSERT(res.bottom_sunlight_valid == true);
UASSERT(v.getNode(v3s16(1,1,1)).getLight(LIGHTBANK_DAY, ndef)
== LIGHT_SUN);
}
{
std::set<v3s16> light_sources;
voxalgo::setLight(v, a, 0, ndef);
voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
v, a, false, light_sources, ndef);
UASSERT(res.bottom_sunlight_valid == true);
UASSERT(v.getNode(v3s16(2,0,2)).getLight(LIGHTBANK_DAY, ndef)
== 0);
}
v.setNodeNoRef(v3s16(1,3,2), MapNode(CONTENT_STONE));
{
std::set<v3s16> light_sources;
voxalgo::setLight(v, a, 0, ndef);
voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
v, a, true, light_sources, ndef);
UASSERT(res.bottom_sunlight_valid == true);
UASSERT(v.getNode(v3s16(1,1,2)).getLight(LIGHTBANK_DAY, ndef)
== 0);
}
{
std::set<v3s16> light_sources;
voxalgo::setLight(v, a, 0, ndef);
voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
v, a, false, light_sources, ndef);
UASSERT(res.bottom_sunlight_valid == true);
UASSERT(v.getNode(v3s16(1,0,2)).getLight(LIGHTBANK_DAY, ndef)
== 0);
}
{
MapNode n(CONTENT_AIR);
n.setLight(LIGHTBANK_DAY, 10, ndef);
v.setNodeNoRef(v3s16(1,-1,2), n);
}
{
std::set<v3s16> light_sources;
voxalgo::setLight(v, a, 0, ndef);
voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
v, a, true, light_sources, ndef);
UASSERT(res.bottom_sunlight_valid == true);
}
{
std::set<v3s16> light_sources;
voxalgo::setLight(v, a, 0, ndef);
voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
v, a, false, light_sources, ndef);
UASSERT(res.bottom_sunlight_valid == true);
}
{
MapNode n(CONTENT_AIR);
n.setLight(LIGHTBANK_DAY, LIGHT_SUN, ndef);
v.setNodeNoRef(v3s16(1,-1,2), n);
}
{
std::set<v3s16> light_sources;
voxalgo::setLight(v, a, 0, ndef);
voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
v, a, true, light_sources, ndef);
UASSERT(res.bottom_sunlight_valid == false);
}
{
std::set<v3s16> light_sources;
voxalgo::setLight(v, a, 0, ndef);
voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
v, a, false, light_sources, ndef);
UASSERT(res.bottom_sunlight_valid == false);
}
v.setNodeNoRef(v3s16(1,3,2), MapNode(CONTENT_IGNORE));
{
std::set<v3s16> light_sources;
voxalgo::setLight(v, a, 0, ndef);
voxalgo::SunlightPropagateResult res = voxalgo::propagateSunlight(
v, a, true, light_sources, ndef);
UASSERT(res.bottom_sunlight_valid == true);
}
}
void TestVoxelAlgorithms::testClearLightAndCollectSources(INodeDefManager *ndef)
{
VoxelManipulator v;
for (u16 z = 0; z < 3; z++)
for (u16 y = 0; y < 3; y++)
for (u16 x = 0; x < 3; x++) {
v3s16 p(x,y,z);
v.setNode(p, MapNode(CONTENT_AIR));
}
VoxelArea a(v3s16(0,0,0), v3s16(2,2,2));
v.setNodeNoRef(v3s16(0,0,0), MapNode(CONTENT_STONE));
v.setNodeNoRef(v3s16(1,1,1), MapNode(CONTENT_TORCH));
{
MapNode n(CONTENT_AIR);
n.setLight(LIGHTBANK_DAY, 1, ndef);
v.setNode(v3s16(1,1,2), n);
}
{
std::set<v3s16> light_sources;
std::map<v3s16, u8> unlight_from;
voxalgo::clearLightAndCollectSources(v, a, LIGHTBANK_DAY,
ndef, light_sources, unlight_from);
//v.print(dstream, ndef, VOXELPRINT_LIGHT_DAY);
UASSERT(v.getNode(v3s16(0,1,1)).getLight(LIGHTBANK_DAY, ndef) == 0);
UASSERT(light_sources.find(v3s16(1,1,1)) != light_sources.end());
UASSERT(light_sources.size() == 1);
UASSERT(unlight_from.find(v3s16(1,1,2)) != unlight_from.end());
UASSERT(unlight_from.size() == 1);
}
}

108
src/unittest/test_voxelmanipulator.cpp Normal file
View File

@ -0,0 +1,108 @@
/*
Minetest
Copyright (C) 2013 celeron55, Perttu Ahola <celeron55@gmail.com>
This program is free software; you can redistribute it and/or modify
it under the terms of the GNU Lesser General Public License as published by
the Free Software Foundation; either version 2.1 of the License, or
(at your option) any later version.
This program is distributed in the hope that it will be useful,
but WITHOUT ANY WARRANTY; without even the implied warranty of
MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
GNU Lesser General Public License for more details.
You should have received a copy of the GNU Lesser General Public License along
with this program; if not, write to the Free Software Foundation, Inc.,
51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA.
*/
#include "test.h"
#include <algorithm>
#include "gamedef.h"
#include "log.h"
#include "voxel.h"
class TestVoxelManipulator : public TestBase {
public:
TestVoxelManipulator() { TestManager::registerTestModule(this); }
const char *getName() { return "TestVoxelManipulator"; }
void runTests(IGameDef *gamedef);
void testVoxelArea();
void testVoxelManipulator(INodeDefManager *nodedef);
};
static TestVoxelManipulator g_test_instance;
void TestVoxelManipulator::runTests(IGameDef *gamedef)
{
TEST(testVoxelArea);
TEST(testVoxelManipulator, gamedef->getNodeDefManager());
}
////////////////////////////////////////////////////////////////////////////////
void TestVoxelManipulator::testVoxelArea()
{
VoxelArea a(v3s16(-1,-1,-1), v3s16(1,1,1));
UASSERT(a.index(0,0,0) == 1*3*3 + 1*3 + 1);
UASSERT(a.index(-1,-1,-1) == 0);
VoxelArea c(v3s16(-2,-2,-2), v3s16(2,2,2));
// An area that is 1 bigger in x+ and z-
VoxelArea d(v3s16(-2,-2,-3), v3s16(3,2,2));
std::list<VoxelArea> aa;
d.diff(c, aa);
// Correct results
std::vector<VoxelArea> results;
results.push_back(VoxelArea(v3s16(-2,-2,-3), v3s16(3,2,-3)));
results.push_back(VoxelArea(v3s16(3,-2,-2), v3s16(3,2,2)));
UASSERT(aa.size() == results.size());
infostream<<"Result of diff:"<<std::endl;
for (std::list<VoxelArea>::const_iterator
it = aa.begin(); it != aa.end(); ++it) {
it->print(infostream);
infostream << std::endl;
std::vector<VoxelArea>::iterator j;
j = std::find(results.begin(), results.end(), *it);
UASSERT(j != results.end());
results.erase(j);
}
}
void TestVoxelManipulator::testVoxelManipulator(INodeDefManager *nodedef)
{
VoxelManipulator v;
v.print(infostream, nodedef);
infostream << "*** Setting (-1,0,-1)=2 ***" << std::endl;
v.setNodeNoRef(v3s16(-1,0,-1), MapNode(CONTENT_GRASS));
v.print(infostream, nodedef);
UASSERT(v.getNode(v3s16(-1,0,-1)).getContent() == CONTENT_GRASS);
infostream << "*** Reading from inexistent (0,0,-1) ***" << std::endl;
EXCEPTION_CHECK(InvalidPositionException, v.getNode(v3s16(0,0,-1)));
v.print(infostream, nodedef);
infostream << "*** Adding area ***" << std::endl;
VoxelArea a(v3s16(-1,-1,-1), v3s16(1,1,1));
v.addArea(a);
v.print(infostream, nodedef);
UASSERT(v.getNode(v3s16(-1,0,-1)).getContent() == CONTENT_GRASS);
EXCEPTION_CHECK(InvalidPositionException, v.getNode(v3s16(0,1,1)));
}

18
src/util/string.h
View File

@ -151,6 +151,24 @@ inline bool str_starts_with(const std::basic_string<T> &str,
return true;
}
/**
* Check whether \p str begins with the string prefix. If \p case_insensitive
* is true then the check is case insensitve (default is false; i.e. case is
* significant).
*
* @param str
* @param prefix
* @param case_insensitive
* @return true if the str begins with prefix
*/
template <typename T>
inline bool str_starts_with(const std::basic_string<T> &str,
const T *prefix,
bool case_insensitive = false)
{
return str_starts_with(str, std::basic_string<T>(prefix),
case_insensitive);
}
/**
* Splits a string into its component parts separated by the character