summaryrefslogtreecommitdiff
path: root/scene/3d
diff options
context:
space:
mode:
authorJuan Linietsky <reduzio@gmail.com>2014-06-27 23:21:45 -0300
committerJuan Linietsky <reduzio@gmail.com>2014-06-27 23:21:45 -0300
commit2af2a84a03fd707cfa4c682aff34d722343d8985 (patch)
tree50d064e8bba7d5efb5974e3fa3a67e076fb5ef8b /scene/3d
parent1cc96a4d7440d9e8a20f7dbf17cf5771170de83d (diff)
Misc Fixes
========== -NOTIFICATION_WM_QUIT fixed on android (seems tha way this is reported changed in newer sdk) -WIP implementation of APK Expansion APIs for publishing games larger than 50mb in Play Store -Feaures in the new tutorials are all present in the sourcecode -This (hopefully) should get rid of the animation list order getting corrupted -Improved 3D Scene Importer (Skeletons, Animations and other stuff were not being merged). Anything missing? -In code editor, the automatic syntax checker will only use file_exists() to check preload() else it might freeze the editor too much while typing if the preload is a big resource -Fixed bugs in PolygonPathFinder, stil pending to do a node and a demo
Diffstat (limited to 'scene/3d')
-rw-r--r--scene/3d/camera.cpp2
-rw-r--r--scene/3d/follow_camera.cpp2
-rw-r--r--scene/3d/light.cpp7
-rw-r--r--scene/3d/light.h1
-rw-r--r--scene/3d/particles.cpp2
-rw-r--r--scene/3d/portal.cpp2
-rw-r--r--scene/3d/room_instance.cpp2
-rw-r--r--scene/3d/skeleton.cpp2
-rw-r--r--scene/3d/spatial_player.cpp2
9 files changed, 10 insertions, 12 deletions
diff --git a/scene/3d/camera.cpp b/scene/3d/camera.cpp
index ecdfc8a7f9..56fbf358bc 100644
--- a/scene/3d/camera.cpp
+++ b/scene/3d/camera.cpp
@@ -344,7 +344,7 @@ RES Camera::_get_gizmo_geometry() const {
mat->set_line_width(4);
mat->set_flag(Material::FLAG_DOUBLE_SIDED,true);
mat->set_flag(Material::FLAG_UNSHADED,true);
- mat->set_hint(Material::HINT_NO_DEPTH_DRAW,true);
+ //mat->set_hint(Material::HINT_NO_DEPTH_DRAW,true);
surface_tool->begin(Mesh::PRIMITIVE_LINES);
surface_tool->set_material(mat);
diff --git a/scene/3d/follow_camera.cpp b/scene/3d/follow_camera.cpp
index 20a1654b92..e7ced6c2ba 100644
--- a/scene/3d/follow_camera.cpp
+++ b/scene/3d/follow_camera.cpp
@@ -548,7 +548,7 @@ RES FollowCamera::_get_gizmo_geometry() const {
mat->set_line_width(4);
mat->set_flag(Material::FLAG_DOUBLE_SIDED,true);
mat->set_flag(Material::FLAG_UNSHADED,true);
- mat->set_hint(Material::HINT_NO_DEPTH_DRAW,true);
+// mat->set_hint(Material::HINT_NO_DEPTH_DRAW,true);
surface_tool->begin(Mesh::PRIMITIVE_LINES);
surface_tool->set_material(mat);
diff --git a/scene/3d/light.cpp b/scene/3d/light.cpp
index b79fd8617f..25f3b3d3a5 100644
--- a/scene/3d/light.cpp
+++ b/scene/3d/light.cpp
@@ -165,7 +165,7 @@ RES Light::_get_gizmo_geometry() const {
mat_area->set_parameter( FixedMaterial::PARAM_EMISSION,Color(0.7,0.7,0.7) );
mat_area->set_blend_mode( Material::BLEND_MODE_ADD );
mat_area->set_flag(Material::FLAG_DOUBLE_SIDED,true);
- mat_area->set_hint(Material::HINT_NO_DEPTH_DRAW,true);
+// mat_area->set_hint(Material::HINT_NO_DEPTH_DRAW,true);
Ref<FixedMaterial> mat_light( memnew( FixedMaterial ));
@@ -474,7 +474,6 @@ void Light::_bind_methods() {
}*/
- ADD_PROPERTYI( PropertyInfo( Variant::COLOR, "colors/ambient"), _SCS("set_color"), _SCS("get_color"),COLOR_AMBIENT);
ADD_PROPERTYI( PropertyInfo( Variant::COLOR, "colors/diffuse"), _SCS("set_color"), _SCS("get_color"),COLOR_DIFFUSE);
ADD_PROPERTYI( PropertyInfo( Variant::COLOR, "colors/specular"), _SCS("set_color"), _SCS("get_color"),COLOR_SPECULAR);
ADD_PROPERTY( PropertyInfo( Variant::BOOL, "shadow/shadow"), _SCS("set_project_shadows"), _SCS("has_project_shadows"));
@@ -495,7 +494,7 @@ void Light::_bind_methods() {
BIND_CONSTANT( PARAM_SHADOW_DARKENING );
BIND_CONSTANT( PARAM_SHADOW_Z_OFFSET );
- BIND_CONSTANT( COLOR_AMBIENT );
+
BIND_CONSTANT( COLOR_DIFFUSE );
BIND_CONSTANT( COLOR_SPECULAR );
@@ -518,7 +517,7 @@ Light::Light(VisualServer::LightType p_type) {
set_parameter(PARAM_SHADOW_ESM_MULTIPLIER,60);
set_parameter(PARAM_SHADOW_BLUR_PASSES,1);
- set_color( COLOR_AMBIENT, Color(0,0,0));
+
set_color( COLOR_DIFFUSE, Color(1,1,1));
set_color( COLOR_SPECULAR, Color(1,1,1));
diff --git a/scene/3d/light.h b/scene/3d/light.h
index f090ae5782..6b1ea2d455 100644
--- a/scene/3d/light.h
+++ b/scene/3d/light.h
@@ -61,7 +61,6 @@ public:
enum LightColor {
- COLOR_AMBIENT=VisualServer::LIGHT_COLOR_AMBIENT,
COLOR_DIFFUSE=VisualServer::LIGHT_COLOR_DIFFUSE,
COLOR_SPECULAR=VisualServer::LIGHT_COLOR_SPECULAR
};
diff --git a/scene/3d/particles.cpp b/scene/3d/particles.cpp
index d74768f0ab..b47f1644e3 100644
--- a/scene/3d/particles.cpp
+++ b/scene/3d/particles.cpp
@@ -324,7 +324,7 @@ RES Particles::_get_gizmo_geometry() const {
mat->set_parameter( FixedMaterial::PARAM_EMISSION,Color(0.5,0.7,0.8) );
mat->set_blend_mode( Material::BLEND_MODE_ADD );
mat->set_flag(Material::FLAG_DOUBLE_SIDED,true);
- mat->set_hint(Material::HINT_NO_DEPTH_DRAW,true);
+// mat->set_hint(Material::HINT_NO_DEPTH_DRAW,true);
surface_tool->begin(Mesh::PRIMITIVE_TRIANGLES);
diff --git a/scene/3d/portal.cpp b/scene/3d/portal.cpp
index 12b9dc4b7a..fe627c2cc0 100644
--- a/scene/3d/portal.cpp
+++ b/scene/3d/portal.cpp
@@ -106,7 +106,7 @@ RES Portal::_get_gizmo_geometry() const {
mat->set_line_width(4);
mat->set_flag(Material::FLAG_DOUBLE_SIDED,true);
mat->set_flag(Material::FLAG_UNSHADED,true);
- mat->set_hint(Material::HINT_NO_DEPTH_DRAW,true);
+// mat->set_depth_draw_mode(Material::DEPTH_DRAW_NEVER,true);
surface_tool->begin(Mesh::PRIMITIVE_LINES);
surface_tool->set_material(mat);
diff --git a/scene/3d/room_instance.cpp b/scene/3d/room_instance.cpp
index 0f390c15af..fa1d3ecf6b 100644
--- a/scene/3d/room_instance.cpp
+++ b/scene/3d/room_instance.cpp
@@ -99,7 +99,7 @@ RES Room::_get_gizmo_geometry() const {
mat->set_line_width(4);
mat->set_flag(Material::FLAG_DOUBLE_SIDED,true);
mat->set_flag(Material::FLAG_UNSHADED,true);
- mat->set_hint(Material::HINT_NO_DEPTH_DRAW,true);
+// mat->set_hint(Material::HINT_NO_DEPTH_DRAW,true);
surface_tool->begin(Mesh::PRIMITIVE_LINES);
surface_tool->set_material(mat);
diff --git a/scene/3d/skeleton.cpp b/scene/3d/skeleton.cpp
index b77a4e0fe3..323bfa4dc4 100644
--- a/scene/3d/skeleton.cpp
+++ b/scene/3d/skeleton.cpp
@@ -445,7 +445,7 @@ RES Skeleton::_get_gizmo_geometry() const {
mat->set_flag(Material::FLAG_DOUBLE_SIDED,true);
mat->set_flag(Material::FLAG_UNSHADED,true);
mat->set_flag(Material::FLAG_ONTOP,true);
- mat->set_hint(Material::HINT_NO_DEPTH_DRAW,true);
+// mat->set_hint(Material::HINT_NO_DEPTH_DRAW,true);
surface_tool->begin(Mesh::PRIMITIVE_LINES);
surface_tool->set_material(mat);
diff --git a/scene/3d/spatial_player.cpp b/scene/3d/spatial_player.cpp
index 0847598356..8e3a0d30ea 100644
--- a/scene/3d/spatial_player.cpp
+++ b/scene/3d/spatial_player.cpp
@@ -98,7 +98,7 @@ RES SpatialPlayer::_get_gizmo_geometry() const {
mat->set_parameter( FixedMaterial::PARAM_EMISSION,Color(0.5,0.7,0.8) );
mat->set_blend_mode( Material::BLEND_MODE_ADD );
mat->set_flag(Material::FLAG_DOUBLE_SIDED,true);
- mat->set_hint(Material::HINT_NO_DEPTH_DRAW,true);
+// mat->set_hint(Material::HINT_NO_DEPTH_DRAW,true);
surface_tool->begin(Mesh::PRIMITIVE_TRIANGLES);