diff --git a/engine/app.cpp b/engine/app.cpp index 144e26d..f708483 100644 --- a/engine/app.cpp +++ b/engine/app.cpp @@ -24,8 +24,8 @@ App App::I; // singleton void App::create() { - width = 800; - height = 500; + width = 1920/2; + height = 1080/2; } void App::clear() @@ -70,7 +70,7 @@ void App::download(std::string filename) { auto dest = data_path + "/" + filename; FILE* fp = fopen(dest.c_str(), "wb"); - std::string url = "http://omigamedev.ddns.net:8080/panoview/cloud-dwl.php?file=" + filename; + std::string url = "http://omigamedev.com/panopainter/cloud/cloud-dwl.php?file=" + filename; curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_data_write); @@ -100,7 +100,7 @@ void App::upload(std::string filename, std::string name) if (curl) { - std::string url = "http://omigamedev.ddns.net:8080/panoview/cloud-upl.php?name=" + name; + std::string url = "http://omigamedev.com/panopainter/cloud/cloud-upl.php?name=" + name; curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost); curl_easy_setopt(curl, CURLOPT_WRITEDATA, &res); @@ -242,11 +242,17 @@ void App::update(float dt) //glViewport(0, 0, (GLsizei)width, (GLsizei)height); //glClear(GL_COLOR_BUFFER_BIT); + if (!canvas->m_mouse_captured) + { #if _WIN32 || __OSX__ - layout.reload(); + layout.reload(); #endif - if (auto* main = layout[main_id]) - main->update(width, height, zoom); + if (auto* main = layout[main_id]) + { + main->update(width, height, zoom); + stroke->update_controls(); + } + } static glm::vec4 color_button_normal{.1, .1, .1, 1}; static glm::vec4 color_button_hlight{ 1, .0, .0, 1}; @@ -256,7 +262,6 @@ void App::update(float dt) layout[main_id]->find("btn-touchlock")->set_color( canvas->m_canvas->m_touch_lock ? color_button_hlight : color_button_normal); - stroke->update_controls(); auto observer = [this](Node* n) { diff --git a/engine/node.h b/engine/node.h index 5d6a1c8..b9b0819 100644 --- a/engine/node.h +++ b/engine/node.h @@ -178,6 +178,8 @@ public: template T* add_child() { auto* n = new T; + n->m_manager = m_manager; + n->parent = parent; n->init(); n->create(); n->loaded(); diff --git a/engine/node_dialog_cloud.cpp b/engine/node_dialog_cloud.cpp index fc68a6d..3587526 100644 --- a/engine/node_dialog_cloud.cpp +++ b/engine/node_dialog_cloud.cpp @@ -51,7 +51,7 @@ void NodeDialogCloud::load_thumbs_thread() { curl_easy_setopt(curl, CURLOPT_WRITEDATA, &res); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_data_handler); - curl_easy_setopt(curl, CURLOPT_URL, "http://omigamedev.ddns.net:8080/panoview/cloud-list.php"); + curl_easy_setopt(curl, CURLOPT_URL, "http://omigamedev.com/panopainter/cloud/cloud-list.php"); auto err = curl_easy_perform(curl); if (err != CURLE_OK) { @@ -75,7 +75,7 @@ void NodeDialogCloud::load_thumbs_thread() for (const auto& n : names) { res.clear(); - std::string url = "http://omigamedev.ddns.net:8080/panoview/cloud-info.php?file=" + n; + std::string url = "http://omigamedev.com/panopainter/cloud/cloud-info.php?file=" + n; curl_easy_setopt(curl, CURLOPT_URL, url.c_str()); auto err = curl_easy_perform(curl); if (err != CURLE_OK)