aboutsummaryrefslogtreecommitdiff
path: root/core
diff options
context:
space:
mode:
authorJuan Linietsky2014-10-27 22:54:32 -0300
committerJuan Linietsky2014-10-27 22:54:32 -0300
commite82dc402052a47b44bb3bcf50ee4801257f92778 (patch)
tree01c2cd8692b5569cae778f6504b76b3d1f9ccdad /core
parent9608d4255eb6c76b1c4496f4494c829133e096f4 (diff)
downloadgodot-e82dc402052a47b44bb3bcf50ee4801257f92778.tar.gz
godot-e82dc402052a47b44bb3bcf50ee4801257f92778.tar.zst
godot-e82dc402052a47b44bb3bcf50ee4801257f92778.zip
-Much improvement to baked light baker
-Fixed many bugs in stretch mode -Fixes to camera project and unproject as consequence of the above -added setget to script (documented in script doc) -more fixes to collada exporter for blender
Diffstat (limited to 'core')
-rw-r--r--core/globals.cpp6
-rw-r--r--core/io/config_file.cpp7
-rw-r--r--core/math/quick_hull.cpp2
3 files changed, 10 insertions, 5 deletions
diff --git a/core/globals.cpp b/core/globals.cpp
index 5be53fd85..94fa331be 100644
--- a/core/globals.cpp
+++ b/core/globals.cpp
@@ -566,9 +566,11 @@ static Variant _decode_variant(const String& p_string) {
ERR_FAIL_COND_V(params.size()!=1 && params.size()!=2,Variant());
int scode=0;
- if (params[0].is_numeric())
+ if (params[0].is_numeric()) {
scode=params[0].to_int();
- else
+ if (scode<10)
+ scode+=KEY_0;
+ } else
scode=find_keycode(params[0]);
InputEvent ie;
diff --git a/core/io/config_file.cpp b/core/io/config_file.cpp
index 45e8cf69a..b707fd9c1 100644
--- a/core/io/config_file.cpp
+++ b/core/io/config_file.cpp
@@ -471,9 +471,12 @@ static Variant _decode_variant(const String& p_string) {
ERR_FAIL_COND_V(params.size()!=1 && params.size()!=2,Variant());
int scode=0;
- if (params[0].is_numeric())
+ if (params[0].is_numeric()) {
scode=params[0].to_int();
- else
+ if (scode < 10) {
+ scode=KEY_0+scode;
+ }
+ } else
scode=find_keycode(params[0]);
InputEvent ie;
diff --git a/core/math/quick_hull.cpp b/core/math/quick_hull.cpp
index 136a103ee..a417cdadd 100644
--- a/core/math/quick_hull.cpp
+++ b/core/math/quick_hull.cpp
@@ -63,7 +63,7 @@ Error QuickHull::build(const Vector<Vector3>& p_points, Geometry::MeshData &r_me
Vector3 sp = p_points[i].snapped(0.0001);
if (valid_cache.has(sp)) {
valid_points[i]=false;
- print_line("INVALIDATED: "+itos(i));
+ //print_line("INVALIDATED: "+itos(i));
}else {
valid_points[i]=true;
valid_cache.insert(sp);