diff options
Diffstat (limited to 'core')
| -rw-r--r-- | core/globals.cpp | 4 | ||||
| -rw-r--r-- | core/helper/value_evaluator.h | 43 | ||||
| -rw-r--r-- | core/io/http_client.cpp | 1 | ||||
| -rw-r--r-- | core/math/math_funcs.cpp | 4 |
4 files changed, 50 insertions, 2 deletions
diff --git a/core/globals.cpp b/core/globals.cpp index c0c1171ae6..020e05fb8f 100644 --- a/core/globals.cpp +++ b/core/globals.cpp @@ -54,7 +54,7 @@ String Globals::localize_path(const String& p_path) const { if (resource_path=="") return p_path; //not initialied yet - if (p_path.find(":/") != -1) + if (p_path.begins_with("res://") || p_path.begins_with("user://")) return p_path.simplify_path(); @@ -82,6 +82,8 @@ String Globals::localize_path(const String& p_path) const { if (sep == -1) { return "res://"+path; }; + + String parent = path.substr(0, sep); String plocal = localize_path(parent); diff --git a/core/helper/value_evaluator.h b/core/helper/value_evaluator.h new file mode 100644 index 0000000000..a03602bc61 --- /dev/null +++ b/core/helper/value_evaluator.h @@ -0,0 +1,43 @@ +/*************************************************************************/ +/* value_evaluator.h */ +/*************************************************************************/ +/* This file is part of: */ +/* GODOT ENGINE */ +/* http://www.godotengine.org */ +/*************************************************************************/ +/* Copyright (c) 2007-2014 Juan Linietsky, Ariel Manzur. */ +/* */ +/* Permission is hereby granted, free of charge, to any person obtaining */ +/* a copy of this software and associated documentation files (the */ +/* "Software"), to deal in the Software without restriction, including */ +/* without limitation the rights to use, copy, modify, merge, publish, */ +/* distribute, sublicense, and/or sell copies of the Software, and to */ +/* permit persons to whom the Software is furnished to do so, subject to */ +/* the following conditions: */ +/* */ +/* The above copyright notice and this permission notice shall be */ +/* included in all copies or substantial portions of the Software. */ +/* */ +/* THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, */ +/* EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF */ +/* MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.*/ +/* IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY */ +/* CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, */ +/* TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE */ +/* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ +/*************************************************************************/ +#ifndef VALUE_EVALUATOR_H +#define VALUE_EVALUATOR_H + +#include "core/object.h" + +class ValueEvaluator : public Object { + + OBJ_TYPE(ValueEvaluator, Object); +public: + virtual double eval(const String& p_text) { + return p_text.to_double(); + } +}; + +#endif // VALUE_EVALUATOR_H diff --git a/core/io/http_client.cpp b/core/io/http_client.cpp index 8c58e0ba5e..d7098b4c43 100644 --- a/core/io/http_client.cpp +++ b/core/io/http_client.cpp @@ -303,6 +303,7 @@ Error HTTPClient::poll(){ chunked=false; body_left=0; chunk_left=0; + response_str.clear(); response_headers.clear(); response_num = RESPONSE_OK; diff --git a/core/math/math_funcs.cpp b/core/math/math_funcs.cpp index 07f114725d..0fbd031214 100644 --- a/core/math/math_funcs.cpp +++ b/core/math/math_funcs.cpp @@ -135,18 +135,20 @@ double Math::rad2deg(double p_y) { double Math::round(double p_val) { - if (p_val>0) { + if (p_val>=0) { return ::floor(p_val+0.5); } else { p_val=-p_val; return -::floor(p_val+0.5); } } + double Math::asin(double p_x) { return ::asin(p_x); } + double Math::acos(double p_x) { return ::acos(p_x); |