#include "sound_openal.h"
#include "clouds.h"
#include "httpfetch.h"
+#include "util/numeric.h"
+#ifdef __ANDROID__
+#include "tile.h"
+#include <GLES/gl.h>
+#endif
#include <IGUIStaticText.h>
#include <ICameraSceneNode.h>
-#if USE_CURL
-#include <curl/curl.h>
-#endif
-
/******************************************************************************/
/** TextDestGuiEngine */
/******************************************************************************/
if(name.empty())
return NULL;
m_to_delete.insert(name);
+
+#ifdef __ANDROID__
+ video::IImage *image = m_driver->createImageFromFile(name.c_str());
+ if (image) {
+ image = Align2Npot2(image, m_driver);
+ video::ITexture* retval = m_driver->addTexture(name.c_str(), image);
+ image->drop();
+ return retval;
+ }
+#endif
return m_driver->getTexture(name.c_str());
}
{
//initialize texture pointers
for (unsigned int i = 0; i < TEX_LAYER_MAX; i++) {
- m_textures[i] = 0;
+ m_textures[i].texture = NULL;
}
// is deleted by guiformspec!
m_buttonhandler = new TextDestGuiEngine(this);
rect,false,true,0,-1);
//create formspecsource
- m_formspecgui = new FormspecFormSource("",&m_formspecgui);
+ m_formspecgui = new FormspecFormSource("");
/* Create menu */
- m_menu =
- new GUIFormSpecMenu( m_device,
- m_parent,
- -1,
- m_menumanager,
- 0 /* &client */,
- 0 /* gamedef */,
- m_texture_source);
+ m_menu = new GUIFormSpecMenu(m_device,
+ m_parent,
+ -1,
+ m_menumanager,
+ NULL /* &client */,
+ NULL /* gamedef */,
+ m_texture_source,
+ m_formspecgui,
+ m_buttonhandler,
+ NULL);
m_menu->allowClose(false);
m_menu->lockSize(true,v2u32(800,600));
- m_menu->setFormSource(m_formspecgui);
- m_menu->setTextDest(m_buttonhandler);
// Initialize scripting
- infostream<<"GUIEngine: Initializing Lua"<<std::endl;
+ infostream << "GUIEngine: Initializing Lua" << std::endl;
m_script = new MainMenuScripting(this);
try {
- if (m_data->errormessage != "")
- {
+ if (m_data->errormessage != "") {
m_script->setMainMenuErrorMessage(m_data->errormessage);
m_data->errormessage = "";
}
- if (!loadMainMenuScript())
- assert("no future without mainmenu" == 0);
+ if (!loadMainMenuScript()) {
+ errorstream << "No future without mainmenu" << std::endl;
+ abort();
+ }
run();
}
}
m_menu->quitMenu();
- m_menu->drop();
- m_menu = 0;
+ m_menu->remove();
+ delete m_menu;
+ m_menu = NULL;
}
/******************************************************************************/
bool GUIEngine::loadMainMenuScript()
{
- // Try custom menu script (main_menu_script)
-
- std::string menuscript = g_settings->get("main_menu_script");
- if(menuscript != "") {
- m_scriptdir = fs::RemoveLastPathComponent(menuscript);
+ // Try custom menu script (main_menu_path)
- if(m_script->loadMod(menuscript, "__custommenu")) {
- // custom menu script loaded
- return true;
- }
- else {
- infostream
- << "GUIEngine: execution of custom menu failed!"
- << std::endl
- << "\tfalling back to builtin menu"
- << std::endl;
- }
+ m_scriptdir = g_settings->get("main_menu_path");
+ if (m_scriptdir.empty()) {
+ m_scriptdir = porting::path_share + DIR_DELIM "builtin" + DIR_DELIM "mainmenu";
}
- // Try builtin menu script (main_menu_script)
-
- std::string builtin_menuscript =
- porting::path_share + DIR_DELIM + "builtin"
- + DIR_DELIM + "mainmenu.lua";
-
- m_scriptdir = fs::RemoveRelativePathComponents(
- fs::RemoveLastPathComponent(builtin_menuscript));
-
- if(m_script->loadMod(builtin_menuscript, "__builtinmenu")) {
- // builtin menu script loaded
+ std::string script = porting::path_share + DIR_DELIM "builtin" + DIR_DELIM "init.lua";
+ if (m_script->loadScript(script)) {
+ // Menu script loaded
return true;
- }
- else {
- errorstream
- << "GUIEngine: unable to load builtin menu"
- << std::endl;
+ } else {
+ infostream
+ << "GUIEngine: execution of menu script in: \""
+ << m_scriptdir << "\" failed!" << std::endl;
}
return false;
/******************************************************************************/
void GUIEngine::run()
{
-
// Always create clouds because they may or may not be
// needed based on the game selected
video::IVideoDriver* driver = m_device->getVideoDriver();
else
sleep_ms(25);
- m_script->Step();
+ m_script->step();
+
+#ifdef __ANDROID__
+ m_menu->getAndroidUIInput();
+#endif
}
}
m_sound_manager = NULL;
}
- //TODO: clean up m_menu here
-
infostream<<"GUIEngine: Deinitializing scripting"<<std::endl;
delete m_script;
//clean up texture pointers
for (unsigned int i = 0; i < TEX_LAYER_MAX; i++) {
- if (m_textures[i] != 0)
- driver->removeTexture(m_textures[i]);
+ if (m_textures[i].texture != NULL)
+ driver->removeTexture(m_textures[i].texture);
}
delete m_texture_source;
-
+
if (m_cloud.clouds)
m_cloud.clouds->drop();
}
{
v2u32 screensize = driver->getScreenSize();
- video::ITexture* texture = m_textures[TEX_LAYER_BACKGROUND];
+ video::ITexture* texture = m_textures[TEX_LAYER_BACKGROUND].texture;
/* If no texture, draw background of solid color */
if(!texture){
return;
}
- /* Draw background texture */
v2u32 sourcesize = texture->getOriginalSize();
+
+ if (m_textures[TEX_LAYER_BACKGROUND].tile)
+ {
+ v2u32 tilesize(
+ MYMAX(sourcesize.X,m_textures[TEX_LAYER_BACKGROUND].minsize),
+ MYMAX(sourcesize.Y,m_textures[TEX_LAYER_BACKGROUND].minsize));
+ for (unsigned int x = 0; x < screensize.X; x += tilesize.X )
+ {
+ for (unsigned int y = 0; y < screensize.Y; y += tilesize.Y )
+ {
+ driver->draw2DImage(texture,
+ core::rect<s32>(x, y, x+tilesize.X, y+tilesize.Y),
+ core::rect<s32>(0, 0, sourcesize.X, sourcesize.Y),
+ NULL, NULL, true);
+ }
+ }
+ return;
+ }
+
+ /* Draw background texture */
driver->draw2DImage(texture,
core::rect<s32>(0, 0, screensize.X, screensize.Y),
core::rect<s32>(0, 0, sourcesize.X, sourcesize.Y),
{
v2u32 screensize = driver->getScreenSize();
- video::ITexture* texture = m_textures[TEX_LAYER_OVERLAY];
+ video::ITexture* texture = m_textures[TEX_LAYER_OVERLAY].texture;
/* If no texture, draw background of solid color */
if(!texture)
{
core::dimension2d<u32> screensize = driver->getScreenSize();
- video::ITexture* texture = m_textures[TEX_LAYER_HEADER];
+ video::ITexture* texture = m_textures[TEX_LAYER_HEADER].texture;
/* If no texture, draw nothing */
if(!texture)
{
core::dimension2d<u32> screensize = driver->getScreenSize();
- video::ITexture* texture = m_textures[TEX_LAYER_FOOTER];
+ video::ITexture* texture = m_textures[TEX_LAYER_FOOTER].texture;
/* If no texture, draw nothing */
if(!texture)
}
/******************************************************************************/
-bool GUIEngine::setTexture(texture_layer layer,std::string texturepath) {
-
+bool GUIEngine::setTexture(texture_layer layer, std::string texturepath,
+ bool tile_image, unsigned int minsize)
+{
video::IVideoDriver* driver = m_device->getVideoDriver();
assert(driver != 0);
- if (m_textures[layer] != 0)
+ if (m_textures[layer].texture != NULL)
{
- driver->removeTexture(m_textures[layer]);
- m_textures[layer] = 0;
+ driver->removeTexture(m_textures[layer].texture);
+ m_textures[layer].texture = NULL;
}
if ((texturepath == "") || !fs::PathExists(texturepath))
+ {
return false;
+ }
- m_textures[layer] = driver->getTexture(texturepath.c_str());
+ m_textures[layer].texture = driver->getTexture(texturepath.c_str());
+ m_textures[layer].tile = tile_image;
+ m_textures[layer].minsize = minsize;
- if (m_textures[layer] == 0) return false;
+ if (m_textures[layer].texture == NULL)
+ {
+ return false;
+ }
return true;
}
/******************************************************************************/
-bool GUIEngine::downloadFile(std::string url,std::string target) {
+bool GUIEngine::downloadFile(std::string url,std::string target)
+{
#if USE_CURL
- bool retval = true;
-
- FILE* targetfile = fopen(target.c_str(),"wb");
-
- if (targetfile) {
- HTTPFetchRequest fetchrequest;
- HTTPFetchResult fetchresult;
- fetchrequest.url = url;
- fetchrequest.useragent = std::string("Minetest ")+minetest_version_hash;
- fetchrequest.timeout = g_settings->getS32("curl_timeout");
- fetchrequest.caller = HTTPFETCH_SYNC;
- httpfetch_sync(fetchrequest,fetchresult);
-
- if (fetchresult.succeeded) {
- if (fwrite(fetchresult.data.c_str(),1,fetchresult.data.size(),targetfile) != fetchresult.data.size()) {
- retval = false;
- }
- }
- else {
- retval = false;
- }
- fclose(targetfile);
+ std::ofstream targetfile(target.c_str(), std::ios::out | std::ios::binary);
+
+ if (!targetfile.good()) {
+ return false;
}
- else {
- retval = false;
+
+ HTTPFetchRequest fetchrequest;
+ HTTPFetchResult fetchresult;
+ fetchrequest.url = url;
+ fetchrequest.caller = HTTPFETCH_SYNC;
+ fetchrequest.timeout = g_settings->getS32("curl_file_download_timeout");
+ httpfetch_sync(fetchrequest, fetchresult);
+
+ if (fetchresult.succeeded) {
+ targetfile << fetchresult.data;
+ } else {
+ return false;
}
- return retval;
+ return true;
#else
return false;
#endif
}
/******************************************************************************/
-void GUIEngine::setTopleftText(std::string append) {
+void GUIEngine::setTopleftText(std::string append)
+{
std::string toset = std::string("Minetest ") + minetest_version_hash;
if (append != "") {
}
/******************************************************************************/
-unsigned int GUIEngine::DoAsync(std::string serialized_fct,
- std::string serialized_params) {
- return m_script->DoAsync(serialized_fct,serialized_params);
+unsigned int GUIEngine::queueAsync(std::string serialized_func,
+ std::string serialized_params)
+{
+ return m_script->queueAsync(serialized_func, serialized_params);
}
+
projects / oweals / minetest.git / blobdiff