omar/panopainter
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

change cloud url

Browse Source
This commit is contained in:
omigamedev
2017-12-23 13:57:43 +00:00
parent 0a3363fb13
commit 01370642a1
3 changed files with 17 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
engine/app.cpp
View File

@@ -24,8 +24,8 @@ App App::I; // singleton
void App::create() void App::create()
{ {
width = 800; width = 1920/2;
height = 500; height = 1080/2;
} }
void App::clear() void App::clear()
@@ -70,7 +70,7 @@ void App::download(std::string filename)
{ {
auto dest = data_path + "/" + filename; auto dest = data_path + "/" + filename;
FILE* fp = fopen(dest.c_str(), "wb"); 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_URL, url.c_str());
curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp); curl_easy_setopt(curl, CURLOPT_WRITEDATA, fp);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_data_write); curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_data_write);
@@ -100,7 +100,7 @@ void App::upload(std::string filename, std::string name)
if (curl) 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_URL, url.c_str());
curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost); curl_easy_setopt(curl, CURLOPT_HTTPPOST, formpost);
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &res); curl_easy_setopt(curl, CURLOPT_WRITEDATA, &res);
@@ -242,11 +242,17 @@ void App::update(float dt)
//glViewport(0, 0, (GLsizei)width, (GLsizei)height); //glViewport(0, 0, (GLsizei)width, (GLsizei)height);
//glClear(GL_COLOR_BUFFER_BIT); //glClear(GL_COLOR_BUFFER_BIT);
if (!canvas->m_mouse_captured)
{
#if _WIN32 || __OSX__ #if _WIN32 || __OSX__
layout.reload(); layout.reload();
#endif #endif
if (auto* main = layout[main_id]) if (auto* main = layout[main_id])
main->update(width, height, zoom); {
main->update(width, height, zoom);
stroke->update_controls();
}
}
static glm::vec4 color_button_normal{.1, .1, .1, 1}; static glm::vec4 color_button_normal{.1, .1, .1, 1};
static glm::vec4 color_button_hlight{ 1, .0, .0, 1}; static glm::vec4 color_button_hlight{ 1, .0, .0, 1};
@@ -256,7 +262,6 @@ void App::update(float dt)
layout[main_id]->find<NodeButton>("btn-touchlock")->set_color( layout[main_id]->find<NodeButton>("btn-touchlock")->set_color(
canvas->m_canvas->m_touch_lock ? color_button_hlight : color_button_normal); canvas->m_canvas->m_touch_lock ? color_button_hlight : color_button_normal);
stroke->update_controls();
auto observer = [this](Node* n) auto observer = [this](Node* n)
{ {

2
engine/node.h
View File

@@ -178,6 +178,8 @@ public:
template<class T> T* add_child() template<class T> T* add_child()
{ {
auto* n = new T; auto* n = new T;
n->m_manager = m_manager;
n->parent = parent;
n->init(); n->init();
n->create(); n->create();
n->loaded(); n->loaded();

4
engine/node_dialog_cloud.cpp
View File

@@ -51,7 +51,7 @@ void NodeDialogCloud::load_thumbs_thread()
{ {
curl_easy_setopt(curl, CURLOPT_WRITEDATA, &res); curl_easy_setopt(curl, CURLOPT_WRITEDATA, &res);
curl_easy_setopt(curl, CURLOPT_WRITEFUNCTION, curl_data_handler); 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); auto err = curl_easy_perform(curl);
if (err != CURLE_OK) if (err != CURLE_OK)
{ {
@@ -75,7 +75,7 @@ void NodeDialogCloud::load_thumbs_thread()
for (const auto& n : names) for (const auto& n : names)
{ {
res.clear(); 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()); curl_easy_setopt(curl, CURLOPT_URL, url.c_str());
auto err = curl_easy_perform(curl); auto err = curl_easy_perform(curl);
if (err != CURLE_OK) if (err != CURLE_OK)