Dead code tells no tales

core/class_db.h

@@ -181,27 +181,6 @@ public:
 	static void _add_class() {
 
 		_add_class2(T::get_class_static(), T::get_parent_class_static());
-#if 0
-		GLOBAL_LOCK_FUNCTION;
-
-		StringName name = T::get_class_static();
-
-		ERR_FAIL_COND(types.has(name));
-
-		types[name]=TypeInfo();
-		TypeInfo &ti=types[name];
-		ti.name=name;
-		ti.inherits=T::get_parent_class_static();
-
-		if (ti.inherits) {
-
-			ERR_FAIL_COND( !types.has(ti.inherits) ); //it MUST be registered.
-			ti.inherits_ptr = &types[ti.inherits];
-
-		} else {
-			ti.inherits_ptr=NULL;
-		}
-#endif
 	}
 
 	template <class T>
@@ -252,102 +231,6 @@ public:
 
 	static uint64_t get_api_hash(APIType p_api);
 
-#if 0
-	template<class N, class M>
-	static MethodBind* bind_method(N p_method_name, M p_method,
-		//default arguments
-		ParamDef d1=ParamDef(),
-		ParamDef d2=ParamDef(),
-		ParamDef d3=ParamDef(),
-		ParamDef d4=ParamDef(),
-		ParamDef d5=ParamDef()
-		) {
-
-		return bind_methodf(METHOD_FLAGS_DEFAULT,p_method_name, p_method, d1,d2,d3,d4,d5);
-	}
-
-
-
-	template<class N, class M>
-	static MethodBind* bind_methodf(uint32_t p_flags, N p_method_name, M p_method,
-
-
-		//default arguments
-		const ParamDef &d1=ParamDef(),
-		const ParamDef &d2=ParamDef(),
-		const ParamDef &d3=ParamDef(),
-		const ParamDef &d4=ParamDef(),
-		const ParamDef &d5=ParamDef()
-		) {
-
-		GLOBAL_LOCK_FUNCTION;
-
-		MethodDefinition method_name=p_method_name;
-
-		MethodBind *bind = create_method_bind(p_method);
-		bind->set_name(method_name.name);
-		ERR_FAIL_COND_V(!bind,NULL);
-
-		String instance_type=bind->get_instance_type();
-
-		TypeInfo *type=types.getptr(instance_type);
-		if (!type) {
-			memdelete(bind);
-			ERR_FAIL_COND_V(!type,NULL);
-		}
-
-		if (type->method_map.has(method_name.name)) {
-			memdelete(bind);
-			// overloading not supported
-			ERR_EXPLAIN("Method already bound: "+instance_type+"::"+method_name.name);
-			ERR_FAIL_V(NULL);
-		}
-		bind->set_argument_names(method_name.args);
-		type->method_map[method_name.name]=bind;
-
-		Vector<Variant> defvals;
-
-#define PARSE_DEFVAL(m_defval)              \
-	if (d##m_defval.used)                   \
-		defvals.insert(0, d##m_defval.val); \
-	else                                    \
-		goto set_defvals;
-
-
-		PARSE_DEFVAL(1);
-		PARSE_DEFVAL(2);
-		PARSE_DEFVAL(3);
-		PARSE_DEFVAL(4);
-		PARSE_DEFVAL(5);
-		set_defvals:
-
-		bind->set_default_arguments(defvals);
-		bind->set_hint_flags(p_flags);
-
-		return bind;
-#undef PARSE_DEFVAL
-	}
-#else
-
-#if 0
-	template<class N, class M>
-	static MethodBind* bind_method(N p_method_name, M p_method,
-		//default arguments
-		const ParamDef &d1=ParamDef(),
-		const ParamDef &d2=ParamDef(),
-		const ParamDef &d3=ParamDef(),
-		const ParamDef &d4=ParamDef(),
-		const ParamDef &d5=ParamDef()
-		) {
-
-		MethodDefinition method_name=p_method_name;
-
-		MethodBind *bind = create_method_bind(p_method);
-
-		return bind_methodfi(METHOD_FLAGS_DEFAULT,bind,method_name,d1,d2,d3,d4,d5); //use static function, much smaller binary usage
-	}
-#endif
-
 	template <class N, class M>
 	static MethodBind *bind_method(N p_method_name, M p_method) {
 
@@ -410,26 +293,6 @@ public:
 		return bind_methodfi(METHOD_FLAGS_DEFAULT, bind, p_method_name, ptr, 6);
 	}
 
-#if 0
-	template<class N, class M>
-	static MethodBind* bind_methodf(uint32_t p_flags, N p_method_name, M p_method,
-
-		const ParamDef& d1=ParamDef(),
-		const ParamDef& d2=ParamDef(),
-		const ParamDef& d3=ParamDef(),
-		const ParamDef& d4=ParamDef(),
-		const ParamDef& d5=ParamDef()
-		) {
-
-		MethodDefinition method_name=p_method_name;
-
-		MethodBind *bind = create_method_bind(p_method);
-
-		return bind_methodfi(p_flags,bind,method_name,d1,d2,d3,d4,d5); //use static function, much smaller binary usage
-	}
-#endif
-
-#endif
 	template <class M>
 	static MethodBind *bind_vararg_method(uint32_t p_flags, StringName p_name, M p_method, const MethodInfo &p_info = MethodInfo(), const Vector<Variant> &p_default_args = Vector<Variant>()) {
 

core/dictionary.cpp

@@ -200,17 +200,6 @@ uint32_t Dictionary::hash() const {
 
 Array Dictionary::keys() const {
 
-#if 0
-	Array karr;
-	karr.resize(size());
-	const Variant *K = NULL;
-	int idx = 0;
-	while ((K = next(K))) {
-		karr[idx++] = (*K);
-	}
-	return karr;
-#else
-
 	Array varr;
 	varr.resize(size());
 	if (_p->variant_map.empty())
@@ -228,7 +217,6 @@ Array Dictionary::keys() const {
 	}
 
 	return varr;
-#endif
 }
 
 Array Dictionary::values() const {

core/io/resource_format_binary.cpp

@@ -1717,54 +1717,6 @@ void ResourceFormatSaverBinaryInstance::_find_resources(const Variant &p_variant
 		default: {}
 	}
 }
-#if 0
-Error ResourceFormatSaverBinary::_save_obj(const Object *p_object,SavedObject *so) {
-
-	//use classic way
-	List<PropertyInfo> property_list;
-	p_object->get_property_list( &property_list );
-
-	for(List<PropertyInfo>::Element *E=property_list.front();E;E=E->next()) {
-
-		if (skip_editor && E->get().name.begins_with("__editor"))
-			continue;
-		if (E->get().usage&PROPERTY_USAGE_STORAGE || (bundle_resources && E->get().usage&PROPERTY_USAGE_BUNDLE)) {
-
-			SavedObject::SavedProperty sp;
-			sp.name_idx=get_string_index(E->get().name);
-			sp.value = p_object->get(E->get().name);
-			_find_resources(sp.value);
-			so->properties.push_back(sp);
-		}
-	}
-
-	return OK;
-
-}
-
-
-
-Error ResourceFormatSaverBinary::save(const Object *p_object,const Variant &p_meta) {
-
-	ERR_FAIL_COND_V(!f,ERR_UNCONFIGURED);
-	ERR_EXPLAIN("write_object should supply either an object, a meta, or both");
-	ERR_FAIL_COND_V(!p_object && p_meta.get_type()==Variant::NIL, ERR_INVALID_PARAMETER);
-
-	SavedObject *so = memnew( SavedObject );
-
-	if (p_object)
-		so->type=p_object->get_type();
-
-	_find_resources(p_meta);
-	so->meta=p_meta;
-	Error err = _save_obj(p_object,so);
-	ERR_FAIL_COND_V( err, ERR_INVALID_DATA );
-
-	saved_objects.push_back(so);
-
-	return OK;
-}
-#endif
 
 void ResourceFormatSaverBinaryInstance::save_unicode_string(const String &p_string) {
 

core/math/camera_matrix.cpp

@@ -180,19 +180,7 @@ void CameraMatrix::set_orthogonal(real_t p_size, real_t p_aspect, real_t p_znear
 }
 
 void CameraMatrix::set_frustum(real_t p_left, real_t p_right, real_t p_bottom, real_t p_top, real_t p_near, real_t p_far) {
-#if 0
-	///@TODO, give a check to this. I'm not sure if it's working.
-	set_identity();
 
-	matrix[0][0]=(2*p_near) / (p_right-p_left);
-	matrix[0][2]=(p_right+p_left) / (p_right-p_left);
-	matrix[1][1]=(2*p_near) / (p_top-p_bottom);
-	matrix[1][2]=(p_top+p_bottom) / (p_top-p_bottom);
-	matrix[2][2]=-(p_far+p_near) / ( p_far-p_near);
-	matrix[2][3]=-(2*p_far*p_near) / (p_far-p_near);
-	matrix[3][2]=-1;
-	matrix[3][3]=0;
-#else
 	real_t *te = &matrix[0][0];
 	real_t x = 2 * p_near / (p_right - p_left);
 	real_t y = 2 * p_near / (p_top - p_bottom);
@@ -218,8 +206,6 @@ void CameraMatrix::set_frustum(real_t p_left, real_t p_right, real_t p_bottom, r
 	te[13] = 0;
 	te[14] = d;
 	te[15] = 0;
-
-#endif
 }
 
 real_t CameraMatrix::get_z_far() const {

core/math/geometry.h

@@ -105,7 +105,7 @@ public:
 	}
 
 	static void get_closest_points_between_segments(const Vector3 &p1, const Vector3 &p2, const Vector3 &q1, const Vector3 &q2, Vector3 &c1, Vector3 &c2) {
-#if 1
+
 //do the function 'd' as defined by pb. I think is is dot product of some sort
 #define d_of(m, n, o, p) ((m.x - n.x) * (o.x - p.x) + (m.y - n.y) * (o.y - p.y) + (m.z - n.z) * (o.z - p.z))
 
@@ -120,33 +120,6 @@ public:
 		if (mub > 1) mub = 1;
 		c1 = p1.linear_interpolate(p2, mua);
 		c2 = q1.linear_interpolate(q2, mub);
-#else
-		//this is broken do not use
-		Vector3 u = p2 - p1;
-		Vector3 v = q2 - q1;
-		Vector3 w = p1 - q1;
-		float a = u.dot(u);
-		float b = u.dot(v);
-		float c = v.dot(v); // always >= 0
-		float d = u.dot(w);
-		float e = v.dot(w);
-		float D = a * c - b * b; // always >= 0
-		float sc, tc;
-
-		// compute the line parameters of the two closest points
-		if (D < CMP_EPSILON) { // the lines are almost parallel
-			sc = 0.0;
-			tc = (b > c ? d / b : e / c); // use the largest denominator
-		} else {
-			sc = (b * e - c * d) / D;
-			tc = (a * e - b * d) / D;
-		}
-
-		c1 = w + sc * u;
-		c2 = w + tc * v;
-// get the difference of the two closest points
-//Vector   dP = w + (sc * u) - (tc * v);  // =  L1(sc) - L2(tc)
-#endif
 	}
 
 	static real_t get_closest_distance_between_segments(const Vector3 &p_from_a, const Vector3 &p_to_a, const Vector3 &p_from_b, const Vector3 &p_to_b) {

core/math/math_2d.cpp

@@ -205,33 +205,6 @@ Vector2 Vector2::clamped(real_t p_len) const {
 	return v;
 }
 
-Vector2 Vector2::cubic_interpolate_soft(const Vector2 &p_b, const Vector2 &p_pre_a, const Vector2 &p_post_b, real_t p_t) const {
-#if 0
-	k[0] = ((*this) (vi[0] + 1, vi[1], vi[2])) - ((*this) (vi[0],
-	vi[1],vi[2])); //fk = a0
-	k[1] = (((*this) (vi[0] + 1, vi[1], vi[2])) - ((*this) ((int) (v(0) -
-	1), vi[1],vi[2])))*0.5; //dk = a1
-	k[2] = (((*this) ((int) (v(0) + 2), vi[1], vi[2])) - ((*this) (vi[0],
-	vi[1],vi[2])))*0.5; //dk+1
-	k[3] = k[0]*3 - k[1]*2 - k[2];//a2
-	k[4] = k[1] + k[2] - k[0]*2;//a3
-
-	//ip = a3(t-tk)³ + a2(t-tk)² + a1(t-tk) + a0
-	//
-	//a3 = dk + dk+1 - Dk
-	//a2 = 3Dk - 2dk - dk+1
-	//a1 = dk
-	//a0 = fk
-	//
-	//dk = (fk+1 - fk-1)*0.5
-	//Dk = (fk+1 - fk)
-
-	real_t dk =
-#endif
-
-	return Vector2();
-}
-
 Vector2 Vector2::cubic_interpolate(const Vector2 &p_b, const Vector2 &p_pre_a, const Vector2 &p_post_b, real_t p_t) const {
 
 	Vector2 p0 = p_pre_a;

core/math/math_2d.h

@@ -113,7 +113,6 @@ struct Vector2 {
 	_FORCE_INLINE_ static Vector2 linear_interpolate(const Vector2 &p_a, const Vector2 &p_b, real_t p_t);
 	_FORCE_INLINE_ Vector2 linear_interpolate(const Vector2 &p_b, real_t p_t) const;
 	Vector2 cubic_interpolate(const Vector2 &p_b, const Vector2 &p_pre_a, const Vector2 &p_post_b, real_t p_t) const;
-	Vector2 cubic_interpolate_soft(const Vector2 &p_b, const Vector2 &p_pre_a, const Vector2 &p_post_b, real_t p_t) const;
 
 	Vector2 slide(const Vector2 &p_normal) const;
 	Vector2 bounce(const Vector2 &p_normal) const;

core/math/math_funcs.cpp

@@ -28,16 +28,13 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "math_funcs.h"
+
 #include "core/os/os.h"
 
 pcg32_random_t Math::default_pcg = { 12047754176567800795ULL, PCG_DEFAULT_INC_64 };
 
 #define PHI 0x9e3779b9
 
-#if 0
-static uint32_t Q[4096];
-#endif
-
 // TODO: we should eventually expose pcg.inc too
 uint32_t Math::rand_from_seed(uint64_t *seed) {
 	pcg32_random_t pcg = { *seed, PCG_DEFAULT_INC_64 };

core/math/octree.h

@@ -851,28 +851,6 @@ void Octree<T, use_pairs, AL>::move(OctreeElementID p_id, const Rect3 &p_aabb) {
 	ERR_FAIL_COND(!E);
 	Element &e = E->get();
 
-#if 0
-
-	pass++;
-	if (!e.aabb.has_no_surface()) {
-		_remove_element(&e);
-	}
-
-	e.aabb=p_aabb;
-
-	if (!e.aabb.has_no_surface()) {
-		_ensure_valid_root(p_aabb);
-
-		_insert_element(&e,root);
-		if (use_pairs)
-			_element_check_pairs(&e);
-
-	}
-
-	_optimize();
-
-#else
-
 	bool old_has_surf = !e.aabb.has_no_surface();
 	bool new_has_surf = !p_aabb.has_no_surface();
 
@@ -979,7 +957,6 @@ void Octree<T, use_pairs, AL>::move(OctreeElementID p_id, const Rect3 &p_aabb) {
 	}
 
 	_optimize();
-#endif
 }
 
 template <class T, bool use_pairs, class AL>

core/math/quat.cpp

@@ -139,48 +139,6 @@ Quat Quat::inverse() const {
 
 Quat Quat::slerp(const Quat &q, const real_t &t) const {
 
-#if 0
-
-
-	Quat dst=q;
-	Quat src=*this;
-
-	src.normalize();
-	dst.normalize();
-
-	real_t cosine = dst.dot(src);
-
-	if (cosine < 0 && true) {
-		cosine = -cosine;
-		dst = -dst;
-	} else {
-		dst = dst;
-	}
-
-	if (Math::abs(cosine) < 1 - CMP_EPSILON) {
-		// Standard case (slerp)
-		real_t sine = Math::sqrt(1 - cosine*cosine);
-		real_t angle = Math::atan2(sine, cosine);
-		real_t inv_sine = 1.0 / sine;
-		real_t coeff_0 = Math::sin((1.0 - t) * angle) * inv_sine;
-		real_t coeff_1 = Math::sin(t * angle) * inv_sine;
-		Quat ret=  src * coeff_0 + dst * coeff_1;
-
-		return ret;
-	} else {
-		// There are two situations:
-		// 1. "rkP" and "q" are very close (cosine ~= +1), so we can do a linear
-		//    interpolation safely.
-		// 2. "rkP" and "q" are almost invedste of each other (cosine ~= -1), there
-		//    are an infinite number of possibilities interpolation. but we haven't
-		//    have method to fix this case, so just use linear interpolation here.
-		Quat ret =  src * (1.0 - t) + dst *t;
-		// taking the complement requires renormalisation
-		ret.normalize();
-		return ret;
-	}
-#else
-
 	Quat to1;
 	real_t omega, cosom, sinom, scale0, scale1;
 
@@ -221,7 +179,6 @@ Quat Quat::slerp(const Quat &q, const real_t &t) const {
 			scale0 * y + scale1 * to1.y,
 			scale0 * z + scale1 * to1.z,
 			scale0 * w + scale1 * to1.w);
-#endif
 }
 
 Quat Quat::slerpni(const Quat &q, const real_t &t) const {
@@ -241,53 +198,6 @@ Quat Quat::slerpni(const Quat &q, const real_t &t) const {
 			invFactor * from.y + newFactor * q.y,
 			invFactor * from.z + newFactor * q.z,
 			invFactor * from.w + newFactor * q.w);
-
-#if 0
-	real_t         to1[4];
-	real_t        omega, cosom, sinom, scale0, scale1;
-
-
-	// calc cosine
-	cosom = x * q.x + y * q.y + z * q.z
-			+ w * q.w;
-
-
-	// adjust signs (if necessary)
-	if ( cosom <0.0 && false) {
-		cosom = -cosom;to1[0] = - q.x;
-		to1[1] = - q.y;
-		to1[2] = - q.z;
-		to1[3] = - q.w;
-	} else  {
-		to1[0] = q.x;
-		to1[1] = q.y;
-		to1[2] = q.z;
-		to1[3] = q.w;
-	}
-
-
-	// calculate coefficients
-
-	if ( (1.0 - cosom) > CMP_EPSILON ) {
-		// standard case (slerp)
-		omega = Math::acos(cosom);
-		sinom = Math::sin(omega);
-		scale0 = Math::sin((1.0 - t) * omega) / sinom;
-		scale1 = Math::sin(t * omega) / sinom;
-	} else {
-		// "from" and "to" quaternions are very close
-		//  ... so we can do a linear interpolation
-		scale0 = 1.0 - t;
-		scale1 = t;
-	}
-	// calculate final values
-	return Quat(
-		scale0 * x + scale1 * to1[0],
-		scale0 * y + scale1 * to1[1],
-		scale0 * z + scale1 * to1[2],
-		scale0 * w + scale1 * to1[3]
-	);
-#endif
 }
 
 Quat Quat::cubic_slerp(const Quat &q, const Quat &prep, const Quat &postq, const real_t &t) const {

core/math/rect3.h

@@ -189,8 +189,6 @@ Vector3 Rect3::get_endpoint(int p_point) const {
 
 bool Rect3::intersects_convex_shape(const Plane *p_planes, int p_plane_count) const {
 
-#if 1
-
 	Vector3 half_extents = size * 0.5;
 	Vector3 ofs = position + half_extents;
 
@@ -206,42 +204,6 @@ bool Rect3::intersects_convex_shape(const Plane *p_planes, int p_plane_count) co
 	}
 
 	return true;
-#else
-	//cache all points to check against!
-	// #warning should be easy to optimize, just use the same as when taking the support and use only that point
-	Vector3 points[8] = {
-		Vector3(position.x, position.y, position.z),
-		Vector3(position.x, position.y, position.z + size.z),
-		Vector3(position.x, position.y + size.y, position.z),
-		Vector3(position.x, position.y + size.y, position.z + size.z),
-		Vector3(position.x + size.x, position.y, position.z),
-		Vector3(position.x + size.x, position.y, position.z + size.z),
-		Vector3(position.x + size.x, position.y + size.y, position.z),
-		Vector3(position.x + size.x, position.y + size.y, position.z + size.z),
-	};
-
-	for (int i = 0; i < p_plane_count; i++) { //for each plane
-
-		const Plane &plane = p_planes[i];
-		bool all_points_over = true;
-		//test if it has all points over!
-
-		for (int j = 0; j < 8; j++) {
-
-			if (!plane.is_point_over(points[j])) {
-
-				all_points_over = false;
-				break;
-			}
-		}
-
-		if (all_points_over) {
-
-			return false;
-		}
-	}
-	return true;
-#endif
 }
 
 bool Rect3::has_point(const Vector3 &p_point) const {

core/math/transform.h

@@ -154,8 +154,7 @@ _FORCE_INLINE_ Plane Transform::xform_inv(const Plane &p_plane) const {
 }
 
 _FORCE_INLINE_ Rect3 Transform::xform(const Rect3 &p_aabb) const {
-/* define vertices */
-#if 1
+	/* define vertices */
 	Vector3 x = basis.get_axis(0) * p_aabb.size.x;
 	Vector3 y = basis.get_axis(1) * p_aabb.size.y;
 	Vector3 z = basis.get_axis(2) * p_aabb.size.z;
@@ -171,31 +170,8 @@ _FORCE_INLINE_ Rect3 Transform::xform(const Rect3 &p_aabb) const {
 	new_aabb.expand_to(pos + y + z);
 	new_aabb.expand_to(pos + x + y + z);
 	return new_aabb;
-#else
-
-	Vector3 vertices[8] = {
-		Vector3(p_aabb.position.x + p_aabb.size.x, p_aabb.position.y + p_aabb.size.y, p_aabb.position.z + p_aabb.size.z),
-		Vector3(p_aabb.position.x + p_aabb.size.x, p_aabb.position.y + p_aabb.size.y, p_aabb.position.z),
-		Vector3(p_aabb.position.x + p_aabb.size.x, p_aabb.position.y, p_aabb.position.z + p_aabb.size.z),
-		Vector3(p_aabb.position.x + p_aabb.size.x, p_aabb.position.y, p_aabb.position.z),
-		Vector3(p_aabb.position.x, p_aabb.position.y + p_aabb.size.y, p_aabb.position.z + p_aabb.size.z),
-		Vector3(p_aabb.position.x, p_aabb.position.y + p_aabb.size.y, p_aabb.position.z),
-		Vector3(p_aabb.position.x, p_aabb.position.y, p_aabb.position.z + p_aabb.size.z),
-		Vector3(p_aabb.position.x, p_aabb.position.y, p_aabb.position.z)
-	};
-
-	AABB ret;
-
-	ret.pos = xform(vertices[0]);
-
-	for (int i = 1; i < 8; i++) {
-
-		ret.expand_to(xform(vertices[i]));
-	}
-
-	return ret;
-#endif
 }
+
 _FORCE_INLINE_ Rect3 Transform::xform_inv(const Rect3 &p_aabb) const {
 
 	/* define vertices */
@@ -222,4 +198,4 @@ _FORCE_INLINE_ Rect3 Transform::xform_inv(const Rect3 &p_aabb) const {
 	return ret;
 }
 
-#endif
+#endif // TRANSFORM_H

core/math/vector3.cpp

@@ -125,51 +125,6 @@ Vector3 Vector3::cubic_interpolate(const Vector3 &p_b, const Vector3 &p_pre_a, c
 	return out;
 }
 
-#if 0
-Vector3 Vector3::cubic_interpolate(const Vector3& p_b,const Vector3& p_pre_a, const Vector3& p_post_b,real_t p_t) const {
-
-	Vector3 p0=p_pre_a;
-	Vector3 p1=*this;
-	Vector3 p2=p_b;
-	Vector3 p3=p_post_b;
-
-	if (true) {
-
-		real_t ab = p0.distance_to(p1);
-		real_t bc = p1.distance_to(p2);
-		real_t cd = p2.distance_to(p3);
-
-		//if (ab>bc) {
-		if (ab>0)
-			p0 = p1+(p0-p1)*(bc/ab);
-		//}
-
-		//if (cd>bc) {
-		if (cd>0)
-			p3 = p2+(p3-p2)*(bc/cd);
-		//}
-	}
-
-	real_t t = p_t;
-	real_t t2 = t * t;
-	real_t t3 = t2 * t;
-
-	Vector3 out;
-	out.x = 0.5 * ( ( 2.0 * p1.x ) +
-	( -p0.x + p2.x ) * t +
-	( 2.0 * p0.x - 5.0 * p1.x + 4 * p2.x - p3.x ) * t2 +
-	( -p0.x + 3.0 * p1.x - 3.0 * p2.x + p3.x ) * t3 );
-	out.y = 0.5 * ( ( 2.0 * p1.y ) +
-	( -p0.y + p2.y ) * t +
-	( 2.0 * p0.y - 5.0 * p1.y + 4 * p2.y - p3.y ) * t2 +
-	( -p0.y + 3.0 * p1.y - 3.0 * p2.y + p3.y ) * t3 );
-	out.z = 0.5 * ( ( 2.0 * p1.z ) +
-	( -p0.z + p2.z ) * t +
-	( 2.0 * p0.z - 5.0 * p1.z + 4 * p2.z - p3.z ) * t2 +
-	( -p0.z + 3.0 * p1.z - 3.0 * p2.z + p3.z ) * t3 );
-	return out;
-}
-#endif
 Vector3::operator String() const {
 
 	return (rtos(x) + ", " + rtos(y) + ", " + rtos(z));

core/message_queue.cpp

@@ -240,47 +240,6 @@ void MessageQueue::statistics() {
 	}
 }
 
-bool MessageQueue::print() {
-#if 0
-	uint32_t read_pos=0;
-	while (read_pos < buffer_end ) {
-		Message *message = (Message*)&buffer[ read_pos ];
-
-		Object *target = ObjectDB::get_instance(message->instance_ID);
-		String cname;
-		String cfunc;
-
-		if (target==NULL) {
-			//object was deleted
-			//WARN_PRINT("Object was deleted while awaiting a callback")
-			//should it print a warning?
-		} else if (message->notification>=0) {
-
-			// messages don't expect a return value
-			cfunc="notification # "+itos(message->notification);
-			cname=target->get_type();
-
-		} else if (!message->target.empty()) {
-
-			cfunc="property:  "+message->target;
-			cname=target->get_type();
-
-
-		} else if (message->target) {
-
-			cfunc=String(message->target)+"()";
-			cname=target->get_type();
-		}
-
-
-		read_pos+=sizeof(Message);
-		if (message->type!=TYPE_NOTIFICATION)
-			read_pos+=sizeof(Variant)*message->args;
-	}
-#endif
-	return false;
-}
-
 int MessageQueue::get_max_buffer_usage() const {
 
 	return buffer_max_used;

core/message_queue.h

@@ -33,6 +33,7 @@
 #include "object.h"
 #include "os/mutex.h"
 #include "os/thread_safe.h"
+
 class MessageQueue {
 
 	_THREAD_SAFE_CLASS_
@@ -85,7 +86,6 @@ public:
 	Error push_notification(Object *p_object, int p_notification);
 	Error push_set(Object *p_object, const StringName &p_prop, const Variant &p_value);
 
-	bool print();
 	void statistics();
 	void flush();
 

core/method_bind.h

@@ -252,28 +252,6 @@ public:
 
 	_FORCE_INLINE_ int get_argument_count() const { return argument_count; };
 
-#if 0
-	_FORCE_INLINE_ Variant call_safe(const Variant** p_args,int p_arg_count, Variant::CallError& r_error) {
-
-		r_error.error=Variant::CallError::CALL_OK;
-		check_call( p_args, &errorarg );
-		if (!err)
-			return call(p_object, VARIANT_ARG_PASS );
-
-		VARIANT_ARGPTRS
-		String errstr;
-		String methodname = get_instance_type()+"::"+name;
-		if (err==CALL_ERROR_ARGUMENT_TYPE) {
-			errstr="Invalid Argument to call: '"+methodname+"'. Cannot convert argument "+itos(errorarg+1)+" from "+Variant::get_type_name(get_argument_type(errorarg))+" to "+Variant::get_type_name(argptr[errorarg]->get_type())+".";
-		}
-		if (err==CALL_ERROR_EXTRA_ARGUMENT) {
-			errstr="Invalid call. Member function '"+methodname+"' takes "+itos(get_argument_count())+" argument, but argument "+itos(errorarg+1)+" was received.";
-		}
-
-		ERR_PRINT(errstr.ascii().get_data());
-		return Variant();
-	}
-#endif
 	virtual Variant call(Object *p_object, const Variant **p_args, int p_arg_count, Variant::CallError &r_error) = 0;
 
 #ifdef PTRCALL_ENABLED

core/object.cpp

@@ -342,35 +342,6 @@ void Object::get_valid_parents_static(List<String> *p_parents) {
 }
 void Object::_get_valid_parents_static(List<String> *p_parents) {
 }
-#if 0
-//old style set, deprecated
-
-void Object::set(const String& p_name, const Variant& p_value) {
-
-	_setv(p_name,p_value);
-
-	/*
-	if (!_use_builtin_script())
-		return;
-	*/
-
-	bool success;
-	ClassDB::set_property(this,p_name,p_value,success);
-	if (success) {
-		return;
-	}
-
-	if (p_name=="__meta__") {
-		metadata=p_value;
-	} else if (p_name=="script") {
-		set_script(p_value);
-	} else if (script_instance) {
-		script_instance->set(p_name,p_value);
-	}
-
-
-}
-#endif
 
 void Object::set(const StringName &p_name, const Variant &p_value, bool *r_valid) {
 
@@ -489,34 +460,6 @@ Variant Object::get(const StringName &p_name, bool *r_valid) const {
 	}
 }
 
-#if 0
-//old style get, deprecated
-Variant Object::get(const String& p_name) const {
-
-	Variant ret=_getv(p_name);
-	if (ret.get_type()!=Variant::NIL)
-		return ret;
-
-	bool success;
-	ClassDB::get_property(const_cast<Object*>(this),p_name,ret,success);
-	if (success) {
-		return ret;
-	}
-
-	if (p_name=="__meta__")
-		return metadata;
-	else if (p_name=="script")
-		return script;
-
-	if (script_instance) {
-		return script_instance->get(p_name);
-	}
-
-	return Variant();
-
-}
-#endif
-
 void Object::get_property_list(List<PropertyInfo> *p_list, bool p_reversed) const {
 
 	if (script_instance && p_reversed) {
@@ -596,22 +539,6 @@ Variant Object::_call_deferred_bind(const Variant **p_args, int p_argcount, Vari
 	return Variant();
 }
 
-#if 0
-Variant Object::_call_bind(const StringName& p_name, const Variant& p_arg1, const Variant& p_arg2, const Variant& p_arg3, const Variant& p_arg4) {
-
-	ERR_FAIL_COND_V(p_argcount<1,Variant());
-
-	return call(p_name, p_arg1, p_arg2, p_arg3, p_arg4);
-};
-
-
-
-
-void Object::_call_deferred_bind(const StringName& p_name, const Variant& p_arg1, const Variant& p_arg2, const Variant& p_arg3, const Variant& p_arg4) {
-
-	call_deferred(p_name, p_arg1, p_arg2, p_arg3, p_arg4);
-};
-#endif
 #ifdef DEBUG_ENABLED
 static bool _test_call_error(const StringName &p_func, const Variant::CallError &error) {
 
@@ -764,54 +691,6 @@ Variant Object::callv(const StringName &p_method, const Array &p_args) {
 }
 
 Variant Object::call(const StringName &p_name, VARIANT_ARG_DECLARE) {
-#if 0
-	if (p_name==CoreStringNames::get_singleton()->_free) {
-#ifdef DEBUG_ENABLED
-		if (cast_to<Reference>()) {
-			ERR_EXPLAIN("Can't 'free' a reference.");
-			ERR_FAIL_V(Variant());
-		}
-#endif
-		//must be here, must be before everything,
-		memdelete(this);
-		return Variant();
-	}
-
-	VARIANT_ARGPTRS;
-
-	int argc=0;
-	for(int i=0;i<VARIANT_ARG_MAX;i++) {
-		if (argptr[i]->get_type()==Variant::NIL)
-			break;
-		argc++;
-	}
-
-	Variant::CallError error;
-
-	Variant ret;
-
-	if (script_instance) {
-		ret = script_instance->call(p_name,argptr,argc,error);
-		if (_test_call_error(p_name,error))
-			return ret;
-	}
-
-	MethodBind *method=ClassDB::get_method(get_type_name(),p_name);
-
-	if (method) {
-
-
-		Variant ret = method->call(this,argptr,argc,error);
-		if (_test_call_error(p_name,error))
-			return ret;
-
-		return ret;
-	} else {
-
-	}
-
-	return Variant();
-#else
 
 	VARIANT_ARGPTRS;
 
@@ -826,52 +705,9 @@ Variant Object::call(const StringName &p_name, VARIANT_ARG_DECLARE) {
 
 	Variant ret = call(p_name, argptr, argc, error);
 	return ret;
-
-#endif
 }
 
 void Object::call_multilevel(const StringName &p_name, VARIANT_ARG_DECLARE) {
-#if 0
-	if (p_name==CoreStringNames::get_singleton()->_free) {
-#ifdef DEBUG_ENABLED
-		if (cast_to<Reference>()) {
-			ERR_EXPLAIN("Can't 'free' a reference.");
-			ERR_FAIL();
-			return;
-		}
-#endif
-		//must be here, must be before everything,
-		memdelete(this);
-		return;
-	}
-
-	VARIANT_ARGPTRS;
-
-	int argc=0;
-	for(int i=0;i<VARIANT_ARG_MAX;i++) {
-		if (argptr[i]->get_type()==Variant::NIL)
-			break;
-		argc++;
-	}
-
-	Variant::CallError error;
-
-	if (script_instance) {
-		script_instance->call(p_name,argptr,argc,error);
-		_test_call_error(p_name,error);
-
-	}
-
-	MethodBind *method=ClassDB::get_method(get_type_name(),p_name);
-
-	if (method) {
-
-		method->call(this,argptr,argc,error);
-		_test_call_error(p_name,error);
-
-	}
-
-#else
 
 	VARIANT_ARGPTRS;
 
@@ -884,8 +720,6 @@ void Object::call_multilevel(const StringName &p_name, VARIANT_ARG_DECLARE) {
 
 	//Variant::CallError error;
 	call_multilevel(p_name, argptr, argc);
-
-#endif
 }
 
 Variant Object::call(const StringName &p_method, const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
@@ -1130,22 +964,6 @@ struct _ObjectSignalDisconnectData {
 	StringName method;
 };
 
-#if 0
-void Object::_emit_signal(const StringName& p_name,const Array& p_pargs){
-
-	Variant args[VARIANT_ARG_MAX];
-
-	int count = p_pargs.size();
-
-	for(int i=0;i<count;i++) {
-		args[i]=p_pargs[i];
-	}
-
-	emit_signal(p_name,VARIANT_ARGS_FROM_ARRAY(args));
-}
-
-#endif
-
 Variant Object::_emit_signal(const Variant **p_args, int p_argcount, Variant::CallError &r_error) {
 
 	r_error.error = Variant::CallError::CALL_ERROR_TOO_FEW_ARGUMENTS;
@@ -1314,21 +1132,7 @@ void Object::_add_user_signal(const String &p_name, const Array &p_args) {
 
 	add_user_signal(mi);
 }
-#if 0
-void Object::_emit_signal(const StringName& p_name,const Array& p_pargs){
-
-	Variant args[VARIANT_ARG_MAX];
 
-	int count = p_pargs.size();
-
-	for(int i=0;i<count;i++) {
-		args[i]=p_pargs[i];
-	}
-
-	emit_signal(p_name,VARIANT_ARGS_FROM_ARRAY(args));
-}
-
-#endif
 Array Object::_get_signal_list() const {
 
 	List<MethodInfo> signal_list;
@@ -1342,6 +1146,7 @@ Array Object::_get_signal_list() const {
 
 	return ret;
 }
+
 Array Object::_get_signal_connection_list(const String &p_signal) const {
 
 	List<Connection> conns;

core/os/input_event.cpp

@@ -28,11 +28,9 @@
 /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.                */
 /*************************************************************************/
 #include "input_event.h"
+
 #include "input_map.h"
 #include "os/keyboard.h"
-/**
- *
- */
 
 void InputEvent::set_id(uint32_t p_id) {
 	id = p_id;
@@ -99,25 +97,6 @@ bool InputEvent::is_action_type() const {
 	return false;
 }
 
-#if 0
-if (String(p_method) == "is_action" && p_argidx == 0) {
-
-	List<PropertyInfo> pinfo;
-	ProjectSettings::get_singleton()->get_property_list(&pinfo);
-
-	for (List<PropertyInfo>::Element *E = pinfo.front(); E; E = E->next()) {
-		const PropertyInfo &pi = E->get();
-
-		if (!pi.name.begins_with("input/"))
-			continue;
-
-		String name = pi.name.substr(pi.name.find("/") + 1, pi.name.length());
-		result.insert("\"" + name + "\"");
-	}
-
-} else
-#endif
-
 void InputEvent::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("set_id", "id"), &InputEvent::set_id);

core/project_settings.cpp

@@ -733,46 +733,6 @@ Error ProjectSettings::save_custom(const String &p_path, const CustomMap &p_cust
 	}
 
 	return OK;
-
-#if 0
-	Error err = file->open(dst_file,FileAccess::WRITE);
-	if (err) {
-		memdelete(file);
-		ERR_EXPLAIN("Couldn't save project.godot");
-		ERR_FAIL_COND_V(err,err)
-	}
-
-
-	for(Map<String,List<String> >::Element *E=props.front();E;E=E->next()) {
-
-		if (E!=props.front())
-			file->store_string("\n");
-
-		if (E->key()!="")
-			file->store_string("["+E->key()+"]\n\n");
-		for(List<String>::Element *F=E->get().front();F;F=F->next()) {
-
-			String key = F->get();
-			if (E->key()!="")
-				key=E->key()+"/"+key;
-			Variant value;
-
-			if (p_custom.has(key))
-				value=p_custom[key];
-			else
-				value = get(key);
-
-			file->store_string(F->get()+"="+_encode_variant(value)+"\n");
-
-		}
-	}
-
-	file->close();
-	memdelete(file);
-
-
-	return OK;
-#endif
 }
 
 Variant _GLOBAL_DEF(const String &p_var, const Variant &p_default) {

core/reference.cpp

@@ -124,44 +124,3 @@ void WeakRef::_bind_methods() {
 
 	ClassDB::bind_method(D_METHOD("get_ref"), &WeakRef::get_ref);
 }
-#if 0
-
-Reference * RefBase::get_reference_from_ref(const RefBase &p_base) {
-
-	return p_base.get_reference();
-}
-void RefBase::ref_inc(Reference *p_reference) {
-
-	p_reference->refcount.ref();
-}
-bool RefBase::ref_dec(Reference *p_reference) {
-
-	bool ref = p_reference->refcount.unref();
-	return ref;
-}
-
-Reference *RefBase::first_ref(Reference *p_reference) {
-
-	if (p_reference->refcount.ref()) {
-
-		// this may fail in the scenario of two threads assigning the pointer for the FIRST TIME
-		// at the same time, which is never likely to happen (would be crazy to do)
-		// so don't do it.
-
-		if (p_reference->refcount_init.get()>0) {
-			p_reference->refcount_init.unref();
-			p_reference->refcount.unref(); // first referencing is already 1, so compensate for the ref above
-		}
-
-		return p_reference;
-	} else {
-
-		return 0;
-	}
-
-}
-char * RefBase::get_refptr_data(const RefPtr &p_refptr) const {
-
-	return p_refptr.data;
-}
-#endif

core/reference.h

@@ -59,21 +59,6 @@ public:
 	~Reference();
 };
 
-#if 0
-class RefBase {
-protected:
-	void ref_inc(Reference *p_reference);
-	bool ref_dec(Reference *p_reference);
-	Reference *first_ref(Reference *p_reference);
-	Reference * get_reference_from_ref(const RefBase &p_base);
-	virtual Reference * get_reference() const=0;
-	char * get_refptr_data(const RefPtr &p_refptr) const;
-public:
-
-	virtual ~RefBase() {}
-};
-#endif
-
 template <class T>
 class Ref {
 
@@ -151,20 +136,10 @@ public:
 		return refptr;
 	};
 
-#if 0
-	// go to RefPtr
-	operator RefPtr() const {
-
-		return get_ref_ptr();
-	}
-#endif
-
-#if 1
 	operator Variant() const {
 
 		return Variant(get_ref_ptr());
 	}
-#endif
 
 	void operator=(const Ref &p_from) {
 

core/ustring.cpp

@@ -1252,66 +1252,7 @@ String String::utf8(const char *p_utf8, int p_len) {
 
 	return ret;
 };
-#if 0
-_FORCE_INLINE static int parse_utf8_char(const char *p_utf8,unsigned int *p_ucs4,int p_left) { //return len
-
-
-	int len=0;
-
-/* Determine the number of characters in sequence */
-	if ((*p_utf8 & 0x80)==0)
-		len=1;
-	else if ((*p_utf8 & 0xE0)==0xC0)
-		len=2;
-	else if ((*p_utf8 & 0xF0)==0xE0)
-		len=3;
-	else if ((*p_utf8 & 0xF8)==0xF0)
-		len=4;
-	else if ((*p_utf8 & 0xFC)==0xF8)
-		len=5;
-	else if ((*p_utf8 & 0xFE)==0xFC)
-		len=6;
-	else
-		return -1; //invalid UTF8
-
-	if (len>p_left)
-		return -1; //not enough space
-
-	if (len==2 && (*p_utf8&0x1E)==0) {
-		//printf("overlong rejected\n");
-		return -1; //reject overlong
-	}
-
-	/* Convert the first character */
-
-	unsigned int unichar=0;
-
-	if (len == 1)
-		unichar=*p_utf8;
-	else {
-
-		unichar=(0xFF >> (len +1)) & *p_utf8;
 
-		for (int i=1;i<len;i++) {
-
-			if ((p_utf8[i] & 0xC0) != 0x80) {
-				//printf("invalid utf8\n");
-				return -1; //invalid utf8
-			}
-			if (unichar==0 && i==2 && ((p_utf8[i] & 0x7F) >> (7 - len)) == 0) {
-				//printf("no overlong\n");
-				return -1; //no overlong
-			}
-			unichar = (unichar << 6) | (p_utf8[i] & 0x3F);
-		}
-	}
-
-	*p_ucs4=unichar;
-
-	return len;
-
-}
-#endif
 bool String::parse_utf8(const char *p_utf8, int p_len) {
 
 #define _UNICERROR(m_err) print_line("unicode error: " + String(m_err));
@@ -1998,94 +1939,6 @@ double String::to_double(const char *p_str) {
 #else
 	return built_in_strtod<char>(p_str);
 #endif
-#if 0
-#if 0
-
-
-	return atof(p_str);
-#else
-	if (!p_str[0])
-		return 0;
-///@todo make more exact so saving and loading does not lose precision
-
-	double integer=0;
-	double decimal=0;
-	double decimal_mult=0.1;
-	double sign=1.0;
-	double exp=0;
-	double exp_sign=1.0;
-	int reading=READING_SIGN;
-
-	const char *str=p_str;
-
-	while(*str && reading!=READING_DONE) {
-
-		CharType c=*(str++);
-		switch(reading) {
-			case READING_SIGN: {
-				if (c>='0' && c<='9')
-					reading=READING_INT;
-					// let it fallthrough
-				else if (c=='-') {
-					sign=-1.0;
-					reading=READING_INT;
-					break;
-				} else if (c=='.') {
-					reading=READING_DEC;
-					break;
-				} else {
-					break;
-				}
-			}
-			case READING_INT: {
-
-				if (c>='0' && c<='9') {
-
-					integer*=10;
-					integer+=c-'0';
-				} else if (c=='.') {
-					reading=READING_DEC;
-				} else if (c=='e') {
-					reading=READING_EXP;
-				} else {
-					reading=READING_DONE;
-				}
-
-			 } break;
-			case READING_DEC: {
-
-				if (c>='0' && c<='9') {
-
-					decimal+=(c-'0')*decimal_mult;
-					decimal_mult*=0.1;
-				} else if (c=='e') {
-					reading=READING_EXP;
-				} else {
-					reading=READING_DONE;
-				}
-
-			 } break;
-			case READING_EXP: {
-
-				if (c>='0' && c<='9') {
-
-					exp*=10.0;
-					exp+=(c-'0');
-				} else if (c=='-' && exp==0) {
-					exp_sign=-1.0;
-				} else if (exp_sign>=0 && c=='+') {
-					//redundant...
-					exp_sign=1.0;
-				} else {
-					reading=READING_DONE;
-				}
-			 } break;
-		}
-	}
-
-	return sign*(integer+decimal)*Math::pow(10,exp_sign*exp);
-#endif
-#endif
 }
 
 float String::to_float() const {
@@ -2096,100 +1949,6 @@ float String::to_float() const {
 double String::to_double(const CharType *p_str, const CharType **r_end) {
 
 	return built_in_strtod<CharType>(p_str, (CharType **)r_end);
-#if 0
-#if 0
-	//ndef NO_USE_STDLIB
-	return wcstod(p_str,p_len<0?NULL:p_str+p_len);
-#else
-	if (p_len==0 || !p_str[0])
-		return 0;
-///@todo make more exact so saving and loading does not lose precision
-
-	double integer=0;
-	double decimal=0;
-	double decimal_mult=0.1;
-	double sign=1.0;
-	double exp=0;
-	double exp_sign=1.0;
-	int reading=READING_SIGN;
-
-	const CharType *str=p_str;
-	const CharType *limit=&p_str[p_len];
-
-	while(reading!=READING_DONE && str!=limit) {
-
-		CharType c=*(str++);
-		switch(reading) {
-			case READING_SIGN: {
-				if (c>='0' && c<='9')
-					reading=READING_INT;
-					// let it fallthrough
-				else if (c=='-') {
-					sign=-1.0;
-					reading=READING_INT;
-					break;
-				} else if (c=='.') {
-					reading=READING_DEC;
-					break;
-				} else if (c==0) {
-					reading=READING_DONE;
-					break;
-				} else {
-					break;
-				}
-			}
-			case READING_INT: {
-
-				if (c>='0' && c<='9') {
-
-					integer*=10;
-					integer+=c-'0';
-				} else if (c=='.') {
-					reading=READING_DEC;
-				} else if (c=='e' || c=='E') {
-					reading=READING_EXP;
-				} else {
-					reading=READING_DONE;
-				}
-
-			 } break;
-			case READING_DEC: {
-
-				if (c>='0' && c<='9') {
-
-					decimal+=(c-'0')*decimal_mult;
-					decimal_mult*=0.1;
-				} else if (c=='e' || c=='E') {
-					reading=READING_EXP;
-				} else {
-					reading=READING_DONE;
-				}
-
-			 } break;
-			case READING_EXP: {
-
-				if (c>='0' && c<='9') {
-
-					exp*=10.0;
-					exp+=(c-'0');
-				} else if (c=='-' && exp==0) {
-					exp_sign=-1.0;
-				} else if (exp_sign>=0 && c=='+') {
-					//redundant...
-					exp_sign=1.0;
-				} else {
-					reading=READING_DONE;
-				}
-			 } break;
-		}
-	}
-
-	if (r_end)
-		*r_end=str-1;
-
-	return sign*(integer+decimal)*Math::pow(10,exp_sign*exp);
-#endif
-#endif
 }
 
 int64_t String::to_int(const CharType *p_str, int p_len) {
@@ -2252,98 +2011,6 @@ double String::to_double() const {
 #else
 	return built_in_strtod<CharType>(c_str());
 #endif
-#if 0
-#ifndef NO_USE_STDLIB
-
-	return atof(utf8().get_data());
-#else
-
-	double integer=0;
-	double decimal=0;
-	double decimal_mult=0.1;
-	double sign=1.0;
-	double exp=0;
-	double exp_sign=1.0;
-	int reading=READING_SIGN;
-
-	const CharType *str=&operator[](0);
-
-	while(*str && reading!=READING_DONE) {
-
-		CharType c=*(str++);
-		switch(reading) {
-			case READING_SIGN: {
-				if (c>='0' && c<='9')
-					reading=READING_INT;
-					// let it fallthrough
-				else if (c=='-') {
-					sign=-1.0;
-					reading=READING_INT;
-					break;
-				} else if (c=='.') {
-					reading=READING_DEC;
-					break;
-				} else {
-					break;
-				}
-			}
-			case READING_INT: {
-
-				if (c>='0' && c<='9') {
-
-					integer*=10;
-					integer+=c-'0';
-				} else if (c=='.') {
-					reading=READING_DEC;
-				} else if (c=='e') {
-					reading=READING_EXP;
-				} else {
-					reading=READING_DONE;
-				}
-
-			 } break;
-			case READING_DEC: {
-
-				if (c>='0' && c<='9') {
-
-					decimal+=(c-'0')*decimal_mult;
-					decimal_mult*=0.1;
-				} else if (c=='e') {
-					reading=READING_EXP;
-				} else {
-					reading=READING_DONE;
-				}
-
-			 } break;
-			case READING_EXP: {
-
-				if (c>='0' && c<='9') {
-
-					exp*=10.0;
-					exp+=(c-'0');
-				} else if (c=='-' && exp==0) {
-					exp_sign=-1.0;
-				} else if (exp_sign>=0 && c=='+') {
-					//redundant...
-					exp_sign=1.0;
-				} else {
-					reading=READING_DONE;
-				}
-			 } break;
-		}
-	}
-
-	return sign*(integer+decimal)*Math::pow(10,exp_sign*exp);
-#endif
-#if 0
-
-
-	double ret=sign*(integer+decimal)*Math::pow(10,exp_sign*exp);
-
-	print_line(*this +" == "+rtos(ret));
-	return ret;
-#endif
-#endif
 }
 
 bool operator==(const char *p_chr, const String &p_str) {

drivers/gles2/SCsub

@@ -1,9 +0,0 @@
-#!/usr/bin/env python
-
-Import('env')
-
-env.add_source_files(env.drivers_sources, "*.cpp")
-
-SConscript("shaders/SCsub")
-
-Export('env')

drivers/gles2/rasterizer_gles2.cpp

@@ -1,10766 +0,0 @@
-/*************************************************************************/
-/*  rasterizer_gles2.cpp                                                 */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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.                */
-/*************************************************************************/
-#ifdef GLES2_ENABLED
-
-#include "rasterizer_gles2.h"
-#include "gl_context/context_gl.h"
-#include "os/os.h"
-#include "project_settings.h"
-#include "servers/visual/particle_system_sw.h"
-#include "servers/visual/shader_language.h"
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#ifdef GLEW_ENABLED
-#define _GL_HALF_FLOAT_OES 0x140B
-#else
-#define _GL_HALF_FLOAT_OES 0x8D61
-#endif
-
-#define _GL_RGBA16F_EXT 0x881A
-#define _GL_RGB16F_EXT 0x881B
-#define _GL_RG16F_EXT 0x822F
-#define _GL_R16F_EXT 0x822D
-#define _GL_R32F_EXT 0x822E
-
-#define _GL_RED_EXT 0x1903
-#define _GL_RG_EXT 0x8227
-#define _GL_R8_EXT 0x8229
-#define _GL_RG8_EXT 0x822B
-
-#define _DEPTH_COMPONENT24_OES 0x81A6
-
-#ifdef GLEW_ENABLED
-#define _glClearDepth glClearDepth
-#else
-#define _glClearDepth glClearDepthf
-#endif
-
-#define _GL_SRGB_EXT 0x8C40
-#define _GL_SRGB_ALPHA_EXT 0x8C42
-
-#define _GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE
-#define _GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF
-
-//#define DEBUG_OPENGL
-
-#ifdef DEBUG_OPENGL
-
-#define DEBUG_TEST_ERROR(m_section)                                         \
-	{                                                                       \
-		print_line("AT: " + String(m_section));                             \
-		glFlush();                                                          \
-		uint32_t err = glGetError();                                        \
-		if (err) {                                                          \
-			print_line("OpenGL Error #" + itos(err) + " at: " + m_section); \
-		}                                                                   \
-	}
-
-#else
-
-#define DEBUG_TEST_ERROR(m_section)
-
-#endif
-
-static RasterizerGLES2 *_singleton = NULL;
-
-#ifdef GLES_NO_CLIENT_ARRAYS
-static float GlobalVertexBuffer[MAX_POLYGON_VERTICES * 8] = { 0 };
-#endif
-
-static const GLenum prim_type[] = { GL_POINTS, GL_LINES, GL_TRIANGLES, GL_TRIANGLE_FAN };
-
-_FORCE_INLINE_ static void _set_color_attrib(const Color &p_color) {
-
-	GLfloat c[4] = { p_color.r, p_color.g, p_color.b, p_color.a };
-	glVertexAttrib4fv(VS::ARRAY_COLOR, c);
-}
-
-static _FORCE_INLINE_ uint16_t make_half_float(float f) {
-
-	union {
-		float fv;
-		uint32_t ui;
-	} ci;
-	ci.fv = f;
-
-	unsigned int x = ci.ui;
-	unsigned int sign = (unsigned short)(x >> 31);
-	unsigned int mantissa;
-	unsigned int exp;
-	uint16_t hf;
-
-	// get mantissa
-	mantissa = x & ((1 << 23) - 1);
-	// get exponent bits
-	exp = x & (0xFF << 23);
-	if (exp >= 0x47800000) {
-		// check if the original single precision float number is a NaN
-		if (mantissa && (exp == (0xFF << 23))) {
-			// we have a single precision NaN
-			mantissa = (1 << 23) - 1;
-		} else {
-			// 16-bit half-float representation stores number as Inf
-			mantissa = 0;
-		}
-		hf = (((uint16_t)sign) << 15) | (uint16_t)((0x1F << 10)) |
-			 (uint16_t)(mantissa >> 13);
-	}
-	// check if exponent is <= -15
-	else if (exp <= 0x38000000) {
-
-		/*// store a denorm half-float value or zero
-	exp = (0x38000000 - exp) >> 23;
-	mantissa >>= (14 + exp);
-
-	hf = (((uint16_t)sign) << 15) | (uint16_t)(mantissa);
-	*/
-		hf = 0; //denormals do not work for 3D, convert to zero
-	} else {
-		hf = (((uint16_t)sign) << 15) |
-			 (uint16_t)((exp - 0x38000000) >> 13) |
-			 (uint16_t)(mantissa >> 13);
-	}
-
-	return hf;
-}
-
-void RasterizerGLES2::_draw_primitive(int p_points, const Vector3 *p_vertices, const Vector3 *p_normals, const Color *p_colors, const Vector3 *p_uvs, const Plane *p_tangents, int p_instanced) {
-
-	ERR_FAIL_COND(!p_vertices);
-	ERR_FAIL_COND(p_points < 1 || p_points > 4);
-
-	bool quad = false;
-
-	GLenum type;
-	switch (p_points) {
-
-		case 1: type = GL_POINTS; break;
-		case 2: type = GL_LINES; break;
-		case 4: quad = true; p_points = 3;
-		case 3: type = GL_TRIANGLES; break;
-	};
-
-	glBindBuffer(GL_ARRAY_BUFFER, 0);
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-
-	GLfloat vert_array[18];
-	GLfloat normal_array[18];
-	GLfloat color_array[24];
-	GLfloat tangent_array[24];
-	GLfloat uv_array[18];
-
-	glEnableVertexAttribArray(VS::ARRAY_VERTEX);
-	glVertexAttribPointer(VS::ARRAY_VERTEX, 3, GL_FLOAT, false, 0, vert_array);
-
-	for (int i = 0; i < p_points; i++) {
-
-		vert_array[i * 3 + 0] = p_vertices[i].x;
-		vert_array[i * 3 + 1] = p_vertices[i].y;
-		vert_array[i * 3 + 2] = p_vertices[i].z;
-		if (quad) {
-			int idx = 2 + i;
-			if (idx == 4)
-				idx = 0;
-			vert_array[9 + i * 3 + 0] = p_vertices[idx].x;
-			vert_array[9 + i * 3 + 1] = p_vertices[idx].y;
-			vert_array[9 + i * 3 + 2] = p_vertices[idx].z;
-		}
-	}
-
-	if (p_normals) {
-		glEnableVertexAttribArray(VS::ARRAY_NORMAL);
-		glVertexAttribPointer(VS::ARRAY_NORMAL, 3, GL_FLOAT, false, 0, normal_array);
-		for (int i = 0; i < p_points; i++) {
-
-			normal_array[i * 3 + 0] = p_normals[i].x;
-			normal_array[i * 3 + 1] = p_normals[i].y;
-			normal_array[i * 3 + 2] = p_normals[i].z;
-			if (quad) {
-				int idx = 2 + i;
-				if (idx == 4)
-					idx = 0;
-				normal_array[9 + i * 3 + 0] = p_normals[idx].x;
-				normal_array[9 + i * 3 + 1] = p_normals[idx].y;
-				normal_array[9 + i * 3 + 2] = p_normals[idx].z;
-			}
-		}
-	} else {
-		glDisableVertexAttribArray(VS::ARRAY_NORMAL);
-	}
-
-	if (p_colors) {
-		glEnableVertexAttribArray(VS::ARRAY_COLOR);
-		glVertexAttribPointer(VS::ARRAY_COLOR, 4, GL_FLOAT, false, 0, color_array);
-		for (int i = 0; i < p_points; i++) {
-
-			color_array[i * 4 + 0] = p_colors[i].r;
-			color_array[i * 4 + 1] = p_colors[i].g;
-			color_array[i * 4 + 2] = p_colors[i].b;
-			color_array[i * 4 + 3] = p_colors[i].a;
-			if (quad) {
-				int idx = 2 + i;
-				if (idx == 4)
-					idx = 0;
-				color_array[12 + i * 4 + 0] = p_colors[idx].r;
-				color_array[12 + i * 4 + 1] = p_colors[idx].g;
-				color_array[12 + i * 4 + 2] = p_colors[idx].b;
-				color_array[12 + i * 4 + 3] = p_colors[idx].a;
-			}
-		}
-	} else {
-		glDisableVertexAttribArray(VS::ARRAY_COLOR);
-	}
-
-	if (p_tangents) {
-		glEnableVertexAttribArray(VS::ARRAY_TANGENT);
-		glVertexAttribPointer(VS::ARRAY_TANGENT, 4, GL_FLOAT, false, 0, tangent_array);
-		for (int i = 0; i < p_points; i++) {
-
-			tangent_array[i * 4 + 0] = p_tangents[i].normal.x;
-			tangent_array[i * 4 + 1] = p_tangents[i].normal.y;
-			tangent_array[i * 4 + 2] = p_tangents[i].normal.z;
-			tangent_array[i * 4 + 3] = p_tangents[i].d;
-			if (quad) {
-				int idx = 2 + i;
-				if (idx == 4)
-					idx = 0;
-				tangent_array[12 + i * 4 + 0] = p_tangents[idx].normal.x;
-				tangent_array[12 + i * 4 + 1] = p_tangents[idx].normal.y;
-				tangent_array[12 + i * 4 + 2] = p_tangents[idx].normal.z;
-				tangent_array[12 + i * 4 + 3] = p_tangents[idx].d;
-			}
-		}
-	} else {
-		glDisableVertexAttribArray(VS::ARRAY_TANGENT);
-	}
-
-	if (p_uvs) {
-
-		glEnableVertexAttribArray(VS::ARRAY_TEX_UV);
-		glVertexAttribPointer(VS::ARRAY_TEX_UV, 3, GL_FLOAT, false, 0, uv_array);
-		for (int i = 0; i < p_points; i++) {
-
-			uv_array[i * 3 + 0] = p_uvs[i].x;
-			uv_array[i * 3 + 1] = p_uvs[i].y;
-			uv_array[i * 3 + 2] = p_uvs[i].z;
-			if (quad) {
-				int idx = 2 + i;
-				if (idx == 4)
-					idx = 0;
-				uv_array[9 + i * 3 + 0] = p_uvs[idx].x;
-				uv_array[9 + i * 3 + 1] = p_uvs[idx].y;
-				uv_array[9 + i * 3 + 2] = p_uvs[idx].z;
-			}
-		}
-
-	} else {
-		glDisableVertexAttribArray(VS::ARRAY_TEX_UV);
-	}
-
-	/*
-	if (p_instanced>1)
-		glDrawArraysInstanced(type,0,p_points,p_instanced);
-	else
-	*/
-
-	glDrawArrays(type, 0, quad ? 6 : p_points);
-};
-
-/* TEXTURE API */
-#define _EXT_COMPRESSED_RGB_PVRTC_4BPPV1_IMG 0x8C00
-#define _EXT_COMPRESSED_RGB_PVRTC_2BPPV1_IMG 0x8C01
-#define _EXT_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG 0x8C02
-#define _EXT_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG 0x8C03
-
-#define _EXT_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT 0x8A54
-#define _EXT_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT 0x8A55
-#define _EXT_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT 0x8A56
-#define _EXT_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT 0x8A57
-
-#define _EXT_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1
-#define _EXT_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2
-#define _EXT_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3
-
-#define _EXT_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70
-#define _EXT_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71
-#define _EXT_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72
-#define _EXT_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73
-
-#define _EXT_COMPRESSED_RED_RGTC1_EXT 0x8DBB
-#define _EXT_COMPRESSED_RED_RGTC1 0x8DBB
-#define _EXT_COMPRESSED_SIGNED_RED_RGTC1 0x8DBC
-#define _EXT_COMPRESSED_RG_RGTC2 0x8DBD
-#define _EXT_COMPRESSED_SIGNED_RG_RGTC2 0x8DBE
-#define _EXT_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC
-#define _EXT_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD
-#define _EXT_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE
-#define _EXT_ETC1_RGB8_OES 0x8D64
-
-#define _EXT_SLUMINANCE_NV 0x8C46
-#define _EXT_SLUMINANCE_ALPHA_NV 0x8C44
-#define _EXT_SRGB8_NV 0x8C41
-#define _EXT_SLUMINANCE8_NV 0x8C47
-#define _EXT_SLUMINANCE8_ALPHA8_NV 0x8C45
-
-#define _EXT_COMPRESSED_SRGB_S3TC_DXT1_NV 0x8C4C
-#define _EXT_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_NV 0x8C4D
-#define _EXT_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_NV 0x8C4E
-#define _EXT_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_NV 0x8C4F
-
-#define _EXT_ATC_RGB_AMD 0x8C92
-#define _EXT_ATC_RGBA_EXPLICIT_ALPHA_AMD 0x8C93
-#define _EXT_ATC_RGBA_INTERPOLATED_ALPHA_AMD 0x87EE
-
-/* TEXTURE API */
-
-Ref<Image> RasterizerGLES2::_get_gl_image_and_format(const Ref<Image> &p_image, Image::Format p_format, uint32_t p_flags, GLenum &r_gl_format, GLenum &r_gl_internal_format, int &r_gl_components, bool &r_has_alpha_cache, bool &r_compressed) {
-
-	r_has_alpha_cache = false;
-	r_compressed = false;
-	r_gl_format = 0;
-	Ref<Image> image = p_image;
-
-	switch (p_format) {
-
-		case Image::FORMAT_L8: {
-			r_gl_components = 1;
-			r_gl_format = GL_LUMINANCE;
-			r_gl_internal_format = (srgb_supported && p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) ? _EXT_SLUMINANCE_NV : GL_LUMINANCE;
-
-		} break;
-		case Image::FORMAT_INTENSITY: {
-
-			if (!image.empty())
-				image.convert(Image::FORMAT_RGBA8);
-			r_gl_components = 4;
-			r_gl_format = GL_RGBA;
-			r_gl_internal_format = (srgb_supported && p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) ? _GL_SRGB_ALPHA_EXT : GL_RGBA;
-			r_has_alpha_cache = true;
-		} break;
-		case Image::FORMAT_LA8: {
-
-			//image.convert(Image::FORMAT_RGBA8);
-			r_gl_components = 2;
-			r_gl_format = GL_LUMINANCE_ALPHA;
-			r_gl_internal_format = (srgb_supported && p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) ? _EXT_SLUMINANCE_ALPHA_NV : GL_LUMINANCE_ALPHA;
-			r_has_alpha_cache = true;
-		} break;
-
-		case Image::FORMAT_INDEXED: {
-
-			if (!image.empty())
-				image.convert(Image::FORMAT_RGB8);
-			r_gl_components = 3;
-			r_gl_format = GL_RGB;
-			r_gl_internal_format = (srgb_supported && p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) ? _GL_SRGB_EXT : GL_RGB;
-
-		} break;
-
-		case Image::FORMAT_INDEXED_ALPHA: {
-
-			if (!image.empty())
-				image.convert(Image::FORMAT_RGBA8);
-			r_gl_components = 4;
-
-			if (p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) {
-
-				if (srgb_supported) {
-					r_gl_format = GL_RGBA;
-					r_gl_internal_format = _GL_SRGB_ALPHA_EXT;
-				} else {
-					r_gl_internal_format = GL_RGBA;
-					if (!image.empty())
-						image.srgb_to_linear();
-				}
-			} else {
-				r_gl_internal_format = GL_RGBA;
-			}
-			r_has_alpha_cache = true;
-
-		} break;
-		case Image::FORMAT_RGB8: {
-
-			r_gl_components = 3;
-
-			if (p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) {
-
-				if (srgb_supported) {
-					r_gl_internal_format = _GL_SRGB_EXT;
-					r_gl_format = GL_RGB;
-				} else {
-					r_gl_internal_format = GL_RGB;
-					if (!image.empty())
-						image.srgb_to_linear();
-				}
-			} else {
-				r_gl_internal_format = GL_RGB;
-			}
-		} break;
-		case Image::FORMAT_RGBA8: {
-
-			r_gl_components = 4;
-			if (p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) {
-
-				if (srgb_supported) {
-					r_gl_internal_format = _GL_SRGB_ALPHA_EXT;
-					r_gl_format = GL_RGBA;
-					//r_gl_internal_format=GL_RGBA;
-				} else {
-					r_gl_internal_format = GL_RGBA;
-					if (!image.empty())
-						image.srgb_to_linear();
-				}
-			} else {
-				r_gl_internal_format = GL_RGBA;
-			}
-
-			r_has_alpha_cache = true;
-		} break;
-		case Image::FORMAT_DXT1: {
-
-			if (!s3tc_supported || (!s3tc_srgb_supported && p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR)) {
-
-				if (!image.empty()) {
-					image.decompress();
-				}
-				r_gl_components = 4;
-				if (p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) {
-
-					if (srgb_supported) {
-						r_gl_format = GL_RGBA;
-						r_gl_internal_format = _GL_SRGB_ALPHA_EXT;
-					} else {
-						r_gl_internal_format = GL_RGBA;
-						if (!image.empty())
-							image.srgb_to_linear();
-					}
-				} else {
-					r_gl_internal_format = GL_RGBA;
-				}
-				r_has_alpha_cache = true;
-
-			} else {
-
-				r_gl_components = 1; //doesn't matter much
-				r_gl_internal_format = (srgb_supported && p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) ? _EXT_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_NV : _EXT_COMPRESSED_RGBA_S3TC_DXT1_EXT;
-				r_compressed = true;
-			};
-
-		} break;
-		case Image::FORMAT_DXT3: {
-
-			if (!s3tc_supported || (!s3tc_srgb_supported && p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR)) {
-
-				if (!image.empty()) {
-					image.decompress();
-				}
-				r_gl_components = 4;
-				if (p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) {
-
-					if (srgb_supported) {
-						r_gl_format = GL_RGBA;
-						r_gl_internal_format = _GL_SRGB_ALPHA_EXT;
-					} else {
-						r_gl_internal_format = GL_RGBA;
-						if (!image.empty())
-							image.srgb_to_linear();
-					}
-				} else {
-					r_gl_internal_format = GL_RGBA;
-				}
-				r_has_alpha_cache = true;
-
-			} else {
-				r_gl_components = 1; //doesn't matter much
-				r_gl_internal_format = (srgb_supported && p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) ? _EXT_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_NV : _EXT_COMPRESSED_RGBA_S3TC_DXT3_EXT;
-
-				r_has_alpha_cache = true;
-				r_compressed = true;
-			};
-
-		} break;
-		case Image::FORMAT_DXT5: {
-
-			if (!s3tc_supported || (!s3tc_srgb_supported && p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR)) {
-
-				if (!image.empty()) {
-					image.decompress();
-				}
-				r_gl_components = 4;
-				if (p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) {
-
-					if (srgb_supported) {
-						r_gl_format = GL_RGBA;
-						r_gl_internal_format = _GL_SRGB_ALPHA_EXT;
-					} else {
-						r_gl_internal_format = GL_RGBA;
-						if (!image.empty())
-							image.srgb_to_linear();
-					}
-				} else {
-					r_gl_internal_format = GL_RGBA;
-				}
-				r_has_alpha_cache = true;
-
-			} else {
-				r_gl_components = 1; //doesn't matter much
-				r_gl_internal_format = (srgb_supported && p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) ? _EXT_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_NV : _EXT_COMPRESSED_RGBA_S3TC_DXT5_EXT;
-				r_has_alpha_cache = true;
-				r_compressed = true;
-			};
-
-		} break;
-		case Image::FORMAT_ATI1: {
-
-			if (!latc_supported) {
-
-				if (!image.empty()) {
-					image.decompress();
-				}
-				r_gl_components = 4;
-				if (p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) {
-
-					if (srgb_supported) {
-						r_gl_format = GL_RGBA;
-						r_gl_internal_format = _GL_SRGB_ALPHA_EXT;
-					} else {
-						r_gl_internal_format = GL_RGBA;
-						if (!image.empty())
-							image.srgb_to_linear();
-					}
-				} else {
-					r_gl_internal_format = GL_RGBA;
-				}
-				r_has_alpha_cache = true;
-
-			} else {
-
-				r_gl_internal_format = _EXT_COMPRESSED_LUMINANCE_LATC1_EXT;
-				r_gl_components = 1; //doesn't matter much
-				r_compressed = true;
-			};
-
-		} break;
-		case Image::FORMAT_ATI2: {
-
-			if (!latc_supported) {
-
-				if (!image.empty()) {
-					image.decompress();
-				}
-				r_gl_components = 4;
-				if (p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) {
-
-					if (srgb_supported) {
-						r_gl_format = GL_RGBA;
-						r_gl_internal_format = _GL_SRGB_ALPHA_EXT;
-					} else {
-						r_gl_internal_format = GL_RGBA;
-						if (!image.empty())
-							image.srgb_to_linear();
-					}
-				} else {
-					r_gl_internal_format = GL_RGBA;
-				}
-				r_has_alpha_cache = true;
-
-			} else {
-				r_gl_internal_format = _EXT_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT;
-				r_gl_components = 1; //doesn't matter much
-				r_compressed = true;
-			};
-		} break;
-		case Image::FORMAT_PVRTC2: {
-
-			if (!pvr_supported || (!pvr_srgb_supported && p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR)) {
-
-				if (!image.empty()) {
-					image.decompress();
-				}
-				r_gl_components = 4;
-				if (p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) {
-
-					if (srgb_supported) {
-						r_gl_format = GL_RGBA;
-						r_gl_internal_format = _GL_SRGB_ALPHA_EXT;
-					} else {
-						r_gl_internal_format = GL_RGBA;
-						if (!image.empty())
-							image.srgb_to_linear();
-					}
-				} else {
-					r_gl_internal_format = GL_RGBA;
-				}
-				r_has_alpha_cache = true;
-
-			} else {
-
-				r_gl_internal_format = (srgb_supported && p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) ? _EXT_COMPRESSED_SRGB_PVRTC_2BPPV1_EXT : _EXT_COMPRESSED_RGB_PVRTC_2BPPV1_IMG;
-				r_gl_components = 1; //doesn't matter much
-				r_compressed = true;
-			}
-
-		} break;
-		case Image::FORMAT_PVRTC2A: {
-
-			if (!pvr_supported || (!pvr_srgb_supported && p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR)) {
-
-				if (!image.empty())
-					image.decompress();
-				r_gl_components = 4;
-				if (p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) {
-
-					if (srgb_supported) {
-						r_gl_format = GL_RGBA;
-						r_gl_internal_format = _GL_SRGB_ALPHA_EXT;
-					} else {
-						r_gl_internal_format = GL_RGBA;
-						if (!image.empty())
-							image.srgb_to_linear();
-					}
-				} else {
-					r_gl_internal_format = GL_RGBA;
-				}
-				r_has_alpha_cache = true;
-
-			} else {
-
-				r_gl_internal_format = (srgb_supported && p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) ? _EXT_COMPRESSED_SRGB_ALPHA_PVRTC_2BPPV1_EXT : _EXT_COMPRESSED_RGBA_PVRTC_2BPPV1_IMG;
-				r_gl_components = 1; //doesn't matter much
-				r_compressed = true;
-			}
-
-		} break;
-		case Image::FORMAT_PVRTC4: {
-
-			if (!pvr_supported || (!pvr_srgb_supported && p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR)) {
-
-				if (!image.empty())
-					image.decompress();
-				r_gl_components = 4;
-				if (p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) {
-
-					if (srgb_supported) {
-						r_gl_format = GL_RGBA;
-						r_gl_internal_format = _GL_SRGB_ALPHA_EXT;
-					} else {
-						r_gl_internal_format = GL_RGBA;
-						if (!image.empty())
-							image.srgb_to_linear();
-					}
-				} else {
-					r_gl_internal_format = GL_RGBA;
-				}
-				r_has_alpha_cache = true;
-			} else {
-
-				r_gl_internal_format = (srgb_supported && p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) ? _EXT_COMPRESSED_SRGB_PVRTC_4BPPV1_EXT : _EXT_COMPRESSED_RGB_PVRTC_4BPPV1_IMG;
-				r_gl_components = 1; //doesn't matter much
-				r_compressed = true;
-			}
-
-		} break;
-		case Image::FORMAT_PVRTC4A: {
-
-			if (!pvr_supported || (!pvr_srgb_supported && p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR)) {
-
-				if (!image.empty())
-					image.decompress();
-				r_gl_components = 4;
-				if (p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) {
-
-					if (srgb_supported) {
-						r_gl_format = GL_RGBA;
-						r_gl_internal_format = _GL_SRGB_ALPHA_EXT;
-					} else {
-						r_gl_internal_format = GL_RGBA;
-						if (!image.empty())
-							image.srgb_to_linear();
-					}
-				} else {
-					r_gl_internal_format = GL_RGBA;
-				}
-				r_has_alpha_cache = true;
-
-			} else {
-				r_gl_internal_format = (srgb_supported && p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) ? _EXT_COMPRESSED_SRGB_ALPHA_PVRTC_4BPPV1_EXT : _EXT_COMPRESSED_RGBA_PVRTC_4BPPV1_IMG;
-				r_gl_components = 1; //doesn't matter much
-				r_compressed = true;
-			}
-
-		} break;
-		case Image::FORMAT_ETC: {
-
-			if (!etc_supported || p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) {
-
-				if (!image.empty()) {
-					image.decompress();
-				}
-				r_gl_components = 3;
-				if (p_flags & VS::TEXTURE_FLAG_CONVERT_TO_LINEAR) {
-
-					if (srgb_supported) {
-						r_gl_format = GL_RGB;
-						r_gl_internal_format = _GL_SRGB_EXT;
-					} else {
-						r_gl_internal_format = GL_RGB;
-						if (!image.empty())
-							image.srgb_to_linear();
-					}
-				} else {
-					r_gl_internal_format = GL_RGB;
-				}
-				r_gl_internal_format = GL_RGB;
-
-			} else {
-
-				r_gl_internal_format = _EXT_ETC1_RGB8_OES;
-				r_gl_components = 1; //doesn't matter much
-				r_compressed = true;
-			}
-
-		} break;
-		case Image::FORMAT_ATC: {
-
-			if (!atitc_supported) {
-
-				if (!image.empty()) {
-					image.decompress();
-				}
-				r_gl_components = 3;
-				r_gl_internal_format = GL_RGB;
-
-			} else {
-
-				r_gl_internal_format = _EXT_ATC_RGB_AMD;
-				r_gl_components = 1; //doesn't matter much
-				r_compressed = true;
-			}
-
-		} break;
-		case Image::FORMAT_ATC_ALPHA_EXPLICIT: {
-
-			if (!atitc_supported) {
-
-				if (!image.empty()) {
-					image.decompress();
-				}
-				r_gl_components = 4;
-				r_gl_internal_format = GL_RGBA;
-
-			} else {
-
-				r_gl_internal_format = _EXT_ATC_RGBA_EXPLICIT_ALPHA_AMD;
-				r_gl_components = 1; //doesn't matter much
-				r_compressed = true;
-			}
-
-		} break;
-		case Image::FORMAT_ATC_ALPHA_INTERPOLATED: {
-
-			if (!atitc_supported) {
-
-				if (!image.empty()) {
-					image.decompress();
-				}
-				r_gl_components = 4;
-				r_gl_internal_format = GL_RGBA;
-
-			} else {
-
-				r_gl_internal_format = _EXT_ATC_RGBA_INTERPOLATED_ALPHA_AMD;
-				r_gl_components = 1; //doesn't matter much
-				r_compressed = true;
-			}
-
-		} break;
-		case Image::FORMAT_YUV_422:
-		case Image::FORMAT_YUV_444: {
-
-			if (!image.empty())
-				image.convert(Image::FORMAT_RGB8);
-			r_gl_internal_format = GL_RGB;
-			r_gl_components = 3;
-
-		} break;
-
-		default: {
-
-			ERR_FAIL_V(Image());
-		}
-	}
-
-	if (r_gl_format == 0) {
-		r_gl_format = r_gl_internal_format;
-	}
-
-	return image;
-}
-
-static const GLenum _cube_side_enum[6] = {
-
-	GL_TEXTURE_CUBE_MAP_NEGATIVE_X,
-	GL_TEXTURE_CUBE_MAP_POSITIVE_X,
-	GL_TEXTURE_CUBE_MAP_NEGATIVE_Y,
-	GL_TEXTURE_CUBE_MAP_POSITIVE_Y,
-	GL_TEXTURE_CUBE_MAP_NEGATIVE_Z,
-	GL_TEXTURE_CUBE_MAP_POSITIVE_Z,
-
-};
-
-RID RasterizerGLES2::texture_create() {
-
-	Texture *texture = memnew(Texture);
-	ERR_FAIL_COND_V(!texture, RID());
-	glGenTextures(1, &texture->tex_id);
-	texture->active = false;
-	texture->total_data_size = 0;
-
-	return texture_owner.make_rid(texture);
-}
-
-void RasterizerGLES2::texture_allocate(RID p_texture, int p_width, int p_height, Image::Format p_format, uint32_t p_flags) {
-
-	bool has_alpha_cache;
-	int components;
-	GLenum format;
-	GLenum internal_format;
-	bool compressed;
-
-	int po2_width = next_power_of_2(p_width);
-	int po2_height = next_power_of_2(p_height);
-
-	if (p_flags & VS::TEXTURE_FLAG_VIDEO_SURFACE) {
-		p_flags &= ~VS::TEXTURE_FLAG_MIPMAPS; // no mipies for video
-	}
-
-	Texture *texture = texture_owner.get(p_texture);
-	ERR_FAIL_COND(!texture);
-	texture->width = p_width;
-	texture->height = p_height;
-	texture->format = p_format;
-	texture->flags = p_flags;
-	texture->target = (p_flags & VS::TEXTURE_FLAG_CUBEMAP) ? GL_TEXTURE_CUBE_MAP : GL_TEXTURE_2D;
-
-	_get_gl_image_and_format(Image(), texture->format, texture->flags, format, internal_format, components, has_alpha_cache, compressed);
-
-	bool scale_textures = !compressed && !(p_flags & VS::TEXTURE_FLAG_VIDEO_SURFACE) && (!npo2_textures_available || p_flags & VS::TEXTURE_FLAG_MIPMAPS);
-
-	if (scale_textures) {
-		texture->alloc_width = po2_width;
-		texture->alloc_height = po2_height;
-		//print_line("scale because npo2: "+itos(npo2_textures_available)+" mm: "+itos(p_format&VS::TEXTURE_FLAG_MIPMAPS)+" "+itos(p_mipmap_count) );
-	} else {
-
-		texture->alloc_width = texture->width;
-		texture->alloc_height = texture->height;
-	};
-
-	if (!(p_flags & VS::TEXTURE_FLAG_VIDEO_SURFACE) && shrink_textures_x2) {
-		texture->alloc_height = MAX(1, texture->alloc_height / 2);
-		texture->alloc_width = MAX(1, texture->alloc_width / 2);
-	}
-
-	texture->gl_components_cache = components;
-	texture->gl_format_cache = format;
-	texture->gl_internal_format_cache = internal_format;
-	texture->format_has_alpha = has_alpha_cache;
-	texture->compressed = compressed;
-	texture->has_alpha = false; //by default it doesn't have alpha unless something with alpha is blitteds
-	texture->data_size = 0;
-	texture->mipmaps = 0;
-
-	glActiveTexture(GL_TEXTURE0);
-	glBindTexture(texture->target, texture->tex_id);
-
-	if (p_flags & VS::TEXTURE_FLAG_VIDEO_SURFACE) {
-		//prealloc if video
-		glTexImage2D(texture->target, 0, internal_format, p_width, p_height, 0, format, GL_UNSIGNED_BYTE, NULL);
-	}
-
-	texture->active = true;
-}
-
-void RasterizerGLES2::texture_set_data(RID p_texture, const Image &p_image, VS::CubeMapSide p_cube_side) {
-
-	Texture *texture = texture_owner.get(p_texture);
-
-	ERR_FAIL_COND(!texture);
-	ERR_FAIL_COND(!texture->active);
-	ERR_FAIL_COND(texture->render_target);
-	ERR_FAIL_COND(texture->format != p_image.get_format());
-	ERR_FAIL_COND(p_image.empty());
-
-	int components;
-	GLenum format;
-	GLenum internal_format;
-	bool alpha;
-	bool compressed;
-
-	if (keep_copies && !(texture->flags & VS::TEXTURE_FLAG_VIDEO_SURFACE) && !(use_reload_hooks && texture->reloader)) {
-		texture->image[p_cube_side] = p_image;
-	}
-
-	Image img = _get_gl_image_and_format(p_image, p_image.get_format(), texture->flags, format, internal_format, components, alpha, compressed);
-
-	if (texture->alloc_width != img.get_width() || texture->alloc_height != img.get_height()) {
-
-		if (texture->alloc_width == img.get_width() / 2 && texture->alloc_height == img.get_height() / 2) {
-
-			img.shrink_x2();
-		} else if (img.get_format() <= Image::FORMAT_INDEXED_ALPHA) {
-
-			img.resize(texture->alloc_width, texture->alloc_height, Image::INTERPOLATE_BILINEAR);
-		}
-	};
-
-	if (!(texture->flags & VS::TEXTURE_FLAG_VIDEO_SURFACE) && img.detect_alpha() == Image::ALPHA_BLEND) {
-		texture->has_alpha = true;
-	}
-
-	GLenum blit_target = (texture->target == GL_TEXTURE_CUBE_MAP) ? _cube_side_enum[p_cube_side] : GL_TEXTURE_2D;
-
-	texture->data_size = img.get_data().size();
-	PoolVector<uint8_t>::Read read = img.get_data().read();
-
-	glActiveTexture(GL_TEXTURE0);
-	glBindTexture(texture->target, texture->tex_id);
-
-	texture->ignore_mipmaps = compressed && img.get_mipmaps() == 0;
-
-	if (texture->flags & VS::TEXTURE_FLAG_MIPMAPS && !texture->ignore_mipmaps)
-		glTexParameteri(texture->target, GL_TEXTURE_MIN_FILTER, use_fast_texture_filter ? GL_LINEAR_MIPMAP_NEAREST : GL_LINEAR_MIPMAP_LINEAR);
-	else {
-		if (texture->flags & VS::TEXTURE_FLAG_FILTER) {
-			glTexParameteri(texture->target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-		} else {
-			glTexParameteri(texture->target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-		}
-	}
-
-	if (texture->flags & VS::TEXTURE_FLAG_FILTER) {
-
-		glTexParameteri(texture->target, GL_TEXTURE_MAG_FILTER, GL_LINEAR); // Linear Filtering
-
-	} else {
-
-		glTexParameteri(texture->target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); // raw Filtering
-	}
-
-	bool force_clamp_to_edge = !(texture->flags & VS::TEXTURE_FLAG_MIPMAPS && !texture->ignore_mipmaps) && (next_power_of_2(texture->alloc_height) != texture->alloc_height || next_power_of_2(texture->alloc_width) != texture->alloc_width);
-
-	if (!force_clamp_to_edge && (texture->flags & VS::TEXTURE_FLAG_REPEAT || texture->flags & VS::TEXTURE_FLAG_MIRRORED_REPEAT) && texture->target != GL_TEXTURE_CUBE_MAP) {
-
-		if (texture->flags & VS::TEXTURE_FLAG_MIRRORED_REPEAT) {
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_MIRRORED_REPEAT);
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_MIRRORED_REPEAT);
-		} else {
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-		}
-	} else {
-
-		//glTexParameterf( texture->target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE );
-		glTexParameterf(texture->target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-		glTexParameterf(texture->target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-	}
-
-	if (use_anisotropic_filter) {
-
-		if (texture->flags & VS::TEXTURE_FLAG_ANISOTROPIC_FILTER) {
-
-			glTexParameterf(texture->target, _GL_TEXTURE_MAX_ANISOTROPY_EXT, anisotropic_level);
-		} else {
-			glTexParameterf(texture->target, _GL_TEXTURE_MAX_ANISOTROPY_EXT, 1);
-		}
-	}
-
-	int mipmaps = (texture->flags & VS::TEXTURE_FLAG_MIPMAPS && img.get_mipmaps() > 0) ? img.get_mipmaps() + 1 : 1;
-
-	int w = img.get_width();
-	int h = img.get_height();
-
-	int tsize = 0;
-	for (int i = 0; i < mipmaps; i++) {
-
-		int size, ofs;
-		img.get_mipmap_offset_and_size(i, ofs, size);
-
-		//print_line("mipmap: "+itos(i)+" size: "+itos(size)+" w: "+itos(mm_w)+", h: "+itos(mm_h));
-
-		if (texture->compressed) {
-			glPixelStorei(GL_UNPACK_ALIGNMENT, 4);
-			glCompressedTexImage2D(blit_target, i, format, w, h, 0, size, &read[ofs]);
-
-		} else {
-			glPixelStorei(GL_UNPACK_ALIGNMENT, 1);
-			if (texture->flags & VS::TEXTURE_FLAG_VIDEO_SURFACE) {
-				glTexSubImage2D(blit_target, i, 0, 0, w, h, format, GL_UNSIGNED_BYTE, &read[ofs]);
-			} else {
-				glTexImage2D(blit_target, i, internal_format, w, h, 0, format, GL_UNSIGNED_BYTE, &read[ofs]);
-			}
-		}
-		tsize += size;
-
-		w = MAX(1, w >> 1);
-		h = MAX(1, h >> 1);
-	}
-
-	_rinfo.texture_mem -= texture->total_data_size;
-	texture->total_data_size = tsize;
-	_rinfo.texture_mem += texture->total_data_size;
-
-	//printf("texture: %i x %i - size: %i - total: %i\n",texture->width,texture->height,tsize,_rinfo.texture_mem);
-
-	if (texture->flags & VS::TEXTURE_FLAG_MIPMAPS && mipmaps == 1 && !texture->ignore_mipmaps) {
-		//generate mipmaps if they were requested and the image does not contain them
-		glGenerateMipmap(texture->target);
-	}
-
-	texture->mipmaps = mipmaps;
-
-	if (mipmaps > 1) {
-
-		//glTexParameteri( GL_TEXTURE_2D, GL_TEXTURE_MAX_LEVEL, mipmaps-1 ); - assumed to have all, always
-	}
-
-	//texture_set_flags(p_texture,texture->flags);
-}
-
-Image RasterizerGLES2::texture_get_data(RID p_texture, VS::CubeMapSide p_cube_side) const {
-
-	Texture *texture = texture_owner.get(p_texture);
-
-	ERR_FAIL_COND_V(!texture, Image());
-	ERR_FAIL_COND_V(!texture->active, Image());
-	ERR_FAIL_COND_V(texture->data_size == 0, Image());
-	ERR_FAIL_COND_V(texture->render_target, Image());
-
-	return texture->image[p_cube_side];
-
-#if 0
-
-	Texture * texture = texture_owner.get(p_texture);
-
-	ERR_FAIL_COND_V(!texture,Image());
-	ERR_FAIL_COND_V(!texture->active,Image());
-	ERR_FAIL_COND_V(texture->data_size==0,Image());
-
-	PoolVector<uint8_t> data;
-	GLenum format,type=GL_UNSIGNED_BYTE;
-	Image::Format fmt;
-	int pixelsize=0;
-	int pixelshift=0;
-	int minw=1,minh=1;
-	bool compressed=false;
-
-	fmt=texture->format;
-
-	switch(texture->format) {
-
-		case Image::FORMAT_L8: {
-
-			format=GL_LUMINANCE;
-			type=GL_UNSIGNED_BYTE;
-			data.resize(texture->alloc_width*texture->alloc_height);
-			pixelsize=1;
-
-		} break;
-		case Image::FORMAT_INTENSITY: {
-			return Image();
-		} break;
-		case Image::FORMAT_LA8: {
-
-			format=GL_LUMINANCE_ALPHA;
-			type=GL_UNSIGNED_BYTE;
-			pixelsize=2;
-
-		} break;
-		case Image::FORMAT_RGB8: {
-			format=GL_RGB;
-			type=GL_UNSIGNED_BYTE;
-			pixelsize=3;
-		} break;
-		case Image::FORMAT_RGBA8: {
-
-			format=GL_RGBA;
-			type=GL_UNSIGNED_BYTE;
-			pixelsize=4;
-		} break;
-		case Image::FORMAT_INDEXED: {
-
-			format=GL_RGB;
-			type=GL_UNSIGNED_BYTE;
-			fmt=Image::FORMAT_RGB8;
-			pixelsize=3;
-		} break;
-		case Image::FORMAT_INDEXED_ALPHA: {
-
-			format=GL_RGBA;
-			type=GL_UNSIGNED_BYTE;
-			fmt=Image::FORMAT_RGBA8;
-			pixelsize=4;
-
-		} break;
-		case Image::FORMAT_DXT1: {
-
-			pixelsize=1; //doesn't matter much
-			format=GL_COMPRESSED_RGBA_S3TC_DXT1_EXT;
-			compressed=true;
-			pixelshift=1;
-			minw=minh=4;
-
-		} break;
-		case Image::FORMAT_DXT3: {
-			pixelsize=1; //doesn't matter much
-			format=GL_COMPRESSED_RGBA_S3TC_DXT3_EXT;
-			compressed=true;
-			minw=minh=4;
-
-		} break;
-		case Image::FORMAT_DXT5: {
-
-			pixelsize=1; //doesn't matter much
-			format=GL_COMPRESSED_RGBA_S3TC_DXT5_EXT;
-			compressed=true;
-			minw=minh=4;
-
-		} break;
-		case Image::FORMAT_ATI1: {
-
-			format=GL_COMPRESSED_RED_RGTC1;
-			pixelsize=1; //doesn't matter much
-			compressed=true;
-			pixelshift=1;
-			minw=minh=4;
-
-		} break;
-		case Image::FORMAT_ATI2: {
-
-			format=GL_COMPRESSED_RG_RGTC2;
-			pixelsize=1; //doesn't matter much
-			compressed=true;
-			minw=minh=4;
-
-		} break;
-
-		default:{}
-	}
-
-	data.resize(texture->data_size);
-	PoolVector<uint8_t>::Write wb = data.write();
-
-	glActiveTexture(GL_TEXTURE0);
-	int ofs=0;
-	glBindTexture(texture->target,texture->tex_id);
-
-	int w=texture->alloc_width;
-	int h=texture->alloc_height;
-	for(int i=0;i<texture->mipmaps+1;i++) {
-
-		if (compressed) {
-
-			glPixelStorei(GL_PACK_ALIGNMENT, 4);
-			glGetCompressedTexImage(texture->target,i,&wb[ofs]);
-
-		} else {
-			glPixelStorei(GL_PACK_ALIGNMENT, 1);
-			glGetTexImage(texture->target,i,format,type,&wb[ofs]);
-		}
-
-		int size = (w*h*pixelsize)>>pixelshift;
-		ofs+=size;
-
-		w=MAX(minw,w>>1);
-		h=MAX(minh,h>>1);
-
-	}
-
-
-	wb=PoolVector<uint8_t>::Write();
-
-	Image img(texture->alloc_width,texture->alloc_height,texture->mipmaps,fmt,data);
-
-	if (texture->format<Image::FORMAT_INDEXED && (texture->alloc_width!=texture->width || texture->alloc_height!=texture->height))
-		img.resize(texture->width,texture->height);
-
-	return img;
-#endif
-}
-
-void RasterizerGLES2::texture_set_flags(RID p_texture, uint32_t p_flags) {
-
-	Texture *texture = texture_owner.get(p_texture);
-	ERR_FAIL_COND(!texture);
-	if (texture->render_target) {
-
-		p_flags &= VS::TEXTURE_FLAG_FILTER; //can change only filter
-	}
-
-	bool had_mipmaps = texture->flags & VS::TEXTURE_FLAG_MIPMAPS;
-
-	glActiveTexture(GL_TEXTURE0);
-	glBindTexture(texture->target, texture->tex_id);
-	uint32_t cube = texture->flags & VS::TEXTURE_FLAG_CUBEMAP;
-	texture->flags = p_flags | cube; // can't remove a cube from being a cube
-
-	bool force_clamp_to_edge = !(p_flags & VS::TEXTURE_FLAG_MIPMAPS && !texture->ignore_mipmaps) && (next_power_of_2(texture->alloc_height) != texture->alloc_height || next_power_of_2(texture->alloc_width) != texture->alloc_width);
-
-	if (!force_clamp_to_edge && (texture->flags & VS::TEXTURE_FLAG_REPEAT || texture->flags & VS::TEXTURE_FLAG_MIRRORED_REPEAT) && texture->target != GL_TEXTURE_CUBE_MAP) {
-
-		if (texture->flags & VS::TEXTURE_FLAG_MIRRORED_REPEAT) {
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_MIRRORED_REPEAT);
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_MIRRORED_REPEAT);
-		} else {
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-		}
-	} else {
-		//glTexParameterf( texture->target, GL_TEXTURE_WRAP_R, GL_CLAMP_TO_EDGE );
-		glTexParameterf(texture->target, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-		glTexParameterf(texture->target, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-	}
-
-	if (use_anisotropic_filter) {
-
-		if (texture->flags & VS::TEXTURE_FLAG_ANISOTROPIC_FILTER) {
-
-			glTexParameterf(texture->target, _GL_TEXTURE_MAX_ANISOTROPY_EXT, anisotropic_level);
-		} else {
-			glTexParameterf(texture->target, _GL_TEXTURE_MAX_ANISOTROPY_EXT, 1);
-		}
-	}
-
-	if (texture->flags & VS::TEXTURE_FLAG_MIPMAPS && !texture->ignore_mipmaps) {
-		if (!had_mipmaps && texture->mipmaps == 1) {
-			glGenerateMipmap(texture->target);
-		}
-		glTexParameteri(texture->target, GL_TEXTURE_MIN_FILTER, use_fast_texture_filter ? GL_LINEAR_MIPMAP_NEAREST : GL_LINEAR_MIPMAP_LINEAR);
-
-	} else {
-		if (texture->flags & VS::TEXTURE_FLAG_FILTER) {
-			glTexParameteri(texture->target, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-		} else {
-			glTexParameteri(texture->target, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-		}
-	}
-
-	if (texture->flags & VS::TEXTURE_FLAG_FILTER) {
-
-		glTexParameteri(texture->target, GL_TEXTURE_MAG_FILTER, GL_LINEAR); // Linear Filtering
-
-	} else {
-
-		glTexParameteri(texture->target, GL_TEXTURE_MAG_FILTER, GL_NEAREST); // raw Filtering
-	}
-}
-uint32_t RasterizerGLES2::texture_get_flags(RID p_texture) const {
-
-	Texture *texture = texture_owner.get(p_texture);
-
-	ERR_FAIL_COND_V(!texture, 0);
-
-	return texture->flags;
-}
-Image::Format RasterizerGLES2::texture_get_format(RID p_texture) const {
-
-	Texture *texture = texture_owner.get(p_texture);
-
-	ERR_FAIL_COND_V(!texture, Image::FORMAT_L8);
-
-	return texture->format;
-}
-uint32_t RasterizerGLES2::texture_get_width(RID p_texture) const {
-
-	Texture *texture = texture_owner.get(p_texture);
-
-	ERR_FAIL_COND_V(!texture, 0);
-
-	return texture->width;
-}
-uint32_t RasterizerGLES2::texture_get_height(RID p_texture) const {
-
-	Texture *texture = texture_owner.get(p_texture);
-
-	ERR_FAIL_COND_V(!texture, 0);
-
-	return texture->height;
-}
-
-bool RasterizerGLES2::texture_has_alpha(RID p_texture) const {
-
-	Texture *texture = texture_owner.get(p_texture);
-
-	ERR_FAIL_COND_V(!texture, 0);
-
-	return texture->has_alpha;
-}
-
-void RasterizerGLES2::texture_set_size_override(RID p_texture, int p_width, int p_height) {
-
-	Texture *texture = texture_owner.get(p_texture);
-
-	ERR_FAIL_COND(!texture);
-	ERR_FAIL_COND(texture->render_target);
-
-	ERR_FAIL_COND(p_width <= 0 || p_width > 16384);
-	ERR_FAIL_COND(p_height <= 0 || p_height > 16384);
-	//real texture size is in alloc width and height
-	texture->width = p_width;
-	texture->height = p_height;
-}
-
-void RasterizerGLES2::texture_set_reload_hook(RID p_texture, ObjectID p_owner, const StringName &p_function) const {
-
-	Texture *texture = texture_owner.get(p_texture);
-
-	ERR_FAIL_COND(!texture);
-	ERR_FAIL_COND(texture->render_target);
-
-	texture->reloader = p_owner;
-	texture->reloader_func = p_function;
-	if (use_reload_hooks && p_owner && keep_copies) {
-
-		for (int i = 0; i < 6; i++)
-			texture->image[i] = Image();
-	}
-}
-
-GLuint RasterizerGLES2::_texture_get_name(RID p_tex) {
-
-	Texture *texture = texture_owner.get(p_tex);
-	ERR_FAIL_COND_V(!texture, 0);
-
-	return texture->tex_id;
-};
-
-void RasterizerGLES2::texture_set_path(RID p_texture, const String &p_path) {
-	Texture *texture = texture_owner.get(p_texture);
-	ERR_FAIL_COND(!texture);
-
-	texture->path = p_path;
-}
-
-String RasterizerGLES2::texture_get_path(RID p_texture) const {
-
-	Texture *texture = texture_owner.get(p_texture);
-	ERR_FAIL_COND_V(!texture, String());
-	return texture->path;
-}
-void RasterizerGLES2::texture_debug_usage(List<VS::TextureInfo> *r_info) {
-
-	List<RID> textures;
-	texture_owner.get_owned_list(&textures);
-
-	for (List<RID>::Element *E = textures.front(); E; E = E->next()) {
-
-		Texture *t = texture_owner.get(E->get());
-		if (!t)
-			continue;
-		VS::TextureInfo tinfo;
-		tinfo.path = t->path;
-		tinfo.format = t->format;
-		tinfo.size.x = t->alloc_width;
-		tinfo.size.y = t->alloc_height;
-		tinfo.bytes = t->total_data_size;
-		r_info->push_back(tinfo);
-	}
-}
-
-void RasterizerGLES2::texture_set_shrink_all_x2_on_set_data(bool p_enable) {
-
-	shrink_textures_x2 = p_enable;
-}
-
-/* SHADER API */
-
-RID RasterizerGLES2::shader_create(VS::ShaderMode p_mode) {
-
-	Shader *shader = memnew(Shader);
-	shader->mode = p_mode;
-	RID rid = shader_owner.make_rid(shader);
-	shader_set_mode(rid, p_mode);
-	_shader_make_dirty(shader);
-
-	return rid;
-}
-
-void RasterizerGLES2::shader_set_mode(RID p_shader, VS::ShaderMode p_mode) {
-
-	ERR_FAIL_INDEX(p_mode, 3);
-	Shader *shader = shader_owner.get(p_shader);
-	ERR_FAIL_COND(!shader);
-	if (shader->custom_code_id && p_mode == shader->mode)
-		return;
-
-	if (shader->custom_code_id) {
-
-		switch (shader->mode) {
-			case VS::SHADER_MATERIAL: {
-				material_shader.free_custom_shader(shader->custom_code_id);
-			} break;
-			case VS::SHADER_CANVAS_ITEM: {
-				canvas_shader.free_custom_shader(shader->custom_code_id);
-			} break;
-		}
-
-		shader->custom_code_id = 0;
-	}
-
-	shader->mode = p_mode;
-
-	switch (shader->mode) {
-		case VS::SHADER_MATERIAL: {
-			shader->custom_code_id = material_shader.create_custom_shader();
-		} break;
-		case VS::SHADER_CANVAS_ITEM: {
-			shader->custom_code_id = canvas_shader.create_custom_shader();
-		} break;
-	}
-	_shader_make_dirty(shader);
-}
-VS::ShaderMode RasterizerGLES2::shader_get_mode(RID p_shader) const {
-
-	Shader *shader = shader_owner.get(p_shader);
-	ERR_FAIL_COND_V(!shader, VS::SHADER_MATERIAL);
-	return shader->mode;
-}
-
-void RasterizerGLES2::shader_set_code(RID p_shader, const String &p_vertex, const String &p_fragment, const String &p_light, int p_vertex_ofs, int p_fragment_ofs, int p_light_ofs) {
-
-	Shader *shader = shader_owner.get(p_shader);
-	ERR_FAIL_COND(!shader);
-
-#ifdef DEBUG_ENABLED
-	if (shader->vertex_code == p_vertex && shader->fragment_code == p_fragment && shader->light_code == p_light)
-		return;
-#endif
-	shader->fragment_code = p_fragment;
-	shader->vertex_code = p_vertex;
-	shader->light_code = p_light;
-	shader->fragment_line = p_fragment_ofs;
-	shader->vertex_line = p_vertex_ofs;
-	shader->light_line = p_light_ofs;
-	_shader_make_dirty(shader);
-}
-
-String RasterizerGLES2::shader_get_vertex_code(RID p_shader) const {
-
-	Shader *shader = shader_owner.get(p_shader);
-	ERR_FAIL_COND_V(!shader, String());
-	return shader->vertex_code;
-}
-
-String RasterizerGLES2::shader_get_fragment_code(RID p_shader) const {
-
-	Shader *shader = shader_owner.get(p_shader);
-	ERR_FAIL_COND_V(!shader, String());
-	return shader->fragment_code;
-}
-
-String RasterizerGLES2::shader_get_light_code(RID p_shader) const {
-
-	Shader *shader = shader_owner.get(p_shader);
-	ERR_FAIL_COND_V(!shader, String());
-	return shader->light_code;
-}
-
-void RasterizerGLES2::_shader_make_dirty(Shader *p_shader) {
-
-	if (p_shader->dirty_list.in_list())
-		return;
-
-	_shader_dirty_list.add(&p_shader->dirty_list);
-}
-
-void RasterizerGLES2::shader_get_param_list(RID p_shader, List<PropertyInfo> *p_param_list) const {
-
-	Shader *shader = shader_owner.get(p_shader);
-	ERR_FAIL_COND(!shader);
-
-	if (shader->dirty_list.in_list())
-		_update_shader(shader); // ok should be not anymore dirty
-
-	Map<int, StringName> order;
-
-	for (Map<StringName, ShaderLanguage::Uniform>::Element *E = shader->uniforms.front(); E; E = E->next()) {
-
-		order[E->get().order] = E->key();
-	}
-
-	for (Map<int, StringName>::Element *E = order.front(); E; E = E->next()) {
-
-		PropertyInfo pi;
-		ShaderLanguage::Uniform &u = shader->uniforms[E->get()];
-		pi.name = E->get();
-		switch (u.type) {
-
-			case ShaderLanguage::TYPE_VOID:
-			case ShaderLanguage::TYPE_BOOL:
-			case ShaderLanguage::TYPE_FLOAT:
-			case ShaderLanguage::TYPE_VEC2:
-			case ShaderLanguage::TYPE_VEC3:
-			case ShaderLanguage::TYPE_MAT3:
-			case ShaderLanguage::TYPE_MAT4:
-			case ShaderLanguage::TYPE_VEC4:
-				pi.type = u.default_value.get_type();
-				break;
-			case ShaderLanguage::TYPE_TEXTURE:
-				pi.type = Variant::_RID;
-				pi.hint = PROPERTY_HINT_RESOURCE_TYPE;
-				pi.hint_string = "Texture";
-				break;
-			case ShaderLanguage::TYPE_CUBEMAP:
-				pi.type = Variant::_RID;
-				pi.hint = PROPERTY_HINT_RESOURCE_TYPE;
-				pi.hint_string = "CubeMap";
-				break;
-		};
-
-		p_param_list->push_back(pi);
-	}
-}
-
-void RasterizerGLES2::shader_set_default_texture_param(RID p_shader, const StringName &p_name, RID p_texture) {
-
-	Shader *shader = shader_owner.get(p_shader);
-	ERR_FAIL_COND(!shader);
-	ERR_FAIL_COND(p_texture.is_valid() && !texture_owner.owns(p_texture));
-
-	if (p_texture.is_valid())
-		shader->default_textures[p_name] = p_texture;
-	else
-		shader->default_textures.erase(p_name);
-
-	_shader_make_dirty(shader);
-}
-
-RID RasterizerGLES2::shader_get_default_texture_param(RID p_shader, const StringName &p_name) const {
-	const Shader *shader = shader_owner.get(p_shader);
-	ERR_FAIL_COND_V(!shader, RID());
-
-	const Map<StringName, RID>::Element *E = shader->default_textures.find(p_name);
-	if (!E)
-		return RID();
-	return E->get();
-}
-
-Variant RasterizerGLES2::shader_get_default_param(RID p_shader, const StringName &p_name) {
-
-	Shader *shader = shader_owner.get(p_shader);
-	ERR_FAIL_COND_V(!shader, Variant());
-
-	//update shader params if necessary
-	//make sure the shader is compiled and everything
-	//so the actual parameters can be properly retrieved!
-	if (shader->dirty_list.in_list()) {
-		_update_shader(shader);
-	}
-	if (shader->valid && shader->uniforms.has(p_name))
-		return shader->uniforms[p_name].default_value;
-
-	return Variant();
-}
-
-/* COMMON MATERIAL API */
-
-RID RasterizerGLES2::material_create() {
-
-	RID material = material_owner.make_rid(memnew(Material));
-	return material;
-}
-
-void RasterizerGLES2::material_set_shader(RID p_shader_material, RID p_shader) {
-
-	Material *material = material_owner.get(p_shader_material);
-	ERR_FAIL_COND(!material);
-	if (material->shader == p_shader)
-		return;
-	material->shader = p_shader;
-	material->shader_version = 0;
-}
-
-RID RasterizerGLES2::material_get_shader(RID p_shader_material) const {
-
-	Material *material = material_owner.get(p_shader_material);
-	ERR_FAIL_COND_V(!material, RID());
-	return material->shader;
-}
-
-void RasterizerGLES2::material_set_param(RID p_material, const StringName &p_param, const Variant &p_value) {
-
-	Material *material = material_owner.get(p_material);
-	ERR_FAIL_COND(!material);
-
-	Map<StringName, Material::UniformData>::Element *E = material->shader_params.find(p_param);
-	if (E) {
-
-		if (p_value.get_type() == Variant::NIL) {
-
-			material->shader_params.erase(E);
-			material->shader_version = 0; //get default!
-		} else {
-			E->get().value = p_value;
-			E->get().inuse = true;
-		}
-	} else {
-
-		if (p_value.get_type() == Variant::NIL)
-			return;
-
-		Material::UniformData ud;
-		ud.index = -1;
-		ud.value = p_value;
-		ud.istexture = p_value.get_type() == Variant::_RID; /// cache it being texture
-		ud.inuse = true;
-		material->shader_params[p_param] = ud; //may be got at some point, or erased
-	}
-}
-Variant RasterizerGLES2::material_get_param(RID p_material, const StringName &p_param) const {
-
-	Material *material = material_owner.get(p_material);
-	ERR_FAIL_COND_V(!material, Variant());
-
-	if (material->shader.is_valid()) {
-		//update shader params if necessary
-		//make sure the shader is compiled and everything
-		//so the actual parameters can be properly retrieved!
-		material->shader_cache = shader_owner.get(material->shader);
-		if (!material->shader_cache) {
-			//invalidate
-			material->shader = RID();
-			material->shader_cache = NULL;
-		} else {
-
-			if (material->shader_cache->dirty_list.in_list())
-				_update_shader(material->shader_cache);
-			if (material->shader_cache->valid && material->shader_cache->version != material->shader_version) {
-				//validate
-				_update_material_shader_params(material);
-			}
-		}
-	}
-
-	if (material->shader_params.has(p_param) && material->shader_params[p_param].inuse)
-		return material->shader_params[p_param].value;
-	else
-		return Variant();
-}
-
-void RasterizerGLES2::material_set_flag(RID p_material, VS::MaterialFlag p_flag, bool p_enabled) {
-
-	Material *material = material_owner.get(p_material);
-	ERR_FAIL_COND(!material);
-	ERR_FAIL_INDEX(p_flag, VS::MATERIAL_FLAG_MAX);
-
-	material->flags[p_flag] = p_enabled;
-}
-bool RasterizerGLES2::material_get_flag(RID p_material, VS::MaterialFlag p_flag) const {
-
-	Material *material = material_owner.get(p_material);
-	ERR_FAIL_COND_V(!material, false);
-	ERR_FAIL_INDEX_V(p_flag, VS::MATERIAL_FLAG_MAX, false);
-	return material->flags[p_flag];
-}
-
-void RasterizerGLES2::material_set_depth_draw_mode(RID p_material, VS::MaterialDepthDrawMode p_mode) {
-
-	Material *material = material_owner.get(p_material);
-	ERR_FAIL_COND(!material);
-	material->depth_draw_mode = p_mode;
-}
-
-VS::MaterialDepthDrawMode RasterizerGLES2::material_get_depth_draw_mode(RID p_material) const {
-
-	Material *material = material_owner.get(p_material);
-	ERR_FAIL_COND_V(!material, VS::MATERIAL_DEPTH_DRAW_ALWAYS);
-	return material->depth_draw_mode;
-}
-
-void RasterizerGLES2::material_set_blend_mode(RID p_material, VS::MaterialBlendMode p_mode) {
-
-	Material *material = material_owner.get(p_material);
-	ERR_FAIL_COND(!material);
-	material->blend_mode = p_mode;
-}
-VS::MaterialBlendMode RasterizerGLES2::material_get_blend_mode(RID p_material) const {
-
-	Material *material = material_owner.get(p_material);
-	ERR_FAIL_COND_V(!material, VS::MATERIAL_BLEND_MODE_ADD);
-	return material->blend_mode;
-}
-
-void RasterizerGLES2::material_set_line_width(RID p_material, float p_line_width) {
-
-	Material *material = material_owner.get(p_material);
-	ERR_FAIL_COND(!material);
-	material->line_width = p_line_width;
-}
-float RasterizerGLES2::material_get_line_width(RID p_material) const {
-
-	Material *material = material_owner.get(p_material);
-	ERR_FAIL_COND_V(!material, 0);
-
-	return material->line_width;
-}
-
-/* MESH API */
-
-RID RasterizerGLES2::mesh_create() {
-
-	return mesh_owner.make_rid(memnew(Mesh));
-}
-
-void RasterizerGLES2::mesh_add_surface(RID p_mesh, VS::PrimitiveType p_primitive, const Array &p_arrays, const Array &p_blend_shapes, bool p_alpha_sort) {
-
-	Mesh *mesh = mesh_owner.get(p_mesh);
-	ERR_FAIL_COND(!mesh);
-
-	ERR_FAIL_INDEX(p_primitive, VS::PRIMITIVE_MAX);
-	ERR_FAIL_COND(p_arrays.size() != VS::ARRAY_MAX);
-
-	uint32_t format = 0;
-
-	// validation
-	int index_array_len = 0;
-	int array_len = 0;
-
-	for (int i = 0; i < p_arrays.size(); i++) {
-
-		if (p_arrays[i].get_type() == Variant::NIL)
-			continue;
-
-		format |= (1 << i);
-
-		if (i == VS::ARRAY_VERTEX) {
-
-			array_len = Vector3Array(p_arrays[i]).size();
-			ERR_FAIL_COND(array_len == 0);
-		} else if (i == VS::ARRAY_INDEX) {
-
-			index_array_len = IntArray(p_arrays[i]).size();
-		}
-	}
-
-	ERR_FAIL_COND((format & VS::ARRAY_FORMAT_VERTEX) == 0); // mandatory
-
-	ERR_FAIL_COND(mesh->morph_target_count != p_blend_shapes.size());
-	if (mesh->morph_target_count) {
-		//validate format for morphs
-		for (int i = 0; i < p_blend_shapes.size(); i++) {
-
-			uint32_t bsformat = 0;
-			Array arr = p_blend_shapes[i];
-			for (int j = 0; j < arr.size(); j++) {
-
-				if (arr[j].get_type() != Variant::NIL)
-					bsformat |= (1 << j);
-			}
-
-			ERR_FAIL_COND((bsformat) != (format & (VS::ARRAY_FORMAT_BONES - 1)));
-		}
-	}
-
-	Surface *surface = memnew(Surface);
-	ERR_FAIL_COND(!surface);
-
-	bool use_VBO = true; //glGenBuffersARB!=NULL; // TODO detect if it's in there
-	if ((!use_hw_skeleton_xform && format & VS::ARRAY_FORMAT_WEIGHTS) || mesh->morph_target_count > 0) {
-
-		use_VBO = false;
-	}
-
-	//surface->packed=pack_arrays && use_VBO;
-
-	int total_elem_size = 0;
-
-	for (int i = 0; i < VS::ARRAY_MAX; i++) {
-
-		Surface::ArrayData &ad = surface->array[i];
-		ad.size = 0;
-		ad.ofs = 0;
-		int elem_size = 0;
-		int elem_count = 0;
-		bool valid_local = true;
-		GLenum datatype;
-		bool normalize = false;
-		bool bind = false;
-
-		if (!(format & (1 << i))) // no array
-			continue;
-
-		switch (i) {
-
-			case VS::ARRAY_VERTEX: {
-
-				if (use_VBO && use_half_float) {
-					elem_size = 3 * sizeof(int16_t); // vertex
-					datatype = _GL_HALF_FLOAT_OES;
-				} else {
-
-					elem_size = 3 * sizeof(GLfloat); // vertex
-					datatype = GL_FLOAT;
-				}
-				bind = true;
-				elem_count = 3;
-
-			} break;
-			case VS::ARRAY_NORMAL: {
-
-				if (use_VBO) {
-					elem_size = 4 * sizeof(int8_t); // vertex
-					datatype = GL_BYTE;
-					normalize = true;
-				} else {
-					elem_size = 3 * sizeof(GLfloat); // vertex
-					datatype = GL_FLOAT;
-				}
-				bind = true;
-				elem_count = 3;
-			} break;
-			case VS::ARRAY_TANGENT: {
-				if (use_VBO) {
-					elem_size = 4 * sizeof(int8_t); // vertex
-					datatype = GL_BYTE;
-					normalize = true;
-				} else {
-					elem_size = 4 * sizeof(GLfloat); // vertex
-					datatype = GL_FLOAT;
-				}
-				bind = true;
-				elem_count = 4;
-
-			} break;
-			case VS::ARRAY_COLOR: {
-
-				elem_size = 4 * sizeof(uint8_t); /* RGBA */
-				datatype = GL_UNSIGNED_BYTE;
-				elem_count = 4;
-				bind = true;
-				normalize = true;
-			} break;
-			case VS::ARRAY_TEX_UV:
-			case VS::ARRAY_TEX_UV2: {
-				if (use_VBO && use_half_float) {
-					elem_size = 2 * sizeof(int16_t); // vertex
-					datatype = _GL_HALF_FLOAT_OES;
-				} else {
-					elem_size = 2 * sizeof(GLfloat); // vertex
-					datatype = GL_FLOAT;
-				}
-				bind = true;
-				elem_count = 2;
-
-			} break;
-			case VS::ARRAY_WEIGHTS: {
-
-				if (use_VBO) {
-
-					elem_size = VS::ARRAY_WEIGHTS_SIZE * sizeof(GLushort);
-					valid_local = false;
-					bind = true;
-					normalize = true;
-					datatype = GL_UNSIGNED_SHORT;
-					elem_count = 4;
-
-				} else {
-					elem_size = VS::ARRAY_WEIGHTS_SIZE * sizeof(GLfloat);
-					valid_local = false;
-					bind = false;
-					datatype = GL_FLOAT;
-					elem_count = 4;
-				}
-
-			} break;
-			case VS::ARRAY_BONES: {
-
-				if (use_VBO) {
-					elem_size = VS::ARRAY_WEIGHTS_SIZE * sizeof(GLubyte);
-					valid_local = false;
-					bind = true;
-					datatype = GL_UNSIGNED_BYTE;
-					elem_count = 4;
-				} else {
-
-					elem_size = VS::ARRAY_WEIGHTS_SIZE * sizeof(GLushort);
-					valid_local = false;
-					bind = false;
-					datatype = GL_UNSIGNED_SHORT;
-					elem_count = 4;
-				}
-
-			} break;
-			case VS::ARRAY_INDEX: {
-
-				if (index_array_len <= 0) {
-					ERR_PRINT("index_array_len==NO_INDEX_ARRAY");
-					break;
-				}
-				/* determine wether using 16 or 32 bits indices */
-				if (array_len > (1 << 16)) {
-
-					elem_size = 4;
-					datatype = GL_UNSIGNED_INT;
-				} else {
-					elem_size = 2;
-					datatype = GL_UNSIGNED_SHORT;
-				}
-
-				/*
-				if (use_VBO) {
-
-					glGenBuffers(1,&surface->index_id);
-					ERR_FAIL_COND(surface->index_id==0);
-					glBindBuffer(GL_ELEMENT_ARRAY_BUFFER,surface->index_id);
-					glBufferData(GL_ELEMENT_ARRAY_BUFFER,index_array_len*elem_size,NULL,GL_STATIC_DRAW);
-					glBindBuffer(GL_ELEMENT_ARRAY_BUFFER,0); //unbind
-				} else {
-					surface->index_array_local = (uint8_t*)memalloc(index_array_len*elem_size);
-				};
-*/
-				surface->index_array_len = index_array_len; // only way it can exist
-				ad.ofs = 0;
-				ad.size = elem_size;
-
-				continue;
-			} break;
-			default: {
-				ERR_FAIL();
-			}
-		}
-
-		ad.ofs = total_elem_size;
-		ad.size = elem_size;
-		ad.datatype = datatype;
-		ad.normalize = normalize;
-		ad.bind = bind;
-		ad.count = elem_count;
-		total_elem_size += elem_size;
-		if (valid_local) {
-			surface->local_stride += elem_size;
-			surface->morph_format |= (1 << i);
-		}
-	}
-
-	surface->stride = total_elem_size;
-	surface->array_len = array_len;
-	surface->format = format;
-	surface->primitive = p_primitive;
-	surface->morph_target_count = mesh->morph_target_count;
-	surface->configured_format = 0;
-	surface->mesh = mesh;
-	if (keep_copies) {
-		surface->data = p_arrays;
-		surface->morph_data = p_blend_shapes;
-	}
-
-	uint8_t *array_ptr = NULL;
-	uint8_t *index_array_ptr = NULL;
-	PoolVector<uint8_t> array_pre_vbo;
-	PoolVector<uint8_t>::Write vaw;
-	PoolVector<uint8_t> index_array_pre_vbo;
-	PoolVector<uint8_t>::Write iaw;
-
-	/* create pointers */
-	if (use_VBO) {
-
-		array_pre_vbo.resize(surface->array_len * surface->stride);
-		vaw = array_pre_vbo.write();
-		array_ptr = vaw.ptr();
-
-		if (surface->index_array_len) {
-
-			index_array_pre_vbo.resize(surface->index_array_len * surface->array[VS::ARRAY_INDEX].size);
-			iaw = index_array_pre_vbo.write();
-			index_array_ptr = iaw.ptr();
-		}
-
-		_surface_set_arrays(surface, array_ptr, index_array_ptr, p_arrays, true);
-
-	} else {
-
-		surface->array_local = (uint8_t *)memalloc(surface->array_len * surface->stride);
-		array_ptr = (uint8_t *)surface->array_local;
-		if (surface->index_array_len) {
-			surface->index_array_local = (uint8_t *)memalloc(index_array_len * surface->array[VS::ARRAY_INDEX].size);
-			index_array_ptr = (uint8_t *)surface->index_array_local;
-		}
-
-		_surface_set_arrays(surface, array_ptr, index_array_ptr, p_arrays, true);
-
-		if (mesh->morph_target_count) {
-
-			surface->morph_targets_local = memnew_arr(Surface::MorphTarget, mesh->morph_target_count);
-			for (int i = 0; i < mesh->morph_target_count; i++) {
-
-				surface->morph_targets_local[i].array = memnew_arr(uint8_t, surface->local_stride * surface->array_len);
-				surface->morph_targets_local[i].configured_format = surface->morph_format;
-				_surface_set_arrays(surface, surface->morph_targets_local[i].array, NULL, p_blend_shapes[i], false);
-			}
-		}
-	}
-
-	/* create buffers!! */
-	if (use_VBO) {
-		glGenBuffers(1, &surface->vertex_id);
-		ERR_FAIL_COND(surface->vertex_id == 0);
-		glBindBuffer(GL_ARRAY_BUFFER, surface->vertex_id);
-		glBufferData(GL_ARRAY_BUFFER, surface->array_len * surface->stride, array_ptr, GL_STATIC_DRAW);
-		glBindBuffer(GL_ARRAY_BUFFER, 0); //unbind
-		if (surface->index_array_len) {
-
-			glGenBuffers(1, &surface->index_id);
-			ERR_FAIL_COND(surface->index_id == 0);
-			glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, surface->index_id);
-			glBufferData(GL_ELEMENT_ARRAY_BUFFER, index_array_len * surface->array[VS::ARRAY_INDEX].size, index_array_ptr, GL_STATIC_DRAW);
-			glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); //unbind
-		}
-	}
-
-	mesh->surfaces.push_back(surface);
-}
-
-Error RasterizerGLES2::_surface_set_arrays(Surface *p_surface, uint8_t *p_mem, uint8_t *p_index_mem, const Array &p_arrays, bool p_main) {
-
-	uint32_t stride = p_main ? p_surface->stride : p_surface->local_stride;
-
-	for (int ai = 0; ai < VS::ARRAY_MAX; ai++) {
-		if (ai >= p_arrays.size())
-			break;
-		if (p_arrays[ai].get_type() == Variant::NIL)
-			continue;
-		Surface::ArrayData &a = p_surface->array[ai];
-
-		switch (ai) {
-
-			case VS::ARRAY_VERTEX: {
-
-				ERR_FAIL_COND_V(p_arrays[ai].get_type() != Variant::VECTOR3_ARRAY, ERR_INVALID_PARAMETER);
-
-				PoolVector<Vector3> array = p_arrays[ai];
-				ERR_FAIL_COND_V(array.size() != p_surface->array_len, ERR_INVALID_PARAMETER);
-
-				PoolVector<Vector3>::Read read = array.read();
-				const Vector3 *src = read.ptr();
-
-				// setting vertices means regenerating the AABB
-				AABB aabb;
-
-				float scale = 1;
-
-				if (p_surface->array[VS::ARRAY_VERTEX].datatype == _GL_HALF_FLOAT_OES) {
-
-					for (int i = 0; i < p_surface->array_len; i++) {
-
-						uint16_t vector[3] = { make_half_float(src[i].x), make_half_float(src[i].y), make_half_float(src[i].z) };
-
-						copymem(&p_mem[a.ofs + i * stride], vector, a.size);
-
-						if (i == 0) {
-
-							aabb = AABB(src[i], Vector3());
-						} else {
-
-							aabb.expand_to(src[i]);
-						}
-					}
-
-				} else {
-					for (int i = 0; i < p_surface->array_len; i++) {
-
-						GLfloat vector[3] = { src[i].x, src[i].y, src[i].z };
-
-						copymem(&p_mem[a.ofs + i * stride], vector, a.size);
-
-						if (i == 0) {
-
-							aabb = AABB(src[i], Vector3());
-						} else {
-
-							aabb.expand_to(src[i]);
-						}
-					}
-				}
-
-				if (p_main) {
-					p_surface->aabb = aabb;
-					p_surface->vertex_scale = scale;
-				}
-
-			} break;
-			case VS::ARRAY_NORMAL: {
-
-				ERR_FAIL_COND_V(p_arrays[ai].get_type() != Variant::VECTOR3_ARRAY, ERR_INVALID_PARAMETER);
-
-				PoolVector<Vector3> array = p_arrays[ai];
-				ERR_FAIL_COND_V(array.size() != p_surface->array_len, ERR_INVALID_PARAMETER);
-
-				PoolVector<Vector3>::Read read = array.read();
-				const Vector3 *src = read.ptr();
-
-				// setting vertices means regenerating the AABB
-
-				if (p_surface->array[VS::ARRAY_NORMAL].datatype == GL_BYTE) {
-
-					for (int i = 0; i < p_surface->array_len; i++) {
-
-						GLbyte vector[4] = {
-							CLAMP(src[i].x * 127, -128, 127),
-							CLAMP(src[i].y * 127, -128, 127),
-							CLAMP(src[i].z * 127, -128, 127),
-							0,
-						};
-
-						copymem(&p_mem[a.ofs + i * stride], vector, a.size);
-					}
-
-				} else {
-					for (int i = 0; i < p_surface->array_len; i++) {
-
-						GLfloat vector[3] = { src[i].x, src[i].y, src[i].z };
-						copymem(&p_mem[a.ofs + i * stride], vector, a.size);
-					}
-				}
-
-			} break;
-			case VS::ARRAY_TANGENT: {
-
-				ERR_FAIL_COND_V(p_arrays[ai].get_type() != Variant::REAL_ARRAY, ERR_INVALID_PARAMETER);
-
-				PoolVector<real_t> array = p_arrays[ai];
-
-				ERR_FAIL_COND_V(array.size() != p_surface->array_len * 4, ERR_INVALID_PARAMETER);
-
-				PoolVector<real_t>::Read read = array.read();
-				const real_t *src = read.ptr();
-
-				if (p_surface->array[VS::ARRAY_TANGENT].datatype == GL_BYTE) {
-
-					for (int i = 0; i < p_surface->array_len; i++) {
-
-						GLbyte xyzw[4] = {
-							CLAMP(src[i * 4 + 0] * 127, -128, 127),
-							CLAMP(src[i * 4 + 1] * 127, -128, 127),
-							CLAMP(src[i * 4 + 2] * 127, -128, 127),
-							CLAMP(src[i * 4 + 3] * 127, -128, 127)
-						};
-
-						copymem(&p_mem[a.ofs + i * stride], xyzw, a.size);
-					}
-
-				} else {
-					for (int i = 0; i < p_surface->array_len; i++) {
-
-						GLfloat xyzw[4] = {
-							src[i * 4 + 0],
-							src[i * 4 + 1],
-							src[i * 4 + 2],
-							src[i * 4 + 3]
-						};
-
-						copymem(&p_mem[a.ofs + i * stride], xyzw, a.size);
-					}
-				}
-
-			} break;
-			case VS::ARRAY_COLOR: {
-
-				ERR_FAIL_COND_V(p_arrays[ai].get_type() != Variant::COLOR_ARRAY, ERR_INVALID_PARAMETER);
-
-				PoolVector<Color> array = p_arrays[ai];
-
-				ERR_FAIL_COND_V(array.size() != p_surface->array_len, ERR_INVALID_PARAMETER);
-
-				PoolVector<Color>::Read read = array.read();
-				const Color *src = read.ptr();
-				bool alpha = false;
-
-				for (int i = 0; i < p_surface->array_len; i++) {
-
-					if (src[i].a < 0.98) // tolerate alpha a bit, for crappy exporters
-						alpha = true;
-
-					uint8_t colors[4];
-
-					for (int j = 0; j < 4; j++) {
-
-						colors[j] = CLAMP(int((src[i][j]) * 255.0), 0, 255);
-					}
-
-					copymem(&p_mem[a.ofs + i * stride], colors, a.size);
-				}
-
-				if (p_main)
-					p_surface->has_alpha = alpha;
-
-			} break;
-			case VS::ARRAY_TEX_UV:
-			case VS::ARRAY_TEX_UV2: {
-
-				ERR_FAIL_COND_V(p_arrays[ai].get_type() != Variant::VECTOR3_ARRAY && p_arrays[ai].get_type() != Variant::VECTOR2_ARRAY, ERR_INVALID_PARAMETER);
-
-				PoolVector<Vector2> array = p_arrays[ai];
-
-				ERR_FAIL_COND_V(array.size() != p_surface->array_len, ERR_INVALID_PARAMETER);
-
-				PoolVector<Vector2>::Read read = array.read();
-
-				const Vector2 *src = read.ptr();
-				float scale = 1.0;
-
-				if (p_surface->array[ai].datatype == _GL_HALF_FLOAT_OES) {
-
-					for (int i = 0; i < p_surface->array_len; i++) {
-
-						uint16_t uv[2] = { make_half_float(src[i].x), make_half_float(src[i].y) };
-						copymem(&p_mem[a.ofs + i * stride], uv, a.size);
-					}
-
-				} else {
-					for (int i = 0; i < p_surface->array_len; i++) {
-
-						GLfloat uv[2] = { src[i].x, src[i].y };
-
-						copymem(&p_mem[a.ofs + i * stride], uv, a.size);
-					}
-				}
-
-				if (p_main) {
-
-					if (ai == VS::ARRAY_TEX_UV) {
-
-						p_surface->uv_scale = scale;
-					}
-					if (ai == VS::ARRAY_TEX_UV2) {
-
-						p_surface->uv2_scale = scale;
-					}
-				}
-
-			} break;
-			case VS::ARRAY_WEIGHTS: {
-
-				ERR_FAIL_COND_V(p_arrays[ai].get_type() != Variant::REAL_ARRAY, ERR_INVALID_PARAMETER);
-
-				PoolVector<real_t> array = p_arrays[ai];
-
-				ERR_FAIL_COND_V(array.size() != p_surface->array_len * VS::ARRAY_WEIGHTS_SIZE, ERR_INVALID_PARAMETER);
-
-				PoolVector<real_t>::Read read = array.read();
-
-				const real_t *src = read.ptr();
-
-				if (p_surface->array[VS::ARRAY_WEIGHTS].datatype == GL_UNSIGNED_SHORT) {
-
-					for (int i = 0; i < p_surface->array_len; i++) {
-
-						GLushort data[VS::ARRAY_WEIGHTS_SIZE];
-						for (int j = 0; j < VS::ARRAY_WEIGHTS_SIZE; j++) {
-							data[j] = CLAMP(src[i * VS::ARRAY_WEIGHTS_SIZE + j] * 65535, 0, 65535);
-						}
-
-						copymem(&p_mem[a.ofs + i * stride], data, a.size);
-					}
-				} else {
-
-					for (int i = 0; i < p_surface->array_len; i++) {
-
-						GLfloat data[VS::ARRAY_WEIGHTS_SIZE];
-						for (int j = 0; j < VS::ARRAY_WEIGHTS_SIZE; j++) {
-							data[j] = src[i * VS::ARRAY_WEIGHTS_SIZE + j];
-						}
-
-						copymem(&p_mem[a.ofs + i * stride], data, a.size);
-					}
-				}
-
-			} break;
-			case VS::ARRAY_BONES: {
-
-				ERR_FAIL_COND_V(p_arrays[ai].get_type() != Variant::REAL_ARRAY, ERR_INVALID_PARAMETER);
-
-				PoolVector<int> array = p_arrays[ai];
-
-				ERR_FAIL_COND_V(array.size() != p_surface->array_len * VS::ARRAY_WEIGHTS_SIZE, ERR_INVALID_PARAMETER);
-
-				PoolVector<int>::Read read = array.read();
-
-				const int *src = read.ptr();
-
-				p_surface->max_bone = 0;
-
-				if (p_surface->array[VS::ARRAY_BONES].datatype == GL_UNSIGNED_BYTE) {
-
-					for (int i = 0; i < p_surface->array_len; i++) {
-
-						GLubyte data[VS::ARRAY_WEIGHTS_SIZE];
-						for (int j = 0; j < VS::ARRAY_WEIGHTS_SIZE; j++) {
-							data[j] = CLAMP(src[i * VS::ARRAY_WEIGHTS_SIZE + j], 0, 255);
-							p_surface->max_bone = MAX(data[j], p_surface->max_bone);
-						}
-
-						copymem(&p_mem[a.ofs + i * stride], data, a.size);
-					}
-
-				} else {
-					for (int i = 0; i < p_surface->array_len; i++) {
-
-						GLushort data[VS::ARRAY_WEIGHTS_SIZE];
-						for (int j = 0; j < VS::ARRAY_WEIGHTS_SIZE; j++) {
-							data[j] = src[i * VS::ARRAY_WEIGHTS_SIZE + j];
-							p_surface->max_bone = MAX(data[j], p_surface->max_bone);
-						}
-
-						copymem(&p_mem[a.ofs + i * stride], data, a.size);
-					}
-				}
-
-			} break;
-			case VS::ARRAY_INDEX: {
-
-				ERR_FAIL_COND_V(p_surface->index_array_len <= 0, ERR_INVALID_DATA);
-				ERR_FAIL_COND_V(p_arrays[ai].get_type() != Variant::INT_ARRAY, ERR_INVALID_PARAMETER);
-
-				PoolVector<int> indices = p_arrays[ai];
-				ERR_FAIL_COND_V(indices.size() == 0, ERR_INVALID_PARAMETER);
-				ERR_FAIL_COND_V(indices.size() != p_surface->index_array_len, ERR_INVALID_PARAMETER);
-
-				/* determine wether using 16 or 32 bits indices */
-
-				PoolVector<int>::Read read = indices.read();
-				const int *src = read.ptr();
-
-				for (int i = 0; i < p_surface->index_array_len; i++) {
-
-					if (a.size == 2) {
-						uint16_t v = src[i];
-
-						copymem(&p_index_mem[i * a.size], &v, a.size);
-					} else {
-						uint32_t v = src[i];
-
-						copymem(&p_index_mem[i * a.size], &v, a.size);
-					}
-				}
-
-			} break;
-
-			default: { ERR_FAIL_V(ERR_INVALID_PARAMETER); }
-		}
-
-		p_surface->configured_format |= (1 << ai);
-	}
-
-	if (p_surface->format & VS::ARRAY_FORMAT_BONES) {
-		//create AABBs for each detected bone
-		int total_bones = p_surface->max_bone + 1;
-		if (p_main) {
-			p_surface->skeleton_bone_aabb.resize(total_bones);
-			p_surface->skeleton_bone_used.resize(total_bones);
-			for (int i = 0; i < total_bones; i++)
-				p_surface->skeleton_bone_used[i] = false;
-		}
-		PoolVector<Vector3> vertices = p_arrays[VS::ARRAY_VERTEX];
-		PoolVector<int> bones = p_arrays[VS::ARRAY_BONES];
-		PoolVector<float> weights = p_arrays[VS::ARRAY_WEIGHTS];
-
-		bool any_valid = false;
-
-		if (vertices.size() && bones.size() == vertices.size() * 4 && weights.size() == bones.size()) {
-			//print_line("MAKING SKELETHONG");
-			int vs = vertices.size();
-			PoolVector<Vector3>::Read rv = vertices.read();
-			PoolVector<int>::Read rb = bones.read();
-			PoolVector<float>::Read rw = weights.read();
-
-			Vector<bool> first;
-			first.resize(total_bones);
-			for (int i = 0; i < total_bones; i++) {
-				first[i] = p_main;
-			}
-			AABB *bptr = p_surface->skeleton_bone_aabb.ptr();
-			bool *fptr = first.ptr();
-			bool *usedptr = p_surface->skeleton_bone_used.ptr();
-
-			for (int i = 0; i < vs; i++) {
-
-				Vector3 v = rv[i];
-				for (int j = 0; j < 4; j++) {
-
-					int idx = rb[i * 4 + j];
-					float w = rw[i * 4 + j];
-					if (w == 0)
-						continue; //break;
-					ERR_FAIL_INDEX_V(idx, total_bones, ERR_INVALID_DATA);
-
-					if (fptr[idx]) {
-						bptr[idx].pos = v;
-						fptr[idx] = false;
-						any_valid = true;
-					} else {
-						bptr[idx].expand_to(v);
-					}
-					usedptr[idx] = true;
-				}
-			}
-		}
-
-		if (p_main && !any_valid) {
-
-			p_surface->skeleton_bone_aabb.clear();
-			p_surface->skeleton_bone_used.clear();
-		}
-	}
-
-	return OK;
-}
-
-void RasterizerGLES2::mesh_add_custom_surface(RID p_mesh, const Variant &p_dat) {
-
-	ERR_EXPLAIN("OpenGL Rasterizer does not support custom surfaces. Running on wrong platform?");
-	ERR_FAIL();
-}
-
-Array RasterizerGLES2::mesh_get_surface_arrays(RID p_mesh, int p_surface) const {
-
-	Mesh *mesh = mesh_owner.get(p_mesh);
-	ERR_FAIL_COND_V(!mesh, Array());
-	ERR_FAIL_INDEX_V(p_surface, mesh->surfaces.size(), Array());
-	Surface *surface = mesh->surfaces[p_surface];
-	ERR_FAIL_COND_V(!surface, Array());
-
-	return surface->data;
-}
-Array RasterizerGLES2::mesh_get_surface_morph_arrays(RID p_mesh, int p_surface) const {
-
-	Mesh *mesh = mesh_owner.get(p_mesh);
-	ERR_FAIL_COND_V(!mesh, Array());
-	ERR_FAIL_INDEX_V(p_surface, mesh->surfaces.size(), Array());
-	Surface *surface = mesh->surfaces[p_surface];
-	ERR_FAIL_COND_V(!surface, Array());
-
-	return surface->morph_data;
-}
-
-void RasterizerGLES2::mesh_set_morph_target_count(RID p_mesh, int p_amount) {
-
-	Mesh *mesh = mesh_owner.get(p_mesh);
-	ERR_FAIL_COND(!mesh);
-	ERR_FAIL_COND(mesh->surfaces.size() != 0);
-
-	mesh->morph_target_count = p_amount;
-}
-
-int RasterizerGLES2::mesh_get_morph_target_count(RID p_mesh) const {
-
-	Mesh *mesh = mesh_owner.get(p_mesh);
-	ERR_FAIL_COND_V(!mesh, -1);
-
-	return mesh->morph_target_count;
-}
-
-void RasterizerGLES2::mesh_set_morph_target_mode(RID p_mesh, VS::MorphTargetMode p_mode) {
-
-	ERR_FAIL_INDEX(p_mode, 2);
-	Mesh *mesh = mesh_owner.get(p_mesh);
-	ERR_FAIL_COND(!mesh);
-
-	mesh->morph_target_mode = p_mode;
-}
-
-VS::MorphTargetMode RasterizerGLES2::mesh_get_morph_target_mode(RID p_mesh) const {
-
-	Mesh *mesh = mesh_owner.get(p_mesh);
-	ERR_FAIL_COND_V(!mesh, VS::MORPH_MODE_NORMALIZED);
-
-	return mesh->morph_target_mode;
-}
-
-void RasterizerGLES2::mesh_surface_set_material(RID p_mesh, int p_surface, RID p_material, bool p_owned) {
-
-	Mesh *mesh = mesh_owner.get(p_mesh);
-	ERR_FAIL_COND(!mesh);
-	ERR_FAIL_INDEX(p_surface, mesh->surfaces.size());
-	Surface *surface = mesh->surfaces[p_surface];
-	ERR_FAIL_COND(!surface);
-
-	if (surface->material_owned && surface->material.is_valid())
-		free(surface->material);
-
-	surface->material_owned = p_owned;
-
-	surface->material = p_material;
-}
-
-RID RasterizerGLES2::mesh_surface_get_material(RID p_mesh, int p_surface) const {
-
-	Mesh *mesh = mesh_owner.get(p_mesh);
-	ERR_FAIL_COND_V(!mesh, RID());
-	ERR_FAIL_INDEX_V(p_surface, mesh->surfaces.size(), RID());
-	Surface *surface = mesh->surfaces[p_surface];
-	ERR_FAIL_COND_V(!surface, RID());
-
-	return surface->material;
-}
-
-int RasterizerGLES2::mesh_surface_get_array_len(RID p_mesh, int p_surface) const {
-
-	Mesh *mesh = mesh_owner.get(p_mesh);
-	ERR_FAIL_COND_V(!mesh, -1);
-	ERR_FAIL_INDEX_V(p_surface, mesh->surfaces.size(), -1);
-	Surface *surface = mesh->surfaces[p_surface];
-	ERR_FAIL_COND_V(!surface, -1);
-
-	return surface->array_len;
-}
-int RasterizerGLES2::mesh_surface_get_array_index_len(RID p_mesh, int p_surface) const {
-
-	Mesh *mesh = mesh_owner.get(p_mesh);
-	ERR_FAIL_COND_V(!mesh, -1);
-	ERR_FAIL_INDEX_V(p_surface, mesh->surfaces.size(), -1);
-	Surface *surface = mesh->surfaces[p_surface];
-	ERR_FAIL_COND_V(!surface, -1);
-
-	return surface->index_array_len;
-}
-uint32_t RasterizerGLES2::mesh_surface_get_format(RID p_mesh, int p_surface) const {
-
-	Mesh *mesh = mesh_owner.get(p_mesh);
-	ERR_FAIL_COND_V(!mesh, 0);
-	ERR_FAIL_INDEX_V(p_surface, mesh->surfaces.size(), 0);
-	Surface *surface = mesh->surfaces[p_surface];
-	ERR_FAIL_COND_V(!surface, 0);
-
-	return surface->format;
-}
-VS::PrimitiveType RasterizerGLES2::mesh_surface_get_primitive_type(RID p_mesh, int p_surface) const {
-
-	Mesh *mesh = mesh_owner.get(p_mesh);
-	ERR_FAIL_COND_V(!mesh, VS::PRIMITIVE_POINTS);
-	ERR_FAIL_INDEX_V(p_surface, mesh->surfaces.size(), VS::PRIMITIVE_POINTS);
-	Surface *surface = mesh->surfaces[p_surface];
-	ERR_FAIL_COND_V(!surface, VS::PRIMITIVE_POINTS);
-
-	return surface->primitive;
-}
-
-void RasterizerGLES2::mesh_remove_surface(RID p_mesh, int p_index) {
-
-	Mesh *mesh = mesh_owner.get(p_mesh);
-	ERR_FAIL_COND(!mesh);
-	ERR_FAIL_INDEX(p_index, mesh->surfaces.size());
-	Surface *surface = mesh->surfaces[p_index];
-	ERR_FAIL_COND(!surface);
-
-	if (surface->vertex_id)
-		glDeleteBuffers(1, &surface->vertex_id);
-	if (surface->index_id)
-		glDeleteBuffers(1, &surface->index_id);
-
-	if (mesh->morph_target_count) {
-		for (int i = 0; i < mesh->morph_target_count; i++)
-			memfree(surface->morph_targets_local[i].array);
-		memfree(surface->morph_targets_local);
-	}
-
-	memdelete(mesh->surfaces[p_index]);
-	mesh->surfaces.remove(p_index);
-}
-int RasterizerGLES2::mesh_get_surface_count(RID p_mesh) const {
-
-	Mesh *mesh = mesh_owner.get(p_mesh);
-	ERR_FAIL_COND_V(!mesh, -1);
-
-	return mesh->surfaces.size();
-}
-
-AABB RasterizerGLES2::mesh_get_aabb(RID p_mesh, RID p_skeleton) const {
-
-	Mesh *mesh = mesh_owner.get(p_mesh);
-	ERR_FAIL_COND_V(!mesh, AABB());
-
-	if (mesh->custom_aabb != AABB())
-		return mesh->custom_aabb;
-
-	Skeleton *sk = NULL;
-	if (p_skeleton.is_valid())
-		sk = skeleton_owner.get(p_skeleton);
-
-	AABB aabb;
-	if (sk && sk->bones.size() != 0) {
-
-		for (int i = 0; i < mesh->surfaces.size(); i++) {
-
-			AABB laabb;
-			if (mesh->surfaces[i]->format & VS::ARRAY_FORMAT_BONES && mesh->surfaces[i]->skeleton_bone_aabb.size()) {
-
-				int bs = mesh->surfaces[i]->skeleton_bone_aabb.size();
-				const AABB *skbones = mesh->surfaces[i]->skeleton_bone_aabb.ptr();
-				const bool *skused = mesh->surfaces[i]->skeleton_bone_used.ptr();
-
-				int sbs = sk->bones.size();
-				ERR_CONTINUE(bs > sbs);
-				Skeleton::Bone *skb = sk->bones.ptr();
-
-				bool first = true;
-				for (int j = 0; j < bs; j++) {
-
-					if (!skused[j])
-						continue;
-					AABB baabb = skb[j].transform_aabb(skbones[j]);
-					if (first) {
-						laabb = baabb;
-						first = false;
-					} else {
-						laabb.merge_with(baabb);
-					}
-				}
-
-			} else {
-
-				laabb = mesh->surfaces[i]->aabb;
-			}
-
-			if (i == 0)
-				aabb = laabb;
-			else
-				aabb.merge_with(laabb);
-		}
-	} else {
-
-		for (int i = 0; i < mesh->surfaces.size(); i++) {
-
-			if (i == 0)
-				aabb = mesh->surfaces[i]->aabb;
-			else
-				aabb.merge_with(mesh->surfaces[i]->aabb);
-		}
-	}
-
-	return aabb;
-}
-
-void RasterizerGLES2::mesh_set_custom_aabb(RID p_mesh, const AABB &p_aabb) {
-
-	Mesh *mesh = mesh_owner.get(p_mesh);
-	ERR_FAIL_COND(!mesh);
-
-	mesh->custom_aabb = p_aabb;
-}
-
-AABB RasterizerGLES2::mesh_get_custom_aabb(RID p_mesh) const {
-
-	const Mesh *mesh = mesh_owner.get(p_mesh);
-	ERR_FAIL_COND_V(!mesh, AABB());
-
-	return mesh->custom_aabb;
-}
-/* MULTIMESH API */
-
-RID RasterizerGLES2::multimesh_create() {
-
-	return multimesh_owner.make_rid(memnew(MultiMesh));
-}
-
-void RasterizerGLES2::multimesh_set_instance_count(RID p_multimesh, int p_count) {
-
-	MultiMesh *multimesh = multimesh_owner.get(p_multimesh);
-	ERR_FAIL_COND(!multimesh);
-
-	//multimesh->elements.clear(); // make sure to delete everything, so it "fails" in all implementations
-
-	if (use_texture_instancing) {
-
-		if (next_power_of_2(p_count) != next_power_of_2(multimesh->elements.size())) {
-			if (multimesh->tex_id) {
-				glDeleteTextures(1, &multimesh->tex_id);
-				multimesh->tex_id = 0;
-			}
-
-			if (p_count) {
-
-				uint32_t po2 = next_power_of_2(p_count);
-				if (po2 & 0xAAAAAAAA) {
-					//half width
-
-					multimesh->tw = Math::sqrt(po2 * 2);
-					multimesh->th = multimesh->tw / 2;
-				} else {
-
-					multimesh->tw = Math::sqrt(po2);
-					multimesh->th = multimesh->tw;
-				}
-				multimesh->tw *= 4;
-				if (multimesh->th == 0)
-					multimesh->th = 1;
-
-				glGenTextures(1, &multimesh->tex_id);
-				glActiveTexture(GL_TEXTURE0);
-				glBindTexture(GL_TEXTURE_2D, multimesh->tex_id);
-
-#ifdef GLEW_ENABLED
-				glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, multimesh->tw, multimesh->th, 0, GL_RGBA, GL_FLOAT, NULL);
-#else
-				glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, multimesh->tw, multimesh->th, 0, GL_RGBA, GL_FLOAT, NULL);
-#endif
-				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-				glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-				glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-				//multimesh->pixel_size=1.0/ps;
-
-				glBindTexture(GL_TEXTURE_2D, 0);
-			}
-		}
-
-		if (!multimesh->dirty_list.in_list()) {
-			_multimesh_dirty_list.add(&multimesh->dirty_list);
-		}
-	}
-
-	multimesh->elements.resize(p_count);
-}
-int RasterizerGLES2::multimesh_get_instance_count(RID p_multimesh) const {
-
-	MultiMesh *multimesh = multimesh_owner.get(p_multimesh);
-	ERR_FAIL_COND_V(!multimesh, -1);
-
-	return multimesh->elements.size();
-}
-
-void RasterizerGLES2::multimesh_set_mesh(RID p_multimesh, RID p_mesh) {
-
-	MultiMesh *multimesh = multimesh_owner.get(p_multimesh);
-	ERR_FAIL_COND(!multimesh);
-
-	multimesh->mesh = p_mesh;
-}
-void RasterizerGLES2::multimesh_set_aabb(RID p_multimesh, const AABB &p_aabb) {
-
-	MultiMesh *multimesh = multimesh_owner.get(p_multimesh);
-	ERR_FAIL_COND(!multimesh);
-	multimesh->aabb = p_aabb;
-}
-void RasterizerGLES2::multimesh_instance_set_transform(RID p_multimesh, int p_index, const Transform &p_transform) {
-
-	MultiMesh *multimesh = multimesh_owner.get(p_multimesh);
-	ERR_FAIL_COND(!multimesh);
-	ERR_FAIL_INDEX(p_index, multimesh->elements.size());
-	MultiMesh::Element &e = multimesh->elements[p_index];
-
-	e.matrix[0] = p_transform.basis.elements[0][0];
-	e.matrix[1] = p_transform.basis.elements[1][0];
-	e.matrix[2] = p_transform.basis.elements[2][0];
-	e.matrix[3] = 0;
-	e.matrix[4] = p_transform.basis.elements[0][1];
-	e.matrix[5] = p_transform.basis.elements[1][1];
-	e.matrix[6] = p_transform.basis.elements[2][1];
-	e.matrix[7] = 0;
-	e.matrix[8] = p_transform.basis.elements[0][2];
-	e.matrix[9] = p_transform.basis.elements[1][2];
-	e.matrix[10] = p_transform.basis.elements[2][2];
-	e.matrix[11] = 0;
-	e.matrix[12] = p_transform.origin.x;
-	e.matrix[13] = p_transform.origin.y;
-	e.matrix[14] = p_transform.origin.z;
-	e.matrix[15] = 1;
-
-	if (!multimesh->dirty_list.in_list()) {
-		_multimesh_dirty_list.add(&multimesh->dirty_list);
-	}
-}
-void RasterizerGLES2::multimesh_instance_set_color(RID p_multimesh, int p_index, const Color &p_color) {
-
-	MultiMesh *multimesh = multimesh_owner.get(p_multimesh);
-	ERR_FAIL_COND(!multimesh)
-	ERR_FAIL_INDEX(p_index, multimesh->elements.size());
-	MultiMesh::Element &e = multimesh->elements[p_index];
-	e.color[0] = CLAMP(p_color.r * 255, 0, 255);
-	e.color[1] = CLAMP(p_color.g * 255, 0, 255);
-	e.color[2] = CLAMP(p_color.b * 255, 0, 255);
-	e.color[3] = CLAMP(p_color.a * 255, 0, 255);
-
-	if (!multimesh->dirty_list.in_list()) {
-		_multimesh_dirty_list.add(&multimesh->dirty_list);
-	}
-}
-
-RID RasterizerGLES2::multimesh_get_mesh(RID p_multimesh) const {
-
-	MultiMesh *multimesh = multimesh_owner.get(p_multimesh);
-	ERR_FAIL_COND_V(!multimesh, RID());
-
-	return multimesh->mesh;
-}
-AABB RasterizerGLES2::multimesh_get_aabb(RID p_multimesh) const {
-
-	MultiMesh *multimesh = multimesh_owner.get(p_multimesh);
-	ERR_FAIL_COND_V(!multimesh, AABB());
-
-	return multimesh->aabb;
-}
-
-Transform RasterizerGLES2::multimesh_instance_get_transform(RID p_multimesh, int p_index) const {
-
-	MultiMesh *multimesh = multimesh_owner.get(p_multimesh);
-	ERR_FAIL_COND_V(!multimesh, Transform());
-
-	ERR_FAIL_INDEX_V(p_index, multimesh->elements.size(), Transform());
-	MultiMesh::Element &e = multimesh->elements[p_index];
-
-	Transform tr;
-
-	tr.basis.elements[0][0] = e.matrix[0];
-	tr.basis.elements[1][0] = e.matrix[1];
-	tr.basis.elements[2][0] = e.matrix[2];
-	tr.basis.elements[0][1] = e.matrix[4];
-	tr.basis.elements[1][1] = e.matrix[5];
-	tr.basis.elements[2][1] = e.matrix[6];
-	tr.basis.elements[0][2] = e.matrix[8];
-	tr.basis.elements[1][2] = e.matrix[9];
-	tr.basis.elements[2][2] = e.matrix[10];
-	tr.origin.x = e.matrix[12];
-	tr.origin.y = e.matrix[13];
-	tr.origin.z = e.matrix[14];
-
-	return tr;
-}
-Color RasterizerGLES2::multimesh_instance_get_color(RID p_multimesh, int p_index) const {
-
-	MultiMesh *multimesh = multimesh_owner.get(p_multimesh);
-	ERR_FAIL_COND_V(!multimesh, Color());
-	ERR_FAIL_INDEX_V(p_index, multimesh->elements.size(), Color());
-	MultiMesh::Element &e = multimesh->elements[p_index];
-	Color c;
-	c.r = e.color[0] / 255.0;
-	c.g = e.color[1] / 255.0;
-	c.b = e.color[2] / 255.0;
-	c.a = e.color[3] / 255.0;
-
-	return c;
-}
-
-void RasterizerGLES2::multimesh_set_visible_instances(RID p_multimesh, int p_visible) {
-
-	MultiMesh *multimesh = multimesh_owner.get(p_multimesh);
-	ERR_FAIL_COND(!multimesh);
-	multimesh->visible = p_visible;
-}
-
-int RasterizerGLES2::multimesh_get_visible_instances(RID p_multimesh) const {
-
-	MultiMesh *multimesh = multimesh_owner.get(p_multimesh);
-	ERR_FAIL_COND_V(!multimesh, -1);
-	return multimesh->visible;
-}
-
-/* IMMEDIATE API */
-
-RID RasterizerGLES2::immediate_create() {
-
-	Immediate *im = memnew(Immediate);
-	return immediate_owner.make_rid(im);
-}
-
-void RasterizerGLES2::immediate_begin(RID p_immediate, VS::PrimitiveType p_rimitive, RID p_texture) {
-
-	Immediate *im = immediate_owner.get(p_immediate);
-	ERR_FAIL_COND(!im);
-	ERR_FAIL_COND(im->building);
-
-	Immediate::Chunk ic;
-	ic.texture = p_texture;
-	ic.primitive = p_rimitive;
-	im->chunks.push_back(ic);
-	im->mask = 0;
-	im->building = true;
-}
-void RasterizerGLES2::immediate_vertex(RID p_immediate, const Vector3 &p_vertex) {
-
-	Immediate *im = immediate_owner.get(p_immediate);
-	ERR_FAIL_COND(!im);
-	ERR_FAIL_COND(!im->building);
-
-	Immediate::Chunk *c = &im->chunks.back()->get();
-
-	if (c->vertices.empty() && im->chunks.size() == 1) {
-
-		im->aabb.pos = p_vertex;
-		im->aabb.size = Vector3();
-	} else {
-		im->aabb.expand_to(p_vertex);
-	}
-
-	if (im->mask & VS::ARRAY_FORMAT_NORMAL)
-		c->normals.push_back(chunk_normal);
-	if (im->mask & VS::ARRAY_FORMAT_TANGENT)
-		c->tangents.push_back(chunk_tangent);
-	if (im->mask & VS::ARRAY_FORMAT_COLOR)
-		c->colors.push_back(chunk_color);
-	if (im->mask & VS::ARRAY_FORMAT_TEX_UV)
-		c->uvs.push_back(chunk_uv);
-	if (im->mask & VS::ARRAY_FORMAT_TEX_UV2)
-		c->uvs2.push_back(chunk_uv2);
-	im->mask |= VS::ARRAY_FORMAT_VERTEX;
-	c->vertices.push_back(p_vertex);
-}
-
-void RasterizerGLES2::immediate_normal(RID p_immediate, const Vector3 &p_normal) {
-
-	Immediate *im = immediate_owner.get(p_immediate);
-	ERR_FAIL_COND(!im);
-	ERR_FAIL_COND(!im->building);
-
-	im->mask |= VS::ARRAY_FORMAT_NORMAL;
-	chunk_normal = p_normal;
-}
-void RasterizerGLES2::immediate_tangent(RID p_immediate, const Plane &p_tangent) {
-
-	Immediate *im = immediate_owner.get(p_immediate);
-	ERR_FAIL_COND(!im);
-	ERR_FAIL_COND(!im->building);
-
-	im->mask |= VS::ARRAY_FORMAT_TANGENT;
-	chunk_tangent = p_tangent;
-}
-void RasterizerGLES2::immediate_color(RID p_immediate, const Color &p_color) {
-
-	Immediate *im = immediate_owner.get(p_immediate);
-	ERR_FAIL_COND(!im);
-	ERR_FAIL_COND(!im->building);
-
-	im->mask |= VS::ARRAY_FORMAT_COLOR;
-	chunk_color = p_color;
-}
-void RasterizerGLES2::immediate_uv(RID p_immediate, const Vector2 &tex_uv) {
-
-	Immediate *im = immediate_owner.get(p_immediate);
-	ERR_FAIL_COND(!im);
-	ERR_FAIL_COND(!im->building);
-
-	im->mask |= VS::ARRAY_FORMAT_TEX_UV;
-	chunk_uv = tex_uv;
-}
-void RasterizerGLES2::immediate_uv2(RID p_immediate, const Vector2 &tex_uv) {
-
-	Immediate *im = immediate_owner.get(p_immediate);
-	ERR_FAIL_COND(!im);
-	ERR_FAIL_COND(!im->building);
-
-	im->mask |= VS::ARRAY_FORMAT_TEX_UV2;
-	chunk_uv2 = tex_uv;
-}
-
-void RasterizerGLES2::immediate_end(RID p_immediate) {
-
-	Immediate *im = immediate_owner.get(p_immediate);
-	ERR_FAIL_COND(!im);
-	ERR_FAIL_COND(!im->building);
-
-	im->building = false;
-}
-void RasterizerGLES2::immediate_clear(RID p_immediate) {
-
-	Immediate *im = immediate_owner.get(p_immediate);
-	ERR_FAIL_COND(!im);
-	ERR_FAIL_COND(im->building);
-
-	im->chunks.clear();
-}
-
-AABB RasterizerGLES2::immediate_get_aabb(RID p_immediate) const {
-
-	Immediate *im = immediate_owner.get(p_immediate);
-	ERR_FAIL_COND_V(!im, AABB());
-	return im->aabb;
-}
-
-void RasterizerGLES2::immediate_set_material(RID p_immediate, RID p_material) {
-
-	Immediate *im = immediate_owner.get(p_immediate);
-	ERR_FAIL_COND(!im);
-	im->material = p_material;
-}
-
-RID RasterizerGLES2::immediate_get_material(RID p_immediate) const {
-
-	const Immediate *im = immediate_owner.get(p_immediate);
-	ERR_FAIL_COND_V(!im, RID());
-	return im->material;
-}
-
-/* PARTICLES API */
-
-RID RasterizerGLES2::particles_create() {
-
-	Particles *particles = memnew(Particles);
-	ERR_FAIL_COND_V(!particles, RID());
-	return particles_owner.make_rid(particles);
-}
-
-void RasterizerGLES2::particles_set_amount(RID p_particles, int p_amount) {
-
-	ERR_FAIL_COND(p_amount < 1);
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND(!particles);
-	particles->data.amount = p_amount;
-}
-
-int RasterizerGLES2::particles_get_amount(RID p_particles) const {
-
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND_V(!particles, -1);
-	return particles->data.amount;
-}
-
-void RasterizerGLES2::particles_set_emitting(RID p_particles, bool p_emitting) {
-
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND(!particles);
-	particles->data.emitting = p_emitting;
-}
-bool RasterizerGLES2::particles_is_emitting(RID p_particles) const {
-
-	const Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND_V(!particles, false);
-	return particles->data.emitting;
-}
-
-void RasterizerGLES2::particles_set_visibility_aabb(RID p_particles, const AABB &p_visibility) {
-
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND(!particles);
-	particles->data.visibility_aabb = p_visibility;
-}
-
-void RasterizerGLES2::particles_set_emission_half_extents(RID p_particles, const Vector3 &p_half_extents) {
-
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND(!particles);
-
-	particles->data.emission_half_extents = p_half_extents;
-}
-Vector3 RasterizerGLES2::particles_get_emission_half_extents(RID p_particles) const {
-
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND_V(!particles, Vector3());
-
-	return particles->data.emission_half_extents;
-}
-
-void RasterizerGLES2::particles_set_emission_base_velocity(RID p_particles, const Vector3 &p_base_velocity) {
-
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND(!particles);
-
-	particles->data.emission_base_velocity = p_base_velocity;
-}
-
-Vector3 RasterizerGLES2::particles_get_emission_base_velocity(RID p_particles) const {
-
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND_V(!particles, Vector3());
-
-	return particles->data.emission_base_velocity;
-}
-
-void RasterizerGLES2::particles_set_emission_points(RID p_particles, const PoolVector<Vector3> &p_points) {
-
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND(!particles);
-
-	particles->data.emission_points = p_points;
-}
-
-PoolVector<Vector3> RasterizerGLES2::particles_get_emission_points(RID p_particles) const {
-
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND_V(!particles, PoolVector<Vector3>());
-
-	return particles->data.emission_points;
-}
-
-void RasterizerGLES2::particles_set_gravity_normal(RID p_particles, const Vector3 &p_normal) {
-
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND(!particles);
-
-	particles->data.gravity_normal = p_normal;
-}
-Vector3 RasterizerGLES2::particles_get_gravity_normal(RID p_particles) const {
-
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND_V(!particles, Vector3());
-
-	return particles->data.gravity_normal;
-}
-
-AABB RasterizerGLES2::particles_get_visibility_aabb(RID p_particles) const {
-
-	const Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND_V(!particles, AABB());
-	return particles->data.visibility_aabb;
-}
-
-void RasterizerGLES2::particles_set_variable(RID p_particles, VS::ParticleVariable p_variable, float p_value) {
-
-	ERR_FAIL_INDEX(p_variable, VS::PARTICLE_VAR_MAX);
-
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND(!particles);
-	particles->data.particle_vars[p_variable] = p_value;
-}
-float RasterizerGLES2::particles_get_variable(RID p_particles, VS::ParticleVariable p_variable) const {
-
-	const Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND_V(!particles, -1);
-	return particles->data.particle_vars[p_variable];
-}
-
-void RasterizerGLES2::particles_set_randomness(RID p_particles, VS::ParticleVariable p_variable, float p_randomness) {
-
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND(!particles);
-	particles->data.particle_randomness[p_variable] = p_randomness;
-}
-float RasterizerGLES2::particles_get_randomness(RID p_particles, VS::ParticleVariable p_variable) const {
-
-	const Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND_V(!particles, -1);
-	return particles->data.particle_randomness[p_variable];
-}
-
-void RasterizerGLES2::particles_set_color_phases(RID p_particles, int p_phases) {
-
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND(!particles);
-	ERR_FAIL_COND(p_phases < 0 || p_phases > VS::MAX_PARTICLE_COLOR_PHASES);
-	particles->data.color_phase_count = p_phases;
-}
-int RasterizerGLES2::particles_get_color_phases(RID p_particles) const {
-
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND_V(!particles, -1);
-	return particles->data.color_phase_count;
-}
-
-void RasterizerGLES2::particles_set_color_phase_pos(RID p_particles, int p_phase, float p_pos) {
-
-	ERR_FAIL_INDEX(p_phase, VS::MAX_PARTICLE_COLOR_PHASES);
-	if (p_pos < 0.0)
-		p_pos = 0.0;
-	if (p_pos > 1.0)
-		p_pos = 1.0;
-
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND(!particles);
-	particles->data.color_phases[p_phase].pos = p_pos;
-}
-float RasterizerGLES2::particles_get_color_phase_pos(RID p_particles, int p_phase) const {
-
-	ERR_FAIL_INDEX_V(p_phase, VS::MAX_PARTICLE_COLOR_PHASES, -1.0);
-
-	const Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND_V(!particles, -1);
-	return particles->data.color_phases[p_phase].pos;
-}
-
-void RasterizerGLES2::particles_set_color_phase_color(RID p_particles, int p_phase, const Color &p_color) {
-
-	ERR_FAIL_INDEX(p_phase, VS::MAX_PARTICLE_COLOR_PHASES);
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND(!particles);
-	particles->data.color_phases[p_phase].color = p_color;
-
-	//update alpha
-	particles->has_alpha = false;
-	for (int i = 0; i < VS::MAX_PARTICLE_COLOR_PHASES; i++) {
-		if (particles->data.color_phases[i].color.a < 0.99)
-			particles->has_alpha = true;
-	}
-}
-
-Color RasterizerGLES2::particles_get_color_phase_color(RID p_particles, int p_phase) const {
-
-	ERR_FAIL_INDEX_V(p_phase, VS::MAX_PARTICLE_COLOR_PHASES, Color());
-
-	const Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND_V(!particles, Color());
-	return particles->data.color_phases[p_phase].color;
-}
-
-void RasterizerGLES2::particles_set_attractors(RID p_particles, int p_attractors) {
-
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND(!particles);
-	ERR_FAIL_COND(p_attractors < 0 || p_attractors > VisualServer::MAX_PARTICLE_ATTRACTORS);
-	particles->data.attractor_count = p_attractors;
-}
-int RasterizerGLES2::particles_get_attractors(RID p_particles) const {
-
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND_V(!particles, -1);
-	return particles->data.attractor_count;
-}
-
-void RasterizerGLES2::particles_set_attractor_pos(RID p_particles, int p_attractor, const Vector3 &p_pos) {
-
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND(!particles);
-	ERR_FAIL_INDEX(p_attractor, particles->data.attractor_count);
-	particles->data.attractors[p_attractor].pos = p_pos;
-}
-Vector3 RasterizerGLES2::particles_get_attractor_pos(RID p_particles, int p_attractor) const {
-
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND_V(!particles, Vector3());
-	ERR_FAIL_INDEX_V(p_attractor, particles->data.attractor_count, Vector3());
-	return particles->data.attractors[p_attractor].pos;
-}
-
-void RasterizerGLES2::particles_set_attractor_strength(RID p_particles, int p_attractor, float p_force) {
-
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND(!particles);
-	ERR_FAIL_INDEX(p_attractor, particles->data.attractor_count);
-	particles->data.attractors[p_attractor].force = p_force;
-}
-
-float RasterizerGLES2::particles_get_attractor_strength(RID p_particles, int p_attractor) const {
-
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND_V(!particles, 0);
-	ERR_FAIL_INDEX_V(p_attractor, particles->data.attractor_count, 0);
-	return particles->data.attractors[p_attractor].force;
-}
-
-void RasterizerGLES2::particles_set_material(RID p_particles, RID p_material, bool p_owned) {
-
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND(!particles);
-	if (particles->material_owned && particles->material.is_valid())
-		free(particles->material);
-
-	particles->material_owned = p_owned;
-
-	particles->material = p_material;
-}
-RID RasterizerGLES2::particles_get_material(RID p_particles) const {
-
-	const Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND_V(!particles, RID());
-	return particles->material;
-}
-
-void RasterizerGLES2::particles_set_use_local_coordinates(RID p_particles, bool p_enable) {
-
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND(!particles);
-	particles->data.local_coordinates = p_enable;
-}
-
-bool RasterizerGLES2::particles_is_using_local_coordinates(RID p_particles) const {
-
-	const Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND_V(!particles, false);
-	return particles->data.local_coordinates;
-}
-bool RasterizerGLES2::particles_has_height_from_velocity(RID p_particles) const {
-
-	const Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND_V(!particles, false);
-	return particles->data.height_from_velocity;
-}
-
-void RasterizerGLES2::particles_set_height_from_velocity(RID p_particles, bool p_enable) {
-
-	Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND(!particles);
-	particles->data.height_from_velocity = p_enable;
-}
-
-AABB RasterizerGLES2::particles_get_aabb(RID p_particles) const {
-
-	const Particles *particles = particles_owner.get(p_particles);
-	ERR_FAIL_COND_V(!particles, AABB());
-	return particles->data.visibility_aabb;
-}
-
-/* SKELETON API */
-
-RID RasterizerGLES2::skeleton_create() {
-
-	Skeleton *skeleton = memnew(Skeleton);
-	ERR_FAIL_COND_V(!skeleton, RID());
-	return skeleton_owner.make_rid(skeleton);
-}
-void RasterizerGLES2::skeleton_resize(RID p_skeleton, int p_bones) {
-
-	Skeleton *skeleton = skeleton_owner.get(p_skeleton);
-	ERR_FAIL_COND(!skeleton);
-	if (p_bones == skeleton->bones.size()) {
-		return;
-	};
-	if (use_hw_skeleton_xform) {
-
-		if (next_power_of_2(p_bones) != next_power_of_2(skeleton->bones.size())) {
-			if (skeleton->tex_id) {
-				glDeleteTextures(1, &skeleton->tex_id);
-				skeleton->tex_id = 0;
-			}
-
-			if (p_bones) {
-
-				glGenTextures(1, &skeleton->tex_id);
-				glActiveTexture(GL_TEXTURE0);
-				glBindTexture(GL_TEXTURE_2D, skeleton->tex_id);
-				int ps = next_power_of_2(p_bones * 3);
-#ifdef GLEW_ENABLED
-				glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, ps, 1, 0, GL_RGBA, GL_FLOAT, skel_default.ptr());
-#else
-				glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, ps, 1, 0, GL_RGBA, GL_FLOAT, skel_default.ptr());
-#endif
-				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-				glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-				glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-				glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-				skeleton->pixel_size = 1.0 / ps;
-
-				glBindTexture(GL_TEXTURE_2D, 0);
-			}
-		}
-
-		if (!skeleton->dirty_list.in_list()) {
-			_skeleton_dirty_list.add(&skeleton->dirty_list);
-		}
-	}
-	skeleton->bones.resize(p_bones);
-}
-int RasterizerGLES2::skeleton_get_bone_count(RID p_skeleton) const {
-
-	Skeleton *skeleton = skeleton_owner.get(p_skeleton);
-	ERR_FAIL_COND_V(!skeleton, -1);
-	return skeleton->bones.size();
-}
-void RasterizerGLES2::skeleton_bone_set_transform(RID p_skeleton, int p_bone, const Transform &p_transform) {
-
-	Skeleton *skeleton = skeleton_owner.get(p_skeleton);
-	ERR_FAIL_COND(!skeleton);
-	ERR_FAIL_INDEX(p_bone, skeleton->bones.size());
-
-	Skeleton::Bone &b = skeleton->bones[p_bone];
-
-	b.mtx[0][0] = p_transform.basis[0][0];
-	b.mtx[0][1] = p_transform.basis[1][0];
-	b.mtx[0][2] = p_transform.basis[2][0];
-	b.mtx[1][0] = p_transform.basis[0][1];
-	b.mtx[1][1] = p_transform.basis[1][1];
-	b.mtx[1][2] = p_transform.basis[2][1];
-	b.mtx[2][0] = p_transform.basis[0][2];
-	b.mtx[2][1] = p_transform.basis[1][2];
-	b.mtx[2][2] = p_transform.basis[2][2];
-	b.mtx[3][0] = p_transform.origin[0];
-	b.mtx[3][1] = p_transform.origin[1];
-	b.mtx[3][2] = p_transform.origin[2];
-
-	if (skeleton->tex_id) {
-		if (!skeleton->dirty_list.in_list()) {
-			_skeleton_dirty_list.add(&skeleton->dirty_list);
-		}
-	}
-}
-
-Transform RasterizerGLES2::skeleton_bone_get_transform(RID p_skeleton, int p_bone) {
-
-	Skeleton *skeleton = skeleton_owner.get(p_skeleton);
-	ERR_FAIL_COND_V(!skeleton, Transform());
-	ERR_FAIL_INDEX_V(p_bone, skeleton->bones.size(), Transform());
-
-	const Skeleton::Bone &b = skeleton->bones[p_bone];
-
-	Transform t;
-	t.basis[0][0] = b.mtx[0][0];
-	t.basis[1][0] = b.mtx[0][1];
-	t.basis[2][0] = b.mtx[0][2];
-	t.basis[0][1] = b.mtx[1][0];
-	t.basis[1][1] = b.mtx[1][1];
-	t.basis[2][1] = b.mtx[1][2];
-	t.basis[0][2] = b.mtx[2][0];
-	t.basis[1][2] = b.mtx[2][1];
-	t.basis[2][2] = b.mtx[2][2];
-	t.origin[0] = b.mtx[3][0];
-	t.origin[1] = b.mtx[3][1];
-	t.origin[2] = b.mtx[3][2];
-
-	return t;
-}
-
-/* LIGHT API */
-
-RID RasterizerGLES2::light_create(VS::LightType p_type) {
-
-	Light *light = memnew(Light);
-	light->type = p_type;
-	return light_owner.make_rid(light);
-}
-
-VS::LightType RasterizerGLES2::light_get_type(RID p_light) const {
-
-	Light *light = light_owner.get(p_light);
-	ERR_FAIL_COND_V(!light, VS::LIGHT_OMNI);
-	return light->type;
-}
-
-void RasterizerGLES2::light_set_color(RID p_light, VS::LightColor p_type, const Color &p_color) {
-
-	Light *light = light_owner.get(p_light);
-	ERR_FAIL_COND(!light);
-	ERR_FAIL_INDEX(p_type, 3);
-	light->colors[p_type] = p_color;
-}
-Color RasterizerGLES2::light_get_color(RID p_light, VS::LightColor p_type) const {
-
-	Light *light = light_owner.get(p_light);
-	ERR_FAIL_COND_V(!light, Color());
-	ERR_FAIL_INDEX_V(p_type, 3, Color());
-	return light->colors[p_type];
-}
-
-void RasterizerGLES2::light_set_shadow(RID p_light, bool p_enabled) {
-
-	Light *light = light_owner.get(p_light);
-	ERR_FAIL_COND(!light);
-	light->shadow_enabled = p_enabled;
-}
-
-bool RasterizerGLES2::light_has_shadow(RID p_light) const {
-
-	Light *light = light_owner.get(p_light);
-	ERR_FAIL_COND_V(!light, false);
-	return light->shadow_enabled;
-}
-
-void RasterizerGLES2::light_set_volumetric(RID p_light, bool p_enabled) {
-
-	Light *light = light_owner.get(p_light);
-	ERR_FAIL_COND(!light);
-	light->volumetric_enabled = p_enabled;
-}
-bool RasterizerGLES2::light_is_volumetric(RID p_light) const {
-
-	Light *light = light_owner.get(p_light);
-	ERR_FAIL_COND_V(!light, false);
-	return light->volumetric_enabled;
-}
-
-void RasterizerGLES2::light_set_projector(RID p_light, RID p_texture) {
-
-	Light *light = light_owner.get(p_light);
-	ERR_FAIL_COND(!light);
-	light->projector = p_texture;
-}
-RID RasterizerGLES2::light_get_projector(RID p_light) const {
-
-	Light *light = light_owner.get(p_light);
-	ERR_FAIL_COND_V(!light, RID());
-	return light->projector;
-}
-
-void RasterizerGLES2::light_set_var(RID p_light, VS::LightParam p_var, float p_value) {
-
-	Light *light = light_owner.get(p_light);
-	ERR_FAIL_COND(!light);
-	ERR_FAIL_INDEX(p_var, VS::LIGHT_PARAM_MAX);
-
-	light->vars[p_var] = p_value;
-}
-float RasterizerGLES2::light_get_var(RID p_light, VS::LightParam p_var) const {
-
-	Light *light = light_owner.get(p_light);
-	ERR_FAIL_COND_V(!light, 0);
-
-	ERR_FAIL_INDEX_V(p_var, VS::LIGHT_PARAM_MAX, 0);
-
-	return light->vars[p_var];
-}
-
-void RasterizerGLES2::light_set_operator(RID p_light, VS::LightOp p_op){
-
-};
-
-VS::LightOp RasterizerGLES2::light_get_operator(RID p_light) const {
-
-	return VS::LightOp();
-};
-
-void RasterizerGLES2::light_omni_set_shadow_mode(RID p_light, VS::LightOmniShadowMode p_mode) {
-
-	Light *light = light_owner.get(p_light);
-	ERR_FAIL_COND(!light);
-
-	light->omni_shadow_mode = p_mode;
-}
-VS::LightOmniShadowMode RasterizerGLES2::light_omni_get_shadow_mode(RID p_light) const {
-
-	const Light *light = light_owner.get(p_light);
-	ERR_FAIL_COND_V(!light, VS::LIGHT_OMNI_SHADOW_DEFAULT);
-
-	return light->omni_shadow_mode;
-}
-
-void RasterizerGLES2::light_directional_set_shadow_mode(RID p_light, VS::LightDirectionalShadowMode p_mode) {
-
-	Light *light = light_owner.get(p_light);
-	ERR_FAIL_COND(!light);
-
-	light->directional_shadow_mode = p_mode;
-}
-
-VS::LightDirectionalShadowMode RasterizerGLES2::light_directional_get_shadow_mode(RID p_light) const {
-
-	const Light *light = light_owner.get(p_light);
-	ERR_FAIL_COND_V(!light, VS::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL);
-
-	return light->directional_shadow_mode;
-}
-
-void RasterizerGLES2::light_directional_set_shadow_param(RID p_light, VS::LightDirectionalShadowParam p_param, float p_value) {
-
-	Light *light = light_owner.get(p_light);
-	ERR_FAIL_COND(!light);
-
-	light->directional_shadow_param[p_param] = p_value;
-}
-
-float RasterizerGLES2::light_directional_get_shadow_param(RID p_light, VS::LightDirectionalShadowParam p_param) const {
-
-	const Light *light = light_owner.get(p_light);
-	ERR_FAIL_COND_V(!light, 0);
-	return light->directional_shadow_param[p_param];
-}
-
-AABB RasterizerGLES2::light_get_aabb(RID p_light) const {
-
-	Light *light = light_owner.get(p_light);
-	ERR_FAIL_COND_V(!light, AABB());
-
-	switch (light->type) {
-
-		case VS::LIGHT_SPOT: {
-
-			float len = light->vars[VS::LIGHT_PARAM_RADIUS];
-			float size = Math::tan(Math::deg2rad(light->vars[VS::LIGHT_PARAM_SPOT_ANGLE])) * len;
-			return AABB(Vector3(-size, -size, -len), Vector3(size * 2, size * 2, len));
-		} break;
-		case VS::LIGHT_OMNI: {
-
-			float r = light->vars[VS::LIGHT_PARAM_RADIUS];
-			return AABB(-Vector3(r, r, r), Vector3(r, r, r) * 2);
-		} break;
-		case VS::LIGHT_DIRECTIONAL: {
-
-			return AABB();
-		} break;
-		default: {}
-	}
-
-	ERR_FAIL_V(AABB());
-}
-
-RID RasterizerGLES2::light_instance_create(RID p_light) {
-
-	Light *light = light_owner.get(p_light);
-	ERR_FAIL_COND_V(!light, RID());
-
-	LightInstance *light_instance = memnew(LightInstance);
-
-	light_instance->light = p_light;
-	light_instance->base = light;
-	light_instance->last_pass = 0;
-
-	return light_instance_owner.make_rid(light_instance);
-}
-void RasterizerGLES2::light_instance_set_transform(RID p_light_instance, const Transform &p_transform) {
-
-	LightInstance *lighti = light_instance_owner.get(p_light_instance);
-	ERR_FAIL_COND(!lighti);
-	lighti->transform = p_transform;
-}
-
-Rasterizer::ShadowType RasterizerGLES2::light_instance_get_shadow_type(RID p_light_instance, bool p_far) const {
-
-	LightInstance *lighti = light_instance_owner.get(p_light_instance);
-	ERR_FAIL_COND_V(!lighti, Rasterizer::SHADOW_NONE);
-
-	switch (lighti->base->type) {
-
-		case VS::LIGHT_DIRECTIONAL: {
-			switch (lighti->base->directional_shadow_mode) {
-				case VS::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL: {
-					return SHADOW_ORTHOGONAL;
-				} break;
-				case VS::LIGHT_DIRECTIONAL_SHADOW_PERSPECTIVE: {
-					return SHADOW_PSM;
-				} break;
-				case VS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS:
-				case VS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_4_SPLITS: {
-					return SHADOW_PSSM;
-				} break;
-			}
-
-		} break;
-		case VS::LIGHT_OMNI: return SHADOW_DUAL_PARABOLOID; break;
-		case VS::LIGHT_SPOT: return SHADOW_SIMPLE; break;
-	}
-
-	return Rasterizer::SHADOW_NONE;
-}
-
-int RasterizerGLES2::light_instance_get_shadow_passes(RID p_light_instance) const {
-
-	LightInstance *lighti = light_instance_owner.get(p_light_instance);
-	ERR_FAIL_COND_V(!lighti, 0);
-
-	if (lighti->base->type == VS::LIGHT_DIRECTIONAL && lighti->base->directional_shadow_mode == VS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_4_SPLITS) {
-
-		return 4; // dp4
-	} else if (lighti->base->type == VS::LIGHT_OMNI || (lighti->base->type == VS::LIGHT_DIRECTIONAL && lighti->base->directional_shadow_mode == VS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS)) {
-		return 2; // dp
-	} else
-		return 1;
-}
-
-bool RasterizerGLES2::light_instance_get_pssm_shadow_overlap(RID p_light_instance) const {
-
-	return shadow_filter >= SHADOW_FILTER_ESM;
-}
-
-void RasterizerGLES2::light_instance_set_shadow_transform(RID p_light_instance, int p_index, const CameraMatrix &p_camera, const Transform &p_transform, float p_split_near, float p_split_far) {
-
-	LightInstance *lighti = light_instance_owner.get(p_light_instance);
-	ERR_FAIL_COND(!lighti);
-
-	ERR_FAIL_COND(lighti->base->type != VS::LIGHT_DIRECTIONAL);
-	//ERR_FAIL_INDEX(p_index,1);
-
-	lighti->custom_projection[p_index] = p_camera;
-	lighti->custom_transform[p_index] = p_transform;
-	lighti->shadow_split[p_index] = 1.0 / p_split_far;
-#if 0
-	if (p_index==0) {
-		lighti->custom_projection=p_camera;
-		lighti->custom_transform=p_transform;
-		//Plane p(0,0,-p_split_far,1);
-		//p=camera_projection.xform4(p);
-		//lighti->shadow_split=p.normal.z/p.d;
-		lighti->shadow_split=1.0/p_split_far;
-
-		//lighti->shadow_split=-p_split_far;
-	} else {
-
-		lighti->custom_projection2=p_camera;
-		lighti->custom_transform2=p_transform;
-		lighti->shadow_split2=p_split_far;
-
-	}
-#endif
-}
-
-int RasterizerGLES2::light_instance_get_shadow_size(RID p_light_instance, int p_index) const {
-
-	LightInstance *lighti = light_instance_owner.get(p_light_instance);
-	ERR_FAIL_COND_V(!lighti, 1);
-	ERR_FAIL_COND_V(!lighti->near_shadow_buffer, 256);
-	return lighti->near_shadow_buffer->size / 2;
-}
-
-void RasterizerGLES2::shadow_clear_near() {
-
-	for (int i = 0; i < near_shadow_buffers.size(); i++) {
-
-		if (near_shadow_buffers[i].owner)
-			near_shadow_buffers[i].owner->clear_near_shadow_buffers();
-	}
-}
-
-bool RasterizerGLES2::shadow_allocate_near(RID p_light) {
-
-	if (!use_shadow_mapping || !use_framebuffers)
-		return false;
-
-	LightInstance *li = light_instance_owner.get(p_light);
-	ERR_FAIL_COND_V(!li, false);
-	ERR_FAIL_COND_V(li->near_shadow_buffer, false);
-
-	int skip = 0;
-	if (framebuffer.active) {
-
-		int sc = framebuffer.scale;
-		while (sc > 1) {
-			sc /= 2;
-			skip++;
-		}
-	}
-
-	for (int i = 0; i < near_shadow_buffers.size(); i++) {
-
-		if (skip > 0) {
-			skip--;
-			continue;
-		}
-
-		if (near_shadow_buffers[i].owner != NULL)
-			continue;
-
-		near_shadow_buffers[i].owner = li;
-		li->near_shadow_buffer = &near_shadow_buffers[i];
-		return true;
-	}
-
-	return false;
-}
-
-bool RasterizerGLES2::shadow_allocate_far(RID p_light) {
-
-	return false;
-}
-
-/* PARTICLES INSTANCE */
-
-RID RasterizerGLES2::particles_instance_create(RID p_particles) {
-
-	ERR_FAIL_COND_V(!particles_owner.owns(p_particles), RID());
-	ParticlesInstance *particles_instance = memnew(ParticlesInstance);
-	ERR_FAIL_COND_V(!particles_instance, RID());
-	particles_instance->particles = p_particles;
-	return particles_instance_owner.make_rid(particles_instance);
-}
-
-void RasterizerGLES2::particles_instance_set_transform(RID p_particles_instance, const Transform &p_transform) {
-
-	ParticlesInstance *particles_instance = particles_instance_owner.get(p_particles_instance);
-	ERR_FAIL_COND(!particles_instance);
-	particles_instance->transform = p_transform;
-}
-
-RID RasterizerGLES2::viewport_data_create() {
-
-	ViewportData *vd = memnew(ViewportData);
-
-	glActiveTexture(GL_TEXTURE0);
-	glGenFramebuffers(1, &vd->lum_fbo);
-	glBindFramebuffer(GL_FRAMEBUFFER, vd->lum_fbo);
-
-	GLuint format_luminance = use_fp16_fb ? _GL_RG_EXT : GL_RGBA;
-	GLuint format_luminance_type = use_fp16_fb ? (full_float_fb_supported ? GL_FLOAT : _GL_HALF_FLOAT_OES) : GL_UNSIGNED_BYTE;
-	GLuint format_luminance_components = use_fp16_fb ? _GL_RG_EXT : GL_RGBA;
-
-	glGenTextures(1, &vd->lum_color);
-	glBindTexture(GL_TEXTURE_2D, vd->lum_color);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-	/*
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, 1, 1, 0,
-			GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-	*/
-	glTexImage2D(GL_TEXTURE_2D, 0, format_luminance, 1, 1, 0,
-			format_luminance_components, format_luminance_type, NULL);
-
-	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-			GL_TEXTURE_2D, vd->lum_color, 0);
-
-	GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-
-	glBindFramebuffer(GL_FRAMEBUFFER, base_framebuffer);
-	DEBUG_TEST_ERROR("Viewport Data Init");
-	if (status != GL_FRAMEBUFFER_COMPLETE) {
-		WARN_PRINT("Can't create framebuffer for vd");
-	}
-
-	return viewport_data_owner.make_rid(vd);
-}
-
-RID RasterizerGLES2::render_target_create() {
-
-	RenderTarget *rt = memnew(RenderTarget);
-	rt->fbo = 0;
-	rt->width = 0;
-	rt->height = 0;
-	rt->last_pass = 0;
-
-	Texture *texture = memnew(Texture);
-	texture->active = false;
-	texture->total_data_size = 0;
-	texture->render_target = rt;
-	texture->ignore_mipmaps = true;
-	rt->texture_ptr = texture;
-	rt->texture = texture_owner.make_rid(texture);
-	rt->texture_ptr->active = false;
-	return render_target_owner.make_rid(rt);
-}
-void RasterizerGLES2::render_target_set_size(RID p_render_target, int p_width, int p_height) {
-
-	RenderTarget *rt = render_target_owner.get(p_render_target);
-
-	if (p_width == rt->width && p_height == rt->height)
-		return;
-
-	if (rt->width != 0 && rt->height != 0) {
-
-		glDeleteFramebuffers(1, &rt->fbo);
-		glDeleteRenderbuffers(1, &rt->depth);
-		glDeleteTextures(1, &rt->color);
-
-		rt->fbo = 0;
-		rt->depth = 0;
-		rt->color = 0;
-		rt->width = 0;
-		rt->height = 0;
-		rt->texture_ptr->tex_id = 0;
-		rt->texture_ptr->active = false;
-	}
-
-	if (p_width == 0 || p_height == 0)
-		return;
-
-	rt->width = p_width;
-	rt->height = p_height;
-
-	//fbo
-	glGenFramebuffers(1, &rt->fbo);
-	glBindFramebuffer(GL_FRAMEBUFFER, rt->fbo);
-
-	//depth
-	if (!low_memory_2d) {
-		glGenRenderbuffers(1, &rt->depth);
-		glBindRenderbuffer(GL_RENDERBUFFER, rt->depth);
-
-		glRenderbufferStorage(GL_RENDERBUFFER, use_depth24 ? _DEPTH_COMPONENT24_OES : GL_DEPTH_COMPONENT16, rt->width, rt->height);
-
-		glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, rt->depth);
-	}
-
-	//color
-	glGenTextures(1, &rt->color);
-	glBindTexture(GL_TEXTURE_2D, rt->color);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, rt->width, rt->height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-
-	if (rt->texture_ptr->flags & VS::TEXTURE_FLAG_FILTER) {
-
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	} else {
-
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-	}
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, rt->color, 0);
-
-	rt->texture_ptr->tex_id = rt->color;
-	rt->texture_ptr->active = true;
-	rt->texture_ptr->width = p_width;
-	rt->texture_ptr->height = p_height;
-
-#
-	GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-
-	if (status != GL_FRAMEBUFFER_COMPLETE) {
-
-		glDeleteRenderbuffers(1, &rt->fbo);
-		glDeleteTextures(1, &rt->depth);
-		glDeleteTextures(1, &rt->color);
-		rt->fbo = 0;
-		rt->width = 0;
-		rt->height = 0;
-		rt->color = 0;
-		rt->depth = 0;
-		rt->texture_ptr->tex_id = 0;
-		rt->texture_ptr->active = false;
-		WARN_PRINT("Could not create framebuffer!!");
-	}
-
-	glBindFramebuffer(GL_FRAMEBUFFER, base_framebuffer);
-}
-
-RID RasterizerGLES2::render_target_get_texture(RID p_render_target) const {
-
-	const RenderTarget *rt = render_target_owner.get(p_render_target);
-	ERR_FAIL_COND_V(!rt, RID());
-	return rt->texture;
-}
-bool RasterizerGLES2::render_target_renedered_in_frame(RID p_render_target) {
-
-	RenderTarget *rt = render_target_owner.get(p_render_target);
-	ERR_FAIL_COND_V(!rt, false);
-	return rt->last_pass == frame;
-}
-
-/* RENDER API */
-/* all calls (inside begin/end shadow) are always warranted to be in the following order: */
-
-void RasterizerGLES2::begin_frame() {
-
-	_update_framebuffer();
-
-	glDepthFunc(GL_LEQUAL);
-	glFrontFace(GL_CW);
-
-//fragment_lighting=Globals::get_singleton()->get("rasterizer/use_fragment_lighting");
-#ifdef TOOLS_ENABLED
-	canvas_shader.set_conditional(CanvasShaderGLES2::USE_PIXEL_SNAP, GLOBAL_DEF("rendering/use_2d_pixel_snap", false));
-	shadow_filter = ShadowFilterTechnique(int(ProjectSettings::get_singleton()->get("rasterizer/shadow_filter")));
-#endif
-
-	canvas_shader.set_conditional(CanvasShaderGLES2::SHADOW_PCF5, shadow_filter == SHADOW_FILTER_PCF5);
-	canvas_shader.set_conditional(CanvasShaderGLES2::SHADOW_PCF13, shadow_filter == SHADOW_FILTER_PCF13);
-	canvas_shader.set_conditional(CanvasShaderGLES2::SHADOW_ESM, shadow_filter == SHADOW_FILTER_ESM);
-
-	window_size = Size2(OS::get_singleton()->get_video_mode().width, OS::get_singleton()->get_video_mode().height);
-
-	double time = (OS::get_singleton()->get_ticks_usec() / 1000); // get msec
-	time /= 1000.0; // make secs
-	time_delta = time - last_time;
-	last_time = time;
-	frame++;
-
-	_rinfo.vertex_count = 0;
-	_rinfo.object_count = 0;
-	_rinfo.mat_change_count = 0;
-	_rinfo.shader_change_count = 0;
-	_rinfo.ci_draw_commands = 0;
-	_rinfo.surface_count = 0;
-	_rinfo.draw_calls = 0;
-
-	_update_fixed_materials();
-	while (_shader_dirty_list.first()) {
-
-		_update_shader(_shader_dirty_list.first()->self());
-	}
-
-	while (_skeleton_dirty_list.first()) {
-
-		Skeleton *s = _skeleton_dirty_list.first()->self();
-
-		float *sk_float = (float *)skinned_buffer;
-		for (int i = 0; i < s->bones.size(); i++) {
-
-			float *m = &sk_float[i * 12];
-			const Skeleton::Bone &b = s->bones[i];
-			m[0] = b.mtx[0][0];
-			m[1] = b.mtx[1][0];
-			m[2] = b.mtx[2][0];
-			m[3] = b.mtx[3][0];
-
-			m[4] = b.mtx[0][1];
-			m[5] = b.mtx[1][1];
-			m[6] = b.mtx[2][1];
-			m[7] = b.mtx[3][1];
-
-			m[8] = b.mtx[0][2];
-			m[9] = b.mtx[1][2];
-			m[10] = b.mtx[2][2];
-			m[11] = b.mtx[3][2];
-		}
-
-		glActiveTexture(GL_TEXTURE0);
-		glBindTexture(GL_TEXTURE_2D, s->tex_id);
-		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, next_power_of_2(s->bones.size() * 3), 1, GL_RGBA, GL_FLOAT, sk_float);
-		_skeleton_dirty_list.remove(_skeleton_dirty_list.first());
-	}
-
-	while (_multimesh_dirty_list.first()) {
-
-		MultiMesh *s = _multimesh_dirty_list.first()->self();
-
-		float *sk_float = (float *)skinned_buffer;
-		for (int i = 0; i < s->elements.size(); i++) {
-
-			float *m = &sk_float[i * 16];
-			const float *im = s->elements[i].matrix;
-			for (int j = 0; j < 16; j++) {
-				m[j] = im[j];
-			}
-		}
-
-		glActiveTexture(GL_TEXTURE0);
-		glBindTexture(GL_TEXTURE_2D, s->tex_id);
-		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, s->tw, s->th, GL_RGBA, GL_FLOAT, sk_float);
-		_multimesh_dirty_list.remove(_multimesh_dirty_list.first());
-	}
-
-	draw_next_frame = false;
-	//material_shader.set_uniform_default(MaterialShaderGLES2::SCREENZ_SCALE, Math::fmod(time, 3600.0));
-	/* nehe ?*/
-
-	//glClearColor(0,0,1,1);
-	//glClear(GL_COLOR_BUFFER_BIT); //should not clear if anything else cleared..
-}
-
-void RasterizerGLES2::capture_viewport(Image *r_capture) {
-#if 0
-	PoolVector<uint8_t> pixels;
-	pixels.resize(viewport.width*viewport.height*3);
-	PoolVector<uint8_t>::Write w = pixels.write();
-#ifdef GLEW_ENABLED
-	glReadBuffer(GL_COLOR_ATTACHMENT0);
-#endif
-	glPixelStorei(GL_PACK_ALIGNMENT, 1);
-	if (current_rt)
-		glReadPixels( 0, 0, viewport.width, viewport.height,GL_RGB,GL_UNSIGNED_BYTE,w.ptr() );
-	else
-		glReadPixels( viewport.x, window_size.height-(viewport.height+viewport.y), viewport.width,viewport.height,GL_RGB,GL_UNSIGNED_BYTE,w.ptr());
-
-	glPixelStorei(GL_PACK_ALIGNMENT, 4);
-
-	w=PoolVector<uint8_t>::Write();
-
-	r_capture->create(viewport.width,viewport.height,0,Image::FORMAT_RGB8,pixels);
-#else
-
-	PoolVector<uint8_t> pixels;
-	pixels.resize(viewport.width * viewport.height * 4);
-	PoolVector<uint8_t>::Write w = pixels.write();
-	glPixelStorei(GL_PACK_ALIGNMENT, 4);
-
-	//uint64_t time = OS::get_singleton()->get_ticks_usec();
-
-	if (current_rt) {
-#ifdef GLEW_ENABLED
-		glReadBuffer(GL_COLOR_ATTACHMENT0);
-#endif
-		glReadPixels(0, 0, viewport.width, viewport.height, GL_RGBA, GL_UNSIGNED_BYTE, w.ptr());
-	} else {
-		// back?
-		glReadPixels(viewport.x, window_size.height - (viewport.height + viewport.y), viewport.width, viewport.height, GL_RGBA, GL_UNSIGNED_BYTE, w.ptr());
-	}
-
-	bool flip = current_rt == NULL;
-
-	if (flip) {
-		uint32_t *imgptr = (uint32_t *)w.ptr();
-		for (int y = 0; y < (viewport.height / 2); y++) {
-
-			uint32_t *ptr1 = &imgptr[y * viewport.width];
-			uint32_t *ptr2 = &imgptr[(viewport.height - y - 1) * viewport.width];
-
-			for (int x = 0; x < viewport.width; x++) {
-
-				uint32_t tmp = ptr1[x];
-				ptr1[x] = ptr2[x];
-				ptr2[x] = tmp;
-			}
-		}
-	}
-
-	w = PoolVector<uint8_t>::Write();
-	r_capture->create(viewport.width, viewport.height, 0, Image::FORMAT_RGBA8, pixels);
-//r_capture->flip_y();
-
-#endif
-}
-
-void RasterizerGLES2::clear_viewport(const Color &p_color) {
-
-	if (current_rt || using_canvas_bg) {
-
-		glScissor(0, 0, viewport.width, viewport.height);
-	} else {
-		glScissor(viewport.x, window_size.height - (viewport.height + viewport.y), viewport.width, viewport.height);
-	}
-
-	glEnable(GL_SCISSOR_TEST);
-	glClearColor(p_color.r, p_color.g, p_color.b, p_color.a);
-	glClear(GL_COLOR_BUFFER_BIT); //should not clear if anything else cleared..
-	glDisable(GL_SCISSOR_TEST);
-};
-
-void RasterizerGLES2::set_render_target(RID p_render_target, bool p_transparent_bg, bool p_vflip) {
-
-	if (!p_render_target.is_valid()) {
-		glBindFramebuffer(GL_FRAMEBUFFER, base_framebuffer);
-		current_rt = NULL;
-		current_rt_vflip = false;
-
-	} else {
-		RenderTarget *rt = render_target_owner.get(p_render_target);
-		ERR_FAIL_COND(!rt);
-		ERR_FAIL_COND(rt->fbo == 0);
-		glBindFramebuffer(GL_FRAMEBUFFER, rt->fbo);
-		current_rt = rt;
-		current_rt_transparent = p_transparent_bg;
-		current_rt_vflip = !p_vflip;
-	}
-}
-
-void RasterizerGLES2::set_viewport(const VS::ViewportRect &p_viewport) {
-
-	viewport = p_viewport;
-	//viewport.width/=2;
-	//viewport.height/=2;
-	//print_line("viewport: "+itos(p_viewport.x)+","+itos(p_viewport.y)+","+itos(p_viewport.width)+","+itos(p_viewport.height));
-
-	if (current_rt) {
-
-		glViewport(0, 0, viewport.width, viewport.height);
-	} else {
-		glViewport(viewport.x, window_size.height - (viewport.height + viewport.y), viewport.width, viewport.height);
-	}
-}
-
-void RasterizerGLES2::begin_scene(RID p_viewport_data, RID p_env, VS::ScenarioDebugMode p_debug) {
-
-	current_debug = p_debug;
-	opaque_render_list.clear();
-	alpha_render_list.clear();
-	light_instance_count = 0;
-	current_env = p_env.is_valid() ? environment_owner.get(p_env) : NULL;
-	scene_pass++;
-	last_light_id = 0;
-	directional_light_count = 0;
-	lights_use_shadow = false;
-	texscreen_used = false;
-	current_vd = viewport_data_owner.get(p_viewport_data);
-	if (current_debug == VS::SCENARIO_DEBUG_WIREFRAME) {
-#ifdef GLEW_ENABLED
-		glPolygonMode(GL_FRONT_AND_BACK, GL_LINE);
-#endif
-	}
-
-	//set state
-
-	glCullFace(GL_FRONT);
-	cull_front = true;
-};
-
-void RasterizerGLES2::begin_shadow_map(RID p_light_instance, int p_shadow_pass) {
-
-	ERR_FAIL_COND(shadow);
-	shadow = light_instance_owner.get(p_light_instance);
-	shadow_pass = p_shadow_pass;
-	ERR_FAIL_COND(!shadow);
-
-	opaque_render_list.clear();
-	alpha_render_list.clear();
-	//pre_zpass_render_list.clear();
-	light_instance_count = 0;
-
-	glCullFace(GL_FRONT);
-	cull_front = true;
-}
-
-void RasterizerGLES2::set_camera(const Transform &p_world, const CameraMatrix &p_projection, bool p_ortho_hint) {
-
-	camera_transform = p_world;
-	if (current_rt && current_rt_vflip) {
-		camera_transform.basis.set_axis(1, -camera_transform.basis.get_axis(1));
-	}
-	camera_transform_inverse = camera_transform.inverse();
-	camera_projection = p_projection;
-	camera_plane = Plane(camera_transform.origin, -camera_transform.basis.get_axis(2));
-	camera_z_near = camera_projection.get_z_near();
-	camera_z_far = camera_projection.get_z_far();
-	camera_projection.get_viewport_size(camera_vp_size.x, camera_vp_size.y);
-	camera_ortho = p_ortho_hint;
-}
-
-void RasterizerGLES2::add_light(RID p_light_instance) {
-
-#define LIGHT_FADE_THRESHOLD 0.05
-
-	ERR_FAIL_COND(light_instance_count >= MAX_SCENE_LIGHTS);
-
-	LightInstance *li = light_instance_owner.get(p_light_instance);
-	ERR_FAIL_COND(!li);
-
-	switch (li->base->type) {
-
-		case VS::LIGHT_DIRECTIONAL: {
-
-			ERR_FAIL_COND(directional_light_count >= RenderList::MAX_LIGHTS);
-			directional_lights[directional_light_count++] = li;
-
-			if (li->base->shadow_enabled) {
-				CameraMatrix bias;
-				bias.set_light_bias();
-
-				int passes = light_instance_get_shadow_passes(p_light_instance);
-
-				for (int i = 0; i < passes; i++) {
-					Transform modelview = Transform(camera_transform_inverse * li->custom_transform[i]).inverse();
-					li->shadow_projection[i] = bias * li->custom_projection[i] * modelview;
-				}
-
-				lights_use_shadow = true;
-			}
-		} break;
-		case VS::LIGHT_OMNI: {
-
-			if (li->base->shadow_enabled) {
-				li->shadow_projection[0] = Transform(camera_transform_inverse * li->transform).inverse();
-				lights_use_shadow = true;
-			}
-		} break;
-		case VS::LIGHT_SPOT: {
-
-			if (li->base->shadow_enabled) {
-				CameraMatrix bias;
-				bias.set_light_bias();
-				Transform modelview = Transform(camera_transform_inverse * li->transform).inverse();
-				li->shadow_projection[0] = bias * li->projection * modelview;
-				lights_use_shadow = true;
-			}
-		} break;
-	}
-
-	/* make light hash */
-
-	// actually, not really a hash, but helps to sort the lights
-	// and avoid recompiling redudant shader versions
-
-	li->last_pass = scene_pass;
-	li->sort_key = light_instance_count;
-
-	light_instances[light_instance_count++] = li;
-}
-
-void RasterizerGLES2::_update_shader(Shader *p_shader) const {
-
-	_shader_dirty_list.remove(&p_shader->dirty_list);
-
-	p_shader->valid = false;
-
-	p_shader->uniforms.clear();
-	Vector<StringName> uniform_names;
-
-	String vertex_code;
-	String vertex_globals;
-	ShaderCompilerGLES2::Flags vertex_flags;
-	ShaderCompilerGLES2::Flags fragment_flags;
-	ShaderCompilerGLES2::Flags light_flags;
-
-	if (p_shader->mode == VS::SHADER_MATERIAL) {
-		Error err = shader_precompiler.compile(p_shader->vertex_code, ShaderLanguage::SHADER_MATERIAL_VERTEX, vertex_code, vertex_globals, vertex_flags, &p_shader->uniforms);
-		if (err) {
-			return; //invalid
-		}
-	} else if (p_shader->mode == VS::SHADER_CANVAS_ITEM) {
-
-		Error err = shader_precompiler.compile(p_shader->vertex_code, ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX, vertex_code, vertex_globals, vertex_flags, &p_shader->uniforms);
-		if (err) {
-			return; //invalid
-		}
-	}
-
-	//print_line("compiled vertex: "+vertex_code);
-	//print_line("compiled vertex globals: "+vertex_globals);
-
-	//print_line("UCV: "+itos(p_shader->uniforms.size()));
-	String fragment_code;
-	String fragment_globals;
-
-	if (p_shader->mode == VS::SHADER_MATERIAL) {
-		Error err = shader_precompiler.compile(p_shader->fragment_code, ShaderLanguage::SHADER_MATERIAL_FRAGMENT, fragment_code, fragment_globals, fragment_flags, &p_shader->uniforms);
-		if (err) {
-			return; //invalid
-		}
-	} else if (p_shader->mode == VS::SHADER_CANVAS_ITEM) {
-		Error err = shader_precompiler.compile(p_shader->fragment_code, ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT, fragment_code, fragment_globals, fragment_flags, &p_shader->uniforms);
-		if (err) {
-			return; //invalid
-		}
-	}
-
-	String light_code;
-	String light_globals;
-
-	if (p_shader->mode == VS::SHADER_MATERIAL) {
-
-		Error err = shader_precompiler.compile(p_shader->light_code, (ShaderLanguage::SHADER_MATERIAL_LIGHT), light_code, light_globals, light_flags, &p_shader->uniforms);
-		if (err) {
-			return; //invalid
-		}
-	} else if (p_shader->mode == VS::SHADER_CANVAS_ITEM) {
-		Error err = shader_precompiler.compile(p_shader->light_code, (ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT), light_code, light_globals, light_flags, &p_shader->uniforms);
-		if (err) {
-			return; //invalid
-		}
-	}
-
-	fragment_globals += light_globals; //both fragment anyway
-
-	//print_line("compiled fragment: "+fragment_code);
-	//("compiled fragment globals: "+fragment_globals);
-
-	//print_line("UCF: "+itos(p_shader->uniforms.size()));
-
-	int first_tex_index = 0xFFFFF;
-	p_shader->first_texture = StringName();
-
-	for (Map<StringName, ShaderLanguage::Uniform>::Element *E = p_shader->uniforms.front(); E; E = E->next()) {
-
-		uniform_names.push_back("_" + String(E->key()));
-		if (E->get().type == ShaderLanguage::TYPE_TEXTURE && E->get().order < first_tex_index) {
-			p_shader->first_texture = E->key();
-			first_tex_index = E->get().order;
-		}
-	}
-
-	bool uses_time = false;
-
-	if (p_shader->mode == VS::SHADER_MATERIAL) {
-		//print_line("setting code to id.. "+itos(p_shader->custom_code_id));
-		Vector<const char *> enablers;
-		if (fragment_flags.use_color_interp || vertex_flags.use_color_interp)
-			enablers.push_back("#define ENABLE_COLOR_INTERP\n");
-		if (fragment_flags.use_uv_interp || vertex_flags.use_uv_interp)
-			enablers.push_back("#define ENABLE_UV_INTERP\n");
-		if (fragment_flags.use_uv2_interp || vertex_flags.use_uv2_interp)
-			enablers.push_back("#define ENABLE_UV2_INTERP\n");
-		if (fragment_flags.use_tangent_interp || vertex_flags.use_tangent_interp || fragment_flags.uses_normalmap)
-			enablers.push_back("#define ENABLE_TANGENT_INTERP\n");
-		if (fragment_flags.use_var1_interp || vertex_flags.use_var1_interp)
-			enablers.push_back("#define ENABLE_VAR1_INTERP\n");
-		if (fragment_flags.use_var2_interp || vertex_flags.use_var2_interp)
-			enablers.push_back("#define ENABLE_VAR2_INTERP\n");
-		if (fragment_flags.uses_texscreen) {
-			enablers.push_back("#define ENABLE_TEXSCREEN\n");
-		}
-		if (fragment_flags.uses_screen_uv) {
-			enablers.push_back("#define ENABLE_SCREEN_UV\n");
-		}
-		if (fragment_flags.uses_discard) {
-			enablers.push_back("#define ENABLE_DISCARD\n");
-		}
-		if (fragment_flags.uses_normalmap) {
-			enablers.push_back("#define ENABLE_NORMALMAP\n");
-		}
-		if (light_flags.uses_light) {
-			enablers.push_back("#define USE_LIGHT_SHADER_CODE\n");
-		}
-		if (light_flags.uses_shadow_color) {
-			enablers.push_back("#define USE_OUTPUT_SHADOW_COLOR\n");
-		}
-		if (light_flags.uses_time || fragment_flags.uses_time || vertex_flags.uses_time) {
-			enablers.push_back("#define USE_TIME\n");
-			uses_time = true;
-		}
-		if (vertex_flags.vertex_code_writes_position) {
-			enablers.push_back("#define VERTEX_SHADER_WRITE_POSITION\n");
-		}
-
-		material_shader.set_custom_shader_code(p_shader->custom_code_id, vertex_code, vertex_globals, fragment_code, light_code, fragment_globals, uniform_names, enablers);
-	} else if (p_shader->mode == VS::SHADER_CANVAS_ITEM) {
-
-		Vector<const char *> enablers;
-
-		if (light_flags.uses_time || fragment_flags.uses_time || vertex_flags.uses_time) {
-			enablers.push_back("#define USE_TIME\n");
-			uses_time = true;
-		}
-		if (fragment_flags.uses_normal) {
-			enablers.push_back("#define NORMAL_USED\n");
-		}
-		if (fragment_flags.uses_normalmap) {
-			enablers.push_back("#define USE_NORMALMAP\n");
-		}
-
-		if (light_flags.uses_light) {
-			enablers.push_back("#define USE_LIGHT_SHADER_CODE\n");
-		}
-		if (fragment_flags.use_var1_interp || vertex_flags.use_var1_interp)
-			enablers.push_back("#define ENABLE_VAR1_INTERP\n");
-		if (fragment_flags.use_var2_interp || vertex_flags.use_var2_interp)
-			enablers.push_back("#define ENABLE_VAR2_INTERP\n");
-		if (fragment_flags.uses_texscreen) {
-			enablers.push_back("#define ENABLE_TEXSCREEN\n");
-		}
-		if (fragment_flags.uses_screen_uv) {
-			enablers.push_back("#define ENABLE_SCREEN_UV\n");
-		}
-		if (fragment_flags.uses_texpixel_size) {
-			enablers.push_back("#define USE_TEXPIXEL_SIZE\n");
-		}
-		if (light_flags.uses_shadow_color) {
-			enablers.push_back("#define USE_OUTPUT_SHADOW_COLOR\n");
-		}
-
-		if (vertex_flags.uses_worldvec) {
-			enablers.push_back("#define USE_WORLD_VEC\n");
-		}
-		canvas_shader.set_custom_shader_code(p_shader->custom_code_id, vertex_code, vertex_globals, fragment_code, light_code, fragment_globals, uniform_names, enablers);
-
-		//postprocess_shader.set_custom_shader_code(p_shader->custom_code_id,vertex_code, vertex_globals,fragment_code, fragment_globals,uniform_names);
-	}
-
-	p_shader->valid = true;
-	p_shader->has_alpha = fragment_flags.uses_alpha || fragment_flags.uses_texscreen;
-	p_shader->writes_vertex = vertex_flags.vertex_code_writes_vertex;
-	p_shader->uses_discard = fragment_flags.uses_discard;
-	p_shader->has_texscreen = fragment_flags.uses_texscreen;
-	p_shader->has_screen_uv = fragment_flags.uses_screen_uv;
-	p_shader->can_zpass = !fragment_flags.uses_discard && !vertex_flags.vertex_code_writes_vertex;
-	p_shader->uses_normal = fragment_flags.uses_normal || light_flags.uses_normal;
-	p_shader->uses_time = uses_time;
-	p_shader->uses_texpixel_size = fragment_flags.uses_texpixel_size;
-	p_shader->version++;
-}
-
-void RasterizerGLES2::_add_geometry(const Geometry *p_geometry, const InstanceData *p_instance, const Geometry *p_geometry_cmp, const GeometryOwner *p_owner, int p_material) {
-
-	Material *m = NULL;
-	RID m_src = p_instance->material_override.is_valid() ? p_instance->material_override : (p_material >= 0 ? p_instance->materials[p_material] : p_geometry->material);
-
-#ifdef DEBUG_ENABLED
-	if (current_debug == VS::SCENARIO_DEBUG_OVERDRAW) {
-		m_src = overdraw_material;
-	}
-
-#endif
-
-	if (m_src)
-		m = material_owner.get(m_src);
-
-	if (!m) {
-		m = material_owner.get(default_material);
-	}
-
-	ERR_FAIL_COND(!m);
-
-	if (m->last_pass != frame) {
-
-		if (m->shader.is_valid()) {
-
-			m->shader_cache = shader_owner.get(m->shader);
-			if (m->shader_cache) {
-
-				if (!m->shader_cache->valid) {
-					m->shader_cache = NULL;
-				} else {
-					if (m->shader_cache->has_texscreen)
-						texscreen_used = true;
-				}
-			} else {
-				m->shader = RID();
-			}
-
-		} else {
-			m->shader_cache = NULL;
-		}
-
-		m->last_pass = frame;
-	}
-
-	RenderList *render_list = NULL;
-
-	bool has_base_alpha = (m->shader_cache && m->shader_cache->has_alpha);
-	bool has_blend_alpha = m->blend_mode != VS::MATERIAL_BLEND_MODE_MIX || m->flags[VS::MATERIAL_FLAG_ONTOP];
-	bool has_alpha = has_base_alpha || has_blend_alpha;
-
-	if (shadow) {
-
-		if (has_blend_alpha || (has_base_alpha && m->depth_draw_mode != VS::MATERIAL_DEPTH_DRAW_OPAQUE_PRE_PASS_ALPHA))
-			return; //bye
-
-		if (!m->shader_cache || (!m->shader_cache->writes_vertex && !m->shader_cache->uses_discard && m->depth_draw_mode != VS::MATERIAL_DEPTH_DRAW_OPAQUE_PRE_PASS_ALPHA)) {
-			//shader does not use discard and does not write a vertex position, use generic material
-			if (p_instance->cast_shadows == VS::SHADOW_CASTING_SETTING_DOUBLE_SIDED)
-				m = shadow_mat_double_sided_ptr;
-			else
-				m = shadow_mat_ptr;
-			if (m->last_pass != frame) {
-
-				if (m->shader.is_valid()) {
-
-					m->shader_cache = shader_owner.get(m->shader);
-					if (m->shader_cache) {
-
-						if (!m->shader_cache->valid)
-							m->shader_cache = NULL;
-					} else {
-						m->shader = RID();
-					}
-
-				} else {
-					m->shader_cache = NULL;
-				}
-
-				m->last_pass = frame;
-			}
-		}
-
-		render_list = &opaque_render_list;
-		/* notyet
-		if (!m->shader_cache || m->shader_cache->can_zpass)
-			render_list = &alpha_render_list;
-		} else {
-			render_list = &opaque_render_list;
-		}*/
-
-	} else {
-		if (has_alpha) {
-			render_list = &alpha_render_list;
-		} else {
-			render_list = &opaque_render_list;
-		}
-	}
-
-	RenderList::Element *e = render_list->add_element();
-
-	if (!e)
-		return;
-
-	e->geometry = p_geometry;
-	e->geometry_cmp = p_geometry_cmp;
-	e->material = m;
-	e->instance = p_instance;
-	if (camera_ortho) {
-		e->depth = camera_plane.distance_to(p_instance->transform.origin);
-	} else {
-		e->depth = camera_transform.origin.distance_to(p_instance->transform.origin);
-	}
-	e->owner = p_owner;
-	e->light_type = 0;
-	e->additive = false;
-	e->additive_ptr = &e->additive;
-	e->sort_flags = 0;
-
-	if (p_instance->skeleton.is_valid()) {
-		e->skeleton = skeleton_owner.get(p_instance->skeleton);
-		if (!e->skeleton)
-			const_cast<InstanceData *>(p_instance)->skeleton = RID();
-		else
-			e->sort_flags |= RenderList::SORT_FLAG_SKELETON;
-	} else {
-		e->skeleton = NULL;
-	}
-
-	if (e->geometry->type == Geometry::GEOMETRY_MULTISURFACE)
-		e->sort_flags |= RenderList::SORT_FLAG_INSTANCING;
-
-	e->mirror = p_instance->mirror;
-	if (m->flags[VS::MATERIAL_FLAG_INVERT_FACES])
-		e->mirror = !e->mirror;
-
-	//e->light_type=0xFF; // no lights!
-	e->light_type = 3; //light type 3 is no light?
-	e->light = 0xFFFF;
-
-	if (!shadow && !has_blend_alpha && has_alpha && m->depth_draw_mode == VS::MATERIAL_DEPTH_DRAW_OPAQUE_PRE_PASS_ALPHA) {
-
-		//if nothing exists, add this element as opaque too
-		RenderList::Element *oe = opaque_render_list.add_element();
-
-		if (!oe)
-			return;
-
-		memcpy(oe, e, sizeof(RenderList::Element));
-		oe->additive_ptr = &oe->additive;
-	}
-
-	if (shadow || m->flags[VS::MATERIAL_FLAG_UNSHADED] || current_debug == VS::SCENARIO_DEBUG_SHADELESS) {
-
-		e->light_type = 0x7F; //unshaded is zero
-	} else {
-
-		bool duplicate = false;
-
-		for (int i = 0; i < directional_light_count; i++) {
-			uint16_t sort_key = directional_lights[i]->sort_key;
-			uint8_t light_type = VS::LIGHT_DIRECTIONAL;
-			if (directional_lights[i]->base->shadow_enabled) {
-				light_type |= 0x8;
-				if (directional_lights[i]->base->directional_shadow_mode == VS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS)
-					light_type |= 0x10;
-				else if (directional_lights[i]->base->directional_shadow_mode == VS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_4_SPLITS)
-					light_type |= 0x30;
-			}
-
-			RenderList::Element *ec;
-			if (duplicate) {
-
-				ec = render_list->add_element();
-				memcpy(ec, e, sizeof(RenderList::Element));
-			} else {
-
-				ec = e;
-				duplicate = true;
-			}
-
-			ec->light_type = light_type;
-			ec->light = sort_key;
-			ec->additive_ptr = &e->additive;
-		}
-
-		const RID *liptr = p_instance->light_instances.ptr();
-		int ilc = p_instance->light_instances.size();
-
-		for (int i = 0; i < ilc; i++) {
-
-			LightInstance *li = light_instance_owner.get(liptr[i]);
-			if (!li || li->last_pass != scene_pass) //lit by light not in visible scene
-				continue;
-			uint8_t light_type = li->base->type | 0x40; //penalty to ensure directionals always go first
-			if (li->base->shadow_enabled) {
-				light_type |= 0x8;
-			}
-			uint16_t sort_key = li->sort_key;
-
-			RenderList::Element *ec;
-			if (duplicate) {
-
-				ec = render_list->add_element();
-				memcpy(ec, e, sizeof(RenderList::Element));
-			} else {
-
-				duplicate = true;
-				ec = e;
-			}
-
-			ec->light_type = light_type;
-			ec->light = sort_key;
-			ec->additive_ptr = &e->additive;
-		}
-	}
-
-	DEBUG_TEST_ERROR("Add Geometry");
-}
-
-void RasterizerGLES2::add_mesh(const RID &p_mesh, const InstanceData *p_data) {
-
-	Mesh *mesh = mesh_owner.get(p_mesh);
-	ERR_FAIL_COND(!mesh);
-
-	int ssize = mesh->surfaces.size();
-
-	for (int i = 0; i < ssize; i++) {
-
-		int mat_idx = p_data->materials[i].is_valid() ? i : -1;
-		Surface *s = mesh->surfaces[i];
-		_add_geometry(s, p_data, s, NULL, mat_idx);
-	}
-
-	mesh->last_pass = frame;
-}
-
-void RasterizerGLES2::add_multimesh(const RID &p_multimesh, const InstanceData *p_data) {
-
-	MultiMesh *multimesh = multimesh_owner.get(p_multimesh);
-	ERR_FAIL_COND(!multimesh);
-
-	if (!multimesh->mesh.is_valid())
-		return;
-	if (multimesh->elements.empty())
-		return;
-
-	Mesh *mesh = mesh_owner.get(multimesh->mesh);
-	ERR_FAIL_COND(!mesh);
-
-	int surf_count = mesh->surfaces.size();
-	if (multimesh->last_pass != scene_pass) {
-
-		multimesh->cache_surfaces.resize(surf_count);
-		for (int i = 0; i < surf_count; i++) {
-
-			multimesh->cache_surfaces[i].material = mesh->surfaces[i]->material;
-			multimesh->cache_surfaces[i].has_alpha = mesh->surfaces[i]->has_alpha;
-			multimesh->cache_surfaces[i].surface = mesh->surfaces[i];
-		}
-
-		multimesh->last_pass = scene_pass;
-	}
-
-	for (int i = 0; i < surf_count; i++) {
-
-		_add_geometry(&multimesh->cache_surfaces[i], p_data, multimesh->cache_surfaces[i].surface, multimesh);
-	}
-}
-
-void RasterizerGLES2::add_immediate(const RID &p_immediate, const InstanceData *p_data) {
-
-	Immediate *immediate = immediate_owner.get(p_immediate);
-	ERR_FAIL_COND(!immediate);
-
-	_add_geometry(immediate, p_data, immediate, NULL);
-}
-
-void RasterizerGLES2::add_particles(const RID &p_particle_instance, const InstanceData *p_data) {
-
-	//print_line("adding particles");
-	ParticlesInstance *particles_instance = particles_instance_owner.get(p_particle_instance);
-	ERR_FAIL_COND(!particles_instance);
-	Particles *p = particles_owner.get(particles_instance->particles);
-	ERR_FAIL_COND(!p);
-
-	_add_geometry(p, p_data, p, particles_instance);
-	draw_next_frame = true;
-}
-
-Color RasterizerGLES2::_convert_color(const Color &p_color) {
-
-	if (current_env && current_env->fx_enabled[VS::ENV_FX_SRGB])
-		return p_color.to_linear();
-	else
-		return p_color;
-}
-
-void RasterizerGLES2::_set_cull(bool p_front, bool p_reverse_cull) {
-
-	bool front = p_front;
-	if (p_reverse_cull)
-		front = !front;
-
-	if (front != cull_front) {
-
-		glCullFace(front ? GL_FRONT : GL_BACK);
-		cull_front = front;
-	}
-}
-
-_FORCE_INLINE_ void RasterizerGLES2::_update_material_shader_params(Material *p_material) const {
-
-	Map<StringName, Material::UniformData> old_mparams = p_material->shader_params;
-	Map<StringName, Material::UniformData> &mparams = p_material->shader_params;
-	mparams.clear();
-	int idx = 0;
-	for (Map<StringName, ShaderLanguage::Uniform>::Element *E = p_material->shader_cache->uniforms.front(); E; E = E->next()) {
-
-		Material::UniformData ud;
-
-		bool keep = true; //keep material value
-
-		Map<StringName, Material::UniformData>::Element *OLD = old_mparams.find(E->key());
-		bool has_old = OLD;
-		bool old_inuse = has_old && old_mparams[E->key()].inuse;
-
-		ud.istexture = (E->get().type == ShaderLanguage::TYPE_TEXTURE || E->get().type == ShaderLanguage::TYPE_CUBEMAP);
-
-		if (!has_old || !old_inuse) {
-			keep = false;
-		} else if (OLD->get().value.get_type() != E->value().default_value.get_type()) {
-
-			if (OLD->get().value.get_type() == Variant::INT && E->get().type == ShaderLanguage::TYPE_FLOAT) {
-				//handle common mistake using shaders (feeding ints instead of float)
-				OLD->get().value = float(OLD->get().value);
-				keep = true;
-			} else if (!ud.istexture && E->value().default_value.get_type() != Variant::NIL) {
-
-				keep = false;
-			}
-			//type changed between old and new
-			/*	if (old_mparams[E->key()].value.get_type()==Variant::OBJECT) {
-				if (E->value().default_value.get_type()!=Variant::_RID) //hackfor textures
-					keep=false;
-			} else if (!old_mparams[E->key()].value.is_num() || !E->value().default_value.get_type())
-				keep=false;*/
-
-			//value is invalid because type differs and default is not null
-			;
-		}
-
-		if (keep) {
-			ud.value = old_mparams[E->key()].value;
-
-			//print_line("KEEP: "+String(E->key()));
-		} else {
-			if (ud.istexture && p_material->shader_cache->default_textures.has(E->key()))
-				ud.value = p_material->shader_cache->default_textures[E->key()];
-			else
-				ud.value = E->value().default_value;
-			old_inuse = false; //if reverted to default, obviously did not work
-
-			/*
-			print_line("NEW: "+String(E->key())+" because: hasold-"+itos(old_mparams.has(E->key())));
-			if (old_mparams.has(E->key()))
-				print_line(" told "+Variant::get_type_name(old_mparams[E->key()].value.get_type())+" tnew "+Variant::get_type_name(E->value().default_value.get_type()));
-			*/
-		}
-
-		ud.index = idx++;
-		ud.inuse = old_inuse;
-		mparams[E->key()] = ud;
-	}
-
-	p_material->shader_version = p_material->shader_cache->version;
-}
-
-bool RasterizerGLES2::_setup_material(const Geometry *p_geometry, const Material *p_material, bool p_no_const_light, bool p_opaque_pass) {
-
-	if (p_material->flags[VS::MATERIAL_FLAG_DOUBLE_SIDED]) {
-		glDisable(GL_CULL_FACE);
-	} else {
-		glEnable(GL_CULL_FACE);
-	}
-
-	//glPolygonMode(GL_FRONT_AND_BACK,GL_LINE);
-
-	/*
-	if (p_material->flags[VS::MATERIAL_FLAG_WIREFRAME])
-		glPolygonMode(GL_FRONT_AND_BACK,GL_LINE);
-	else
-		glPolygonMode(GL_FRONT_AND_BACK,GL_FILL);
-	*/
-
-	if (p_material->line_width)
-		glLineWidth(p_material->line_width);
-
-	//all goes to false by default
-	material_shader.set_conditional(MaterialShaderGLES2::USE_SHADOW_PASS, shadow != NULL);
-	material_shader.set_conditional(MaterialShaderGLES2::USE_SHADOW_PCF, shadow_filter == SHADOW_FILTER_PCF5 || shadow_filter == SHADOW_FILTER_PCF13);
-	material_shader.set_conditional(MaterialShaderGLES2::USE_SHADOW_PCF_HQ, shadow_filter == SHADOW_FILTER_PCF13);
-	material_shader.set_conditional(MaterialShaderGLES2::USE_SHADOW_ESM, shadow_filter == SHADOW_FILTER_ESM);
-	material_shader.set_conditional(MaterialShaderGLES2::USE_LIGHTMAP_ON_UV2, p_material->flags[VS::MATERIAL_FLAG_LIGHTMAP_ON_UV2]);
-	material_shader.set_conditional(MaterialShaderGLES2::USE_COLOR_ATTRIB_SRGB_TO_LINEAR, p_material->flags[VS::MATERIAL_FLAG_COLOR_ARRAY_SRGB] && current_env && current_env->fx_enabled[VS::ENV_FX_SRGB]);
-
-	if (p_opaque_pass && p_material->depth_draw_mode == VS::MATERIAL_DEPTH_DRAW_OPAQUE_PRE_PASS_ALPHA && p_material->shader_cache && p_material->shader_cache->has_alpha) {
-
-		material_shader.set_conditional(MaterialShaderGLES2::ENABLE_CLIP_ALPHA, true);
-	} else {
-		material_shader.set_conditional(MaterialShaderGLES2::ENABLE_CLIP_ALPHA, false);
-	}
-
-	if (!shadow) {
-
-		bool depth_test = !p_material->flags[VS::MATERIAL_FLAG_ONTOP];
-		bool depth_write = p_material->depth_draw_mode != VS::MATERIAL_DEPTH_DRAW_NEVER && (p_opaque_pass || p_material->depth_draw_mode == VS::MATERIAL_DEPTH_DRAW_ALWAYS);
-		//bool depth_write=!p_material->hints[VS::MATERIAL_HINT_NO_DEPTH_DRAW] && (p_opaque_pass || !p_material->hints[VS::MATERIAL_HINT_NO_DEPTH_DRAW_FOR_ALPHA]);
-
-		if (current_depth_mask != depth_write) {
-			current_depth_mask = depth_write;
-			glDepthMask(depth_write);
-		}
-
-		if (current_depth_test != depth_test) {
-
-			current_depth_test = depth_test;
-			if (depth_test)
-				glEnable(GL_DEPTH_TEST);
-			else
-				glDisable(GL_DEPTH_TEST);
-		}
-
-		material_shader.set_conditional(MaterialShaderGLES2::USE_FOG, current_env && current_env->fx_enabled[VS::ENV_FX_FOG]);
-		//glDepthMask( true );
-	}
-
-	DEBUG_TEST_ERROR("Pre Shader Bind");
-
-	bool rebind = false;
-
-	if (p_material->shader_cache && p_material->shader_cache->valid) {
-
-		/*
-		// reduce amount of conditional compilations
-		for(int i=0;i<_tex_version_count;i++)
-			material_shader.set_conditional((MaterialShaderGLES2::Conditionals)_tex_version[i],false);
-		*/
-
-		//material_shader.set_custom_shader(p_material->shader_cache->custom_code_id);
-
-		if (p_material->shader_version != p_material->shader_cache->version) {
-			//shader changed somehow, must update uniforms
-
-			_update_material_shader_params((Material *)p_material);
-		}
-		material_shader.set_custom_shader(p_material->shader_cache->custom_code_id);
-		rebind = material_shader.bind();
-
-		DEBUG_TEST_ERROR("Shader Bind");
-
-		//set uniforms!
-		int texcoord = 0;
-		for (Map<StringName, Material::UniformData>::Element *E = p_material->shader_params.front(); E; E = E->next()) {
-
-			if (E->get().index < 0)
-				continue;
-			//print_line(String(E->key())+": "+E->get().value);
-			if (E->get().istexture) {
-				//clearly a texture..
-				RID rid = E->get().value;
-				int loc = material_shader.get_custom_uniform_location(E->get().index); //should be automatic..
-
-				Texture *t = NULL;
-				if (rid.is_valid()) {
-
-					t = texture_owner.get(rid);
-					if (!t) {
-						E->get().value = RID(); //nullify, invalid texture
-						rid = RID();
-					}
-				}
-
-				glActiveTexture(GL_TEXTURE0 + texcoord);
-				glUniform1i(loc, texcoord); //TODO - this could happen automatically on compile...
-				if (t) {
-					if (t->render_target)
-						t->render_target->last_pass = frame;
-					if (E->key() == p_material->shader_cache->first_texture) {
-						tc0_idx = texcoord;
-						tc0_id_cache = t->tex_id;
-					}
-					glBindTexture(t->target, t->tex_id);
-				} else
-					glBindTexture(GL_TEXTURE_2D, white_tex); //no texture
-				texcoord++;
-
-			} else if (E->get().value.get_type() == Variant::COLOR) {
-				Color c = E->get().value;
-				material_shader.set_custom_uniform(E->get().index, _convert_color(c));
-			} else {
-				material_shader.set_custom_uniform(E->get().index, E->get().value);
-			}
-		}
-
-		if (p_material->shader_cache->has_texscreen && framebuffer.active) {
-			material_shader.set_uniform(MaterialShaderGLES2::TEXSCREEN_SCREEN_MULT, Vector2(float(viewport.width) / framebuffer.width, float(viewport.height) / framebuffer.height));
-			material_shader.set_uniform(MaterialShaderGLES2::TEXSCREEN_SCREEN_CLAMP, Color(0, 0, float(viewport.width) / framebuffer.width, float(viewport.height) / framebuffer.height));
-			material_shader.set_uniform(MaterialShaderGLES2::TEXSCREEN_TEX, texcoord);
-			glActiveTexture(GL_TEXTURE0 + texcoord);
-			glBindTexture(GL_TEXTURE_2D, framebuffer.sample_color);
-		}
-		if (p_material->shader_cache->has_screen_uv) {
-			material_shader.set_uniform(MaterialShaderGLES2::SCREEN_UV_MULT, Vector2(1.0 / viewport.width, 1.0 / viewport.height));
-		}
-		DEBUG_TEST_ERROR("Material arameters");
-
-		if (p_material->shader_cache->uses_time) {
-			material_shader.set_uniform(MaterialShaderGLES2::TIME, Math::fmod(last_time, shader_time_rollback));
-			draw_next_frame = true;
-		}
-		//if uses TIME - draw_next_frame=true
-
-	} else {
-
-		material_shader.set_custom_shader(0);
-		rebind = material_shader.bind();
-
-		DEBUG_TEST_ERROR("Shader bind2");
-	}
-
-	if (shadow) {
-
-		float zofs = shadow->base->vars[VS::LIGHT_PARAM_SHADOW_Z_OFFSET];
-		float zslope = shadow->base->vars[VS::LIGHT_PARAM_SHADOW_Z_SLOPE_SCALE];
-		if (shadow_pass >= 1 && shadow->base->type == VS::LIGHT_DIRECTIONAL) {
-			float m = Math::pow(shadow->base->directional_shadow_param[VS::LIGHT_DIRECTIONAL_SHADOW_PARAM_PSSM_ZOFFSET_SCALE], shadow_pass);
-			zofs *= m;
-			zslope *= m;
-		}
-		material_shader.set_uniform(MaterialShaderGLES2::SHADOW_Z_OFFSET, zofs);
-		material_shader.set_uniform(MaterialShaderGLES2::SHADOW_Z_SLOPE_SCALE, zslope);
-		if (shadow->base->type == VS::LIGHT_OMNI)
-			material_shader.set_uniform(MaterialShaderGLES2::DUAL_PARABOLOID, shadow->dp);
-		DEBUG_TEST_ERROR("Shadow uniforms");
-	}
-
-	if (current_env && current_env->fx_enabled[VS::ENV_FX_FOG]) {
-
-		Color col_begin = current_env->fx_param[VS::ENV_FX_PARAM_FOG_BEGIN_COLOR];
-		Color col_end = current_env->fx_param[VS::ENV_FX_PARAM_FOG_END_COLOR];
-		col_begin = _convert_color(col_begin);
-		col_end = _convert_color(col_end);
-		float from = current_env->fx_param[VS::ENV_FX_PARAM_FOG_BEGIN];
-		float zf = camera_z_far;
-		float curve = current_env->fx_param[VS::ENV_FX_PARAM_FOG_ATTENUATION];
-		material_shader.set_uniform(MaterialShaderGLES2::FOG_PARAMS, Vector3(from, zf, curve));
-		material_shader.set_uniform(MaterialShaderGLES2::FOG_COLOR_BEGIN, Vector3(col_begin.r, col_begin.g, col_begin.b));
-		material_shader.set_uniform(MaterialShaderGLES2::FOG_COLOR_END, Vector3(col_end.r, col_end.g, col_end.b));
-	}
-
-	//material_shader.set_uniform(MaterialShaderGLES2::TIME,Math::fmod(last_time,300.0));
-	//if uses TIME - draw_next_frame=true
-
-	return rebind;
-}
-
-void RasterizerGLES2::_setup_light(uint16_t p_light) {
-
-	if (shadow)
-		return;
-
-	if (p_light == 0xFFFF)
-		return;
-
-	enum {
-		VL_LIGHT_POS,
-		VL_LIGHT_DIR,
-		VL_LIGHT_ATTENUATION,
-		VL_LIGHT_SPOT_ATTENUATION,
-		VL_LIGHT_DIFFUSE,
-		VL_LIGHT_SPECULAR,
-		VL_LIGHT_MAX
-	};
-
-	static const MaterialShaderGLES2::Uniforms light_uniforms[VL_LIGHT_MAX] = {
-		MaterialShaderGLES2::LIGHT_POS,
-		MaterialShaderGLES2::LIGHT_DIRECTION,
-		MaterialShaderGLES2::LIGHT_ATTENUATION,
-		MaterialShaderGLES2::LIGHT_SPOT_ATTENUATION,
-		MaterialShaderGLES2::LIGHT_DIFFUSE,
-		MaterialShaderGLES2::LIGHT_SPECULAR,
-	};
-
-	GLfloat light_data[VL_LIGHT_MAX][3];
-	memset(light_data, 0, (VL_LIGHT_MAX)*3 * sizeof(GLfloat));
-
-	LightInstance *li = light_instances[p_light];
-	Light *l = li->base;
-
-	Color col_diffuse = _convert_color(l->colors[VS::LIGHT_COLOR_DIFFUSE]);
-	Color col_specular = _convert_color(l->colors[VS::LIGHT_COLOR_SPECULAR]);
-
-	for (int j = 0; j < 3; j++) {
-		light_data[VL_LIGHT_DIFFUSE][j] = col_diffuse[j];
-		light_data[VL_LIGHT_SPECULAR][j] = col_specular[j];
-	}
-
-	if (l->type != VS::LIGHT_OMNI) {
-
-		Vector3 dir = -li->transform.get_basis().get_axis(2);
-		dir = camera_transform_inverse.basis.xform(dir).normalized();
-		for (int j = 0; j < 3; j++)
-			light_data[VL_LIGHT_DIR][j] = dir[j];
-	}
-
-	if (l->type != VS::LIGHT_DIRECTIONAL) {
-
-		Vector3 pos = li->transform.get_origin();
-		pos = camera_transform_inverse.xform(pos);
-		for (int j = 0; j < 3; j++)
-			light_data[VL_LIGHT_POS][j] = pos[j];
-	}
-
-	if (li->near_shadow_buffer) {
-
-		glActiveTexture(GL_TEXTURE0 + max_texture_units - 1);
-		glBindTexture(GL_TEXTURE_2D, li->near_shadow_buffer->depth);
-
-		material_shader.set_uniform(MaterialShaderGLES2::SHADOW_MATRIX, li->shadow_projection[0]);
-		material_shader.set_uniform(MaterialShaderGLES2::SHADOW_TEXEL_SIZE, Vector2(1.0, 1.0) / li->near_shadow_buffer->size);
-		material_shader.set_uniform(MaterialShaderGLES2::SHADOW_TEXTURE, max_texture_units - 1);
-		if (shadow_filter == SHADOW_FILTER_ESM)
-			material_shader.set_uniform(MaterialShaderGLES2::ESM_MULTIPLIER, float(li->base->vars[VS::LIGHT_PARAM_SHADOW_ESM_MULTIPLIER]));
-
-		if (li->base->type == VS::LIGHT_DIRECTIONAL) {
-
-			if (li->base->directional_shadow_mode == VS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS) {
-
-				material_shader.set_uniform(MaterialShaderGLES2::SHADOW_MATRIX2, li->shadow_projection[1]);
-				material_shader.set_uniform(MaterialShaderGLES2::LIGHT_PSSM_SPLIT, Vector3(li->shadow_split[0], li->shadow_split[1], li->shadow_split[2]));
-			} else if (li->base->directional_shadow_mode == VS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_4_SPLITS) {
-
-				material_shader.set_uniform(MaterialShaderGLES2::SHADOW_MATRIX2, li->shadow_projection[1]);
-				material_shader.set_uniform(MaterialShaderGLES2::SHADOW_MATRIX3, li->shadow_projection[2]);
-				material_shader.set_uniform(MaterialShaderGLES2::SHADOW_MATRIX4, li->shadow_projection[3]);
-				material_shader.set_uniform(MaterialShaderGLES2::LIGHT_PSSM_SPLIT, Vector3(li->shadow_split[0], li->shadow_split[1], li->shadow_split[2]));
-			}
-			//print_line("shadow split: "+rtos(li->shadow_split));
-		}
-
-		material_shader.set_uniform(MaterialShaderGLES2::SHADOW_DARKENING, li->base->vars[VS::LIGHT_PARAM_SHADOW_DARKENING]);
-		//matrix
-	}
-
-	light_data[VL_LIGHT_ATTENUATION][0] = l->vars[VS::LIGHT_PARAM_ENERGY];
-
-	if (l->type == VS::LIGHT_DIRECTIONAL) {
-		light_data[VL_LIGHT_ATTENUATION][1] = l->directional_shadow_param[VS::LIGHT_DIRECTIONAL_SHADOW_PARAM_MAX_DISTANCE];
-	} else {
-		light_data[VL_LIGHT_ATTENUATION][1] = l->vars[VS::LIGHT_PARAM_RADIUS];
-	}
-
-	light_data[VL_LIGHT_ATTENUATION][2] = l->vars[VS::LIGHT_PARAM_ATTENUATION];
-
-	light_data[VL_LIGHT_SPOT_ATTENUATION][0] = Math::cos(Math::deg2rad(l->vars[VS::LIGHT_PARAM_SPOT_ANGLE]));
-	light_data[VL_LIGHT_SPOT_ATTENUATION][1] = l->vars[VS::LIGHT_PARAM_SPOT_ATTENUATION];
-
-	//int uf = material_shader.get_uniform(MaterialShaderGLES2::LIGHT_PARAMS);
-	for (int i = 0; i < VL_LIGHT_MAX; i++) {
-		glUniform3f(material_shader.get_uniform(light_uniforms[i]), light_data[i][0], light_data[i][1], light_data[i][2]);
-	}
-}
-
-template <bool USE_NORMAL, bool USE_TANGENT, bool INPLACE>
-void RasterizerGLES2::_skeleton_xform(const uint8_t *p_src_array, int p_src_stride, uint8_t *p_dst_array, int p_dst_stride, int p_elements, const uint8_t *p_src_bones, const uint8_t *p_src_weights, const Skeleton::Bone *p_bone_xforms) {
-
-	uint32_t basesize = 3;
-	if (USE_NORMAL)
-		basesize += 3;
-	if (USE_TANGENT)
-		basesize += 4;
-
-	uint32_t extra = (p_dst_stride - basesize * 4);
-	const int dstvec_size = 3 + (USE_NORMAL ? 3 : 0) + (USE_TANGENT ? 4 : 0);
-	float dstcopy[dstvec_size];
-
-	for (int i = 0; i < p_elements; i++) {
-
-		uint32_t ss = p_src_stride * i;
-		uint32_t ds = p_dst_stride * i;
-		const uint16_t *bi = (const uint16_t *)&p_src_bones[ss];
-		const float *bw = (const float *)&p_src_weights[ss];
-		const float *src_vec = (const float *)&p_src_array[ss];
-		float *dst_vec;
-		if (INPLACE)
-			dst_vec = dstcopy;
-		else
-			dst_vec = (float *)&p_dst_array[ds];
-
-		dst_vec[0] = 0.0;
-		dst_vec[1] = 0.0;
-		dst_vec[2] = 0.0;
-		//conditionals simply removed by optimizer
-		if (USE_NORMAL) {
-
-			dst_vec[3] = 0.0;
-			dst_vec[4] = 0.0;
-			dst_vec[5] = 0.0;
-
-			if (USE_TANGENT) {
-
-				dst_vec[6] = 0.0;
-				dst_vec[7] = 0.0;
-				dst_vec[8] = 0.0;
-				dst_vec[9] = src_vec[9];
-			}
-		} else {
-
-			if (USE_TANGENT) {
-
-				dst_vec[3] = 0.0;
-				dst_vec[4] = 0.0;
-				dst_vec[5] = 0.0;
-				dst_vec[6] = src_vec[6];
-			}
-		}
-
-#define _XFORM_BONE(m_idx)                                                                     \
-	if (bw[m_idx] == 0)                                                                        \
-		goto end;                                                                              \
-	p_bone_xforms[bi[m_idx]].transform_add_mul3(&src_vec[0], &dst_vec[0], bw[m_idx]);          \
-	if (USE_NORMAL) {                                                                          \
-		p_bone_xforms[bi[m_idx]].transform3_add_mul3(&src_vec[3], &dst_vec[3], bw[m_idx]);     \
-		if (USE_TANGENT) {                                                                     \
-			p_bone_xforms[bi[m_idx]].transform3_add_mul3(&src_vec[6], &dst_vec[6], bw[m_idx]); \
-		}                                                                                      \
-	} else {                                                                                   \
-		if (USE_TANGENT) {                                                                     \
-			p_bone_xforms[bi[m_idx]].transform3_add_mul3(&src_vec[3], &dst_vec[3], bw[m_idx]); \
-		}                                                                                      \
-	}
-
-		_XFORM_BONE(0);
-		_XFORM_BONE(1);
-		_XFORM_BONE(2);
-		_XFORM_BONE(3);
-
-	end:
-
-		if (INPLACE) {
-
-			const uint8_t *esp = (const uint8_t *)dstcopy;
-			uint8_t *edp = (uint8_t *)&p_dst_array[ds];
-
-			for (uint32_t j = 0; j < dstvec_size * 4; j++) {
-
-				edp[j] = esp[j];
-			}
-
-		} else {
-			//copy extra stuff
-			const uint8_t *esp = (const uint8_t *)&src_vec[basesize];
-			uint8_t *edp = (uint8_t *)&dst_vec[basesize];
-
-			for (uint32_t j = 0; j < extra; j++) {
-
-				edp[j] = esp[j];
-			}
-		}
-	}
-}
-
-Error RasterizerGLES2::_setup_geometry(const Geometry *p_geometry, const Material *p_material, const Skeleton *p_skeleton, const float *p_morphs) {
-
-	switch (p_geometry->type) {
-
-		case Geometry::GEOMETRY_MULTISURFACE:
-		case Geometry::GEOMETRY_SURFACE: {
-
-			const Surface *surf = NULL;
-			if (p_geometry->type == Geometry::GEOMETRY_SURFACE)
-				surf = static_cast<const Surface *>(p_geometry);
-			else if (p_geometry->type == Geometry::GEOMETRY_MULTISURFACE)
-				surf = static_cast<const MultiMeshSurface *>(p_geometry)->surface;
-
-			if (surf->format != surf->configured_format) {
-				if (OS::get_singleton()->is_stdout_verbose()) {
-
-					print_line("has format: " + itos(surf->format));
-					print_line("configured format: " + itos(surf->configured_format));
-				}
-				ERR_EXPLAIN("Missing arrays (not set) in surface");
-			}
-			ERR_FAIL_COND_V(surf->format != surf->configured_format, ERR_UNCONFIGURED);
-			uint8_t *base = 0;
-			int stride = surf->stride;
-			bool use_VBO = (surf->array_local == 0);
-			_setup_geometry_vinfo = surf->array_len;
-
-			bool skeleton_valid = p_skeleton && (surf->format & VS::ARRAY_FORMAT_BONES) && (surf->format & VS::ARRAY_FORMAT_WEIGHTS) && !p_skeleton->bones.empty() && p_skeleton->bones.size() > surf->max_bone;
-			/*
-			if (surf->packed) {
-				float scales[4]={surf->vertex_scale,surf->uv_scale,surf->uv2_scale,0.0};
-				glVertexAttrib4fv( 7, scales );
-			} else {
-				glVertexAttrib4f( 7, 1,1,1,1 );
-
-			}*/
-
-			if (!use_VBO) {
-
-				DEBUG_TEST_ERROR("Draw NO VBO");
-
-				base = surf->array_local;
-				glBindBuffer(GL_ARRAY_BUFFER, 0);
-				bool can_copy_to_local = surf->local_stride * surf->array_len <= skinned_buffer_size;
-				if (p_morphs && surf->stride * surf->array_len > skinned_buffer_size)
-					can_copy_to_local = false;
-
-				if (!can_copy_to_local)
-					skeleton_valid = false;
-
-				/* compute morphs */
-
-				if (p_morphs && surf->morph_target_count && can_copy_to_local) {
-
-					base = skinned_buffer;
-					stride = surf->local_stride;
-
-					//copy all first
-					float coef = 1.0;
-
-					for (int i = 0; i < surf->morph_target_count; i++) {
-						if (surf->mesh->morph_target_mode == VS::MORPH_MODE_NORMALIZED)
-							coef -= p_morphs[i];
-						ERR_FAIL_COND_V(surf->morph_format != surf->morph_targets_local[i].configured_format, ERR_INVALID_DATA);
-					}
-
-					int16_t coeffp = CLAMP(coef * 255, 0, 255);
-
-					for (int i = 0; i < VS::ARRAY_MAX - 1; i++) {
-
-						const Surface::ArrayData &ad = surf->array[i];
-						if (ad.size == 0)
-							continue;
-
-						int ofs = ad.ofs;
-						int src_stride = surf->stride;
-						int dst_stride = skeleton_valid ? surf->stride : surf->local_stride;
-						int count = surf->array_len;
-
-						if (!skeleton_valid && i >= VS::ARRAY_MAX - 3)
-							break;
-
-						switch (i) {
-
-							case VS::ARRAY_VERTEX:
-							case VS::ARRAY_NORMAL:
-							case VS::ARRAY_TANGENT: {
-
-								for (int k = 0; k < count; k++) {
-
-									const float *src = (const float *)&surf->array_local[ofs + k * src_stride];
-									float *dst = (float *)&base[ofs + k * dst_stride];
-
-									dst[0] = src[0] * coef;
-									dst[1] = src[1] * coef;
-									dst[2] = src[2] * coef;
-								};
-
-							} break;
-							case VS::ARRAY_COLOR: {
-
-								for (int k = 0; k < count; k++) {
-
-									const uint8_t *src = (const uint8_t *)&surf->array_local[ofs + k * src_stride];
-									uint8_t *dst = (uint8_t *)&base[ofs + k * dst_stride];
-
-									dst[0] = (src[0] * coeffp) >> 8;
-									dst[1] = (src[1] * coeffp) >> 8;
-									dst[2] = (src[2] * coeffp) >> 8;
-									dst[3] = (src[3] * coeffp) >> 8;
-								}
-
-							} break;
-							case VS::ARRAY_TEX_UV:
-							case VS::ARRAY_TEX_UV2: {
-
-								for (int k = 0; k < count; k++) {
-
-									const float *src = (const float *)&surf->array_local[ofs + k * src_stride];
-									float *dst = (float *)&base[ofs + k * dst_stride];
-
-									dst[0] = src[0] * coef;
-									dst[1] = src[1] * coef;
-								}
-
-							} break;
-							case VS::ARRAY_BONES:
-							case VS::ARRAY_WEIGHTS: {
-
-								for (int k = 0; k < count; k++) {
-
-									const float *src = (const float *)&surf->array_local[ofs + k * src_stride];
-									float *dst = (float *)&base[ofs + k * dst_stride];
-
-									dst[0] = src[0];
-									dst[1] = src[1];
-									dst[2] = src[2];
-									dst[3] = src[3];
-								}
-
-							} break;
-						}
-					}
-
-					for (int j = 0; j < surf->morph_target_count; j++) {
-
-						for (int i = 0; i < VS::ARRAY_MAX - 3; i++) {
-
-							const Surface::ArrayData &ad = surf->array[i];
-							if (ad.size == 0)
-								continue;
-
-							int ofs = ad.ofs;
-							int src_stride = surf->local_stride;
-							int dst_stride = skeleton_valid ? surf->stride : surf->local_stride;
-							int count = surf->array_len;
-							const uint8_t *morph = surf->morph_targets_local[j].array;
-							float w = p_morphs[j];
-							int16_t wfp = CLAMP(w * 255, 0, 255);
-
-							switch (i) {
-
-								case VS::ARRAY_VERTEX:
-								case VS::ARRAY_NORMAL:
-								case VS::ARRAY_TANGENT: {
-
-									for (int k = 0; k < count; k++) {
-
-										const float *src_morph = (const float *)&morph[ofs + k * src_stride];
-										float *dst = (float *)&base[ofs + k * dst_stride];
-
-										dst[0] += src_morph[0] * w;
-										dst[1] += src_morph[1] * w;
-										dst[2] += src_morph[2] * w;
-									}
-
-								} break;
-								case VS::ARRAY_COLOR: {
-									for (int k = 0; k < count; k++) {
-
-										const uint8_t *src = (const uint8_t *)&morph[ofs + k * src_stride];
-										uint8_t *dst = (uint8_t *)&base[ofs + k * dst_stride];
-
-										dst[0] = (src[0] * wfp) >> 8;
-										dst[1] = (src[1] * wfp) >> 8;
-										dst[2] = (src[2] * wfp) >> 8;
-										dst[3] = (src[3] * wfp) >> 8;
-									}
-
-								} break;
-								case VS::ARRAY_TEX_UV:
-								case VS::ARRAY_TEX_UV2: {
-
-									for (int k = 0; k < count; k++) {
-
-										const float *src_morph = (const float *)&morph[ofs + k * src_stride];
-										float *dst = (float *)&base[ofs + k * dst_stride];
-
-										dst[0] += src_morph[0] * w;
-										dst[1] += src_morph[1] * w;
-									}
-
-								} break;
-							}
-						}
-					}
-
-					if (skeleton_valid) {
-
-						const uint8_t *src_weights = &surf->array_local[surf->array[VS::ARRAY_WEIGHTS].ofs];
-						const uint8_t *src_bones = &surf->array_local[surf->array[VS::ARRAY_BONES].ofs];
-						const Skeleton::Bone *skeleton = &p_skeleton->bones[0];
-
-						if (surf->format & VS::ARRAY_FORMAT_NORMAL && surf->format & VS::ARRAY_FORMAT_TANGENT)
-							_skeleton_xform<true, true, true>(base, surf->stride, base, surf->stride, surf->array_len, src_bones, src_weights, skeleton);
-						else if (surf->format & (VS::ARRAY_FORMAT_NORMAL))
-							_skeleton_xform<true, false, true>(base, surf->stride, base, surf->stride, surf->array_len, src_bones, src_weights, skeleton);
-						else if (surf->format & (VS::ARRAY_FORMAT_TANGENT))
-							_skeleton_xform<false, true, true>(base, surf->stride, base, surf->stride, surf->array_len, src_bones, src_weights, skeleton);
-						else
-							_skeleton_xform<false, false, true>(base, surf->stride, base, surf->stride, surf->array_len, src_bones, src_weights, skeleton);
-					}
-
-					stride = skeleton_valid ? surf->stride : surf->local_stride;
-
-#if 0
-					{
-						//in-place skeleton tansformation, only used for morphs, slow.
-						//should uptimize some day....
-
-						const uint8_t *src_weights=&surf->array_local[surf->array[VS::ARRAY_WEIGHTS].ofs];
-						const uint8_t *src_bones=&surf->array_local[surf->array[VS::ARRAY_BONES].ofs];
-						int src_stride = surf->stride;
-						int count = surf->array_len;
-						const Transform *skeleton = &p_skeleton->bones[0];
-
-						for(int i=0;i<VS::ARRAY_MAX-1;i++) {
-
-							const Surface::ArrayData& ad=surf->array[i];
-							if (ad.size==0)
-								continue;
-
-							int ofs = ad.ofs;
-
-
-							switch(i) {
-
-								case VS::ARRAY_VERTEX: {
-									for(int k=0;k<count;k++) {
-
-										float *ptr=  (float*)&base[ofs+k*stride];
-										const GLfloat* weights = reinterpret_cast<const GLfloat*>(&src_weights[k*src_stride]);
-										const GLfloat *bones = reinterpret_cast<const GLfloat*>(&src_bones[k*src_stride]);
-
-										Vector3 src( ptr[0], ptr[1], ptr[2] );
-										Vector3 dst;
-										for(int j=0;j<VS::ARRAY_WEIGHTS_SIZE;j++) {
-
-											float w = weights[j];
-											if (w==0)
-												break;
-
-											//print_line("accum "+itos(i)+" += "+rtos(Math::ftoi(bones[j]))+" * "+skeleton[ Math::ftoi(bones[j]) ]+" * "+rtos(w));
-											int bidx = Math::fast_ftoi(bones[j]);
-											dst+=skeleton[ bidx ].xform(src) * w;
-										}
-
-										ptr[0]=dst.x;
-										ptr[1]=dst.y;
-										ptr[2]=dst.z;
-
-									} break;
-
-								} break;
-								case VS::ARRAY_NORMAL:
-								case VS::ARRAY_TANGENT: {
-									for(int k=0;k<count;k++) {
-
-										float *ptr=  (float*)&base[ofs+k*stride];
-										const GLfloat* weights = reinterpret_cast<const GLfloat*>(&src_weights[k*src_stride]);
-										const GLfloat *bones = reinterpret_cast<const GLfloat*>(&src_bones[k*src_stride]);
-
-										Vector3 src( ptr[0], ptr[1], ptr[2] );
-										Vector3 dst;
-										for(int j=0;j<VS::ARRAY_WEIGHTS_SIZE;j++) {
-
-											float w = weights[j];
-											if (w==0)
-												break;
-
-											//print_line("accum "+itos(i)+" += "+rtos(Math::ftoi(bones[j]))+" * "+skeleton[ Math::ftoi(bones[j]) ]+" * "+rtos(w));
-											int bidx=Math::fast_ftoi(bones[j]);
-											dst+=skeleton[ bidx ].basis.xform(src) * w;
-										}
-
-										ptr[0]=dst.x;
-										ptr[1]=dst.y;
-										ptr[2]=dst.z;
-
-									} break;
-
-								} break;
-							}
-						}
-					}
-#endif
-
-				} else if (skeleton_valid) {
-
-					base = skinned_buffer;
-					//copy stuff and get it ready for the skeleton
-
-					int dst_stride = surf->stride - (surf->array[VS::ARRAY_BONES].size + surf->array[VS::ARRAY_WEIGHTS].size);
-					const uint8_t *src_weights = &surf->array_local[surf->array[VS::ARRAY_WEIGHTS].ofs];
-					const uint8_t *src_bones = &surf->array_local[surf->array[VS::ARRAY_BONES].ofs];
-					const Skeleton::Bone *skeleton = &p_skeleton->bones[0];
-
-					if (surf->format & VS::ARRAY_FORMAT_NORMAL && surf->format & VS::ARRAY_FORMAT_TANGENT)
-						_skeleton_xform<true, true, false>(surf->array_local, surf->stride, base, dst_stride, surf->array_len, src_bones, src_weights, skeleton);
-					else if (surf->format & (VS::ARRAY_FORMAT_NORMAL))
-						_skeleton_xform<true, false, false>(surf->array_local, surf->stride, base, dst_stride, surf->array_len, src_bones, src_weights, skeleton);
-					else if (surf->format & (VS::ARRAY_FORMAT_TANGENT))
-						_skeleton_xform<false, true, false>(surf->array_local, surf->stride, base, dst_stride, surf->array_len, src_bones, src_weights, skeleton);
-					else
-						_skeleton_xform<false, false, false>(surf->array_local, surf->stride, base, dst_stride, surf->array_len, src_bones, src_weights, skeleton);
-
-					stride = dst_stride;
-				}
-
-			} else {
-
-				glBindBuffer(GL_ARRAY_BUFFER, surf->vertex_id);
-			};
-
-			for (int i = 0; i < (VS::ARRAY_MAX - 1); i++) {
-
-				const Surface::ArrayData &ad = surf->array[i];
-
-				/*
-				if (!gl_texcoord_shader[i])
-					continue;
-				*/
-
-				if (ad.size == 0 || !ad.bind) {
-					glDisableVertexAttribArray(i);
-					if (i == VS::ARRAY_COLOR) {
-						_set_color_attrib(Color(1, 1, 1, 1));
-					};
-					//print_line("disable: "+itos(i));
-					continue; // this one is disabled.
-				}
-
-				glEnableVertexAttribArray(i);
-				//print_line("set: "+itos(i)+" - count: "+itos(ad.count)+" datatype: "+itos(ad.datatype)+" ofs: "+itos(ad.ofs)+" stride: "+itos(stride)+" total len: "+itos(surf->array_len));
-				glVertexAttribPointer(i, ad.count, ad.datatype, ad.normalize, stride, &base[ad.ofs]);
-			}
-#ifdef GLEW_ENABLED
-			//"desktop" opengl needs this.
-			if (surf->primitive == VS::PRIMITIVE_POINTS) {
-				glEnable(GL_POINT_SPRITE);
-				glEnable(GL_VERTEX_PROGRAM_POINT_SIZE);
-
-			} else {
-				glDisable(GL_POINT_SPRITE);
-				glDisable(GL_VERTEX_PROGRAM_POINT_SIZE);
-			}
-#endif
-		} break;
-
-		default: break;
-	};
-
-	return OK;
-};
-
-static const GLenum gl_primitive[] = {
-	GL_POINTS,
-	GL_LINES,
-	GL_LINE_STRIP,
-	GL_LINE_LOOP,
-	GL_TRIANGLES,
-	GL_TRIANGLE_STRIP,
-	GL_TRIANGLE_FAN
-};
-
-void RasterizerGLES2::_render(const Geometry *p_geometry, const Material *p_material, const Skeleton *p_skeleton, const GeometryOwner *p_owner, const Transform &p_xform) {
-
-	_rinfo.object_count++;
-
-	switch (p_geometry->type) {
-
-		case Geometry::GEOMETRY_SURFACE: {
-
-			Surface *s = (Surface *)p_geometry;
-
-			_rinfo.vertex_count += s->array_len;
-
-			if (s->index_array_len > 0) {
-
-				if (s->index_array_local) {
-
-					//print_line("LOCAL F: "+itos(s->format)+" C: "+itos(s->index_array_len)+" VC: "+itos(s->array_len));
-					glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-					glDrawElements(gl_primitive[s->primitive], s->index_array_len, (s->array_len > (1 << 16)) ? GL_UNSIGNED_INT : GL_UNSIGNED_SHORT, s->index_array_local);
-
-				} else {
-					//print_line("indices: "+itos(s->index_array_local) );
-
-					//print_line("VBO F: "+itos(s->format)+" C: "+itos(s->index_array_len)+" VC: "+itos(s->array_len));
-					glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, s->index_id);
-					glDrawElements(gl_primitive[s->primitive], s->index_array_len, (s->array_len > (1 << 16)) ? GL_UNSIGNED_INT : GL_UNSIGNED_SHORT, 0);
-				}
-
-			} else {
-
-				glDrawArrays(gl_primitive[s->primitive], 0, s->array_len);
-			};
-
-			_rinfo.draw_calls++;
-		} break;
-
-		case Geometry::GEOMETRY_MULTISURFACE: {
-
-			material_shader.bind_uniforms();
-			Surface *s = static_cast<const MultiMeshSurface *>(p_geometry)->surface;
-			const MultiMesh *mm = static_cast<const MultiMesh *>(p_owner);
-			int element_count = mm->elements.size();
-
-			if (element_count == 0)
-				return;
-
-			if (mm->visible >= 0) {
-				element_count = MIN(element_count, mm->visible);
-			}
-
-			const MultiMesh::Element *elements = &mm->elements[0];
-
-			_rinfo.vertex_count += s->array_len * element_count;
-
-			_rinfo.draw_calls += element_count;
-
-			if (use_texture_instancing) {
-				//this is probably the fastest all around way if vertex texture fetch is supported
-
-				float twd = (1.0 / mm->tw) * 4.0;
-				float thd = 1.0 / mm->th;
-				float parm[3] = { 0.0, 01.0, (1.0f / mm->tw) };
-				glActiveTexture(GL_TEXTURE0 + max_texture_units - 2);
-				glDisableVertexAttribArray(6);
-				glBindTexture(GL_TEXTURE_2D, mm->tex_id);
-				material_shader.set_uniform(MaterialShaderGLES2::INSTANCE_MATRICES, GL_TEXTURE0 + max_texture_units - 2);
-
-				if (s->index_array_len > 0) {
-
-					glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, s->index_id);
-					for (int i = 0; i < element_count; i++) {
-						parm[0] = (i % (mm->tw >> 2)) * twd;
-						parm[1] = (i / (mm->tw >> 2)) * thd;
-						glVertexAttrib3fv(6, parm);
-						glDrawElements(gl_primitive[s->primitive], s->index_array_len, (s->array_len > (1 << 16)) ? GL_UNSIGNED_INT : GL_UNSIGNED_SHORT, 0);
-					}
-
-				} else {
-
-					for (int i = 0; i < element_count; i++) {
-						//parm[0]=(i%(mm->tw>>2))*twd;
-						//parm[1]=(i/(mm->tw>>2))*thd;
-						glVertexAttrib3fv(6, parm);
-						glDrawArrays(gl_primitive[s->primitive], 0, s->array_len);
-					}
-				};
-
-			} else if (use_attribute_instancing) {
-				//if not, using attributes instead of uniforms can be really fast in forward rendering architectures
-				if (s->index_array_len > 0) {
-
-					glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, s->index_id);
-					for (int i = 0; i < element_count; i++) {
-						glVertexAttrib4fv(8, &elements[i].matrix[0]);
-						glVertexAttrib4fv(9, &elements[i].matrix[4]);
-						glVertexAttrib4fv(10, &elements[i].matrix[8]);
-						glVertexAttrib4fv(11, &elements[i].matrix[12]);
-						glDrawElements(gl_primitive[s->primitive], s->index_array_len, (s->array_len > (1 << 16)) ? GL_UNSIGNED_INT : GL_UNSIGNED_SHORT, 0);
-					}
-
-				} else {
-
-					for (int i = 0; i < element_count; i++) {
-						glVertexAttrib4fv(8, &elements[i].matrix[0]);
-						glVertexAttrib4fv(9, &elements[i].matrix[4]);
-						glVertexAttrib4fv(10, &elements[i].matrix[8]);
-						glVertexAttrib4fv(11, &elements[i].matrix[12]);
-						glDrawArrays(gl_primitive[s->primitive], 0, s->array_len);
-					}
-				};
-
-			} else {
-
-				//nothing to do, slow path (hope no hardware has to use it... but you never know)
-
-				if (s->index_array_len > 0) {
-
-					glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, s->index_id);
-					for (int i = 0; i < element_count; i++) {
-
-						glUniformMatrix4fv(material_shader.get_uniform_location(MaterialShaderGLES2::INSTANCE_TRANSFORM), 1, false, elements[i].matrix);
-						glDrawElements(gl_primitive[s->primitive], s->index_array_len, (s->array_len > (1 << 16)) ? GL_UNSIGNED_INT : GL_UNSIGNED_SHORT, 0);
-					}
-
-				} else {
-
-					for (int i = 0; i < element_count; i++) {
-						glUniformMatrix4fv(material_shader.get_uniform_location(MaterialShaderGLES2::INSTANCE_TRANSFORM), 1, false, elements[i].matrix);
-						glDrawArrays(gl_primitive[s->primitive], 0, s->array_len);
-					}
-				};
-			}
-		} break;
-		case Geometry::GEOMETRY_IMMEDIATE: {
-
-			bool restore_tex = false;
-			const Immediate *im = static_cast<const Immediate *>(p_geometry);
-			if (im->building) {
-				return;
-			}
-
-			glBindBuffer(GL_ARRAY_BUFFER, 0);
-
-			for (const List<Immediate::Chunk>::Element *E = im->chunks.front(); E; E = E->next()) {
-
-				const Immediate::Chunk &c = E->get();
-				if (c.vertices.empty()) {
-					continue;
-				}
-				for (int i = 0; i < c.vertices.size(); i++)
-
-					if (c.texture.is_valid() && texture_owner.owns(c.texture)) {
-
-						const Texture *t = texture_owner.get(c.texture);
-						glActiveTexture(GL_TEXTURE0 + tc0_idx);
-						glBindTexture(t->target, t->tex_id);
-						restore_tex = true;
-
-					} else if (restore_tex) {
-
-						glActiveTexture(GL_TEXTURE0 + tc0_idx);
-						glBindTexture(GL_TEXTURE_2D, tc0_id_cache);
-						restore_tex = false;
-					}
-
-				if (!c.normals.empty()) {
-
-					glEnableVertexAttribArray(VS::ARRAY_NORMAL);
-					glVertexAttribPointer(VS::ARRAY_NORMAL, 3, GL_FLOAT, false, sizeof(Vector3), c.normals.ptr());
-
-				} else {
-
-					glDisableVertexAttribArray(VS::ARRAY_NORMAL);
-				}
-
-				if (!c.tangents.empty()) {
-
-					glEnableVertexAttribArray(VS::ARRAY_TANGENT);
-					glVertexAttribPointer(VS::ARRAY_TANGENT, 4, GL_FLOAT, false, sizeof(Plane), c.tangents.ptr());
-
-				} else {
-
-					glDisableVertexAttribArray(VS::ARRAY_TANGENT);
-				}
-
-				if (!c.colors.empty()) {
-
-					glEnableVertexAttribArray(VS::ARRAY_COLOR);
-					glVertexAttribPointer(VS::ARRAY_COLOR, 4, GL_FLOAT, false, sizeof(Color), c.colors.ptr());
-
-				} else {
-
-					glDisableVertexAttribArray(VS::ARRAY_COLOR);
-					_set_color_attrib(Color(1, 1, 1, 1));
-				}
-
-				if (!c.uvs.empty()) {
-
-					glEnableVertexAttribArray(VS::ARRAY_TEX_UV);
-					glVertexAttribPointer(VS::ARRAY_TEX_UV, 2, GL_FLOAT, false, sizeof(Vector2), c.uvs.ptr());
-
-				} else {
-
-					glDisableVertexAttribArray(VS::ARRAY_TEX_UV);
-				}
-
-				if (!c.uvs2.empty()) {
-
-					glEnableVertexAttribArray(VS::ARRAY_TEX_UV2);
-					glVertexAttribPointer(VS::ARRAY_TEX_UV2, 2, GL_FLOAT, false, sizeof(Vector2), c.uvs2.ptr());
-
-				} else {
-
-					glDisableVertexAttribArray(VS::ARRAY_TEX_UV2);
-				}
-
-				glEnableVertexAttribArray(VS::ARRAY_VERTEX);
-				glVertexAttribPointer(VS::ARRAY_VERTEX, 3, GL_FLOAT, false, sizeof(Vector3), c.vertices.ptr());
-				glDrawArrays(gl_primitive[c.primitive], 0, c.vertices.size());
-			}
-
-			if (restore_tex) {
-
-				glActiveTexture(GL_TEXTURE0 + tc0_idx);
-				glBindTexture(GL_TEXTURE_2D, tc0_id_cache);
-				restore_tex = false;
-			}
-
-		} break;
-		case Geometry::GEOMETRY_PARTICLES: {
-
-			//print_line("particulinas");
-			const Particles *particles = static_cast<const Particles *>(p_geometry);
-			ERR_FAIL_COND(!p_owner);
-			ParticlesInstance *particles_instance = (ParticlesInstance *)p_owner;
-
-			ParticleSystemProcessSW &pp = particles_instance->particles_process;
-			float td = time_delta; //MIN(time_delta,1.0/10.0);
-			pp.process(&particles->data, particles_instance->transform, td);
-			ERR_EXPLAIN("A parameter in the particle system is not correct.");
-			ERR_FAIL_COND(!pp.valid);
-
-			Transform camera;
-			if (shadow)
-				camera = shadow->transform;
-			else
-				camera = camera_transform;
-
-			particle_draw_info.prepare(&particles->data, &pp, particles_instance->transform, camera);
-			_rinfo.draw_calls += particles->data.amount;
-
-			_rinfo.vertex_count += 4 * particles->data.amount;
-
-			{
-				static const Vector3 points[4] = {
-					Vector3(-1.0, 1.0, 0),
-					Vector3(1.0, 1.0, 0),
-					Vector3(1.0, -1.0, 0),
-					Vector3(-1.0, -1.0, 0)
-				};
-				static const Vector3 uvs[4] = {
-					Vector3(0.0, 0.0, 0.0),
-					Vector3(1.0, 0.0, 0.0),
-					Vector3(1.0, 1.0, 0.0),
-					Vector3(0, 1.0, 0.0)
-				};
-				static const Vector3 normals[4] = {
-					Vector3(0, 0, 1),
-					Vector3(0, 0, 1),
-					Vector3(0, 0, 1),
-					Vector3(0, 0, 1)
-				};
-
-				static const Plane tangents[4] = {
-					Plane(Vector3(1, 0, 0), 0),
-					Plane(Vector3(1, 0, 0), 0),
-					Plane(Vector3(1, 0, 0), 0),
-					Plane(Vector3(1, 0, 0), 0)
-				};
-
-				for (int i = 0; i < particles->data.amount; i++) {
-
-					ParticleSystemDrawInfoSW::ParticleDrawInfo &pinfo = *particle_draw_info.draw_info_order[i];
-					if (!pinfo.data->active)
-						continue;
-
-					material_shader.set_uniform(MaterialShaderGLES2::WORLD_TRANSFORM, pinfo.transform);
-					_set_color_attrib(pinfo.color);
-					_draw_primitive(4, points, normals, NULL, uvs, tangents);
-				}
-			}
-
-		} break;
-		default: break;
-	};
-};
-
-void RasterizerGLES2::_setup_shader_params(const Material *p_material) {
-
-#if 0
-	int idx=0;
-	int tex_idx=0;
-	for(Map<StringName,Variant>::Element *E=p_material->shader_cache->params.front();E;E=E->next(),idx++) {
-
-		Variant v; //
-		v = E->get();
-		const Map<StringName,Variant>::Element *F=p_material->shader_params.find(E->key());
-		if (F)
-			v=F->get();
-
-		switch(v.get_type() ) {
-			case Variant::OBJECT:
-			case Variant::_RID: {
-
-				RID tex=v;
-				if (!tex.is_valid())
-					break;
-
-				Texture *texture = texture_owner.get(tex);
-				if (!texture)
-					break;
-				glUniform1i( material_shader.get_custom_uniform_location(idx), tex_idx);
-				glActiveTexture(tex_idx);
-				glBindTexture(texture->target,texture->tex_id);
-
-			} break;
-			case Variant::COLOR: {
-
-				Color c=v;
-				material_shader.set_custom_uniform(idx,Vector3(c.r,c.g,c.b));
-			} break;
-			default: {
-
-				material_shader.set_custom_uniform(idx,v);
-			} break;
-		}
-
-	}
-#endif
-}
-
-void RasterizerGLES2::_setup_skeleton(const Skeleton *p_skeleton) {
-
-	material_shader.set_conditional(MaterialShaderGLES2::USE_SKELETON, p_skeleton != NULL);
-	if (p_skeleton && p_skeleton->tex_id) {
-
-		glActiveTexture(GL_TEXTURE0 + max_texture_units - 2);
-		glBindTexture(GL_TEXTURE_2D, p_skeleton->tex_id);
-	}
-}
-
-void RasterizerGLES2::_render_list_forward(RenderList *p_render_list, const Transform &p_view_transform, const Transform &p_view_transform_inverse, const CameraMatrix &p_projection, bool p_reverse_cull, bool p_fragment_light, bool p_alpha_pass) {
-
-	if (current_rt && current_rt_vflip) {
-		//p_reverse_cull=!p_reverse_cull;
-		glFrontFace(GL_CCW);
-	}
-
-	const Material *prev_material = NULL;
-	uint16_t prev_light = 0x777E;
-	const Geometry *prev_geometry_cmp = NULL;
-	uint8_t prev_light_type = 0xEF;
-	const Skeleton *prev_skeleton = NULL;
-	uint8_t prev_sort_flags = 0xFF;
-	const BakedLightData *prev_baked_light = NULL;
-	RID prev_baked_light_texture;
-	const float *prev_morph_values = NULL;
-	int prev_receive_shadows_state = -1;
-
-	material_shader.set_conditional(MaterialShaderGLES2::USE_VERTEX_LIGHTING, !shadow && !p_fragment_light);
-	material_shader.set_conditional(MaterialShaderGLES2::USE_FRAGMENT_LIGHTING, !shadow && p_fragment_light);
-	material_shader.set_conditional(MaterialShaderGLES2::USE_SKELETON, false);
-
-	if (shadow) {
-		material_shader.set_conditional(MaterialShaderGLES2::LIGHT_TYPE_DIRECTIONAL, false);
-		material_shader.set_conditional(MaterialShaderGLES2::LIGHT_TYPE_OMNI, false);
-		material_shader.set_conditional(MaterialShaderGLES2::LIGHT_TYPE_SPOT, false);
-		material_shader.set_conditional(MaterialShaderGLES2::LIGHT_USE_SHADOW, false);
-		material_shader.set_conditional(MaterialShaderGLES2::LIGHT_USE_PSSM, false);
-		material_shader.set_conditional(MaterialShaderGLES2::LIGHT_USE_PSSM4, false);
-		material_shader.set_conditional(MaterialShaderGLES2::SHADELESS, false);
-		material_shader.set_conditional(MaterialShaderGLES2::ENABLE_AMBIENT_OCTREE, false);
-		material_shader.set_conditional(MaterialShaderGLES2::ENABLE_AMBIENT_LIGHTMAP, false);
-		//material_shader.set_conditional(MaterialShaderGLES2::ENABLE_AMBIENT_TEXTURE,false);
-	}
-
-	bool stores_glow = !shadow && (current_env && current_env->fx_enabled[VS::ENV_FX_GLOW]) && !p_alpha_pass;
-	float sampled_light_dp_multiplier = 1.0;
-
-	bool prev_blend = false;
-	glDisable(GL_BLEND);
-	for (int i = 0; i < p_render_list->element_count; i++) {
-
-		RenderList::Element *e = p_render_list->elements[i];
-		const Material *material = e->material;
-		uint16_t light = e->light;
-		uint8_t light_type = e->light_type;
-		uint8_t sort_flags = e->sort_flags;
-		const Skeleton *skeleton = e->skeleton;
-		const Geometry *geometry_cmp = e->geometry_cmp;
-		const BakedLightData *baked_light = e->instance->baked_light;
-		const float *morph_values = e->instance->morph_values.ptr();
-		int receive_shadows_state = e->instance->receive_shadows == true ? 1 : 0;
-
-		bool rebind = false;
-		bool bind_baked_light_octree = false;
-		bool bind_baked_lightmap = false;
-		bool additive = false;
-		bool bind_dp_sampler = false;
-
-		if (!shadow) {
-
-			if (texscreen_used && !texscreen_copied && material->shader_cache && material->shader_cache->valid && material->shader_cache->has_texscreen) {
-				texscreen_copied = true;
-				_copy_to_texscreen();
-
-				//force reset state
-				prev_material = NULL;
-				prev_light = 0x777E;
-				prev_geometry_cmp = NULL;
-				prev_light_type = 0xEF;
-				prev_skeleton = NULL;
-				prev_sort_flags = 0xFF;
-				prev_morph_values = NULL;
-				prev_receive_shadows_state = -1;
-				glEnable(GL_BLEND);
-				glDepthMask(GL_TRUE);
-				glEnable(GL_DEPTH_TEST);
-				glDisable(GL_SCISSOR_TEST);
-			}
-
-			if (light_type != prev_light_type || receive_shadows_state != prev_receive_shadows_state) {
-
-				if (material->flags[VS::MATERIAL_FLAG_UNSHADED] || current_debug == VS::SCENARIO_DEBUG_SHADELESS) {
-					material_shader.set_conditional(MaterialShaderGLES2::LIGHT_TYPE_DIRECTIONAL, false);
-					material_shader.set_conditional(MaterialShaderGLES2::LIGHT_TYPE_OMNI, false);
-					material_shader.set_conditional(MaterialShaderGLES2::LIGHT_TYPE_SPOT, false);
-					material_shader.set_conditional(MaterialShaderGLES2::LIGHT_USE_SHADOW, false);
-					material_shader.set_conditional(MaterialShaderGLES2::LIGHT_USE_PSSM, false);
-					material_shader.set_conditional(MaterialShaderGLES2::LIGHT_USE_PSSM4, false);
-					material_shader.set_conditional(MaterialShaderGLES2::SHADELESS, true);
-				} else {
-					material_shader.set_conditional(MaterialShaderGLES2::LIGHT_TYPE_DIRECTIONAL, (light_type & 0x3) == VS::LIGHT_DIRECTIONAL);
-					material_shader.set_conditional(MaterialShaderGLES2::LIGHT_TYPE_OMNI, (light_type & 0x3) == VS::LIGHT_OMNI);
-					material_shader.set_conditional(MaterialShaderGLES2::LIGHT_TYPE_SPOT, (light_type & 0x3) == VS::LIGHT_SPOT);
-					if (receive_shadows_state == 1) {
-						material_shader.set_conditional(MaterialShaderGLES2::LIGHT_USE_SHADOW, (light_type & 0x8));
-						material_shader.set_conditional(MaterialShaderGLES2::LIGHT_USE_PSSM, (light_type & 0x10));
-						material_shader.set_conditional(MaterialShaderGLES2::LIGHT_USE_PSSM4, (light_type & 0x20));
-					} else {
-						material_shader.set_conditional(MaterialShaderGLES2::LIGHT_USE_SHADOW, false);
-						material_shader.set_conditional(MaterialShaderGLES2::LIGHT_USE_PSSM, false);
-						material_shader.set_conditional(MaterialShaderGLES2::LIGHT_USE_PSSM4, false);
-					}
-					material_shader.set_conditional(MaterialShaderGLES2::SHADELESS, false);
-				}
-
-				rebind = true;
-			}
-
-			if (!*e->additive_ptr) {
-
-				additive = false;
-				*e->additive_ptr = true;
-			} else {
-				additive = true;
-			}
-
-			if (stores_glow)
-				material_shader.set_conditional(MaterialShaderGLES2::USE_GLOW, !additive);
-
-			bool desired_blend = false;
-			VS::MaterialBlendMode desired_blend_mode = VS::MATERIAL_BLEND_MODE_MIX;
-
-			if (additive) {
-				desired_blend = true;
-				desired_blend_mode = VS::MATERIAL_BLEND_MODE_ADD;
-			} else {
-				desired_blend = p_alpha_pass;
-				desired_blend_mode = material->blend_mode;
-			}
-
-			if (prev_blend != desired_blend) {
-
-				if (desired_blend) {
-					glEnable(GL_BLEND);
-					if (!current_rt || !current_rt_transparent)
-						glColorMask(1, 1, 1, 0);
-				} else {
-					glDisable(GL_BLEND);
-					glColorMask(1, 1, 1, 1);
-				}
-
-				prev_blend = desired_blend;
-			}
-
-			if (desired_blend && desired_blend_mode != current_blend_mode) {
-
-				switch (desired_blend_mode) {
-
-					case VS::MATERIAL_BLEND_MODE_MIX: {
-						glBlendEquation(GL_FUNC_ADD);
-						if (current_rt && current_rt_transparent) {
-							glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-						} else {
-							glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-						}
-
-					} break;
-					case VS::MATERIAL_BLEND_MODE_ADD: {
-
-						glBlendEquation(GL_FUNC_ADD);
-						glBlendFunc(p_alpha_pass ? GL_SRC_ALPHA : GL_ONE, GL_ONE);
-
-					} break;
-					case VS::MATERIAL_BLEND_MODE_SUB: {
-
-						glBlendEquation(GL_FUNC_REVERSE_SUBTRACT);
-						glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-					} break;
-					case VS::MATERIAL_BLEND_MODE_MUL: {
-						glBlendEquation(GL_FUNC_ADD);
-						if (current_rt && current_rt_transparent) {
-							glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-						} else {
-							glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-						}
-
-					} break;
-				}
-
-				current_blend_mode = desired_blend_mode;
-			}
-
-			material_shader.set_conditional(MaterialShaderGLES2::ENABLE_AMBIENT_OCTREE, false);
-			material_shader.set_conditional(MaterialShaderGLES2::ENABLE_AMBIENT_LIGHTMAP, false);
-			material_shader.set_conditional(MaterialShaderGLES2::ENABLE_AMBIENT_DP_SAMPLER, false);
-
-			material_shader.set_conditional(MaterialShaderGLES2::ENABLE_AMBIENT_COLOR, false);
-
-			if (material->flags[VS::MATERIAL_FLAG_UNSHADED] == false && current_debug != VS::SCENARIO_DEBUG_SHADELESS) {
-
-				if (baked_light != NULL) {
-					if (baked_light->realtime_color_enabled) {
-						float realtime_energy = baked_light->realtime_energy;
-						material_shader.set_conditional(MaterialShaderGLES2::ENABLE_AMBIENT_COLOR, true);
-						material_shader.set_uniform(MaterialShaderGLES2::AMBIENT_COLOR, Vector3(baked_light->realtime_color.r * realtime_energy, baked_light->realtime_color.g * realtime_energy, baked_light->realtime_color.b * realtime_energy));
-					}
-				}
-
-				if (e->instance->sampled_light.is_valid()) {
-
-					SampledLight *sl = sampled_light_owner.get(e->instance->sampled_light);
-					if (sl) {
-
-						baked_light = NULL; //can't mix
-						material_shader.set_conditional(MaterialShaderGLES2::ENABLE_AMBIENT_DP_SAMPLER, true);
-						glActiveTexture(GL_TEXTURE0 + max_texture_units - 3);
-						glBindTexture(GL_TEXTURE_2D, sl->texture); //bind the texture
-						sampled_light_dp_multiplier = sl->multiplier;
-						bind_dp_sampler = true;
-					}
-				}
-
-				if (!additive && baked_light) {
-
-					if (baked_light->mode == VS::BAKED_LIGHT_OCTREE && baked_light->octree_texture.is_valid() && e->instance->baked_light_octree_xform) {
-						material_shader.set_conditional(MaterialShaderGLES2::ENABLE_AMBIENT_OCTREE, true);
-						bind_baked_light_octree = true;
-						if (prev_baked_light != baked_light) {
-							Texture *tex = texture_owner.get(baked_light->octree_texture);
-							if (tex) {
-
-								glActiveTexture(GL_TEXTURE0 + max_texture_units - 3);
-								glBindTexture(tex->target, tex->tex_id); //bind the texture
-							}
-							if (baked_light->light_texture.is_valid()) {
-								Texture *texl = texture_owner.get(baked_light->light_texture);
-								if (texl) {
-									glActiveTexture(GL_TEXTURE0 + max_texture_units - 4);
-									glBindTexture(texl->target, texl->tex_id); //bind the light texture
-								}
-							}
-						}
-					} else if (baked_light->mode == VS::BAKED_LIGHT_LIGHTMAPS) {
-
-						int lightmap_idx = e->instance->baked_lightmap_id;
-
-						material_shader.set_conditional(MaterialShaderGLES2::ENABLE_AMBIENT_LIGHTMAP, false);
-						bind_baked_lightmap = false;
-
-						if (baked_light->lightmaps.has(lightmap_idx)) {
-
-							RID texid = baked_light->lightmaps[lightmap_idx];
-
-							if (prev_baked_light != baked_light || texid != prev_baked_light_texture) {
-
-								Texture *tex = texture_owner.get(texid);
-								if (tex) {
-
-									glActiveTexture(GL_TEXTURE0 + max_texture_units - 3);
-									glBindTexture(tex->target, tex->tex_id); //bind the texture
-								}
-
-								prev_baked_light_texture = texid;
-							}
-
-							if (texid.is_valid()) {
-								material_shader.set_conditional(MaterialShaderGLES2::ENABLE_AMBIENT_LIGHTMAP, true);
-								bind_baked_lightmap = true;
-							}
-						}
-					}
-				}
-
-				if (int(prev_baked_light != NULL) ^ int(baked_light != NULL)) {
-					rebind = true;
-				}
-			}
-		}
-
-		if (sort_flags != prev_sort_flags) {
-
-			if (sort_flags & RenderList::SORT_FLAG_INSTANCING) {
-				material_shader.set_conditional(MaterialShaderGLES2::USE_UNIFORM_INSTANCING, !use_texture_instancing && !use_attribute_instancing);
-				material_shader.set_conditional(MaterialShaderGLES2::USE_ATTRIBUTE_INSTANCING, use_attribute_instancing);
-				material_shader.set_conditional(MaterialShaderGLES2::USE_TEXTURE_INSTANCING, use_texture_instancing);
-			} else {
-				material_shader.set_conditional(MaterialShaderGLES2::USE_UNIFORM_INSTANCING, false);
-				material_shader.set_conditional(MaterialShaderGLES2::USE_ATTRIBUTE_INSTANCING, false);
-				material_shader.set_conditional(MaterialShaderGLES2::USE_TEXTURE_INSTANCING, false);
-			}
-			rebind = true;
-		}
-
-		if (use_hw_skeleton_xform && (skeleton != prev_skeleton || morph_values != prev_morph_values)) {
-			if (!prev_skeleton || !skeleton)
-				rebind = true; //went from skeleton <-> no skeleton, needs rebind
-
-			if (morph_values == NULL)
-				_setup_skeleton(skeleton);
-			else
-				_setup_skeleton(NULL);
-		}
-
-		if (material != prev_material || rebind) {
-
-			rebind = _setup_material(e->geometry, material, additive, !p_alpha_pass);
-
-			DEBUG_TEST_ERROR("Setup material");
-			_rinfo.mat_change_count++;
-			//_setup_material_overrides(e->material,NULL,material_overrides);
-			//_setup_material_skeleton(material,skeleton);
-		} else {
-
-			if (prev_skeleton != skeleton) {
-				//_setup_material_skeleton(material,skeleton);
-			};
-		}
-
-		if (geometry_cmp != prev_geometry_cmp || prev_skeleton != skeleton) {
-
-			_setup_geometry(e->geometry, material, e->skeleton, e->instance->morph_values.ptr());
-			_rinfo.surface_count++;
-			DEBUG_TEST_ERROR("Setup geometry");
-		};
-
-		if (i == 0 || light != prev_light || rebind) {
-			if (e->light != 0xFFFF) {
-				_setup_light(e->light);
-			}
-		}
-
-		if (bind_baked_light_octree && (baked_light != prev_baked_light || rebind)) {
-
-			material_shader.set_uniform(MaterialShaderGLES2::AMBIENT_OCTREE_INVERSE_TRANSFORM, *e->instance->baked_light_octree_xform);
-			material_shader.set_uniform(MaterialShaderGLES2::AMBIENT_OCTREE_LATTICE_SIZE, baked_light->octree_lattice_size);
-			material_shader.set_uniform(MaterialShaderGLES2::AMBIENT_OCTREE_LATTICE_DIVIDE, baked_light->octree_lattice_divide);
-			material_shader.set_uniform(MaterialShaderGLES2::AMBIENT_OCTREE_STEPS, baked_light->octree_steps);
-			material_shader.set_uniform(MaterialShaderGLES2::AMBIENT_OCTREE_TEX, max_texture_units - 3);
-			if (baked_light->light_texture.is_valid()) {
-
-				material_shader.set_uniform(MaterialShaderGLES2::AMBIENT_OCTREE_LIGHT_TEX, max_texture_units - 4);
-				material_shader.set_uniform(MaterialShaderGLES2::AMBIENT_OCTREE_LIGHT_PIX_SIZE, baked_light->light_tex_pixel_size);
-			} else {
-				material_shader.set_uniform(MaterialShaderGLES2::AMBIENT_OCTREE_LIGHT_TEX, max_texture_units - 3);
-				material_shader.set_uniform(MaterialShaderGLES2::AMBIENT_OCTREE_LIGHT_PIX_SIZE, baked_light->octree_tex_pixel_size);
-			}
-			material_shader.set_uniform(MaterialShaderGLES2::AMBIENT_OCTREE_MULTIPLIER, baked_light->texture_multiplier);
-			material_shader.set_uniform(MaterialShaderGLES2::AMBIENT_OCTREE_PIX_SIZE, baked_light->octree_tex_pixel_size);
-		}
-
-		if (bind_baked_lightmap && (baked_light != prev_baked_light || rebind)) {
-
-			material_shader.set_uniform(MaterialShaderGLES2::AMBIENT_LIGHTMAP, max_texture_units - 3);
-			material_shader.set_uniform(MaterialShaderGLES2::AMBIENT_LIGHTMAP_MULTIPLIER, baked_light->lightmap_multiplier);
-		}
-
-		if (bind_dp_sampler) {
-
-			material_shader.set_uniform(MaterialShaderGLES2::AMBIENT_DP_SAMPLER_MULTIPLIER, sampled_light_dp_multiplier);
-			material_shader.set_uniform(MaterialShaderGLES2::AMBIENT_DP_SAMPLER, max_texture_units - 3);
-		}
-
-		_set_cull(e->mirror, p_reverse_cull);
-
-		if (i == 0 || rebind) {
-			material_shader.set_uniform(MaterialShaderGLES2::CAMERA_INVERSE_TRANSFORM, p_view_transform_inverse);
-			material_shader.set_uniform(MaterialShaderGLES2::PROJECTION_TRANSFORM, p_projection);
-			if (!shadow) {
-
-				if (!additive && current_env && current_env->fx_enabled[VS::ENV_FX_AMBIENT_LIGHT]) {
-					Color ambcolor = _convert_color(current_env->fx_param[VS::ENV_FX_PARAM_AMBIENT_LIGHT_COLOR]);
-					float ambnrg = current_env->fx_param[VS::ENV_FX_PARAM_AMBIENT_LIGHT_ENERGY];
-					material_shader.set_uniform(MaterialShaderGLES2::AMBIENT_LIGHT, Vector3(ambcolor.r * ambnrg, ambcolor.g * ambnrg, ambcolor.b * ambnrg));
-				} else {
-					material_shader.set_uniform(MaterialShaderGLES2::AMBIENT_LIGHT, Vector3());
-				}
-			}
-
-			_rinfo.shader_change_count++;
-		}
-
-		if (skeleton != prev_skeleton || rebind) {
-			if (skeleton && morph_values == NULL) {
-				material_shader.set_uniform(MaterialShaderGLES2::SKELETON_MATRICES, max_texture_units - 2);
-				material_shader.set_uniform(MaterialShaderGLES2::SKELTEX_PIXEL_SIZE, skeleton->pixel_size);
-			}
-		}
-
-		if (e->instance->billboard || e->instance->billboard_y || e->instance->depth_scale) {
-
-			Transform xf = e->instance->transform;
-			if (e->instance->depth_scale) {
-
-				if (p_projection.matrix[3][3]) {
-					//orthogonal matrix, try to do about the same
-					//with viewport size
-					//real_t w = Math::abs( 1.0/(2.0*(p_projection.matrix[0][0])) );
-					real_t h = Math::abs(1.0 / (2.0 * p_projection.matrix[1][1]));
-					float sc = (h * 2.0); //consistent with Y-fov
-					xf.basis.scale(Vector3(sc, sc, sc));
-				} else {
-					//just scale by depth
-					real_t sc = -camera_plane.distance_to(xf.origin);
-					xf.basis.scale(Vector3(sc, sc, sc));
-				}
-			}
-
-			if (e->instance->billboard) {
-
-				Vector3 scale = xf.basis.get_scale();
-
-				if (current_rt && current_rt_vflip) {
-					xf.set_look_at(xf.origin, xf.origin + p_view_transform.get_basis().get_axis(2), -p_view_transform.get_basis().get_axis(1));
-				} else {
-					xf.set_look_at(xf.origin, xf.origin + p_view_transform.get_basis().get_axis(2), p_view_transform.get_basis().get_axis(1));
-				}
-
-				xf.basis.scale(scale);
-			}
-
-			if (e->instance->billboard_y) {
-
-				Vector3 scale = xf.basis.get_scale();
-				Vector3 look_at = p_view_transform.get_origin();
-				look_at.y = 0.0;
-				Vector3 look_at_norm = look_at.normalized();
-
-				if (current_rt && current_rt_vflip) {
-					xf.set_look_at(xf.origin, xf.origin + look_at_norm, Vector3(0.0, -1.0, 0.0));
-				} else {
-					xf.set_look_at(xf.origin, xf.origin + look_at_norm, Vector3(0.0, 1.0, 0.0));
-				}
-				xf.basis.scale(scale);
-			}
-			material_shader.set_uniform(MaterialShaderGLES2::WORLD_TRANSFORM, xf);
-
-		} else {
-			material_shader.set_uniform(MaterialShaderGLES2::WORLD_TRANSFORM, e->instance->transform);
-		}
-
-		material_shader.set_uniform(MaterialShaderGLES2::NORMAL_MULT, e->mirror ? -1.0 : 1.0);
-		material_shader.set_uniform(MaterialShaderGLES2::CONST_LIGHT_MULT, additive ? 0.0 : 1.0);
-
-		_render(e->geometry, material, skeleton, e->owner, e->instance->transform);
-		DEBUG_TEST_ERROR("Rendering");
-
-		prev_material = material;
-		prev_skeleton = skeleton;
-		prev_geometry_cmp = geometry_cmp;
-		prev_light = e->light;
-		prev_light_type = e->light_type;
-		prev_sort_flags = sort_flags;
-		prev_baked_light = baked_light;
-		prev_morph_values = morph_values;
-		prev_receive_shadows_state = receive_shadows_state;
-	}
-
-	//print_line("shaderchanges: "+itos(p_alpha_pass)+": "+itos(_rinfo.shader_change_count));
-
-	if (current_rt && current_rt_vflip) {
-		glFrontFace(GL_CW);
-	}
-};
-
-void RasterizerGLES2::_copy_to_texscreen() {
-
-	//what am i missing?
-	glDisable(GL_CULL_FACE);
-	glDisable(GL_DEPTH_TEST);
-	glDisable(GL_SCISSOR_TEST);
-#ifdef GLEW_ENABLED
-	glDisable(GL_POINT_SPRITE);
-	glDisable(GL_VERTEX_PROGRAM_POINT_SIZE);
-#endif
-	glDisable(GL_BLEND);
-	glBlendEquation(GL_FUNC_ADD);
-	if (current_rt && current_rt_transparent) {
-		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-	} else {
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	}
-	//glPolygonMode(GL_FRONT_AND_BACK,GL_FILL);
-	glBindBuffer(GL_ARRAY_BUFFER, 0);
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-
-	for (int i = 0; i < VS::ARRAY_MAX; i++) {
-		glDisableVertexAttribArray(i);
-	}
-
-	glActiveTexture(GL_TEXTURE0);
-
-	glBindFramebuffer(GL_FRAMEBUFFER, framebuffer.sample_fbo);
-	glActiveTexture(GL_TEXTURE0);
-	glBindTexture(GL_TEXTURE_2D, framebuffer.color);
-	copy_shader.bind();
-	_copy_screen_quad();
-	glBindFramebuffer(GL_FRAMEBUFFER, framebuffer.fbo);
-}
-
-void RasterizerGLES2::_copy_screen_quad() {
-
-	Vector2 dst_pos[4] = {
-		Vector2(-1, 1),
-		Vector2(1, 1),
-		Vector2(1, -1),
-		Vector2(-1, -1)
-	};
-
-	Size2 uvscale(
-			(viewport.width / float(framebuffer.scale)) / framebuffer.width,
-			(viewport.height / float(framebuffer.scale)) / framebuffer.height);
-
-	Vector2 src_uv[4] = {
-		Vector2(0, 1) * uvscale,
-		Vector2(1, 1) * uvscale,
-		Vector2(1, 0) * uvscale,
-		Vector2(0, 0) * uvscale
-	};
-
-	Vector2 full_uv[4] = {
-		Vector2(0, 1),
-		Vector2(1, 1),
-		Vector2(1, 0),
-		Vector2(0, 0)
-	};
-
-	_draw_gui_primitive2(4, dst_pos, NULL, src_uv, full_uv);
-}
-
-void RasterizerGLES2::_process_glow_bloom() {
-
-	glBindFramebuffer(GL_FRAMEBUFFER, framebuffer.blur[0].fbo);
-	glActiveTexture(GL_TEXTURE0);
-	glBindTexture(GL_TEXTURE_2D, framebuffer.color);
-	copy_shader.set_conditional(CopyShaderGLES2::USE_GLOW_COPY, true);
-	if (current_vd && current_env->fx_enabled[VS::ENV_FX_HDR]) {
-
-		copy_shader.set_conditional(CopyShaderGLES2::USE_HDR, true);
-	}
-
-	copy_shader.bind();
-	copy_shader.set_uniform(CopyShaderGLES2::BLOOM, float(current_env->fx_param[VS::ENV_FX_PARAM_GLOW_BLOOM]));
-	copy_shader.set_uniform(CopyShaderGLES2::BLOOM_THRESHOLD, float(current_env->fx_param[VS::ENV_FX_PARAM_GLOW_BLOOM_THRESHOLD]));
-	glUniform1i(copy_shader.get_uniform_location(CopyShaderGLES2::SOURCE), 0);
-
-	if (current_vd && current_env->fx_enabled[VS::ENV_FX_HDR]) {
-		glActiveTexture(GL_TEXTURE2);
-		glBindTexture(GL_TEXTURE_2D, current_vd->lum_color);
-		glUniform1i(copy_shader.get_uniform_location(CopyShaderGLES2::HDR_SOURCE), 2);
-		copy_shader.set_uniform(CopyShaderGLES2::TONEMAP_EXPOSURE, float(current_env->fx_param[VS::ENV_FX_PARAM_HDR_EXPOSURE]));
-		copy_shader.set_uniform(CopyShaderGLES2::TONEMAP_WHITE, float(current_env->fx_param[VS::ENV_FX_PARAM_HDR_WHITE]));
-		//copy_shader.set_uniform(CopyShaderGLES2::TONEMAP_WHITE,1.0);
-		copy_shader.set_uniform(CopyShaderGLES2::HDR_GLOW_THRESHOLD, float(current_env->fx_param[VS::ENV_FX_PARAM_HDR_GLOW_THRESHOLD]));
-		copy_shader.set_uniform(CopyShaderGLES2::HDR_GLOW_SCALE, float(current_env->fx_param[VS::ENV_FX_PARAM_HDR_GLOW_SCALE]));
-
-		glActiveTexture(GL_TEXTURE0);
-	}
-
-	glViewport(0, 0, framebuffer.blur_size, framebuffer.blur_size);
-	_copy_screen_quad();
-
-	copy_shader.set_conditional(CopyShaderGLES2::USE_GLOW_COPY, false);
-	copy_shader.set_conditional(CopyShaderGLES2::USE_HDR, false);
-	int passes = current_env->fx_param[VS::ENV_FX_PARAM_GLOW_BLUR_PASSES];
-	Vector2 psize(1.0 / framebuffer.blur_size, 1.0 / framebuffer.blur_size);
-	float pscale = current_env->fx_param[VS::ENV_FX_PARAM_GLOW_BLUR_SCALE];
-	float pmag = current_env->fx_param[VS::ENV_FX_PARAM_GLOW_BLUR_STRENGTH];
-
-	for (int i = 0; i < passes; i++) {
-
-		static const Vector2 src_uv[4] = {
-			Vector2(0, 1),
-			Vector2(1, 1),
-			Vector2(1, 0),
-			Vector2(0, 0)
-		};
-		static const Vector2 dst_pos[4] = {
-			Vector2(-1, 1),
-			Vector2(1, 1),
-			Vector2(1, -1),
-			Vector2(-1, -1)
-		};
-
-		glBindFramebuffer(GL_FRAMEBUFFER, framebuffer.blur[1].fbo);
-		glBindTexture(GL_TEXTURE_2D, framebuffer.blur[0].color);
-		copy_shader.set_conditional(CopyShaderGLES2::BLUR_V_PASS, true);
-		copy_shader.set_conditional(CopyShaderGLES2::BLUR_H_PASS, false);
-		copy_shader.bind();
-		copy_shader.set_uniform(CopyShaderGLES2::PIXEL_SIZE, psize);
-		copy_shader.set_uniform(CopyShaderGLES2::PIXEL_SCALE, pscale);
-		copy_shader.set_uniform(CopyShaderGLES2::BLUR_MAGNITUDE, pmag);
-
-		_draw_gui_primitive(4, dst_pos, NULL, src_uv);
-
-		glBindFramebuffer(GL_FRAMEBUFFER, framebuffer.blur[0].fbo);
-		glBindTexture(GL_TEXTURE_2D, framebuffer.blur[1].color);
-		copy_shader.set_conditional(CopyShaderGLES2::BLUR_V_PASS, false);
-		copy_shader.set_conditional(CopyShaderGLES2::BLUR_H_PASS, true);
-		copy_shader.bind();
-		copy_shader.set_uniform(CopyShaderGLES2::PIXEL_SIZE, psize);
-		copy_shader.set_uniform(CopyShaderGLES2::PIXEL_SCALE, pscale);
-		copy_shader.set_uniform(CopyShaderGLES2::BLUR_MAGNITUDE, pmag);
-
-		_draw_gui_primitive(4, dst_pos, NULL, src_uv);
-	}
-
-	copy_shader.set_conditional(CopyShaderGLES2::BLUR_V_PASS, false);
-	copy_shader.set_conditional(CopyShaderGLES2::BLUR_H_PASS, false);
-	copy_shader.set_conditional(CopyShaderGLES2::USE_HDR, false);
-
-	//blur it
-}
-
-void RasterizerGLES2::_process_hdr() {
-
-	if (framebuffer.luminance.empty()) {
-		return;
-	}
-
-	glBindFramebuffer(GL_FRAMEBUFFER, framebuffer.luminance[0].fbo);
-	glActiveTexture(GL_TEXTURE0);
-	glBindTexture(GL_TEXTURE_2D, framebuffer.color);
-	copy_shader.set_conditional(CopyShaderGLES2::USE_HDR_COPY, true);
-	copy_shader.bind();
-	glUniform1i(copy_shader.get_uniform_location(CopyShaderGLES2::SOURCE), 0);
-	glViewport(0, 0, framebuffer.luminance[0].size, framebuffer.luminance[0].size);
-	_copy_screen_quad();
-
-	copy_shader.set_conditional(CopyShaderGLES2::USE_HDR_COPY, false);
-	//int passes = current_env->fx_param[VS::ENV_FX_PARAM_GLOW_BLUR_PASSES];
-
-	copy_shader.set_conditional(CopyShaderGLES2::USE_HDR_REDUCE, true);
-	copy_shader.bind();
-
-	for (int i = 1; i < framebuffer.luminance.size(); i++) {
-
-		static const Vector2 src_uv[4] = {
-			Vector2(0, 1),
-			Vector2(1, 1),
-			Vector2(1, 0),
-			Vector2(0, 0)
-		};
-		static const Vector2 dst_pos[4] = {
-			Vector2(-1, 1),
-			Vector2(1, 1),
-			Vector2(1, -1),
-			Vector2(-1, -1)
-		};
-
-		Vector2 psize(1.0 / framebuffer.luminance[i - 1].size, 1.0 / framebuffer.luminance[i - 1].size);
-		glBindFramebuffer(GL_FRAMEBUFFER, framebuffer.luminance[i].fbo);
-		glBindTexture(GL_TEXTURE_2D, framebuffer.luminance[i - 1].color);
-		glViewport(0, 0, framebuffer.luminance[i].size, framebuffer.luminance[i].size);
-		glUniform1i(copy_shader.get_uniform_location(CopyShaderGLES2::SOURCE), 0);
-
-		if (framebuffer.luminance[i].size == 1) {
-			//last step
-			copy_shader.set_conditional(CopyShaderGLES2::USE_HDR_STORE, true);
-			copy_shader.bind();
-			glActiveTexture(GL_TEXTURE1);
-			glBindTexture(GL_TEXTURE_2D, current_vd->lum_color);
-			glUniform1i(copy_shader.get_uniform_location(CopyShaderGLES2::SOURCE_VD_LUM), 1);
-			copy_shader.set_uniform(CopyShaderGLES2::HDR_TIME_DELTA, time_delta);
-			copy_shader.set_uniform(CopyShaderGLES2::HDR_EXP_ADJ_SPEED, float(current_env->fx_param[VS::ENV_FX_PARAM_HDR_EXPOSURE_ADJUST_SPEED]));
-			copy_shader.set_uniform(CopyShaderGLES2::MIN_LUMINANCE, float(current_env->fx_param[VS::ENV_FX_PARAM_HDR_MIN_LUMINANCE]));
-			copy_shader.set_uniform(CopyShaderGLES2::MAX_LUMINANCE, float(current_env->fx_param[VS::ENV_FX_PARAM_HDR_MAX_LUMINANCE]));
-			glUniform1i(copy_shader.get_uniform_location(CopyShaderGLES2::SOURCE), 0);
-
-			//swap them
-			SWAP(current_vd->lum_color, framebuffer.luminance[i].color);
-			SWAP(current_vd->lum_fbo, framebuffer.luminance[i].fbo);
-		}
-
-		copy_shader.set_uniform(CopyShaderGLES2::PIXEL_SIZE, psize);
-
-		_draw_gui_primitive(4, dst_pos, NULL, src_uv);
-	}
-
-	copy_shader.set_conditional(CopyShaderGLES2::USE_HDR_REDUCE, false);
-	copy_shader.set_conditional(CopyShaderGLES2::USE_HDR_STORE, false);
-
-	draw_next_frame = true;
-}
-
-void RasterizerGLES2::_draw_tex_bg() {
-
-	glDepthMask(GL_TRUE);
-	glEnable(GL_DEPTH_TEST);
-	glDisable(GL_CULL_FACE);
-	glDisable(GL_BLEND);
-	glColorMask(1, 1, 1, 1);
-
-	RID texture;
-
-	if (current_env->bg_mode == VS::ENV_BG_TEXTURE) {
-		texture = current_env->bg_param[VS::ENV_BG_PARAM_TEXTURE];
-	} else {
-		texture = current_env->bg_param[VS::ENV_BG_PARAM_CUBEMAP];
-	}
-
-	if (!texture_owner.owns(texture)) {
-		return;
-	}
-
-	Texture *t = texture_owner.get(texture);
-
-	glActiveTexture(GL_TEXTURE0);
-	glBindTexture(t->target, t->tex_id);
-
-	copy_shader.set_conditional(CopyShaderGLES2::USE_ENERGY, true);
-
-	if (current_env->bg_mode == VS::ENV_BG_TEXTURE) {
-		copy_shader.set_conditional(CopyShaderGLES2::USE_CUBEMAP, false);
-
-	} else {
-		copy_shader.set_conditional(CopyShaderGLES2::USE_CUBEMAP, true);
-	}
-
-	copy_shader.set_conditional(CopyShaderGLES2::USE_CUSTOM_ALPHA, true);
-
-	copy_shader.bind();
-
-	if (current_env->bg_mode == VS::ENV_BG_TEXTURE) {
-		glUniform1i(copy_shader.get_uniform_location(CopyShaderGLES2::SOURCE), 0);
-	} else {
-		glUniform1i(copy_shader.get_uniform_location(CopyShaderGLES2::SOURCE_CUBE), 0);
-	}
-
-	float nrg = float(current_env->bg_param[VS::ENV_BG_PARAM_ENERGY]);
-	if (current_env->fx_enabled[VS::ENV_FX_HDR] && !use_fp16_fb)
-		nrg *= 0.25; //go down a quarter for hdr
-	copy_shader.set_uniform(CopyShaderGLES2::ENERGY, nrg);
-	copy_shader.set_uniform(CopyShaderGLES2::CUSTOM_ALPHA, float(current_env->bg_param[VS::ENV_BG_PARAM_GLOW]));
-
-	float flip_sign = (current_env->bg_mode == VS::ENV_BG_TEXTURE && current_rt && current_rt_vflip) ? -1 : 1;
-
-	Vector3 vertices[4] = {
-		Vector3(-1, -1 * flip_sign, 1),
-		Vector3(1, -1 * flip_sign, 1),
-		Vector3(1, 1 * flip_sign, 1),
-		Vector3(-1, 1 * flip_sign, 1)
-	};
-
-	Vector3 src_uv[4] = {
-		Vector3(0, 1, 0),
-		Vector3(1, 1, 0),
-		Vector3(1, 0, 0),
-		Vector3(0, 0, 0)
-	};
-
-	if (current_env->bg_mode == VS::ENV_BG_TEXTURE) {
-
-		//regular texture
-		//adjust aspect
-
-		float aspect_t = t->width / float(t->height);
-		float aspect_v = viewport.width / float(viewport.height);
-
-		if (aspect_v > aspect_t) {
-			//wider than texture
-			for (int i = 0; i < 4; i++) {
-				src_uv[i].y = (src_uv[i].y - 0.5) * (aspect_t / aspect_v) + 0.5;
-			}
-
-		} else {
-			//narrower than texture
-			for (int i = 0; i < 4; i++) {
-				src_uv[i].x = (src_uv[i].x - 0.5) * (aspect_v / aspect_t) + 0.5;
-			}
-		}
-
-		float scale = current_env->bg_param[VS::ENV_BG_PARAM_SCALE];
-		for (int i = 0; i < 4; i++) {
-
-			src_uv[i].x *= scale;
-			src_uv[i].y *= scale;
-		}
-	} else {
-
-		//skybox uv vectors
-		float vw, vh, zn;
-		camera_projection.get_viewport_size(vw, vh);
-		zn = camera_projection.get_z_near();
-
-		float scale = current_env->bg_param[VS::ENV_BG_PARAM_SCALE];
-
-		for (int i = 0; i < 4; i++) {
-
-			Vector3 uv = src_uv[i];
-			uv.x = (uv.x * 2.0 - 1.0) * vw * scale;
-			uv.y = -(uv.y * 2.0 - 1.0) * vh * scale;
-			uv.z = -zn;
-			src_uv[i] = camera_transform.basis.xform(uv).normalized();
-			src_uv[i].z = -src_uv[i].z;
-		}
-	}
-
-	_draw_primitive(4, vertices, NULL, NULL, src_uv);
-
-	copy_shader.set_conditional(CopyShaderGLES2::USE_ENERGY, false);
-	copy_shader.set_conditional(CopyShaderGLES2::USE_RGBE, false);
-	copy_shader.set_conditional(CopyShaderGLES2::USE_CUBEMAP, false);
-	copy_shader.set_conditional(CopyShaderGLES2::USE_CUSTOM_ALPHA, false);
-}
-
-void RasterizerGLES2::end_scene() {
-
-	glEnable(GL_BLEND);
-	glDepthMask(GL_TRUE);
-	glEnable(GL_DEPTH_TEST);
-	glDisable(GL_SCISSOR_TEST);
-
-	bool use_fb = false;
-
-	if (framebuffer.active) {
-
-		//detect when to use the framebuffer object
-		if (using_canvas_bg || texscreen_used || framebuffer.scale != 1) {
-			use_fb = true;
-		} else if (current_env) {
-			use_fb = false;
-			for (int i = 0; i < VS::ENV_FX_MAX; i++) {
-
-				if (i == VS::ENV_FX_FOG) //does not need fb
-					continue;
-
-				if (current_env->fx_enabled[i]) {
-					use_fb = true;
-					break;
-				}
-			}
-		}
-	}
-
-	if (use_fb) {
-
-		glBindFramebuffer(GL_FRAMEBUFFER, framebuffer.fbo);
-		glViewport(0, 0, viewport.width / framebuffer.scale, viewport.height / framebuffer.scale);
-		glScissor(0, 0, viewport.width / framebuffer.scale, viewport.height / framebuffer.scale);
-
-		material_shader.set_conditional(MaterialShaderGLES2::USE_8BIT_HDR, !use_fp16_fb && current_env && current_env->fx_enabled[VS::ENV_FX_HDR]);
-
-	} else {
-		if (current_rt) {
-			glScissor(0, 0, viewport.width, viewport.height);
-		} else {
-			glScissor(viewport.x, window_size.height - (viewport.height + viewport.y), viewport.width, viewport.height);
-		}
-	}
-
-	glEnable(GL_SCISSOR_TEST);
-	_glClearDepth(1.0);
-
-	bool draw_tex_background = false;
-
-	if (current_debug == VS::SCENARIO_DEBUG_OVERDRAW) {
-
-		glClearColor(0, 0, 0, 1);
-		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-	} else if (current_rt && current_rt_transparent) {
-
-		glClearColor(0, 0, 0, 0);
-		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-	} else if (current_env) {
-
-		switch (current_env->bg_mode) {
-
-			case VS::ENV_BG_CANVAS:
-			case VS::ENV_BG_KEEP: {
-				//copy from framebuffer if framebuffer
-				glClear(GL_DEPTH_BUFFER_BIT);
-			} break;
-			case VS::ENV_BG_DEFAULT_COLOR:
-			case VS::ENV_BG_COLOR: {
-
-				Color bgcolor;
-				if (current_env->bg_mode == VS::ENV_BG_COLOR)
-					bgcolor = current_env->bg_param[VS::ENV_BG_PARAM_COLOR];
-				else
-					bgcolor = ProjectSettings::get_singleton()->get("render/default_clear_color");
-				bgcolor = _convert_color(bgcolor);
-				float a = use_fb ? float(current_env->bg_param[VS::ENV_BG_PARAM_GLOW]) : 1.0;
-				glClearColor(bgcolor.r, bgcolor.g, bgcolor.b, a);
-				_glClearDepth(1.0);
-				glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-			} break;
-			case VS::ENV_BG_TEXTURE:
-			case VS::ENV_BG_CUBEMAP: {
-
-				glClear(GL_DEPTH_BUFFER_BIT);
-				draw_tex_background = true;
-			} break;
-		}
-	} else {
-
-		Color c = _convert_color(Color(0.3, 0.3, 0.3));
-		glClearColor(c.r, c.g, c.b, 0.0);
-		glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-	}
-
-	glDisable(GL_SCISSOR_TEST);
-
-	//material_shader.set_uniform_camera(MaterialShaderGLES2::PROJECTION_MATRIX, camera_projection);
-
-	/*
-	printf("setting projection to ");
-	for (int i=0; i<16; i++) {
-		printf("%f, ", ((float*)camera_projection.matrix)[i]);
-	};
-	printf("\n");
-
-	print_line(String("setting camera to ")+camera_transform_inverse);
-	*/
-	//material_shader.set_uniform_default(MaterialShaderGLES2::CAMERA_INVERSE, camera_transform_inverse);
-
-	current_depth_test = true;
-	current_depth_mask = true;
-	texscreen_copied = false;
-	glBlendEquation(GL_FUNC_ADD);
-	if (current_rt && current_rt_transparent) {
-		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-	} else {
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	}
-	glDisable(GL_BLEND);
-	current_blend_mode = VS::MATERIAL_BLEND_MODE_MIX;
-
-	//material_shader.set_conditional(MaterialShaderGLES2::USE_GLOW,current_env && current_env->fx_enabled[VS::ENV_FX_GLOW]);
-	opaque_render_list.sort_mat_light_type_flags();
-	_render_list_forward(&opaque_render_list, camera_transform, camera_transform_inverse, camera_projection, false, fragment_lighting);
-
-	if (draw_tex_background) {
-
-		//most 3D vendors recommend drawing a texture bg or skybox here,
-		//after opaque geometry has been drawn
-		//so the zbuffer can get rid of most pixels
-		_draw_tex_bg();
-	}
-
-	glBlendEquation(GL_FUNC_ADD);
-	if (current_rt && current_rt_transparent) {
-		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-	} else {
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	}
-	glDisable(GL_BLEND);
-	current_blend_mode = VS::MATERIAL_BLEND_MODE_MIX;
-	material_shader.set_conditional(MaterialShaderGLES2::USE_GLOW, false);
-	if (current_env && current_env->fx_enabled[VS::ENV_FX_GLOW]) {
-		glColorMask(1, 1, 1, 0); //don't touch alpha
-	}
-
-	alpha_render_list.sort_z();
-	_render_list_forward(&alpha_render_list, camera_transform, camera_transform_inverse, camera_projection, false, fragment_lighting, true);
-	glColorMask(1, 1, 1, 1);
-
-	//material_shader.set_conditional( MaterialShaderGLES2::USE_FOG,false);
-
-	DEBUG_TEST_ERROR("Drawing Scene");
-
-#ifdef GLEW_ENABLED
-	glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-#endif
-
-	if (use_fb) {
-
-		for (int i = 0; i < VS::ARRAY_MAX; i++) {
-			glDisableVertexAttribArray(i);
-		}
-		glBindBuffer(GL_ARRAY_BUFFER, 0);
-		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-		glDisable(GL_BLEND);
-		glDisable(GL_DEPTH_TEST);
-		glDisable(GL_CULL_FACE);
-		glDisable(GL_SCISSOR_TEST);
-		glDepthMask(false);
-
-		if (current_env && current_env->fx_enabled[VS::ENV_FX_HDR]) {
-
-			int hdr_tm = current_env->fx_param[VS::ENV_FX_PARAM_HDR_TONEMAPPER];
-			switch (hdr_tm) {
-				case VS::ENV_FX_HDR_TONE_MAPPER_LINEAR: {
-
-				} break;
-				case VS::ENV_FX_HDR_TONE_MAPPER_LOG: {
-					copy_shader.set_conditional(CopyShaderGLES2::USE_LOG_TONEMAPPER, true);
-
-				} break;
-				case VS::ENV_FX_HDR_TONE_MAPPER_REINHARDT: {
-					copy_shader.set_conditional(CopyShaderGLES2::USE_REINHARDT_TONEMAPPER, true);
-				} break;
-				case VS::ENV_FX_HDR_TONE_MAPPER_REINHARDT_AUTOWHITE: {
-
-					copy_shader.set_conditional(CopyShaderGLES2::USE_REINHARDT_TONEMAPPER, true);
-					copy_shader.set_conditional(CopyShaderGLES2::USE_AUTOWHITE, true);
-				} break;
-			}
-
-			_process_hdr();
-		}
-		if (current_env && current_env->fx_enabled[VS::ENV_FX_GLOW]) {
-			_process_glow_bloom();
-			int glow_transfer_mode = current_env->fx_param[VS::ENV_FX_PARAM_GLOW_BLUR_BLEND_MODE];
-			if (glow_transfer_mode == 1)
-				copy_shader.set_conditional(CopyShaderGLES2::USE_GLOW_SCREEN, true);
-			if (glow_transfer_mode == 2)
-				copy_shader.set_conditional(CopyShaderGLES2::USE_GLOW_SOFTLIGHT, true);
-		}
-
-		glBindFramebuffer(GL_FRAMEBUFFER, current_rt ? current_rt->fbo : base_framebuffer);
-
-		Size2 size;
-		if (current_rt) {
-			glBindFramebuffer(GL_FRAMEBUFFER, current_rt->fbo);
-			glViewport(0, 0, viewport.width, viewport.height);
-			size = Size2(viewport.width, viewport.height);
-		} else {
-			glBindFramebuffer(GL_FRAMEBUFFER, base_framebuffer);
-			glViewport(viewport.x, window_size.height - (viewport.height + viewport.y), viewport.width, viewport.height);
-			size = Size2(viewport.width, viewport.height);
-		}
-
-		//time to copy!!!
-		copy_shader.set_conditional(CopyShaderGLES2::USE_BCS, current_env && current_env->fx_enabled[VS::ENV_FX_BCS]);
-		copy_shader.set_conditional(CopyShaderGLES2::USE_SRGB, current_env && current_env->fx_enabled[VS::ENV_FX_SRGB]);
-		copy_shader.set_conditional(CopyShaderGLES2::USE_GLOW, current_env && current_env->fx_enabled[VS::ENV_FX_GLOW]);
-		copy_shader.set_conditional(CopyShaderGLES2::USE_HDR, current_env && current_env->fx_enabled[VS::ENV_FX_HDR]);
-		copy_shader.set_conditional(CopyShaderGLES2::USE_NO_ALPHA, true);
-		copy_shader.set_conditional(CopyShaderGLES2::USE_FXAA, current_env && current_env->fx_enabled[VS::ENV_FX_FXAA]);
-
-		copy_shader.bind();
-		//copy_shader.set_uniform(CopyShaderGLES2::SOURCE,0);
-
-		if (current_env && current_env->fx_enabled[VS::ENV_FX_GLOW]) {
-
-			glActiveTexture(GL_TEXTURE1);
-			glBindTexture(GL_TEXTURE_2D, framebuffer.blur[0].color);
-			glUniform1i(copy_shader.get_uniform_location(CopyShaderGLES2::GLOW_SOURCE), 1);
-		}
-
-		if (current_env && current_env->fx_enabled[VS::ENV_FX_HDR]) {
-
-			glActiveTexture(GL_TEXTURE2);
-			glBindTexture(GL_TEXTURE_2D, current_vd->lum_color);
-			glUniform1i(copy_shader.get_uniform_location(CopyShaderGLES2::HDR_SOURCE), 2);
-			copy_shader.set_uniform(CopyShaderGLES2::TONEMAP_EXPOSURE, float(current_env->fx_param[VS::ENV_FX_PARAM_HDR_EXPOSURE]));
-			copy_shader.set_uniform(CopyShaderGLES2::TONEMAP_WHITE, float(current_env->fx_param[VS::ENV_FX_PARAM_HDR_WHITE]));
-		}
-
-		if (current_env && current_env->fx_enabled[VS::ENV_FX_FXAA])
-			copy_shader.set_uniform(CopyShaderGLES2::PIXEL_SIZE, Size2(1.0 / size.x, 1.0 / size.y));
-
-		if (current_env && current_env->fx_enabled[VS::ENV_FX_BCS]) {
-
-			Vector3 bcs;
-			bcs.x = current_env->fx_param[VS::ENV_FX_PARAM_BCS_BRIGHTNESS];
-			bcs.y = current_env->fx_param[VS::ENV_FX_PARAM_BCS_CONTRAST];
-			bcs.z = current_env->fx_param[VS::ENV_FX_PARAM_BCS_SATURATION];
-			copy_shader.set_uniform(CopyShaderGLES2::BCS, bcs);
-		}
-
-		glActiveTexture(GL_TEXTURE0);
-		glBindTexture(GL_TEXTURE_2D, framebuffer.color);
-		glUniform1i(copy_shader.get_uniform_location(CopyShaderGLES2::SOURCE), 0);
-
-		_copy_screen_quad();
-
-		copy_shader.set_conditional(CopyShaderGLES2::USE_BCS, false);
-		copy_shader.set_conditional(CopyShaderGLES2::USE_SRGB, false);
-		copy_shader.set_conditional(CopyShaderGLES2::USE_GLOW, false);
-		copy_shader.set_conditional(CopyShaderGLES2::USE_HDR, false);
-		copy_shader.set_conditional(CopyShaderGLES2::USE_NO_ALPHA, false);
-		copy_shader.set_conditional(CopyShaderGLES2::USE_FXAA, false);
-		copy_shader.set_conditional(CopyShaderGLES2::USE_GLOW_SCREEN, false);
-		copy_shader.set_conditional(CopyShaderGLES2::USE_GLOW_SOFTLIGHT, false);
-		copy_shader.set_conditional(CopyShaderGLES2::USE_REINHARDT_TONEMAPPER, false);
-		copy_shader.set_conditional(CopyShaderGLES2::USE_AUTOWHITE, false);
-		copy_shader.set_conditional(CopyShaderGLES2::USE_LOG_TONEMAPPER, false);
-
-		material_shader.set_conditional(MaterialShaderGLES2::USE_8BIT_HDR, false);
-
-		if (current_env && current_env->fx_enabled[VS::ENV_FX_HDR] && GLOBAL_DEF("rasterizer/debug_hdr", false)) {
-			_debug_luminances();
-		}
-	}
-
-	current_env = NULL;
-	current_debug = VS::SCENARIO_DEBUG_DISABLED;
-	if (GLOBAL_DEF("rasterizer/debug_shadow_maps", false)) {
-		_debug_shadows();
-	}
-	//_debug_luminances();
-	//_debug_samplers();
-
-	if (using_canvas_bg) {
-		using_canvas_bg = false;
-		glColorMask(1, 1, 1, 1); //don't touch alpha
-	}
-}
-void RasterizerGLES2::end_shadow_map() {
-
-	ERR_FAIL_COND(!shadow);
-
-	glDisable(GL_BLEND);
-	glDisable(GL_SCISSOR_TEST);
-	glDisable(GL_DITHER);
-	glEnable(GL_DEPTH_TEST);
-	glDepthMask(true);
-
-	ShadowBuffer *sb = shadow->near_shadow_buffer;
-
-	ERR_FAIL_COND(!sb);
-
-	glBindFramebuffer(GL_FRAMEBUFFER, sb->fbo);
-
-	if (!use_rgba_shadowmaps)
-		glColorMask(0, 0, 0, 0);
-
-	//glEnable(GL_POLYGON_OFFSET_FILL);
-	//glPolygonOffset( 8.0f, 16.0f);
-
-	CameraMatrix cm;
-	float z_near, z_far;
-	Transform light_transform;
-
-	float dp_direction = 0.0;
-	bool flip_facing = false;
-	Rect2 vp_rect;
-
-	switch (shadow->base->type) {
-
-		case VS::LIGHT_DIRECTIONAL: {
-
-			if (shadow->base->directional_shadow_mode == VS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_4_SPLITS) {
-
-				cm = shadow->custom_projection[shadow_pass];
-				light_transform = shadow->custom_transform[shadow_pass];
-
-				if (shadow_pass == 0) {
-
-					vp_rect = Rect2(0, sb->size / 2, sb->size / 2, sb->size / 2);
-					glViewport(0, sb->size / 2, sb->size / 2, sb->size / 2);
-					glScissor(0, sb->size / 2, sb->size / 2, sb->size / 2);
-				} else if (shadow_pass == 1) {
-
-					vp_rect = Rect2(0, 0, sb->size / 2, sb->size / 2);
-					glViewport(0, 0, sb->size / 2, sb->size / 2);
-					glScissor(0, 0, sb->size / 2, sb->size / 2);
-
-				} else if (shadow_pass == 2) {
-
-					vp_rect = Rect2(sb->size / 2, sb->size / 2, sb->size / 2, sb->size / 2);
-					glViewport(sb->size / 2, sb->size / 2, sb->size / 2, sb->size / 2);
-					glScissor(sb->size / 2, sb->size / 2, sb->size / 2, sb->size / 2);
-				} else if (shadow_pass == 3) {
-
-					vp_rect = Rect2(sb->size / 2, 0, sb->size / 2, sb->size / 2);
-					glViewport(sb->size / 2, 0, sb->size / 2, sb->size / 2);
-					glScissor(sb->size / 2, 0, sb->size / 2, sb->size / 2);
-				}
-
-				glEnable(GL_SCISSOR_TEST);
-
-			} else if (shadow->base->directional_shadow_mode == VS::LIGHT_DIRECTIONAL_SHADOW_PARALLEL_2_SPLITS) {
-
-				if (shadow_pass == 0) {
-
-					cm = shadow->custom_projection[0];
-					light_transform = shadow->custom_transform[0];
-					vp_rect = Rect2(0, sb->size / 2, sb->size, sb->size / 2);
-					glViewport(0, sb->size / 2, sb->size, sb->size / 2);
-					glScissor(0, sb->size / 2, sb->size, sb->size / 2);
-				} else {
-
-					cm = shadow->custom_projection[1];
-					light_transform = shadow->custom_transform[1];
-					vp_rect = Rect2(0, 0, sb->size, sb->size / 2);
-					glViewport(0, 0, sb->size, sb->size / 2);
-					glScissor(0, 0, sb->size, sb->size / 2);
-				}
-
-				glEnable(GL_SCISSOR_TEST);
-
-			} else {
-				cm = shadow->custom_projection[0];
-				light_transform = shadow->custom_transform[0];
-				vp_rect = Rect2(0, 0, sb->size, sb->size);
-				glViewport(0, 0, sb->size, sb->size);
-			}
-
-			z_near = cm.get_z_near();
-			z_far = cm.get_z_far();
-
-			_glClearDepth(1.0f);
-			glClearColor(1, 1, 1, 1);
-
-			if (use_rgba_shadowmaps)
-				glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
-			else
-				glClear(GL_DEPTH_BUFFER_BIT);
-
-			glDisable(GL_SCISSOR_TEST);
-
-		} break;
-		case VS::LIGHT_OMNI: {
-
-			material_shader.set_conditional(MaterialShaderGLES2::USE_DUAL_PARABOLOID, true);
-			dp_direction = shadow_pass ? 1.0 : -1.0;
-			flip_facing = (shadow_pass == 1);
-			light_transform = shadow->transform;
-			z_near = 0;
-			z_far = shadow->base->vars[VS::LIGHT_PARAM_RADIUS];
-			shadow->dp.x = 1.0 / z_far;
-			shadow->dp.y = dp_direction;
-
-			if (shadow_pass == 0) {
-				vp_rect = Rect2(0, sb->size / 2, sb->size, sb->size / 2);
-				glViewport(0, sb->size / 2, sb->size, sb->size / 2);
-				glScissor(0, sb->size / 2, sb->size, sb->size / 2);
-			} else {
-				vp_rect = Rect2(0, 0, sb->size, sb->size / 2);
-				glViewport(0, 0, sb->size, sb->size / 2);
-				glScissor(0, 0, sb->size, sb->size / 2);
-			}
-			glEnable(GL_SCISSOR_TEST);
-			shadow->projection = cm;
-
-			glClearColor(1, 1, 1, 1);
-			_glClearDepth(1.0f);
-			if (use_rgba_shadowmaps)
-				glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
-			else
-				glClear(GL_DEPTH_BUFFER_BIT);
-			glDisable(GL_SCISSOR_TEST);
-
-		} break;
-		case VS::LIGHT_SPOT: {
-
-			float far = shadow->base->vars[VS::LIGHT_PARAM_RADIUS];
-			ERR_FAIL_COND(far <= 0);
-			float near = far / 200.0;
-			if (near < 0.05)
-				near = 0.05;
-
-			float angle = shadow->base->vars[VS::LIGHT_PARAM_SPOT_ANGLE];
-
-			cm.set_perspective(angle * 2.0, 1.0, near, far);
-
-			shadow->projection = cm; // cache
-			light_transform = shadow->transform;
-			z_near = cm.get_z_near();
-			z_far = cm.get_z_far();
-
-			glViewport(0, 0, sb->size, sb->size);
-			vp_rect = Rect2(0, 0, sb->size, sb->size);
-			_glClearDepth(1.0f);
-			glClearColor(1, 1, 1, 1);
-			if (use_rgba_shadowmaps)
-				glClear(GL_DEPTH_BUFFER_BIT | GL_COLOR_BUFFER_BIT);
-			else
-				glClear(GL_DEPTH_BUFFER_BIT);
-
-		} break;
-	}
-
-	Transform light_transform_inverse = light_transform.affine_inverse();
-
-	opaque_render_list.sort_mat_geom();
-	_render_list_forward(&opaque_render_list, light_transform, light_transform_inverse, cm, flip_facing, false);
-
-	material_shader.set_conditional(MaterialShaderGLES2::USE_DUAL_PARABOLOID, false);
-
-	//if (!use_rgba_shadowmaps)
-
-	if (shadow_filter == SHADOW_FILTER_ESM) {
-
-		copy_shader.set_conditional(CopyShaderGLES2::USE_RGBA_DEPTH, use_rgba_shadowmaps);
-		copy_shader.set_conditional(CopyShaderGLES2::USE_HIGHP_SOURCE, !use_rgba_shadowmaps);
-
-		Vector2 psize(1.0 / sb->size, 1.0 / sb->size);
-		float pscale = 1.0;
-		int passes = shadow->base->vars[VS::LIGHT_PARAM_SHADOW_BLUR_PASSES];
-		glDisable(GL_BLEND);
-		glDisable(GL_CULL_FACE);
-#ifdef GLEW_ENABLED
-		glPolygonMode(GL_FRONT_AND_BACK, GL_FILL);
-#endif
-
-		for (int i = 0; i < VS::ARRAY_MAX; i++) {
-			glDisableVertexAttribArray(i);
-		}
-		glBindBuffer(GL_ARRAY_BUFFER, 0);
-		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-		glDisable(GL_SCISSOR_TEST);
-
-		if (!use_rgba_shadowmaps) {
-			glEnable(GL_DEPTH_TEST);
-			glDepthFunc(GL_ALWAYS);
-			glDepthMask(true);
-		} else {
-			glDisable(GL_DEPTH_TEST);
-		}
-
-		for (int i = 0; i < passes; i++) {
-
-			Vector2 src_sb_uv[4] = {
-				(vp_rect.pos + Vector2(0, vp_rect.size.y)) / sb->size,
-				(vp_rect.pos + vp_rect.size) / sb->size,
-				(vp_rect.pos + Vector2(vp_rect.size.x, 0)) / sb->size,
-				(vp_rect.pos) / sb->size
-			};
-			/*
-			Vector2 src_uv[4]={
-				Vector2( 0, 1),
-				Vector2( 1, 1),
-				Vector2( 1, 0),
-				Vector2( 0, 0)
-			};
-*/
-			static const Vector2 dst_pos[4] = {
-				Vector2(-1, 1),
-				Vector2(1, 1),
-				Vector2(1, -1),
-				Vector2(-1, -1)
-			};
-
-			glBindFramebuffer(GL_FRAMEBUFFER, blur_shadow_buffer.fbo);
-			glActiveTexture(GL_TEXTURE0);
-			glBindTexture(GL_TEXTURE_2D, sb->depth);
-#ifdef GLEW_ENABLED
-//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_NONE);
-#endif
-
-			copy_shader.set_conditional(CopyShaderGLES2::SHADOW_BLUR_V_PASS, true);
-			copy_shader.set_conditional(CopyShaderGLES2::SHADOW_BLUR_H_PASS, false);
-
-			copy_shader.bind();
-			copy_shader.set_uniform(CopyShaderGLES2::PIXEL_SIZE, psize);
-			copy_shader.set_uniform(CopyShaderGLES2::PIXEL_SCALE, pscale);
-			copy_shader.set_uniform(CopyShaderGLES2::BLUR_MAGNITUDE, 1);
-			//copy_shader.set_uniform(CopyShaderGLES2::SOURCE,0);
-			glUniform1i(copy_shader.get_uniform_location(CopyShaderGLES2::SOURCE), 0);
-
-			_draw_gui_primitive(4, dst_pos, NULL, src_sb_uv);
-
-			Vector2 src_bb_uv[4] = {
-				(vp_rect.pos + Vector2(0, vp_rect.size.y)) / blur_shadow_buffer.size,
-				(vp_rect.pos + vp_rect.size) / blur_shadow_buffer.size,
-				(vp_rect.pos + Vector2(vp_rect.size.x, 0)) / blur_shadow_buffer.size,
-				(vp_rect.pos) / blur_shadow_buffer.size,
-			};
-
-			glBindFramebuffer(GL_FRAMEBUFFER, sb->fbo);
-			glActiveTexture(GL_TEXTURE0);
-			glBindTexture(GL_TEXTURE_2D, blur_shadow_buffer.depth);
-#ifdef GLEW_ENABLED
-
-//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_NONE);
-#endif
-
-			copy_shader.set_conditional(CopyShaderGLES2::SHADOW_BLUR_V_PASS, false);
-			copy_shader.set_conditional(CopyShaderGLES2::SHADOW_BLUR_H_PASS, true);
-			copy_shader.bind();
-			copy_shader.set_uniform(CopyShaderGLES2::PIXEL_SIZE, psize);
-			copy_shader.set_uniform(CopyShaderGLES2::PIXEL_SCALE, pscale);
-			copy_shader.set_uniform(CopyShaderGLES2::BLUR_MAGNITUDE, 1);
-			glUniform1i(copy_shader.get_uniform_location(CopyShaderGLES2::SOURCE), 0);
-
-			_draw_gui_primitive(4, dst_pos, NULL, src_bb_uv);
-		}
-
-		glDepthFunc(GL_LEQUAL);
-		copy_shader.set_conditional(CopyShaderGLES2::USE_RGBA_DEPTH, false);
-		copy_shader.set_conditional(CopyShaderGLES2::USE_HIGHP_SOURCE, false);
-		copy_shader.set_conditional(CopyShaderGLES2::SHADOW_BLUR_V_PASS, false);
-		copy_shader.set_conditional(CopyShaderGLES2::SHADOW_BLUR_H_PASS, false);
-	}
-
-	DEBUG_TEST_ERROR("Drawing Shadow");
-	shadow = NULL;
-	glBindFramebuffer(GL_FRAMEBUFFER, current_rt ? current_rt->fbo : base_framebuffer);
-	glColorMask(1, 1, 1, 1);
-	//glDisable(GL_POLYGON_OFFSET_FILL);
-}
-
-void RasterizerGLES2::_debug_draw_shadow(GLuint tex, const Rect2 &p_rect) {
-
-	Transform2D modelview;
-	modelview.translate(p_rect.pos.x, p_rect.pos.y);
-	canvas_shader.set_uniform(CanvasShaderGLES2::MODELVIEW_MATRIX, modelview);
-	glBindTexture(GL_TEXTURE_2D, tex);
-
-	Vector3 coords[4] = {
-		Vector3(p_rect.pos.x, p_rect.pos.y, 0),
-		Vector3(p_rect.pos.x + p_rect.size.width,
-				p_rect.pos.y, 0),
-		Vector3(p_rect.pos.x + p_rect.size.width,
-				p_rect.pos.y + p_rect.size.height, 0),
-		Vector3(p_rect.pos.x,
-				p_rect.pos.y + p_rect.size.height, 0)
-	};
-
-	Vector3 texcoords[4] = {
-		Vector3(0.0f, 0.0f, 0),
-		Vector3(1.0f, 0.0f, 0),
-		Vector3(1.0f, 1.0f, 0),
-		Vector3(0.0f, 1.0f, 0),
-	};
-
-	_draw_primitive(4, coords, 0, 0, texcoords);
-	//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_COMPARE_R_TO_TEXTURE);
-}
-
-void RasterizerGLES2::_debug_draw_shadows_type(Vector<ShadowBuffer> &p_shadows, Point2 &ofs) {
-
-	Size2 debug_size(128, 128);
-	//Size2 debug_size(512,512);
-
-	int useblur = shadow_filter == SHADOW_FILTER_ESM ? 1 : 0;
-	for (int i = 0; i < p_shadows.size() + useblur; i++) {
-
-		ShadowBuffer *sb = i == p_shadows.size() ? &blur_shadow_buffer : &p_shadows[i];
-
-		if (!sb->owner && i != p_shadows.size())
-			continue;
-
-		_debug_draw_shadow(sb->depth, Rect2(ofs, debug_size));
-		ofs.x += debug_size.x;
-		if ((ofs.x + debug_size.x) > viewport.width) {
-
-			ofs.x = 0;
-			ofs.y += debug_size.y;
-		}
-	}
-}
-
-void RasterizerGLES2::_debug_luminances() {
-
-	canvas_shader.set_conditional(CanvasShaderGLES2::DEBUG_ENCODED_32, !use_fp16_fb);
-	canvas_begin();
-	glDisable(GL_BLEND);
-	canvas_shader.bind();
-
-	Size2 debug_size(128, 128);
-	Size2 ofs;
-
-	for (int i = 0; i <= framebuffer.luminance.size(); i++) {
-
-		if (i == framebuffer.luminance.size()) {
-			if (!current_vd)
-				break;
-			_debug_draw_shadow(current_vd->lum_color, Rect2(ofs, debug_size));
-		} else {
-			_debug_draw_shadow(framebuffer.luminance[i].color, Rect2(ofs, debug_size));
-		}
-		ofs.x += debug_size.x / 2;
-		if ((ofs.x + debug_size.x) > viewport.width) {
-
-			ofs.x = 0;
-			ofs.y += debug_size.y;
-		}
-	}
-
-	canvas_shader.set_conditional(CanvasShaderGLES2::DEBUG_ENCODED_32, false);
-}
-
-void RasterizerGLES2::_debug_samplers() {
-	canvas_shader.set_conditional(CanvasShaderGLES2::DEBUG_ENCODED_32, false);
-	canvas_begin();
-	glDisable(GL_BLEND);
-	_set_color_attrib(Color(1, 1, 1, 1));
-	canvas_shader.bind();
-
-	List<RID> samplers;
-	sampled_light_owner.get_owned_list(&samplers);
-
-	Size2 debug_size(128, 128);
-	Size2 ofs;
-
-	for (List<RID>::Element *E = samplers.front(); E; E = E->next()) {
-
-		SampledLight *sl = sampled_light_owner.get(E->get());
-
-		_debug_draw_shadow(sl->texture, Rect2(ofs, debug_size));
-
-		ofs.x += debug_size.x / 2;
-		if ((ofs.x + debug_size.x) > viewport.width) {
-
-			ofs.x = 0;
-			ofs.y += debug_size.y;
-		}
-	}
-}
-void RasterizerGLES2::_debug_shadows() {
-
-	canvas_begin();
-	glDisable(GL_BLEND);
-	Size2 ofs;
-
-	/*
-	for(int i=0;i<16;i++) {
-		glActiveTexture(GL_TEXTURE0+i);
-		//glDisable(GL_TEXTURE_2D);
-	}
-	glActiveTexture(GL_TEXTURE0);
-	//glEnable(GL_TEXTURE_2D);
-	*/
-
-	_debug_draw_shadows_type(near_shadow_buffers, ofs);
-	//_debug_draw_shadows_type(far_shadow_buffers,ofs);
-}
-
-void RasterizerGLES2::end_frame() {
-
-	//print_line("VTX: "+itos(_rinfo.vertex_count)+" OBJ: "+itos(_rinfo.object_count)+" MAT: "+itos(_rinfo.mat_change_count)+" SHD: "+itos(_rinfo.shader_change_count)+" CI: "+itos(_rinfo.ci_draw_commands));
-
-	//print_line("TOTAL VTX: "+itos(_rinfo.vertex_count));
-	OS::get_singleton()->swap_buffers();
-}
-
-void RasterizerGLES2::flush_frame() {
-
-	glFlush();
-}
-
-/* CANVAS API */
-
-void RasterizerGLES2::begin_canvas_bg() {
-
-	if (framebuffer.active) {
-		using_canvas_bg = true;
-		glBindFramebuffer(GL_FRAMEBUFFER, framebuffer.fbo);
-		glViewport(0, 0, viewport.width, viewport.height);
-	} else {
-		using_canvas_bg = false;
-	}
-}
-
-void RasterizerGLES2::canvas_begin() {
-
-	if (using_canvas_bg) {
-		glBindFramebuffer(GL_FRAMEBUFFER, framebuffer.fbo);
-		glColorMask(1, 1, 1, 0); //don't touch alpha
-	}
-
-	glDisable(GL_CULL_FACE);
-	glDisable(GL_DEPTH_TEST);
-	glDisable(GL_SCISSOR_TEST);
-#ifdef GLEW_ENABLED
-	glDisable(GL_POINT_SPRITE);
-	glDisable(GL_VERTEX_PROGRAM_POINT_SIZE);
-#endif
-	glEnable(GL_BLEND);
-	glBlendEquation(GL_FUNC_ADD);
-	if (current_rt && current_rt_transparent) {
-		glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-	} else {
-		glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-	}
-	//glPolygonMode(GL_FRONT_AND_BACK,GL_FILL);
-	glLineWidth(1.0);
-	glBindBuffer(GL_ARRAY_BUFFER, 0);
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-	for (int i = 0; i < VS::ARRAY_MAX; i++) {
-		glDisableVertexAttribArray(i);
-	}
-
-	glActiveTexture(GL_TEXTURE0);
-	glBindTexture(GL_TEXTURE_2D, white_tex);
-	canvas_tex = RID();
-	//material_shader.unbind();
-	canvas_shader.unbind();
-	canvas_shader.set_custom_shader(0);
-	canvas_shader.set_conditional(CanvasShaderGLES2::USE_MODULATE, false);
-	canvas_shader.bind();
-	canvas_shader.set_uniform(CanvasShaderGLES2::TEXTURE, 0);
-	canvas_use_modulate = false;
-	_set_color_attrib(Color(1, 1, 1));
-	canvas_transform = Transform();
-	canvas_transform.translate(-(viewport.width / 2.0f), -(viewport.height / 2.0f), 0.0f);
-	float csy = 1.0;
-	if (current_rt && current_rt_vflip)
-		csy = -1.0;
-
-	canvas_transform.scale(Vector3(2.0f / viewport.width, csy * -2.0f / viewport.height, 1.0f));
-	canvas_shader.set_uniform(CanvasShaderGLES2::PROJECTION_MATRIX, canvas_transform);
-	canvas_shader.set_uniform(CanvasShaderGLES2::MODELVIEW_MATRIX, Transform2D());
-	canvas_shader.set_uniform(CanvasShaderGLES2::EXTRA_MATRIX, Transform2D());
-
-	canvas_opacity = 1.0;
-	canvas_blend_mode = VS::MATERIAL_BLEND_MODE_MIX;
-	canvas_texscreen_used = false;
-	uses_texpixel_size = false;
-
-	canvas_last_material = NULL;
-}
-
-void RasterizerGLES2::canvas_disable_blending() {
-
-	glDisable(GL_BLEND);
-}
-
-void RasterizerGLES2::canvas_set_opacity(float p_opacity) {
-
-	canvas_opacity = p_opacity;
-}
-
-void RasterizerGLES2::canvas_set_blend_mode(VS::MaterialBlendMode p_mode) {
-
-	if (p_mode == canvas_blend_mode)
-		return;
-	switch (p_mode) {
-
-		case VS::MATERIAL_BLEND_MODE_MIX: {
-			glBlendEquation(GL_FUNC_ADD);
-			if (current_rt && current_rt_transparent) {
-				glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-			} else {
-				glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-			}
-
-		} break;
-		case VS::MATERIAL_BLEND_MODE_ADD: {
-
-			glBlendEquation(GL_FUNC_ADD);
-			glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-
-		} break;
-		case VS::MATERIAL_BLEND_MODE_SUB: {
-
-			glBlendEquation(GL_FUNC_REVERSE_SUBTRACT);
-			glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-		} break;
-		case VS::MATERIAL_BLEND_MODE_MUL: {
-			glBlendEquation(GL_FUNC_ADD);
-			glBlendFunc(GL_DST_COLOR, GL_ZERO);
-		} break;
-		case VS::MATERIAL_BLEND_MODE_PREMULT_ALPHA: {
-			glBlendEquation(GL_FUNC_ADD);
-			glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-		} break;
-	}
-
-	canvas_blend_mode = p_mode;
-}
-
-void RasterizerGLES2::canvas_begin_rect(const Transform2D &p_transform) {
-
-	canvas_shader.set_uniform(CanvasShaderGLES2::MODELVIEW_MATRIX, p_transform);
-	canvas_shader.set_uniform(CanvasShaderGLES2::EXTRA_MATRIX, Transform2D());
-}
-
-void RasterizerGLES2::canvas_set_clip(bool p_clip, const Rect2 &p_rect) {
-
-	if (p_clip) {
-
-		glEnable(GL_SCISSOR_TEST);
-		//glScissor(viewport.x+p_rect.pos.x,viewport.y+ (viewport.height-(p_rect.pos.y+p_rect.size.height)),
-
-		int x = p_rect.pos.x;
-		int y = window_size.height - (p_rect.pos.y + p_rect.size.y);
-		int w = p_rect.size.x;
-		int h = p_rect.size.y;
-
-		glScissor(x, y, w, h);
-
-	} else {
-
-		glDisable(GL_SCISSOR_TEST);
-	}
-}
-
-void RasterizerGLES2::canvas_end_rect() {
-
-	//glPopMatrix();
-}
-
-RasterizerGLES2::Texture *RasterizerGLES2::_bind_canvas_texture(const RID &p_texture) {
-
-	if (p_texture == canvas_tex && !rebind_texpixel_size) {
-		if (canvas_tex.is_valid()) {
-			Texture *texture = texture_owner.get(p_texture);
-			return texture;
-		}
-		return NULL;
-	}
-
-	rebind_texpixel_size = false;
-
-	if (p_texture.is_valid()) {
-
-		Texture *texture = texture_owner.get(p_texture);
-		if (!texture) {
-			canvas_tex = RID();
-			glBindTexture(GL_TEXTURE_2D, white_tex);
-
-			return NULL;
-		}
-
-		if (texture->render_target)
-			texture->render_target->last_pass = frame;
-
-		glBindTexture(GL_TEXTURE_2D, texture->tex_id);
-		canvas_tex = p_texture;
-		if (uses_texpixel_size) {
-			canvas_shader.set_uniform(CanvasShaderGLES2::TEXPIXEL_SIZE, Size2(1.0 / texture->width, 1.0 / texture->height));
-		}
-		return texture;
-
-	} else {
-
-		glBindTexture(GL_TEXTURE_2D, white_tex);
-		canvas_tex = p_texture;
-	}
-
-	return NULL;
-}
-
-void RasterizerGLES2::canvas_draw_line(const Point2 &p_from, const Point2 &p_to, const Color &p_color, float p_width, bool p_antialiased) {
-
-	_bind_canvas_texture(RID());
-	Color c = p_color;
-	c.a *= canvas_opacity;
-	_set_color_attrib(c);
-
-	Vector3 verts[2] = {
-		Vector3(p_from.x, p_from.y, 0),
-		Vector3(p_to.x, p_to.y, 0)
-	};
-
-#ifdef GLEW_ENABLED
-	if (p_antialiased)
-		glEnable(GL_LINE_SMOOTH);
-#endif
-	glLineWidth(p_width);
-	_draw_primitive(2, verts, 0, 0, 0);
-
-#ifdef GLEW_ENABLED
-	if (p_antialiased)
-		glDisable(GL_LINE_SMOOTH);
-#endif
-
-	_rinfo.ci_draw_commands++;
-}
-
-void RasterizerGLES2::_draw_gui_primitive(int p_points, const Vector2 *p_vertices, const Color *p_colors, const Vector2 *p_uvs) {
-
-	static const GLenum prim[5] = { GL_POINTS, GL_POINTS, GL_LINES, GL_TRIANGLES, GL_TRIANGLE_FAN };
-
-//#define GLES_USE_PRIMITIVE_BUFFER
-
-#ifndef GLES_NO_CLIENT_ARRAYS
-
-	glEnableVertexAttribArray(VS::ARRAY_VERTEX);
-	glVertexAttribPointer(VS::ARRAY_VERTEX, 2, GL_FLOAT, false, sizeof(Vector2), p_vertices);
-
-	if (p_colors) {
-
-		glEnableVertexAttribArray(VS::ARRAY_COLOR);
-		glVertexAttribPointer(VS::ARRAY_COLOR, 4, GL_FLOAT, false, sizeof(Color), p_colors);
-	} else {
-		glDisableVertexAttribArray(VS::ARRAY_COLOR);
-	}
-
-	if (p_uvs) {
-
-		glEnableVertexAttribArray(VS::ARRAY_TEX_UV);
-		glVertexAttribPointer(VS::ARRAY_TEX_UV, 2, GL_FLOAT, false, sizeof(Vector2), p_uvs);
-	} else {
-		glDisableVertexAttribArray(VS::ARRAY_TEX_UV);
-	}
-
-	glDrawArrays(prim[p_points], 0, p_points);
-
-#else
-
-	glBindBuffer(GL_ARRAY_BUFFER, gui_quad_buffer);
-	float b[32];
-	int ofs = 0;
-	glEnableVertexAttribArray(VS::ARRAY_VERTEX);
-	glVertexAttribPointer(VS::ARRAY_VERTEX, 2, GL_FLOAT, false, sizeof(float) * 2, ((float *)0) + ofs);
-	for (int i = 0; i < p_points; i++) {
-		b[ofs++] = p_vertices[i].x;
-		b[ofs++] = p_vertices[i].y;
-	}
-
-	if (p_colors) {
-
-		glEnableVertexAttribArray(VS::ARRAY_COLOR);
-		glVertexAttribPointer(VS::ARRAY_COLOR, 4, GL_FLOAT, false, sizeof(float) * 4, ((float *)0) + ofs);
-		for (int i = 0; i < p_points; i++) {
-			b[ofs++] = p_colors[i].r;
-			b[ofs++] = p_colors[i].g;
-			b[ofs++] = p_colors[i].b;
-			b[ofs++] = p_colors[i].a;
-		}
-
-	} else {
-		glDisableVertexAttribArray(VS::ARRAY_COLOR);
-	}
-
-	if (p_uvs) {
-
-		glEnableVertexAttribArray(VS::ARRAY_TEX_UV);
-		glVertexAttribPointer(VS::ARRAY_TEX_UV, 2, GL_FLOAT, false, sizeof(float) * 2, ((float *)0) + ofs);
-		for (int i = 0; i < p_points; i++) {
-			b[ofs++] = p_uvs[i].x;
-			b[ofs++] = p_uvs[i].y;
-		}
-
-	} else {
-		glDisableVertexAttribArray(VS::ARRAY_TEX_UV);
-	}
-
-	glBufferSubData(GL_ARRAY_BUFFER, 0, ofs * 4, &b[0]);
-	glDrawArrays(prim[p_points], 0, p_points);
-	glBindBuffer(GL_ARRAY_BUFFER, 0);
-
-#endif
-	_rinfo.ci_draw_commands++;
-}
-
-void RasterizerGLES2::_draw_gui_primitive2(int p_points, const Vector2 *p_vertices, const Color *p_colors, const Vector2 *p_uvs, const Vector2 *p_uvs2) {
-
-	static const GLenum prim[5] = { GL_POINTS, GL_POINTS, GL_LINES, GL_TRIANGLES, GL_TRIANGLE_FAN };
-
-	glEnableVertexAttribArray(VS::ARRAY_VERTEX);
-	glVertexAttribPointer(VS::ARRAY_VERTEX, 2, GL_FLOAT, false, sizeof(Vector2), p_vertices);
-	if (p_colors) {
-
-		glEnableVertexAttribArray(VS::ARRAY_COLOR);
-		glVertexAttribPointer(VS::ARRAY_COLOR, 4, GL_FLOAT, false, sizeof(Color), p_colors);
-	} else {
-		glDisableVertexAttribArray(VS::ARRAY_COLOR);
-	}
-
-	if (p_uvs) {
-
-		glEnableVertexAttribArray(VS::ARRAY_TEX_UV);
-		glVertexAttribPointer(VS::ARRAY_TEX_UV, 2, GL_FLOAT, false, sizeof(Vector2), p_uvs);
-	} else {
-		glDisableVertexAttribArray(VS::ARRAY_TEX_UV);
-	}
-
-	if (p_uvs2) {
-
-		glEnableVertexAttribArray(VS::ARRAY_TEX_UV2);
-		glVertexAttribPointer(VS::ARRAY_TEX_UV2, 2, GL_FLOAT, false, sizeof(Vector2), p_uvs2);
-	} else {
-		glDisableVertexAttribArray(VS::ARRAY_TEX_UV2);
-	}
-
-	glDrawArrays(prim[p_points], 0, p_points);
-	_rinfo.ci_draw_commands++;
-}
-
-void RasterizerGLES2::_draw_textured_quad(const Rect2 &p_rect, const Rect2 &p_src_region, const Size2 &p_tex_size, bool p_h_flip, bool p_v_flip, bool p_transpose) {
-
-	Vector2 texcoords[4] = {
-		Vector2(p_src_region.pos.x / p_tex_size.width,
-				p_src_region.pos.y / p_tex_size.height),
-
-		Vector2((p_src_region.pos.x + p_src_region.size.width) / p_tex_size.width,
-				p_src_region.pos.y / p_tex_size.height),
-
-		Vector2((p_src_region.pos.x + p_src_region.size.width) / p_tex_size.width,
-				(p_src_region.pos.y + p_src_region.size.height) / p_tex_size.height),
-
-		Vector2(p_src_region.pos.x / p_tex_size.width,
-				(p_src_region.pos.y + p_src_region.size.height) / p_tex_size.height)
-	};
-
-	if (p_transpose) {
-		SWAP(texcoords[1], texcoords[3]);
-	}
-	if (p_h_flip) {
-		SWAP(texcoords[0], texcoords[1]);
-		SWAP(texcoords[2], texcoords[3]);
-	}
-	if (p_v_flip) {
-		SWAP(texcoords[1], texcoords[2]);
-		SWAP(texcoords[0], texcoords[3]);
-	}
-
-	Vector2 coords[4] = {
-		Vector2(p_rect.pos.x, p_rect.pos.y),
-		Vector2(p_rect.pos.x + p_rect.size.width, p_rect.pos.y),
-		Vector2(p_rect.pos.x + p_rect.size.width, p_rect.pos.y + p_rect.size.height),
-		Vector2(p_rect.pos.x, p_rect.pos.y + p_rect.size.height)
-	};
-
-	_draw_gui_primitive(4, coords, 0, texcoords);
-	_rinfo.ci_draw_commands++;
-}
-
-void RasterizerGLES2::_draw_quad(const Rect2 &p_rect) {
-
-	Vector2 coords[4] = {
-		Vector2(p_rect.pos.x, p_rect.pos.y),
-		Vector2(p_rect.pos.x + p_rect.size.width, p_rect.pos.y),
-		Vector2(p_rect.pos.x + p_rect.size.width, p_rect.pos.y + p_rect.size.height),
-		Vector2(p_rect.pos.x, p_rect.pos.y + p_rect.size.height)
-	};
-
-	_draw_gui_primitive(4, coords, 0, 0);
-	_rinfo.ci_draw_commands++;
-}
-
-void RasterizerGLES2::canvas_draw_rect(const Rect2 &p_rect, int p_flags, const Rect2 &p_source, RID p_texture, const Color &p_modulate) {
-
-	Color m = p_modulate;
-	m.a *= canvas_opacity;
-	_set_color_attrib(m);
-	Texture *texture = _bind_canvas_texture(p_texture);
-
-	if (texture) {
-
-		bool untile = false;
-
-		if (p_flags & CANVAS_RECT_TILE && !(texture->flags & VS::TEXTURE_FLAG_REPEAT)) {
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_REPEAT);
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_REPEAT);
-			untile = true;
-		}
-
-		if (!(p_flags & CANVAS_RECT_REGION)) {
-
-			Rect2 region = Rect2(0, 0, texture->width, texture->height);
-			_draw_textured_quad(p_rect, region, region.size, p_flags & CANVAS_RECT_FLIP_H, p_flags & CANVAS_RECT_FLIP_V, p_flags & CANVAS_RECT_TRANSPOSE);
-
-		} else {
-
-			_draw_textured_quad(p_rect, p_source, Size2(texture->width, texture->height), p_flags & CANVAS_RECT_FLIP_H, p_flags & CANVAS_RECT_FLIP_V, p_flags & CANVAS_RECT_TRANSPOSE);
-		}
-
-		if (untile) {
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-		}
-
-	} else {
-
-		//glDisable(GL_TEXTURE_2D);
-		_draw_quad(p_rect);
-		//print_line("rect: "+p_rect);
-	}
-
-	_rinfo.ci_draw_commands++;
-}
-
-void RasterizerGLES2::canvas_draw_style_box(const Rect2 &p_rect, const Rect2 &p_src_region, RID p_texture, const float *p_margins, bool p_draw_center, const Color &p_modulate) {
-
-	Color m = p_modulate;
-	m.a *= canvas_opacity;
-	_set_color_attrib(m);
-
-	Texture *texture = _bind_canvas_texture(p_texture);
-	ERR_FAIL_COND(!texture);
-
-	Rect2 region = p_src_region;
-	if (region.size.width <= 0)
-		region.size.width = texture->width;
-	if (region.size.height <= 0)
-		region.size.height = texture->height;
-	/* CORNERS */
-	_draw_textured_quad( // top left
-			Rect2(p_rect.pos, Size2(p_margins[MARGIN_LEFT], p_margins[MARGIN_TOP])),
-			Rect2(region.pos, Size2(p_margins[MARGIN_LEFT], p_margins[MARGIN_TOP])),
-			Size2(texture->width, texture->height));
-
-	_draw_textured_quad( // top right
-			Rect2(Point2(p_rect.pos.x + p_rect.size.width - p_margins[MARGIN_RIGHT], p_rect.pos.y), Size2(p_margins[MARGIN_RIGHT], p_margins[MARGIN_TOP])),
-			Rect2(Point2(region.pos.x + region.size.width - p_margins[MARGIN_RIGHT], region.pos.y), Size2(p_margins[MARGIN_RIGHT], p_margins[MARGIN_TOP])),
-			Size2(texture->width, texture->height));
-
-	_draw_textured_quad( // bottom left
-			Rect2(Point2(p_rect.pos.x, p_rect.pos.y + p_rect.size.height - p_margins[MARGIN_BOTTOM]), Size2(p_margins[MARGIN_LEFT], p_margins[MARGIN_BOTTOM])),
-			Rect2(Point2(region.pos.x, region.pos.y + region.size.height - p_margins[MARGIN_BOTTOM]), Size2(p_margins[MARGIN_LEFT], p_margins[MARGIN_BOTTOM])),
-			Size2(texture->width, texture->height));
-
-	_draw_textured_quad( // bottom right
-			Rect2(Point2(p_rect.pos.x + p_rect.size.width - p_margins[MARGIN_RIGHT], p_rect.pos.y + p_rect.size.height - p_margins[MARGIN_BOTTOM]), Size2(p_margins[MARGIN_RIGHT], p_margins[MARGIN_BOTTOM])),
-			Rect2(Point2(region.pos.x + region.size.width - p_margins[MARGIN_RIGHT], region.pos.y + region.size.height - p_margins[MARGIN_BOTTOM]), Size2(p_margins[MARGIN_RIGHT], p_margins[MARGIN_BOTTOM])),
-			Size2(texture->width, texture->height));
-
-	Rect2 rect_center(p_rect.pos + Point2(p_margins[MARGIN_LEFT], p_margins[MARGIN_TOP]), Size2(p_rect.size.width - p_margins[MARGIN_LEFT] - p_margins[MARGIN_RIGHT], p_rect.size.height - p_margins[MARGIN_TOP] - p_margins[MARGIN_BOTTOM]));
-
-	Rect2 src_center(Point2(region.pos.x + p_margins[MARGIN_LEFT], region.pos.y + p_margins[MARGIN_TOP]), Size2(region.size.width - p_margins[MARGIN_LEFT] - p_margins[MARGIN_RIGHT], region.size.height - p_margins[MARGIN_TOP] - p_margins[MARGIN_BOTTOM]));
-
-	_draw_textured_quad( // top
-			Rect2(Point2(rect_center.pos.x, p_rect.pos.y), Size2(rect_center.size.width, p_margins[MARGIN_TOP])),
-			Rect2(Point2(src_center.pos.x, region.pos.y), Size2(src_center.size.width, p_margins[MARGIN_TOP])),
-			Size2(texture->width, texture->height));
-
-	_draw_textured_quad( // bottom
-			Rect2(Point2(rect_center.pos.x, rect_center.pos.y + rect_center.size.height), Size2(rect_center.size.width, p_margins[MARGIN_BOTTOM])),
-			Rect2(Point2(src_center.pos.x, src_center.pos.y + src_center.size.height), Size2(src_center.size.width, p_margins[MARGIN_BOTTOM])),
-			Size2(texture->width, texture->height));
-
-	_draw_textured_quad( // left
-			Rect2(Point2(p_rect.pos.x, rect_center.pos.y), Size2(p_margins[MARGIN_LEFT], rect_center.size.height)),
-			Rect2(Point2(region.pos.x, region.pos.y + p_margins[MARGIN_TOP]), Size2(p_margins[MARGIN_LEFT], src_center.size.height)),
-			Size2(texture->width, texture->height));
-
-	_draw_textured_quad( // right
-			Rect2(Point2(rect_center.pos.x + rect_center.size.width, rect_center.pos.y), Size2(p_margins[MARGIN_RIGHT], rect_center.size.height)),
-			Rect2(Point2(src_center.pos.x + src_center.size.width, region.pos.y + p_margins[MARGIN_TOP]), Size2(p_margins[MARGIN_RIGHT], src_center.size.height)),
-			Size2(texture->width, texture->height));
-
-	if (p_draw_center) {
-
-		_draw_textured_quad(
-				rect_center,
-				src_center,
-				Size2(texture->width, texture->height));
-	}
-
-	_rinfo.ci_draw_commands++;
-}
-
-void RasterizerGLES2::canvas_draw_primitive(const Vector<Point2> &p_points, const Vector<Color> &p_colors, const Vector<Point2> &p_uvs, RID p_texture, float p_width) {
-
-	ERR_FAIL_COND(p_points.size() < 1);
-	_set_color_attrib(Color(1, 1, 1, canvas_opacity));
-	_bind_canvas_texture(p_texture);
-	_draw_gui_primitive(p_points.size(), p_points.ptr(), p_colors.ptr(), p_uvs.ptr());
-
-	_rinfo.ci_draw_commands++;
-}
-
-void RasterizerGLES2::canvas_draw_polygon(int p_vertex_count, const int *p_indices, const Vector2 *p_vertices, const Vector2 *p_uvs, const Color *p_colors, const RID &p_texture, bool p_singlecolor) {
-
-	bool do_colors = false;
-	Color m;
-	if (p_singlecolor) {
-		m = *p_colors;
-		m.a *= canvas_opacity;
-		_set_color_attrib(m);
-	} else if (!p_colors) {
-		m = Color(1, 1, 1, canvas_opacity);
-		_set_color_attrib(m);
-	} else
-		do_colors = true;
-
-	Texture *texture = _bind_canvas_texture(p_texture);
-
-#ifndef GLES_NO_CLIENT_ARRAYS
-	glEnableVertexAttribArray(VS::ARRAY_VERTEX);
-	glVertexAttribPointer(VS::ARRAY_VERTEX, 2, GL_FLOAT, false, sizeof(Vector2), p_vertices);
-	if (do_colors) {
-
-		glEnableVertexAttribArray(VS::ARRAY_COLOR);
-		glVertexAttribPointer(VS::ARRAY_COLOR, 4, GL_FLOAT, false, sizeof(Color), p_colors);
-	} else {
-		glDisableVertexAttribArray(VS::ARRAY_COLOR);
-	}
-
-	if (texture && p_uvs) {
-
-		glEnableVertexAttribArray(VS::ARRAY_TEX_UV);
-		glVertexAttribPointer(VS::ARRAY_TEX_UV, 2, GL_FLOAT, false, sizeof(Vector2), p_uvs);
-	} else {
-		glDisableVertexAttribArray(VS::ARRAY_TEX_UV);
-	}
-
-	if (p_indices) {
-#ifdef GLEW_ENABLED
-		glDrawElements(GL_TRIANGLES, p_vertex_count, GL_UNSIGNED_INT, p_indices);
-#else
-		static const int _max_draw_poly_indices = 16 * 1024; // change this size if needed!!!
-		ERR_FAIL_COND(p_vertex_count > _max_draw_poly_indices);
-		static uint16_t _draw_poly_indices[_max_draw_poly_indices];
-		for (int i = 0; i < p_vertex_count; i++) {
-			_draw_poly_indices[i] = p_indices[i];
-		};
-		glDrawElements(GL_TRIANGLES, p_vertex_count, GL_UNSIGNED_SHORT, _draw_poly_indices);
-#endif
-	} else {
-		glDrawArrays(GL_TRIANGLES, 0, p_vertex_count);
-	}
-
-#else //WebGL specific impl.
-	glBindBuffer(GL_ARRAY_BUFFER, gui_quad_buffer);
-	float *b = GlobalVertexBuffer;
-	int ofs = 0;
-	if (p_vertex_count > MAX_POLYGON_VERTICES) {
-		print_line("Too many vertices to render");
-		return;
-	}
-	glEnableVertexAttribArray(VS::ARRAY_VERTEX);
-	glVertexAttribPointer(VS::ARRAY_VERTEX, 2, GL_FLOAT, false, sizeof(float) * 2, ((float *)0) + ofs);
-	for (int i = 0; i < p_vertex_count; i++) {
-		b[ofs++] = p_vertices[i].x;
-		b[ofs++] = p_vertices[i].y;
-	}
-
-	if (p_colors && do_colors) {
-
-		glEnableVertexAttribArray(VS::ARRAY_COLOR);
-		glVertexAttribPointer(VS::ARRAY_COLOR, 4, GL_FLOAT, false, sizeof(float) * 4, ((float *)0) + ofs);
-		for (int i = 0; i < p_vertex_count; i++) {
-			b[ofs++] = p_colors[i].r;
-			b[ofs++] = p_colors[i].g;
-			b[ofs++] = p_colors[i].b;
-			b[ofs++] = p_colors[i].a;
-		}
-
-	} else {
-		glDisableVertexAttribArray(VS::ARRAY_COLOR);
-	}
-
-	if (p_uvs) {
-
-		glEnableVertexAttribArray(VS::ARRAY_TEX_UV);
-		glVertexAttribPointer(VS::ARRAY_TEX_UV, 2, GL_FLOAT, false, sizeof(float) * 2, ((float *)0) + ofs);
-		for (int i = 0; i < p_vertex_count; i++) {
-			b[ofs++] = p_uvs[i].x;
-			b[ofs++] = p_uvs[i].y;
-		}
-
-	} else {
-		glDisableVertexAttribArray(VS::ARRAY_TEX_UV);
-	}
-
-	glBufferSubData(GL_ARRAY_BUFFER, 0, ofs * 4, &b[0]);
-
-	//bind the indices buffer.
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indices_buffer);
-
-	static const int _max_draw_poly_indices = 16 * 1024; // change this size if needed!!!
-	ERR_FAIL_COND(p_vertex_count > _max_draw_poly_indices);
-	static uint16_t _draw_poly_indices[_max_draw_poly_indices];
-	for (int i = 0; i < p_vertex_count; i++) {
-		_draw_poly_indices[i] = p_indices[i];
-		//OS::get_singleton()->print("ind: %d ", p_indices[i]);
-	};
-
-	//copy the data to GPU.
-	glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, p_vertex_count * sizeof(uint16_t), &_draw_poly_indices[0]);
-
-	//draw the triangles.
-	glDrawElements(GL_TRIANGLES, p_vertex_count, GL_UNSIGNED_SHORT, 0);
-
-	glBindBuffer(GL_ARRAY_BUFFER, 0);
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-#endif
-
-	_rinfo.ci_draw_commands++;
-};
-
-void RasterizerGLES2::canvas_set_transform(const Transform2D &p_transform) {
-
-	canvas_shader.set_uniform(CanvasShaderGLES2::EXTRA_MATRIX, p_transform);
-
-	//canvas_transform = Variant(p_transform);
-}
-
-RID RasterizerGLES2::canvas_light_occluder_create() {
-
-	CanvasOccluder *co = memnew(CanvasOccluder);
-	co->index_id = 0;
-	co->vertex_id = 0;
-	co->len = 0;
-
-	return canvas_occluder_owner.make_rid(co);
-}
-
-void RasterizerGLES2::canvas_light_occluder_set_polylines(RID p_occluder, const PoolVector<Vector2> &p_lines) {
-
-	CanvasOccluder *co = canvas_occluder_owner.get(p_occluder);
-	ERR_FAIL_COND(!co);
-
-	co->lines = p_lines;
-
-	if (p_lines.size() != co->len) {
-
-		if (co->index_id)
-			glDeleteBuffers(1, &co->index_id);
-		if (co->vertex_id)
-			glDeleteBuffers(1, &co->vertex_id);
-
-		co->index_id = 0;
-		co->vertex_id = 0;
-		co->len = 0;
-	}
-
-	if (p_lines.size()) {
-
-		PoolVector<float> geometry;
-		PoolVector<uint16_t> indices;
-		int lc = p_lines.size();
-
-		geometry.resize(lc * 6);
-		indices.resize(lc * 3);
-
-		PoolVector<float>::Write vw = geometry.write();
-		PoolVector<uint16_t>::Write iw = indices.write();
-
-		PoolVector<Vector2>::Read lr = p_lines.read();
-
-		const int POLY_HEIGHT = 16384;
-
-		for (int i = 0; i < lc / 2; i++) {
-
-			vw[i * 12 + 0] = lr[i * 2 + 0].x;
-			vw[i * 12 + 1] = lr[i * 2 + 0].y;
-			vw[i * 12 + 2] = POLY_HEIGHT;
-
-			vw[i * 12 + 3] = lr[i * 2 + 1].x;
-			vw[i * 12 + 4] = lr[i * 2 + 1].y;
-			vw[i * 12 + 5] = POLY_HEIGHT;
-
-			vw[i * 12 + 6] = lr[i * 2 + 1].x;
-			vw[i * 12 + 7] = lr[i * 2 + 1].y;
-			vw[i * 12 + 8] = -POLY_HEIGHT;
-
-			vw[i * 12 + 9] = lr[i * 2 + 0].x;
-			vw[i * 12 + 10] = lr[i * 2 + 0].y;
-			vw[i * 12 + 11] = -POLY_HEIGHT;
-
-			iw[i * 6 + 0] = i * 4 + 0;
-			iw[i * 6 + 1] = i * 4 + 1;
-			iw[i * 6 + 2] = i * 4 + 2;
-
-			iw[i * 6 + 3] = i * 4 + 2;
-			iw[i * 6 + 4] = i * 4 + 3;
-			iw[i * 6 + 5] = i * 4 + 0;
-		}
-
-		//if same buffer len is being set, just use BufferSubData to avoid a pipeline flush
-
-		if (!co->vertex_id) {
-			glGenBuffers(1, &co->vertex_id);
-			glBindBuffer(GL_ARRAY_BUFFER, co->vertex_id);
-			glBufferData(GL_ARRAY_BUFFER, lc * 6 * sizeof(real_t), vw.ptr(), GL_STATIC_DRAW);
-		} else {
-
-			glBindBuffer(GL_ARRAY_BUFFER, co->vertex_id);
-			glBufferSubData(GL_ARRAY_BUFFER, 0, lc * 6 * sizeof(real_t), vw.ptr());
-		}
-
-		glBindBuffer(GL_ARRAY_BUFFER, 0); //unbind
-
-		if (!co->index_id) {
-
-			glGenBuffers(1, &co->index_id);
-			glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, co->index_id);
-			glBufferData(GL_ELEMENT_ARRAY_BUFFER, lc * 3 * sizeof(uint16_t), iw.ptr(), GL_STATIC_DRAW);
-		} else {
-
-			glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, co->index_id);
-			glBufferSubData(GL_ELEMENT_ARRAY_BUFFER, 0, lc * 3 * sizeof(uint16_t), iw.ptr());
-		}
-
-		glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); //unbind
-
-		co->len = lc;
-	}
-}
-
-RID RasterizerGLES2::canvas_light_shadow_buffer_create(int p_width) {
-
-	CanvasLightShadow *cls = memnew(CanvasLightShadow);
-	if (p_width > max_texture_size)
-		p_width = max_texture_size;
-
-	cls->size = p_width;
-	glActiveTexture(GL_TEXTURE0);
-
-	glGenFramebuffers(1, &cls->fbo);
-	glBindFramebuffer(GL_FRAMEBUFFER, cls->fbo);
-
-	// Create a render buffer
-	glGenRenderbuffers(1, &cls->rbo);
-	glBindRenderbuffer(GL_RENDERBUFFER, cls->rbo);
-
-	// Create a texture for storing the depth
-	glGenTextures(1, &cls->depth);
-	glBindTexture(GL_TEXTURE_2D, cls->depth);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-	// Remove artifact on the edges of the shadowmap
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-	cls->height = 16;
-
-	//print_line("ERROR? "+itos(glGetError()));
-	if (read_depth_supported) {
-
-		// We'll use a depth texture to store the depths in the shadow map
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT, cls->size, cls->height, 0,
-				GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL);
-
-#ifdef GLEW_ENABLED
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-#endif
-
-		// Attach the depth texture to FBO depth attachment point
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
-				GL_TEXTURE_2D, cls->depth, 0);
-
-#ifdef GLEW_ENABLED
-		glDrawBuffer(GL_NONE);
-#endif
-
-	} else {
-		// We'll use a RGBA texture into which we pack the depth info
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, cls->size, cls->height, 0,
-				GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-
-		// Attach the RGBA texture to FBO color attachment point
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-				GL_TEXTURE_2D, cls->depth, 0);
-		cls->rgba = cls->depth;
-
-		// Allocate 16-bit depth buffer
-		glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, cls->size, cls->height);
-
-		// Attach the render buffer as depth buffer - will be ignored
-		glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
-				GL_RENDERBUFFER, cls->rbo);
-	}
-
-	GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-//printf("errnum: %x\n",status);
-#ifdef GLEW_ENABLED
-	if (read_depth_supported) {
-		//glDrawBuffer(GL_BACK);
-	}
-#endif
-	glBindFramebuffer(GL_FRAMEBUFFER, base_framebuffer);
-	DEBUG_TEST_ERROR("2D Shadow Buffer Init");
-	ERR_FAIL_COND_V(status != GL_FRAMEBUFFER_COMPLETE, RID());
-
-#ifdef GLEW_ENABLED
-	if (read_depth_supported) {
-		//glDrawBuffer(GL_BACK);
-	}
-#endif
-
-	return canvas_light_shadow_owner.make_rid(cls);
-}
-
-void RasterizerGLES2::canvas_light_shadow_buffer_update(RID p_buffer, const Transform2D &p_light_xform, int p_light_mask, float p_near, float p_far, CanvasLightOccluderInstance *p_occluders, CameraMatrix *p_xform_cache) {
-
-	CanvasLightShadow *cls = canvas_light_shadow_owner.get(p_buffer);
-	ERR_FAIL_COND(!cls);
-
-	glDisable(GL_BLEND);
-	glDisable(GL_SCISSOR_TEST);
-	glDisable(GL_DITHER);
-	glDisable(GL_CULL_FACE);
-	glDepthFunc(GL_LEQUAL);
-	glEnable(GL_DEPTH_TEST);
-	glDepthMask(true);
-
-	glBindFramebuffer(GL_FRAMEBUFFER, cls->fbo);
-
-	if (!use_rgba_shadowmaps)
-		glColorMask(0, 0, 0, 0);
-
-	glEnableVertexAttribArray(VS::ARRAY_VERTEX);
-	canvas_shadow_shader.bind();
-
-	glViewport(0, 0, cls->size, cls->height);
-	_glClearDepth(1.0f);
-	glClearColor(1, 1, 1, 1);
-	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-	VS::CanvasOccluderPolygonCullMode cull = VS::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED;
-
-	for (int i = 0; i < 4; i++) {
-
-		//make sure it remains orthogonal, makes easy to read angle later
-
-		Transform light;
-		light.origin[0] = p_light_xform[2][0];
-		light.origin[1] = p_light_xform[2][1];
-		light.basis[0][0] = p_light_xform[0][0];
-		light.basis[0][1] = p_light_xform[1][0];
-		light.basis[1][0] = p_light_xform[0][1];
-		light.basis[1][1] = p_light_xform[1][1];
-
-		//light.basis.scale(Vector3(to_light.elements[0].length(),to_light.elements[1].length(),1));
-
-		/ //p_near=1;
-				CameraMatrix projection;
-		{
-			real_t fov = 90;
-			real_t near = p_near;
-			real_t far = p_far;
-			real_t aspect = 1.0;
-
-			real_t ymax = near * Math::tan(Math::deg2rad(fov * 0.5));
-			real_t ymin = -ymax;
-			real_t xmin = ymin * aspect;
-			real_t xmax = ymax * aspect;
-
-			projection.set_frustum(xmin, xmax, ymin, ymax, near, far);
-		}
-
-		Vector3 cam_target = Matrix3(Vector3(0, 0, Math_PI * 2 * (i / 4.0))).xform(Vector3(0, 1, 0));
-		projection = projection * CameraMatrix(Transform().looking_at(cam_target, Vector3(0, 0, -1)).affine_inverse());
-
-		canvas_shadow_shader.set_uniform(CanvasShadowShaderGLES2::PROJECTION_MATRIX, projection);
-		canvas_shadow_shader.set_uniform(CanvasShadowShaderGLES2::LIGHT_MATRIX, light);
-
-		if (i == 0)
-			*p_xform_cache = projection;
-
-		glViewport(0, (cls->height / 4) * i, cls->size, cls->height / 4);
-
-		CanvasLightOccluderInstance *instance = p_occluders;
-
-		while (instance) {
-
-			CanvasOccluder *cc = canvas_occluder_owner.get(instance->polygon_buffer);
-			if (!cc || cc->len == 0 || !(p_light_mask & instance->light_mask)) {
-
-				instance = instance->next;
-				continue;
-			}
-
-			canvas_shadow_shader.set_uniform(CanvasShadowShaderGLES2::WORLD_MATRIX, instance->xform_cache);
-			if (cull != instance->cull_cache) {
-
-				cull = instance->cull_cache;
-				switch (cull) {
-					case VS::CANVAS_OCCLUDER_POLYGON_CULL_DISABLED: {
-
-						glDisable(GL_CULL_FACE);
-
-					} break;
-					case VS::CANVAS_OCCLUDER_POLYGON_CULL_CLOCKWISE: {
-
-						glEnable(GL_CULL_FACE);
-						glCullFace(GL_FRONT);
-					} break;
-					case VS::CANVAS_OCCLUDER_POLYGON_CULL_COUNTER_CLOCKWISE: {
-
-						glEnable(GL_CULL_FACE);
-						glCullFace(GL_BACK);
-
-					} break;
-				}
-			}
-			/*
-			if (i==0) {
-				for(int i=0;i<cc->lines.size();i++) {
-					Vector2 p = instance->xform_cache.xform(cc->lines.get(i));
-					Plane pp(Vector3(p.x,p.y,0),1);
-					pp.normal = light.xform(pp.normal);
-					pp = projection.xform4(pp);
-					print_line(itos(i)+": "+pp.normal/pp.d);
-					//pp=light_mat.xform4(pp);
-					//print_line(itos(i)+": "+pp.normal/pp.d);
-				}
-			}
-*/
-			glBindBuffer(GL_ARRAY_BUFFER, cc->vertex_id);
-			glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, cc->index_id);
-			glVertexAttribPointer(VS::ARRAY_VERTEX, 3, GL_FLOAT, false, 0, 0);
-			glDrawElements(GL_TRIANGLES, cc->len * 3, GL_UNSIGNED_SHORT, 0);
-
-			instance = instance->next;
-		}
-	}
-
-	glDisableVertexAttribArray(VS::ARRAY_VERTEX);
-	glBindBuffer(GL_ARRAY_BUFFER, 0);
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0);
-
-	if (shadow_filter == SHADOW_FILTER_ESM) {
-//blur the buffer
-#if 0
-	//this is ignord, it did not make any difference..
-		if (read_depth_supported) {
-			glDepthFunc(GL_ALWAYS);
-		} else {
-			glDisable(GL_DEPTH_TEST);
-			glDepthMask(false);
-		}
-		glDisable(GL_CULL_FACE);
-		glViewport(0, 0, cls->size,cls->height);
-
-		int passes=1;
-		CanvasLightShadow *blur = canvas_light_shadow_owner.get(canvas_shadow_blur);
-
-		copy_shader.set_conditional(CopyShaderGLES2::SHADOW_BLUR_H_PASS,true);
-		copy_shader.bind();
-		copy_shader.set_uniform(CopyShaderGLES2::PIXEL_SCALE,1);
-		copy_shader.set_uniform(CopyShaderGLES2::BLUR_MAGNITUDE,1);
-		glUniform1i(copy_shader.get_uniform_location(CopyShaderGLES2::SOURCE),0);
-
-		for(int i=0;i<passes;i++) {
-
-			glBindFramebuffer(GL_FRAMEBUFFER, blur->fbo);
-			glActiveTexture(GL_TEXTURE0);
-
-			if (read_depth_supported)
-				glBindTexture(GL_TEXTURE_2D,cls->depth);
-			else
-				glBindTexture(GL_TEXTURE_2D,cls->rgba);
-
-
-			{
-				Vector2 src_sb_uv[4]={
-					Vector2( 0, 1),
-					Vector2( 1, 1),
-					Vector2( 1, 0),
-					Vector2( 0, 0)
-				};
-				static const Vector2 dst_pos[4]={
-					Vector2(-1, 1),
-					Vector2( 1, 1),
-					Vector2( 1,-1),
-					Vector2(-1,-1)
-				};
-
-
-
-				copy_shader.set_uniform(CopyShaderGLES2::PIXEL_SIZE,Vector2(1.0,1.0)/cls->size);
-				_draw_gui_primitive(4,dst_pos,NULL,src_sb_uv);
-			}
-
-			glActiveTexture(GL_TEXTURE0);
-			if (read_depth_supported)
-				glBindTexture(GL_TEXTURE_2D,blur->depth);
-			else
-				glBindTexture(GL_TEXTURE_2D,blur->rgba);
-
-			glBindFramebuffer(GL_FRAMEBUFFER, cls->fbo);
-
-			{
-				float hlimit = float(cls->size) / blur->size;
-				//hlimit*=2.0;
-				Vector2 src_sb_uv[4]={
-					Vector2( 0, 1),
-					Vector2( hlimit, 1),
-					Vector2( hlimit, 0),
-					Vector2( 0, 0)
-				};
-				static const Vector2 dst_pos[4]={
-					Vector2(-1, 1),
-					Vector2( 1, 1),
-					Vector2( 1,-1),
-					Vector2(-1,-1)
-				};
-
-
-				copy_shader.set_uniform(CopyShaderGLES2::PIXEL_SIZE,Vector2(1.0,1.0)/blur->size);
-				_draw_gui_primitive(4,dst_pos,NULL,src_sb_uv);
-			}
-
-		}
-		copy_shader.set_conditional(CopyShaderGLES2::SHADOW_BLUR_H_PASS,false);
-		glDepthFunc(GL_LEQUAL);
-#endif
-	}
-
-	glBindFramebuffer(GL_FRAMEBUFFER, current_rt ? current_rt->fbo : base_framebuffer);
-	glColorMask(1, 1, 1, 1);
-}
-
-void RasterizerGLES2::canvas_debug_viewport_shadows(CanvasLight *p_lights_with_shadow) {
-
-	CanvasLight *light = p_lights_with_shadow;
-
-	canvas_begin(); //reset
-
-	int h = 10;
-	int w = viewport.width;
-	int ofs = h;
-
-	//print_line(" debug lights ");
-	while (light) {
-
-		//print_line("debug light");
-		if (light->shadow_buffer.is_valid()) {
-
-			//print_line("sb is valid");
-			CanvasLightShadow *sb = canvas_light_shadow_owner.get(light->shadow_buffer);
-			if (sb) {
-				glActiveTexture(GL_TEXTURE0);
-				if (read_depth_supported)
-					glBindTexture(GL_TEXTURE_2D, sb->depth);
-				else
-					glBindTexture(GL_TEXTURE_2D, sb->rgba);
-				_draw_textured_quad(Rect2(h, ofs, w - h * 2, h), Rect2(0, 0, sb->size, 10), Size2(sb->size, 10), false, false);
-				ofs += h * 2;
-			}
-		}
-
-		light = light->shadows_next_ptr;
-	}
-}
-
-void RasterizerGLES2::_canvas_normal_set_flip(const Vector2 &p_flip) {
-
-	if (p_flip == normal_flip)
-		return;
-	normal_flip = p_flip;
-	canvas_shader.set_uniform(CanvasShaderGLES2::NORMAL_FLIP, normal_flip);
-}
-
-template <bool use_normalmap>
-void RasterizerGLES2::_canvas_item_render_commands(CanvasItem *p_item, CanvasItem *current_clip, bool &reclip) {
-
-	int cc = p_item->commands.size();
-	CanvasItem::Command **commands = p_item->commands.ptr();
-
-	for (int i = 0; i < cc; i++) {
-
-		CanvasItem::Command *c = commands[i];
-
-		switch (c->type) {
-			case CanvasItem::Command::TYPE_LINE: {
-
-				CanvasItem::CommandLine *line = static_cast<CanvasItem::CommandLine *>(c);
-				canvas_draw_line(line->from, line->to, line->color, line->width, line->antialiased);
-			} break;
-			case CanvasItem::Command::TYPE_RECT: {
-
-				CanvasItem::CommandRect *rect = static_cast<CanvasItem::CommandRect *>(c);
-//canvas_draw_rect(rect->rect,rect->region,rect->source,rect->flags&CanvasItem::CommandRect::FLAG_TILE,rect->flags&CanvasItem::CommandRect::FLAG_FLIP_H,rect->flags&CanvasItem::CommandRect::FLAG_FLIP_V,rect->texture,rect->modulate);
-#if 0
-				int flags=0;
-
-				if (rect->flags&CanvasItem::CommandRect::FLAG_REGION) {
-					flags|=Rasterizer::CANVAS_RECT_REGION;
-				}
-				if (rect->flags&CanvasItem::CommandRect::FLAG_TILE) {
-					flags|=Rasterizer::CANVAS_RECT_TILE;
-				}
-				if (rect->flags&CanvasItem::CommandRect::FLAG_FLIP_H) {
-
-					flags|=Rasterizer::CANVAS_RECT_FLIP_H;
-				}
-				if (rect->flags&CanvasItem::CommandRect::FLAG_FLIP_V) {
-
-					flags|=Rasterizer::CANVAS_RECT_FLIP_V;
-				}
-#else
-
-				int flags = rect->flags;
-#endif
-				if (use_normalmap)
-					_canvas_normal_set_flip(Vector2((flags & CANVAS_RECT_FLIP_H) ? -1 : 1, (flags & CANVAS_RECT_FLIP_V) ? -1 : 1));
-				canvas_draw_rect(rect->rect, flags, rect->source, rect->texture, rect->modulate);
-
-			} break;
-			case CanvasItem::Command::TYPE_STYLE: {
-
-				CanvasItem::CommandStyle *style = static_cast<CanvasItem::CommandStyle *>(c);
-				if (use_normalmap)
-					_canvas_normal_set_flip(Vector2(1, 1));
-				canvas_draw_style_box(style->rect, style->source, style->texture, style->margin, style->draw_center, style->color);
-
-			} break;
-			case CanvasItem::Command::TYPE_PRIMITIVE: {
-
-				if (use_normalmap)
-					_canvas_normal_set_flip(Vector2(1, 1));
-				CanvasItem::CommandPrimitive *primitive = static_cast<CanvasItem::CommandPrimitive *>(c);
-				canvas_draw_primitive(primitive->points, primitive->colors, primitive->uvs, primitive->texture, primitive->width);
-			} break;
-			case CanvasItem::Command::TYPE_POLYGON: {
-
-				if (use_normalmap)
-					_canvas_normal_set_flip(Vector2(1, 1));
-				CanvasItem::CommandPolygon *polygon = static_cast<CanvasItem::CommandPolygon *>(c);
-				canvas_draw_polygon(polygon->count, polygon->indices.ptr(), polygon->points.ptr(), polygon->uvs.ptr(), polygon->colors.ptr(), polygon->texture, polygon->colors.size() == 1);
-
-			} break;
-
-			case CanvasItem::Command::TYPE_POLYGON_PTR: {
-
-				if (use_normalmap)
-					_canvas_normal_set_flip(Vector2(1, 1));
-				CanvasItem::CommandPolygonPtr *polygon = static_cast<CanvasItem::CommandPolygonPtr *>(c);
-				canvas_draw_polygon(polygon->count, polygon->indices, polygon->points, polygon->uvs, polygon->colors, polygon->texture, false);
-			} break;
-			case CanvasItem::Command::TYPE_CIRCLE: {
-
-				CanvasItem::CommandCircle *circle = static_cast<CanvasItem::CommandCircle *>(c);
-				static const int numpoints = 32;
-				Vector2 points[numpoints + 1];
-				points[numpoints] = circle->pos;
-				int indices[numpoints * 3];
-
-				for (int i = 0; i < numpoints; i++) {
-
-					points[i] = circle->pos + Vector2(Math::sin(i * Math_PI * 2.0 / numpoints), Math::cos(i * Math_PI * 2.0 / numpoints)) * circle->radius;
-					indices[i * 3 + 0] = i;
-					indices[i * 3 + 1] = (i + 1) % numpoints;
-					indices[i * 3 + 2] = numpoints;
-				}
-				canvas_draw_polygon(numpoints * 3, indices, points, NULL, &circle->color, RID(), true);
-				//canvas_draw_circle(circle->indices.size(),circle->indices.ptr(),circle->points.ptr(),circle->uvs.ptr(),circle->colors.ptr(),circle->texture,circle->colors.size()==1);
-			} break;
-			case CanvasItem::Command::TYPE_TRANSFORM: {
-
-				CanvasItem::CommandTransform *transform = static_cast<CanvasItem::CommandTransform *>(c);
-				canvas_set_transform(transform->xform);
-			} break;
-			case CanvasItem::Command::TYPE_BLEND_MODE: {
-
-				CanvasItem::CommandBlendMode *bm = static_cast<CanvasItem::CommandBlendMode *>(c);
-				canvas_set_blend_mode(bm->blend_mode);
-
-			} break;
-			case CanvasItem::Command::TYPE_CLIP_IGNORE: {
-
-				CanvasItem::CommandClipIgnore *ci = static_cast<CanvasItem::CommandClipIgnore *>(c);
-				if (current_clip) {
-
-					if (ci->ignore != reclip) {
-						if (ci->ignore) {
-
-							glDisable(GL_SCISSOR_TEST);
-							reclip = true;
-						} else {
-
-							glEnable(GL_SCISSOR_TEST);
-							//glScissor(viewport.x+current_clip->final_clip_rect.pos.x,viewport.y+ (viewport.height-(current_clip->final_clip_rect.pos.y+current_clip->final_clip_rect.size.height)),
-							//current_clip->final_clip_rect.size.width,current_clip->final_clip_rect.size.height);
-
-							int x;
-							int y;
-							int w;
-							int h;
-
-							if (current_rt) {
-								x = current_clip->final_clip_rect.pos.x;
-								y = current_clip->final_clip_rect.pos.y;
-								w = current_clip->final_clip_rect.size.x;
-								h = current_clip->final_clip_rect.size.y;
-							} else {
-								x = current_clip->final_clip_rect.pos.x;
-								y = window_size.height - (current_clip->final_clip_rect.pos.y + current_clip->final_clip_rect.size.y);
-								w = current_clip->final_clip_rect.size.x;
-								h = current_clip->final_clip_rect.size.y;
-							}
-
-							glScissor(x, y, w, h);
-
-							reclip = false;
-						}
-					}
-				}
-
-			} break;
-		}
-	}
-}
-
-void RasterizerGLES2::_canvas_item_setup_shader_params(ShaderMaterial *material, Shader *p_shader) {
-
-	if (canvas_shader.bind())
-		rebind_texpixel_size = true;
-
-	if (material->shader_version != p_shader->version) {
-		//todo optimize uniforms
-		material->shader_version = p_shader->version;
-	}
-
-	if (p_shader->has_texscreen && framebuffer.active) {
-
-		int x = viewport.x;
-		int y = window_size.height - (viewport.height + viewport.y);
-
-		canvas_shader.set_uniform(CanvasShaderGLES2::TEXSCREEN_SCREEN_MULT, Vector2(float(viewport.width) / framebuffer.width, float(viewport.height) / framebuffer.height));
-		canvas_shader.set_uniform(CanvasShaderGLES2::TEXSCREEN_SCREEN_CLAMP, Color(float(x) / framebuffer.width, float(y) / framebuffer.height, float(x + viewport.width) / framebuffer.width, float(y + viewport.height) / framebuffer.height));
-		canvas_shader.set_uniform(CanvasShaderGLES2::TEXSCREEN_TEX, max_texture_units - 1);
-		glActiveTexture(GL_TEXTURE0 + max_texture_units - 1);
-		glBindTexture(GL_TEXTURE_2D, framebuffer.sample_color);
-		if (framebuffer.scale == 1 && !canvas_texscreen_used) {
-#ifdef GLEW_ENABLED
-			if (current_rt) {
-				glReadBuffer(GL_COLOR_ATTACHMENT0);
-			} else {
-				glReadBuffer(GL_BACK);
-			}
-#endif
-			if (current_rt) {
-				glCopyTexSubImage2D(GL_TEXTURE_2D, 0, viewport.x, viewport.y, viewport.x, viewport.y, viewport.width, viewport.height);
-				canvas_shader.set_uniform(CanvasShaderGLES2::TEXSCREEN_SCREEN_CLAMP, Color(float(x) / framebuffer.width, float(viewport.y) / framebuffer.height, float(x + viewport.width) / framebuffer.width, float(y + viewport.height) / framebuffer.height));
-				//window_size.height-(viewport.height+viewport.y)
-			} else {
-				glCopyTexSubImage2D(GL_TEXTURE_2D, 0, x, y, x, y, viewport.width, viewport.height);
-			}
-
-			canvas_texscreen_used = true;
-		}
-
-		glActiveTexture(GL_TEXTURE0);
-	}
-
-	if (p_shader->has_screen_uv) {
-		canvas_shader.set_uniform(CanvasShaderGLES2::SCREEN_UV_MULT, Vector2(1.0 / viewport.width, 1.0 / viewport.height));
-	}
-
-	uses_texpixel_size = p_shader->uses_texpixel_size;
-}
-
-void RasterizerGLES2::_canvas_item_setup_shader_uniforms(ShaderMaterial *material, Shader *p_shader) {
-
-	//this can be optimized..
-	int tex_id = 1;
-	int idx = 0;
-	for (Map<StringName, ShaderLanguage::Uniform>::Element *E = p_shader->uniforms.front(); E; E = E->next()) {
-
-		Map<StringName, Variant>::Element *F = material->shader_param.find(E->key());
-
-		if ((E->get().type == ShaderLanguage::TYPE_TEXTURE || E->get().type == ShaderLanguage::TYPE_CUBEMAP)) {
-
-			RID rid;
-			if (F) {
-				rid = F->get();
-			}
-
-			if (!rid.is_valid()) {
-
-				Map<StringName, RID>::Element *DT = p_shader->default_textures.find(E->key());
-				if (DT) {
-					rid = DT->get();
-				}
-			}
-
-			if (rid.is_valid()) {
-
-				int loc = canvas_shader.get_custom_uniform_location(idx); //should be automatic..
-
-				glActiveTexture(GL_TEXTURE0 + tex_id);
-				Texture *t = texture_owner.get(rid);
-				if (!t)
-					glBindTexture(GL_TEXTURE_2D, white_tex);
-				else
-					glBindTexture(t->target, t->tex_id);
-
-				glUniform1i(loc, tex_id);
-				tex_id++;
-			}
-		} else {
-			Variant &v = F ? F->get() : E->get().default_value;
-			canvas_shader.set_custom_uniform(idx, v);
-		}
-
-		idx++;
-	}
-
-	if (tex_id > 1) {
-		glActiveTexture(GL_TEXTURE0);
-	}
-
-	if (p_shader->uses_time) {
-		canvas_shader.set_uniform(CanvasShaderGLES2::TIME, Math::fmod(last_time, shader_time_rollback));
-		draw_next_frame = true;
-	}
-	//if uses TIME - draw_next_frame=true
-}
-
-void RasterizerGLES2::canvas_render_items(CanvasItem *p_item_list, int p_z, const Color &p_modulate, CanvasLight *p_light) {
-
-	CanvasItem *current_clip = NULL;
-	Shader *shader_cache = NULL;
-
-	bool rebind_shader = true;
-
-	canvas_opacity = 1.0;
-	canvas_use_modulate = p_modulate != Color(1, 1, 1, 1);
-	canvas_modulate = p_modulate;
-	canvas_shader.set_conditional(CanvasShaderGLES2::USE_MODULATE, canvas_use_modulate);
-	canvas_shader.set_conditional(CanvasShaderGLES2::USE_DISTANCE_FIELD, false);
-
-	bool reset_modulate = false;
-	bool prev_distance_field = false;
-
-	while (p_item_list) {
-
-		CanvasItem *ci = p_item_list;
-
-		if (ci->vp_render) {
-			if (draw_viewport_func) {
-				draw_viewport_func(ci->vp_render->owner, ci->vp_render->udata, ci->vp_render->rect);
-			}
-			memdelete(ci->vp_render);
-			ci->vp_render = NULL;
-			canvas_last_material = NULL;
-			canvas_use_modulate = p_modulate != Color(1, 1, 1, 1);
-			canvas_modulate = p_modulate;
-			canvas_shader.set_conditional(CanvasShaderGLES2::USE_MODULATE, canvas_use_modulate);
-			canvas_shader.set_conditional(CanvasShaderGLES2::USE_DISTANCE_FIELD, false);
-			prev_distance_field = false;
-			rebind_shader = true;
-			reset_modulate = true;
-		}
-
-		if (prev_distance_field != ci->distance_field) {
-
-			canvas_shader.set_conditional(CanvasShaderGLES2::USE_DISTANCE_FIELD, ci->distance_field);
-			prev_distance_field = ci->distance_field;
-			rebind_shader = true;
-		}
-
-		if (current_clip != ci->final_clip_owner) {
-
-			current_clip = ci->final_clip_owner;
-
-			//setup clip
-			if (current_clip) {
-
-				glEnable(GL_SCISSOR_TEST);
-				//glScissor(viewport.x+current_clip->final_clip_rect.pos.x,viewport.y+ (viewport.height-(current_clip->final_clip_rect.pos.y+current_clip->final_clip_rect.size.height)),
-				//current_clip->final_clip_rect.size.width,current_clip->final_clip_rect.size.height);
-
-				/*				int x = viewport.x+current_clip->final_clip_rect.pos.x;
-				int y = window_size.height-(viewport.y+current_clip->final_clip_rect.pos.y+current_clip->final_clip_rect.size.y);
-				int w = current_clip->final_clip_rect.size.x;
-				int h = current_clip->final_clip_rect.size.y;
-*/
-				int x;
-				int y;
-				int w;
-				int h;
-
-				if (current_rt) {
-					x = current_clip->final_clip_rect.pos.x;
-					y = current_clip->final_clip_rect.pos.y;
-					w = current_clip->final_clip_rect.size.x;
-					h = current_clip->final_clip_rect.size.y;
-				} else {
-					x = current_clip->final_clip_rect.pos.x;
-					y = window_size.height - (current_clip->final_clip_rect.pos.y + current_clip->final_clip_rect.size.y);
-					w = current_clip->final_clip_rect.size.x;
-					h = current_clip->final_clip_rect.size.y;
-				}
-
-				glScissor(x, y, w, h);
-
-			} else {
-
-				glDisable(GL_SCISSOR_TEST);
-			}
-		}
-
-		if (ci->copy_back_buffer && framebuffer.active && framebuffer.scale == 1) {
-
-			Rect2 rect;
-			int x, y;
-
-			if (ci->copy_back_buffer->full) {
-
-				x = viewport.x;
-				y = window_size.height - (viewport.height + viewport.y);
-			} else {
-				x = viewport.x + ci->copy_back_buffer->screen_rect.pos.x;
-				y = window_size.height - (viewport.y + ci->copy_back_buffer->screen_rect.pos.y + ci->copy_back_buffer->screen_rect.size.y);
-			}
-			glActiveTexture(GL_TEXTURE0 + max_texture_units - 1);
-			glBindTexture(GL_TEXTURE_2D, framebuffer.sample_color);
-
-#ifdef GLEW_ENABLED
-			if (current_rt) {
-				glReadBuffer(GL_COLOR_ATTACHMENT0);
-			} else {
-				glReadBuffer(GL_BACK);
-			}
-#endif
-			if (current_rt) {
-				glCopyTexSubImage2D(GL_TEXTURE_2D, 0, viewport.x, viewport.y, viewport.x, viewport.y, viewport.width, viewport.height);
-				//window_size.height-(viewport.height+viewport.y)
-			} else {
-				glCopyTexSubImage2D(GL_TEXTURE_2D, 0, x, y, x, y, viewport.width, viewport.height);
-			}
-
-			canvas_texscreen_used = true;
-			glActiveTexture(GL_TEXTURE0);
-		}
-
-		//begin rect
-		CanvasItem *material_owner = ci->material_owner ? ci->material_owner : ci;
-		ShaderMaterial *material = material_owner->material;
-
-		if (material != canvas_last_material || rebind_shader) {
-
-			Shader *shader = NULL;
-			if (material && material->shader.is_valid()) {
-				shader = shader_owner.get(material->shader);
-				if (shader && !shader->valid) {
-					shader = NULL;
-				}
-			}
-
-			shader_cache = shader;
-
-			if (shader) {
-				canvas_shader.set_custom_shader(shader->custom_code_id);
-				_canvas_item_setup_shader_params(material, shader);
-			} else {
-				shader_cache = NULL;
-				canvas_shader.set_custom_shader(0);
-				canvas_shader.bind();
-				uses_texpixel_size = false;
-			}
-
-			canvas_shader.set_uniform(CanvasShaderGLES2::PROJECTION_MATRIX, canvas_transform);
-			if (canvas_use_modulate)
-				reset_modulate = true;
-			canvas_last_material = material;
-			rebind_shader = false;
-		}
-
-		if (material && shader_cache) {
-
-			_canvas_item_setup_shader_uniforms(material, shader_cache);
-		}
-
-		bool unshaded = (material && material->shading_mode == VS::CANVAS_ITEM_SHADING_UNSHADED) || ci->blend_mode != VS::MATERIAL_BLEND_MODE_MIX;
-
-		if (unshaded) {
-			canvas_shader.set_uniform(CanvasShaderGLES2::MODULATE, Color(1, 1, 1, 1));
-			reset_modulate = true;
-		} else if (reset_modulate) {
-			canvas_shader.set_uniform(CanvasShaderGLES2::MODULATE, canvas_modulate);
-			reset_modulate = false;
-		}
-
-		canvas_shader.set_uniform(CanvasShaderGLES2::MODELVIEW_MATRIX, ci->final_transform);
-		canvas_shader.set_uniform(CanvasShaderGLES2::EXTRA_MATRIX, Transform2D());
-
-		bool reclip = false;
-
-		if (ci == p_item_list || ci->blend_mode != canvas_blend_mode) {
-
-			switch (ci->blend_mode) {
-
-				case VS::MATERIAL_BLEND_MODE_MIX: {
-					glBlendEquation(GL_FUNC_ADD);
-					if (current_rt && current_rt_transparent) {
-						glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-					} else {
-						glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-					}
-
-				} break;
-				case VS::MATERIAL_BLEND_MODE_ADD: {
-
-					glBlendEquation(GL_FUNC_ADD);
-					glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-
-				} break;
-				case VS::MATERIAL_BLEND_MODE_SUB: {
-
-					glBlendEquation(GL_FUNC_REVERSE_SUBTRACT);
-					glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-				} break;
-				case VS::MATERIAL_BLEND_MODE_MUL: {
-					glBlendEquation(GL_FUNC_ADD);
-					glBlendFunc(GL_DST_COLOR, GL_ZERO);
-				} break;
-				case VS::MATERIAL_BLEND_MODE_PREMULT_ALPHA: {
-					glBlendEquation(GL_FUNC_ADD);
-					glBlendFunc(GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-				} break;
-			}
-
-			canvas_blend_mode = ci->blend_mode;
-		}
-
-		canvas_opacity = ci->final_opacity;
-
-		if (unshaded || (p_modulate.a > 0.001 && (!material || material->shading_mode != VS::CANVAS_ITEM_SHADING_ONLY_LIGHT) && !ci->light_masked))
-			_canvas_item_render_commands<false>(ci, current_clip, reclip);
-
-		if (canvas_blend_mode == VS::MATERIAL_BLEND_MODE_MIX && p_light && !unshaded) {
-
-			CanvasLight *light = p_light;
-			bool light_used = false;
-			VS::CanvasLightMode mode = VS::CANVAS_LIGHT_MODE_ADD;
-
-			while (light) {
-
-				if (ci->light_mask & light->item_mask && p_z >= light->z_min && p_z <= light->z_max && ci->global_rect_cache.intersects_transformed(light->xform_cache, light->rect_cache)) {
-
-					//intersects this light
-
-					if (!light_used || mode != light->mode) {
-
-						mode = light->mode;
-
-						switch (mode) {
-
-							case VS::CANVAS_LIGHT_MODE_ADD: {
-								glBlendEquation(GL_FUNC_ADD);
-								glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-
-							} break;
-							case VS::CANVAS_LIGHT_MODE_SUB: {
-								glBlendEquation(GL_FUNC_REVERSE_SUBTRACT);
-								glBlendFunc(GL_SRC_ALPHA, GL_ONE);
-							} break;
-							case VS::CANVAS_LIGHT_MODE_MIX:
-							case VS::CANVAS_LIGHT_MODE_MASK: {
-								glBlendEquation(GL_FUNC_ADD);
-								glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-
-							} break;
-						}
-					}
-
-					if (!light_used) {
-
-						canvas_shader.set_conditional(CanvasShaderGLES2::USE_LIGHTING, true);
-						canvas_shader.set_conditional(CanvasShaderGLES2::USE_MODULATE, false);
-						light_used = true;
-						normal_flip = Vector2(1, 1);
-					}
-
-					bool has_shadow = light->shadow_buffer.is_valid() && ci->light_mask & light->item_shadow_mask;
-
-					canvas_shader.set_conditional(CanvasShaderGLES2::USE_SHADOWS, has_shadow);
-
-					bool light_rebind = canvas_shader.bind();
-
-					if (light_rebind) {
-
-						if (material && shader_cache) {
-							_canvas_item_setup_shader_params(material, shader_cache);
-							_canvas_item_setup_shader_uniforms(material, shader_cache);
-						}
-
-						canvas_shader.set_uniform(CanvasShaderGLES2::MODELVIEW_MATRIX, ci->final_transform);
-						canvas_shader.set_uniform(CanvasShaderGLES2::EXTRA_MATRIX, Transform2D());
-						canvas_shader.set_uniform(CanvasShaderGLES2::PROJECTION_MATRIX, canvas_transform);
-						if (canvas_use_modulate)
-							canvas_shader.set_uniform(CanvasShaderGLES2::MODULATE, canvas_modulate);
-						canvas_shader.set_uniform(CanvasShaderGLES2::NORMAL_FLIP, Vector2(1, 1));
-						canvas_shader.set_uniform(CanvasShaderGLES2::SHADOWPIXEL_SIZE, 1.0 / light->shadow_buffer_size);
-					}
-
-					canvas_shader.set_uniform(CanvasShaderGLES2::LIGHT_MATRIX, light->light_shader_xform);
-					canvas_shader.set_uniform(CanvasShaderGLES2::LIGHT_POS, light->light_shader_pos);
-					canvas_shader.set_uniform(CanvasShaderGLES2::LIGHT_COLOR, Color(light->color.r * light->energy, light->color.g * light->energy, light->color.b * light->energy, light->color.a));
-					canvas_shader.set_uniform(CanvasShaderGLES2::LIGHT_HEIGHT, light->height);
-					canvas_shader.set_uniform(CanvasShaderGLES2::LIGHT_LOCAL_MATRIX, light->xform_cache.affine_inverse());
-					canvas_shader.set_uniform(CanvasShaderGLES2::LIGHT_OUTSIDE_ALPHA, light->mode == VS::CANVAS_LIGHT_MODE_MASK ? 1.0 : 0.0);
-
-					if (has_shadow) {
-
-						CanvasLightShadow *cls = canvas_light_shadow_owner.get(light->shadow_buffer);
-						glActiveTexture(GL_TEXTURE0 + max_texture_units - 3);
-						if (read_depth_supported)
-							glBindTexture(GL_TEXTURE_2D, cls->depth);
-						else
-							glBindTexture(GL_TEXTURE_2D, cls->rgba);
-
-						canvas_shader.set_uniform(CanvasShaderGLES2::SHADOW_TEXTURE, max_texture_units - 3);
-						canvas_shader.set_uniform(CanvasShaderGLES2::SHADOW_MATRIX, light->shadow_matrix_cache);
-						canvas_shader.set_uniform(CanvasShaderGLES2::SHADOW_ESM_MULTIPLIER, light->shadow_esm_mult);
-						canvas_shader.set_uniform(CanvasShaderGLES2::LIGHT_SHADOW_COLOR, light->shadow_color);
-					}
-
-					glActiveTexture(GL_TEXTURE0 + max_texture_units - 2);
-					canvas_shader.set_uniform(CanvasShaderGLES2::LIGHT_TEXTURE, max_texture_units - 2);
-					Texture *t = texture_owner.get(light->texture);
-					if (!t) {
-						glBindTexture(GL_TEXTURE_2D, white_tex);
-					} else {
-
-						glBindTexture(t->target, t->tex_id);
-					}
-
-					glActiveTexture(GL_TEXTURE0);
-					_canvas_item_render_commands<true>(ci, current_clip, reclip); //redraw using light
-				}
-
-				light = light->next_ptr;
-			}
-
-			if (light_used) {
-
-				canvas_shader.set_conditional(CanvasShaderGLES2::USE_LIGHTING, false);
-				canvas_shader.set_conditional(CanvasShaderGLES2::USE_MODULATE, canvas_use_modulate);
-				canvas_shader.set_conditional(CanvasShaderGLES2::USE_SHADOWS, false);
-
-				canvas_shader.bind();
-
-				if (material && shader_cache) {
-					_canvas_item_setup_shader_params(material, shader_cache);
-					_canvas_item_setup_shader_uniforms(material, shader_cache);
-				}
-
-				canvas_shader.set_uniform(CanvasShaderGLES2::MODELVIEW_MATRIX, ci->final_transform);
-				canvas_shader.set_uniform(CanvasShaderGLES2::EXTRA_MATRIX, Transform2D());
-				if (canvas_use_modulate)
-					canvas_shader.set_uniform(CanvasShaderGLES2::MODULATE, canvas_modulate);
-
-				glBlendEquation(GL_FUNC_ADD);
-				if (current_rt && current_rt_transparent) {
-					glBlendFuncSeparate(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA, GL_ONE, GL_ONE_MINUS_SRC_ALPHA);
-				} else {
-					glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
-				}
-			}
-		}
-
-		if (reclip) {
-
-			glEnable(GL_SCISSOR_TEST);
-			//glScissor(viewport.x+current_clip->final_clip_rect.pos.x,viewport.y+ (viewport.height-(current_clip->final_clip_rect.pos.y+current_clip->final_clip_rect.size.height)),
-			//current_clip->final_clip_rect.size.width,current_clip->final_clip_rect.size.height);
-
-			int x;
-			int y;
-			int w;
-			int h;
-
-			if (current_rt) {
-				x = current_clip->final_clip_rect.pos.x;
-				y = current_clip->final_clip_rect.pos.y;
-				w = current_clip->final_clip_rect.size.x;
-				h = current_clip->final_clip_rect.size.y;
-			} else {
-				x = current_clip->final_clip_rect.pos.x;
-				y = window_size.height - (current_clip->final_clip_rect.pos.y + current_clip->final_clip_rect.size.y);
-				w = current_clip->final_clip_rect.size.x;
-				h = current_clip->final_clip_rect.size.y;
-			}
-
-			glScissor(x, y, w, h);
-		}
-
-		p_item_list = p_item_list->next;
-	}
-
-	if (current_clip) {
-		glDisable(GL_SCISSOR_TEST);
-	}
-}
-
-/* ENVIRONMENT */
-
-RID RasterizerGLES2::environment_create() {
-
-	Environment *env = memnew(Environment);
-	return environment_owner.make_rid(env);
-}
-
-void RasterizerGLES2::environment_set_background(RID p_env, VS::EnvironmentBG p_bg) {
-
-	ERR_FAIL_INDEX(p_bg, VS::ENV_BG_MAX);
-	Environment *env = environment_owner.get(p_env);
-	ERR_FAIL_COND(!env);
-	env->bg_mode = p_bg;
-}
-
-VS::EnvironmentBG RasterizerGLES2::environment_get_background(RID p_env) const {
-
-	const Environment *env = environment_owner.get(p_env);
-	ERR_FAIL_COND_V(!env, VS::ENV_BG_MAX);
-	return env->bg_mode;
-}
-
-void RasterizerGLES2::environment_set_background_param(RID p_env, VS::EnvironmentBGParam p_param, const Variant &p_value) {
-
-	ERR_FAIL_INDEX(p_param, VS::ENV_BG_PARAM_MAX);
-	Environment *env = environment_owner.get(p_env);
-	ERR_FAIL_COND(!env);
-	env->bg_param[p_param] = p_value;
-}
-Variant RasterizerGLES2::environment_get_background_param(RID p_env, VS::EnvironmentBGParam p_param) const {
-
-	ERR_FAIL_INDEX_V(p_param, VS::ENV_BG_PARAM_MAX, Variant());
-	const Environment *env = environment_owner.get(p_env);
-	ERR_FAIL_COND_V(!env, Variant());
-	return env->bg_param[p_param];
-}
-
-void RasterizerGLES2::environment_set_enable_fx(RID p_env, VS::EnvironmentFx p_effect, bool p_enabled) {
-
-	ERR_FAIL_INDEX(p_effect, VS::ENV_FX_MAX);
-	Environment *env = environment_owner.get(p_env);
-	ERR_FAIL_COND(!env);
-	env->fx_enabled[p_effect] = p_enabled;
-}
-bool RasterizerGLES2::environment_is_fx_enabled(RID p_env, VS::EnvironmentFx p_effect) const {
-
-	ERR_FAIL_INDEX_V(p_effect, VS::ENV_FX_MAX, false);
-	const Environment *env = environment_owner.get(p_env);
-	ERR_FAIL_COND_V(!env, false);
-	return env->fx_enabled[p_effect];
-}
-
-void RasterizerGLES2::environment_fx_set_param(RID p_env, VS::EnvironmentFxParam p_param, const Variant &p_value) {
-
-	ERR_FAIL_INDEX(p_param, VS::ENV_FX_PARAM_MAX);
-	Environment *env = environment_owner.get(p_env);
-	ERR_FAIL_COND(!env);
-	env->fx_param[p_param] = p_value;
-}
-Variant RasterizerGLES2::environment_fx_get_param(RID p_env, VS::EnvironmentFxParam p_param) const {
-
-	ERR_FAIL_INDEX_V(p_param, VS::ENV_FX_PARAM_MAX, Variant());
-	const Environment *env = environment_owner.get(p_env);
-	ERR_FAIL_COND_V(!env, Variant());
-	return env->fx_param[p_param];
-}
-
-RID RasterizerGLES2::sampled_light_dp_create(int p_width, int p_height) {
-
-	SampledLight *slight = memnew(SampledLight);
-	slight->w = p_width;
-	slight->h = p_height;
-	slight->multiplier = 1.0;
-	slight->is_float = float_linear_supported;
-
-	glActiveTexture(GL_TEXTURE0);
-	glGenTextures(1, &slight->texture);
-	glBindTexture(GL_TEXTURE_2D, slight->texture);
-	// for debug, but glitchy
-	//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-	//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-	// Remove artifact on the edges of the shadowmap
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-	if (slight->is_float) {
-#ifdef GLEW_ENABLED
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA32F, p_width, p_height, 0, GL_RGBA, GL_FLOAT, NULL);
-#else
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, p_width, p_height, 0, GL_RGBA, GL_FLOAT, NULL);
-#endif
-	} else {
-
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, p_width, p_height, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-	}
-
-	return sampled_light_owner.make_rid(slight);
-}
-
-void RasterizerGLES2::sampled_light_dp_update(RID p_sampled_light, const Color *p_data, float p_multiplier) {
-
-	SampledLight *slight = sampled_light_owner.get(p_sampled_light);
-	ERR_FAIL_COND(!slight);
-
-	glActiveTexture(GL_TEXTURE0);
-	glBindTexture(GL_TEXTURE_2D, slight->texture);
-
-	if (slight->is_float) {
-
-#ifdef GLEW_ENABLED
-		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, slight->w, slight->h, GL_RGBA, GL_FLOAT, p_data);
-#else
-		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, slight->w, slight->h, GL_RGBA, GL_FLOAT, p_data);
-#endif
-
-	} else {
-		//convert to bytes
-		uint8_t *tex8 = (uint8_t *)alloca(slight->w * slight->h * 4);
-		const float *src = (const float *)p_data;
-
-		for (int i = 0; i < slight->w * slight->h * 4; i++) {
-
-			tex8[i] = Math::fast_ftoi(CLAMP(src[i] * 255.0, 0.0, 255.0));
-		}
-
-		glTexSubImage2D(GL_TEXTURE_2D, 0, 0, 0, slight->w, slight->h, GL_RGBA, GL_UNSIGNED_BYTE, p_data);
-	}
-
-	slight->multiplier = p_multiplier;
-}
-
-/*MISC*/
-
-bool RasterizerGLES2::is_texture(const RID &p_rid) const {
-
-	return texture_owner.owns(p_rid);
-}
-bool RasterizerGLES2::is_material(const RID &p_rid) const {
-
-	return material_owner.owns(p_rid);
-}
-bool RasterizerGLES2::is_mesh(const RID &p_rid) const {
-
-	return mesh_owner.owns(p_rid);
-}
-bool RasterizerGLES2::is_immediate(const RID &p_rid) const {
-
-	return immediate_owner.owns(p_rid);
-}
-bool RasterizerGLES2::is_multimesh(const RID &p_rid) const {
-
-	return multimesh_owner.owns(p_rid);
-}
-bool RasterizerGLES2::is_particles(const RID &p_beam) const {
-
-	return particles_owner.owns(p_beam);
-}
-
-bool RasterizerGLES2::is_light(const RID &p_rid) const {
-
-	return light_owner.owns(p_rid);
-}
-bool RasterizerGLES2::is_light_instance(const RID &p_rid) const {
-
-	return light_instance_owner.owns(p_rid);
-}
-bool RasterizerGLES2::is_particles_instance(const RID &p_rid) const {
-
-	return particles_instance_owner.owns(p_rid);
-}
-bool RasterizerGLES2::is_skeleton(const RID &p_rid) const {
-
-	return skeleton_owner.owns(p_rid);
-}
-bool RasterizerGLES2::is_environment(const RID &p_rid) const {
-
-	return environment_owner.owns(p_rid);
-}
-bool RasterizerGLES2::is_shader(const RID &p_rid) const {
-
-	return shader_owner.owns(p_rid);
-}
-
-bool RasterizerGLES2::is_canvas_light_occluder(const RID &p_rid) const {
-
-	return false;
-}
-
-void RasterizerGLES2::free(const RID &p_rid) {
-	if (texture_owner.owns(p_rid)) {
-
-		// delete the texture
-		Texture *texture = texture_owner.get(p_rid);
-
-		//glDeleteTextures( 1,&texture->tex_id );
-		_rinfo.texture_mem -= texture->total_data_size;
-		texture_owner.free(p_rid);
-		memdelete(texture);
-
-	} else if (shader_owner.owns(p_rid)) {
-
-		// delete the texture
-		Shader *shader = shader_owner.get(p_rid);
-
-		switch (shader->mode) {
-			case VS::SHADER_MATERIAL: {
-				material_shader.free_custom_shader(shader->custom_code_id);
-			} break;
-			case VS::SHADER_POST_PROCESS: {
-				//postprocess_shader.free_custom_shader(shader->custom_code_id);
-			} break;
-		}
-
-		if (shader->dirty_list.in_list())
-			_shader_dirty_list.remove(&shader->dirty_list);
-
-		//material_shader.free_custom_shader(shader->custom_code_id);
-		shader_owner.free(p_rid);
-		memdelete(shader);
-
-	} else if (material_owner.owns(p_rid)) {
-
-		Material *material = material_owner.get(p_rid);
-		ERR_FAIL_COND(!material);
-
-		_free_fixed_material(p_rid); //just in case
-		material_owner.free(p_rid);
-		memdelete(material);
-
-	} else if (mesh_owner.owns(p_rid)) {
-
-		Mesh *mesh = mesh_owner.get(p_rid);
-		ERR_FAIL_COND(!mesh);
-		for (int i = 0; i < mesh->surfaces.size(); i++) {
-
-			Surface *surface = mesh->surfaces[i];
-			if (surface->array_local != 0) {
-				memfree(surface->array_local);
-			};
-			if (surface->index_array_local != 0) {
-				memfree(surface->index_array_local);
-			};
-
-			if (mesh->morph_target_count > 0) {
-
-				for (int i = 0; i < mesh->morph_target_count; i++) {
-
-					memdelete_arr(surface->morph_targets_local[i].array);
-				}
-				memdelete_arr(surface->morph_targets_local);
-				surface->morph_targets_local = NULL;
-			}
-
-			if (surface->vertex_id)
-				glDeleteBuffers(1, &surface->vertex_id);
-			if (surface->index_id)
-				glDeleteBuffers(1, &surface->index_id);
-
-			memdelete(surface);
-		};
-
-		mesh->surfaces.clear();
-
-		mesh_owner.free(p_rid);
-		memdelete(mesh);
-
-	} else if (multimesh_owner.owns(p_rid)) {
-
-		MultiMesh *multimesh = multimesh_owner.get(p_rid);
-		ERR_FAIL_COND(!multimesh);
-
-		if (multimesh->tex_id) {
-			glDeleteTextures(1, &multimesh->tex_id);
-		}
-
-		multimesh_owner.free(p_rid);
-		memdelete(multimesh);
-
-	} else if (immediate_owner.owns(p_rid)) {
-
-		Immediate *immediate = immediate_owner.get(p_rid);
-		ERR_FAIL_COND(!immediate);
-
-		immediate_owner.free(p_rid);
-		memdelete(immediate);
-	} else if (particles_owner.owns(p_rid)) {
-
-		Particles *particles = particles_owner.get(p_rid);
-		ERR_FAIL_COND(!particles);
-
-		particles_owner.free(p_rid);
-		memdelete(particles);
-	} else if (particles_instance_owner.owns(p_rid)) {
-
-		ParticlesInstance *particles_isntance = particles_instance_owner.get(p_rid);
-		ERR_FAIL_COND(!particles_isntance);
-
-		particles_instance_owner.free(p_rid);
-		memdelete(particles_isntance);
-
-	} else if (skeleton_owner.owns(p_rid)) {
-
-		Skeleton *skeleton = skeleton_owner.get(p_rid);
-		ERR_FAIL_COND(!skeleton);
-
-		if (skeleton->dirty_list.in_list())
-			_skeleton_dirty_list.remove(&skeleton->dirty_list);
-		if (skeleton->tex_id) {
-			glDeleteTextures(1, &skeleton->tex_id);
-		}
-		skeleton_owner.free(p_rid);
-		memdelete(skeleton);
-
-	} else if (light_owner.owns(p_rid)) {
-
-		Light *light = light_owner.get(p_rid);
-		ERR_FAIL_COND(!light)
-
-		light_owner.free(p_rid);
-		memdelete(light);
-
-	} else if (light_instance_owner.owns(p_rid)) {
-
-		LightInstance *light_instance = light_instance_owner.get(p_rid);
-		ERR_FAIL_COND(!light_instance);
-		light_instance->clear_shadow_buffers();
-		light_instance_owner.free(p_rid);
-		memdelete(light_instance);
-
-	} else if (environment_owner.owns(p_rid)) {
-
-		Environment *env = environment_owner.get(p_rid);
-		ERR_FAIL_COND(!env);
-
-		environment_owner.free(p_rid);
-		memdelete(env);
-
-	} else if (viewport_data_owner.owns(p_rid)) {
-
-		ViewportData *viewport_data = viewport_data_owner.get(p_rid);
-		ERR_FAIL_COND(!viewport_data);
-		glDeleteFramebuffers(1, &viewport_data->lum_fbo);
-		glDeleteTextures(1, &viewport_data->lum_color);
-		viewport_data_owner.free(p_rid);
-		memdelete(viewport_data);
-
-	} else if (render_target_owner.owns(p_rid)) {
-
-		RenderTarget *render_target = render_target_owner.get(p_rid);
-		ERR_FAIL_COND(!render_target);
-		render_target_set_size(p_rid, 0, 0); //clears framebuffer
-		texture_owner.free(render_target->texture);
-		memdelete(render_target->texture_ptr);
-		render_target_owner.free(p_rid);
-		memdelete(render_target);
-	} else if (sampled_light_owner.owns(p_rid)) {
-
-		SampledLight *sampled_light = sampled_light_owner.get(p_rid);
-		ERR_FAIL_COND(!sampled_light);
-		glDeleteTextures(1, &sampled_light->texture);
-		sampled_light_owner.free(p_rid);
-		memdelete(sampled_light);
-	} else if (canvas_occluder_owner.owns(p_rid)) {
-
-		CanvasOccluder *co = canvas_occluder_owner.get(p_rid);
-		if (co->index_id)
-			glDeleteBuffers(1, &co->index_id);
-		if (co->vertex_id)
-			glDeleteBuffers(1, &co->vertex_id);
-
-		canvas_occluder_owner.free(p_rid);
-		memdelete(co);
-
-	} else if (canvas_light_shadow_owner.owns(p_rid)) {
-
-		CanvasLightShadow *cls = canvas_light_shadow_owner.get(p_rid);
-		glDeleteFramebuffers(1, &cls->fbo);
-		glDeleteRenderbuffers(1, &cls->rbo);
-		glDeleteTextures(1, &cls->depth);
-		/*
-		if (!read_depth_supported) {
-			glDeleteTextures(1,&cls->rgba);
-		}
-		*/
-
-		canvas_light_shadow_owner.free(p_rid);
-		memdelete(cls);
-	};
-}
-
-bool RasterizerGLES2::ShadowBuffer::init(int p_size, bool p_use_depth) {
-
-	size = p_size;
-	// Create a framebuffer object
-	glGenFramebuffers(1, &fbo);
-	glBindFramebuffer(GL_FRAMEBUFFER, fbo);
-
-	// Create a render buffer
-	glGenRenderbuffers(1, &rbo);
-	glBindRenderbuffer(GL_RENDERBUFFER, rbo);
-
-	// Create a texture for storing the depth
-	glGenTextures(1, &depth);
-	glBindTexture(GL_TEXTURE_2D, depth);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-
-	// Remove artifact on the edges of the shadowmap
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-	//print_line("ERROR? "+itos(glGetError()));
-	if (p_use_depth) {
-
-		// We'll use a depth texture to store the depths in the shadow map
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT, size, size, 0,
-				GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL);
-
-#ifdef GLEW_ENABLED
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-#endif
-
-		// Attach the depth texture to FBO depth attachment point
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
-				GL_TEXTURE_2D, depth, 0);
-
-#ifdef GLEW_ENABLED
-		glDrawBuffer(GL_NONE);
-#endif
-	} else {
-		// We'll use a RGBA texture into which we pack the depth info
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, size, size, 0,
-				GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-
-		// Attach the RGBA texture to FBO color attachment point
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-				GL_TEXTURE_2D, depth, 0);
-
-		// Allocate 16-bit depth buffer
-		glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, size, size);
-
-		// Attach the render buffer as depth buffer - will be ignored
-		glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
-				GL_RENDERBUFFER, rbo);
-	}
-
-#if 0
-
-	if (!p_use_depth) {
-
-
-		print_line("try no depth!");
-
-		glGenTextures(1, &rgba);
-		glBindTexture(GL_TEXTURE_2D, rgba);
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, size, size, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, rgba, 0);
-/*
-		glGenRenderbuffers(1, &depth);
-		glBindRenderbuffer(GL_RENDERBUFFER, depth);
-		glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, p_size, p_size);
-		glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, depth);
-*/
-		glGenTextures(1, &depth);
-		glBindTexture(GL_TEXTURE_2D, depth);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT16, size, size, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL);
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, depth, 0);
-
-	} else {
-
-		//glGenRenderbuffers(1, &rbo);
-		//glBindRenderbuffer(GL_RENDERBUFFER, rbo);
-
-		glGenTextures(1, &depth);
-		glBindTexture(GL_TEXTURE_2D, depth);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-		glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-		glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-		glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT, size, size, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL);
-		glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, depth, 0);
-
-	}
-
-#endif
-	GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-//printf("errnum: %x\n",status);
-#ifdef GLEW_ENABLED
-	if (p_use_depth) {
-		//glDrawBuffer(GL_BACK);
-	}
-#endif
-	glBindFramebuffer(GL_FRAMEBUFFER, 0);
-	DEBUG_TEST_ERROR("Shadow Buffer Init");
-	ERR_FAIL_COND_V(status != GL_FRAMEBUFFER_COMPLETE, false);
-
-#ifdef GLEW_ENABLED
-	if (p_use_depth) {
-		//glDrawBuffer(GL_BACK);
-	}
-#endif
-
-#if 0
-	glGenFramebuffers(1, &fbo_blur);
-	glBindFramebuffer(GL_FRAMEBUFFER, fbo_blur);
-
-	glGenRenderbuffers(1, &rbo_blur);
-	glBindRenderbuffer(GL_RENDERBUFFER, rbo_blur);
-
-	glGenTextures(1, &blur);
-	glBindTexture(GL_TEXTURE_2D, blur);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, size, size, 0, GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-	//glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT16, size, size, 0,
-	//GL_DEPTH_COMPONENT16, GL_UNSIGNED_SHORT, NULL);
-
-	// Attach the RGBA texture to FBO color attachment point
-	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-			GL_TEXTURE_2D, blur, 0);
-
-	// Allocate 16-bit depth buffer
-	/*
-	glRenderbufferStorage(GL_RENDERBUFFER, GL_DEPTH_COMPONENT16, size, size);
-
-	// Attach the render buffer as depth buffer - will be ignored
-	glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
-			GL_RENDERBUFFER, rbo_blur);
-	*/
-	status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-	OS::get_singleton()->print("Status: %x\n",status);
-	glBindFramebuffer(GL_FRAMEBUFFER, 0);
-	DEBUG_TEST_ERROR("Shadow Blur Buffer Init");
-	ERR_FAIL_COND_V( status != GL_FRAMEBUFFER_COMPLETE,false );
-#endif
-
-	return true;
-}
-
-void RasterizerGLES2::_update_framebuffer() {
-
-	if (!use_framebuffers)
-		return;
-
-	int scale = GLOBAL_DEF("rasterizer/framebuffer_shrink", 1);
-	if (scale < 1)
-		scale = 1;
-
-	int dwidth = OS::get_singleton()->get_video_mode().width / scale;
-	int dheight = OS::get_singleton()->get_video_mode().height / scale;
-
-	if (framebuffer.fbo && dwidth == framebuffer.width && dheight == framebuffer.height)
-		return;
-
-	bool use_fbo = true;
-
-	if (framebuffer.fbo != 0) {
-
-		glDeleteFramebuffers(1, &framebuffer.fbo);
-#if 0
-		glDeleteTextures(1,&framebuffer.depth);
-#else
-		glDeleteRenderbuffers(1, &framebuffer.depth);
-
-#endif
-		glDeleteTextures(1, &framebuffer.color);
-
-		for (int i = 0; i < framebuffer.luminance.size(); i++) {
-
-			glDeleteTextures(1, &framebuffer.luminance[i].color);
-			glDeleteFramebuffers(1, &framebuffer.luminance[i].fbo);
-		}
-
-		for (int i = 0; i < 3; i++) {
-
-			glDeleteTextures(1, &framebuffer.blur[i].color);
-			glDeleteFramebuffers(1, &framebuffer.blur[i].fbo);
-		}
-
-		glDeleteTextures(1, &framebuffer.sample_color);
-		glDeleteFramebuffers(1, &framebuffer.sample_fbo);
-		framebuffer.luminance.clear();
-		framebuffer.blur_size = 0;
-		framebuffer.fbo = 0;
-	}
-
-#ifdef TOOLS_ENABLED
-	framebuffer.active = use_fbo;
-#else
-	framebuffer.active = use_fbo && !low_memory_2d;
-#endif
-	framebuffer.width = dwidth;
-	framebuffer.height = dheight;
-	framebuffer.scale = scale;
-
-	if (!framebuffer.active)
-		return;
-
-	glGenFramebuffers(1, &framebuffer.fbo);
-	glBindFramebuffer(GL_FRAMEBUFFER, framebuffer.fbo);
-
-//print_line("generating fbo, id: "+itos(framebuffer.fbo));
-//depth
-
-// Create a render buffer
-
-#if 0
-	glGenTextures(1, &framebuffer.depth);
-	glBindTexture(GL_TEXTURE_2D, framebuffer.depth);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT24,  framebuffer.width, framebuffer.height, 0, GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_COMPARE_MODE, GL_NONE );
-	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_TEXTURE_2D, framebuffer.depth, 0);
-
-#else
-
-	glGenRenderbuffers(1, &framebuffer.depth);
-	glBindRenderbuffer(GL_RENDERBUFFER, framebuffer.depth);
-
-	glRenderbufferStorage(GL_RENDERBUFFER, use_depth24 ? _DEPTH_COMPONENT24_OES : GL_DEPTH_COMPONENT16, framebuffer.width, framebuffer.height);
-
-	glFramebufferRenderbuffer(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT, GL_RENDERBUFFER, framebuffer.depth);
-
-#endif
-	//color
-
-	//GLuint format_rgba = use_fp16_fb?_GL_RGBA16F_EXT:GL_RGBA;
-	GLuint format_rgba = GL_RGBA;
-	GLuint format_type = use_fp16_fb ? _GL_HALF_FLOAT_OES : GL_UNSIGNED_BYTE;
-	GLuint format_internal = GL_RGBA;
-
-	if (use_16bits_fbo) {
-		format_type = GL_UNSIGNED_SHORT_5_6_5;
-		format_rgba = GL_RGB;
-		format_internal = GL_RGB;
-	}
-	/*GLuint format_luminance = use_fp16_fb?GL_RGB16F:GL_RGBA;
-	GLuint format_luminance_type = use_fp16_fb?(use_fu_GL_HALF_FLOAT_OES):GL_UNSIGNED_BYTE;
-	GLuint format_luminance_components = use_fp16_fb?GL_RGB:GL_RGBA;*/
-
-	GLuint format_luminance = use_fp16_fb ? _GL_RG_EXT : GL_RGBA;
-	GLuint format_luminance_type = use_fp16_fb ? (full_float_fb_supported ? GL_FLOAT : _GL_HALF_FLOAT_OES) : GL_UNSIGNED_BYTE;
-	GLuint format_luminance_components = use_fp16_fb ? _GL_RG_EXT : GL_RGBA;
-
-	glGenTextures(1, &framebuffer.color);
-	glBindTexture(GL_TEXTURE_2D, framebuffer.color);
-	glTexImage2D(GL_TEXTURE_2D, 0, format_rgba, framebuffer.width, framebuffer.height, 0, format_internal, format_type, NULL);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-	//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, framebuffer.color, 0);
-#
-	GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-	glBindFramebuffer(GL_FRAMEBUFFER, 0);
-
-	if (status != GL_FRAMEBUFFER_COMPLETE) {
-
-		glDeleteFramebuffers(1, &framebuffer.fbo);
-#if 0
-		glDeleteTextures(1,&framebuffer.depth);
-#else
-		glDeleteRenderbuffers(1, &framebuffer.depth);
-
-#endif
-		glDeleteTextures(1, &framebuffer.color);
-		framebuffer.fbo = 0;
-		framebuffer.active = false;
-		//print_line("**************** NO FAMEBUFFEEEERRRR????");
-		WARN_PRINT(String("Could not create framebuffer!!, code: " + itos(status)).ascii().get_data());
-	}
-
-	//sample
-
-	glGenFramebuffers(1, &framebuffer.sample_fbo);
-	glBindFramebuffer(GL_FRAMEBUFFER, framebuffer.sample_fbo);
-	glGenTextures(1, &framebuffer.sample_color);
-	glBindTexture(GL_TEXTURE_2D, framebuffer.sample_color);
-	glTexImage2D(GL_TEXTURE_2D, 0, format_rgba, framebuffer.width, framebuffer.height, 0, format_internal, format_type, NULL);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-	//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-	//glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0, GL_TEXTURE_2D, framebuffer.sample_color, 0);
-#
-	status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-	glBindFramebuffer(GL_FRAMEBUFFER, 0);
-
-	if (status != GL_FRAMEBUFFER_COMPLETE) {
-
-		glDeleteFramebuffers(1, &framebuffer.fbo);
-#if 0
-		glDeleteTextures(1,&framebuffer.depth);
-#else
-		glDeleteRenderbuffers(1, &framebuffer.depth);
-
-#endif
-		glDeleteTextures(1, &framebuffer.color);
-		glDeleteTextures(1, &framebuffer.sample_color);
-		glDeleteFramebuffers(1, &framebuffer.sample_fbo);
-		framebuffer.fbo = 0;
-		framebuffer.active = false;
-		//print_line("**************** NO FAMEBUFFEEEERRRR????");
-		WARN_PRINT("Could not create framebuffer!!");
-	}
-	//blur
-
-	int size = GLOBAL_DEF("rasterizer/blur_buffer_size", 256);
-
-	if (size != framebuffer.blur_size) {
-
-		for (int i = 0; i < 3; i++) {
-
-			if (framebuffer.blur[i].fbo) {
-				glDeleteFramebuffers(1, &framebuffer.blur[i].fbo);
-				glDeleteTextures(1, &framebuffer.blur[i].color);
-				framebuffer.blur[i].fbo = 0;
-				framebuffer.blur[i].color = 0;
-			}
-		}
-
-		framebuffer.blur_size = size;
-
-		for (int i = 0; i < 3; i++) {
-
-			glGenFramebuffers(1, &framebuffer.blur[i].fbo);
-			glBindFramebuffer(GL_FRAMEBUFFER, framebuffer.blur[i].fbo);
-
-			glGenTextures(1, &framebuffer.blur[i].color);
-			glBindTexture(GL_TEXTURE_2D, framebuffer.blur[i].color);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-			glTexImage2D(GL_TEXTURE_2D, 0, format_rgba, size, size, 0,
-					format_internal, format_type, NULL);
-			glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-					GL_TEXTURE_2D, framebuffer.blur[i].color, 0);
-
-			GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-
-			glBindFramebuffer(GL_FRAMEBUFFER, 0);
-			DEBUG_TEST_ERROR("Shadow Buffer Init");
-			ERR_CONTINUE(status != GL_FRAMEBUFFER_COMPLETE);
-		}
-	}
-
-	// luminance
-
-	int base_size = GLOBAL_DEF("rasterizer/luminance_buffer_size", 81);
-
-	if (framebuffer.luminance.empty() || framebuffer.luminance[0].size != base_size) {
-
-		for (int i = 0; i < framebuffer.luminance.size(); i++) {
-
-			glDeleteFramebuffers(1, &framebuffer.luminance[i].fbo);
-			glDeleteTextures(1, &framebuffer.luminance[i].color);
-		}
-
-		framebuffer.luminance.clear();
-
-		while (base_size > 0) {
-
-			FrameBuffer::Luminance lb;
-			lb.size = base_size;
-
-			glGenFramebuffers(1, &lb.fbo);
-			glBindFramebuffer(GL_FRAMEBUFFER, lb.fbo);
-
-			glGenTextures(1, &lb.color);
-			glBindTexture(GL_TEXTURE_2D, lb.color);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-			glTexImage2D(GL_TEXTURE_2D, 0, format_luminance, lb.size, lb.size, 0,
-					format_luminance_components, format_luminance_type, NULL);
-			glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-					GL_TEXTURE_2D, lb.color, 0);
-
-			GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-
-			glBindFramebuffer(GL_FRAMEBUFFER, 0);
-
-			base_size /= 3;
-
-			DEBUG_TEST_ERROR("Shadow Buffer Init");
-			ERR_CONTINUE(status != GL_FRAMEBUFFER_COMPLETE);
-
-			framebuffer.luminance.push_back(lb);
-		}
-	}
-}
-
-void RasterizerGLES2::set_base_framebuffer(GLuint p_id, Vector2 p_size) {
-
-	base_framebuffer = p_id;
-
-	if (p_size.x != 0) {
-		window_size = p_size;
-	};
-}
-
-#if 0
-void RasterizerGLES2::_update_blur_buffer() {
-
-	int size = GLOBAL_DEF("rasterizer/blur_buffer_size",256);
-	if (size!=framebuffer.blur_size) {
-
-		for(int i=0;i<3;i++) {
-
-			if (framebuffer.blur[i].fbo) {
-				glDeleteFramebuffers(1,&framebuffer.blur[i].fbo);
-				glDeleteTextures(1,&framebuffer.blur[i].color);
-				framebuffer.blur[i].fbo=0;
-				framebuffer.blur[i].color=0;
-			}
-		}
-
-		framebuffer.blur_size=size;
-
-		for(int i=0;i<3;i++) {
-
-			glGenFramebuffers(1, &framebuffer.blur[i].fbo);
-			glBindFramebuffer(GL_FRAMEBUFFER, framebuffer.blur[i].fbo);
-
-			glGenTextures(1, &framebuffer.blur[i].color);
-			glBindTexture(GL_TEXTURE_2D, framebuffer.blur[i].color);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-			glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-			glTexParameterf(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-			glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA, size, size, 0,
-					GL_RGBA, GL_UNSIGNED_BYTE, NULL);
-			glFramebufferTexture2D(GL_FRAMEBUFFER, GL_COLOR_ATTACHMENT0,
-					GL_TEXTURE_2D, framebuffer.blur[i].color, 0);
-
-
-			GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-
-			glBindFramebuffer(GL_FRAMEBUFFER, 0);
-			DEBUG_TEST_ERROR("Shadow Buffer Init");
-			ERR_CONTINUE( status != GL_FRAMEBUFFER_COMPLETE );
-
-
-		}
-
-	}
-
-
-
-
-
-}
-#endif
-
-bool RasterizerGLES2::_test_depth_shadow_buffer() {
-
-	int size = 16;
-
-	GLuint fbo;
-	GLuint rbo;
-	GLuint depth;
-
-	glActiveTexture(GL_TEXTURE0);
-
-	glGenFramebuffers(1, &fbo);
-	glBindFramebuffer(GL_FRAMEBUFFER, fbo);
-
-	// Create a render buffer
-	glGenRenderbuffers(1, &rbo);
-	glBindRenderbuffer(GL_RENDERBUFFER, rbo);
-
-	// Create a texture for storing the depth
-	glGenTextures(1, &depth);
-	glBindTexture(GL_TEXTURE_2D, depth);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-
-	// Remove artifact on the edges of the shadowmap
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP_TO_EDGE);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP_TO_EDGE);
-
-	// We'll use a depth texture to store the depths in the shadow map
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_DEPTH_COMPONENT, size, size, 0,
-			GL_DEPTH_COMPONENT, GL_UNSIGNED_INT, NULL);
-
-#ifdef GLEW_ENABLED
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_LINEAR);
-	glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_LINEAR);
-#endif
-
-	// Attach the depth texture to FBO depth attachment point
-	glFramebufferTexture2D(GL_FRAMEBUFFER, GL_DEPTH_ATTACHMENT,
-			GL_TEXTURE_2D, depth, 0);
-
-	GLenum status = glCheckFramebufferStatus(GL_FRAMEBUFFER);
-
-	glDeleteFramebuffers(1, &fbo);
-	glDeleteRenderbuffers(1, &rbo);
-	glDeleteTextures(1, &depth);
-
-	return status == GL_FRAMEBUFFER_COMPLETE;
-}
-
-void RasterizerGLES2::init() {
-
-	if (OS::get_singleton()->is_stdout_verbose()) {
-		print_line("Using GLES2 video driver");
-	}
-
-#ifdef GLEW_ENABLED
-	GLuint res = glewInit();
-	ERR_FAIL_COND(res != GLEW_OK);
-	if (OS::get_singleton()->is_stdout_verbose()) {
-		print_line(String("GLES2: Using GLEW ") + (const char *)glewGetString(GLEW_VERSION));
-	}
-
-	// Godot makes use of functions from ARB_framebuffer_object extension which is not implemented by all drivers.
-	// On the other hand, these drivers might implement the older EXT_framebuffer_object extension
-	// with which current source code is backward compatible.
-
-	bool framebuffer_object_is_supported = glewIsSupported("GL_ARB_framebuffer_object");
-
-	if (!framebuffer_object_is_supported) {
-		WARN_PRINT("GL_ARB_framebuffer_object not supported by your graphics card.");
-
-		if (glewIsSupported("GL_EXT_framebuffer_object")) {
-			// falling-back to the older EXT function if present
-			WARN_PRINT("Falling-back to GL_EXT_framebuffer_object.");
-
-			glIsRenderbuffer = glIsRenderbufferEXT;
-			glBindRenderbuffer = glBindRenderbufferEXT;
-			glDeleteRenderbuffers = glDeleteRenderbuffersEXT;
-			glGenRenderbuffers = glGenRenderbuffersEXT;
-			glRenderbufferStorage = glRenderbufferStorageEXT;
-			glGetRenderbufferParameteriv = glGetRenderbufferParameterivEXT;
-			glIsFramebuffer = glIsFramebufferEXT;
-			glBindFramebuffer = glBindFramebufferEXT;
-			glDeleteFramebuffers = glDeleteFramebuffersEXT;
-			glGenFramebuffers = glGenFramebuffersEXT;
-			glCheckFramebufferStatus = glCheckFramebufferStatusEXT;
-			glFramebufferTexture1D = glFramebufferTexture1DEXT;
-			glFramebufferTexture2D = glFramebufferTexture2DEXT;
-			glFramebufferTexture3D = glFramebufferTexture3DEXT;
-			glFramebufferRenderbuffer = glFramebufferRenderbufferEXT;
-			glGetFramebufferAttachmentParameteriv = glGetFramebufferAttachmentParameterivEXT;
-			glGenerateMipmap = glGenerateMipmapEXT;
-
-			framebuffer_object_is_supported = true;
-		} else {
-			ERR_PRINT("Framebuffer Object is not supported by your graphics card.");
-		}
-	}
-
-	// Check for GL 2.1 compatibility, if not bail out
-	if (!(glewIsSupported("GL_VERSION_2_1") && framebuffer_object_is_supported)) {
-		ERR_PRINT("Your system's graphic drivers seem not to support OpenGL 2.1 / GLES 2.0, sorry :(\n"
-				  "Try a drivers update, buy a new GPU or try software rendering on Linux; Godot is now going to terminate.");
-		OS::get_singleton()->alert("Your system's graphic drivers seem not to support OpenGL 2.1 / GLES 2.0, sorry :(\n"
-								   "Godot Engine will self-destruct as soon as you acknowledge this error message.",
-				"Fatal error: Insufficient OpenGL / GLES drivers");
-		exit(1);
-	}
-#endif
-
-	scene_pass = 1;
-
-	if (extensions.size() == 0) {
-
-		set_extensions((const char *)glGetString(GL_EXTENSIONS));
-	}
-
-	GLint tmp = 0;
-	glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &tmp);
-	//print_line("GL_MAX_VERTEX_ATTRIBS "+itos(tmp));
-
-	glEnable(GL_DEPTH_TEST);
-	glDepthFunc(GL_LEQUAL);
-	glFrontFace(GL_CW);
-	//glEnable(GL_TEXTURE_2D);
-
-	default_material = create_default_material();
-
-	material_shader.init();
-	canvas_shader.init();
-	copy_shader.init();
-	canvas_shadow_shader.init();
-
-#ifdef GLEW_ENABLED
-	material_shader.set_conditional(MaterialShaderGLES2::USE_GLES_OVER_GL, true);
-	canvas_shader.set_conditional(CanvasShaderGLES2::USE_GLES_OVER_GL, true);
-	canvas_shadow_shader.set_conditional(CanvasShadowShaderGLES2::USE_GLES_OVER_GL, true);
-	copy_shader.set_conditional(CopyShaderGLES2::USE_GLES_OVER_GL, true);
-#endif
-
-#ifdef ANGLE_ENABLED
-	// Fix for ANGLE
-	material_shader.set_conditional(MaterialShaderGLES2::DISABLE_FRONT_FACING, true);
-#endif
-
-	shadow = NULL;
-	shadow_pass = 0;
-
-	framebuffer.fbo = 0;
-	framebuffer.width = 0;
-	framebuffer.height = 0;
-	//framebuffer.buff16=false;
-	//framebuffer.blur[0].fbo=false;
-	//framebuffer.blur[1].fbo=false;
-	framebuffer.active = false;
-
-	//do a single initial clear
-	glClearColor(0, 0, 0, 1);
-	//glClearDepth(1.0);
-	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-	glGenTextures(1, &white_tex);
-	unsigned char whitetexdata[8 * 8 * 3];
-	for (int i = 0; i < 8 * 8 * 3; i++) {
-		whitetexdata[i] = 255;
-	}
-	glActiveTexture(GL_TEXTURE0);
-	glBindTexture(GL_TEXTURE_2D, white_tex);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 8, 8, 0, GL_RGB, GL_UNSIGNED_BYTE, whitetexdata);
-	glGenerateMipmap(GL_TEXTURE_2D);
-	glBindTexture(GL_TEXTURE_2D, 0);
-
-#ifdef GLEW_ENABLED
-
-	pvr_supported = false;
-	etc_supported = false;
-	use_depth24 = true;
-	s3tc_supported = true;
-	atitc_supported = false;
-	//use_texture_instancing=false;
-	//use_attribute_instancing=true;
-	use_texture_instancing = false;
-	use_attribute_instancing = true;
-	full_float_fb_supported = true;
-	srgb_supported = true;
-	latc_supported = true;
-	s3tc_srgb_supported = true;
-	use_anisotropic_filter = true;
-	float_linear_supported = true;
-
-	GLint vtf;
-	glGetIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, &vtf);
-	float_supported = extensions.has("GL_OES_texture_float") || extensions.has("GL_ARB_texture_float");
-	use_hw_skeleton_xform = vtf > 0 && float_supported;
-
-	read_depth_supported = _test_depth_shadow_buffer();
-	use_rgba_shadowmaps = !read_depth_supported;
-	//print_line("read depth support? "+itos(read_depth_supported));
-
-	glGetFloatv(GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &anisotropic_level);
-	anisotropic_level = MIN(anisotropic_level, float(GLOBAL_DEF("rasterizer/anisotropic_filter_level", 4.0)));
-#ifdef OSX_ENABLED
-	use_rgba_shadowmaps = true;
-	use_fp16_fb = false;
-#else
-
-#endif
-	use_half_float = true;
-
-#else
-
-	for (Set<String>::Element *E = extensions.front(); E; E = E->next()) {
-		print_line(E->get());
-	}
-	read_depth_supported = extensions.has("GL_OES_depth_texture");
-	use_rgba_shadowmaps = !read_depth_supported;
-	if (shadow_filter >= SHADOW_FILTER_ESM && !extensions.has("GL_EXT_frag_depth")) {
-		use_rgba_shadowmaps = true; //no other way, go back to rgba
-	}
-	pvr_supported = extensions.has("GL_IMG_texture_compression_pvrtc");
-	pvr_srgb_supported = extensions.has("GL_EXT_pvrtc_sRGB");
-	etc_supported = extensions.has("GL_OES_compressed_ETC1_RGB8_texture");
-	use_depth24 = extensions.has("GL_OES_depth24");
-	s3tc_supported = extensions.has("GL_EXT_texture_compression_dxt1") || extensions.has("GL_EXT_texture_compression_s3tc") || extensions.has("WEBGL_compressed_texture_s3tc");
-	use_half_float = extensions.has("GL_OES_vertex_half_float");
-	atitc_supported = extensions.has("GL_AMD_compressed_ATC_texture");
-
-	srgb_supported = extensions.has("GL_EXT_sRGB");
-#ifndef ANGLE_ENABLED
-	s3tc_srgb_supported = s3tc_supported && extensions.has("GL_EXT_texture_compression_s3tc");
-#else
-	s3tc_srgb_supported = s3tc_supported;
-#endif
-	latc_supported = extensions.has("GL_EXT_texture_compression_latc");
-	anisotropic_level = 1.0;
-	use_anisotropic_filter = extensions.has("GL_EXT_texture_filter_anisotropic");
-	if (use_anisotropic_filter) {
-		glGetFloatv(_GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT, &anisotropic_level);
-		anisotropic_level = MIN(anisotropic_level, float(GLOBAL_DEF("rasterizer/anisotropic_filter_level", 4.0)));
-	}
-
-	print_line("S3TC: " + itos(s3tc_supported) + " ATITC: " + itos(atitc_supported));
-
-	GLint vtf;
-	glGetIntegerv(GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS, &vtf);
-	float_supported = extensions.has("GL_OES_texture_float") || extensions.has("GL_ARB_texture_float");
-	use_hw_skeleton_xform = vtf > 0 && float_supported;
-	float_linear_supported = extensions.has("GL_OES_texture_float_linear");
-
-	/*
-	if (extensions.has("GL_QCOM_tiled_rendering"))
-		use_hw_skeleton_xform=false;
-	*/
-	GLint mva;
-	glGetIntegerv(GL_MAX_VERTEX_ATTRIBS, &mva);
-	if (vtf == 0 && mva > 8) {
-		//tegra 3, mali 400
-		use_attribute_instancing = true;
-		use_texture_instancing = false;
-	} else if (vtf > 0 && extensions.has("GL_OES_texture_float")) {
-		//use_texture_instancing=true;
-		use_texture_instancing = false; // i don't get it, uniforms are faster.
-		use_attribute_instancing = false;
-
-	} else {
-
-		use_texture_instancing = false;
-		use_attribute_instancing = false;
-	}
-
-	if (use_fp16_fb) {
-		use_fp16_fb = extensions.has("GL_OES_texture_half_float") && extensions.has("GL_EXT_color_buffer_half_float") && extensions.has("GL_EXT_texture_rg");
-	}
-
-	full_float_fb_supported = extensions.has("GL_EXT_color_buffer_float");
-
-//etc_supported=false;
-
-#endif
-
-	//use_rgba_shadowmaps=true;
-
-	glGetIntegerv(GL_MAX_TEXTURE_IMAGE_UNITS, &max_texture_units);
-	glGetIntegerv(GL_MAX_TEXTURE_SIZE, &max_texture_size);
-	//read_depth_supported=false;
-
-	canvas_shadow_blur = canvas_light_shadow_buffer_create(max_texture_size);
-
-	{
-		//shadowmaps
-
-		//don't use a shadowbuffer too big in GLES, this should be the maximum
-		int max_shadow_size = GLOBAL_DEF("rasterizer/max_shadow_buffer_size", 1024);
-		int smsize = max_shadow_size;
-		while (smsize >= 16) {
-
-			ShadowBuffer sb;
-			bool s = sb.init(smsize, !use_rgba_shadowmaps);
-			if (s)
-				near_shadow_buffers.push_back(sb);
-			smsize /= 2;
-		}
-
-		blur_shadow_buffer.init(max_shadow_size, !use_rgba_shadowmaps);
-
-		//material_shader
-		material_shader.set_conditional(MaterialShaderGLES2::USE_DEPTH_SHADOWS, !use_rgba_shadowmaps);
-		canvas_shadow_shader.set_conditional(CanvasShadowShaderGLES2::USE_DEPTH_SHADOWS, !use_rgba_shadowmaps);
-	}
-
-	shadow_material = material_create(); //empty with nothing
-	shadow_mat_ptr = material_owner.get(shadow_material);
-
-	// Now create a second shadow material for double-sided shadow instances
-	shadow_material_double_sided = material_create();
-	shadow_mat_double_sided_ptr = material_owner.get(shadow_material_double_sided);
-	shadow_mat_double_sided_ptr->flags[VS::MATERIAL_FLAG_DOUBLE_SIDED] = true;
-
-	overdraw_material = create_overdraw_debug_material();
-	copy_shader.set_conditional(CopyShaderGLES2::USE_8BIT_HDR, !use_fp16_fb);
-	canvas_shader.set_conditional(CanvasShaderGLES2::USE_DEPTH_SHADOWS, read_depth_supported);
-
-	canvas_shader.set_conditional(CanvasShaderGLES2::USE_PIXEL_SNAP, GLOBAL_DEF("rendering/use_2d_pixel_snap", false));
-
-	npo2_textures_available = true;
-	//fragment_lighting=false;
-	_rinfo.texture_mem = 0;
-	current_env = NULL;
-	current_rt = NULL;
-	current_vd = NULL;
-	current_debug = VS::SCENARIO_DEBUG_DISABLED;
-	camera_ortho = false;
-
-	glGenBuffers(1, &gui_quad_buffer);
-	glBindBuffer(GL_ARRAY_BUFFER, gui_quad_buffer);
-#ifdef GLES_NO_CLIENT_ARRAYS //WebGL specific implementation.
-	glBufferData(GL_ARRAY_BUFFER, 8 * MAX_POLYGON_VERTICES, NULL, GL_DYNAMIC_DRAW);
-#else
-	glBufferData(GL_ARRAY_BUFFER, 128, NULL, GL_DYNAMIC_DRAW);
-#endif
-	glBindBuffer(GL_ARRAY_BUFFER, 0); //unbind
-
-#ifdef GLES_NO_CLIENT_ARRAYS //webgl indices buffer
-	glGenBuffers(1, &indices_buffer);
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, indices_buffer);
-	glBufferData(GL_ELEMENT_ARRAY_BUFFER, 16 * 1024, NULL, GL_DYNAMIC_DRAW);
-	glBindBuffer(GL_ELEMENT_ARRAY_BUFFER, 0); // unbind
-#endif
-
-	shader_time_rollback = GLOBAL_DEF("rasterizer/shader_time_rollback", 300);
-
-	using_canvas_bg = false;
-	_update_framebuffer();
-	DEBUG_TEST_ERROR("Initializing");
-}
-
-void RasterizerGLES2::finish() {
-
-	free(default_material);
-	free(shadow_material);
-	free(shadow_material_double_sided);
-	free(canvas_shadow_blur);
-	free(overdraw_material);
-}
-
-int RasterizerGLES2::get_render_info(VS::RenderInfo p_info) {
-
-	switch (p_info) {
-
-		case VS::INFO_OBJECTS_IN_FRAME: {
-
-			return _rinfo.object_count;
-		} break;
-		case VS::INFO_VERTICES_IN_FRAME: {
-
-			return _rinfo.vertex_count;
-		} break;
-		case VS::INFO_MATERIAL_CHANGES_IN_FRAME: {
-
-			return _rinfo.mat_change_count;
-		} break;
-		case VS::INFO_SHADER_CHANGES_IN_FRAME: {
-
-			return _rinfo.shader_change_count;
-		} break;
-		case VS::INFO_DRAW_CALLS_IN_FRAME: {
-
-			return _rinfo.draw_calls;
-		} break;
-		case VS::INFO_SURFACE_CHANGES_IN_FRAME: {
-
-			return _rinfo.surface_count;
-		} break;
-		case VS::INFO_USAGE_VIDEO_MEM_TOTAL: {
-
-			return 0;
-		} break;
-		case VS::INFO_VIDEO_MEM_USED: {
-
-			return get_render_info(VS::INFO_TEXTURE_MEM_USED) + get_render_info(VS::INFO_VERTEX_MEM_USED);
-		} break;
-		case VS::INFO_TEXTURE_MEM_USED: {
-
-			return _rinfo.texture_mem;
-		} break;
-		case VS::INFO_VERTEX_MEM_USED: {
-
-			return 0;
-		} break;
-	}
-
-	return 0;
-}
-
-void RasterizerGLES2::set_extensions(const char *p_strings) {
-
-	Vector<String> strings = String(p_strings).split(" ", false);
-	for (int i = 0; i < strings.size(); i++) {
-
-		extensions.insert(strings[i]);
-		//print_line(strings[i]);
-	}
-}
-
-bool RasterizerGLES2::needs_to_draw_next_frame() const {
-
-	return draw_next_frame;
-}
-
-bool RasterizerGLES2::has_feature(VS::Features p_feature) const {
-
-	switch (p_feature) {
-		case VS::FEATURE_SHADERS: return true;
-		case VS::FEATURE_NEEDS_RELOAD_HOOK: return use_reload_hooks;
-		default: return false;
-	}
-}
-
-void RasterizerGLES2::reload_vram() {
-
-	glEnable(GL_DEPTH_TEST);
-	glDepthFunc(GL_LEQUAL);
-	glFrontFace(GL_CW);
-
-	//do a single initial clear
-	glClearColor(0, 0, 0, 1);
-	//glClearDepth(1.0);
-	glClear(GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT);
-
-	glGenTextures(1, &white_tex);
-	unsigned char whitetexdata[8 * 8 * 3];
-	for (int i = 0; i < 8 * 8 * 3; i++) {
-		whitetexdata[i] = 255;
-	}
-	glActiveTexture(GL_TEXTURE0);
-	glBindTexture(GL_TEXTURE_2D, white_tex);
-	glTexImage2D(GL_TEXTURE_2D, 0, GL_RGB, 8, 8, 0, GL_RGB, GL_UNSIGNED_BYTE, whitetexdata);
-	glGenerateMipmap(GL_TEXTURE_2D);
-	glBindTexture(GL_TEXTURE_2D, 0);
-
-	List<RID> textures;
-	texture_owner.get_owned_list(&textures);
-	keep_copies = false;
-	for (List<RID>::Element *E = textures.front(); E; E = E->next()) {
-
-		RID tid = E->get();
-		Texture *t = texture_owner.get(tid);
-		ERR_CONTINUE(!t);
-		t->tex_id = 0;
-		t->data_size = 0;
-		glGenTextures(1, &t->tex_id);
-		t->active = false;
-		if (t->render_target)
-			continue;
-		texture_allocate(tid, t->width, t->height, t->format, t->flags);
-		bool had_image = false;
-		for (int i = 0; i < 6; i++) {
-			if (!t->image[i].empty()) {
-				texture_set_data(tid, t->image[i], VS::CubeMapSide(i));
-				had_image = true;
-			}
-		}
-
-		if (!had_image && t->reloader) {
-			Object *rl = ObjectDB::get_instance(t->reloader);
-			if (rl)
-				rl->call(t->reloader_func, tid);
-		}
-	}
-	keep_copies = true;
-
-	List<RID> render_targets;
-	render_target_owner.get_owned_list(&render_targets);
-	for (List<RID>::Element *E = render_targets.front(); E; E = E->next()) {
-		RenderTarget *rt = render_target_owner.get(E->get());
-
-		int w = rt->width;
-		int h = rt->height;
-		rt->width = 0;
-		rt->height = 0;
-		render_target_set_size(E->get(), w, h);
-	}
-
-	List<RID> meshes;
-	mesh_owner.get_owned_list(&meshes);
-	for (List<RID>::Element *E = meshes.front(); E; E = E->next()) {
-
-		Mesh *mesh = mesh_owner.get(E->get());
-		Vector<Surface *> surfaces = mesh->surfaces;
-		mesh->surfaces.clear();
-		for (int i = 0; i < surfaces.size(); i++) {
-			mesh_add_surface(E->get(), surfaces[i]->primitive, surfaces[i]->data, surfaces[i]->morph_data, surfaces[i]->alpha_sort);
-			mesh_surface_set_material(E->get(), i, surfaces[i]->material);
-
-			if (surfaces[i]->array_local != 0) {
-				memfree(surfaces[i]->array_local);
-			};
-			if (surfaces[i]->index_array_local != 0) {
-				memfree(surfaces[i]->index_array_local);
-			};
-
-			memdelete(surfaces[i]);
-		}
-	}
-
-	List<RID> skeletons;
-	skeleton_owner.get_owned_list(&skeletons);
-	for (List<RID>::Element *E = skeletons.front(); E; E = E->next()) {
-
-		Skeleton *sk = skeleton_owner.get(E->get());
-		if (!sk->tex_id)
-			continue; //does not use hw transform, leave alone
-
-		Vector<Skeleton::Bone> bones = sk->bones;
-		sk->bones.clear();
-		sk->tex_id = 0;
-		sk->pixel_size = 1.0;
-		skeleton_resize(E->get(), bones.size());
-		sk->bones = bones;
-	}
-
-	List<RID> multimeshes;
-	multimesh_owner.get_owned_list(&multimeshes);
-	for (List<RID>::Element *E = multimeshes.front(); E; E = E->next()) {
-
-		MultiMesh *mm = multimesh_owner.get(E->get());
-		if (!mm->tex_id)
-			continue; //does not use hw transform, leave alone
-
-		Vector<MultiMesh::Element> elements = mm->elements;
-		mm->elements.clear();
-
-		mm->tw = 1;
-		mm->th = 1;
-		mm->tex_id = 0;
-		mm->last_pass = 0;
-		mm->visible = -1;
-
-		multimesh_set_instance_count(E->get(), elements.size());
-		mm->elements = elements;
-	}
-
-	if (framebuffer.fbo != 0) {
-
-		framebuffer.fbo = 0;
-		framebuffer.depth = 0;
-		framebuffer.color = 0;
-
-		for (int i = 0; i < 3; i++) {
-			framebuffer.blur[i].fbo = 0;
-			framebuffer.blur[i].color = 0;
-		}
-
-		framebuffer.luminance.clear();
-	}
-
-	for (int i = 0; i < near_shadow_buffers.size(); i++) {
-		near_shadow_buffers[i].init(near_shadow_buffers[i].size, !use_rgba_shadowmaps);
-	}
-
-	blur_shadow_buffer.init(near_shadow_buffers[0].size, !use_rgba_shadowmaps);
-
-	canvas_shader.clear_caches();
-	material_shader.clear_caches();
-	blur_shader.clear_caches();
-	copy_shader.clear_caches();
-
-	List<RID> shaders;
-	shader_owner.get_owned_list(&shaders);
-	for (List<RID>::Element *E = shaders.front(); E; E = E->next()) {
-
-		Shader *s = shader_owner.get(E->get());
-		s->custom_code_id = 0;
-		s->version = 1;
-		s->valid = false;
-		shader_set_mode(E->get(), s->mode);
-	}
-
-	List<RID> materials;
-	material_owner.get_owned_list(&materials);
-	for (List<RID>::Element *E = materials.front(); E; E = E->next()) {
-
-		Material *m = material_owner.get(E->get());
-		RID shader = m->shader;
-		m->shader_version = 0;
-		material_set_shader(E->get(), shader);
-	}
-}
-
-void RasterizerGLES2::set_use_framebuffers(bool p_use) {
-
-	use_framebuffers = p_use;
-}
-
-RasterizerGLES2 *RasterizerGLES2::get_singleton() {
-
-	return _singleton;
-};
-
-int RasterizerGLES2::RenderList::max_elements = RenderList::DEFAULT_MAX_ELEMENTS;
-
-void RasterizerGLES2::set_force_16_bits_fbo(bool p_force) {
-
-	use_16bits_fbo = p_force;
-}
-
-RasterizerGLES2::RasterizerGLES2(bool p_compress_arrays, bool p_keep_ram_copy, bool p_default_fragment_lighting, bool p_use_reload_hooks) {
-
-	_singleton = this;
-	shrink_textures_x2 = false;
-	RenderList::max_elements = GLOBAL_DEF("rasterizer/max_render_elements", (int)RenderList::DEFAULT_MAX_ELEMENTS);
-	if (RenderList::max_elements > 64000)
-		RenderList::max_elements = 64000;
-	if (RenderList::max_elements < 1024)
-		RenderList::max_elements = 1024;
-
-	opaque_render_list.init();
-	alpha_render_list.init();
-
-	skinned_buffer_size = GLOBAL_DEF("rasterizer/skeleton_buffer_size_kb", DEFAULT_SKINNED_BUFFER_SIZE);
-	if (skinned_buffer_size < 256)
-		skinned_buffer_size = 256;
-	if (skinned_buffer_size > 16384)
-		skinned_buffer_size = 16384;
-	skinned_buffer_size *= 1024;
-	skinned_buffer = memnew_arr(uint8_t, skinned_buffer_size);
-
-	keep_copies = p_keep_ram_copy;
-	use_reload_hooks = p_use_reload_hooks;
-	pack_arrays = p_compress_arrays;
-	p_default_fragment_lighting = false;
-	fragment_lighting = GLOBAL_DEF("rasterizer/use_fragment_lighting", true);
-	read_depth_supported = true; //todo check for extension
-	shadow_filter = ShadowFilterTechnique((int)(GLOBAL_DEF("rasterizer/shadow_filter", SHADOW_FILTER_PCF5)));
-	ProjectSettings::get_singleton()->set_custom_property_info("rasterizer/shadow_filter", PropertyInfo(Variant::INT, "rasterizer/shadow_filter", PROPERTY_HINT_ENUM, "None,PCF5,PCF13,ESM"));
-	use_fp16_fb = bool(GLOBAL_DEF("rasterizer/fp16_framebuffer", true));
-	use_shadow_mapping = true;
-	use_fast_texture_filter = !bool(GLOBAL_DEF("rasterizer/trilinear_mipmap_filter", true));
-	low_memory_2d = bool(GLOBAL_DEF("rasterizer/low_memory_2d_mode", false));
-	skel_default.resize(1024 * 4);
-	for (int i = 0; i < 1024 / 3; i++) {
-
-		float *ptr = skel_default.ptr();
-		ptr += i * 4 * 4;
-		ptr[0] = 1.0;
-		ptr[1] = 0.0;
-		ptr[2] = 0.0;
-		ptr[3] = 0.0;
-
-		ptr[4] = 0.0;
-		ptr[5] = 1.0;
-		ptr[6] = 0.0;
-		ptr[7] = 0.0;
-
-		ptr[8] = 0.0;
-		ptr[9] = 0.0;
-		ptr[10] = 1.0;
-		ptr[12] = 0.0;
-	}
-
-	base_framebuffer = 0;
-	frame = 0;
-	draw_next_frame = false;
-	use_framebuffers = true;
-	framebuffer.active = false;
-	tc0_id_cache = 0;
-	tc0_idx = 0;
-	use_16bits_fbo = false;
-};
-
-void RasterizerGLES2::restore_framebuffer() {
-
-	glBindFramebuffer(GL_FRAMEBUFFER, base_framebuffer);
-}
-
-RasterizerGLES2::~RasterizerGLES2() {
-
-	memdelete_arr(skinned_buffer);
-};
-
-#endif

drivers/gles2/rasterizer_gles2.h

@@ -1,1686 +0,0 @@
-/*************************************************************************/
-/*  rasterizer_gles2.h                                                   */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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 RASTERIZER_GLES2_H
-#define RASTERIZER_GLES2_H
-
-#include "servers/visual/rasterizer.h"
-
-#define MAX_POLYGON_VERTICES 4096 //used for WebGL canvas_draw_polygon call.
-
-#ifdef GLES2_ENABLED
-
-#include "camera_matrix.h"
-#include "image.h"
-#include "list.h"
-#include "map.h"
-#include "rid.h"
-#include "self_list.h"
-#include "servers/visual_server.h"
-#include "sort.h"
-
-#include "platform_config.h"
-#ifndef GLES2_INCLUDE_H
-#include <GLES2/gl2.h>
-#else
-#include GLES2_INCLUDE_H
-#endif
-
-#include "drivers/gles2/shader_compiler_gles2.h"
-#include "drivers/gles2/shaders/blur.glsl.h"
-#include "drivers/gles2/shaders/canvas.glsl.h"
-#include "drivers/gles2/shaders/canvas_shadow.glsl.h"
-#include "drivers/gles2/shaders/copy.glsl.h"
-#include "drivers/gles2/shaders/material.glsl.h"
-#include "servers/visual/particle_system_sw.h"
-
-/**
-        @author Juan Linietsky <[email protected]>
-*/
-class RasterizerGLES2 : public Rasterizer {
-
-	enum {
-
-		MAX_SCENE_LIGHTS = 2048,
-		LIGHT_SPOT_BIT = 0x80,
-		DEFAULT_SKINNED_BUFFER_SIZE = 2048, // 10k vertices
-		MAX_HW_LIGHTS = 1,
-	};
-
-	uint8_t *skinned_buffer;
-	int skinned_buffer_size;
-	bool pvr_supported;
-	bool pvr_srgb_supported;
-	bool s3tc_supported;
-	bool s3tc_srgb_supported;
-	bool latc_supported;
-	bool etc_supported;
-	bool atitc_supported;
-	bool npo2_textures_available;
-	bool read_depth_supported;
-	bool use_framebuffers;
-	bool full_float_fb_supported;
-	bool use_shadow_mapping;
-	bool use_fp16_fb;
-	bool srgb_supported;
-	bool float_supported;
-	bool float_linear_supported;
-	bool use_16bits_fbo;
-
-	ShadowFilterTechnique shadow_filter;
-
-	bool use_shadow_esm;
-	bool use_shadow_pcf;
-	bool use_hw_skeleton_xform;
-	bool use_depth24;
-	bool use_texture_instancing;
-	bool use_attribute_instancing;
-	bool use_rgba_shadowmaps;
-	bool use_anisotropic_filter;
-	float anisotropic_level;
-
-	bool use_half_float;
-	bool low_memory_2d;
-
-	bool shrink_textures_x2;
-
-	Vector<float> skel_default;
-
-	Image _get_gl_image_and_format(const Image &p_image, Image::Format p_format, uint32_t p_flags, GLenum &r_gl_format, GLenum &r_gl_internal_format, int &r_gl_components, bool &r_has_alpha_cache, bool &r_compressed);
-
-	struct RenderTarget;
-
-	struct Texture {
-
-		String path;
-		uint32_t flags;
-		int width, height;
-		int alloc_width, alloc_height;
-		Image::Format format;
-
-		GLenum target;
-		GLenum gl_format_cache;
-		GLenum gl_internal_format_cache;
-		int gl_components_cache;
-		int data_size; //original data size, useful for retrieving back
-		bool has_alpha;
-		bool format_has_alpha;
-		bool compressed;
-		bool disallow_mipmaps;
-		int total_data_size;
-		bool ignore_mipmaps;
-
-		ObjectID reloader;
-		StringName reloader_func;
-		Image image[6];
-
-		int mipmaps;
-
-		bool active;
-		GLuint tex_id;
-
-		RenderTarget *render_target;
-
-		Texture() {
-
-			ignore_mipmaps = false;
-			render_target = NULL;
-			flags = width = height = 0;
-			tex_id = 0;
-			data_size = 0;
-			format = Image::FORMAT_L8;
-			gl_components_cache = 0;
-			format_has_alpha = false;
-			has_alpha = false;
-			active = false;
-			disallow_mipmaps = false;
-			compressed = false;
-			total_data_size = 0;
-			target = GL_TEXTURE_2D;
-			mipmaps = 0;
-
-			reloader = 0;
-		}
-
-		~Texture() {
-
-			if (tex_id != 0) {
-
-				glDeleteTextures(1, &tex_id);
-			}
-		}
-	};
-
-	mutable RID_Owner<Texture> texture_owner;
-
-	struct Shader {
-
-		String vertex_code;
-		String fragment_code;
-		String light_code;
-		int vertex_line;
-		int fragment_line;
-		int light_line;
-		VS::ShaderMode mode;
-
-		uint32_t custom_code_id;
-		uint32_t version;
-
-		bool valid;
-		bool has_alpha;
-		bool can_zpass;
-		bool has_texscreen;
-		bool has_screen_uv;
-		bool writes_vertex;
-		bool uses_discard;
-		bool uses_time;
-		bool uses_normal;
-		bool uses_texpixel_size;
-
-		Map<StringName, ShaderLanguage::Uniform> uniforms;
-		StringName first_texture;
-
-		Map<StringName, RID> default_textures;
-
-		SelfList<Shader> dirty_list;
-
-		Shader()
-			: dirty_list(this) {
-
-			valid = false;
-			custom_code_id = 0;
-			has_alpha = false;
-			version = 1;
-			vertex_line = 0;
-			fragment_line = 0;
-			light_line = 0;
-			can_zpass = true;
-			has_texscreen = false;
-			has_screen_uv = false;
-			writes_vertex = false;
-			uses_discard = false;
-			uses_time = false;
-			uses_normal = false;
-		}
-	};
-
-	mutable RID_Owner<Shader> shader_owner;
-	mutable SelfList<Shader>::List _shader_dirty_list;
-	_FORCE_INLINE_ void _shader_make_dirty(Shader *p_shader);
-	void _update_shader(Shader *p_shader) const;
-
-	struct Material {
-
-		bool flags[VS::MATERIAL_FLAG_MAX];
-
-		VS::MaterialBlendMode blend_mode;
-		VS::MaterialDepthDrawMode depth_draw_mode;
-
-		float line_width;
-		bool has_alpha;
-
-		mutable uint32_t shader_version;
-
-		RID shader; // shader material
-		Shader *shader_cache;
-
-		struct UniformData {
-
-			bool inuse;
-			bool istexture;
-			Variant value;
-			int index;
-		};
-
-		mutable Map<StringName, UniformData> shader_params;
-
-		uint64_t last_pass;
-
-		Material() {
-
-			for (int i = 0; i < VS::MATERIAL_FLAG_MAX; i++)
-				flags[i] = false;
-			flags[VS::MATERIAL_FLAG_VISIBLE] = true;
-
-			line_width = 1;
-			has_alpha = false;
-			depth_draw_mode = VS::MATERIAL_DEPTH_DRAW_OPAQUE_ONLY;
-			blend_mode = VS::MATERIAL_BLEND_MODE_MIX;
-			last_pass = 0;
-			shader_version = 0;
-			shader_cache = NULL;
-		}
-	};
-
-	_FORCE_INLINE_ void _update_material_shader_params(Material *p_material) const;
-	mutable RID_Owner<Material> material_owner;
-
-	struct Geometry {
-
-		enum Type {
-			GEOMETRY_INVALID,
-			GEOMETRY_SURFACE,
-			GEOMETRY_IMMEDIATE,
-			GEOMETRY_PARTICLES,
-			GEOMETRY_MULTISURFACE,
-		};
-
-		Type type;
-		RID material;
-		bool has_alpha;
-		bool material_owned;
-
-		Geometry() {
-			has_alpha = false;
-			material_owned = false;
-		}
-		virtual ~Geometry(){};
-	};
-
-	struct GeometryOwner {
-
-		virtual ~GeometryOwner() {}
-	};
-
-	struct Mesh;
-
-	struct Surface : public Geometry {
-
-		struct ArrayData {
-
-			uint32_t ofs, size, datatype, count;
-			bool normalize;
-			bool bind;
-
-			ArrayData() {
-				ofs = 0;
-				size = 0;
-				count = 0;
-				datatype = 0;
-				normalize = 0;
-				bind = false;
-			}
-		};
-
-		Mesh *mesh;
-
-		Array data;
-		Array morph_data;
-		ArrayData array[VS::ARRAY_MAX];
-		// support for vertex array objects
-		GLuint array_object_id;
-		// support for vertex buffer object
-		GLuint vertex_id; // 0 means, unconfigured
-		GLuint index_id; // 0 means, unconfigured
-		// no support for the above, array in localmem.
-		uint8_t *array_local;
-		uint8_t *index_array_local;
-		Vector<AABB> skeleton_bone_aabb;
-		Vector<bool> skeleton_bone_used;
-
-		//bool packed;
-
-		struct MorphTarget {
-			uint32_t configured_format;
-			uint8_t *array;
-		};
-
-		MorphTarget *morph_targets_local;
-		int morph_target_count;
-		AABB aabb;
-
-		int array_len;
-		int index_array_len;
-		int max_bone;
-
-		float vertex_scale;
-		float uv_scale;
-		float uv2_scale;
-
-		bool alpha_sort;
-
-		VS::PrimitiveType primitive;
-
-		uint32_t format;
-		uint32_t configured_format;
-
-		int stride;
-		int local_stride;
-		uint32_t morph_format;
-
-		bool active;
-
-		Point2 uv_min;
-		Point2 uv_max;
-
-		Surface() {
-
-			array_len = 0;
-			local_stride = 0;
-			morph_format = 0;
-			type = GEOMETRY_SURFACE;
-			primitive = VS::PRIMITIVE_POINTS;
-			index_array_len = 0;
-			vertex_scale = 1.0;
-			uv_scale = 1.0;
-			uv2_scale = 1.0;
-
-			alpha_sort = false;
-
-			format = 0;
-			stride = 0;
-			morph_targets_local = 0;
-			morph_target_count = 0;
-
-			array_local = index_array_local = 0;
-			vertex_id = index_id = 0;
-
-			active = false;
-			//packed=false;
-		}
-
-		~Surface() {
-		}
-	};
-
-	struct Mesh {
-
-		bool active;
-		Vector<Surface *> surfaces;
-		int morph_target_count;
-		VS::MorphTargetMode morph_target_mode;
-		AABB custom_aabb;
-
-		mutable uint64_t last_pass;
-		Mesh() {
-			morph_target_mode = VS::MORPH_MODE_NORMALIZED;
-			morph_target_count = 0;
-			last_pass = 0;
-			active = false;
-		}
-	};
-	mutable RID_Owner<Mesh> mesh_owner;
-
-	Error _surface_set_arrays(Surface *p_surface, uint8_t *p_mem, uint8_t *p_index_mem, const Array &p_arrays, bool p_main);
-
-	struct MultiMesh;
-
-	struct MultiMeshSurface : public Geometry {
-
-		Surface *surface;
-		MultiMeshSurface() { type = GEOMETRY_MULTISURFACE; }
-	};
-
-	struct MultiMesh : public GeometryOwner {
-
-		struct Element {
-
-			float matrix[16];
-			uint8_t color[4];
-			Element() {
-				matrix[0] = 1;
-				matrix[1] = 0;
-				matrix[2] = 0;
-				matrix[3] = 0;
-
-				matrix[4] = 0;
-				matrix[5] = 1;
-				matrix[6] = 0;
-				matrix[7] = 0;
-
-				matrix[8] = 0;
-				matrix[9] = 0;
-				matrix[10] = 1;
-				matrix[11] = 0;
-
-				matrix[12] = 0;
-				matrix[13] = 0;
-				matrix[14] = 0;
-				matrix[15] = 1;
-			};
-		};
-
-		AABB aabb;
-		RID mesh;
-		int visible;
-
-		//IDirect3DVertexBuffer9* instance_buffer;
-		Vector<Element> elements;
-		Vector<MultiMeshSurface> cache_surfaces;
-		mutable uint64_t last_pass;
-		GLuint tex_id;
-		int tw;
-		int th;
-
-		SelfList<MultiMesh> dirty_list;
-
-		MultiMesh()
-			: dirty_list(this) {
-
-			tw = 1;
-			th = 1;
-			tex_id = 0;
-			last_pass = 0;
-			visible = -1;
-		}
-	};
-
-	mutable RID_Owner<MultiMesh> multimesh_owner;
-	mutable SelfList<MultiMesh>::List _multimesh_dirty_list;
-
-	struct Immediate : public Geometry {
-
-		struct Chunk {
-
-			RID texture;
-			VS::PrimitiveType primitive;
-			Vector<Vector3> vertices;
-			Vector<Vector3> normals;
-			Vector<Plane> tangents;
-			Vector<Color> colors;
-			Vector<Vector2> uvs;
-			Vector<Vector2> uvs2;
-		};
-
-		List<Chunk> chunks;
-		bool building;
-		int mask;
-		AABB aabb;
-
-		Immediate() {
-			type = GEOMETRY_IMMEDIATE;
-			building = false;
-		}
-	};
-
-	mutable RID_Owner<Immediate> immediate_owner;
-
-	struct Particles : public Geometry {
-
-		ParticleSystemSW data; // software particle system
-
-		Particles() {
-			type = GEOMETRY_PARTICLES;
-		}
-	};
-
-	mutable RID_Owner<Particles> particles_owner;
-
-	struct ParticlesInstance : public GeometryOwner {
-
-		RID particles;
-
-		ParticleSystemProcessSW particles_process;
-		Transform transform;
-
-		ParticlesInstance() {}
-	};
-
-	mutable RID_Owner<ParticlesInstance> particles_instance_owner;
-	ParticleSystemDrawInfoSW particle_draw_info;
-
-	struct Skeleton {
-
-		struct Bone {
-
-			float mtx[4][4]; //used
-
-			Bone() {
-				for (int i = 0; i < 4; i++) {
-					for (int j = 0; j < 4; j++) {
-
-						mtx[i][j] = (i == j) ? 1 : 0;
-					}
-				}
-			}
-
-			_ALWAYS_INLINE_ void transform_add_mul3(const float *p_src, float *r_dst, float p_weight) const {
-
-				r_dst[0] += ((mtx[0][0] * p_src[0]) + (mtx[1][0] * p_src[1]) + (mtx[2][0] * p_src[2]) + mtx[3][0]) * p_weight;
-				r_dst[1] += ((mtx[0][1] * p_src[0]) + (mtx[1][1] * p_src[1]) + (mtx[2][1] * p_src[2]) + mtx[3][1]) * p_weight;
-				r_dst[2] += ((mtx[0][2] * p_src[0]) + (mtx[1][2] * p_src[1]) + (mtx[2][2] * p_src[2]) + mtx[3][2]) * p_weight;
-			}
-			_ALWAYS_INLINE_ void transform3_add_mul3(const float *p_src, float *r_dst, float p_weight) const {
-
-				r_dst[0] += ((mtx[0][0] * p_src[0]) + (mtx[1][0] * p_src[1]) + (mtx[2][0] * p_src[2])) * p_weight;
-				r_dst[1] += ((mtx[0][1] * p_src[0]) + (mtx[1][1] * p_src[1]) + (mtx[2][1] * p_src[2])) * p_weight;
-				r_dst[2] += ((mtx[0][2] * p_src[0]) + (mtx[1][2] * p_src[1]) + (mtx[2][2] * p_src[2])) * p_weight;
-			}
-
-			_ALWAYS_INLINE_ AABB transform_aabb(const AABB &p_aabb) const {
-
-				float vertices[8][3] = {
-					{ p_aabb.pos.x + p_aabb.size.x, p_aabb.pos.y + p_aabb.size.y, p_aabb.pos.z + p_aabb.size.z },
-					{ p_aabb.pos.x + p_aabb.size.x, p_aabb.pos.y + p_aabb.size.y, p_aabb.pos.z },
-					{ p_aabb.pos.x + p_aabb.size.x, p_aabb.pos.y, p_aabb.pos.z + p_aabb.size.z },
-					{ p_aabb.pos.x + p_aabb.size.x, p_aabb.pos.y, p_aabb.pos.z },
-					{ p_aabb.pos.x, p_aabb.pos.y + p_aabb.size.y, p_aabb.pos.z + p_aabb.size.z },
-					{ p_aabb.pos.x, p_aabb.pos.y + p_aabb.size.y, p_aabb.pos.z },
-					{ p_aabb.pos.x, p_aabb.pos.y, p_aabb.pos.z + p_aabb.size.z },
-					{ p_aabb.pos.x, p_aabb.pos.y, p_aabb.pos.z }
-				};
-
-				AABB ret;
-
-				for (int i = 0; i < 8; i++) {
-
-					Vector3 xv(
-
-							((mtx[0][0] * vertices[i][0]) + (mtx[1][0] * vertices[i][1]) + (mtx[2][0] * vertices[i][2]) + mtx[3][0]),
-							((mtx[0][1] * vertices[i][0]) + (mtx[1][1] * vertices[i][1]) + (mtx[2][1] * vertices[i][2]) + mtx[3][1]),
-							((mtx[0][2] * vertices[i][0]) + (mtx[1][2] * vertices[i][1]) + (mtx[2][2] * vertices[i][2]) + mtx[3][2]));
-
-					if (i == 0)
-						ret.pos = xv;
-					else
-						ret.expand_to(xv);
-				}
-
-				return ret;
-			}
-		};
-
-		GLuint tex_id;
-		float pixel_size; //for texture
-		Vector<Bone> bones;
-
-		SelfList<Skeleton> dirty_list;
-
-		Skeleton()
-			: dirty_list(this) {
-			tex_id = 0;
-			pixel_size = 1.0;
-		}
-	};
-
-	mutable RID_Owner<Skeleton> skeleton_owner;
-	mutable SelfList<Skeleton>::List _skeleton_dirty_list;
-
-	template <bool USE_NORMAL, bool USE_TANGENT, bool INPLACE>
-	void _skeleton_xform(const uint8_t *p_src_array, int p_src_stride, uint8_t *p_dst_array, int p_dst_stride, int p_elements, const uint8_t *p_src_bones, const uint8_t *p_src_weights, const Skeleton::Bone *p_bone_xforms);
-
-	struct Light {
-
-		VS::LightType type;
-		float vars[VS::LIGHT_PARAM_MAX];
-		Color colors[3];
-		bool shadow_enabled;
-		RID projector;
-		bool volumetric_enabled;
-		Color volumetric_color;
-		VS::LightOmniShadowMode omni_shadow_mode;
-		VS::LightDirectionalShadowMode directional_shadow_mode;
-		float directional_shadow_param[3];
-
-		Light() {
-
-			vars[VS::LIGHT_PARAM_SPOT_ATTENUATION] = 1;
-			vars[VS::LIGHT_PARAM_SPOT_ANGLE] = 45;
-			vars[VS::LIGHT_PARAM_ATTENUATION] = 1.0;
-			vars[VS::LIGHT_PARAM_ENERGY] = 1.0;
-			vars[VS::LIGHT_PARAM_RADIUS] = 1.0;
-			vars[VS::LIGHT_PARAM_SHADOW_DARKENING] = 0.0;
-			vars[VS::LIGHT_PARAM_SHADOW_Z_OFFSET] = 0.2;
-			vars[VS::LIGHT_PARAM_SHADOW_Z_SLOPE_SCALE] = 1.4;
-			vars[VS::LIGHT_PARAM_SHADOW_ESM_MULTIPLIER] = 60.0;
-			vars[VS::LIGHT_PARAM_SHADOW_BLUR_PASSES] = 1;
-			colors[VS::LIGHT_COLOR_DIFFUSE] = Color(1, 1, 1);
-			colors[VS::LIGHT_COLOR_SPECULAR] = Color(1, 1, 1);
-			shadow_enabled = false;
-			volumetric_enabled = false;
-
-			directional_shadow_param[VS::LIGHT_DIRECTIONAL_SHADOW_PARAM_PSSM_SPLIT_WEIGHT] = 0.5;
-			directional_shadow_param[VS::LIGHT_DIRECTIONAL_SHADOW_PARAM_MAX_DISTANCE] = 0;
-			directional_shadow_param[VS::LIGHT_DIRECTIONAL_SHADOW_PARAM_PSSM_ZOFFSET_SCALE] = 2.0;
-			omni_shadow_mode = VS::LIGHT_OMNI_SHADOW_DEFAULT;
-			directional_shadow_mode = VS::LIGHT_DIRECTIONAL_SHADOW_ORTHOGONAL;
-		}
-	};
-
-	struct Environment {
-
-		VS::EnvironmentBG bg_mode;
-		Variant bg_param[VS::ENV_BG_PARAM_MAX];
-		bool fx_enabled[VS::ENV_FX_MAX];
-		Variant fx_param[VS::ENV_FX_PARAM_MAX];
-
-		Environment() {
-
-			bg_mode = VS::ENV_BG_DEFAULT_COLOR;
-			bg_param[VS::ENV_BG_PARAM_COLOR] = Color(0, 0, 0);
-			bg_param[VS::ENV_BG_PARAM_TEXTURE] = RID();
-			bg_param[VS::ENV_BG_PARAM_CUBEMAP] = RID();
-			bg_param[VS::ENV_BG_PARAM_ENERGY] = 1.0;
-			bg_param[VS::ENV_BG_PARAM_SCALE] = 1.0;
-			bg_param[VS::ENV_BG_PARAM_GLOW] = 0.0;
-			bg_param[VS::ENV_BG_PARAM_CANVAS_MAX_LAYER] = 0;
-
-			for (int i = 0; i < VS::ENV_FX_MAX; i++)
-				fx_enabled[i] = false;
-
-			fx_param[VS::ENV_FX_PARAM_GLOW_BLUR_PASSES] = 1;
-			fx_param[VS::ENV_FX_PARAM_GLOW_BLUR_SCALE] = 1.0;
-			fx_param[VS::ENV_FX_PARAM_GLOW_BLUR_STRENGTH] = 1.0;
-			fx_param[VS::ENV_FX_PARAM_GLOW_BLUR_BLEND_MODE] = 0;
-			fx_param[VS::ENV_FX_PARAM_GLOW_BLOOM] = 0.0;
-			fx_param[VS::ENV_FX_PARAM_GLOW_BLOOM_THRESHOLD] = 0.5;
-			fx_param[VS::ENV_FX_PARAM_DOF_BLUR_PASSES] = 1;
-			fx_param[VS::ENV_FX_PARAM_DOF_BLUR_BEGIN] = 100.0;
-			fx_param[VS::ENV_FX_PARAM_DOF_BLUR_RANGE] = 10.0;
-			fx_param[VS::ENV_FX_PARAM_HDR_TONEMAPPER] = VS::ENV_FX_HDR_TONE_MAPPER_LINEAR;
-			fx_param[VS::ENV_FX_PARAM_HDR_EXPOSURE] = 0.4;
-			fx_param[VS::ENV_FX_PARAM_HDR_WHITE] = 1.0;
-			fx_param[VS::ENV_FX_PARAM_HDR_GLOW_THRESHOLD] = 0.95;
-			fx_param[VS::ENV_FX_PARAM_HDR_GLOW_SCALE] = 0.2;
-			fx_param[VS::ENV_FX_PARAM_HDR_MIN_LUMINANCE] = 0.4;
-			fx_param[VS::ENV_FX_PARAM_HDR_MAX_LUMINANCE] = 8.0;
-			fx_param[VS::ENV_FX_PARAM_HDR_EXPOSURE_ADJUST_SPEED] = 0.5;
-			fx_param[VS::ENV_FX_PARAM_FOG_BEGIN] = 100.0;
-			fx_param[VS::ENV_FX_PARAM_FOG_ATTENUATION] = 1.0;
-			fx_param[VS::ENV_FX_PARAM_FOG_BEGIN_COLOR] = Color(0, 0, 0);
-			fx_param[VS::ENV_FX_PARAM_FOG_END_COLOR] = Color(0, 0, 0);
-			fx_param[VS::ENV_FX_PARAM_FOG_BG] = true;
-			fx_param[VS::ENV_FX_PARAM_BCS_BRIGHTNESS] = 1.0;
-			fx_param[VS::ENV_FX_PARAM_BCS_CONTRAST] = 1.0;
-			fx_param[VS::ENV_FX_PARAM_BCS_SATURATION] = 1.0;
-		}
-	};
-
-	mutable RID_Owner<Environment> environment_owner;
-
-	struct SampledLight {
-
-		int w, h;
-		GLuint texture;
-		float multiplier;
-		bool is_float;
-	};
-
-	mutable RID_Owner<SampledLight> sampled_light_owner;
-
-	struct ViewportData {
-
-		//1x1 fbo+texture for storing previous HDR value
-		GLuint lum_fbo;
-		GLuint lum_color;
-
-		ViewportData() {
-			lum_fbo = 0;
-			lum_color = 0;
-		}
-	};
-
-	mutable RID_Owner<ViewportData> viewport_data_owner;
-
-	struct RenderTarget {
-
-		Texture *texture_ptr;
-		RID texture;
-		GLuint fbo;
-		GLuint color;
-		GLuint depth;
-		int width, height;
-		uint64_t last_pass;
-	};
-
-	mutable RID_Owner<RenderTarget> render_target_owner;
-
-	struct ShadowBuffer;
-
-	struct LightInstance {
-
-		struct SplitInfo {
-
-			CameraMatrix camera;
-			Transform transform;
-			float near;
-			float far;
-		};
-
-		RID light;
-		Light *base;
-		Transform transform;
-		CameraMatrix projection;
-
-		Transform custom_transform[4];
-		CameraMatrix custom_projection[4];
-
-		Vector3 light_vector;
-		Vector3 spot_vector;
-		float linear_att;
-
-		uint64_t shadow_pass;
-		uint64_t last_pass;
-		uint16_t sort_key;
-
-		Vector2 dp;
-
-		CameraMatrix shadow_projection[4];
-		float shadow_split[4];
-
-		ShadowBuffer *near_shadow_buffer;
-
-		void clear_shadow_buffers() {
-
-			clear_near_shadow_buffers();
-		}
-
-		void clear_near_shadow_buffers() {
-
-			if (near_shadow_buffer) {
-				near_shadow_buffer->owner = NULL;
-				near_shadow_buffer = NULL;
-			}
-		}
-
-		LightInstance() {
-			shadow_pass = 0;
-			last_pass = 0;
-			sort_key = 0;
-			near_shadow_buffer = NULL;
-		}
-	};
-	mutable RID_Owner<Light> light_owner;
-	mutable RID_Owner<LightInstance> light_instance_owner;
-
-	LightInstance *light_instances[MAX_SCENE_LIGHTS];
-	LightInstance *directional_lights[4];
-	int light_instance_count;
-	int directional_light_count;
-	int last_light_id;
-	bool current_depth_test;
-	bool current_depth_mask;
-	VS::MaterialBlendMode current_blend_mode;
-	bool use_fast_texture_filter;
-	int max_texture_size;
-
-	bool fragment_lighting;
-	RID shadow_material;
-	RID shadow_material_double_sided;
-	Material *shadow_mat_ptr;
-	Material *shadow_mat_double_sided_ptr;
-
-	int max_texture_units;
-	GLuint base_framebuffer;
-
-	GLuint gui_quad_buffer;
-	GLuint indices_buffer;
-
-	struct RenderList {
-
-		enum {
-			DEFAULT_MAX_ELEMENTS = 4096,
-			MAX_LIGHTS = 4,
-			SORT_FLAG_SKELETON = 1,
-			SORT_FLAG_INSTANCING = 2,
-		};
-
-		static int max_elements;
-
-		struct Element {
-
-			float depth;
-			const InstanceData *instance;
-			const Skeleton *skeleton;
-			const Geometry *geometry;
-			const Geometry *geometry_cmp;
-			const Material *material;
-			const GeometryOwner *owner;
-			bool *additive_ptr;
-			bool additive;
-			bool mirror;
-			union {
-#ifdef BIG_ENDIAN_ENABLED
-				struct {
-					uint8_t sort_flags;
-					uint8_t light_type;
-					uint16_t light;
-				};
-#else
-				struct {
-					uint16_t light;
-					uint8_t light_type;
-					uint8_t sort_flags;
-				};
-#endif
-				uint32_t sort_key;
-			};
-		};
-
-		Element *_elements;
-		Element **elements;
-		int element_count;
-
-		void clear() {
-
-			element_count = 0;
-		}
-
-		struct SortZ {
-
-			_FORCE_INLINE_ bool operator()(const Element *A, const Element *B) const {
-
-				return A->depth > B->depth;
-			}
-		};
-
-		void sort_z() {
-
-			SortArray<Element *, SortZ> sorter;
-			sorter.sort(elements, element_count);
-		}
-
-		struct SortMatGeom {
-
-			_FORCE_INLINE_ bool operator()(const Element *A, const Element *B) const {
-				// TODO move to a single uint64 (one comparison)
-				if (A->material->shader_cache == B->material->shader_cache) {
-					if (A->material == B->material) {
-
-						return A->geometry_cmp < B->geometry_cmp;
-					} else {
-
-						return (A->material < B->material);
-					}
-				} else {
-
-					return A->material->shader_cache < B->material->shader_cache;
-				}
-			}
-		};
-
-		void sort_mat_geom() {
-
-			SortArray<Element *, SortMatGeom> sorter;
-			sorter.sort(elements, element_count);
-		}
-
-		struct SortMatLight {
-
-			_FORCE_INLINE_ bool operator()(const Element *A, const Element *B) const {
-
-				if (A->geometry_cmp == B->geometry_cmp) {
-
-					if (A->material == B->material) {
-
-						return A->light < B->light;
-					} else {
-
-						return (A->material < B->material);
-					}
-				} else {
-
-					return (A->geometry_cmp < B->geometry_cmp);
-				}
-			}
-		};
-
-		void sort_mat_light() {
-
-			SortArray<Element *, SortMatLight> sorter;
-			sorter.sort(elements, element_count);
-		}
-
-		struct SortMatLightType {
-
-			_FORCE_INLINE_ bool operator()(const Element *A, const Element *B) const {
-
-				if (A->light_type == B->light_type) {
-					if (A->material->shader_cache == B->material->shader_cache) {
-						if (A->material == B->material) {
-
-							return (A->geometry_cmp < B->geometry_cmp);
-						} else {
-
-							return (A->material < B->material);
-						}
-					} else {
-
-						return (A->material->shader_cache < B->material->shader_cache);
-					}
-				} else {
-
-					return A->light_type < B->light_type;
-				}
-			}
-		};
-
-		void sort_mat_light_type() {
-
-			SortArray<Element *, SortMatLightType> sorter;
-			sorter.sort(elements, element_count);
-		}
-
-		struct SortMatLightTypeFlags {
-
-			_FORCE_INLINE_ bool operator()(const Element *A, const Element *B) const {
-
-				if (A->sort_key == B->sort_key) {
-					if (A->material->shader_cache == B->material->shader_cache) {
-						if (A->material == B->material) {
-
-							return (A->geometry_cmp < B->geometry_cmp);
-						} else {
-
-							return (A->material < B->material);
-						}
-					} else {
-
-						return (A->material->shader_cache < B->material->shader_cache);
-					}
-				} else {
-
-					return A->sort_key < B->sort_key; //one is null and one is not
-				}
-			}
-		};
-
-		void sort_mat_light_type_flags() {
-
-			SortArray<Element *, SortMatLightTypeFlags> sorter;
-			sorter.sort(elements, element_count);
-		}
-		_FORCE_INLINE_ Element *add_element() {
-
-			if (element_count >= max_elements)
-				return NULL;
-			elements[element_count] = &_elements[element_count];
-			return elements[element_count++];
-		}
-
-		void init() {
-
-			element_count = 0;
-			elements = memnew_arr(Element *, max_elements);
-			_elements = memnew_arr(Element, max_elements);
-			for (int i = 0; i < max_elements; i++)
-				elements[i] = &_elements[i]; // assign elements
-		}
-
-		RenderList() {
-		}
-		~RenderList() {
-			memdelete_arr(elements);
-			memdelete_arr(_elements);
-		}
-	};
-
-	RenderList opaque_render_list;
-	RenderList alpha_render_list;
-
-	RID default_material;
-
-	CameraMatrix camera_projection;
-	Transform camera_transform;
-	Transform camera_transform_inverse;
-	float camera_z_near;
-	float camera_z_far;
-	Size2 camera_vp_size;
-	bool camera_ortho;
-	Set<String> extensions;
-	bool texscreen_copied;
-	bool texscreen_used;
-
-	Plane camera_plane;
-
-	void _add_geometry(const Geometry *p_geometry, const InstanceData *p_instance, const Geometry *p_geometry_cmp, const GeometryOwner *p_owner, int p_material = -1);
-	void _render_list_forward(RenderList *p_render_list, const Transform &p_view_transform, const Transform &p_view_transform_inverse, const CameraMatrix &p_projection, bool p_reverse_cull = false, bool p_fragment_light = false, bool p_alpha_pass = false);
-
-	//void _setup_light(LightInstance* p_instance, int p_idx);
-	void _setup_light(uint16_t p_light);
-
-	_FORCE_INLINE_ void _setup_shader_params(const Material *p_material);
-	bool _setup_material(const Geometry *p_geometry, const Material *p_material, bool p_no_const_light, bool p_opaque_pass);
-	void _setup_skeleton(const Skeleton *p_skeleton);
-
-	Error _setup_geometry(const Geometry *p_geometry, const Material *p_material, const Skeleton *p_skeleton, const float *p_morphs);
-	void _render(const Geometry *p_geometry, const Material *p_material, const Skeleton *p_skeleton, const GeometryOwner *p_owner, const Transform &p_xform);
-
-	/***********/
-	/* SHADOWS */
-	/***********/
-
-	struct ShadowBuffer {
-
-		int size;
-		GLuint fbo;
-		GLuint rbo;
-		GLuint depth;
-		GLuint rgba; //for older devices
-#if 0
-		GLuint fbo_blur;
-		GLuint rbo_blur;
-		GLuint blur;
-#endif
-
-		LightInstance *owner;
-		bool init(int p_size, bool p_use_depth);
-		ShadowBuffer() {
-			size = 0;
-			depth = 0;
-			owner = NULL;
-		}
-	};
-
-	Vector<ShadowBuffer> near_shadow_buffers;
-	ShadowBuffer blur_shadow_buffer;
-
-	Vector<ShadowBuffer> far_shadow_buffers;
-
-	LightInstance *shadow;
-	int shadow_pass;
-
-	float shadow_near_far_split_size_ratio;
-	bool _allocate_shadow_buffers(LightInstance *p_instance, Vector<ShadowBuffer> &p_buffers);
-	void _debug_draw_shadow(GLuint tex, const Rect2 &p_rect);
-	void _debug_draw_shadows_type(Vector<ShadowBuffer> &p_shadows, Point2 &ofs);
-	void _debug_shadows();
-	void _debug_luminances();
-	void _debug_samplers();
-
-	/***********/
-	/*  FBOs   */
-	/***********/
-
-	struct FrameBuffer {
-
-		GLuint fbo;
-		GLuint color;
-		GLuint depth;
-
-		int width, height;
-		int scale;
-		bool active;
-
-		int blur_size;
-
-		struct Blur {
-
-			GLuint fbo;
-			GLuint color;
-
-			Blur() {
-				fbo = 0;
-				color = 0;
-			}
-		} blur[3];
-
-		struct Luminance {
-
-			int size;
-			GLuint fbo;
-			GLuint color;
-
-			Luminance() {
-				fbo = 0;
-				color = 0;
-				size = 0;
-			}
-		};
-
-		Vector<Luminance> luminance;
-
-		GLuint sample_fbo;
-		GLuint sample_color;
-
-		FrameBuffer() {
-			blur_size = 0;
-		}
-
-	} framebuffer;
-
-	void _update_framebuffer();
-	void _process_glow_and_bloom();
-	//void _update_blur_buffer();
-
-	/*********/
-	/* FRAME */
-	/*********/
-
-	struct _Rinfo {
-
-		int texture_mem;
-		int vertex_count;
-		int object_count;
-		int mat_change_count;
-		int surface_count;
-		int shader_change_count;
-		int ci_draw_commands;
-		int draw_calls;
-
-	} _rinfo;
-
-	/*******************/
-	/* CANVAS OCCLUDER */
-	/*******************/
-
-	struct CanvasOccluder {
-
-		GLuint vertex_id; // 0 means, unconfigured
-		GLuint index_id; // 0 means, unconfigured
-		DVector<Vector2> lines;
-		int len;
-	};
-
-	RID_Owner<CanvasOccluder> canvas_occluder_owner;
-
-	/***********************/
-	/* CANVAS LIGHT SHADOW */
-	/***********************/
-
-	struct CanvasLightShadow {
-
-		int size;
-		int height;
-		GLuint fbo;
-		GLuint rbo;
-		GLuint depth;
-		GLuint rgba; //for older devices
-
-		GLuint blur;
-	};
-
-	RID_Owner<CanvasLightShadow> canvas_light_shadow_owner;
-
-	RID canvas_shadow_blur;
-
-	/* ETC */
-
-	RenderTarget *current_rt;
-	bool current_rt_transparent;
-	bool current_rt_vflip;
-	ViewportData *current_vd;
-
-	GLuint white_tex;
-	RID canvas_tex;
-	float canvas_opacity;
-	Color canvas_modulate;
-	bool canvas_use_modulate;
-	bool uses_texpixel_size;
-	bool rebind_texpixel_size;
-	Transform canvas_transform;
-	ShaderMaterial *canvas_last_material;
-	bool canvas_texscreen_used;
-	Vector2 normal_flip;
-	_FORCE_INLINE_ void _canvas_normal_set_flip(const Vector2 &p_flip);
-
-	_FORCE_INLINE_ Texture *_bind_canvas_texture(const RID &p_texture);
-	VS::MaterialBlendMode canvas_blend_mode;
-
-	int _setup_geometry_vinfo;
-
-	bool pack_arrays;
-	bool keep_copies;
-	bool use_reload_hooks;
-	bool cull_front;
-	bool lights_use_shadow;
-	_FORCE_INLINE_ void _set_cull(bool p_front, bool p_reverse_cull = false);
-	_FORCE_INLINE_ Color _convert_color(const Color &p_color);
-
-	void _process_glow_bloom();
-	void _process_hdr();
-	void _draw_tex_bg();
-
-	bool using_canvas_bg;
-	Size2 window_size;
-	VS::ViewportRect viewport;
-	double last_time;
-	double time_delta;
-	uint64_t frame;
-	uint64_t scene_pass;
-	bool draw_next_frame;
-	Environment *current_env;
-	VS::ScenarioDebugMode current_debug;
-	RID overdraw_material;
-	float shader_time_rollback;
-
-	mutable MaterialShaderGLES2 material_shader;
-	mutable CanvasShaderGLES2 canvas_shader;
-	BlurShaderGLES2 blur_shader;
-	CopyShaderGLES2 copy_shader;
-	mutable CanvasShadowShaderGLES2 canvas_shadow_shader;
-
-	mutable ShaderCompilerGLES2 shader_precompiler;
-
-	void _draw_primitive(int p_points, const Vector3 *p_vertices, const Vector3 *p_normals, const Color *p_colors, const Vector3 *p_uvs, const Plane *p_tangents = NULL, int p_instanced = 1);
-	_FORCE_INLINE_ void _draw_gui_primitive(int p_points, const Vector2 *p_vertices, const Color *p_colors, const Vector2 *p_uvs);
-	_FORCE_INLINE_ void _draw_gui_primitive2(int p_points, const Vector2 *p_vertices, const Color *p_colors, const Vector2 *p_uvs, const Vector2 *p_uvs2);
-	void _draw_textured_quad(const Rect2 &p_rect, const Rect2 &p_src_region, const Size2 &p_tex_size, bool p_h_flip = false, bool p_v_flip = false, bool p_transpose = false);
-	void _draw_quad(const Rect2 &p_rect);
-	void _copy_screen_quad();
-	void _copy_to_texscreen();
-
-	bool _test_depth_shadow_buffer();
-
-	Vector3 chunk_vertex;
-	Vector3 chunk_normal;
-	Plane chunk_tangent;
-	Color chunk_color;
-	Vector2 chunk_uv;
-	Vector2 chunk_uv2;
-	GLuint tc0_id_cache;
-	GLuint tc0_idx;
-
-	template <bool use_normalmap>
-	_FORCE_INLINE_ void _canvas_item_render_commands(CanvasItem *p_item, CanvasItem *current_clip, bool &reclip);
-	_FORCE_INLINE_ void _canvas_item_setup_shader_params(ShaderMaterial *material, Shader *p_shader);
-	_FORCE_INLINE_ void _canvas_item_setup_shader_uniforms(ShaderMaterial *material, Shader *p_shader);
-
-public:
-	/* TEXTURE API */
-
-	virtual RID texture_create();
-	virtual void texture_allocate(RID p_texture, int p_width, int p_height, Image::Format p_format, uint32_t p_flags = VS::TEXTURE_FLAGS_DEFAULT);
-	virtual void texture_set_data(RID p_texture, const Image &p_image, VS::CubeMapSide p_cube_side = VS::CUBEMAP_LEFT);
-	virtual Image texture_get_data(RID p_texture, VS::CubeMapSide p_cube_side = VS::CUBEMAP_LEFT) const;
-	virtual void texture_set_flags(RID p_texture, uint32_t p_flags);
-	virtual uint32_t texture_get_flags(RID p_texture) const;
-	virtual Image::Format texture_get_format(RID p_texture) const;
-	virtual uint32_t texture_get_width(RID p_texture) const;
-	virtual uint32_t texture_get_height(RID p_texture) const;
-	virtual bool texture_has_alpha(RID p_texture) const;
-	virtual void texture_set_size_override(RID p_texture, int p_width, int p_height);
-	virtual void texture_set_reload_hook(RID p_texture, ObjectID p_owner, const StringName &p_function) const;
-
-	virtual void texture_set_path(RID p_texture, const String &p_path);
-	virtual String texture_get_path(RID p_texture) const;
-	virtual void texture_debug_usage(List<VS::TextureInfo> *r_info);
-
-	virtual void texture_set_shrink_all_x2_on_set_data(bool p_enable);
-
-	GLuint _texture_get_name(RID p_tex);
-
-	/* SHADER API */
-
-	virtual RID shader_create(VS::ShaderMode p_mode = VS::SHADER_MATERIAL);
-
-	virtual void shader_set_mode(RID p_shader, VS::ShaderMode p_mode);
-	virtual VS::ShaderMode shader_get_mode(RID p_shader) const;
-
-	virtual void shader_set_code(RID p_shader, const String &p_vertex, const String &p_fragment, const String &p_light, int p_vertex_ofs = 0, int p_fragment_ofs = 0, int p_light_ofs = 0);
-	virtual String shader_get_fragment_code(RID p_shader) const;
-	virtual String shader_get_vertex_code(RID p_shader) const;
-	virtual String shader_get_light_code(RID p_shader) const;
-
-	virtual void shader_get_param_list(RID p_shader, List<PropertyInfo> *p_param_list) const;
-
-	virtual void shader_set_default_texture_param(RID p_shader, const StringName &p_name, RID p_texture);
-	virtual RID shader_get_default_texture_param(RID p_shader, const StringName &p_name) const;
-
-	virtual Variant shader_get_default_param(RID p_shader, const StringName &p_name);
-
-	/* COMMON MATERIAL API */
-
-	virtual RID material_create();
-
-	virtual void material_set_shader(RID p_shader_material, RID p_shader);
-	virtual RID material_get_shader(RID p_shader_material) const;
-
-	virtual void material_set_param(RID p_material, const StringName &p_param, const Variant &p_value);
-	virtual Variant material_get_param(RID p_material, const StringName &p_param) const;
-
-	virtual void material_set_flag(RID p_material, VS::MaterialFlag p_flag, bool p_enabled);
-	virtual bool material_get_flag(RID p_material, VS::MaterialFlag p_flag) const;
-
-	virtual void material_set_depth_draw_mode(RID p_material, VS::MaterialDepthDrawMode p_mode);
-	virtual VS::MaterialDepthDrawMode material_get_depth_draw_mode(RID p_material) const;
-
-	virtual void material_set_blend_mode(RID p_material, VS::MaterialBlendMode p_mode);
-	virtual VS::MaterialBlendMode material_get_blend_mode(RID p_material) const;
-
-	virtual void material_set_line_width(RID p_material, float p_line_width);
-	virtual float material_get_line_width(RID p_material) const;
-
-	/* MESH API */
-
-	virtual RID mesh_create();
-
-	virtual void mesh_add_surface(RID p_mesh, VS::PrimitiveType p_primitive, const Array &p_arrays, const Array &p_blend_shapes = Array(), bool p_alpha_sort = false);
-	virtual Array mesh_get_surface_arrays(RID p_mesh, int p_surface) const;
-	virtual Array mesh_get_surface_morph_arrays(RID p_mesh, int p_surface) const;
-	virtual void mesh_add_custom_surface(RID p_mesh, const Variant &p_dat);
-
-	virtual void mesh_set_morph_target_count(RID p_mesh, int p_amount);
-	virtual int mesh_get_morph_target_count(RID p_mesh) const;
-
-	virtual void mesh_set_morph_target_mode(RID p_mesh, VS::MorphTargetMode p_mode);
-	virtual VS::MorphTargetMode mesh_get_morph_target_mode(RID p_mesh) const;
-
-	virtual void mesh_surface_set_material(RID p_mesh, int p_surface, RID p_material, bool p_owned = false);
-	virtual RID mesh_surface_get_material(RID p_mesh, int p_surface) const;
-
-	virtual int mesh_surface_get_array_len(RID p_mesh, int p_surface) const;
-	virtual int mesh_surface_get_array_index_len(RID p_mesh, int p_surface) const;
-	virtual uint32_t mesh_surface_get_format(RID p_mesh, int p_surface) const;
-	virtual VS::PrimitiveType mesh_surface_get_primitive_type(RID p_mesh, int p_surface) const;
-
-	virtual void mesh_remove_surface(RID p_mesh, int p_index);
-	virtual int mesh_get_surface_count(RID p_mesh) const;
-
-	virtual AABB mesh_get_aabb(RID p_mesh, RID p_skeleton = RID()) const;
-
-	virtual void mesh_set_custom_aabb(RID p_mesh, const AABB &p_aabb);
-	virtual AABB mesh_get_custom_aabb(RID p_mesh) const;
-
-	/* MULTIMESH API */
-
-	virtual RID multimesh_create();
-
-	virtual void multimesh_set_instance_count(RID p_multimesh, int p_count);
-	virtual int multimesh_get_instance_count(RID p_multimesh) const;
-
-	virtual void multimesh_set_mesh(RID p_multimesh, RID p_mesh);
-	virtual void multimesh_set_aabb(RID p_multimesh, const AABB &p_aabb);
-	virtual void multimesh_instance_set_transform(RID p_multimesh, int p_index, const Transform &p_transform);
-	virtual void multimesh_instance_set_color(RID p_multimesh, int p_index, const Color &p_color);
-
-	virtual RID multimesh_get_mesh(RID p_multimesh) const;
-	virtual AABB multimesh_get_aabb(RID p_multimesh) const;
-
-	virtual Transform multimesh_instance_get_transform(RID p_multimesh, int p_index) const;
-	virtual Color multimesh_instance_get_color(RID p_multimesh, int p_index) const;
-
-	virtual void multimesh_set_visible_instances(RID p_multimesh, int p_visible);
-	virtual int multimesh_get_visible_instances(RID p_multimesh) const;
-
-	/* IMMEDIATE API */
-
-	virtual RID immediate_create();
-	virtual void immediate_begin(RID p_immediate, VS::PrimitiveType p_rimitive, RID p_texture = RID());
-	virtual void immediate_vertex(RID p_immediate, const Vector3 &p_vertex);
-	virtual void immediate_normal(RID p_immediate, const Vector3 &p_normal);
-	virtual void immediate_tangent(RID p_immediate, const Plane &p_tangent);
-	virtual void immediate_color(RID p_immediate, const Color &p_color);
-	virtual void immediate_uv(RID p_immediate, const Vector2 &tex_uv);
-	virtual void immediate_uv2(RID p_immediate, const Vector2 &tex_uv);
-	virtual void immediate_end(RID p_immediate);
-	virtual void immediate_clear(RID p_immediate);
-	virtual AABB immediate_get_aabb(RID p_immediate) const;
-	virtual void immediate_set_material(RID p_immediate, RID p_material);
-	virtual RID immediate_get_material(RID p_immediate) const;
-
-	/* PARTICLES API */
-
-	virtual RID particles_create();
-
-	virtual void particles_set_amount(RID p_particles, int p_amount);
-	virtual int particles_get_amount(RID p_particles) const;
-
-	virtual void particles_set_emitting(RID p_particles, bool p_emitting);
-	virtual bool particles_is_emitting(RID p_particles) const;
-
-	virtual void particles_set_visibility_aabb(RID p_particles, const AABB &p_visibility);
-	virtual AABB particles_get_visibility_aabb(RID p_particles) const;
-
-	virtual void particles_set_emission_half_extents(RID p_particles, const Vector3 &p_half_extents);
-	virtual Vector3 particles_get_emission_half_extents(RID p_particles) const;
-
-	virtual void particles_set_emission_base_velocity(RID p_particles, const Vector3 &p_base_velocity);
-	virtual Vector3 particles_get_emission_base_velocity(RID p_particles) const;
-
-	virtual void particles_set_emission_points(RID p_particles, const DVector<Vector3> &p_points);
-	virtual DVector<Vector3> particles_get_emission_points(RID p_particles) const;
-
-	virtual void particles_set_gravity_normal(RID p_particles, const Vector3 &p_normal);
-	virtual Vector3 particles_get_gravity_normal(RID p_particles) const;
-
-	virtual void particles_set_variable(RID p_particles, VS::ParticleVariable p_variable, float p_value);
-	virtual float particles_get_variable(RID p_particles, VS::ParticleVariable p_variable) const;
-
-	virtual void particles_set_randomness(RID p_particles, VS::ParticleVariable p_variable, float p_randomness);
-	virtual float particles_get_randomness(RID p_particles, VS::ParticleVariable p_variable) const;
-
-	virtual void particles_set_color_phase_pos(RID p_particles, int p_phase, float p_pos);
-	virtual float particles_get_color_phase_pos(RID p_particles, int p_phase) const;
-
-	virtual void particles_set_color_phases(RID p_particles, int p_phases);
-	virtual int particles_get_color_phases(RID p_particles) const;
-
-	virtual void particles_set_color_phase_color(RID p_particles, int p_phase, const Color &p_color);
-	virtual Color particles_get_color_phase_color(RID p_particles, int p_phase) const;
-
-	virtual void particles_set_attractors(RID p_particles, int p_attractors);
-	virtual int particles_get_attractors(RID p_particles) const;
-
-	virtual void particles_set_attractor_pos(RID p_particles, int p_attractor, const Vector3 &p_pos);
-	virtual Vector3 particles_get_attractor_pos(RID p_particles, int p_attractor) const;
-
-	virtual void particles_set_attractor_strength(RID p_particles, int p_attractor, float p_force);
-	virtual float particles_get_attractor_strength(RID p_particles, int p_attractor) const;
-
-	virtual void particles_set_material(RID p_particles, RID p_material, bool p_owned = false);
-	virtual RID particles_get_material(RID p_particles) const;
-
-	virtual AABB particles_get_aabb(RID p_particles) const;
-
-	virtual void particles_set_height_from_velocity(RID p_particles, bool p_enable);
-	virtual bool particles_has_height_from_velocity(RID p_particles) const;
-
-	virtual void particles_set_use_local_coordinates(RID p_particles, bool p_enable);
-	virtual bool particles_is_using_local_coordinates(RID p_particles) const;
-
-	/* SKELETON API */
-
-	virtual RID skeleton_create();
-	virtual void skeleton_resize(RID p_skeleton, int p_bones);
-	virtual int skeleton_get_bone_count(RID p_skeleton) const;
-	virtual void skeleton_bone_set_transform(RID p_skeleton, int p_bone, const Transform &p_transform);
-	virtual Transform skeleton_bone_get_transform(RID p_skeleton, int p_bone);
-
-	/* LIGHT API */
-
-	virtual RID light_create(VS::LightType p_type);
-	virtual VS::LightType light_get_type(RID p_light) const;
-
-	virtual void light_set_color(RID p_light, VS::LightColor p_type, const Color &p_color);
-	virtual Color light_get_color(RID p_light, VS::LightColor p_type) const;
-
-	virtual void light_set_shadow(RID p_light, bool p_enabled);
-	virtual bool light_has_shadow(RID p_light) const;
-
-	virtual void light_set_volumetric(RID p_light, bool p_enabled);
-	virtual bool light_is_volumetric(RID p_light) const;
-
-	virtual void light_set_projector(RID p_light, RID p_texture);
-	virtual RID light_get_projector(RID p_light) const;
-
-	virtual void light_set_var(RID p_light, VS::LightParam p_var, float p_value);
-	virtual float light_get_var(RID p_light, VS::LightParam p_var) const;
-
-	virtual void light_set_operator(RID p_light, VS::LightOp p_op);
-	virtual VS::LightOp light_get_operator(RID p_light) const;
-
-	virtual void light_omni_set_shadow_mode(RID p_light, VS::LightOmniShadowMode p_mode);
-	virtual VS::LightOmniShadowMode light_omni_get_shadow_mode(RID p_light) const;
-
-	virtual void light_directional_set_shadow_mode(RID p_light, VS::LightDirectionalShadowMode p_mode);
-	virtual VS::LightDirectionalShadowMode light_directional_get_shadow_mode(RID p_light) const;
-	virtual void light_directional_set_shadow_param(RID p_light, VS::LightDirectionalShadowParam p_param, float p_value);
-	virtual float light_directional_get_shadow_param(RID p_light, VS::LightDirectionalShadowParam p_param) const;
-
-	virtual AABB light_get_aabb(RID p_light) const;
-
-	virtual RID light_instance_create(RID p_light);
-	virtual void light_instance_set_transform(RID p_light_instance, const Transform &p_transform);
-
-	virtual ShadowType light_instance_get_shadow_type(RID p_light_instance, bool p_far = false) const;
-	virtual int light_instance_get_shadow_passes(RID p_light_instance) const;
-	virtual bool light_instance_get_pssm_shadow_overlap(RID p_light_instance) const;
-	virtual void light_instance_set_shadow_transform(RID p_light_instance, int p_index, const CameraMatrix &p_camera, const Transform &p_transform, float p_split_near = 0, float p_split_far = 0);
-	virtual int light_instance_get_shadow_size(RID p_light_instance, int p_index = 0) const;
-
-	virtual void shadow_clear_near();
-	virtual bool shadow_allocate_near(RID p_light);
-	virtual bool shadow_allocate_far(RID p_light);
-
-	/* SHADOW */
-
-	virtual RID particles_instance_create(RID p_particles);
-	virtual void particles_instance_set_transform(RID p_particles_instance, const Transform &p_transform);
-
-	/* VIEWPORT */
-
-	virtual RID viewport_data_create();
-
-	virtual RID render_target_create();
-	virtual void render_target_set_size(RID p_render_target, int p_width, int p_height);
-	virtual RID render_target_get_texture(RID p_render_target) const;
-	virtual bool render_target_renedered_in_frame(RID p_render_target);
-
-	/* RENDER API */
-	/* all calls (inside begin/end shadow) are always warranted to be in the following order: */
-
-	virtual void begin_frame();
-
-	virtual void set_viewport(const VS::ViewportRect &p_viewport);
-	virtual void set_render_target(RID p_render_target, bool p_transparent_bg = false, bool p_vflip = false);
-	virtual void clear_viewport(const Color &p_color);
-	virtual void capture_viewport(Image *r_capture);
-
-	virtual void begin_scene(RID p_viewport_data, RID p_env, VS::ScenarioDebugMode p_debug);
-
-	virtual void begin_shadow_map(RID p_light_instance, int p_shadow_pass);
-
-	virtual void set_camera(const Transform &p_world, const CameraMatrix &p_projection, bool p_ortho_hint);
-
-	virtual void add_light(RID p_light_instance); ///< all "add_light" calls happen before add_geometry calls
-
-	typedef Map<StringName, Variant> ParamOverrideMap;
-
-	virtual void add_mesh(const RID &p_mesh, const InstanceData *p_data);
-	virtual void add_multimesh(const RID &p_multimesh, const InstanceData *p_data);
-	virtual void add_immediate(const RID &p_immediate, const InstanceData *p_data);
-	virtual void add_particles(const RID &p_particle_instance, const InstanceData *p_data);
-
-	virtual void end_scene();
-	virtual void end_shadow_map();
-
-	virtual void end_frame();
-
-	/* CANVAS API */
-
-	virtual void begin_canvas_bg();
-
-	virtual void canvas_begin();
-	virtual void canvas_disable_blending();
-
-	virtual void canvas_set_opacity(float p_opacity);
-	virtual void canvas_set_blend_mode(VS::MaterialBlendMode p_mode);
-	virtual void canvas_begin_rect(const Transform2D &p_transform);
-	virtual void canvas_set_clip(bool p_clip, const Rect2 &p_rect);
-	virtual void canvas_end_rect();
-	virtual void canvas_draw_line(const Point2 &p_from, const Point2 &p_to, const Color &p_color, float p_width, bool p_antialiased);
-	virtual void canvas_draw_rect(const Rect2 &p_rect, int p_flags, const Rect2 &p_source, RID p_texture, const Color &p_modulate);
-	virtual void canvas_draw_style_box(const Rect2 &p_rect, const Rect2 &p_src_region, RID p_texture, const float *p_margins, bool p_draw_center = true, const Color &p_modulate = Color(1, 1, 1));
-	virtual void canvas_draw_primitive(const Vector<Point2> &p_points, const Vector<Color> &p_colors, const Vector<Point2> &p_uvs, RID p_texture, float p_width);
-	virtual void canvas_draw_polygon(int p_vertex_count, const int *p_indices, const Vector2 *p_vertices, const Vector2 *p_uvs, const Color *p_colors, const RID &p_texture, bool p_singlecolor);
-	virtual void canvas_set_transform(const Transform2D &p_transform);
-
-	virtual void canvas_render_items(CanvasItem *p_item_list, int p_z, const Color &p_modulate, CanvasLight *p_light);
-	virtual void canvas_debug_viewport_shadows(CanvasLight *p_lights_with_shadow);
-
-	/* CANVAS LIGHT SHADOW */
-
-	//buffer
-	virtual RID canvas_light_shadow_buffer_create(int p_width);
-	virtual void canvas_light_shadow_buffer_update(RID p_buffer, const Transform2D &p_light_xform, int p_light_mask, float p_near, float p_far, CanvasLightOccluderInstance *p_occluders, CameraMatrix *p_xform_cache);
-
-	//occluder
-	virtual RID canvas_light_occluder_create();
-	virtual void canvas_light_occluder_set_polylines(RID p_occluder, const DVector<Vector2> &p_lines);
-
-	/* ENVIRONMENT */
-
-	virtual RID environment_create();
-
-	virtual void environment_set_background(RID p_env, VS::EnvironmentBG p_bg);
-	virtual VS::EnvironmentBG environment_get_background(RID p_env) const;
-
-	virtual void environment_set_background_param(RID p_env, VS::EnvironmentBGParam p_param, const Variant &p_value);
-	virtual Variant environment_get_background_param(RID p_env, VS::EnvironmentBGParam p_param) const;
-
-	virtual void environment_set_enable_fx(RID p_env, VS::EnvironmentFx p_effect, bool p_enabled);
-	virtual bool environment_is_fx_enabled(RID p_env, VS::EnvironmentFx p_effect) const;
-
-	virtual void environment_fx_set_param(RID p_env, VS::EnvironmentFxParam p_param, const Variant &p_value);
-	virtual Variant environment_fx_get_param(RID p_env, VS::EnvironmentFxParam p_param) const;
-
-	/* SAMPLED LIGHT */
-	virtual RID sampled_light_dp_create(int p_width, int p_height);
-	virtual void sampled_light_dp_update(RID p_sampled_light, const Color *p_data, float p_multiplier);
-
-	/*MISC*/
-
-	virtual bool is_texture(const RID &p_rid) const;
-	virtual bool is_material(const RID &p_rid) const;
-	virtual bool is_mesh(const RID &p_rid) const;
-	virtual bool is_immediate(const RID &p_rid) const;
-	virtual bool is_multimesh(const RID &p_rid) const;
-	virtual bool is_particles(const RID &p_beam) const;
-
-	virtual bool is_light(const RID &p_rid) const;
-	virtual bool is_light_instance(const RID &p_rid) const;
-	virtual bool is_particles_instance(const RID &p_rid) const;
-	virtual bool is_skeleton(const RID &p_rid) const;
-	virtual bool is_environment(const RID &p_rid) const;
-	virtual bool is_shader(const RID &p_rid) const;
-
-	virtual bool is_canvas_light_occluder(const RID &p_rid) const;
-
-	virtual void free(const RID &p_rid);
-
-	virtual void init();
-	virtual void finish();
-
-	virtual int get_render_info(VS::RenderInfo p_info);
-
-	void set_base_framebuffer(GLuint p_id, Vector2 p_size = Vector2(0, 0));
-
-	virtual void flush_frame(); //not necessary in most cases
-	void set_extensions(const char *p_strings);
-
-	virtual bool needs_to_draw_next_frame() const;
-
-	void set_use_framebuffers(bool p_use);
-	void reload_vram();
-
-	virtual bool has_feature(VS::Features p_feature) const;
-
-	virtual void restore_framebuffer();
-
-	static RasterizerGLES2 *get_singleton();
-
-	virtual void set_force_16_bits_fbo(bool p_force);
-
-	RasterizerGLES2(bool p_compress_arrays = false, bool p_keep_ram_copy = true, bool p_default_fragment_lighting = true, bool p_use_reload_hooks = false);
-	virtual ~RasterizerGLES2();
-};
-
-#endif
-#endif

drivers/gles2/rasterizer_instance_gles2.cpp

@@ -1,40 +0,0 @@
-/*************************************************************************/
-/*  rasterizer_instance_gles2.cpp                                        */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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.                */
-/*************************************************************************/
-#include "rasterizer_instance_gles2.h"
-#include "rasterizer_gles2.h"
-
-#ifdef GLES2_ENABLED
-
-Rasterizer *instance_RasterizerGLES2() {
-
-	return memnew(RasterizerGLES2);
-}
-
-#endif

drivers/gles2/rasterizer_instance_gles2.h

@@ -1,41 +0,0 @@
-/*************************************************************************/
-/*  rasterizer_instance_gles2.h                                          */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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 RASTERIZER_INSTANCE_GLES2_H
-#define RASTERIZER_INSTANCE_GLES2_H
-
-#include "servers/visual/rasterizer.h"
-
-#ifdef GLES2_ENABLED
-
-Rasterizer *instance_RasterizerGLES2();
-
-#endif
-
-#endif // RASTERIZER_INSTANCE_gles2_H

drivers/gles2/shader_compiler_gles2.cpp

@@ -1,939 +0,0 @@
-/*************************************************************************/
-/*  shader_compiler_gles2.cpp                                            */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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.                */
-/*************************************************************************/
-#include "shader_compiler_gles2.h"
-#include "print_string.h"
-
-#include "stdio.h"
-
-//#define DEBUG_SHADER_ENABLED
-
-typedef ShaderLanguage SL;
-
-struct CodeGLSL2 {
-
-	String code;
-};
-
-static String _mktab(int p_level) {
-
-	String tb;
-	for (int i = 0; i < p_level; i++) {
-		tb += "\t";
-	}
-
-	return tb;
-}
-
-static String _typestr(SL::DataType p_type) {
-
-	switch (p_type) {
-
-		case SL::TYPE_VOID: return "void";
-		case SL::TYPE_BOOL: return "bool";
-		case SL::TYPE_FLOAT: return "float";
-		case SL::TYPE_VEC2: return "vec2";
-		case SL::TYPE_VEC3: return "vec3";
-		case SL::TYPE_VEC4: return "vec4";
-		case SL::TYPE_MAT2: return "mat2";
-		case SL::TYPE_MAT3: return "mat3";
-		case SL::TYPE_MAT4: return "mat4";
-		case SL::TYPE_TEXTURE: return "sampler2D";
-		case SL::TYPE_CUBEMAP: return "samplerCube";
-	}
-
-	return "";
-}
-
-static String _mknum(float p_num) {
-	return String::num_real(p_num);
-}
-
-static String _opstr(SL::Operator p_op) {
-
-	switch (p_op) {
-		case SL::OP_ASSIGN: return "=";
-		case SL::OP_ADD: return "+";
-		case SL::OP_SUB: return "-";
-		case SL::OP_MUL: return "*";
-		case SL::OP_DIV: return "/";
-		case SL::OP_ASSIGN_ADD: return "+=";
-		case SL::OP_ASSIGN_SUB: return "-=";
-		case SL::OP_ASSIGN_MUL: return "*=";
-		case SL::OP_ASSIGN_DIV: return "/=";
-		case SL::OP_NEG: return "-";
-		case SL::OP_NOT: return "!";
-		case SL::OP_CMP_EQ: return "==";
-		case SL::OP_CMP_NEQ: return "!=";
-		case SL::OP_CMP_LEQ: return "<=";
-		case SL::OP_CMP_GEQ: return ">=";
-		case SL::OP_CMP_LESS: return "<";
-		case SL::OP_CMP_GREATER: return ">";
-		case SL::OP_CMP_OR: return "||";
-		case SL::OP_CMP_AND: return "&&";
-		default: return "";
-	}
-
-	return "";
-}
-
-//#ifdef DEBUG_SHADER_ENABLED
-#if 1
-#define ENDL "\n"
-#else
-#define ENDL ""
-#endif
-
-String ShaderCompilerGLES2::dump_node_code(SL::Node *p_node, int p_level, bool p_assign_left) {
-
-	String code;
-
-	switch (p_node->type) {
-
-		case SL::Node::TYPE_PROGRAM: {
-
-			SL::ProgramNode *pnode = (SL::ProgramNode *)p_node;
-
-			code += dump_node_code(pnode->body, p_level);
-		} break;
-		case SL::Node::TYPE_FUNCTION: {
-
-		} break;
-		case SL::Node::TYPE_BLOCK: {
-			SL::BlockNode *bnode = (SL::BlockNode *)p_node;
-
-			//variables
-			code += "{" ENDL;
-			for (Map<StringName, SL::DataType>::Element *E = bnode->variables.front(); E; E = E->next()) {
-
-				code += _mktab(p_level) + _typestr(E->value()) + " " + replace_string(E->key()) + ";" ENDL;
-			}
-
-			for (int i = 0; i < bnode->statements.size(); i++) {
-
-				code += _mktab(p_level) + dump_node_code(bnode->statements[i], p_level) + ";" ENDL;
-			}
-
-			code += "}" ENDL;
-
-		} break;
-		case SL::Node::TYPE_VARIABLE: {
-			SL::VariableNode *vnode = (SL::VariableNode *)p_node;
-
-			if (type == ShaderLanguage::SHADER_MATERIAL_VERTEX) {
-
-				if (vnode->name == vname_vertex && p_assign_left) {
-					vertex_code_writes_vertex = true;
-				}
-				if (vnode->name == vname_position && p_assign_left) {
-					vertex_code_writes_position = true;
-				}
-				if (vnode->name == vname_color_interp) {
-					flags->use_color_interp = true;
-				}
-				if (vnode->name == vname_uv_interp) {
-					flags->use_uv_interp = true;
-				}
-				if (vnode->name == vname_uv2_interp) {
-					flags->use_uv2_interp = true;
-				}
-				if (vnode->name == vname_var1_interp) {
-					flags->use_var1_interp = true;
-				}
-				if (vnode->name == vname_var2_interp) {
-					flags->use_var2_interp = true;
-				}
-				if (vnode->name == vname_tangent_interp || vnode->name == vname_binormal_interp) {
-					flags->use_tangent_interp = true;
-				}
-			}
-
-			if (type == ShaderLanguage::SHADER_MATERIAL_FRAGMENT) {
-
-				if (vnode->name == vname_discard) {
-					uses_discard = true;
-				}
-				if (vnode->name == vname_normalmap) {
-					uses_normalmap = true;
-				}
-				if (vnode->name == vname_screen_uv) {
-					uses_screen_uv = true;
-				}
-				if (vnode->name == vname_diffuse_alpha && p_assign_left) {
-					uses_alpha = true;
-				}
-				if (vnode->name == vname_color_interp) {
-					flags->use_color_interp = true;
-				}
-				if (vnode->name == vname_uv_interp) {
-					flags->use_uv_interp = true;
-				}
-				if (vnode->name == vname_uv2_interp) {
-					flags->use_uv2_interp = true;
-				}
-				if (vnode->name == vname_var1_interp) {
-					flags->use_var1_interp = true;
-				}
-				if (vnode->name == vname_var2_interp) {
-					flags->use_var2_interp = true;
-				}
-				if (vnode->name == vname_tangent_interp || vnode->name == vname_binormal_interp) {
-					flags->use_tangent_interp = true;
-				}
-			}
-			if (type == ShaderLanguage::SHADER_MATERIAL_LIGHT) {
-
-				if (vnode->name == vname_light) {
-					uses_light = true;
-				}
-
-				if (vnode->name == vname_shadow) {
-					uses_shadow_color = true;
-				}
-			}
-			if (type == ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX) {
-
-				if (vnode->name == vname_var1_interp) {
-					flags->use_var1_interp = true;
-				}
-				if (vnode->name == vname_var2_interp) {
-					flags->use_var2_interp = true;
-				}
-				if (vnode->name == vname_world_vec) {
-					uses_worldvec = true;
-				}
-			}
-
-			if (type == ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT) {
-
-				if (vnode->name == vname_texpixel_size) {
-					uses_texpixel_size = true;
-				}
-				if (vnode->name == vname_normal) {
-					uses_normal = true;
-				}
-				if (vnode->name == vname_normalmap || vnode->name == vname_normalmap_depth) {
-					uses_normalmap = true;
-					uses_normal = true;
-				}
-
-				if (vnode->name == vname_screen_uv) {
-					uses_screen_uv = true;
-				}
-
-				if (vnode->name == vname_var1_interp) {
-					flags->use_var1_interp = true;
-				}
-				if (vnode->name == vname_var2_interp) {
-					flags->use_var2_interp = true;
-				}
-			}
-
-			if (type == ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT) {
-
-				if (vnode->name == vname_light) {
-					uses_light = true;
-				}
-
-				if (vnode->name == vname_normal) {
-					uses_normal = true;
-				}
-
-				if (vnode->name == vname_shadow) {
-					uses_shadow_color = true;
-				}
-			}
-
-			if (vnode->name == vname_time) {
-				uses_time = true;
-			}
-			code = replace_string(vnode->name);
-
-		} break;
-		case SL::Node::TYPE_CONSTANT: {
-			SL::ConstantNode *cnode = (SL::ConstantNode *)p_node;
-			switch (cnode->datatype) {
-
-				case SL::TYPE_BOOL: code = cnode->value.operator bool() ? "true" : "false"; break;
-				case SL::TYPE_FLOAT:
-					code = _mknum(cnode->value);
-					break; //force zeros, so GLSL doesn't confuse with integer.
-				case SL::TYPE_VEC2: {
-					Vector2 v = cnode->value;
-					code = "vec2(" + _mknum(v.x) + ", " + _mknum(v.y) + ")";
-				} break;
-				case SL::TYPE_VEC3: {
-					Vector3 v = cnode->value;
-					code = "vec3(" + _mknum(v.x) + ", " + _mknum(v.y) + ", " + _mknum(v.z) + ")";
-				} break;
-				case SL::TYPE_VEC4: {
-					Plane v = cnode->value;
-					code = "vec4(" + _mknum(v.normal.x) + ", " + _mknum(v.normal.y) + ", " + _mknum(v.normal.z) + ", " + _mknum(v.d) + ")";
-				} break;
-				case SL::TYPE_MAT2: {
-					Transform2D x = cnode->value;
-					code = "mat2( vec2(" + _mknum(x[0][0]) + ", " + _mknum(x[0][1]) + "), vec2(" + _mknum(x[1][0]) + ", " + _mknum(x[1][1]) + "))";
-				} break;
-				case SL::TYPE_MAT3: {
-					Basis x = cnode->value;
-					code = "mat3( vec3(" + _mknum(x.get_axis(0).x) + ", " + _mknum(x.get_axis(0).y) + ", " + _mknum(x.get_axis(0).z) + "), vec3(" + _mknum(x.get_axis(1).x) + ", " + _mknum(x.get_axis(1).y) + ", " + _mknum(x.get_axis(1).z) + "), vec3(" + _mknum(x.get_axis(2).x) + ", " + _mknum(x.get_axis(2).y) + ", " + _mknum(x.get_axis(2).z) + "))";
-				} break;
-				case SL::TYPE_MAT4: {
-					Transform x = cnode->value;
-					code = "mat4( vec4(" + _mknum(x.basis.get_axis(0).x) + ", " + _mknum(x.basis.get_axis(0).y) + ", " + _mknum(x.basis.get_axis(0).z) + ",0.0), vec4(" + _mknum(x.basis.get_axis(1).x) + ", " + _mknum(x.basis.get_axis(1).y) + ", " + _mknum(x.basis.get_axis(1).z) + ",0.0), vec4(" + _mknum(x.basis.get_axis(2).x) + ", " + _mknum(x.basis.get_axis(2).y) + ", " + _mknum(x.basis.get_axis(2).z) + ",0.0), vec4(" + _mknum(x.origin.x) + ", " + _mknum(x.origin.y) + ", " + _mknum(x.origin.z) + ",1.0))";
-				} break;
-				default: code = "<error: " + Variant::get_type_name(cnode->value.get_type()) + " (" + itos(cnode->datatype) + ">";
-			}
-
-		} break;
-		case SL::Node::TYPE_OPERATOR: {
-			SL::OperatorNode *onode = (SL::OperatorNode *)p_node;
-
-			switch (onode->op) {
-
-				case SL::OP_ASSIGN_MUL: {
-
-					if (onode->arguments[0]->get_datatype() == SL::TYPE_VEC3 && onode->arguments[1]->get_datatype() == SL::TYPE_MAT4) {
-
-						String mul_l = dump_node_code(onode->arguments[0], p_level, true);
-						String mul_r = dump_node_code(onode->arguments[1], p_level);
-						code = mul_l + "=(vec4(" + mul_l + ",1.0)*(" + mul_r + ")).xyz";
-						break;
-					} else if (onode->arguments[0]->get_datatype() == SL::TYPE_MAT4 && onode->arguments[1]->get_datatype() == SL::TYPE_VEC3) {
-
-						String mul_l = dump_node_code(onode->arguments[0], p_level, true);
-						String mul_r = dump_node_code(onode->arguments[1], p_level);
-						code = mul_l + "=((" + mul_l + ")*vec4(" + mul_r + ",1.0)).xyz";
-						break;
-					} else if (onode->arguments[0]->get_datatype() == SL::TYPE_VEC2 && onode->arguments[1]->get_datatype() == SL::TYPE_MAT4) {
-
-						String mul_l = dump_node_code(onode->arguments[0], p_level, true);
-						String mul_r = dump_node_code(onode->arguments[1], p_level);
-						code = mul_l + "=(vec4(" + mul_l + ",0.0,1.0)*(" + mul_r + ")).xy";
-						break;
-					} else if (onode->arguments[0]->get_datatype() == SL::TYPE_MAT4 && onode->arguments[1]->get_datatype() == SL::TYPE_VEC2) {
-
-						String mul_l = dump_node_code(onode->arguments[0], p_level, true);
-						String mul_r = dump_node_code(onode->arguments[1], p_level);
-						code = mul_l + "=((" + mul_l + ")*vec4(" + mul_r + ",0.0,1.0)).xy";
-						break;
-					} else if (onode->arguments[0]->get_datatype() == SL::TYPE_VEC2 && onode->arguments[1]->get_datatype() == SL::TYPE_MAT3) {
-						String mul_l = dump_node_code(onode->arguments[0], p_level, true);
-						String mul_r = dump_node_code(onode->arguments[1], p_level);
-						code = mul_l + "=((" + mul_l + ")*vec3(" + mul_r + ",1.0)).xy";
-						break;
-					}
-				};
-				case SL::OP_ASSIGN:
-				case SL::OP_ASSIGN_ADD:
-				case SL::OP_ASSIGN_SUB:
-				case SL::OP_ASSIGN_DIV:
-					code = "(" + dump_node_code(onode->arguments[0], p_level, true) + _opstr(onode->op) + dump_node_code(onode->arguments[1], p_level) + ")";
-					break;
-
-				case SL::OP_MUL:
-
-					if (onode->arguments[0]->get_datatype() == SL::TYPE_MAT4 && onode->arguments[1]->get_datatype() == SL::TYPE_VEC3) {
-
-						code = "(" + dump_node_code(onode->arguments[0], p_level) + "*vec4(" + dump_node_code(onode->arguments[1], p_level) + ",1.0)).xyz";
-						break;
-					} else if (onode->arguments[0]->get_datatype() == SL::TYPE_VEC3 && onode->arguments[1]->get_datatype() == SL::TYPE_MAT4) {
-
-						code = "(vec4(" + dump_node_code(onode->arguments[0], p_level) + ",1.0)*" + dump_node_code(onode->arguments[1], p_level) + ").xyz";
-						break;
-					} else if (onode->arguments[0]->get_datatype() == SL::TYPE_MAT4 && onode->arguments[1]->get_datatype() == SL::TYPE_VEC2) {
-
-						code = "(" + dump_node_code(onode->arguments[0], p_level) + "*vec4(" + dump_node_code(onode->arguments[1], p_level) + ",0.0,1.0)).xy";
-						break;
-					} else if (onode->arguments[0]->get_datatype() == SL::TYPE_VEC2 && onode->arguments[1]->get_datatype() == SL::TYPE_MAT4) {
-
-						code = "(vec4(" + dump_node_code(onode->arguments[0], p_level) + ",0.0,1.0)*" + dump_node_code(onode->arguments[1], p_level) + ").xy";
-						break;
-					} else if (onode->arguments[0]->get_datatype() == SL::TYPE_MAT3 && onode->arguments[1]->get_datatype() == SL::TYPE_VEC2) {
-
-						code = "(" + dump_node_code(onode->arguments[0], p_level) + "*vec3(" + dump_node_code(onode->arguments[1], p_level) + ",1.0)).xy";
-						break;
-					} else if (onode->arguments[0]->get_datatype() == SL::TYPE_VEC2 && onode->arguments[1]->get_datatype() == SL::TYPE_MAT3) {
-
-						code = "(vec3(" + dump_node_code(onode->arguments[0], p_level) + ",1.0)*" + dump_node_code(onode->arguments[1], p_level) + ").xy";
-						break;
-					}
-
-				case SL::OP_ADD:
-				case SL::OP_SUB:
-				case SL::OP_DIV:
-				case SL::OP_CMP_EQ:
-				case SL::OP_CMP_NEQ:
-				case SL::OP_CMP_LEQ:
-				case SL::OP_CMP_GEQ:
-				case SL::OP_CMP_LESS:
-				case SL::OP_CMP_GREATER:
-				case SL::OP_CMP_OR:
-				case SL::OP_CMP_AND:
-					//handle binary
-					code = "(" + dump_node_code(onode->arguments[0], p_level) + _opstr(onode->op) + dump_node_code(onode->arguments[1], p_level) + ")";
-					break;
-				case SL::OP_NEG:
-				case SL::OP_NOT:
-					//handle unary
-					code = _opstr(onode->op) + dump_node_code(onode->arguments[0], p_level);
-					break;
-				case SL::OP_CONSTRUCT:
-				case SL::OP_CALL: {
-					String callfunc = dump_node_code(onode->arguments[0], p_level);
-
-					code = callfunc + "(";
-					/*if (callfunc=="mat4") {
-						//fix constructor for mat4
-						for(int i=1;i<onode->arguments.size();i++) {
-							if (i>1)
-								code+=", ";
-								//transform
-							code+="vec4( "+dump_node_code(onode->arguments[i],p_level)+(i==4?",1.0)":",0.0)");
-
-						}
-					} else*/ if (callfunc == "tex") {
-
-						code = "texture2D( " + dump_node_code(onode->arguments[1], p_level) + "," + dump_node_code(onode->arguments[2], p_level) + ")";
-						break;
-					} else if (callfunc == "texcube") {
-
-						code = "(textureCube( " + dump_node_code(onode->arguments[1], p_level) + ",(" + dump_node_code(onode->arguments[2], p_level) + ")).xyz";
-						break;
-					} else if (callfunc == "texscreen") {
-						//create the call to sample the screen, and clamp it
-						uses_texscreen = true;
-						code = "(texture2D( texscreen_tex, clamp((" + dump_node_code(onode->arguments[1], p_level) + ").xy*texscreen_screen_mult,texscreen_screen_clamp.xy,texscreen_screen_clamp.zw))).rgb";
-						//code="(texture2D( screen_texture, ("+dump_node_code(onode->arguments[1],p_level)+").xy).rgb";
-						break;
-					} else if (callfunc == "texpos") {
-						//create the call to sample the screen, and clamp it
-						uses_texpos = true;
-						code = "get_texpos(" + dump_node_code(onode->arguments[1], p_level) + "";
-						//code="get_texpos(gl_ProjectionMatrixInverse * texture2D( depth_texture, clamp(("+dump_node_code(onode->arguments[1],p_level)+").xy,vec2(0.0),vec2(1.0))*gl_LightSource[5].specular.zw+gl_LightSource[5].specular.xy)";
-						//code="(texture2D( screen_texture, ("+dump_node_code(onode->arguments[1],p_level)+").xy).rgb";
-						break;
-					} else if (custom_h && callfunc == "cosh_custom") {
-
-						if (!cosh_used) {
-							global_code =
-									"float cosh_custom(float val)\n"
-									"{\n"
-									"    float tmp = exp(val);\n"
-									"    float cosH = (tmp + 1.0 / tmp) / 2.0;\n"
-									"    return cosH;\n"
-									"}\n" +
-									global_code;
-							cosh_used = true;
-						}
-						code = "cosh_custom(" + dump_node_code(onode->arguments[1], p_level) + "";
-					} else if (custom_h && callfunc == "sinh_custom") {
-
-						if (!sinh_used) {
-							global_code =
-									"float sinh_custom(float val)\n"
-									"{\n"
-									"    float tmp = exp(val);\n"
-									"    float sinH = (tmp - 1.0 / tmp) / 2.0;\n"
-									"    return sinH;\n"
-									"}\n" +
-									global_code;
-							sinh_used = true;
-						}
-						code = "sinh_custom(" + dump_node_code(onode->arguments[1], p_level) + "";
-					} else if (custom_h && callfunc == "tanh_custom") {
-
-						if (!tanh_used) {
-							global_code =
-									"float tanh_custom(float val)\n"
-									"{\n"
-									"    float tmp = exp(val);\n"
-									"    float tanH = (tmp - 1.0 / tmp) / (tmp + 1.0 / tmp);\n"
-									"    return tanH;\n"
-									"}\n" +
-									global_code;
-							tanh_used = true;
-						}
-						code = "tanh_custom(" + dump_node_code(onode->arguments[1], p_level) + "";
-
-					} else {
-
-						for (int i = 1; i < onode->arguments.size(); i++) {
-							if (i > 1)
-								code += ", ";
-							//transform
-							code += dump_node_code(onode->arguments[i], p_level);
-						}
-					}
-					code += ")";
-					break;
-				} break;
-				default: {}
-			}
-
-		} break;
-		case SL::Node::TYPE_CONTROL_FLOW: {
-			SL::ControlFlowNode *cfnode = (SL::ControlFlowNode *)p_node;
-			if (cfnode->flow_op == SL::FLOW_OP_IF) {
-
-				code += "if (" + dump_node_code(cfnode->statements[0], p_level) + ") {" ENDL;
-				code += dump_node_code(cfnode->statements[1], p_level + 1);
-				if (cfnode->statements.size() == 3) {
-
-					code += "} else {" ENDL;
-					code += dump_node_code(cfnode->statements[2], p_level + 1);
-				}
-
-				code += "}" ENDL;
-
-			} else if (cfnode->flow_op == SL::FLOW_OP_RETURN) {
-
-				if (cfnode->statements.size()) {
-					code = "return " + dump_node_code(cfnode->statements[0], p_level);
-				} else {
-					code = "return";
-				}
-			}
-
-		} break;
-		case SL::Node::TYPE_MEMBER: {
-			SL::MemberNode *mnode = (SL::MemberNode *)p_node;
-			String m;
-			if (mnode->basetype == SL::TYPE_MAT4) {
-				if (mnode->name == "x")
-					m = "[0]";
-				else if (mnode->name == "y")
-					m = "[1]";
-				else if (mnode->name == "z")
-					m = "[2]";
-				else if (mnode->name == "w")
-					m = "[3]";
-			} else if (mnode->basetype == SL::TYPE_MAT2) {
-				if (mnode->name == "x")
-					m = "[0]";
-				else if (mnode->name == "y")
-					m = "[1]";
-
-			} else if (mnode->basetype == SL::TYPE_MAT3) {
-				if (mnode->name == "x")
-					m = "[0]";
-				else if (mnode->name == "y")
-					m = "[1]";
-				else if (mnode->name == "z")
-					m = "[2]";
-
-			} else {
-				m = "." + mnode->name;
-			}
-			code = dump_node_code(mnode->owner, p_level) + m;
-
-		} break;
-	}
-
-	return code;
-}
-
-Error ShaderCompilerGLES2::compile_node(SL::ProgramNode *p_program) {
-
-	// feed the local replace table and global code
-	global_code = "";
-
-	// uniforms first!
-
-	int ubase = 0;
-	if (uniforms)
-		ubase = uniforms->size();
-	for (Map<StringName, SL::Uniform>::Element *E = p_program->uniforms.front(); E; E = E->next()) {
-
-		String uline = "uniform " + _typestr(E->get().type) + " _" + E->key().operator String() + ";" ENDL;
-
-		global_code += uline;
-		if (uniforms) {
-			/*
-			if (uniforms->has(E->key())) {
-				//repeated uniform, error
-				ERR_EXPLAIN("Uniform already exists from other shader: "+String(E->key()));
-				ERR_FAIL_COND_V(uniforms->has(E->key()),ERR_ALREADY_EXISTS);
-			}
-			*/
-			SL::Uniform u = E->get();
-			u.order += ubase;
-			uniforms->insert(E->key(), u);
-		}
-	}
-
-	for (int i = 0; i < p_program->functions.size(); i++) {
-
-		SL::FunctionNode *fnode = p_program->functions[i].function;
-
-		StringName funcname = fnode->name;
-		String newfuncname = replace_string(funcname);
-
-		String header;
-		header = _typestr(fnode->return_type) + " " + newfuncname + "(";
-		for (int i = 0; i < fnode->arguments.size(); i++) {
-
-			if (i > 0)
-				header += ", ";
-			header += _typestr(fnode->arguments[i].type) + " " + replace_string(fnode->arguments[i].name);
-		}
-
-		header += ") {" ENDL;
-		String fcode = header;
-		fcode += dump_node_code(fnode->body, 1);
-		fcode += "}" ENDL;
-		global_code += fcode;
-	}
-
-	/*	for(Map<StringName,SL::DataType>::Element *E=p_program->preexisting_variables.front();E;E=E->next()) {
-
-		StringName varname=E->key();
-		String newvarname=replace_string(varname);
-        global_code+="uniform "+_typestr(E->get())+" "+newvarname+";" ENDL;
-	}*/
-
-	code = dump_node_code(p_program, 0);
-
-#ifdef DEBUG_SHADER_ENABLED
-
-	print_line("GLOBAL CODE:\n\n");
-	print_line(global_code);
-	global_code = global_code.replace("\n", "");
-	print_line("CODE:\n\n");
-	print_line(code);
-	code = code.replace("\n", "");
-#endif
-
-	return OK;
-}
-
-Error ShaderCompilerGLES2::create_glsl_120_code(void *p_str, SL::ProgramNode *p_program) {
-
-	ShaderCompilerGLES2 *compiler = (ShaderCompilerGLES2 *)p_str;
-	return compiler->compile_node(p_program);
-}
-
-String ShaderCompilerGLES2::replace_string(const StringName &p_string) {
-
-	Map<StringName, StringName>::Element *E = NULL;
-	E = replace_table.find(p_string);
-	if (E)
-		return E->get();
-
-	E = mode_replace_table[type].find(p_string);
-	if (E)
-		return E->get();
-
-	return "_" + p_string.operator String();
-}
-
-Error ShaderCompilerGLES2::compile(const String &p_code, ShaderLanguage::ShaderType p_type, String &r_code_line, String &r_globals_line, Flags &r_flags, Map<StringName, ShaderLanguage::Uniform> *r_uniforms) {
-
-	uses_texscreen = false;
-	uses_texpos = false;
-	uses_alpha = false;
-	uses_discard = false;
-	uses_screen_uv = false;
-	uses_light = false;
-	uses_time = false;
-	uses_normalmap = false;
-	uses_normal = false;
-	uses_texpixel_size = false;
-	uses_worldvec = false;
-	vertex_code_writes_vertex = false;
-	vertex_code_writes_position = false;
-	uses_shadow_color = false;
-	uniforms = r_uniforms;
-	flags = &r_flags;
-	r_flags.use_color_interp = false;
-	r_flags.use_uv_interp = false;
-	r_flags.use_uv2_interp = false;
-	r_flags.use_tangent_interp = false;
-	r_flags.use_var1_interp = false;
-	r_flags.use_var2_interp = false;
-	r_flags.uses_normalmap = false;
-	r_flags.uses_normal = false;
-	sinh_used = false;
-	tanh_used = false;
-	cosh_used = false;
-
-	String error;
-	int errline, errcol;
-
-	type = p_type;
-	Error err = SL::compile(p_code, p_type, create_glsl_120_code, this, &error, &errline, &errcol);
-
-	if (err) {
-		print_line("***Error precompiling shader: " + error);
-		print_line("error " + itos(errline) + ":" + itos(errcol));
-		return err;
-	}
-
-	r_flags.uses_alpha = uses_alpha;
-	r_flags.uses_texscreen = uses_texscreen;
-	r_flags.uses_texpos = uses_texpos;
-	r_flags.vertex_code_writes_vertex = vertex_code_writes_vertex;
-	r_flags.vertex_code_writes_position = vertex_code_writes_position;
-	r_flags.uses_discard = uses_discard;
-	r_flags.uses_screen_uv = uses_screen_uv;
-	r_flags.uses_light = uses_light;
-	r_flags.uses_time = uses_time;
-	r_flags.uses_normalmap = uses_normalmap;
-	r_flags.uses_normal = uses_normal;
-	r_flags.uses_texpixel_size = uses_texpixel_size;
-	r_flags.uses_worldvec = uses_worldvec;
-	r_flags.uses_shadow_color = uses_shadow_color;
-	r_code_line = code;
-	r_globals_line = global_code;
-	return OK;
-}
-
-ShaderCompilerGLES2::ShaderCompilerGLES2() {
-
-#ifdef GLEW_ENABLED
-	//use custom functions because they are not supported in GLSL120
-	custom_h = true;
-#else
-	custom_h = false;
-#endif
-
-	replace_table["bool"] = "bool";
-	replace_table["float"] = "float";
-	replace_table["vec2"] = "vec2";
-	replace_table["vec3"] = "vec3";
-	replace_table["vec4"] = "vec4";
-	replace_table["mat2"] = "mat2";
-	replace_table["mat3"] = "mat3";
-	replace_table["mat4"] = "mat4";
-	replace_table["texture"] = "sampler2D";
-	replace_table["cubemap"] = "samplerCube";
-
-	replace_table["sin"] = "sin";
-	replace_table["cos"] = "cos";
-	replace_table["tan"] = "tan";
-	replace_table["asin"] = "asin";
-	replace_table["acos"] = "acos";
-	replace_table["atan"] = "atan";
-	replace_table["atan2"] = "atan";
-
-	if (custom_h) {
-		replace_table["sinh"] = "sinh_custom";
-		replace_table["cosh"] = "cosh_custom";
-		replace_table["tanh"] = "tanh_custom";
-	} else {
-		replace_table["sinh"] = "sinh";
-		replace_table["cosh"] = "cosh";
-		replace_table["tanh"] = "tanh";
-	}
-
-	replace_table["pow"] = "pow";
-	replace_table["exp"] = "exp";
-	replace_table["log"] = "log";
-	replace_table["sqrt"] = "sqrt";
-	replace_table["abs"] = "abs";
-	replace_table["sign"] = "sign";
-	replace_table["floor"] = "floor";
-	replace_table["trunc"] = "trunc";
-#ifdef GLEW_ENABLED
-	replace_table["round"] = "roundfix";
-#else
-	replace_table["round"] = "round";
-#endif
-	replace_table["ceil"] = "ceil";
-	replace_table["fract"] = "fract";
-	replace_table["mod"] = "mod";
-	replace_table["min"] = "min";
-	replace_table["max"] = "max";
-	replace_table["clamp"] = "clamp";
-	replace_table["mix"] = "mix";
-	replace_table["step"] = "step";
-	replace_table["smoothstep"] = "smoothstep";
-	replace_table["length"] = "length";
-	replace_table["distance"] = "distance";
-	replace_table["dot"] = "dot";
-	replace_table["cross"] = "cross";
-	replace_table["normalize"] = "normalize";
-	replace_table["reflect"] = "reflect";
-	replace_table["refract"] = "refract";
-	replace_table["tex"] = "tex";
-	replace_table["texa"] = "texa";
-	replace_table["tex2"] = "tex2";
-	replace_table["texcube"] = "textureCube";
-	replace_table["texscreen"] = "texscreen";
-	replace_table["texpos"] = "texpos";
-
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["SRC_VERTEX"] = "vertex_in.xyz";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["SRC_NORMAL"] = "normal_in";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["SRC_TANGENT"] = "tangent_in";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["SRC_BINORMALF"] = "binormalf";
-
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["POSITION"] = "gl_Position";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["VERTEX"] = "vertex_interp";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["NORMAL"] = "normal_interp";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["TANGENT"] = "tangent_interp";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["BINORMAL"] = "binormal_interp";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["UV"] = "uv_interp.xy";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["UV2"] = "uv_interp.zw";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["COLOR"] = "color_interp";
-	//@TODO convert to glsl stuff
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["SPEC_EXP"] = "vertex_specular_exp";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["WORLD_MATRIX"] = "world_transform";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["INV_CAMERA_MATRIX"] = "camera_inverse_transform";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["PROJECTION_MATRIX"] = "projection_transform";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["MODELVIEW_MATRIX"] = "modelview";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["POINT_SIZE"] = "gl_PointSize";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["VAR1"] = "var1_interp";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["VAR2"] = "var2_interp";
-
-	//mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["SCREEN_POS"]="SCREEN_POS";
-	//mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["SCREEN_SIZE"]="SCREEN_SIZE";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["INSTANCE_ID"] = "instance_id";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_VERTEX]["TIME"] = "time";
-
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["VERTEX"] = "vertex";
-	//mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["POSITION"]="IN_POSITION";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["NORMAL"] = "normal";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["TANGENT"] = "tangent";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["POSITION"] = "gl_Position";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["BINORMAL"] = "binormal";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["NORMALMAP"] = "normalmap";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["NORMALMAP_DEPTH"] = "normaldepth";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["VAR1"] = "var1_interp";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["VAR2"] = "var2_interp";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["UV"] = "uv";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["UV2"] = "uv2";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["SCREEN_UV"] = "screen_uv";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["VAR1"] = "var1_interp";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["VAR2"] = "var2_interp";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["COLOR"] = "color";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["DIFFUSE"] = "diffuse.rgb";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["DIFFUSE_ALPHA"] = "diffuse";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["SPECULAR"] = "specular";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["EMISSION"] = "emission";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["SHADE_PARAM"] = "shade_param";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["SPEC_EXP"] = "specular_exp";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["GLOW"] = "glow";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["DISCARD"] = "discard_";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["POINT_COORD"] = "gl_PointCoord";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["INV_CAMERA_MATRIX"] = "camera_inverse_transform";
-
-	//mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["SCREEN_POS"]="SCREEN_POS";
-	//mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["SCREEN_TEXEL_SIZE"]="SCREEN_TEXEL_SIZE";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_FRAGMENT]["TIME"] = "time";
-
-	//////////////
-
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["NORMAL"] = "normal";
-	//mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["POSITION"]="IN_POSITION";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["LIGHT_DIR"] = "light_dir";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["LIGHT_DIFFUSE"] = "light_diffuse";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["LIGHT_SPECULAR"] = "light_specular";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["EYE_VEC"] = "eye_vec";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["DIFFUSE"] = "mdiffuse";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["SPECULAR"] = "specular";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["SPECULAR_EXP"] = "specular_exp";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["SHADE_PARAM"] = "shade_param";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["LIGHT"] = "light";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["POINT_COORD"] = "gl_PointCoord";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["TIME"] = "time";
-	mode_replace_table[ShaderLanguage::SHADER_MATERIAL_LIGHT]["SHADOW"] = "shadow_color";
-
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["SRC_VERTEX"] = "src_vtx";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["VERTEX"] = "outvec.xy";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["WORLD_VERTEX"] = "outvec.xy";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["UV"] = "uv_interp";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["COLOR"] = "color_interp";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["VAR1"] = "var1_interp";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["VAR2"] = "var2_interp";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["POINT_SIZE"] = "gl_PointSize";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["WORLD_MATRIX"] = "modelview_matrix";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["PROJECTION_MATRIX"] = "projection_matrix";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["EXTRA_MATRIX"] = "extra_matrix";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_VERTEX]["TIME"] = "time";
-
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["POSITION"] = "gl_Position";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["NORMAL"] = "normal";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["NORMALMAP"] = "normal_map";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["NORMALMAP_DEPTH"] = "normal_depth";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["UV"] = "uv_interp";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["SRC_COLOR"] = "color_interp";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["COLOR"] = "color";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["TEXTURE"] = "texture";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["TEXTURE_PIXEL_SIZE"] = "texpixel_size";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["VAR1"] = "var1_interp";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["VAR2"] = "var2_interp";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["SCREEN_UV"] = "screen_uv";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["POINT_COORD"] = "gl_PointCoord";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_FRAGMENT]["TIME"] = "time";
-
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["POSITION"] = "gl_Position";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["NORMAL"] = "normal";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["UV"] = "uv_interp";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["COLOR"] = "color";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["TEXTURE"] = "texture";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["TEXTURE_PIXEL_SIZE"] = "texpixel_size";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["VAR1"] = "var1_interp";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["VAR2"] = "var2_interp";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["LIGHT_VEC"] = "light_vec";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["LIGHT_HEIGHT"] = "light_height";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["LIGHT_COLOR"] = "light";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["LIGHT_SHADOW"] = "light_shadow_color";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["LIGHT_UV"] = "light_uv";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["LIGHT"] = "light_out";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["SHADOW"] = "shadow_color";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["SCREEN_UV"] = "screen_uv";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["POINT_COORD"] = "gl_PointCoord";
-	mode_replace_table[ShaderLanguage::SHADER_CANVAS_ITEM_LIGHT]["TIME"] = "time";
-
-	//mode_replace_table[2]["SCREEN_POS"]="SCREEN_POS";
-	//mode_replace_table[2]["SCREEN_TEXEL_SIZE"]="SCREEN_TEXEL_SIZE";
-
-	out_vertex_name = "VERTEX";
-
-	vname_discard = "DISCARD";
-	vname_screen_uv = "SCREEN_UV";
-	vname_diffuse_alpha = "DIFFUSE_ALPHA";
-	vname_color_interp = "COLOR";
-	vname_uv_interp = "UV";
-	vname_uv2_interp = "UV2";
-	vname_tangent_interp = "TANGENT";
-	vname_binormal_interp = "BINORMAL";
-	vname_var1_interp = "VAR1";
-	vname_var2_interp = "VAR2";
-	vname_vertex = "VERTEX";
-	vname_position = "POSITION";
-	vname_light = "LIGHT";
-	vname_time = "TIME";
-	vname_normalmap = "NORMALMAP";
-	vname_normalmap_depth = "NORMALMAP_DEPTH";
-	vname_normal = "NORMAL";
-	vname_texpixel_size = "TEXTURE_PIXEL_SIZE";
-	vname_world_vec = "WORLD_VERTEX";
-	vname_shadow = "SHADOW";
-}

drivers/gles2/shader_compiler_gles2.h

@@ -1,134 +0,0 @@
-/*************************************************************************/
-/*  shader_compiler_gles2.h                                              */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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 SHADER_COMPILER_GLES2_H
-#define SHADER_COMPILER_GLES2_H
-
-#include "servers/visual/shader_language.h"
-class ShaderCompilerGLES2 {
-
-	class Uniform;
-
-public:
-	struct Flags;
-
-private:
-	ShaderLanguage::ProgramNode *program_node;
-	String dump_node_code(ShaderLanguage::Node *p_node, int p_level, bool p_assign_left = false);
-	Error compile_node(ShaderLanguage::ProgramNode *p_program);
-	static Error create_glsl_120_code(void *p_str, ShaderLanguage::ProgramNode *p_program);
-
-	bool uses_light;
-	bool uses_texscreen;
-	bool uses_texpos;
-	bool uses_alpha;
-	bool uses_discard;
-	bool uses_time;
-	bool uses_screen_uv;
-	bool uses_normalmap;
-	bool uses_normal;
-	bool uses_texpixel_size;
-	bool uses_worldvec;
-	bool vertex_code_writes_vertex;
-	bool vertex_code_writes_position;
-	bool uses_shadow_color;
-
-	bool sinh_used;
-	bool tanh_used;
-	bool cosh_used;
-
-	bool custom_h;
-
-	Flags *flags;
-
-	StringName vname_discard;
-	StringName vname_screen_uv;
-	StringName vname_diffuse_alpha;
-	StringName vname_color_interp;
-	StringName vname_uv_interp;
-	StringName vname_uv2_interp;
-	StringName vname_tangent_interp;
-	StringName vname_binormal_interp;
-	StringName vname_var1_interp;
-	StringName vname_var2_interp;
-	StringName vname_vertex;
-	StringName vname_position;
-	StringName vname_light;
-	StringName vname_time;
-	StringName vname_normalmap;
-	StringName vname_normalmap_depth;
-	StringName vname_normal;
-	StringName vname_texpixel_size;
-	StringName vname_world_vec;
-	StringName vname_shadow;
-
-	Map<StringName, ShaderLanguage::Uniform> *uniforms;
-
-	StringName out_vertex_name;
-
-	String global_code;
-	String code;
-	ShaderLanguage::ShaderType type;
-
-	String replace_string(const StringName &p_string);
-
-	Map<StringName, StringName> mode_replace_table[9];
-	Map<StringName, StringName> replace_table;
-
-public:
-	struct Flags {
-
-		bool uses_alpha;
-		bool uses_texscreen;
-		bool uses_texpos;
-		bool uses_normalmap;
-		bool vertex_code_writes_vertex;
-		bool vertex_code_writes_position;
-		bool uses_discard;
-		bool uses_screen_uv;
-		bool use_color_interp;
-		bool use_uv_interp;
-		bool use_uv2_interp;
-		bool use_tangent_interp;
-		bool use_var1_interp;
-		bool use_var2_interp;
-		bool uses_light;
-		bool uses_time;
-		bool uses_normal;
-		bool uses_texpixel_size;
-		bool uses_worldvec;
-		bool uses_shadow_color;
-	};
-
-	Error compile(const String &p_code, ShaderLanguage::ShaderType p_type, String &r_code_line, String &r_globals_line, Flags &r_flags, Map<StringName, ShaderLanguage::Uniform> *r_uniforms = NULL);
-
-	ShaderCompilerGLES2();
-};
-
-#endif // SHADER_COMPILERL_GL_H

drivers/gles2/shader_gles2.cpp

@@ -1,736 +0,0 @@
-/*************************************************************************/
-/*  shader_gles2.cpp                                                     */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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.                */
-/*************************************************************************/
-#include "shader_gles2.h"
-
-#ifdef GLES2_ENABLED
-#include "print_string.h"
-
-//#define DEBUG_OPENGL
-
-#ifdef DEBUG_OPENGL
-
-#define DEBUG_TEST_ERROR(m_section)                                         \
-	{                                                                       \
-		uint32_t err = glGetError();                                        \
-		if (err) {                                                          \
-			print_line("OpenGL Error #" + itos(err) + " at: " + m_section); \
-		}                                                                   \
-	}
-#else
-
-#define DEBUG_TEST_ERROR(m_section)
-
-#endif
-
-ShaderGLES2 *ShaderGLES2::active = NULL;
-
-//#define DEBUG_SHADER
-
-#ifdef DEBUG_SHADER
-
-#define DEBUG_PRINT(m_text) print_line(m_text);
-
-#else
-
-#define DEBUG_PRINT(m_text)
-
-#endif
-
-void ShaderGLES2::bind_uniforms() {
-
-	if (!uniforms_dirty) {
-		return;
-	};
-
-	// upload default uniforms
-	const Map<uint32_t, Variant>::Element *E = uniform_defaults.front();
-
-	while (E) {
-		int idx = E->key();
-		int location = version->uniform_location[idx];
-
-		if (location < 0) {
-			E = E->next();
-			continue;
-		}
-
-		const Variant &v = E->value();
-		_set_uniform_variant(location, v);
-		//print_line("uniform "+itos(location)+" value "+v+ " type "+Variant::get_type_name(v.get_type()));
-		E = E->next();
-	};
-
-	const Map<uint32_t, CameraMatrix>::Element *C = uniform_cameras.front();
-	while (C) {
-
-		int location = version->uniform_location[C->key()];
-		if (location < 0) {
-			C = C->next();
-			continue;
-		}
-
-		glUniformMatrix4fv(location, 1, false, &(C->get().matrix[0][0]));
-		C = C->next();
-	};
-
-	uniforms_dirty = false;
-};
-
-GLint ShaderGLES2::get_uniform_location(int p_index) const {
-
-	ERR_FAIL_COND_V(!version, -1);
-
-	return version->uniform_location[p_index];
-};
-
-bool ShaderGLES2::bind() {
-
-	if (active != this || !version || new_conditional_version.key != conditional_version.key) {
-		conditional_version = new_conditional_version;
-		version = get_current_version();
-	} else {
-
-		return false;
-	}
-
-	ERR_FAIL_COND_V(!version, false);
-
-	glUseProgram(version->id);
-
-	DEBUG_TEST_ERROR("Use Program");
-
-	active = this;
-	uniforms_dirty = true;
-	/*
- *	why on earth is this code here?
-	for (int i=0;i<texunit_pair_count;i++) {
-
-		glUniform1i(texunit_pairs[i].location, texunit_pairs[i].index);
-		DEBUG_TEST_ERROR("Uniform 1 i");
-	}
-
-*/
-	return true;
-}
-
-void ShaderGLES2::unbind() {
-
-	version = NULL;
-	glUseProgram(0);
-	uniforms_dirty = true;
-	active = NULL;
-}
-
-static String _fix_error_code_line(const String &p_error, int p_code_start, int p_offset) {
-
-	int last_find_pos = -1;
-	// NVIDIA
-	String error = p_error;
-	while ((last_find_pos = p_error.find("(", last_find_pos + 1)) != -1) {
-
-		int end_pos = last_find_pos + 1;
-
-		while (true) {
-
-			if (p_error[end_pos] >= '0' && p_error[end_pos] <= '9') {
-
-				end_pos++;
-				continue;
-			} else if (p_error[end_pos] == ')') {
-				break;
-			} else {
-
-				end_pos = -1;
-				break;
-			}
-		}
-
-		if (end_pos == -1)
-			continue;
-
-		String numstr = error.substr(last_find_pos + 1, (end_pos - last_find_pos) - 1);
-		String begin = error.substr(0, last_find_pos + 1);
-		String end = error.substr(end_pos, error.length());
-		int num = numstr.to_int() + p_code_start - p_offset;
-		error = begin + itos(num) + end;
-	}
-
-	// ATI
-	last_find_pos = -1;
-	while ((last_find_pos = p_error.find("ERROR: ", last_find_pos + 1)) != -1) {
-
-		last_find_pos += 6;
-		int end_pos = last_find_pos + 1;
-
-		while (true) {
-
-			if (p_error[end_pos] >= '0' && p_error[end_pos] <= '9') {
-
-				end_pos++;
-				continue;
-			} else if (p_error[end_pos] == ':') {
-				break;
-			} else {
-
-				end_pos = -1;
-				break;
-			}
-		}
-		continue;
-		if (end_pos == -1)
-			continue;
-
-		String numstr = error.substr(last_find_pos + 1, (end_pos - last_find_pos) - 1);
-		print_line("numstr: " + numstr);
-		String begin = error.substr(0, last_find_pos + 1);
-		String end = error.substr(end_pos, error.length());
-		int num = numstr.to_int() + p_code_start - p_offset;
-		error = begin + itos(num) + end;
-	}
-	return error;
-}
-
-ShaderGLES2::Version *ShaderGLES2::get_current_version() {
-
-	Version *_v = version_map.getptr(conditional_version);
-
-	if (_v) {
-
-		if (conditional_version.code_version != 0) {
-			CustomCode *cc = custom_code_map.getptr(conditional_version.code_version);
-			ERR_FAIL_COND_V(!cc, _v);
-			if (cc->version == _v->code_version)
-				return _v;
-		} else {
-			return _v;
-		}
-	}
-
-	if (!_v)
-		version_map[conditional_version] = Version();
-
-	Version &v = version_map[conditional_version];
-
-	if (!_v) {
-
-		v.uniform_location = memnew_arr(GLint, uniform_count);
-
-	} else {
-		if (v.ok) {
-			//bye bye shaders
-			glDeleteShader(v.vert_id);
-			glDeleteShader(v.frag_id);
-			glDeleteProgram(v.id);
-			v.id = 0;
-		}
-	}
-
-	v.ok = false;
-	/* SETUP CONDITIONALS */
-
-	Vector<const char *> strings;
-#ifdef GLEW_ENABLED
-	strings.push_back("#version 120\n"); //ATI requieres this before anything
-#endif
-	int define_line_ofs = 1;
-
-	for (int j = 0; j < conditional_count; j++) {
-
-		bool enable = ((1 << j) & conditional_version.version);
-		strings.push_back(enable ? conditional_defines[j] : "");
-		if (enable)
-			define_line_ofs++;
-
-		if (enable) {
-			DEBUG_PRINT(conditional_defines[j]);
-		}
-	}
-
-	//keep them around during the function
-	CharString code_string;
-	CharString code_string2;
-	CharString code_globals;
-
-	//print_line("code version? "+itos(conditional_version.code_version));
-
-	CustomCode *cc = NULL;
-
-	if (conditional_version.code_version > 0) {
-		//do custom code related stuff
-
-		ERR_FAIL_COND_V(!custom_code_map.has(conditional_version.code_version), NULL);
-		cc = &custom_code_map[conditional_version.code_version];
-		v.code_version = cc->version;
-		define_line_ofs += 2;
-	}
-
-	/* CREATE PROGRAM */
-
-	v.id = glCreateProgram();
-
-	ERR_FAIL_COND_V(v.id == 0, NULL);
-
-	/* VERTEX SHADER */
-
-	if (cc) {
-		for (int i = 0; i < cc->custom_defines.size(); i++) {
-
-			strings.push_back(cc->custom_defines[i]);
-			DEBUG_PRINT("CD #" + itos(i) + ": " + String(cc->custom_defines[i]));
-		}
-	}
-
-	int strings_base_size = strings.size();
-#if 0
-	if (cc) {
-
-		String _code_string = "#define VERTEX_SHADER_CODE "+cc->vertex+"\n";
-		String _code_globals = "#define VERTEX_SHADER_GLOBALS "+cc->vertex_globals+"\n";
-
-		code_string=_code_string.ascii();
-		code_globals=_code_globals.ascii();
-		DEBUG_PRINT( code_globals.get_data() );
-		DEBUG_PRINT( code_string.get_data() );
-		strings.push_back(code_globals);
-		strings.push_back(code_string);
-	}
-#endif
-
-	strings.push_back(vertex_code0.get_data());
-	if (cc) {
-		code_globals = cc->vertex_globals.ascii();
-		strings.push_back(code_globals.get_data());
-	}
-	strings.push_back(vertex_code1.get_data());
-
-	if (cc) {
-		code_string = cc->vertex.ascii();
-		strings.push_back(code_string.get_data());
-	}
-
-	strings.push_back(vertex_code2.get_data());
-#ifdef DEBUG_SHADER
-
-	DEBUG_PRINT("\nVertex Code:\n\n" + String(code_string.get_data()));
-	for (int i = 0; i < strings.size(); i++) {
-
-		//print_line("vert strings "+itos(i)+":"+String(strings[i]));
-	}
-#endif
-
-	v.vert_id = glCreateShader(GL_VERTEX_SHADER);
-	glShaderSource(v.vert_id, strings.size(), &strings[0], NULL);
-	glCompileShader(v.vert_id);
-
-	GLint status;
-
-	glGetShaderiv(v.vert_id, GL_COMPILE_STATUS, &status);
-	if (status == GL_FALSE) {
-		// error compiling
-		GLsizei iloglen;
-		glGetShaderiv(v.vert_id, GL_INFO_LOG_LENGTH, &iloglen);
-
-		if (iloglen < 0) {
-
-			glDeleteShader(v.vert_id);
-			glDeleteProgram(v.id);
-			v.id = 0;
-
-			ERR_PRINT("NO LOG, WTF");
-		} else {
-
-			if (iloglen == 0) {
-
-				iloglen = 4096; //buggy driver (Adreno 220+....)
-			}
-
-			char *ilogmem = (char *)Memory::alloc_static(iloglen + 1);
-			ilogmem[iloglen] = 0;
-			glGetShaderInfoLog(v.vert_id, iloglen, &iloglen, ilogmem);
-
-			String err_string = get_shader_name() + ": Vertex Program Compilation Failed:\n";
-
-			err_string += ilogmem;
-			err_string = _fix_error_code_line(err_string, vertex_code_start, define_line_ofs);
-			ERR_PRINT(err_string.ascii().get_data());
-			Memory::free_static(ilogmem);
-			glDeleteShader(v.vert_id);
-			glDeleteProgram(v.id);
-			v.id = 0;
-		}
-
-		ERR_FAIL_V(NULL);
-	}
-
-	/* FRAGMENT SHADER */
-
-	strings.resize(strings_base_size);
-#if 0
-	if (cc) {
-
-		String _code_string = "#define FRAGMENT_SHADER_CODE "+cc->fragment+"\n";
-		String _code_globals = "#define FRAGMENT_SHADER_GLOBALS "+cc->fragment_globals+"\n";
-
-		code_string=_code_string.ascii();
-		code_globals=_code_globals.ascii();
-		DEBUG_PRINT( code_globals.get_data() );
-		DEBUG_PRINT( code_string.get_data() );
-		strings.push_back(code_globals);
-		strings.push_back(code_string);
-	}
-#endif
-
-	strings.push_back(fragment_code0.get_data());
-	if (cc) {
-		code_globals = cc->fragment_globals.ascii();
-		strings.push_back(code_globals.get_data());
-	}
-	strings.push_back(fragment_code1.get_data());
-
-	if (cc) {
-		code_string = cc->fragment.ascii();
-		strings.push_back(code_string.get_data());
-	}
-
-	strings.push_back(fragment_code2.get_data());
-
-	if (cc) {
-		code_string2 = cc->light.ascii();
-		strings.push_back(code_string2.get_data());
-	}
-
-	strings.push_back(fragment_code3.get_data());
-
-#ifdef DEBUG_SHADER
-	DEBUG_PRINT("\nFragment Code:\n\n" + String(code_string.get_data()));
-	for (int i = 0; i < strings.size(); i++) {
-
-		//print_line("frag strings "+itos(i)+":"+String(strings[i]));
-	}
-#endif
-
-	v.frag_id = glCreateShader(GL_FRAGMENT_SHADER);
-	glShaderSource(v.frag_id, strings.size(), &strings[0], NULL);
-	glCompileShader(v.frag_id);
-
-	glGetShaderiv(v.frag_id, GL_COMPILE_STATUS, &status);
-	if (status == GL_FALSE) {
-		// error compiling
-		GLsizei iloglen;
-		glGetShaderiv(v.frag_id, GL_INFO_LOG_LENGTH, &iloglen);
-
-		if (iloglen < 0) {
-
-			glDeleteShader(v.frag_id);
-			glDeleteShader(v.vert_id);
-			glDeleteProgram(v.id);
-			v.id = 0;
-			ERR_PRINT("NO LOG, WTF");
-		} else {
-
-			if (iloglen == 0) {
-
-				iloglen = 4096; //buggy driver (Adreno 220+....)
-			}
-
-			char *ilogmem = (char *)Memory::alloc_static(iloglen + 1);
-			ilogmem[iloglen] = 0;
-			glGetShaderInfoLog(v.frag_id, iloglen, &iloglen, ilogmem);
-
-			String err_string = get_shader_name() + ": Fragment Program Compilation Failed:\n";
-
-			err_string += ilogmem;
-			err_string = _fix_error_code_line(err_string, fragment_code_start, define_line_ofs);
-			ERR_PRINT(err_string.ascii().get_data());
-			Memory::free_static(ilogmem);
-			glDeleteShader(v.frag_id);
-			glDeleteShader(v.vert_id);
-			glDeleteProgram(v.id);
-			v.id = 0;
-		}
-
-		ERR_FAIL_V(NULL);
-	}
-
-	glAttachShader(v.id, v.frag_id);
-	glAttachShader(v.id, v.vert_id);
-
-	// bind attributes before linking
-	for (int i = 0; i < attribute_pair_count; i++) {
-
-		glBindAttribLocation(v.id, attribute_pairs[i].index, attribute_pairs[i].name);
-	}
-
-	glLinkProgram(v.id);
-
-	glGetProgramiv(v.id, GL_LINK_STATUS, &status);
-
-	if (status == GL_FALSE) {
-		// error linking
-		GLsizei iloglen;
-		glGetProgramiv(v.id, GL_INFO_LOG_LENGTH, &iloglen);
-
-		if (iloglen < 0) {
-
-			glDeleteShader(v.frag_id);
-			glDeleteShader(v.vert_id);
-			glDeleteProgram(v.id);
-			v.id = 0;
-			ERR_FAIL_COND_V(iloglen <= 0, NULL);
-		}
-
-		if (iloglen == 0) {
-
-			iloglen = 4096; //buggy driver (Adreno 220+....)
-		}
-
-		char *ilogmem = (char *)Memory::alloc_static(iloglen + 1);
-		ilogmem[iloglen] = 0;
-		glGetProgramInfoLog(v.id, iloglen, &iloglen, ilogmem);
-
-		String err_string = get_shader_name() + ": Program LINK FAILED:\n";
-
-		err_string += ilogmem;
-		err_string = _fix_error_code_line(err_string, fragment_code_start, define_line_ofs);
-		ERR_PRINT(err_string.ascii().get_data());
-		Memory::free_static(ilogmem);
-		glDeleteShader(v.frag_id);
-		glDeleteShader(v.vert_id);
-		glDeleteProgram(v.id);
-		v.id = 0;
-
-		ERR_FAIL_V(NULL);
-	}
-
-	/* UNIFORMS */
-
-	glUseProgram(v.id);
-
-	//print_line("uniforms:  ");
-	for (int j = 0; j < uniform_count; j++) {
-
-		v.uniform_location[j] = glGetUniformLocation(v.id, uniform_names[j]);
-		//print_line("uniform "+String(uniform_names[j])+" location "+itos(v.uniform_location[j]));
-	}
-
-	// set texture uniforms
-	for (int i = 0; i < texunit_pair_count; i++) {
-
-		GLint loc = glGetUniformLocation(v.id, texunit_pairs[i].name);
-		if (loc >= 0)
-			glUniform1i(loc, texunit_pairs[i].index);
-	}
-
-	if (cc) {
-
-		v.custom_uniform_locations.resize(cc->custom_uniforms.size());
-		for (int i = 0; i < cc->custom_uniforms.size(); i++) {
-
-			v.custom_uniform_locations[i] = glGetUniformLocation(v.id, String(cc->custom_uniforms[i]).ascii().get_data());
-		}
-	}
-
-	glUseProgram(0);
-
-	v.ok = true;
-
-	return &v;
-}
-
-GLint ShaderGLES2::get_uniform_location(const String &p_name) const {
-
-	ERR_FAIL_COND_V(!version, -1);
-	return glGetUniformLocation(version->id, p_name.ascii().get_data());
-}
-
-void ShaderGLES2::setup(const char **p_conditional_defines, int p_conditional_count, const char **p_uniform_names, int p_uniform_count, const AttributePair *p_attribute_pairs, int p_attribute_count, const TexUnitPair *p_texunit_pairs, int p_texunit_pair_count, const char *p_vertex_code, const char *p_fragment_code, int p_vertex_code_start, int p_fragment_code_start) {
-
-	ERR_FAIL_COND(version);
-	conditional_version.key = 0;
-	new_conditional_version.key = 0;
-	uniform_count = p_uniform_count;
-	conditional_count = p_conditional_count;
-	conditional_defines = p_conditional_defines;
-	uniform_names = p_uniform_names;
-	vertex_code = p_vertex_code;
-	fragment_code = p_fragment_code;
-	texunit_pairs = p_texunit_pairs;
-	texunit_pair_count = p_texunit_pair_count;
-	vertex_code_start = p_vertex_code_start;
-	fragment_code_start = p_fragment_code_start;
-	attribute_pairs = p_attribute_pairs;
-	attribute_pair_count = p_attribute_count;
-
-	//split vertex and shader code (thank you, retarded shader compiler programmers from you know what company).
-	{
-		String globals_tag = "\nVERTEX_SHADER_GLOBALS";
-		String code_tag = "\nVERTEX_SHADER_CODE";
-		String code = vertex_code;
-		int cpos = code.find(globals_tag);
-		if (cpos == -1) {
-			vertex_code0 = code.ascii();
-		} else {
-			vertex_code0 = code.substr(0, cpos).ascii();
-			code = code.substr(cpos + globals_tag.length(), code.length());
-
-			cpos = code.find(code_tag);
-
-			if (cpos == -1) {
-				vertex_code1 = code.ascii();
-			} else {
-
-				vertex_code1 = code.substr(0, cpos).ascii();
-				vertex_code2 = code.substr(cpos + code_tag.length(), code.length()).ascii();
-			}
-		}
-	}
-
-	{
-		String globals_tag = "\nFRAGMENT_SHADER_GLOBALS";
-		String code_tag = "\nFRAGMENT_SHADER_CODE";
-		String light_code_tag = "\nLIGHT_SHADER_CODE";
-		String code = fragment_code;
-		int cpos = code.find(globals_tag);
-		if (cpos == -1) {
-			fragment_code0 = code.ascii();
-		} else {
-			fragment_code0 = code.substr(0, cpos).ascii();
-			code = code.substr(cpos + globals_tag.length(), code.length());
-
-			cpos = code.find(code_tag);
-
-			if (cpos == -1) {
-				fragment_code1 = code.ascii();
-			} else {
-
-				fragment_code1 = code.substr(0, cpos).ascii();
-				String code2 = code.substr(cpos + code_tag.length(), code.length());
-
-				cpos = code2.find(light_code_tag);
-				if (cpos == -1) {
-					fragment_code2 = code2.ascii();
-				} else {
-
-					fragment_code2 = code2.substr(0, cpos).ascii();
-					fragment_code3 = code2.substr(cpos + light_code_tag.length(), code2.length()).ascii();
-				}
-			}
-		}
-	}
-}
-
-void ShaderGLES2::finish() {
-
-	const VersionKey *V = NULL;
-	while ((V = version_map.next(V))) {
-
-		Version &v = version_map[*V];
-		glDeleteShader(v.vert_id);
-		glDeleteShader(v.frag_id);
-		glDeleteProgram(v.id);
-		memdelete_arr(v.uniform_location);
-	}
-}
-
-void ShaderGLES2::clear_caches() {
-
-	const VersionKey *V = NULL;
-	while ((V = version_map.next(V))) {
-
-		Version &v = version_map[*V];
-		glDeleteShader(v.vert_id);
-		glDeleteShader(v.frag_id);
-		glDeleteProgram(v.id);
-		memdelete_arr(v.uniform_location);
-	}
-
-	version_map.clear();
-
-	custom_code_map.clear();
-	version = NULL;
-	last_custom_code = 1;
-	uniforms_dirty = true;
-}
-
-uint32_t ShaderGLES2::create_custom_shader() {
-
-	custom_code_map[last_custom_code] = CustomCode();
-	custom_code_map[last_custom_code].version = 1;
-	return last_custom_code++;
-}
-
-void ShaderGLES2::set_custom_shader_code(uint32_t p_code_id, const String &p_vertex, const String &p_vertex_globals, const String &p_fragment, const String &p_light, const String &p_fragment_globals, const Vector<StringName> &p_uniforms, const Vector<const char *> &p_custom_defines) {
-
-	ERR_FAIL_COND(!custom_code_map.has(p_code_id));
-	CustomCode *cc = &custom_code_map[p_code_id];
-
-	cc->vertex = p_vertex;
-	cc->vertex_globals = p_vertex_globals;
-	cc->fragment = p_fragment;
-	cc->fragment_globals = p_fragment_globals;
-	cc->light = p_light;
-	cc->custom_uniforms = p_uniforms;
-	cc->custom_defines = p_custom_defines;
-	cc->version++;
-}
-
-void ShaderGLES2::set_custom_shader(uint32_t p_code_id) {
-
-	new_conditional_version.code_version = p_code_id;
-}
-
-void ShaderGLES2::free_custom_shader(uint32_t p_code_id) {
-
-	/*  if (! custom_code_map.has( p_code_id )) {
-        print_line("no code id "+itos(p_code_id));
-    } else {
-        print_line("freed code id "+itos(p_code_id));
-
-    }*/
-
-	ERR_FAIL_COND(!custom_code_map.has(p_code_id));
-	if (conditional_version.code_version == p_code_id)
-		conditional_version.code_version = 0; //bye
-
-	custom_code_map.erase(p_code_id);
-}
-
-ShaderGLES2::ShaderGLES2() {
-	version = NULL;
-	last_custom_code = 1;
-	uniforms_dirty = true;
-}
-
-ShaderGLES2::~ShaderGLES2() {
-
-	finish();
-}
-
-#endif

drivers/gles2/shader_gles2.h

@@ -1,359 +0,0 @@
-/*************************************************************************/
-/*  shader_gles2.h                                                       */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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 SHADER_GLES2_H
-#define SHADER_GLES2_H
-
-#ifdef GLES2_ENABLED
-
-#include "platform_config.h"
-#ifndef GLES2_INCLUDE_H
-#include <GLES2/gl2.h>
-#else
-#include GLES2_INCLUDE_H
-#endif
-
-#include "camera_matrix.h"
-#include "hash_map.h"
-#include "map.h"
-#include "variant.h"
-
-/**
-	@author Juan Linietsky <[email protected]>
-*/
-
-class ShaderGLES2 {
-protected:
-	struct Enum {
-
-		uint64_t mask;
-		uint64_t shift;
-		const char *defines[16];
-	};
-
-	struct EnumValue {
-
-		uint64_t set_mask;
-		uint64_t clear_mask;
-	};
-
-	struct AttributePair {
-
-		const char *name;
-		int index;
-	};
-
-	struct UniformPair {
-		const char *name;
-		Variant::Type type_hint;
-	};
-
-	struct TexUnitPair {
-
-		const char *name;
-		int index;
-	};
-
-	bool uniforms_dirty;
-
-private:
-	//@TODO Optimize to a fixed set of shader pools and use a LRU
-	int uniform_count;
-	int texunit_pair_count;
-	int conditional_count;
-	int vertex_code_start;
-	int fragment_code_start;
-	int attribute_pair_count;
-
-	struct CustomCode {
-
-		String vertex;
-		String vertex_globals;
-		String fragment;
-		String fragment_globals;
-		String light;
-		uint32_t version;
-		Vector<StringName> custom_uniforms;
-		Vector<const char *> custom_defines;
-	};
-
-	struct Version {
-
-		GLuint id;
-		GLuint vert_id;
-		GLuint frag_id;
-		GLint *uniform_location;
-		Vector<GLint> custom_uniform_locations;
-		uint32_t code_version;
-		bool ok;
-		Version() {
-			code_version = 0;
-			ok = false;
-			uniform_location = NULL;
-		}
-	};
-
-	Version *version;
-
-	union VersionKey {
-
-		struct {
-			uint32_t version;
-			uint32_t code_version;
-		};
-		uint64_t key;
-		bool operator==(const VersionKey &p_key) const { return key == p_key.key; }
-		bool operator<(const VersionKey &p_key) const { return key < p_key.key; }
-	};
-
-	struct VersionKeyHash {
-
-		static _FORCE_INLINE_ uint32_t hash(const VersionKey &p_key) { return HashMapHasherDefault::hash(p_key.key); };
-	};
-
-	//this should use a way more cachefriendly version..
-	HashMap<VersionKey, Version, VersionKeyHash> version_map;
-
-	HashMap<uint32_t, CustomCode> custom_code_map;
-	uint32_t last_custom_code;
-
-	VersionKey conditional_version;
-	VersionKey new_conditional_version;
-
-	virtual String get_shader_name() const = 0;
-
-	const char **conditional_defines;
-	const char **uniform_names;
-	const AttributePair *attribute_pairs;
-	const TexUnitPair *texunit_pairs;
-	const char *vertex_code;
-	const char *fragment_code;
-	CharString fragment_code0;
-	CharString fragment_code1;
-	CharString fragment_code2;
-	CharString fragment_code3;
-
-	CharString vertex_code0;
-	CharString vertex_code1;
-	CharString vertex_code2;
-
-	Version *get_current_version();
-
-	static ShaderGLES2 *active;
-
-	_FORCE_INLINE_ void _set_uniform_variant(GLint p_uniform, const Variant &p_value) {
-
-		if (p_uniform < 0)
-			return; // do none
-		switch (p_value.get_type()) {
-
-			case Variant::BOOL:
-			case Variant::INT: /* {
-
-			int val=p_value;
-			glUniform1i( p_uniform, val );
-		} break; */
-			case Variant::REAL: {
-
-				real_t val = p_value;
-				glUniform1f(p_uniform, val);
-			} break;
-			case Variant::COLOR: {
-
-				Color val = p_value;
-				glUniform4f(p_uniform, val.r, val.g, val.b, val.a);
-			} break;
-			case Variant::VECTOR2: {
-
-				Vector2 val = p_value;
-				glUniform2f(p_uniform, val.x, val.y);
-			} break;
-			case Variant::VECTOR3: {
-
-				Vector3 val = p_value;
-				glUniform3f(p_uniform, val.x, val.y, val.z);
-			} break;
-			case Variant::PLANE: {
-
-				Plane val = p_value;
-				glUniform4f(p_uniform, val.normal.x, val.normal.y, val.normal.z, val.d);
-			} break;
-			case Variant::QUAT: {
-
-				Quat val = p_value;
-				glUniform4f(p_uniform, val.x, val.y, val.z, val.w);
-			} break;
-
-			case Variant::MATRIX32: {
-
-				Transform2D tr = p_value;
-				GLfloat matrix[16] = { /* build a 16x16 matrix */
-					tr.elements[0][0],
-					tr.elements[0][1],
-					0,
-					0,
-					tr.elements[1][0],
-					tr.elements[1][1],
-					0,
-					0,
-					0,
-					0,
-					1,
-					0,
-					tr.elements[2][0],
-					tr.elements[2][1],
-					0,
-					1
-				};
-
-				glUniformMatrix4fv(p_uniform, 1, false, matrix);
-
-			} break;
-			case Variant::MATRIX3:
-			case Variant::TRANSFORM: {
-
-				Transform tr = p_value;
-				GLfloat matrix[16] = { /* build a 16x16 matrix */
-					tr.basis.elements[0][0],
-					tr.basis.elements[1][0],
-					tr.basis.elements[2][0],
-					0,
-					tr.basis.elements[0][1],
-					tr.basis.elements[1][1],
-					tr.basis.elements[2][1],
-					0,
-					tr.basis.elements[0][2],
-					tr.basis.elements[1][2],
-					tr.basis.elements[2][2],
-					0,
-					tr.origin.x,
-					tr.origin.y,
-					tr.origin.z,
-					1
-				};
-
-				glUniformMatrix4fv(p_uniform, 1, false, matrix);
-			} break;
-			default: { ERR_FAIL(); } // do nothing
-		}
-	}
-
-	Map<uint32_t, Variant> uniform_defaults;
-	Map<uint32_t, CameraMatrix> uniform_cameras;
-
-protected:
-	_FORCE_INLINE_ int _get_uniform(int p_which) const;
-	_FORCE_INLINE_ void _set_conditional(int p_which, bool p_value);
-
-	void setup(const char **p_conditional_defines, int p_conditional_count, const char **p_uniform_names, int p_uniform_count, const AttributePair *p_attribute_pairs, int p_attribute_count, const TexUnitPair *p_texunit_pairs, int p_texunit_pair_count, const char *p_vertex_code, const char *p_fragment_code, int p_vertex_code_start, int p_fragment_code_start);
-
-	ShaderGLES2();
-
-public:
-	enum {
-		CUSTOM_SHADER_DISABLED = 0
-	};
-
-	GLint get_uniform_location(const String &p_name) const;
-	GLint get_uniform_location(int p_index) const;
-
-	static _FORCE_INLINE_ ShaderGLES2 *get_active() { return active; };
-	bool bind();
-	void unbind();
-	void bind_uniforms();
-
-	inline GLuint get_program() const { return version ? version->id : 0; }
-
-	void clear_caches();
-
-	uint32_t create_custom_shader();
-	void set_custom_shader_code(uint32_t p_code_id, const String &p_vertex, const String &p_vertex_globals, const String &p_fragment, const String &p_light, const String &p_fragment_globals, const Vector<StringName> &p_uniforms, const Vector<const char *> &p_custom_defines);
-	void set_custom_shader(uint32_t p_code_id);
-	void free_custom_shader(uint32_t p_code_id);
-
-	void set_uniform_default(int p_idx, const Variant &p_value) {
-
-		if (p_value.get_type() == Variant::NIL) {
-
-			uniform_defaults.erase(p_idx);
-		} else {
-
-			uniform_defaults[p_idx] = p_value;
-		}
-		uniforms_dirty = true;
-	};
-
-	uint32_t get_version() const { return new_conditional_version.version; }
-
-	void set_uniform_camera(int p_idx, const CameraMatrix &p_mat) {
-
-		uniform_cameras[p_idx] = p_mat;
-		uniforms_dirty = true;
-	};
-
-	_FORCE_INLINE_ void set_custom_uniform(int p_idx, const Variant &p_value) {
-
-		ERR_FAIL_COND(!version);
-		ERR_FAIL_INDEX(p_idx, version->custom_uniform_locations.size());
-		_set_uniform_variant(version->custom_uniform_locations[p_idx], p_value);
-	}
-
-	_FORCE_INLINE_ GLint get_custom_uniform_location(int p_idx) {
-
-		ERR_FAIL_COND_V(!version, -1);
-		ERR_FAIL_INDEX_V(p_idx, version->custom_uniform_locations.size(), -1);
-		return version->custom_uniform_locations[p_idx];
-	}
-
-	virtual void init() = 0;
-	void finish();
-
-	virtual ~ShaderGLES2();
-};
-
-// called a lot, made inline
-
-int ShaderGLES2::_get_uniform(int p_which) const {
-
-	ERR_FAIL_INDEX_V(p_which, uniform_count, -1);
-	ERR_FAIL_COND_V(!version, -1);
-	return version->uniform_location[p_which];
-}
-
-void ShaderGLES2::_set_conditional(int p_which, bool p_value) {
-
-	ERR_FAIL_INDEX(p_which, conditional_count);
-	if (p_value)
-		new_conditional_version.version |= (1 << p_which);
-	else
-		new_conditional_version.version &= ~(1 << p_which);
-}
-
-#endif
-#endif

drivers/gles2/shaders/SCsub

@@ -1,12 +0,0 @@
-#!/usr/bin/env python
-
-Import('env')
-
-if env['BUILDERS'].has_key('GLSL120GLES'):
-    env.GLSL120GLES('material.glsl')
-    env.GLSL120GLES('canvas.glsl')
-    env.GLSL120GLES('canvas_shadow.glsl')
-    env.GLSL120GLES('blur.glsl')
-    env.GLSL120GLES('copy.glsl')
-
-Export('env')

drivers/gles2/shaders/blur.glsl

@@ -1,51 +0,0 @@
-[vertex]
-
-#ifdef USE_GLES_OVER_GL
-#define mediump
-#define highp
-#else
-precision mediump float;
-precision mediump int;
-#endif
-
-attribute highp vec4 vertex_attrib; // attrib:0
-attribute vec2 uv_in; // attrib:4
-
-varying vec2 uv_out;
-
-
-
-void main() {
-
-        color_interp = color_attrib;
-        uv_interp = uv_attrib;
-        vec4 outvec = vec4(vertex, 1.0);
-        outvec = extra_matrix * outvec;
-        outvec = modelview_matrix * outvec;
-        gl_Position = projection_matrix * outvec;
-}
-
-[fragment]
-
-#ifdef USE_GLES_OVER_GL
-#define mediump
-#define highp
-#else
-precision mediump float;
-precision mediump int;
-#endif
-
- // texunit:0
-uniform sampler2D texture;
-varying vec2 uv_out;
-
-
-void main() {
-
-        vec4 color = color_interp;
-
-        color *= texture2D( texture,  uv_interp );
-
-        gl_FragColor = color;
-}
-

drivers/gles2/shaders/canvas.glsl

@@ -1,391 +0,0 @@
-[vertex]
-
-#ifdef USE_GLES_OVER_GL
-#define mediump
-#define highp
-#else
-precision mediump float;
-precision mediump int;
-#endif
-
-uniform highp mat4 projection_matrix;
-uniform highp mat4 modelview_matrix;
-uniform highp mat4 extra_matrix;
-attribute highp vec3 vertex; // attrib:0
-attribute vec4 color_attrib; // attrib:3
-attribute highp vec2 uv_attrib; // attrib:4
-
-varying vec2 uv_interp;
-varying vec4 color_interp;
-
-#if defined(USE_TIME)
-uniform float time;
-#endif
-
-
-#ifdef USE_LIGHTING
-
-uniform highp mat4 light_matrix;
-uniform highp mat4 light_local_matrix;
-uniform vec2 light_pos;
-varying vec4 light_uv_interp;
-
-varying vec4 local_rot;
-uniform vec2 normal_flip;
-
-#ifdef USE_SHADOWS
-varying highp vec2 pos;
-#endif
-
-#endif
-
-#if defined(ENABLE_VAR1_INTERP)
-varying vec4 var1_interp;
-#endif
-
-#if defined(ENABLE_VAR2_INTERP)
-varying vec4 var2_interp;
-#endif
-
-//uniform bool snap_pixels;
-
-VERTEX_SHADER_GLOBALS
-
-void main() {
-
-	color_interp = color_attrib;
-	uv_interp = uv_attrib;		
-        highp vec4 outvec = vec4(vertex, 1.0);
-{
-        vec2 src_vtx=outvec.xy;
-VERTEX_SHADER_CODE
-
-}
-#if !defined(USE_WORLD_VEC)
-        outvec = extra_matrix * outvec;
-        outvec = modelview_matrix * outvec;
-#endif
-
-
-
-#ifdef USE_PIXEL_SNAP
-
-	outvec.xy=floor(outvec.xy+0.5);
-#endif
-
-
-	gl_Position = projection_matrix * outvec;
-
-#ifdef USE_LIGHTING
-
-	light_uv_interp.xy = (light_matrix * outvec).xy;
-	light_uv_interp.zw =(light_local_matrix * outvec).xy;
-#ifdef USE_SHADOWS
-	pos=outvec.xy;
-#endif
-
-	local_rot.xy=normalize( (modelview_matrix * ( extra_matrix * vec4(1.0,0.0,0.0,0.0) )).xy  )*normal_flip.x;
-	local_rot.zw=normalize( (modelview_matrix * ( extra_matrix * vec4(0.0,1.0,0.0,0.0) )).xy  )*normal_flip.y;
-
-#endif
-
-}
-
-[fragment]
-
-#ifdef USE_GLES_OVER_GL
-#define mediump
-#define highp
-#else
-precision mediump float;
-precision mediump int;
-#endif
-
-
-uniform sampler2D texture; // texunit:0
-uniform sampler2D normal_texture; // texunit:0
-
-varying vec2 uv_interp;
-varying vec4 color_interp;
-
-#ifdef MOMO
-
-#endif
-
-#if defined(ENABLE_SCREEN_UV)
-
-uniform vec2 screen_uv_mult;
-
-#endif
-
-#if defined(ENABLE_TEXSCREEN)
-
-uniform vec2 texscreen_screen_mult;
-uniform vec4 texscreen_screen_clamp;
-uniform sampler2D texscreen_tex;
-
-#endif
-
-
-#if defined(ENABLE_VAR1_INTERP)
-varying vec4 var1_interp;
-#endif
-
-#if defined(ENABLE_VAR2_INTERP)
-varying vec4 var2_interp;
-#endif
-
-#if defined(USE_TIME)
-uniform float time;
-#endif
-
-#ifdef USE_MODULATE
-
-uniform vec4 modulate;
-
-#endif
-
-#ifdef USE_LIGHTING
-
-uniform sampler2D light_texture;
-uniform vec4 light_color;
-uniform vec4 light_shadow_color;
-uniform float light_height;
-varying vec4 light_uv_interp;
-uniform float light_outside_alpha;
-
-varying vec4 local_rot;
-
-#ifdef USE_SHADOWS
-
-uniform highp sampler2D shadow_texture;
-uniform float shadow_attenuation;
-
-uniform highp mat4 shadow_matrix;
-varying highp vec2 pos;
-uniform float shadowpixel_size;
-
-#ifdef SHADOW_ESM
-uniform float shadow_esm_multiplier;
-#endif
-
-#endif
-
-#endif
-
-#if defined(USE_TEXPIXEL_SIZE)
-uniform vec2 texpixel_size;
-#endif
-
-
-FRAGMENT_SHADER_GLOBALS
-
-
-void main() {
-
-	vec4 color = color_interp;
-
-#ifdef USE_DISTANCE_FIELD
-	const float smoothing = 1.0/32.0;
-	float distance = textureLod(texture, uv_interp,0.0).a;
-	color.a = smoothstep(0.5 - smoothing, 0.5 + smoothing, distance) * color.a;
-#else
-	color *= texture2D( texture,  uv_interp );
-
-#endif
-
-	vec3 normal;
-	normal.xy = textureLod( normal_texture,  uv_interp, 0.0 ).xy * 2.0 - 1.0;
-	normal.z = sqrt(1.0-dot(normal.xy,normal.xy));
-
-#if defined(ENABLE_SCREEN_UV)
-	vec2 screen_uv = gl_FragCoord.xy*screen_uv_mult;
-#endif
-
-
-{
-#if defined(USE_NORMALMAP)
-	vec3 normal_map=vec3(0.0,0.0,1.0);
-	float normal_depth=1.0;
-#endif
-
-FRAGMENT_SHADER_CODE
-
-#if defined(USE_NORMALMAP)
-	normal = mix(vec3(0.0,0.0,1.0), normal_map * vec3(2.0,-2.0,1.0) - vec3( 1.0, -1.0, 0.0 ), normal_depth );
-#endif
-
-}
-#ifdef DEBUG_ENCODED_32
-	highp float enc32 = dot( color,highp vec4(1.0 / (256.0 * 256.0 * 256.0),1.0 / (256.0 * 256.0),1.0 / 256.0,1)  );
-	color = vec4(vec3(enc32),1.0);
-#endif
-
-#ifdef USE_MODULATE
-
-	color*=modulate;
-#endif
-
-
-#ifdef USE_LIGHTING
-
-	vec2 light_vec = light_uv_interp.zw;; //for shadow and normal mapping
-
-	normal.xy =  mat2(local_rot.xy,local_rot.zw) * normal.xy;
-
-	float att=1.0;
-
-	vec2 light_uv = light_uv_interp.xy;
-	vec4 light = texture2D(light_texture,light_uv) * light_color;
-#if defined(USE_OUTPUT_SHADOW_COLOR)
-	vec4 shadow_color=vec4(0.0,0.0,0.0,0.0);
-#endif
-
-	if (any(lessThan(light_uv_interp.xy,vec2(0.0,0.0))) || any(greaterThanEqual(light_uv_interp.xy,vec2(1.0,1.0)))) {
-		color.a*=light_outside_alpha; //invisible
-
-	} else {
-
-#if defined(USE_LIGHT_SHADER_CODE)
-//light is written by the light shader
-		{
-			vec4 light_out=light*color;
-LIGHT_SHADER_CODE
-			color=light_out;
-		}
-
-#else
-
-		vec3 light_normal = normalize(vec3(light_vec,-light_height));
-		light*=max(dot(-light_normal,normal),0.0);
-
-		color*=light;
-/*
-#ifdef USE_NORMAL
-	color.xy=local_rot.xy;//normal.xy;
-	color.zw=vec2(0.0,1.0);
-#endif
-*/
-
-//light shader code
-#endif
-
-
-#ifdef USE_SHADOWS
-
-		float angle_to_light = -atan(light_vec.x,light_vec.y);
-		float PI = 3.14159265358979323846264;
-		/*int i = int(mod(floor((angle_to_light+7.0*PI/6.0)/(4.0*PI/6.0))+1.0, 3.0)); // +1 pq os indices estao em ordem 2,0,1 nos arrays
-		float ang*/
-
-		float su,sz;
-
-		float abs_angle = abs(angle_to_light);
-		vec2 point;
-		float sh;
-		if (abs_angle<45.0*PI/180.0) {
-			point = light_vec;
-			sh=0.0+(1.0/8.0);
-		} else if (abs_angle>135.0*PI/180.0) {
-			point = -light_vec;
-			sh = 0.5+(1.0/8.0);
-		} else if (angle_to_light>0.0) {
-
-			point = vec2(light_vec.y,-light_vec.x);
-			sh = 0.25+(1.0/8.0);
-		} else {
-
-			point = vec2(-light_vec.y,light_vec.x);
-			sh = 0.75+(1.0/8.0);
-
-		}
-
-
-		highp vec4 s = shadow_matrix * vec4(point,0.0,1.0);
-		s.xyz/=s.w;
-		su=s.x*0.5+0.5;
-		sz=s.z*0.5+0.5;
-
-		highp float shadow_attenuation=0.0;
-
-#ifdef USE_DEPTH_SHADOWS
-
-#define SHADOW_DEPTH(m_tex,m_uv) (texture2D((m_tex),(m_uv)).r)
-
-#else
-
-//#define SHADOW_DEPTH(m_tex,m_uv) dot(texture2D((m_tex),(m_uv)),highp vec4(1.0 / (256.0 * 256.0 * 256.0),1.0 / (256.0 * 256.0),1.0 / 256.0,1)  )
-#define SHADOW_DEPTH(m_tex,m_uv) dot(texture2D((m_tex),(m_uv)),vec4(1.0 / (256.0 * 256.0 * 256.0),1.0 / (256.0 * 256.0),1.0 / 256.0,1)  )
-
-#endif
-
-
-
-#ifdef SHADOW_PCF5
-
-		shadow_attenuation += SHADOW_DEPTH(shadow_texture,vec2(su,sh))<sz?0.0:1.0;
-		shadow_attenuation += SHADOW_DEPTH(shadow_texture,vec2(su+shadowpixel_size,sh))<sz?0.0:1.0;
-		shadow_attenuation += SHADOW_DEPTH(shadow_texture,vec2(su+shadowpixel_size*2.0,sh))<sz?0.0:1.0;
-		shadow_attenuation += SHADOW_DEPTH(shadow_texture,vec2(su-shadowpixel_size,sh))<sz?0.0:1.0;
-		shadow_attenuation += SHADOW_DEPTH(shadow_texture,vec2(su-shadowpixel_size*2.0,sh))<sz?0.0:1.0;
-		shadow_attenuation/=5.0;
-
-#endif
-
-#ifdef SHADOW_PCF13
-
-		shadow_attenuation += SHADOW_DEPTH(shadow_texture,vec2(su,sh))<sz?0.0:1.0;
-		shadow_attenuation += SHADOW_DEPTH(shadow_texture,vec2(su+shadowpixel_size,sh))<sz?0.0:1.0;
-		shadow_attenuation += SHADOW_DEPTH(shadow_texture,vec2(su+shadowpixel_size*2.0,sh))<sz?0.0:1.0;
-		shadow_attenuation += SHADOW_DEPTH(shadow_texture,vec2(su+shadowpixel_size*3.0,sh))<sz?0.0:1.0;
-		shadow_attenuation += SHADOW_DEPTH(shadow_texture,vec2(su+shadowpixel_size*4.0,sh))<sz?0.0:1.0;
-		shadow_attenuation += SHADOW_DEPTH(shadow_texture,vec2(su+shadowpixel_size*5.0,sh))<sz?0.0:1.0;
-		shadow_attenuation += SHADOW_DEPTH(shadow_texture,vec2(su+shadowpixel_size*6.0,sh))<sz?0.0:1.0;
-		shadow_attenuation += SHADOW_DEPTH(shadow_texture,vec2(su-shadowpixel_size*2.0,sh))<sz?0.0:1.0;
-		shadow_attenuation += SHADOW_DEPTH(shadow_texture,vec2(su-shadowpixel_size*3.0,sh))<sz?0.0:1.0;
-		shadow_attenuation += SHADOW_DEPTH(shadow_texture,vec2(su-shadowpixel_size*4.0,sh))<sz?0.0:1.0;
-		shadow_attenuation += SHADOW_DEPTH(shadow_texture,vec2(su-shadowpixel_size*5.0,sh))<sz?0.0:1.0;
-		shadow_attenuation += SHADOW_DEPTH(shadow_texture,vec2(su-shadowpixel_size*6.0,sh))<sz?0.0:1.0;
-		shadow_attenuation/=13.0;
-
-#endif
-
-#ifdef SHADOW_ESM
-
-
-	{
-			float unnormalized = su/shadowpixel_size;
-			float fractional = fract(unnormalized);
-			unnormalized = floor(unnormalized);
-			float zc = SHADOW_DEPTH(shadow_texture,vec2((unnormalized-0.5)*shadowpixel_size,sh));
-			float zn = SHADOW_DEPTH(shadow_texture,vec2((unnormalized+0.5)*shadowpixel_size,sh));
-			float z = mix(zc,zn,fractional);
-			shadow_attenuation=clamp(exp(shadow_esm_multiplier* ( z - sz )),0.0,1.0);
-	}
-
-#endif
-
-#if !defined(SHADOW_PCF5) && !defined(SHADOW_PCF13) && !defined(SHADOW_ESM)
-
-		shadow_attenuation = SHADOW_DEPTH(shadow_texture,vec2(su+shadowpixel_size,sh))<sz?0.0:1.0;
-
-#endif
-
-#if defined(USE_OUTPUT_SHADOW_COLOR)
-	color=mix(shadow_color,color,shadow_attenuation);
-#else
-	//color*=shadow_attenuation;
-	color=mix(light_shadow_color,color,shadow_attenuation);
-#endif
-//use shadows
-#endif
-	}
-
-//use lighting
-#endif
-	//color.rgb*=color.a;
-	gl_FragColor = color;
-
-
-}
-

drivers/gles2/shaders/canvas_shadow.glsl

@@ -1,62 +0,0 @@
-[vertex]
-
-#ifdef USE_GLES_OVER_GL
-#define mediump
-#define highp
-#else
-precision mediump float;
-precision mediump int;
-#endif
-
-uniform highp mat4 projection_matrix;
-uniform highp mat4 light_matrix;
-uniform highp mat4 world_matrix;
-
-attribute highp vec3 vertex; // attrib:0
-
-#ifndef USE_DEPTH_SHADOWS
-
-varying vec4 position_interp;
-
-#endif
-
-
-void main() {
-
-	gl_Position = projection_matrix * (light_matrix * (world_matrix *  vec4(vertex,1.0)));
-
-#ifndef USE_DEPTH_SHADOWS
-	position_interp = gl_Position;
-#endif
-
-}
-
-[fragment]
-
-#ifdef USE_GLES_OVER_GL
-#define mediump
-#define highp
-#else
-precision mediump float;
-precision mediump int;
-#endif
-
-#ifndef USE_DEPTH_SHADOWS
-
-varying vec4 position_interp;
-
-#endif
-
-void main() {
-
-#ifdef USE_DEPTH_SHADOWS
-
-#else
-	highp float depth = ((position_interp.z / position_interp.w) + 1.0) * 0.5 + 0.0;//bias;
-	highp vec4 comp = fract(depth * vec4(256.0 * 256.0 * 256.0, 256.0 * 256.0, 256.0, 1.0));
-	comp -= comp.xxyz * vec4(0, 1.0 / 256.0, 1.0 / 256.0, 1.0 / 256.0);
-	gl_FragColor = comp;
-#endif
-
-}
-

drivers/gles2/shaders/copy.glsl

@@ -1,557 +0,0 @@
-[vertex]
-
-#ifdef USE_GLES_OVER_GL
-#define mediump
-#define highp
-#else
-precision mediump float;
-precision mediump int;
-#endif
-
-attribute highp vec4 vertex_attrib; // attrib:0
-#ifdef USE_CUBEMAP
-attribute vec3 cube_in; // attrib:4
-#else
-attribute vec2 uv_in; // attrib:4
-#endif
-attribute vec2 uv2_in; // attrib:5
-
-
-#ifdef USE_CUBEMAP
-varying vec3 cube_interp;
-#else
-varying vec2 uv_interp;
-#endif
-
-varying vec2 uv2_interp;
-
-void main() {
-
-#ifdef USE_CUBEMAP
-	cube_interp = cube_in;
-#else
-	uv_interp = uv_in;
-#endif
-	uv2_interp = uv2_in;
-	gl_Position = vertex_attrib;
-}
-
-[fragment]
-
-#ifdef USE_GLES_OVER_GL
-#define mediump
-#define highp
-#else
-precision mediump float;
-precision mediump int;
-#endif
-
-
-
-float sRGB_gamma_correct(float c){
-    float a = 0.055;
-    if(c < 0.0031308)
-	return 12.92*c;
-    else
-	return (1.0+a)*pow(c, 1.0/2.4) - a;
-}
-
-#define LUM_RANGE 4.0
-
-
-#ifdef USE_ARRAY
-uniform sampler2DArray source;
-#elif defined(USE_CUBEMAP)
-varying vec3 cube_interp;
-uniform samplerCube source_cube;
-#else
-varying vec2 uv_interp;
-#ifdef HIGHP_SOURCE
-uniform highp sampler2D source;
-#else
-uniform sampler2D source;
-#endif
-#endif
-varying vec2 uv2_interp;
-
-
-#ifdef USE_DEPTH
-uniform highp sampler2D source_depth; //texunit:1
-#endif
-
-#ifdef USE_GLOW
-
-uniform sampler2D glow_source;
-
-#endif
-
-
-#if defined(USE_HDR) && defined(USE_GLOW_COPY)
-uniform highp float hdr_glow_threshold;
-uniform highp float hdr_glow_scale;
-#endif
-
-#ifdef USE_HDR
-
-uniform sampler2D hdr_source;
-uniform highp float tonemap_exposure;
-uniform highp float tonemap_white;
-#endif
-
-#ifdef USE_BCS
-
-uniform vec3 bcs;
-
-#endif
-
-#ifdef USE_GLOW_COPY
-
-uniform float bloom;
-uniform float bloom_threshold;
-
-#endif
-
-#if defined(SHADOW_BLUR_V_PASS) || defined(SHADOW_BLUR_H_PASS) || defined(BLUR_V_PASS) || defined(BLUR_H_PASS) || defined(USE_HDR_REDUCE)
-
-uniform vec2 pixel_size;
-uniform float pixel_scale;
-uniform float blur_magnitude;
-
-#ifdef USE_HDR_STORE
-
-uniform highp float hdr_time_delta;
-uniform highp float hdr_exp_adj_speed;
-uniform highp float min_luminance;
-uniform highp float max_luminance;
-uniform sampler2D source_vd_lum;
-
-#endif
-
-//endif
-#elif defined(USE_FXAA)
-
-uniform vec2 pixel_size;
-
-#endif
-
-#ifdef USE_ENERGY
-
-uniform highp float energy;
-
-#endif
-
-#ifdef USE_CUSTOM_ALPHA
-uniform float custom_alpha;
-#endif
-
-
-void main() {
-
-	//vec4 color = color_interp;
-
-
-#ifdef USE_ARRAY
-	highp vec4 color = textureLod( source,  vec3(uv_interp,0.0),0.0 );
-#elif defined(USE_CUBEMAP)
-	highp vec4 color = textureCube( source_cube,  normalize(cube_interp) );
-
-#else
-	highp vec4 color = texture2D( source,  uv_interp );
-#endif
-
-
-
-#endif
-
-#ifdef USE_FXAA
-
-#define FXAA_REDUCE_MIN   (1.0/ 128.0)
-#define FXAA_REDUCE_MUL   (1.0 / 8.0)
-#define FXAA_SPAN_MAX     8.0
-
-	{
-		vec3 rgbNW = texture2D(source, uv_interp + vec2(-1.0, -1.0) * pixel_size).xyz;
-		vec3 rgbNE = texture2D(source, uv_interp + vec2(1.0, -1.0) * pixel_size).xyz;
-		vec3 rgbSW = texture2D(source, uv_interp + vec2(-1.0, 1.0) * pixel_size).xyz;
-		vec3 rgbSE = texture2D(source, uv_interp + vec2(1.0, 1.0) * pixel_size).xyz;
-		vec3 rgbM  = color.rgb;
-		vec3 luma = vec3(0.299, 0.587, 0.114);
-		float lumaNW = dot(rgbNW, luma);
-		float lumaNE = dot(rgbNE, luma);
-		float lumaSW = dot(rgbSW, luma);
-		float lumaSE = dot(rgbSE, luma);
-		float lumaM  = dot(rgbM,  luma);
-		float lumaMin = min(lumaM, min(min(lumaNW, lumaNE), min(lumaSW, lumaSE)));
-			float lumaMax = max(lumaM, max(max(lumaNW, lumaNE), max(lumaSW, lumaSE)));
-
-		 vec2 dir;
-		 dir.x = -((lumaNW + lumaNE) - (lumaSW + lumaSE));
-		 dir.y =  ((lumaNW + lumaSW) - (lumaNE + lumaSE));
-
-		 float dirReduce = max((lumaNW + lumaNE + lumaSW + lumaSE) *
-				       (0.25 * FXAA_REDUCE_MUL), FXAA_REDUCE_MIN);
-
-		 float rcpDirMin = 1.0 / (min(abs(dir.x), abs(dir.y)) + dirReduce);
-		 dir = min(vec2(FXAA_SPAN_MAX, FXAA_SPAN_MAX),
-			   max(vec2(-FXAA_SPAN_MAX, -FXAA_SPAN_MAX),
-			   dir * rcpDirMin)) * pixel_size;
-
-		 vec3 rgbA = 0.5 * (
-		     texture2D(source, uv_interp + dir * (1.0 / 3.0 - 0.5)).xyz +
-		     texture2D(source, uv_interp + dir * (2.0 / 3.0 - 0.5)).xyz);
-		 vec3 rgbB = rgbA * 0.5 + 0.25 * (
-		     texture2D(source, uv_interp + dir * -0.5).xyz +
-		     texture2D(source, uv_interp + dir * 0.5).xyz);
-
-		 float lumaB = dot(rgbB, luma);
-		 if ((lumaB < lumaMin) || (lumaB > lumaMax))
-		     color.rgb = rgbA;
-		 else
-		     color.rgb = rgbB;
-	}
-
-#endif
-	//color.rg=uv_interp;
-
-#ifdef USE_BCS
-
-	color.rgb = mix(vec3(0.0),color.rgb,bcs.x);
-	color.rgb = mix(vec3(0.5),color.rgb,bcs.y);
-	color.rgb = mix(vec3(dot(vec3(1.0),color.rgb)*0.33333),color.rgb,bcs.z);
-
-#endif
-
-#ifdef BLUR_V_PASS
-
-	color+=texture2D(source,uv_interp+vec2(0.0,pixel_size.y*-3.0)*pixel_scale);
-	color+=texture2D(source,uv_interp+vec2(0.0,pixel_size.y*-2.0)*pixel_scale);
-	color+=texture2D(source,uv_interp+vec2(0.0,pixel_size.y*-1.0)*pixel_scale);
-	color+=texture2D(source,uv_interp+vec2(0.0,pixel_size.y*1.0)*pixel_scale);
-	color+=texture2D(source,uv_interp+vec2(0.0,pixel_size.y*2.0)*pixel_scale);
-	color+=texture2D(source,uv_interp+vec2(0.0,pixel_size.y*3.0)*pixel_scale);
-
-	color*=(1.0/7.0)*blur_magnitude;
-
-#endif
-
-#ifdef BLUR_H_PASS
-
-
-	color+=texture2D(source,uv_interp+vec2(pixel_size.x*-3.0,0.0)*pixel_scale);
-	color+=texture2D(source,uv_interp+vec2(pixel_size.x*-2.0,0.0)*pixel_scale);
-	color+=texture2D(source,uv_interp+vec2(pixel_size.x*-1.0,0.0)*pixel_scale);
-	color+=texture2D(source,uv_interp+vec2(pixel_size.x*1.0,0.0)*pixel_scale);
-	color+=texture2D(source,uv_interp+vec2(pixel_size.x*2.0,0.0)*pixel_scale);
-	color+=texture2D(source,uv_interp+vec2(pixel_size.x*3.0,0.0)*pixel_scale);
-
-	color*=(1.0/7.0)*blur_magnitude;
-
-#endif
-
-#ifdef SHADOW_BLUR_V_PASS
-
-#ifdef USE_RGBA_DEPTH
-
-#define VEC42DEPTH(m_vec4) dot(m_vec4,vec4(1.0 / (256.0 * 256.0 * 256.0),1.0 / (256.0 * 256.0),1.0 / 256.0,1))
-
-	highp float depth = VEC42DEPTH(color)*0.383;
-	depth+=VEC42DEPTH(texture2D(source,uv_interp+vec2(0.0,pixel_size.y*-3.0)*pixel_scale))*0.006;
-	depth+=VEC42DEPTH(texture2D(source,uv_interp+vec2(0.0,pixel_size.y*-2.0)*pixel_scale))*0.061;
-	depth+=VEC42DEPTH(texture2D(source,uv_interp+vec2(0.0,pixel_size.y*-1.0)*pixel_scale))*0.242;
-	depth+=VEC42DEPTH(texture2D(source,uv_interp+vec2(0.0,pixel_size.y*1.0)*pixel_scale))*0.242;
-	depth+=VEC42DEPTH(texture2D(source,uv_interp+vec2(0.0,pixel_size.y*2.0)*pixel_scale))*0.061;
-	depth+=VEC42DEPTH(texture2D(source,uv_interp+vec2(0.0,pixel_size.y*3.0)*pixel_scale))*0.006;
-	highp vec4 comp = fract(depth * vec4(256.0 * 256.0 * 256.0, 256.0 * 256.0, 256.0, 1.0));
-	comp -= comp.xxyz * vec4(0, 1.0 / 256.0, 1.0 / 256.0, 1.0 / 256.0);
-	color=comp;
-
-#else
-
-	highp float depth = color.r*0.383;
-	depth+=texture2D(source,uv_interp+vec2(0.0,pixel_size.y*-3.0)*pixel_scale).r*0.006;
-	depth+=texture2D(source,uv_interp+vec2(0.0,pixel_size.y*-2.0)*pixel_scale).r*0.061;
-	depth+=texture2D(source,uv_interp+vec2(0.0,pixel_size.y*-1.0)*pixel_scale).r*0.242;
-	depth+=texture2D(source,uv_interp+vec2(0.0,pixel_size.y*1.0)*pixel_scale).r*0.242;
-	depth+=texture2D(source,uv_interp+vec2(0.0,pixel_size.y*2.0)*pixel_scale).r*0.061;
-	depth+=texture2D(source,uv_interp+vec2(0.0,pixel_size.y*3.0)*pixel_scale).r*0.006;
-
-#ifdef USE_GLES_OVER_GL
-	gl_FragDepth = depth;
-
-#else
-	gl_FragDepthEXT = depth;
-#endif
-
-	return;
-#endif
-
-#endif
-
-#ifdef SHADOW_BLUR_H_PASS
-
-
-#ifdef USE_RGBA_DEPTH
-
-#define VEC42DEPTH(m_vec4) dot(m_vec4,vec4(1.0 / (256.0 * 256.0 * 256.0),1.0 / (256.0 * 256.0),1.0 / 256.0,1))
-
-	highp float depth = VEC42DEPTH(color)*0.383;
-	depth+=VEC42DEPTH(texture2D(source,uv_interp+vec2(pixel_size.x*-3.0,0.0)*pixel_scale))*0.006;
-	depth+=VEC42DEPTH(texture2D(source,uv_interp+vec2(pixel_size.x*-2.0,0.0)*pixel_scale))*0.061;
-	depth+=VEC42DEPTH(texture2D(source,uv_interp+vec2(pixel_size.x*-1.0,0.0)*pixel_scale))*0.242;
-	depth+=VEC42DEPTH(texture2D(source,uv_interp+vec2(pixel_size.x*1.0,0.0)*pixel_scale))*0.242;
-	depth+=VEC42DEPTH(texture2D(source,uv_interp+vec2(pixel_size.x*2.0,0.0)*pixel_scale))*0.061;
-	depth+=VEC42DEPTH(texture2D(source,uv_interp+vec2(pixel_size.x*3.0,0.0)*pixel_scale))*0.006;
-	highp vec4 comp = fract(depth * vec4(256.0 * 256.0 * 256.0, 256.0 * 256.0, 256.0, 1.0));
-	comp -= comp.xxyz * vec4(0, 1.0 / 256.0, 1.0 / 256.0, 1.0 / 256.0);
-	color=comp;
-#else
-
-
-	highp float depth = color.r*0.383;
-	depth+=texture2D(source,uv_interp+vec2(pixel_size.x*-3.0,0.0)*pixel_scale).r*0.006;
-	depth+=texture2D(source,uv_interp+vec2(pixel_size.x*-2.0,0.0)*pixel_scale).r*0.061;
-	depth+=texture2D(source,uv_interp+vec2(pixel_size.x*-1.0,0.0)*pixel_scale).r*0.242;
-	depth+=texture2D(source,uv_interp+vec2(pixel_size.x*1.0,0.0)*pixel_scale).r*0.242;
-	depth+=texture2D(source,uv_interp+vec2(pixel_size.x*2.0,0.0)*pixel_scale).r*0.061;
-	depth+=texture2D(source,uv_interp+vec2(pixel_size.x*3.0,0.0)*pixel_scale).r*0.006;
-
-#ifdef USE_GLES_OVER_GL
-	gl_FragDepth = depth;
-#else
-	gl_FragDepthEXT = depth;
-#endif
-
-	return;
-
-#endif
-
-#endif
-
-#ifdef USE_HDR
-
-	highp float white_mult = 1.0;
-
-#ifdef USE_8BIT_HDR
-	highp vec4 _mult = vec4(1.0 / (256.0 * 256.0 * 256.0),1.0 / (256.0 * 256.0),1.0 / 256.0,1);
-	highp float hdr_lum = dot(texture2D( hdr_source, vec2(0.0) ), _mult  );
-	color.rgb*=LUM_RANGE;
-	hdr_lum*=LUM_RANGE; //restore to full range
-#else
-
-	highp vec2 lv = texture2D( hdr_source, vec2(0.0) ).rg;
-	highp float hdr_lum = lv.r;
-#ifdef USE_AUTOWHITE
-	white_mult=lv.g;
-#endif
-
-#endif
-
-#ifdef USE_REINHARDT_TONEMAPPER
-	float src_lum = dot(color.rgb,vec3(0.3, 0.58, 0.12));
-	float lp = tonemap_exposure/hdr_lum*src_lum;
-	float white = tonemap_white;
-#ifdef USE_AUTOWHITE
-	white_mult = (white_mult + 1.0 * white_mult);
-	white_mult*=white_mult;
-	white*=white_mult;
-#endif
-	lp = ( lp * ( 1.0 + ( lp / ( white) ) ) ) / ( 1.0 + lp );
-	color.rgb*=lp;
-
-#else
-
-#ifdef USE_LOG_TONEMAPPER
-	color.rgb = tonemap_exposure * log(color.rgb+1.0)/log(hdr_lum+1.0);
-#else
-	highp float tone_scale = tonemap_exposure / hdr_lum; //only linear supported
-	color.rgb*=tone_scale;
-#endif
-
-#endif
-
-#endif
-
-
-#ifdef USE_GLOW_COPY
-
-	highp vec3 glowcol = color.rgb*color.a+step(bloom_threshold,dot(vec3(0.3333,0.3333,0.3333),color.rgb))*bloom*color.rgb;
-
-#ifdef USE_HDR
-	highp float collum = max(color.r,max(color.g,color.b));
-	glowcol+=color.rgb*max(collum-hdr_glow_threshold,0.0)*hdr_glow_scale;
-#endif
-	color.rgb=glowcol;
-	color.a=0.0;
-
-#endif
-
-
-#ifdef USE_GLOW
-
-	vec4 glow = texture2D( glow_source,  uv2_interp );
-
-#ifdef USE_GLOW_SCREEN
-
-	color.rgb = clamp((color.rgb + glow.rgb) - (color.rgb * glow.rgb), 0.0, 1.0);
-
-#endif
-
-#ifdef USE_GLOW_SOFTLIGHT
-
-	{
-
-		glow.rgb = (glow.rgb * 0.5) + 0.5;
-		color.r =  (glow.r <= 0.5) ? (color.r - (1.0 - 2.0 * glow.r) * color.r * (1.0 - color.r)) : (((glow.r > 0.5) && (color.r <= 0.25)) ? (color.r + (2.0 * glow.r - 1.0) * (4.0 * color.r * (4.0 * color.r + 1.0) * (color.r - 1.0) + 7.0 * color.r)) : (color.r + (2.0 * glow.r - 1.0) * (sqrt(color.r) - color.r)));
-		color.g =  (glow.g <= 0.5) ? (color.g - (1.0 - 2.0 * glow.g) * color.g * (1.0 - color.g)) : (((glow.g > 0.5) && (color.g <= 0.25)) ? (color.g + (2.0 * glow.g - 1.0) * (4.0 * color.g * (4.0 * color.g + 1.0) * (color.g - 1.0) + 7.0 * color.g)) : (color.g + (2.0 * glow.g - 1.0) * (sqrt(color.g) - color.g)));
-		color.b =  (glow.b <= 0.5) ? (color.b - (1.0 - 2.0 * glow.b) * color.b * (1.0 - color.b)) : (((glow.b > 0.5) && (color.b <= 0.25)) ? (color.b + (2.0 * glow.b - 1.0) * (4.0 * color.b * (4.0 * color.b + 1.0) * (color.b - 1.0) + 7.0 * color.b)) : (color.b + (2.0 * glow.b - 1.0) * (sqrt(color.b) - color.b)));
-	}
-
-#endif
-
-#if !defined(USE_GLOW_SCREEN) && !defined(USE_GLOW_SOFTLIGHT)
-	color.rgb+=glow.rgb;
-#endif
-
-
-
-#endif
-
-#ifdef USE_SRGB
-
-#if 0
-	//this was fast, but was commented out because it looked kind of shitty, might it be fixable?
-
-	{ //i have my doubts about how fast this is
-
-		color.rgb = min(color.rgb,vec3(1.0)); //clamp just in case
-		vec3 S1 = sqrt(color.rgb);
-		vec3 S2 = sqrt(S1);
-		vec3 S3 = sqrt(S2);
-		color.rgb = 0.662002687 * S1 + 0.684122060 * S2 - 0.323583601 * S3 - 0.225411470 * color.rgb;
-	}
-#else
-
-	color.r=sRGB_gamma_correct(color.r);
-	color.g=sRGB_gamma_correct(color.g);
-	color.b=sRGB_gamma_correct(color.b);
-
-#endif
-
-#endif
-
-#ifdef USE_HDR_COPY
-
-	//highp float lum = dot(color.rgb,highp vec3(1.0/3.0,1.0/3.0,1.0/3.0));
-	//highp float lum = max(color.r,max(color.g,color.b));
-	highp float lum = dot(color.rgb,vec3(0.3, 0.58, 0.12));
-
-	//lum=log(lum+0.0001); //everyone does it
-
-#ifdef USE_8BIT_HDR
-	highp vec4 comp = fract(lum * vec4(256.0 * 256.0 * 256.0, 256.0 * 256.0, 256.0, 1.0));
-	comp -= comp.xxyz * vec4(0.0, 1.0 / 256.0, 1.0 / 256.0, 1.0 / 256.0);
-	color=comp;
-#else
-	color.rgb=vec3(lum);
-#endif
-
-
-#endif
-
-#ifdef USE_HDR_REDUCE
-
-#ifdef USE_8BIT_HDR
-	highp vec4 _multcv = vec4(1.0 / (256.0 * 256.0 * 256.0),1.0 / (256.0 * 256.0),1.0 / 256.0, 1.0);
-	highp float lum_accum = dot(color,_multcv  );
-	lum_accum += dot(texture2D( source,  uv_interp+vec2(-pixel_size.x,-pixel_size.y) ),_multcv  );
-	lum_accum += dot(texture2D( source,  uv_interp+vec2(0.0,-pixel_size.y) ),_multcv  );
-	lum_accum += dot(texture2D( source,  uv_interp+vec2(pixel_size.x,-pixel_size.y) ),_multcv  );
-	lum_accum += dot(texture2D( source,  uv_interp+vec2(-pixel_size.x,0.0) ),_multcv  );
-	lum_accum += dot(texture2D( source,  uv_interp+vec2(pixel_size.x,0.0) ),_multcv  );
-	lum_accum += dot(texture2D( source,  uv_interp+vec2(-pixel_size.x,pixel_size.y) ),_multcv  );
-	lum_accum += dot(texture2D( source,  uv_interp+vec2(0.0,pixel_size.y) ),_multcv  );
-	lum_accum += dot(texture2D( source,  uv_interp+vec2(pixel_size.x,pixel_size.y) ),_multcv  );
-	lum_accum/=9.0;
-#else
-
-	highp float lum_accum = color.r;
-	highp float lum_max = color.g;
-
-#define LUM_REDUCE(m_uv) \
-	{\
-		vec2 val = texture2D( source,  uv_interp+m_uv ).rg;\
-		lum_accum+=val.x;\
-		lum_max=max(val.y,lum_max);\
-	}
-
-	LUM_REDUCE( vec2(-pixel_size.x,-pixel_size.y) );
-	LUM_REDUCE( vec2(0.0,-pixel_size.y) );
-	LUM_REDUCE( vec2(pixel_size.x,-pixel_size.y) );
-	LUM_REDUCE( vec2(-pixel_size.x,0.0) );
-	LUM_REDUCE( vec2(pixel_size.x,0.0) );
-	LUM_REDUCE( vec2(-pixel_size.x,pixel_size.y) );
-	LUM_REDUCE( vec2(0.0,pixel_size.y) );
-	LUM_REDUCE( vec2(pixel_size.x,pixel_size.y) );
-	lum_accum/=9.0;
-
-#endif
-
-#ifdef USE_HDR_STORE
-
-	//lum_accum=exp(lum_accum);
-
-#ifdef USE_8BIT_HDR
-
-	highp float vd_lum = dot(texture2D( source_vd_lum, vec2(0.0) ), _multcv  );
-	lum_accum = clamp( vd_lum + (lum_accum-vd_lum)*hdr_time_delta*hdr_exp_adj_speed,min_luminance*(1.0/LUM_RANGE),max_luminance*(1.0/LUM_RANGE));
-#else
-	highp float vd_lum=texture2D( source_vd_lum, vec2(0.0) ).r;
-	lum_accum = clamp( vd_lum + (lum_accum-vd_lum)*hdr_time_delta*hdr_exp_adj_speed,min_luminance,max_luminance);
-#endif
-
-#endif
-
-#ifdef USE_8BIT_HDR
-	highp vec4 comp = fract(lum_accum * vec4(256.0 * 256.0 * 256.0, 256.0 * 256.0, 256.0, 1.0));
-	comp -= comp.xxyz * vec4(0.0, 1.0 / 256.0, 1.0 / 256.0, 1.0 / 256.0);
-	color=comp;
-#else
-#ifdef USE_AUTOWHITE
-	color.r=lum_accum;
-	color.g=lum_max;
-#else
-	color.rgb=vec3(lum_accum);
-#endif
-
-
-#endif
-
-#endif
-
-
-
-#ifdef USE_RGBE
-
-	color.rgb = pow(color.rgb,color.a*255.0-(8.0+128.0));
-#endif
-
-#ifdef USE_ENERGY
-	color.rgb*=energy;
-#endif
-
-#ifdef USE_NO_ALPHA
-        color.a=1.0;
-#endif
-
-#ifdef USE_CUSTOM_ALPHA
-	color.a=custom_alpha;
-#endif
-
-
-        gl_FragColor = color;
-
-#ifdef USE_DEPTH
-	gl_FragDepth = texture(source_depth,uv_interp).r;
-#endif
-
-}

drivers/gles2/shaders/material.glsl

@@ -1,1326 +0,0 @@
-[vertex]
-
-
-#ifdef USE_GLES_OVER_GL
-#define mediump
-#define highp
-#define roundfix( m_val ) floor( (m_val) + 0.5 )
-#else
-precision mediump float;
-precision mediump int;
-#endif
-
-
-
-/*
-from VisualServer:
-
-ARRAY_VERTEX=0,
-ARRAY_NORMAL=1,
-ARRAY_TANGENT=2,
-ARRAY_COLOR=3,
-ARRAY_TEX_UV=4,
-ARRAY_TEX_UV2=5,
-ARRAY_BONES=6,
-ARRAY_WEIGHTS=7,
-ARRAY_INDEX=8,
-*/
-
-//hack to use uv if no uv present so it works with lightmap
-#ifdef ENABLE_AMBIENT_LIGHTMAP
-
-#ifdef USE_LIGHTMAP_ON_UV2
-
-#ifndef ENABLE_UV2_INTERP
-#define ENABLE_UV2_INTERP
-#endif
-
-#else
-
-#ifndef ENABLE_UV_INTERP
-#define ENABLE_UV_INTERP
-#endif
-
-#endif
-
-#endif
-
-
-/* INPUT ATTRIBS */
-
-attribute highp vec4 vertex_attrib; // attrib:0
-attribute vec3 normal_attrib; // attrib:1
-attribute vec4 tangent_attrib; // attrib:2
-attribute vec4 color_attrib; // attrib:3
-attribute vec2 uv_attrib; // attrib:4
-attribute vec2 uv2_attrib; // attrib:5
-
-uniform float normal_mult;
-
-#ifdef USE_SKELETON
-attribute vec4 bone_indices; // attrib:6
-attribute vec4 bone_weights; // attrib:7
-uniform highp sampler2D skeleton_matrices;
-uniform highp float skeltex_pixel_size;
-#endif
-
-#ifdef USE_ATTRIBUTE_INSTANCING
-
-attribute highp vec4 instance_row0; // attrib:8
-attribute highp vec4 instance_row1; // attrib:9
-attribute highp vec4 instance_row2; // attrib:10
-attribute highp vec4 instance_row3; // attrib:11
-
-#endif
-
-#ifdef USE_TEXTURE_INSTANCING
-
-attribute highp vec3 instance_uv; // attrib:6
-uniform highp sampler2D instance_matrices;
-
-#endif
-
-uniform highp mat4 world_transform;
-uniform highp mat4 camera_inverse_transform;
-uniform highp mat4 projection_transform;
-
-#ifdef USE_UNIFORM_INSTANCING
-//shittiest form of instancing (but most compatible)
-uniform highp mat4 instance_transform;
-#endif
-
-/* Varyings */
-
-varying vec3 vertex_interp;
-varying vec3 normal_interp;
-
-#if defined(ENABLE_COLOR_INTERP)
-varying vec4 color_interp;
-#endif
-
-#if defined(ENABLE_UV_INTERP)
-varying vec2 uv_interp;
-#endif
-
-#if defined(ENABLE_UV2_INTERP)
-varying vec2 uv2_interp;
-#endif
-
-#if defined(ENABLE_VAR1_INTERP)
-varying vec4 var1_interp;
-#endif
-
-#if defined(ENABLE_VAR2_INTERP)
-varying vec4 var2_interp;
-#endif
-
-#if defined(ENABLE_TANGENT_INTERP)
-varying vec3 tangent_interp;
-varying vec3 binormal_interp;
-#endif
-
-#ifdef ENABLE_AMBIENT_OCTREE
-
-uniform highp mat4 ambient_octree_inverse_transform;
-varying highp vec3 ambient_octree_coords;
-
-#endif
-
-#ifdef USE_FOG
-
-varying vec4 fog_interp;
-uniform highp vec3 fog_params;
-uniform vec3 fog_color_begin;
-uniform vec3 fog_color_end;
-
-#endif
-
-#ifdef USE_VERTEX_LIGHTING
-
-uniform vec3 light_pos;
-uniform vec3 light_direction;
-uniform vec3 light_attenuation;
-uniform vec3 light_spot_attenuation;
-uniform vec3 light_diffuse;
-uniform vec3 light_specular;
-
-
-
-#endif
-
-varying vec4 diffuse_interp;
-varying vec3 specular_interp;
-//intended for static branching
-//pretty much all meaningful platforms support
-//static branching
-
-uniform float time;
-uniform float instance_id;
-
-uniform vec3 ambient_light;
-
-#if !defined(USE_DEPTH_SHADOWS) && defined(USE_SHADOW_PASS)
-
-varying vec4 position_interp;
-
-#endif
-
-#ifdef LIGHT_USE_SHADOW
-
-uniform highp mat4 shadow_matrix;
-varying highp vec4 shadow_coord;
-#ifdef LIGHT_USE_PSSM
-uniform highp mat4 shadow_matrix2;
-varying highp vec4 shadow_coord2;
-#endif
-#ifdef LIGHT_USE_PSSM4
-uniform highp mat4 shadow_matrix3;
-varying highp vec4 shadow_coord3;
-uniform highp mat4 shadow_matrix4;
-varying highp vec4 shadow_coord4;
-#endif
-
-
-#endif
-
-#ifdef USE_SHADOW_PASS
-
-uniform highp float shadow_z_offset;
-uniform highp float shadow_z_slope_scale;
-
-#endif
-
-#ifdef USE_DUAL_PARABOLOID
-uniform highp vec2 dual_paraboloid;
-varying float dp_clip;
-#endif
-
-
-
-VERTEX_SHADER_GLOBALS
-
-
-
-
-void main() {
-#ifdef USE_UNIFORM_INSTANCING
-
-	highp mat4 modelview = (camera_inverse_transform * (world_transform * instance_transform));
-#ifdef ENABLE_AMBIENT_OCTREE
-	highp mat4 ambient_octree_transform = (ambient_octree_inverse_transform * (world_transform * instance_transform));
-#endif
-
-#else
-
-#ifdef USE_ATTRIBUTE_INSTANCING
-
-	highp mat4 minst=mat4(instance_row0,instance_row1,instance_row2,instance_row3);
-	highp mat4 modelview = (camera_inverse_transform * (world_transform * minst));
-#ifdef ENABLE_AMBIENT_OCTREE
-	highp mat4 ambient_octree_transform = (ambient_octree_inverse_transform * (world_transform * minst));
-#endif
-
-#else
-
-#ifdef USE_TEXTURE_INSTANCING
-
-	highp vec2 ins_ofs=vec2(instance_uv.z,0.0);
-
-	highp mat4 minst=mat4(
-		texture2D(instance_matrices,instance_uv.xy),
-		texture2D(instance_matrices,instance_uv.xy+ins_ofs),
-		texture2D(instance_matrices,instance_uv.xy+ins_ofs*2.0),
-		texture2D(instance_matrices,instance_uv.xy+ins_ofs*3.0)
-	);
-
-	/*highp mat4 minst=mat4(
-		vec4(1.0,0.0,0.0,0.0),
-		vec4(0.0,1.0,0.0,0.0),
-		vec4(0.0,0.0,1.0,0.0),
-		vec4(0.0,0.0,0.0,1.0)
-	);*/
-
-	highp mat4 modelview = (camera_inverse_transform * (world_transform * minst));
-#ifdef ENABLE_AMBIENT_OCTREE
-	highp mat4 ambient_octree_transform = (ambient_octree_inverse_transform * (world_transform * minst));
-#endif
-
-#else
-	highp mat4 modelview = (camera_inverse_transform * world_transform);
-#ifdef ENABLE_AMBIENT_OCTREE
-	highp mat4 ambient_octree_transform = (ambient_octree_inverse_transform * world_transform);
-#endif
-
-#endif
-
-#endif
-
-#endif
-	highp vec4 vertex_in = vertex_attrib; // vec4(vertex_attrib.xyz * data_attrib.x,1.0);
-	vec3 normal_in = normal_attrib;
-	normal_in*=normal_mult;
-#if defined(ENABLE_TANGENT_INTERP)
-	vec3 tangent_in = tangent_attrib.xyz;
-	tangent_in*=normal_mult;
-	float binormalf = tangent_attrib.a;
-#endif
-
-#ifdef USE_SKELETON
-
-	{
-		//skeleton transform
-		highp mat4 m=mat4(texture2D(skeleton_matrices,vec2((bone_indices.x*3.0+0.0)*skeltex_pixel_size,0.0)),texture2D(skeleton_matrices,vec2((bone_indices.x*3.0+1.0)*skeltex_pixel_size,0.0)),texture2D(skeleton_matrices,vec2((bone_indices.x*3.0+2.0)*skeltex_pixel_size,0.0)),vec4(0.0,0.0,0.0,1.0))*bone_weights.x;
-		m+=mat4(texture2D(skeleton_matrices,vec2((bone_indices.y*3.0+0.0)*skeltex_pixel_size,0.0)),texture2D(skeleton_matrices,vec2((bone_indices.y*3.0+1.0)*skeltex_pixel_size,0.0)),texture2D(skeleton_matrices,vec2((bone_indices.y*3.0+2.0)*skeltex_pixel_size,0.0)),vec4(0.0,0.0,0.0,1.0))*bone_weights.y;
-		m+=mat4(texture2D(skeleton_matrices,vec2((bone_indices.z*3.0+0.0)*skeltex_pixel_size,0.0)),texture2D(skeleton_matrices,vec2((bone_indices.z*3.0+1.0)*skeltex_pixel_size,0.0)),texture2D(skeleton_matrices,vec2((bone_indices.z*3.0+2.0)*skeltex_pixel_size,0.0)),vec4(0.0,0.0,0.0,1.0))*bone_weights.z;
-		m+=mat4(texture2D(skeleton_matrices,vec2((bone_indices.w*3.0+0.0)*skeltex_pixel_size,0.0)),texture2D(skeleton_matrices,vec2((bone_indices.w*3.0+1.0)*skeltex_pixel_size,0.0)),texture2D(skeleton_matrices,vec2((bone_indices.w*3.0+2.0)*skeltex_pixel_size,0.0)),vec4(0.0,0.0,0.0,1.0))*bone_weights.w;
-
-		vertex_in = vertex_in * m;
-		normal_in = (vec4(normal_in,0.0) * m).xyz;
-#if defined(ENABLE_TANGENT_INTERP)
-		tangent_in = (vec4(tangent_in,0.0) * m).xyz;
-#endif
-	}
-
-#endif
-
-#ifdef ENABLE_AMBIENT_OCTREE
-
-	ambient_octree_coords = (ambient_octree_transform * vertex_in).xyz;
-#endif
-
-	vertex_interp = (modelview * vertex_in).xyz;
-	normal_interp = normalize((modelview * vec4(normal_in,0.0)).xyz);
-
-#if defined(ENABLE_COLOR_INTERP)
-#ifdef USE_COLOR_ATTRIB_SRGB_TO_LINEAR
-
-	color_interp = vec4(
-		color_attrib.r<0.04045 ? color_attrib.r * (1.0 / 12.92) : pow((color_attrib.r + 0.055) * (1.0 / (1 + 0.055)), 2.4),
-		color_attrib.g<0.04045 ? color_attrib.g * (1.0 / 12.92) : pow((color_attrib.g + 0.055) * (1.0 / (1 + 0.055)), 2.4),
-		color_attrib.b<0.04045 ? color_attrib.b * (1.0 / 12.92) : pow((color_attrib.b + 0.055) * (1.0 / (1 + 0.055)), 2.4),
-		color_attrib.a
-	);
-#else
-	color_interp = color_attrib;
-#endif
-#endif
-
-#if defined(ENABLE_TANGENT_INTERP)
-	tangent_interp=normalize((modelview * vec4(tangent_in,0.0)).xyz);
-	binormal_interp = normalize( cross(normal_interp,tangent_interp) * binormalf );
-#endif
-
-#if defined(ENABLE_UV_INTERP)
-	uv_interp = uv_attrib;
-#endif
-#if defined(ENABLE_UV2_INTERP)
-	uv2_interp = uv2_attrib;
-#endif
-
-	float vertex_specular_exp = 40.0; //material_specular.a;
-
-
-
-VERTEX_SHADER_CODE
-
-
-#ifdef USE_DUAL_PARABOLOID
-//for dual paraboloid shadow mapping
-        highp vec3 vtx = vertex_interp;
-        vtx.z*=dual_paraboloid.y; //side to affect
-        vtx.z+=0.01;
-        dp_clip=vtx.z;
-        highp float len=length( vtx );
-        vtx=normalize(vtx);
-        vtx.xy/=1.0+vtx.z;
-        vtx.z = len*dual_paraboloid.x; // it's a reciprocal(len - z_near) / (z_far - z_near);
-        vtx+=normalize(vtx)*0.025;
-        vtx.z = vtx.z * 2.0 - 1.0; // fit to clipspace
-        vertex_interp=vtx;
-
-        //vertex_interp.w = z_clip;
-
-#endif
-
-#ifdef USE_SHADOW_PASS
-
-	float z_ofs = shadow_z_offset;
-	z_ofs += (1.0-abs(normal_interp.z))*shadow_z_slope_scale;
-	vertex_interp.z-=z_ofs;
-#endif
-
-#ifdef LIGHT_USE_SHADOW
-
-        shadow_coord = shadow_matrix * vec4(vertex_interp,1.0);
-	shadow_coord.xyz/=shadow_coord.w;
-
-#ifdef LIGHT_USE_PSSM
-	shadow_coord.y*=0.5;
-	shadow_coord.y+=0.5;
-	shadow_coord2 = shadow_matrix2 * vec4(vertex_interp,1.0);
-	shadow_coord2.xyz/=shadow_coord2.w;
-	shadow_coord2.y*=0.5;
-#endif
-#ifdef LIGHT_USE_PSSM4
-	shadow_coord.x*=0.5;
-	shadow_coord2.x*=0.5;
-
-	shadow_coord3 = shadow_matrix3 * vec4(vertex_interp,1.0);
-	shadow_coord3.xyz/=shadow_coord3.w;
-	shadow_coord3.xy*=vec2(0.5);
-	shadow_coord3.xy+=vec2(0.5);
-
-	shadow_coord4 = shadow_matrix4 * vec4(vertex_interp,1.0);
-	shadow_coord4.xyz/=shadow_coord4.w;
-	shadow_coord4.xy*=vec2(0.5);
-	shadow_coord4.x+=0.5;
-
-#endif
-
-#endif
-
-#ifdef USE_FOG
-
-	fog_interp.a = pow( clamp( (length(vertex_interp)-fog_params.x)/(fog_params.y-fog_params.x), 0.0, 1.0 ), fog_params.z );
-	fog_interp.rgb = mix( fog_color_begin, fog_color_end, fog_interp.a );
-#endif
-
-#ifndef VERTEX_SHADER_WRITE_POSITION
-//vertex shader might write a position
-	gl_Position = projection_transform * vec4(vertex_interp,1.0);
-#endif
-
-
-
-#if !defined(USE_DEPTH_SHADOWS) && defined(USE_SHADOW_PASS)
-
-    position_interp=gl_Position;
-
-#endif
-
-
-#ifdef USE_VERTEX_LIGHTING
-
-	vec3 eye_vec = -normalize(vertex_interp);
-
-#ifdef LIGHT_TYPE_DIRECTIONAL
-
-	vec3 light_dir = -light_direction;
-	float attenuation = light_attenuation.r;
-
-
-#endif
-
-#ifdef LIGHT_TYPE_OMNI
-	vec3 light_dir = light_pos-vertex_interp;
-	float radius = light_attenuation.g;
-	float dist = min(length(light_dir),radius);
-	light_dir=normalize(light_dir);
-	float attenuation = pow( max(1.0 - dist/radius, 0.0), light_attenuation.b ) * light_attenuation.r;
-
-#endif
-
-#ifdef LIGHT_TYPE_SPOT
-
-	vec3 light_dir = light_pos-vertex_interp;
-	float radius = light_attenuation.g;
-	float dist = min(length(light_dir),radius);
-	light_dir=normalize(light_dir);
-	float attenuation = pow(  max(1.0 - dist/radius, 0.0), light_attenuation.b ) * light_attenuation.r;
-	vec3 spot_dir = light_direction;
-	float spot_cutoff=light_spot_attenuation.r;
-	float scos = max(dot(-light_dir, spot_dir),spot_cutoff);
-	float rim = (1.0 - scos) / (1.0 - spot_cutoff);
-	attenuation *= 1.0 - pow( rim, light_spot_attenuation.g);
-
-
-#endif
-
-#if defined(LIGHT_TYPE_DIRECTIONAL) || defined(LIGHT_TYPE_OMNI) || defined(LIGHT_TYPE_SPOT)
-
-	//process_shade(normal_interp,light_dir,eye_vec,vertex_specular_exp,attenuation,diffuse_interp,specular_interp);
-	{
-		float NdotL = max(0.0,dot( normal_interp, light_dir ));
-		vec3 half_vec = normalize(light_dir + eye_vec);
-		float eye_light = max(dot(normal_interp, half_vec),0.0);
-		diffuse_interp.rgb=light_diffuse * NdotL * attenuation;
-		diffuse_interp.a=attenuation;
-		if (NdotL > 0.0) {
-			specular_interp=light_specular * pow( eye_light, vertex_specular_exp ) * attenuation;
-		} else {
-			specular_interp=vec3(0.0);
-		}
-	}
-
-#else
-
-#ifdef SHADELESS
-
-	diffuse_interp=vec4(vec3(1.0),0.0);
-	specular_interp=vec3(0.0);
-# else
-
-	diffuse_interp=vec4(0.0);
-	specular_interp=vec3(0.0);
-# endif
-
-#endif
-
-
-
-
-#endif
-
-
-}
-
-
-[fragment]
-
-
-#ifdef USE_GLES_OVER_GL
-#define mediump
-#define highp
-#define roundfix( m_val ) floor( (m_val) + 0.5 )
-#else
-
-precision mediump float;
-precision mediump int;
-
-#endif
-
-
-//hack to use uv if no uv present so it works with lightmap
-#ifdef ENABLE_AMBIENT_LIGHTMAP
-
-#ifdef USE_LIGHTMAP_ON_UV2
-
-#ifndef ENABLE_UV2_INTERP
-#define ENABLE_UV2_INTERP
-#endif
-
-#else
-
-#ifndef ENABLE_UV_INTERP
-#define ENABLE_UV_INTERP
-#endif
-
-#endif
-
-#endif
-
-
-/* Varyings */
-
-#if defined(ENABLE_COLOR_INTERP)
-varying vec4 color_interp;
-#endif
-
-#if defined(ENABLE_UV_INTERP)
-varying vec2 uv_interp;
-#endif
-
-#if defined(ENABLE_UV2_INTERP)
-varying vec2 uv2_interp;
-#endif
-
-#if defined(ENABLE_TANGENT_INTERP)
-varying vec3 tangent_interp;
-varying vec3 binormal_interp;
-#endif
-
-#if defined(ENABLE_VAR1_INTERP)
-varying vec4 var1_interp;
-#endif
-
-#if defined(ENABLE_VAR2_INTERP)
-varying vec4 var2_interp;
-#endif
-
-#ifdef LIGHT_USE_PSSM
-uniform vec3 light_pssm_split;
-#endif
-
-varying vec3 vertex_interp;
-varying vec3 normal_interp;
-
-#ifdef USE_FOG
-
-varying vec4 fog_interp;
-
-#endif
-
-/* Material Uniforms */
-
-#ifdef USE_VERTEX_LIGHTING
-
-varying vec4 diffuse_interp;
-varying vec3 specular_interp;
-
-#endif
-
-#if !defined(USE_DEPTH_SHADOWS) && defined(USE_SHADOW_PASS)
-
-varying vec4 position_interp;
-
-#endif
-
-
-
-uniform vec3 light_pos;
-uniform vec3 light_direction;
-uniform vec3 light_attenuation;
-uniform vec3 light_spot_attenuation;
-uniform vec3 light_diffuse;
-uniform vec3 light_specular;
-
-uniform vec3 ambient_light;
-
-
-#ifdef USE_FRAGMENT_LIGHTING
-
-
-
-# ifdef USE_DEPTH_SHADOWS
-# else
-# endif
-
-#endif
-
-uniform float const_light_mult;
-uniform float time;
-
-#ifdef ENABLE_AMBIENT_OCTREE
-
-varying highp vec3 ambient_octree_coords;
-uniform highp float ambient_octree_lattice_size;
-uniform highp vec2 ambient_octree_pix_size;
-uniform highp vec2 ambient_octree_light_pix_size;
-uniform highp float ambient_octree_lattice_divide;
-uniform highp sampler2D ambient_octree_tex;
-uniform highp sampler2D ambient_octree_light_tex;
-uniform float ambient_octree_multiplier;
-uniform int ambient_octree_steps;
-
-#endif
-
-#ifdef ENABLE_AMBIENT_LIGHTMAP
-
-uniform highp sampler2D ambient_lightmap;
-uniform float ambient_lightmap_multiplier;
-
-#endif
-
-#ifdef ENABLE_AMBIENT_DP_SAMPLER
-
-uniform highp sampler2D ambient_dp_sampler;
-uniform float ambient_dp_sampler_multiplier;
-
-#endif
-
-#ifdef ENABLE_AMBIENT_COLOR
-
-uniform vec3 ambient_color;
-
-#endif
-
-FRAGMENT_SHADER_GLOBALS
-
-
-
-#ifdef LIGHT_USE_SHADOW
-
-varying highp vec4 shadow_coord;
-#ifdef LIGHT_USE_PSSM
-varying highp vec4 shadow_coord2;
-#endif
-#ifdef LIGHT_USE_PSSM4
-varying highp vec4 shadow_coord3;
-varying highp vec4 shadow_coord4;
-#endif
-
-uniform highp sampler2D shadow_texture;
-uniform highp vec2 shadow_texel_size;
-
-uniform float shadow_darkening;
-
-#ifdef USE_DEPTH_SHADOWS
-
-#define SHADOW_DEPTH(m_tex,m_uv) (texture2D((m_tex),(m_uv)).z)
-
-#else
-
-//#define SHADOW_DEPTH(m_tex,m_uv) dot(texture2D((m_tex),(m_uv)),highp vec4(1.0 / (256.0 * 256.0 * 256.0),1.0 / (256.0 * 256.0),1.0 / 256.0,1)  )
-#define SHADOW_DEPTH(m_tex,m_uv) dot(texture2D((m_tex),(m_uv)),vec4(1.0 / (256.0 * 256.0 * 256.0),1.0 / (256.0 * 256.0),1.0 / 256.0,1)  )
-
-#endif
-
-#ifdef USE_SHADOW_PCF
-
-
-#ifdef USE_SHADOW_PCF_HQ
-
-
-float SAMPLE_SHADOW_TEX( highp vec2 coord, highp float refdepth) {
-
-	float avg=(SHADOW_DEPTH(shadow_texture,coord) < refdepth ?  0.0 : 1.0);
-	avg+=(SHADOW_DEPTH(shadow_texture,coord+vec2(shadow_texel_size.x,0.0)) < refdepth ?  0.0 : 1.0);
-	avg+=(SHADOW_DEPTH(shadow_texture,coord+vec2(-shadow_texel_size.x,0.0)) < refdepth ?  0.0 : 1.0);
-	avg+=(SHADOW_DEPTH(shadow_texture,coord+vec2(0.0,shadow_texel_size.y)) < refdepth ?  0.0 : 1.0);
-	avg+=(SHADOW_DEPTH(shadow_texture,coord+vec2(0.0,-shadow_texel_size.y)) < refdepth ?  0.0 : 1.0);
-	avg+=(SHADOW_DEPTH(shadow_texture,coord+vec2(shadow_texel_size.x,shadow_texel_size.y)) < refdepth ?  0.0 : 1.0);
-	avg+=(SHADOW_DEPTH(shadow_texture,coord+vec2(-shadow_texel_size.x,shadow_texel_size.y)) < refdepth ?  0.0 : 1.0);
-	avg+=(SHADOW_DEPTH(shadow_texture,coord+vec2(shadow_texel_size.x,-shadow_texel_size.y)) < refdepth ?  0.0 : 1.0);
-	avg+=(SHADOW_DEPTH(shadow_texture,coord+vec2(-shadow_texel_size.x,-shadow_texel_size.y)) < refdepth ?  0.0 : 1.0);
-	avg+=(SHADOW_DEPTH(shadow_texture,coord+vec2(shadow_texel_size.x*2.0,0.0)) < refdepth ?  0.0 : 1.0);
-	avg+=(SHADOW_DEPTH(shadow_texture,coord+vec2(-shadow_texel_size.x*2.0,0.0)) < refdepth ?  0.0 : 1.0);
-	avg+=(SHADOW_DEPTH(shadow_texture,coord+vec2(0.0,shadow_texel_size.y*2.0)) < refdepth ?  0.0 : 1.0);
-	avg+=(SHADOW_DEPTH(shadow_texture,coord+vec2(0.0,-shadow_texel_size.y*2.0)) < refdepth ?  0.0 : 1.0);
-	return avg*(1.0/13.0);
-}
-
-#else
-
-float SAMPLE_SHADOW_TEX( highp vec2 coord, highp float refdepth) {
-
-	float avg=(SHADOW_DEPTH(shadow_texture,coord) < refdepth ?  0.0 : 1.0);
-	avg+=(SHADOW_DEPTH(shadow_texture,coord+vec2(shadow_texel_size.x,0.0)) < refdepth ?  0.0 : 1.0);
-	avg+=(SHADOW_DEPTH(shadow_texture,coord+vec2(-shadow_texel_size.x,0.0)) < refdepth ?  0.0 : 1.0);
-	avg+=(SHADOW_DEPTH(shadow_texture,coord+vec2(0.0,shadow_texel_size.y)) < refdepth ?  0.0 : 1.0);
-	avg+=(SHADOW_DEPTH(shadow_texture,coord+vec2(0.0,-shadow_texel_size.y)) < refdepth ?  0.0 : 1.0);
-	return avg*0.2;
-}
-
-#endif
-
-
-
-
-/*
-	16x averaging
-float SAMPLE_SHADOW_TEX( highp vec2 coord, highp float refdepth) {
-
-	vec2 offset = vec2(
-		lessThan(vec2(0.25),fract(gl_FragCoord.xy * 0.5))
-		);
-	offset.y += offset.x;  // y ^= x in floating point
-
-	if (offset.y > 1.1)
-		offset.y = 0.0;
-	float avg = step( refdepth, SHADOW_DEPTH(shadow_texture, coord+ (offset + vec2(-1.5, 0.5))*shadow_texel_size) );
-	avg+=step(refdepth, SHADOW_DEPTH(shadow_texture, coord+ (offset + vec2(0.5, 0.5))*shadow_texel_size) );
-	avg+=step(refdepth, SHADOW_DEPTH(shadow_texture, coord+ (offset + vec2(-1.5, -1.5))*shadow_texel_size) );
-	avg+=step(refdepth, SHADOW_DEPTH(shadow_texture, coord+ (offset + vec2(0.5, -1.5))*shadow_texel_size) );
-	return avg * 0.25;
-}
-*/
-
-/*
-float SAMPLE_SHADOW_TEX( highp vec2 coord, highp float refdepth) {
-
-	vec2 offset = vec2(
-		lessThan(vec2(0.25),fract(gl_FragCoord.xy * 0.5))
-		);
-	offset.y += offset.x;  // y ^= x in floating point
-
-	if (offset.y > 1.1)
-		offset.y = 0.0;
-	return step( refdepth, SHADOW_DEPTH(shadow_texture, coord+ offset*shadow_texel_size) );
-
-}
-
-*/
-/* simple pcf4 */
-//#define SAMPLE_SHADOW_TEX(m_coord,m_depth) ((step(m_depth,SHADOW_DEPTH(shadow_texture,m_coord))+step(m_depth,SHADOW_DEPTH(shadow_texture,m_coord+vec2(0.0,shadow_texel_size.y)))+step(m_depth,SHADOW_DEPTH(shadow_texture,m_coord+vec2(shadow_texel_size.x,0.0)))+step(m_depth,SHADOW_DEPTH(shadow_texture,m_coord+shadow_texel_size)))/4.0)
-
-#endif
-
-#ifdef USE_SHADOW_ESM
-
-uniform float esm_multiplier;
-
-float SAMPLE_SHADOW_TEX(vec2 p_uv,float p_depth) {
-
-#if defined (USE_DEPTH_SHADOWS)
-	//these only are used if interpolation exists
-	highp float occluder = SHADOW_DEPTH(shadow_texture, p_uv);
-#else
-	vec2 unnormalized = p_uv/shadow_texel_size;
-	vec2 fractional = fract(unnormalized);
-	unnormalized = floor(unnormalized);
-
-	vec4 exponent;
-	exponent.x = SHADOW_DEPTH(shadow_texture, (unnormalized + vec2( -0.5, 0.5 )) * shadow_texel_size );
-	exponent.y = SHADOW_DEPTH(shadow_texture, (unnormalized + vec2( 0.5, 0.5 )) * shadow_texel_size );
-	exponent.z = SHADOW_DEPTH(shadow_texture, (unnormalized + vec2( 0.5, -0.5 )) * shadow_texel_size );
-	exponent.w = SHADOW_DEPTH(shadow_texture, (unnormalized + vec2( -0.5, -0.5 )) * shadow_texel_size );
-
-	highp float occluder = (exponent.w + (exponent.x - exponent.w) * fractional.y);
-	occluder = occluder + ((exponent.z + (exponent.y - exponent.z) * fractional.y) - occluder)*fractional.x;
-#endif
-	return clamp(exp(esm_multiplier* ( occluder - p_depth )),0.0,1.0);
-
-}
-
-
-#endif
-
-#if !defined(USE_SHADOW_PCF) && !defined(USE_SHADOW_ESM)
-
-#define SAMPLE_SHADOW_TEX(m_coord,m_depth) (SHADOW_DEPTH(shadow_texture,m_coord) < m_depth ?  0.0 : 1.0)
-
-#endif
-
-
-#endif
-
-#ifdef USE_DUAL_PARABOLOID
-
-varying float dp_clip;
-
-#endif
-
-uniform highp mat4 camera_inverse_transform;
-
-#if defined(ENABLE_TEXSCREEN)
-
-uniform vec2 texscreen_screen_mult;
-uniform vec4 texscreen_screen_clamp;
-uniform sampler2D texscreen_tex;
-
-#endif
-
-#if defined(ENABLE_SCREEN_UV)
-
-uniform vec2 screen_uv_mult;
-
-#endif
-
-void main() {
-
-#ifdef USE_DUAL_PARABOLOID
-        if (dp_clip<0.0)
-            discard;
-#endif
-
-	//lay out everything, whathever is unused is optimized away anyway
-        vec3 vertex = vertex_interp;
-	vec4 diffuse = vec4(0.9,0.9,0.9,1.0);
-	vec3 specular = vec3(0.0,0.0,0.0);
-	vec3 emission = vec3(0.0,0.0,0.0);
-	float specular_exp=1.0;
-	float glow=0.0;
-	float shade_param=0.0;
-#ifdef DISABLE_FRONT_FACING
-	float side=float(1)*2.0-1.0;
-#else
-	float side=float(gl_FrontFacing)*2.0-1.0;
-#endif
-#if defined(ENABLE_TANGENT_INTERP)
-	vec3 binormal = normalize(binormal_interp)*side;
-	vec3 tangent = normalize(tangent_interp)*side;
-#endif
-	//vec3 normal = abs(normalize(normal_interp))*side;
-	vec3 normal = normalize(normal_interp)*side;
-#if defined(ENABLE_SCREEN_UV)
-	vec2 screen_uv = gl_FragCoord.xy*screen_uv_mult;
-#endif
-
-#if defined(ENABLE_UV_INTERP)
-	vec2 uv = uv_interp;
-#endif
-
-#if defined(ENABLE_UV2_INTERP)
-	vec2 uv2 = uv2_interp;
-#endif
-
-#if defined(ENABLE_COLOR_INTERP)
-	vec4 color = color_interp;
-#endif
-
-#if defined(ENABLE_NORMALMAP)
-
-	vec3 normalmap = vec3(0.0);
-#endif
-
-	float normaldepth=1.0;
-
-
-
-#if defined(ENABLE_DISCARD)
-	bool discard_=false;
-#endif
-
-{
-
-
-FRAGMENT_SHADER_CODE
-
-}
-
-#if defined(ENABLE_NORMALMAP)
-
-	normal = normalize( mix(normal_interp,tangent_interp * normalmap.x + binormal_interp * normalmap.y + normal_interp * normalmap.z,normaldepth) ) * side;
-
-#endif
-
-#if defined(ENABLE_DISCARD)
-	if (discard_) {
-	//easy to eliminate dead code
-		discard;
-	}
-#endif
-
-#ifdef ENABLE_CLIP_ALPHA
-	if (diffuse.a<0.99) {
-		//used for doublepass and shadowmapping
-		discard;
-	}
-#endif
-
-	float shadow_attenuation = 1.0;
-
-#ifdef ENABLE_AMBIENT_LIGHTMAP
-
-	vec3 ambientmap_color = vec3(0.0,0.0,0.0);
-	vec2 ambientmap_uv = vec2(0.0,0.0);
-
-#ifdef USE_LIGHTMAP_ON_UV2
-
-	ambientmap_uv = uv2_interp;
-
-#else
-
-	ambientmap_uv = uv_interp;
-
-#endif
-
-	vec4 amcol = texture2D(ambient_lightmap,ambientmap_uv);
-	shadow_attenuation=amcol.a;
-	ambientmap_color = amcol.rgb;
-	ambientmap_color*=ambient_lightmap_multiplier;
-	ambientmap_color*=diffuse.rgb;
-
-
-
-#endif
-
-
-#ifdef ENABLE_AMBIENT_OCTREE
-
-	vec3 ambientmap_color = vec3(0.0,0.0,0.0);
-
-
-	{
-
-		//read position from initial lattice grid
-		highp vec3 lattice_pos = floor(ambient_octree_coords*ambient_octree_lattice_size);
-		highp vec2 octant_uv = highp vec2(lattice_pos.x+ambient_octree_lattice_size*lattice_pos.z,lattice_pos.y);
-		octant_uv=(octant_uv*highp vec2(2.0,4.0)+highp vec2(0.0,4.0));
-		highp float ld = 1.0/ambient_octree_lattice_size;
-
-
-		//go down the octree
-
-		for(int i=0;i<ambient_octree_steps;i++) {
-
-
-			highp vec3 sub=mod(ambient_octree_coords,ld);
-			ld*=0.5;
-			highp vec3 s = step(ld,sub);
-			octant_uv+=s.xy;
-			octant_uv.y+=s.z*2.0;
-			octant_uv=(octant_uv+0.5)*ambient_octree_pix_size;
-			highp vec4 new_uv = texture2D(ambient_octree_tex,octant_uv);
-			octant_uv=floor(highp vec2( dot(new_uv.xy,highp vec2(65280.0,255.0)),  dot(new_uv.zw,highp vec2(65280.0,255.0)) )+0.5);//+ambient_octree_pix_size*0.5;
-
-		}
-
-		//sample color
-		octant_uv=(octant_uv+0.5)*ambient_octree_light_pix_size;
-		highp vec3 sub=(mod(ambient_octree_coords,ld)/ld);
-		octant_uv.xy+=sub.xy*ambient_octree_light_pix_size.xy;
-		vec3 col_up=texture2D(ambient_octree_light_tex,octant_uv).rgb;
-		octant_uv.y+=ambient_octree_light_pix_size.y*2.0;
-		vec3 col_down=texture2D(ambient_octree_light_tex,octant_uv).rgb;
-		ambientmap_color=mix(col_up,col_down,sub.z)*ambient_octree_multiplier;
-
-		ambientmap_color*=diffuse.rgb;
-
-	}
-
-#endif
-
-
-
-#ifdef ENABLE_AMBIENT_DP_SAMPLER
-
-	vec3 ambientmap_color = vec3(0.0,0.0,0.0);
-
-	{
-
-		vec3 dp_normal = normalize((vec4(normal,0) * camera_inverse_transform).xyz);
-		vec2 ambient_uv = (dp_normal.xy / (1.0+abs(dp_normal.z)))*0.5+0.5; //dual paraboloid
-		ambient_uv.y*=0.5;
-		if (dp_normal.z<0) {
-
-			ambient_uv.y=(0.5-ambient_uv.y)+0.5;
-
-		}
-
-		ambientmap_color = texture2D(ambient_dp_sampler,ambient_uv ).rgb * ambient_dp_sampler_multiplier;
-		ambientmap_color*=diffuse.rgb;
-	}
-
-#endif
-
-
-
-
-#ifdef LIGHT_USE_SHADOW
-#ifdef LIGHT_TYPE_DIRECTIONAL
-
-	float shadow_fade_exponent=5.0;  //hardcoded for now
-	float shadow_fade=pow(length(vertex_interp)/light_attenuation.g,shadow_fade_exponent);
-
-// optimization - skip shadows outside visible range
-	if(shadow_fade<1.0){
-
-#ifdef LIGHT_USE_PSSM
-
-
-	//if (vertex_interp.z > light_pssm_split) {
-#if 0
-	highp vec3 splane = vec3(0.0,0.0,0.0);
-
-	if (gl_FragCoord.w > light_pssm_split.x) {
-
-		splane = shadow_coord.xyz;
-		splane.y+=1.0;
-	} else {
-		splane = shadow_coord2.xyz;
-	}
-	splane.y*=0.5;
-	shadow_attenuation=SAMPLE_SHADOW_TEX(splane.xy,splane.z);
-
-#else
-/*
-	float sa_a = SAMPLE_SHADOW_TEX(shadow_coord.xy,shadow_coord.z);
-	float sa_b = SAMPLE_SHADOW_TEX(shadow_coord2.xy,shadow_coord2.z);
-	if (gl_FragCoord.w > light_pssm_split.x) {
-		shadow_attenuation=sa_a;
-	} else {
-		shadow_attenuation=sa_b;
-	}
-*/
-
-	vec2 pssm_coord;
-	float pssm_z;
-
-#if defined(LIGHT_USE_PSSM) && defined(USE_SHADOW_ESM)
-#define USE_PSSM_BLEND
-	float pssm_blend;
-	vec2 pssm_coord_2;
-	float pssm_z_2;
-	vec3 light_pssm_split_inv = 1.0/light_pssm_split;
-	float w_inv = 1.0/gl_FragCoord.w;
-#endif
-
-#ifdef LIGHT_USE_PSSM4
-
-
-	if (gl_FragCoord.w > light_pssm_split.y) {
-
-		if (gl_FragCoord.w > light_pssm_split.x) {
-			pssm_coord=shadow_coord.xy;
-			pssm_z=shadow_coord.z;
-#if defined(USE_PSSM_BLEND)
-			pssm_coord_2=shadow_coord2.xy;
-			pssm_z_2=shadow_coord2.z;
-			pssm_blend=smoothstep(0.0,light_pssm_split_inv.x,w_inv);
-#endif
-
-		} else {
-			pssm_coord=shadow_coord2.xy;
-			pssm_z=shadow_coord2.z;
-#if defined(USE_PSSM_BLEND)
-			pssm_coord_2=shadow_coord3.xy;
-			pssm_z_2=shadow_coord3.z;
-			pssm_blend=smoothstep(light_pssm_split_inv.x,light_pssm_split_inv.y,w_inv);
-#endif
-
-		}
-	} else {
-
-
-		if (gl_FragCoord.w > light_pssm_split.z) {
-			pssm_coord=shadow_coord3.xy;
-			pssm_z=shadow_coord3.z;
-#if defined(USE_PSSM_BLEND)
-			pssm_coord_2=shadow_coord4.xy;
-			pssm_z_2=shadow_coord4.z;
-			pssm_blend=smoothstep(light_pssm_split_inv.y,light_pssm_split_inv.z,w_inv);
-#endif
-
-		} else {
-			pssm_coord=shadow_coord4.xy;
-			pssm_z=shadow_coord4.z;
-#if defined(USE_PSSM_BLEND)
-			pssm_coord_2=shadow_coord4.xy;
-			pssm_z_2=shadow_coord4.z;
-			pssm_blend=0.0;
-#endif
-
-		}
-	}
-
-#else
-
-	if (gl_FragCoord.w > light_pssm_split.x) {
-		pssm_coord=shadow_coord.xy;
-		pssm_z=shadow_coord.z;
-#if defined(USE_PSSM_BLEND)
-		pssm_coord_2=shadow_coord2.xy;
-		pssm_z_2=shadow_coord2.z;
-		pssm_blend=smoothstep(0.0,light_pssm_split_inv.x,w_inv);
-#endif
-
-	} else {
-		pssm_coord=shadow_coord2.xy;
-		pssm_z=shadow_coord2.z;
-#if defined(USE_PSSM_BLEND)
-		pssm_coord_2=shadow_coord2.xy;
-		pssm_z_2=shadow_coord2.z;
-		pssm_blend=0.0;
-#endif
-
-	}
-
-#endif
-
-	//one one sample
-	shadow_attenuation=SAMPLE_SHADOW_TEX(pssm_coord,pssm_z);
-#if defined(USE_PSSM_BLEND)
-	shadow_attenuation=mix(shadow_attenuation,SAMPLE_SHADOW_TEX(pssm_coord_2,pssm_z_2),pssm_blend);
-#endif
-
-
-#endif
-
-#else
-
-	shadow_attenuation=SAMPLE_SHADOW_TEX(shadow_coord.xy,shadow_coord.z);
-#endif
-
-	shadow_attenuation=mix(shadow_attenuation,1.0,shadow_fade);
-	}else{
-	shadow_attenuation=1.0;
-	};
-
-#endif
-
-#ifdef LIGHT_TYPE_OMNI
-
-        vec3 splane=shadow_coord.xyz;///shadow_coord.w;
-        float shadow_len=length(splane);
-        splane=normalize(splane);
-        float vofs=0.0;
-
-        if (splane.z>=0.0) {
-
-                splane.z+=1.0;
-        } else {
-
-                splane.z=1.0 - splane.z;
-                vofs=0.5;
-        }
-        splane.xy/=splane.z;
-        splane.xy=splane.xy * 0.5 + 0.5;
-	float lradius = light_attenuation.g;
-        splane.z = shadow_len / lradius;
-        splane.y=clamp(splane.y,0.0,1.0)*0.5+vofs;
-
-        shadow_attenuation=SAMPLE_SHADOW_TEX(splane.xy,splane.z);
-#endif
-
-#ifdef LIGHT_TYPE_SPOT
-
-	shadow_attenuation=SAMPLE_SHADOW_TEX(shadow_coord.xy,shadow_coord.z);
-#endif
-
-	shadow_attenuation=mix(shadow_attenuation,1.0,shadow_darkening);
-#endif
-
-
-#ifdef USE_FRAGMENT_LIGHTING
-
-	vec3 eye_vec = -normalize(vertex);
-
-#ifdef LIGHT_TYPE_DIRECTIONAL
-
-	vec3 light_dir = -light_direction;
-	float attenuation = light_attenuation.r;
-
-
-#endif
-
-#ifdef LIGHT_TYPE_OMNI
-
-	vec3 light_dir = light_pos-vertex;
-	float radius = light_attenuation.g;
-	float dist = min(length(light_dir),radius);
-	light_dir=normalize(light_dir);
-	float attenuation = pow( max(1.0 - dist/radius, 0.0), light_attenuation.b ) * light_attenuation.r;
-
-#endif
-
-
-#ifdef LIGHT_TYPE_SPOT
-
-	vec3 light_dir = light_pos-vertex;
-	float radius = light_attenuation.g;
-	float dist = min(length(light_dir),radius);
-	light_dir=normalize(light_dir);
-	float attenuation = pow(  max(1.0 - dist/radius, 0.0), light_attenuation.b ) * light_attenuation.r;
-	vec3 spot_dir = light_direction;
-	float spot_cutoff=light_spot_attenuation.r;
-	float scos = max(dot(-light_dir, spot_dir),spot_cutoff);
-	float rim = (1.0 - scos) / (1.0 - spot_cutoff);
-	attenuation *= 1.0 - pow( rim, light_spot_attenuation.g);
-
-#endif
-
-# if defined(LIGHT_TYPE_DIRECTIONAL) || defined(LIGHT_TYPE_OMNI) || defined (LIGHT_TYPE_SPOT)
-
-	{
-
-		vec3 mdiffuse = diffuse.rgb;
-		vec3 light;
-
-#if defined(USE_OUTPUT_SHADOW_COLOR)
-		vec3 shadow_color=vec3(0.0,0.0,0.0);
-#endif
-
-#if defined(USE_LIGHT_SHADER_CODE)
-//light is written by the light shader
-{
-
-LIGHT_SHADER_CODE
-
-}
-#else
-//traditional lambert + blinn
-		float NdotL = max(0.0,dot( normal, light_dir ));
-		vec3 half_vec = normalize(light_dir + eye_vec);
-		float eye_light = max(dot(normal, half_vec),0.0);
-
-		light = light_diffuse * mdiffuse * NdotL;
-		if (NdotL > 0.0) {
-			light+=specular * light_specular * pow( eye_light, specular_exp );
-		}
-#endif
-		diffuse.rgb = const_light_mult * ambient_light *diffuse.rgb + light * attenuation * shadow_attenuation;
-
-#if defined(USE_OUTPUT_SHADOW_COLOR)
-		diffuse.rgb += light * shadow_color * attenuation * (1.0 - shadow_attenuation);
-#endif
-
-#ifdef USE_FOG
-
-		diffuse.rgb = mix(diffuse.rgb,fog_interp.rgb,fog_interp.a);
-
-# if defined(LIGHT_TYPE_OMNI) || defined (LIGHT_TYPE_SPOT)
-		diffuse.rgb = mix(mix(vec3(0.0),diffuse.rgb,attenuation),diffuse.rgb,const_light_mult);
-# endif
-
-
-#endif
-
-
-	}
-
-
-# endif
-
-# if !defined(LIGHT_TYPE_DIRECTIONAL) && !defined(LIGHT_TYPE_OMNI) && !defined (LIGHT_TYPE_SPOT)
-//none
-#ifndef SHADELESS
-	diffuse.rgb=ambient_light *diffuse.rgb;
-#endif
-
-# endif
-
-	diffuse.rgb+=const_light_mult*emission;
-
-#endif
-
-
-
-
-#ifdef USE_VERTEX_LIGHTING
-
-	vec3 ambient = const_light_mult*ambient_light*diffuse.rgb;
-# if defined(LIGHT_TYPE_OMNI) || defined (LIGHT_TYPE_SPOT)
-	//ambient*=diffuse_interp.a; //attenuation affects ambient too
-
-# endif
-
-	//diffuse.rgb=(diffuse.rgb * diffuse_interp.rgb + specular * specular_interp)*shadow_attenuation + ambient;
-	//diffuse.rgb+=emission * const_light_mult;
-	diffuse.rgb=(diffuse.rgb * diffuse_interp.rgb + specular * specular_interp)*shadow_attenuation + ambient;
-	diffuse.rgb+=emission * const_light_mult;
-
-#ifdef USE_FOG
-
-	diffuse.rgb = mix(diffuse.rgb,fog_interp.rgb,fog_interp.a);
-
-# if defined(LIGHT_TYPE_OMNI) || defined (LIGHT_TYPE_SPOT)
-	diffuse.rgb = mix(mix(vec3(0.0),diffuse.rgb,diffuse_interp.a),diffuse.rgb,const_light_mult);
-# endif
-
-#endif
-
-#endif
-
-
-#if defined(ENABLE_AMBIENT_OCTREE) || defined(ENABLE_AMBIENT_LIGHTMAP) || defined(ENABLE_AMBIENT_DP_SAMPLER)
-#if defined(ENABLE_AMBIENT_COLOR)
-	ambientmap_color*=ambient_color;
-#endif
-	diffuse.rgb+=ambientmap_color;
-#endif
-
-
-#ifdef USE_SHADOW_PASS
-
-#ifdef USE_DEPTH_SHADOWS
-
-        //do nothing, depth is just written
-#else
-        // pack depth to rgba
-        //highp float bias = 0.0005;
-	highp float depth = ((position_interp.z / position_interp.w) + 1.0) * 0.5 + 0.0;//bias;
-        highp vec4 comp = fract(depth * vec4(256.0 * 256.0 * 256.0, 256.0 * 256.0, 256.0, 1.0));
-        comp -= comp.xxyz * vec4(0, 1.0 / 256.0, 1.0 / 256.0, 1.0 / 256.0);
-        gl_FragColor = comp;
-
-#endif
-
-#else
-
-
-
-#ifdef USE_GLOW
-
-	diffuse.a=glow;
-#endif
-
-#ifdef USE_8BIT_HDR
-	diffuse.rgb*=0.25;
-#endif
-
-	gl_FragColor = diffuse;
-#endif
-}
-
-

drivers/gles3/shader_compiler_gles3.cpp

@@ -626,13 +626,11 @@ Error ShaderCompilerGLES3::compile(VS::ShaderMode p_mode, const String &p_code,
 	Error err = parser.compile(p_code, ShaderTypes::get_singleton()->get_functions(p_mode), ShaderTypes::get_singleton()->get_modes(p_mode), ShaderTypes::get_singleton()->get_types());
 
 	if (err != OK) {
-#if 1
 
 		Vector<String> shader = p_code.split("\n");
 		for (int i = 0; i < shader.size(); i++) {
 			print_line(itos(i) + " " + shader[i]);
 		}
-#endif
 
 		_err_print_error(NULL, p_path.utf8().get_data(), parser.get_error_line(), parser.get_error_text().utf8().get_data(), ERR_HANDLER_SHADER);
 		return err;

drivers/unix/dir_access_unix.cpp

@@ -194,21 +194,9 @@ Error DirAccessUnix::make_dir(String p_dir) {
 
 	p_dir = fix_path(p_dir);
 
-#if 1
-
-	bool success = (mkdir(p_dir.utf8().get_data(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) == 0);
-	int err = errno;
-
-#else
-	char real_current_dir_name[2048];
-	getcwd(real_current_dir_name, 2048);
-	chdir(current_dir.utf8().get_data()); //ascii since this may be unicode or wathever the host os wants
-
 	bool success = (mkdir(p_dir.utf8().get_data(), S_IRWXU | S_IRWXG | S_IROTH | S_IXOTH) == 0);
 	int err = errno;
 
-	chdir(real_current_dir_name);
-#endif
 	if (success) {
 		return OK;
 	};

editor/SCsub

@@ -404,7 +404,6 @@ if (env["tools"] == "yes"):
     SConscript('fileserver/SCsub')
     SConscript('icons/SCsub')
     SConscript('import/SCsub')
-    SConscript('io_plugins/SCsub')
     SConscript('plugins/SCsub')
 
     lib = env.Library("editor", env.editor_sources)

editor/animation_editor.cpp

@@ -38,6 +38,7 @@
 #include "pair.h"
 #include "scene/gui/separator.h"
 #include "scene/main/viewport.h"
+
 /* Missing to fix:
 
   *Set
@@ -2684,17 +2685,6 @@ void AnimationKeyEditor::_track_editor_gui_input(const Ref<InputEvent> &p_input)
 			Point2 mpos = mm->get_position() - ofs;
 
 			if (mpos.y < h) {
-#if 0
-				//seek
-				//int zoomw = settings_limit-name_limit;
-				float scale = _get_zoom_scale();
-				float pos = h_scroll->get_val() + (mpos.y-name_limit) / scale;
-				if (pos<0 )
-					pos=0;
-				if (pos>=animation->get_length())
-					pos=animation->get_length();
-				timeline->set_val(pos);
-#endif
 				return;
 			}
 

editor/call_dialog.cpp

@@ -1,342 +0,0 @@
-/*************************************************************************/
-/*  call_dialog.cpp                                                      */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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.                */
-/*************************************************************************/
-#include "call_dialog.h"
-
-#if 0
-#include "class_db.h"
-#include "print_string.h"
-#include "scene/gui/label.h"
-
-
-class CallDialogParams : public Object {
-
-	GDCLASS( CallDialogParams, Object );
-public:
-
-	bool _set(const StringName& p_name, const Variant& p_value) {
-
-		values[p_name]=p_value;
-                return true;
-	}
-
-	bool _get(const StringName& p_name,Variant &r_ret) const {
-
-            if (values.has(p_name)) {
-                        r_ret=values[p_name];
-                        return true;
-                    }
-                return false;
-	}
-
-	void _get_property_list( List<PropertyInfo> *p_list) const {
-
-		for(int i=0;i<method.arguments.size();i++)
-			p_list->push_back(method.arguments[i]);
-	}
-
-	MethodInfo method;
-	HashMap<String,Variant> values;
-
-	CallDialogParams() {}
-};
-
-
-void CallDialog::_notification(int p_what) {
-
-	if (p_what==NOTIFICATION_READY) {
-
-		call->connect("pressed", this,"_call");
-		cancel->connect("pressed", this,"_cancel");
-		//filter->get_path()->connect("text_changed", this,"_text_changed");
-		_update_method_list();
-	}
-
-	if (p_what==NOTIFICATION_EXIT_TREE) {
-
-		call->disconnect("pressed", this,"_call");
-		cancel->disconnect("pressed", this,"_cancel");
-
-		//filter->get_path()->connect("text_changed", this,"_text_changed");
-		_update_method_list();
-	}
-
-	if (p_what==NOTIFICATION_DRAW) {
-
-		RID ci = get_canvas_item();
-		get_stylebox("panel","PopupMenu")->draw(ci,Rect2(Point2(),get_size()));
-	}
-}
-
-
-void CallDialog::_call() {
-
-	if (!tree->get_selected())
-		return;
-
-	TreeItem* item=tree->get_selected();
-	ERR_FAIL_COND(!item);
-	int idx=item->get_metadata(0);
-	ERR_FAIL_INDEX(idx,methods.size());
-	MethodInfo &m = methods[idx];
-
-	Variant args[VARIANT_ARG_MAX];
-
-	for(int i=0;i<VARIANT_ARG_MAX;i++) {
-
-		if (i>=m.arguments.size())
-			continue;
-
-		if (call_params->values.has(m.arguments[i].name))
-			args[i]=call_params->values[m.arguments[i].name];
-	}
-
-	Variant ret = object->call(m.name,args[0],args[1],args[2],args[3],args[4]);
-	if (ret.get_type()!=Variant::NIL)
-		return_value->set_text(ret);
-	else
-		return_value->set_text("");
-}
-
-void CallDialog::_cancel() {
-
-	hide();
-}
-
-
-void CallDialog::_item_selected() {
-
-	TreeItem* item=tree->get_selected();
-	ERR_FAIL_COND(!item);
-
-	if (item->get_metadata(0).get_type()==Variant::NIL) {
-
-		call->set_disabled(true);
-		return;
-	}
-
-	call->set_disabled(false);
-
-	int idx=item->get_metadata(0);
-	ERR_FAIL_INDEX(idx,methods.size());
-
-	MethodInfo &m = methods[idx];
-
-	call_params->values.clear();
-	call_params->method=m;
-
-	property_editor->edit(call_params);
-	property_editor->update_tree();
-
-
-}
-
-void CallDialog::_update_method_list() {
-
-	tree->clear();
-	if (!object)
-		return;
-
-	TreeItem *root = tree->create_item();
-
-	List<MethodInfo> method_list;
-	object->get_method_list(&method_list);
-	method_list.sort();
-	methods.clear();
-
-	List<String> inheritance_list;
-
-	String type = object->get_class();
-
-	while(type!="") {
-		inheritance_list.push_back( type );
-		type=ClassDB::get_parent_class(type);
-	}
-
-	TreeItem *selected_item=NULL;
-
-	for(int i=0;i<inheritance_list.size();i++) {
-
-		String type=inheritance_list[i];
-		String parent_type=ClassDB::get_parent_class(type);
-
-		TreeItem *type_item=NULL;
-
-		List<MethodInfo>::Element *N,*E=method_list.front();
-
-		while(E) {
-
-			N=E->next();
-
-			if (parent_type!="" && ClassDB::get_method(parent_type,E->get().name)!=NULL) {
-				E=N;
-				continue;
-			}
-
-			if (!type_item) {
-				type_item=tree->create_item(root);
-				type_item->set_text(0,type);
-				if (has_icon(type,"EditorIcons"))
-					type_item->set_icon(0,get_icon(type,"EditorIcons"));
-			}
-
-			TreeItem *method_item = tree->create_item(type_item);
-			method_item->set_text(0,E->get().name);
-			method_item->set_metadata(0,methods.size());
-			if (E->get().name==selected)
-				selected_item=method_item;
-			methods.push_back( E->get() );
-
-			method_list.erase(E);
-			E=N;
-		}
-	}
-
-
-
-	if (selected_item)
-		selected_item->select(0);
-}
-
-void CallDialog::_bind_methods() {
-
-	ClassDB::bind_method("_call",&CallDialog::_call);
-	ClassDB::bind_method("_cancel",&CallDialog::_cancel);
-	ClassDB::bind_method("_item_selected", &CallDialog::_item_selected);
-
-}
-
-void CallDialog::set_object(Object *p_object,StringName p_selected) {
-
-	object=p_object;
-	selected=p_selected;
-	property_editor->edit(NULL);
-	call->set_disabled(true);
-	return_value->clear();
-
-	_update_method_list();
-	method_label->set_text(vformat(TTR("Method List For '%s':"),p_object->get_class()));
-}
-
-CallDialog::CallDialog() {
-
-	object=NULL;
-
-	call = memnew( Button );
-	call->set_anchor( MARGIN_LEFT, ANCHOR_END );
-	call->set_anchor( MARGIN_TOP, ANCHOR_END );
-	call->set_anchor( MARGIN_RIGHT, ANCHOR_END );
-	call->set_anchor( MARGIN_BOTTOM, ANCHOR_END );
-	call->set_begin( Point2( -70, -29 ) );
-	call->set_end( Point2( -15, -15 ) );
-	call->set_text(TTR("Call"));
-
-	add_child(call);
-
-	cancel = memnew( Button );
-	cancel->set_anchor( MARGIN_TOP, ANCHOR_END );
-	cancel->set_anchor( MARGIN_BOTTOM, ANCHOR_END );
-	cancel->set_begin( Point2( -15, 29 ) );
-	cancel->set_end( Point2( 70, -15 ) );
-	cancel->set_text(TTR("Close"));
-
-	add_child(cancel);
-
-	tree = memnew( Tree );
-
-	tree->set_anchor( MARGIN_BOTTOM, ANCHOR_END );
-	tree->set_begin( Point2( 20,50 ) );
-	tree->set_margin(MARGIN_BOTTOM, -44 );
-	tree->set_margin(MARGIN_RIGHT, 0.5 );
-	tree->set_select_mode( Tree::SELECT_ROW );
-	add_child(tree);
-
-	tree->connect("item_selected", this,"_item_selected");
-	tree->set_hide_root(true);
-
-	property_editor = memnew( PropertyEditor );
-
-	property_editor->set_anchor_and_margin( MARGIN_RIGHT, ANCHOR_END, -15 );
-	property_editor->set_anchor_and_margin( MARGIN_TOP, ANCHOR_BEGIN, 50 );
-	//property_editor->set_anchor_and_margin( MARGIN_LEFT, ANCHOR_RATIO, 0.55 );
-	property_editor->set_anchor_and_margin( MARGIN_BOTTOM, ANCHOR_END, -90 );
-	property_editor->get_scene_tree()->set_hide_root( true );
-	property_editor->hide_top_label();
-
-	add_child(property_editor);
-	method_label = memnew(Label);
-	method_label->set_position(Point2( 15,25));
-	method_label->set_text(TTR("Method List:"));
-
-	add_child(method_label);
-
-	Label *label = memnew( Label );
-	//label->set_anchor_and_margin( MARGIN_LEFT, ANCHOR_RATIO, 0.53 );
-	label->set_anchor_and_margin( MARGIN_TOP, ANCHOR_BEGIN, 25 );
-	label->set_text(TTR("Arguments:"));
-
-	add_child(label);
-
-	return_label = memnew( Label );
-	//return_label->set_anchor_and_margin( MARGIN_LEFT, ANCHOR_RATIO, 0.53 );
-	return_label->set_anchor_and_margin( MARGIN_TOP, ANCHOR_END, -85 );
-	return_label->set_text(TTR("Return:"));
-
-	add_child(return_label);
-
-	return_value = memnew( LineEdit );
-	//return_value->set_anchor_and_margin( MARGIN_LEFT, ANCHOR_RATIO, 0.55 );
-	return_value->set_anchor_and_margin( MARGIN_RIGHT, ANCHOR_END, -15 );
-	return_value->set_anchor_and_margin( MARGIN_TOP, ANCHOR_END, -65 );
-
-	add_child(return_value);
-
-	/*
-	label = memnew( Label );
-	label->set_anchor( MARGIN_TOP, ANCHOR_END );
-	label->set_anchor( MARGIN_BOTTOM, ANCHOR_END );
-
-	label->set_begin( Point2( 15,54) );
-	label->set_end( Point2( 16,44) );
-	label->set_text("Parameters:");
-
-	add_child(label);
-	*/
-
-
-	call_params = memnew( CallDialogParams );
-	set_as_toplevel(true);
-}
-
-
-CallDialog::~CallDialog()
-{
-	memdelete(call_params);
-}
-#endif

editor/call_dialog.h

@@ -1,86 +0,0 @@
-/*************************************************************************/
-/*  call_dialog.h                                                        */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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 CALL_DIALOG_H
-#define CALL_DIALOG_H
-
-#include "editor/property_editor.h"
-#include "scene/gui/button.h"
-#include "scene/gui/label.h"
-#include "scene/gui/line_edit.h"
-#include "scene/gui/popup.h"
-#include "scene/gui/tree.h"
-/**
-	@author Juan Linietsky <[email protected]>
-*/
-
-#if 0
-
-class CallDialogParams;
-
-class CallDialog : public Popup {
-
-	GDCLASS( CallDialog, Popup );
-
-
-	Label* method_label;
-	Tree *tree;
-	Button *call;
-	Button *cancel;
-
-	CallDialogParams *call_params;
-	PropertyEditor *property_editor;
-
-	Label *return_label;
-	LineEdit *return_value;
-	Object *object;
-	StringName selected;
-
-	Vector<MethodInfo> methods;
-
-
-	void _item_selected();
-	void _update_method_list();
-	void _call();
-	void _cancel();
-
-protected:
-	static void _bind_methods();
-	void _notification(int p_what);
-public:
-
-	void set_object(Object *p_object,StringName p_selected="");
-
-	CallDialog();
-	~CallDialog();
-
-};
-
-#endif
-#endif

editor/collada/collada.cpp

@@ -31,7 +31,7 @@
 
 #include "collada.h"
 
-#include "stdio.h"
+#include <stdio.h>
 
 //#define DEBUG_DEFAULT_ANIMATION
 //#define DEBUG_COLLADA
@@ -671,15 +671,7 @@ void Collada::_parse_effect_material(XMLParser &parser, Effect &effect, String &
 							}
 
 						} else if (what == "shininess") {
-#if 1
 							effect.shininess = _parse_param(parser);
-#else
-
-							parser.read();
-							float shininess = parser.get_node_data().to_double();
-							effect.shininess = shininess;
-							COLLADA_PRINT("shininess: " + rtos(shininess));
-#endif
 						}
 					} else if (parser.get_node_type() == XMLParser::NODE_ELEMENT_END && (parser.get_node_name() == "constant" ||
 																								parser.get_node_name() == "lambert" ||
@@ -2505,7 +2497,7 @@ void Collada::_optimize() {
 		for (int i = 0; i < vs.root_nodes.size(); i++) {
 			_create_skeletons(&vs.root_nodes[i]);
 		}
-#if 1
+
 		for (int i = 0; i < vs.root_nodes.size(); i++) {
 			_merge_skeletons(&vs, vs.root_nodes[i]);
 		}
@@ -2531,7 +2523,7 @@ void Collada::_optimize() {
 				mgeom.pop_front();
 			}
 		}
-#endif
+
 		for (int i = 0; i < vs.root_nodes.size(); i++) {
 			_find_morph_nodes(&vs, vs.root_nodes[i]);
 		}

editor/connections_dialog.cpp

@@ -113,33 +113,7 @@ void ConnectDialog::_tree_node_selected() {
 		make_callback->hide();
 	else
 		make_callback->show();
-#if 0
-	List<MethodInfo> methods;
-	current->get_method_list(&methods);
-	for (List<MethodInfo>::Element *E=methods.front();E;E=E->next()) {
-
-		if (E->get().name.length() && E->get().name[0]=='_')
-			continue; // hidden method, not show!
-
-		if (ClassDB::has_method(node->get_type(),"Node") || ClassDB::has_method(node->get_type(),"Control",true))
-			continue; //avoid too much unnecessary stuff
-
-		String method=E->get().name+"(";
-		for(int i=0;i<E->get().arguments.size();i++) {
-
-			if (i!=0)
-				method+=", ";
-			method+=Variant::get_type_name(E->get().arguments[i].type);
-			if (E->get().arguments[i].name.length()) {
-				method+=" ";
-				method+=E->get().arguments[i].name;
-			}
-		}
-		method+=")";
 
-		//dst_method_list->get_popup()->add_item(method);
-	}
-#endif
 	dst_path->set_text(node->get_path_to(current));
 }
 

editor/editor_export.cpp

@@ -1169,2205 +1169,3 @@ void EditorExportPlatformPC::get_platform_features(List<String> *r_features) {
 
 EditorExportPlatformPC::EditorExportPlatformPC() {
 }
-
-////////
-
-#if 0
-#include "editor/editor_file_system.h"
-#include "editor/plugins/script_editor_plugin.h"
-#include "editor_node.h"
-#include "editor_settings.h"
-#include "io/config_file.h"
-#include "io/md5.h"
-#include "io/resource_loader.h"
-#include "io/resource_saver.h"
-#include "io/zip_io.h"
-#include "io_plugins/editor_texture_import_plugin.h"
-#include "os/dir_access.h"
-#include "os/file_access.h"
-#include "project_settings.h"
-#include "script_language.h"
-#include "version.h"
-
-
-String EditorImportPlugin::validate_source_path(const String& p_path) {
-
-	String gp = ProjectSettings::get_singleton()->globalize_path(p_path);
-	String rp = ProjectSettings::get_singleton()->get_resource_path();
-	if (!rp.ends_with("/"))
-		rp+="/";
-
-	return rp.path_to_file(gp);
-}
-
-String EditorImportPlugin::expand_source_path(const String& p_path) {
-
-	if (p_path.is_rel_path()) {
-		return ProjectSettings::get_singleton()->get_resource_path().plus_file(p_path).simplify_path();
-	} else {
-		return p_path;
-	}
-}
-
-
-String EditorImportPlugin::_validate_source_path(const String& p_path) {
-
-	return validate_source_path(p_path);
-}
-
-String EditorImportPlugin::_expand_source_path(const String& p_path) {
-
-	return expand_source_path(p_path);
-}
-
-void EditorImportPlugin::_bind_methods() {
-
-
-	ClassDB::bind_method(D_METHOD("validate_source_path","path"),&EditorImportPlugin::_validate_source_path);
-	ClassDB::bind_method(D_METHOD("expand_source_path","path"),&EditorImportPlugin::_expand_source_path);
-
-	ClassDB::add_virtual_method(get_class_static(),MethodInfo(Variant::STRING,"get_name"));
-	ClassDB::add_virtual_method(get_class_static(),MethodInfo(Variant::STRING,"get_visible_name"));
-	ClassDB::add_virtual_method(get_class_static(),MethodInfo("import_dialog",PropertyInfo(Variant::STRING,"from")));
-	ClassDB::add_virtual_method(get_class_static(),MethodInfo(Variant::INT,"import",PropertyInfo(Variant::STRING,"path"),PropertyInfo(Variant::OBJECT,"from",PROPERTY_HINT_RESOURCE_TYPE,"ResourceImportMetadata")));
-	ClassDB::add_virtual_method(get_class_static(),MethodInfo(Variant::POOL_BYTE_ARRAY,"custom_export",PropertyInfo(Variant::STRING,"path"),PropertyInfo(Variant::OBJECT,"platform",PROPERTY_HINT_RESOURCE_TYPE,"EditorExportPlatform")));
-	ClassDB::add_virtual_method(get_class_static(),MethodInfo("import_from_drop",PropertyInfo(Variant::POOL_STRING_ARRAY,"files"),PropertyInfo(Variant::STRING,"dest_path")));
-	ClassDB::add_virtual_method(get_class_static(),MethodInfo("reimport_multiple_files",PropertyInfo(Variant::POOL_STRING_ARRAY,"files")));
-	ClassDB::add_virtual_method(get_class_static(),MethodInfo(Variant::BOOL,"can_reimport_multiple_files"));
-
-	//BIND_VMETHOD( mi );
-}
-
-String EditorImportPlugin::get_name() const {
-
-	if (get_script_instance() && get_script_instance()->has_method("get_name")) {
-		return get_script_instance()->call("get_name");
-	}
-
-	ERR_FAIL_V("");
-}
-
-String EditorImportPlugin::get_visible_name() const {
-
-	if (get_script_instance() && get_script_instance()->has_method("get_visible_name")) {
-		return get_script_instance()->call("get_visible_name");
-	}
-
-	ERR_FAIL_V("");
-}
-
-
-void EditorImportPlugin::import_dialog(const String& p_from) {
-
-	if (get_script_instance() && get_script_instance()->has_method("import_dialog")) {
-		get_script_instance()->call("import_dialog",p_from);
-		return;
-	}
-
-	ERR_FAIL();
-
-}
-
-Error EditorImportPlugin::import(const String& p_path, const Ref<ResourceImportMetadata>& p_from) {
-
-	if (get_script_instance() && get_script_instance()->has_method("import")) {
-		return Error(get_script_instance()->call("import",p_path,p_from).operator int());
-	}
-
-	ERR_FAIL_V(ERR_UNAVAILABLE);
-}
-
-Vector<uint8_t> EditorImportPlugin::custom_export(const String& p_path, const Ref<EditorExportPlatform> &p_platform) {
-
-	if (get_script_instance() && get_script_instance()->has_method("custom_export")) {
-		get_script_instance()->call("custom_export",p_path,p_platform);
-	}
-
-	return Vector<uint8_t>();
-}
-
-bool EditorImportPlugin::can_reimport_multiple_files() const {
-
-	if (get_script_instance() && get_script_instance()->has_method("can_reimport_multiple_files")) {
-		return get_script_instance()->call("can_reimport_multiple_files");
-	}
-
-	return false;
-}
-void EditorImportPlugin::reimport_multiple_files(const Vector<String>& p_list) {
-
-	if (get_script_instance() && get_script_instance()->has_method("reimport_multiple_files")) {
-		get_script_instance()->call("reimport_multiple_files",p_list);
-	}
-
-}
-
-void EditorImportPlugin::import_from_drop(const Vector<String>& p_drop, const String &p_dest_path) {
-
-	if (get_script_instance() && get_script_instance()->has_method("import_from_drop")) {
-		get_script_instance()->call("import_from_drop",p_drop,p_dest_path);
-	}
-
-}
-
-EditorImportPlugin::EditorImportPlugin() {
-
-
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-void EditorExportPlugin::_bind_methods() {
-
-	MethodInfo mi = MethodInfo("custom_export:Variant",PropertyInfo(Variant::STRING,"name"),PropertyInfo(Variant::OBJECT,"platform",PROPERTY_HINT_RESOURCE_TYPE,"EditorExportPlatform"));
-	mi.return_val.type=Variant::POOL_BYTE_ARRAY;
-
-	BIND_VMETHOD( mi );
-}
-
-
-Vector<uint8_t> EditorExportPlugin::custom_export(String& p_path,const Ref<EditorExportPlatform> &p_platform) {
-
-	if (get_script_instance()) {
-
-		Variant d = get_script_instance()->call("custom_export",p_path,p_platform);
-		if (d.get_type()==Variant::NIL)
-			return Vector<uint8_t>();
-		if (d.get_type()==Variant::POOL_BYTE_ARRAY)
-			return d;
-
-		ERR_FAIL_COND_V(d.get_type()!=Variant::DICTIONARY,Vector<uint8_t>());
-		Dictionary dict=d;
-		ERR_FAIL_COND_V(!dict.has("name"),Vector<uint8_t>());
-		ERR_FAIL_COND_V(!dict.has("data"),Vector<uint8_t>());
-		p_path=dict["name"];
-		return dict["data"];
-	}
-
-	return Vector<uint8_t>();
-
-}
-
-
-EditorExportPlugin::EditorExportPlugin() {
-
-
-}
-
-/////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-
-static void _add_to_list(EditorFileSystemDirectory *p_efsd,Set<StringName>& r_list) {
-
-	for(int i=0;i<p_efsd->get_subdir_count();i++) {
-
-		_add_to_list(p_efsd->get_subdir(i),r_list);
-	}
-
-	for(int i=0;i<p_efsd->get_file_count();i++) {
-		r_list.insert(p_efsd->get_file_path(i));
-	}
-}
-
-
-struct __EESortDepCmp {
-
-	_FORCE_INLINE_ bool operator()(const StringName& p_l,const StringName& p_r) const {
-		return p_l.operator String() < p_r.operator String();
-	}
-};
-
-
-
-
-static void _edit_files_with_filter(DirAccess *da,const List<String>& p_filters,Set<StringName>& r_list,bool exclude) {
-
-
-	List<String> files;
-	List<String> dirs;
-
-	da->list_dir_begin();
-
-	String f = da->get_next();
-	while(f!="") {
-
-		print_line("HOHO: "+f);
-		if (da->current_is_dir())
-			dirs.push_back(f);
-		else
-			files.push_back(f);
-
-		f=da->get_next();
-	}
-
-	String r = da->get_current_dir().replace("\\","/");
-	if (!r.ends_with("/"))
-		r+="/";
-
-	print_line("AT: "+r);
-
-	for(List<String>::Element *E=files.front();E;E=E->next()) {
-		String fullpath=r+E->get();
-		for(const List<String>::Element *F=p_filters.front();F;F=F->next()) {
-
-			if (fullpath.matchn(F->get())) {
-				String act = TTR("Added:")+" ";
-
-				if (!exclude) {
-					r_list.insert(fullpath);
-				} else {
-					act = TTR("Removed:")+" ";
-					r_list.erase(fullpath);
-				}
-
-
-				print_line(act+fullpath);
-			}
-		}
-	}
-
-	da->list_dir_end();
-
-	for(List<String>::Element *E=dirs.front();E;E=E->next()) {
-		if (E->get().begins_with("."))
-			continue;
-		da->change_dir(E->get());
-		_edit_files_with_filter(da,p_filters,r_list,exclude);
-		da->change_dir("..");
-	}
-
-}
-
-static void _edit_filter_list(Set<StringName>& r_list,const String& p_filter,bool exclude) {
-
-	if (p_filter=="")
-		return;
-	Vector<String> split = p_filter.split(",");
-	List<String> filters;
-	for(int i=0;i<split.size();i++) {
-		String f = split[i].strip_edges();
-		if (f.empty())
-			continue;
-		filters.push_back(f);
-	}
-
-	DirAccess *da = DirAccess::open("res://");
-	ERR_FAIL_NULL(da);
-	_edit_files_with_filter(da,filters,r_list,exclude);
-	memdelete(da);
-}
-
-static void _add_filter_to_list(Set<StringName>& r_list,const String& p_filter) {
-	_edit_filter_list(r_list,p_filter,false);
-}
-
-static void _remove_filter_from_list(Set<StringName>& r_list,const String& p_filter) {
-	_edit_filter_list(r_list,p_filter,true);
-}
-
-bool EditorExportPlatform::_set(const StringName& p_name, const Variant& p_value) {
-
-	String n = p_name;
-
-	if (n=="debug/debugging_enabled") {
-		set_debugging_enabled(p_value);
-	} else {
-		return false;
-	}
-
-	return true;
-
-}
-
-bool EditorExportPlatform::_get(const StringName& p_name,Variant &r_ret) const {
-
-	String n = p_name;
-
-	if (n=="debug/debugging_enabled") {
-		r_ret=is_debugging_enabled();
-	} else {
-		return false;
-	}
-
-	return true;
-
-}
-
-void EditorExportPlatform::_get_property_list( List<PropertyInfo> *p_list) const {
-
-	p_list->push_front( PropertyInfo( Variant::BOOL, "debug/debugging_enabled"));
-}
-
-Vector<uint8_t> EditorExportPlatform::get_exported_file_default(String& p_fname) const {
-
-	FileAccess *f = FileAccess::open(p_fname,FileAccess::READ);
-	ERR_FAIL_COND_V(!f,Vector<uint8_t>());
-	Vector<uint8_t> ret;
-	ret.resize(f->get_len());
-	int rbs = f->get_buffer(ret.ptr(),ret.size());
-	memdelete(f);
-	return ret;
-}
-
-Vector<uint8_t> EditorExportPlatform::get_exported_file(String& p_fname) const {
-
-	Ref<EditorExportPlatform> ep=EditorImportExport::get_singleton()->get_export_platform(get_name());
-
-	for(int i=0;i<EditorImportExport::get_singleton()->get_export_plugin_count();i++) {
-
-		Vector<uint8_t> data = EditorImportExport::get_singleton()->get_export_plugin(i)->custom_export(p_fname,ep);
-		if (data.size())
-			return data;
-
-	}
-
-
-	return get_exported_file_default(p_fname);
-
-
-}
-
-Vector<StringName> EditorExportPlatform::get_dependencies(bool p_bundles) const {
-
-
-	Set<StringName> exported;
-
-	if (FileAccess::exists("res://project.godot"))
-		exported.insert("res://project.godot");
-
-	if (EditorImportExport::get_singleton()->get_export_filter()!=EditorImportExport::EXPORT_SELECTED) {
-
-		String filter;
-		if (EditorImportExport::get_singleton()->get_export_filter()==EditorImportExport::EXPORT_ALL) {
-			_add_filter_to_list(exported,"*");
-		} else {
-			_add_to_list(EditorFileSystem::get_singleton()->get_filesystem(),exported);
-			String cf = EditorImportExport::get_singleton()->get_export_custom_filter();
-			if (cf!="")
-				cf+=",";
-			cf+="*.flags";
-			_add_filter_to_list(exported,cf);
-
-			cf = EditorImportExport::get_singleton()->get_export_custom_filter_exclude();
-			_remove_filter_from_list(exported,cf);
-		}
-
-
-	} else {
-
-
-		Map<String,Map<String,String> > remapped_paths;
-
-		Set<String> scene_extensions;
-		Set<String> resource_extensions;
-
-		{
-
-			List<String> l;
-			/*
-			SceneLoader::get_recognized_extensions(&l);
-			for(List<String>::Element *E=l.front();E;E=E->next()) {
-				scene_extensions.insert(E->get());
-			}
-			*/
-			ResourceLoader::get_recognized_extensions_for_type("",&l);
-			for(List<String>::Element *E=l.front();E;E=E->next()) {
-
-				resource_extensions.insert(E->get());
-			}
-		}
-
-
-		List<StringName> toexport;
-
-		EditorImportExport::get_singleton()->get_export_file_list(&toexport);
-
-		print_line("TO EXPORT: "+itos(toexport.size()));
-
-
-		for (List<StringName>::Element *E=toexport.front();E;E=E->next()) {
-
-			print_line("DEP: "+String(E->get()));
-			exported.insert(E->get());
-			if (p_bundles && EditorImportExport::get_singleton()->get_export_file_action(E->get())==EditorImportExport::ACTION_BUNDLE) {
-				print_line("NO BECAUSE OF BUNDLE!");
-				continue; //no dependencies needed to be copied
-			}
-
-			List<String> testsubs;
-			testsubs.push_back(E->get());
-
-			while(testsubs.size()) {
-				//recursive subdep search!
-				List<String> deplist;
-				ResourceLoader::get_dependencies(testsubs.front()->get(),&deplist);
-				testsubs.pop_front();
-
-				List<String> subdeps;
-
-				for (List<String>::Element *F=deplist.front();F;F=F->next()) {
-
-					StringName dep = F->get();
-
-					if (exported.has(dep) || EditorImportExport::get_singleton()->get_export_file_action(dep)!=EditorImportExport::ACTION_NONE)
-						continue; //dependency added or to be added
-					print_line(" SUBDEP: "+String(dep));
-
-					exported.insert(dep);
-					testsubs.push_back(dep);
-				}
-			}
-		}
-		String cf = EditorImportExport::get_singleton()->get_export_custom_filter();
-		if (cf!="")
-			cf+=",";
-		cf+="*.flags";
-		_add_filter_to_list(exported,cf);
-
-		cf = EditorImportExport::get_singleton()->get_export_custom_filter_exclude();
-		_remove_filter_from_list(exported,cf);
-
-
-	}
-
-	Vector<StringName> ret;
-	ret.resize(exported.size());
-
-
-	int idx=0;
-	for(Set<StringName>::Element *E=exported.front();E;E=E->next()) {
-
-		ret[idx++]=E->get();
-
-	}
-
-	SortArray<StringName,__EESortDepCmp> sort; //some platforms work better if this is sorted
-	sort.sort(ret.ptr(),ret.size());
-
-	return ret;
-
-}
-
-///////////////////////////////////////
-
-
-
-bool EditorExportPlatform::is_debugging_enabled() const {
-
-	return debugging_enabled;
-}
-
-void EditorExportPlatform::set_debugging_enabled(bool p_enabled) {
-
-	debugging_enabled = p_enabled;
-}
-
-bool EditorExportPlatformPC::_set(const StringName& p_name, const Variant& p_value) {
-
-	String n = p_name;
-
-	if (n=="custom_binary/release") {
-
-		custom_release_binary=p_value;
-	} else if (n=="custom_binary/debug") {
-
-		custom_debug_binary=p_value;
-	} else if (n=="resources/pack_mode") {
-
-		export_mode=ExportMode(int(p_value));
-	} else if (n=="resources/bundle_dependencies_(for_optical_disc)") {
-
-		bundle=p_value;
-	} else if (n=="binary/64_bits") {
-
-		use64=p_value;
-	} else
-		return false;
-
-	return true;
-
-}
-
-bool EditorExportPlatformPC::_get(const StringName& p_name,Variant &r_ret) const {
-
-	String n = p_name;
-
-	if (n=="custom_binary/release") {
-
-		r_ret=custom_release_binary;
-	} else if (n=="custom_binary/debug") {
-
-		r_ret=custom_debug_binary;
-	} else if (n=="resources/pack_mode") {
-
-		r_ret=export_mode;
-	} else if (n=="resources/bundle_dependencies_(for_optical_disc)") {
-
-		r_ret=bundle;
-	} else if (n=="binary/64_bits") {
-
-		r_ret=use64;
-	} else
-		return false;
-
-	return true;
-
-}
-
-void EditorExportPlatformPC::_get_property_list( List<PropertyInfo> *p_list) const {
-
-	p_list->push_back( PropertyInfo( Variant::STRING, "custom_binary/debug", PROPERTY_HINT_GLOBAL_FILE,binary_extension));
-	p_list->push_back( PropertyInfo( Variant::STRING, "custom_binary/release", PROPERTY_HINT_GLOBAL_FILE,binary_extension));
-	p_list->push_back( PropertyInfo( Variant::INT, "resources/pack_mode", PROPERTY_HINT_ENUM,"Pack into executable,Pack into binary file (.pck),Pack into archive file (.zip)"));
-	p_list->push_back( PropertyInfo( Variant::BOOL, "resources/bundle_dependencies_(for_optical_disc)"));
-	p_list->push_back( PropertyInfo( Variant::BOOL, "binary/64_bits"));
-}
-
-
-
-static void _exp_add_dep(Map<StringName,List<StringName> > &deps,const StringName& p_path) {
-
-
-	if (deps.has(p_path))
-		return; //already done
-
-	deps.insert(p_path,List<StringName>());
-
-	List<StringName> &deplist=deps[p_path];
-	Set<StringName> depset;
-
-	List<String> dl;
-	ResourceLoader::get_dependencies(p_path,&dl);
-
-	//added in order so child dependencies are always added bfore parent dependencies
-	for (List<String>::Element *E=dl.front();E;E=E->next()) {
-
-
-		if (!deps.has(E->get()))
-			_exp_add_dep(deps,E->get());
-
-		for(List<StringName>::Element *F=deps[E->get()].front();F;F=F->next()) {
-
-
-			if (!depset.has(F->get())) {
-				depset.insert(F->get());
-				deplist.push_back(F->get());
-			}
-		}
-
-		if (!depset.has(E->get())) {
-			depset.insert(E->get());
-			deplist.push_back(E->get());
-		}
-
-	}
-}
-
-
-
-Error EditorExportPlatform::export_project_files(EditorExportSaveFunction p_func, void* p_udata,bool p_make_bundles) {
-
-/* ALL FILES AND DEPENDENCIES */
-
-	Vector<StringName> files=get_dependencies(p_make_bundles);
-
-	Map<StringName,List<StringName> > deps;
-
-	if (false) {
-		for(int i=0;i<files.size();i++) {
-
-			_exp_add_dep(deps,files[i]);
-
-		}
-	}
-
-
-
-/* GROUP ATLAS */
-
-
-	List<StringName> groups;
-
-	EditorImportExport::get_singleton()->image_export_get_groups(&groups);
-
-	Map<StringName,StringName> remap_files;
-	Set<StringName> saved;
-
-	int counter=0;
-
-	for(List<StringName>::Element *E=groups.front();E;E=E->next()) {
-
-		if (!EditorImportExport::get_singleton()->image_export_group_get_make_atlas(E->get()))
-			continue; //uninterested, only process for atlas!
-
-		List<StringName> atlas_images;
-		EditorImportExport::get_singleton()->image_export_get_images_in_group(E->get(),&atlas_images);
-		atlas_images.sort_custom<StringName::AlphCompare>();
-
-		for (List<StringName>::Element *F=atlas_images.front();F;) {
-
-			List<StringName>::Element *N=F->next();
-
-			if (!FileAccess::exists(F->get())) {
-				atlas_images.erase(F);
-			}
-
-			F=N;
-
-		}
-
-		if (atlas_images.size()<=1)
-			continue;
-
-		int group_format=0;
-		float group_lossy_quality=EditorImportExport::get_singleton()->image_export_group_get_lossy_quality(E->get());
-		int group_shrink=EditorImportExport::get_singleton()->image_export_group_get_shrink(E->get());
-		group_shrink*=EditorImportExport::get_singleton()->get_export_image_shrink();
-
-		switch(EditorImportExport::get_singleton()->image_export_group_get_image_action(E->get())) {
-			case EditorImportExport::IMAGE_ACTION_KEEP:
-			case EditorImportExport::IMAGE_ACTION_NONE: {
-
-				switch(EditorImportExport::get_singleton()->get_export_image_action()) {
-					case EditorImportExport::IMAGE_ACTION_NONE: {
-
-						group_format=EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_DISK_LOSSLESS; //?
-
-					} break; //use default
-					case EditorImportExport::IMAGE_ACTION_COMPRESS_DISK: {
-						group_format=EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_DISK_LOSSY;
-					} break; //use default
-					case EditorImportExport::IMAGE_ACTION_COMPRESS_RAM: {
-						group_format=EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_RAM;
-					} break; //use default
-				}
-
-				group_lossy_quality=EditorImportExport::get_singleton()->get_export_image_quality();
-
-			} break; //use default
-			case EditorImportExport::IMAGE_ACTION_COMPRESS_DISK: {
-				group_format=EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_DISK_LOSSY;
-			} break; //use default
-			case EditorImportExport::IMAGE_ACTION_COMPRESS_RAM: {
-				group_format=EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_RAM;
-			} break; //use default
-		}
-
-		String image_list_md5;
-
-		{
-			MD5_CTX ctx;
-			MD5Init(&ctx);
-			for (List<StringName>::Element *F=atlas_images.front();F;F=F->next()) {
-
-				String p = F->get();
-				MD5Update(&ctx,(unsigned char*)p.utf8().get_data(),p.utf8().length());
-
-			}
-
-			MD5Final(&ctx);
-			image_list_md5=String::md5(ctx.digest);
-		}
-		//ok see if cached
-		String md5;
-		bool atlas_valid=true;
-		String atlas_name;
-
-		{
-			MD5_CTX ctx;
-			MD5Init(&ctx);
-			String path = ProjectSettings::get_singleton()->get_resource_path()+"::"+String(E->get())+"::"+get_name();
-			MD5Update(&ctx,(unsigned char*)path.utf8().get_data(),path.utf8().length());
-			MD5Final(&ctx);
-			md5 = String::md5(ctx.digest);
-		}
-
-		FileAccess *f=NULL;
-
-		if (!FileAccess::exists(EditorSettings::get_singleton()->get_settings_path()+"/tmp/atlas-"+md5)) {
-			print_line("NO MD5 INVALID");
-			atlas_valid=false;
-		}
-
-		if (atlas_valid)
-			f=FileAccess::open(EditorSettings::get_singleton()->get_settings_path()+"/tmp/atlas-"+md5,FileAccess::READ);
-
-		if (atlas_valid) {
-			//compare options
-			/*Dictionary options;
-			options.parse_json(f->get_line());
-			if (!options.has("lossy_quality") || float(options["lossy_quality"])!=group_lossy_quality)
-				atlas_valid=false;
-			else if (!options.has("shrink") || int(options["shrink"])!=group_shrink)
-				atlas_valid=false;
-			else if (!options.has("image_format") || int(options["image_format"])!=group_format)
-				atlas_valid=false;
-
-			if (!atlas_valid)
-				print_line("JSON INVALID");
-*/
-		}
-
-
-		if (atlas_valid) {
-			//check md5 of list of image /names/
-			if (f->get_line().strip_edges()!=image_list_md5) {
-				atlas_valid=false;
-				print_line("IMAGE MD5 INVALID!");
-			}
-
-		}
-
-		Vector<Rect2> rects;
-		bool resave_deps=false;
-
-		if (atlas_valid) {
-
-			//check if images were not modified
-			for (List<StringName>::Element *F=atlas_images.front();F;F=F->next()) {
-
-				Vector<String> slices = f->get_line().strip_edges().split("::");
-
-				if (slices.size()!=10) {
-					atlas_valid=false;
-					print_line("CAN'T SLICE IN 10");
-					break;
-				}
-				uint64_t mod_time = slices[0].to_int64();
-				uint64_t file_mod_time = FileAccess::get_modified_time(F->get());
-				if (mod_time!=file_mod_time) {
-
-					String image_md5 = slices[1];
-					String file_md5 = FileAccess::get_md5(F->get());
-
-					if (image_md5!=file_md5) {
-						atlas_valid=false;
-						print_line("IMAGE INVALID "+slices[0]);
-						break;
-					} else {
-						resave_deps=true;
-					}
-				}
-
-				if (atlas_valid) {
-					//push back region and margin
-					rects.push_back(Rect2(slices[2].to_float(),slices[3].to_float(),slices[4].to_float(),slices[5].to_float()));
-					rects.push_back(Rect2(slices[6].to_float(),slices[7].to_float(),slices[8].to_float(),slices[9].to_float()));
-				}
-			}
-
-		}
-
-		if (f) {
-			memdelete(f);
-			f=NULL;
-		}
-
-		print_line("ATLAS VALID? "+itos(atlas_valid)+" RESAVE DEPS? "+itos(resave_deps));
-		if (!atlas_valid) {
-			rects.clear();
-			//oh well, atlas is not valid. need to make new one....
-
-			String dst_file = EditorSettings::get_singleton()->get_settings_path()+"/tmp/atlas-"+md5+".tex";
-			Ref<ResourceImportMetadata> imd = memnew( ResourceImportMetadata );
-			//imd->set_editor();
-
-
-			for (List<StringName>::Element *F=atlas_images.front();F;F=F->next()) {
-
-				imd->add_source(EditorImportPlugin::validate_source_path(F->get()),FileAccess::get_md5(F->get()));
-
-			}
-
-
-			imd->set_option("format",group_format);
-
-
-			int flags=0;
-
-			if (ProjectSettings::get_singleton()->get("image_loader/filter"))
-				flags|=EditorTextureImportPlugin::IMAGE_FLAG_FILTER;
-			if (!ProjectSettings::get_singleton()->get("image_loader/gen_mipmaps"))
-				flags|=EditorTextureImportPlugin::IMAGE_FLAG_NO_MIPMAPS;
-			if (!ProjectSettings::get_singleton()->get("image_loader/repeat"))
-				flags|=EditorTextureImportPlugin::IMAGE_FLAG_REPEAT;
-
-			flags|=EditorTextureImportPlugin::IMAGE_FLAG_FIX_BORDER_ALPHA;
-
-			imd->set_option("flags",flags);
-			imd->set_option("quality",group_lossy_quality);
-			imd->set_option("atlas",true);
-			imd->set_option("crop",true);
-			imd->set_option("shrink",group_shrink);
-
-
-
-			Ref<EditorTextureImportPlugin> plugin = EditorImportExport::get_singleton()->get_import_plugin_by_name("texture");
-			Error err = plugin->import2(dst_file,imd,get_image_compression(),true);
-			if (err) {
-
-				EditorNode::add_io_error(TTR("Error saving atlas:")+" "+dst_file.get_file());
-				return ERR_CANT_CREATE;
-			}
-
-			ERR_FAIL_COND_V(imd->get_option("rects")==Variant(),ERR_BUG);
-
-			Array r_rects=imd->get_option("rects");
-			rects.resize(r_rects.size());
-			for(int i=0;i<r_rects.size();i++) {
-				//get back region and margins
-				rects[i]=r_rects[i];
-			}
-
-
-			resave_deps=true;
-		}
-
-
-		//atlas is valid (or it was just saved i guess), create the atex files and save them
-
-		if (resave_deps) {
-			f=FileAccess::open(EditorSettings::get_singleton()->get_settings_path()+"/tmp/atlas-"+md5,FileAccess::WRITE);
-			Dictionary options;
-			options["lossy_quality"]=group_lossy_quality;
-			options["shrink"]=EditorImportExport::get_singleton()->image_export_group_get_shrink(E->get());
-			options["image_format"]=group_format;
-			//f->store_line(options.to_json());
-			f->store_line(image_list_md5);
-		}
-
-		//go through all ATEX files
-
-		{
-			Ref<ImageTexture> atlas = memnew( ImageTexture ); //fake atlas!
-			String atlas_path="res://atlas-"+md5+".tex";
-			atlas->set_path(atlas_path);
-			int idx=0;
-			for (List<StringName>::Element *F=atlas_images.front();F;F=F->next()) {
-
-				String p = F->get();
-				Ref<AtlasTexture> atex = memnew(AtlasTexture);
-				atex->set_atlas(atlas);
-				Rect2 region=rects[idx++];
-				Rect2 margin=rects[idx++];
-				atex->set_region(region);
-				atex->set_margin(margin);
-
-				String path = EditorSettings::get_singleton()->get_settings_path()+"/tmp/tmpatlas.atlastex";
-				Error err = ResourceSaver::save(path,atex);
-				if (err!=OK) {
-					EditorNode::add_io_error(TTR("Could not save atlas subtexture:")+" "+path);
-					return ERR_CANT_CREATE;
-				}
-				Vector<uint8_t> data = FileAccess::get_file_as_array(path);
-				String dst_path = F->get().operator String().get_basename()+".atlastex";
-				err = p_func(p_udata,dst_path,data,counter++,files.size());
-				saved.insert(dst_path);
-				if (err)
-					return err;
-
-				if (f) {
-					//recreating deps..
-					String depline;
-					//depline=String(F->get())+"::"+itos(FileAccess::get_modified_time(F->get()))+"::"+FileAccess::get_md5(F->get()); name unnecessary by top md5
-					depline=itos(FileAccess::get_modified_time(F->get()))+"::"+FileAccess::get_md5(F->get());
-					depline+="::"+itos(region.pos.x)+"::"+itos(region.pos.y)+"::"+itos(region.size.x)+"::"+itos(region.size.y);
-					depline+="::"+itos(margin.pos.x)+"::"+itos(margin.pos.y)+"::"+itos(margin.size.x)+"::"+itos(margin.size.y);
-					f->store_line(depline);
-				}
-
-				remap_files[F->get()]=dst_path;
-			}
-
-			Vector<uint8_t> atlas_data = FileAccess::get_file_as_array(EditorSettings::get_singleton()->get_settings_path()+"/tmp/atlas-"+md5+".tex");
-			Error err = p_func(p_udata,atlas_path,atlas_data,counter,files.size());
-			saved.insert(atlas_path);
-			if (err)
-				return err;
-
-		}
-
-
-		if (f) {
-			memdelete(f);
-		}
-
-	}
-
-
-	StringName engine_cfg="res://project.godot";
-	StringName boot_splash;
-	{
-		String splash=ProjectSettings::get_singleton()->get("application/boot_splash"); //avoid splash from being converted
-		splash=splash.strip_edges();
-		if (splash!=String()) {
-			if (!splash.begins_with("res://"))
-				splash="res://"+splash;
-			splash=splash.simplify_path();
-			boot_splash=splash;
-		}
-	}
-	StringName custom_cursor;
-	{
-		String splash=ProjectSettings::get_singleton()->get("display/custom_mouse_cursor"); //avoid splash from being converted
-		splash=splash.strip_edges();
-		if (splash!=String()) {
-			if (!splash.begins_with("res://"))
-				splash="res://"+splash;
-			splash=splash.simplify_path();
-			custom_cursor=splash;
-		}
-	}
-
-
-
-
-	for(int i=0;i<files.size();i++) {
-
-		if (remap_files.has(files[i]) || files[i]==engine_cfg) //gonna be remapped (happened before!)
-			continue; //from atlas?
-		String src=files[i];
-		Vector<uint8_t> buf;
-
-		if (src==boot_splash || src==custom_cursor)
-			buf = get_exported_file_default(src); //bootsplash must be kept if used
-		else
-			buf = get_exported_file(src);
-
-		ERR_CONTINUE( saved.has(src) );
-
-		Error err = p_func(p_udata,src,buf,counter++,files.size());
-		if (err)
-			return err;
-
-		saved.insert(src);
-		if (src!=String(files[i]))
-			remap_files[files[i]]=src;
-
-	}
-
-
-	{
-
-		//make binary project.godot config
-		Map<String,Variant> custom;
-
-
-		if (remap_files.size()) {
-			Vector<String> remapsprop;
-			for(Map<StringName,StringName>::Element *E=remap_files.front();E;E=E->next()) {
-				print_line("REMAP: "+String(E->key())+" -> "+E->get());
-				remapsprop.push_back(E->key());
-				remapsprop.push_back(E->get());
-			}
-
-			custom["remap/all"]=remapsprop;
-		}
-
-		//add presaved dependencies
-		for(Map<StringName,List<StringName> >::Element *E=deps.front();E;E=E->next()) {
-
-			if (E->get().size()==0)
-				continue; //no deps
-			String key;
-			Vector<StringName> deps;
-			//if bundle continue (when bundles supported obviously)
-
-			if (remap_files.has(E->key())) {
-				key=remap_files[E->key()];
-			} else {
-				key=E->key();
-			}
-
-			deps.resize(E->get().size());
-			int i=0;
-
-			for(List<StringName>::Element *F=E->get().front();F;F=F->next()) {
-				deps[i++]=F->get();
-				print_line(" -"+String(F->get()));
-			}
-
-			NodePath prop(deps,true,String()); //seems best to use this for performance
-
-			custom["deps/"+key.md5_text()]=prop;
-
-		}
-
-		String remap_file="project.binary";
-		String engine_cfb =EditorSettings::get_singleton()->get_settings_path()+"/tmp/tmp"+remap_file;
-		ProjectSettings::get_singleton()->save_custom(engine_cfb,custom);
-		Vector<uint8_t> data = FileAccess::get_file_as_array(engine_cfb);
-
-		Error err = p_func(p_udata,"res://"+remap_file,data,counter,files.size());
-		if (err)
-			return err;
-
-	}
-
-	return OK;
-}
-
-static int _get_pad(int p_alignment, int p_n) {
-
-	int rest = p_n % p_alignment;
-	int pad = 0;
-	if (rest > 0) {
-		pad = p_alignment - rest;
-	};
-
-	return pad;
-};
-
-void EditorExportPlatform::gen_export_flags(Vector<String> &r_flags, int p_flags) {
-
-	String host = EditorSettings::get_singleton()->get("network/debug/remote_host");
-	int remote_port = (int)EditorSettings::get_singleton()->get("network/debug/remote_port");
-
-	if (p_flags&EXPORT_REMOTE_DEBUG_LOCALHOST)
-		host="localhost";
-
-	if (p_flags&EXPORT_DUMB_CLIENT) {
-		int port = EditorSettings::get_singleton()->get("filesystem/file_server/port");
-		String passwd = EditorSettings::get_singleton()->get("filesystem/file_server/password");
-		r_flags.push_back("--remote-fs");
-		r_flags.push_back(host+":"+itos(port));
-		if (passwd!="") {
-			r_flags.push_back("--remote-fs-password");
-			r_flags.push_back(passwd);
-		}
-	}
-
-	if (p_flags&EXPORT_REMOTE_DEBUG) {
-
-		r_flags.push_back("--remote-debug");
-
-		r_flags.push_back(host+":"+String::num(remote_port));
-
-		List<String> breakpoints;
-		ScriptEditor::get_singleton()->get_breakpoints(&breakpoints);
-
-
-		if (breakpoints.size()) {
-
-			r_flags.push_back("--breakpoints");
-			String bpoints;
-			for(const List<String>::Element *E=breakpoints.front();E;E=E->next()) {
-
-				bpoints+=E->get().replace(" ","%20");
-				if (E->next())
-					bpoints+=",";
-			}
-
-			r_flags.push_back(bpoints);
-		}
-
-	}
-
-	if (p_flags&EXPORT_VIEW_COLLISONS) {
-
-		r_flags.push_back("--debug-collisions");
-	}
-
-	if (p_flags&EXPORT_VIEW_NAVIGATION) {
-
-		r_flags.push_back("--debug-navigation");
-	}
-
-
-}
-
-Error EditorExportPlatform::save_pack_file(void *p_userdata,const String& p_path, const Vector<uint8_t>& p_data,int p_file,int p_total) {
-
-
-	PackData *pd = (PackData*)p_userdata;
-
-	CharString cs=p_path.utf8();
-	pd->f->store_32(cs.length());
-	pd->f->store_buffer((uint8_t*)cs.get_data(),cs.length());
-	TempData td;
-	td.pos=pd->f->get_pos();
-	td.ofs=pd->ftmp->get_pos();
-	td.size=p_data.size();
-	pd->file_ofs.push_back(td);
-	pd->f->store_64(0); //ofs
-	pd->f->store_64(0); //size
-	{
-		MD5_CTX ctx;
-		MD5Init(&ctx);
-		MD5Update(&ctx,(unsigned char*)p_data.ptr(),p_data.size());
-		MD5Final(&ctx);
-		pd->f->store_buffer(ctx.digest,16);
-	}
-	pd->ep->step(TTR("Storing File:")+" "+p_path,2+p_file*100/p_total,false);
-	pd->count++;
-	pd->ftmp->store_buffer(p_data.ptr(),p_data.size());
-	if (pd->alignment > 1) {
-
-		int pad = _get_pad(pd->alignment, pd->ftmp->get_pos());
-		for (int i=0; i<pad; i++) {
-
-			pd->ftmp->store_8(0);
-		};
-	};
-	return OK;
-
-}
-
-Error EditorExportPlatform::save_zip_file(void *p_userdata,const String& p_path, const Vector<uint8_t>& p_data,int p_file,int p_total) {
-
-
-	String path=p_path.replace_first("res://","");
-
-	ZipData *zd = (ZipData*)p_userdata;
-
-	zipFile zip=(zipFile)zd->zip;
-
-	zipOpenNewFileInZip(zip,
-		path.utf8().get_data(),
-		NULL,
-		NULL,
-		0,
-		NULL,
-		0,
-		NULL,
-		Z_DEFLATED,
-		Z_DEFAULT_COMPRESSION);
-
-	zipWriteInFileInZip(zip,p_data.ptr(),p_data.size());
-	zipCloseFileInZip(zip);
-
-	zd->ep->step(TTR("Storing File:")+" "+p_path,2+p_file*100/p_total,false);
-	zd->count++;
-	return OK;
-
-}
-
-Error EditorExportPlatform::save_zip(const String& p_path, bool p_make_bundles) {
-
-	EditorProgress ep("savezip",TTR("Packing"),102);
-
-	//FileAccess *tmp = FileAccess::open(tmppath,FileAccess::WRITE);
-
-	FileAccess *src_f;
-	zlib_filefunc_def io = zipio_create_io_from_file(&src_f);
-	zipFile	zip=zipOpen2(p_path.utf8().get_data(),APPEND_STATUS_CREATE,NULL,&io);
-
-	ZipData zd;
-	zd.count=0;
-	zd.ep=&ep;
-	zd.zip=zip;
-
-
-	Error err = export_project_files(save_zip_file,&zd,p_make_bundles);
-
-	zipClose(zip,NULL);
-
-	return err;
-}
-
-Error EditorExportPlatform::save_pack(FileAccess *dst,bool p_make_bundles, int p_alignment) {
-
-	EditorProgress ep("savepack",TTR("Packing"),102);
-
-	String tmppath = EditorSettings::get_singleton()->get_settings_path()+"/tmp/packtmp";
-	FileAccess *tmp = FileAccess::open(tmppath,FileAccess::WRITE);
-	uint64_t ofs_begin = dst->get_pos();
-
-	dst->store_32(0x43504447); //GDPK
-	dst->store_32(0); //pack version
-	dst->store_32(VERSION_MAJOR);
-	dst->store_32(VERSION_MINOR);
-	dst->store_32(0); //hmph
-	for(int i=0;i<16;i++) {
-		//reserved
-		dst->store_32(0);
-	}
-
-	size_t fcountpos = dst->get_pos();
-	dst->store_32(0);
-
-	PackData pd;
-	pd.ep=&ep;
-	pd.f=dst;
-	pd.ftmp=tmp;
-	pd.count=0;
-	pd.alignment = p_alignment;
-	Error err = export_project_files(save_pack_file,&pd,p_make_bundles);
-	memdelete(tmp);
-	if (err)
-		return err;
-
-	if (p_alignment > 1) {
-		int pad = _get_pad(p_alignment, dst->get_pos());
-		for (int i=0; i<pad; i++) {
-
-			dst->store_8(0);
-		};
-	};
-
-	size_t ofsplus = dst->get_pos();
-	//append file
-
-	tmp = FileAccess::open(tmppath,FileAccess::READ);
-
-	ERR_FAIL_COND_V(!tmp,ERR_CANT_OPEN;)
-	const int bufsize=16384;
-	uint8_t buf[bufsize];
-
-	while(true) {
-
-		int got = tmp->get_buffer(buf,bufsize);
-		if (got<=0)
-			break;
-		dst->store_buffer(buf,got);
-	}
-
-	memdelete(tmp);
-
-	dst->store_64(dst->get_pos()-ofs_begin);
-	dst->store_32(0x43504447); //GDPK
-
-	//fix offsets
-
-	dst->seek(fcountpos);
-	dst->store_32(pd.count);
-	for(int i=0;i<pd.file_ofs.size();i++) {
-
-		dst->seek(pd.file_ofs[i].pos);
-		dst->store_64(pd.file_ofs[i].ofs+ofsplus);
-		dst->store_64(pd.file_ofs[i].size);
-	}
-
-	return OK;
-}
-
-EditorExportPlatform::EditorExportPlatform() {
-
-	debugging_enabled = true;
-}
-
-Error EditorExportPlatformPC::export_project(const String& p_path, bool p_debug, int p_flags) {
-
-
-
-	EditorProgress ep("export",vformat(TTR("Exporting for %s"),get_name()),102);
-
-	const int BUFSIZE = 32768;
-
-
-
-	ep.step(TTR("Setting Up.."),0);
-
-	String exe_path="";
-
-	if (p_debug)
-		exe_path=custom_debug_binary;
-	else
-		exe_path=custom_release_binary;
-
-	if (exe_path=="") {
-		String fname;
-		if (use64) {
-			if (p_debug)
-				fname=debug_binary64;
-			else
-				fname=release_binary64;
-		} else {
-			if (p_debug)
-				fname=debug_binary32;
-			else
-				fname=release_binary32;
-		}
-		String err="";
-		exe_path=find_export_template(fname,&err);
-		if (exe_path=="") {
-			EditorNode::add_io_error(err);
-			return ERR_FILE_CANT_READ;
-		}
-	}
-
-	FileAccess *src_exe=FileAccess::open(exe_path,FileAccess::READ);
-	if (!src_exe) {
-
-		EditorNode::add_io_error("Couldn't read source executable at:\n "+exe_path);
-		return ERR_FILE_CANT_READ;
-	}
-
-	FileAccess *dst=FileAccess::open(p_path,FileAccess::WRITE);
-	if (!dst) {
-
-		EditorNode::add_io_error("Can't copy executable file to:\n "+p_path);
-		return ERR_FILE_CANT_WRITE;
-	}
-
-	uint8_t buff[32768];
-
-	while(true) {
-
-		int c = src_exe->get_buffer(buff,BUFSIZE);
-		if (c>0) {
-
-			dst->store_buffer(buff,c);
-		} else {
-			break;
-		}
-	}
-
-	String dstfile = p_path.replace_first("res://","").replace("\\","/");
-	if (export_mode!=EXPORT_EXE) {
-
-		String dstfile_extension=export_mode==EXPORT_ZIP?".zip":".pck";
-		if (dstfile.find("/")!=-1)
-			dstfile=dstfile.get_base_dir()+"/data"+dstfile_extension;
-		else
-			dstfile="data"+dstfile_extension;
-		if (export_mode==EXPORT_PACK) {
-
-			memdelete(dst);
-
-			dst=FileAccess::open(dstfile,FileAccess::WRITE);
-			if (!dst) {
-
-				EditorNode::add_io_error("Can't write data pack to:\n "+p_path);
-				return ERR_FILE_CANT_WRITE;
-			}
-		}
-	}
-
-
-
-	memdelete(src_exe);
-
-	Error err = export_mode==EXPORT_ZIP?save_zip(dstfile,bundle):save_pack(dst,bundle);
-	memdelete(dst);
-	return err;
-}
-
-void EditorExportPlatformPC::set_binary_extension(const String& p_extension) {
-
-	binary_extension=p_extension;
-}
-
-EditorExportPlatformPC::EditorExportPlatformPC() {
-
-	export_mode=EXPORT_PACK;
-	use64=true;
-}
-
-
-
-
-
-
-
-
-
-
-///////////////////////////////////////////////////////////////////////////////////////////////////////
-
-
-EditorImportExport* EditorImportExport::singleton=NULL;
-
-void EditorImportExport::add_import_plugin(const Ref<EditorImportPlugin>& p_plugin) {
-
-	// Need to make sure the name is unique if we are going to lookup by it
-	ERR_FAIL_COND(by_idx.has(p_plugin->get_name()));
-
-	by_idx[ p_plugin->get_name() ]=plugins.size();
-	plugins.push_back(p_plugin);
-}
-
-void EditorImportExport::remove_import_plugin(const Ref<EditorImportPlugin>& p_plugin) {
-
-	String plugin_name = p_plugin->get_name();
-
-	// Keep the indices the same
-	// Find the index of the target plugin
-	ERR_FAIL_COND(!by_idx.has(plugin_name));
-	int idx = by_idx[plugin_name];
-	int last_idx = plugins.size() - 1;
-
-	// Swap the last plugin and the target one
-	SWAP(plugins[idx], plugins[last_idx]);
-
-	// Update the index of the old last one
-	by_idx[plugins[idx]->get_name()] = idx;
-
-	// Remove the target plugin's by_idx entry
-	by_idx.erase(plugin_name);
-
-	// Erase the plugin
-	plugins.remove(last_idx);
-}
-
-int EditorImportExport::get_import_plugin_count() const{
-
-	return plugins.size();
-}
-Ref<EditorImportPlugin> EditorImportExport::get_import_plugin(int p_idx) const{
-
-	ERR_FAIL_INDEX_V(p_idx,plugins.size(),Ref<EditorImportPlugin>());
-	return plugins[p_idx];
-
-}
-
-
-
-Ref<EditorImportPlugin> EditorImportExport::get_import_plugin_by_name(const String& p_string) const{
-
-	ERR_FAIL_COND_V( !by_idx.has(p_string), Ref<EditorImportPlugin>());
-	return plugins[ by_idx[p_string] ];
-}
-
-void EditorImportExport::add_export_plugin(const Ref<EditorExportPlugin>& p_plugin) {
-
-	ERR_FAIL_COND( p_plugin.is_null() );
-
-	export_plugins.push_back(p_plugin);
-}
-
-void EditorImportExport::remove_export_plugin(const Ref<EditorExportPlugin>& p_plugin) {
-
-	ERR_FAIL_COND( p_plugin.is_null() );
-	export_plugins.erase(p_plugin);
-}
-
-int EditorImportExport::get_export_plugin_count() const{
-
-	return export_plugins.size();
-}
-Ref<EditorExportPlugin> EditorImportExport::get_export_plugin(int p_idx) const{
-
-	ERR_FAIL_INDEX_V(p_idx,export_plugins.size(),Ref<EditorExportPlugin>());
-	return export_plugins[p_idx];
-}
-
-void EditorImportExport::set_export_file_action(const StringName& p_file, FileAction p_action) {
-
-	if (p_action==ACTION_NONE) {
-
-		files.erase(p_file);
-	} else {
-
-		files[p_file]=p_action;
-	}
-
-}
-
-EditorImportExport::FileAction EditorImportExport::get_export_file_action(const StringName& p_file) const{
-
-
-	if (files.has(p_file))
-		return files[p_file];
-
-
-	return ACTION_NONE;
-}
-
-void EditorImportExport::get_export_file_list(List<StringName> *p_files){
-
-
-	for (Map<StringName,FileAction>::Element *E=files.front();E;E=E->next()) {
-
-		p_files->push_back(E->key());
-	}
-
-}
-
-void EditorImportExport::add_export_platform(const Ref<EditorExportPlatform>& p_export) {
-
-	exporters[p_export->get_name()]=p_export;
-}
-
-
-void EditorImportExport::get_export_platforms(List<StringName> *r_platforms) {
-
-	for (Map<StringName,Ref<EditorExportPlatform> >::Element *E=exporters.front();E;E=E->next()) {
-
-		r_platforms->push_back(E->key());
-	}
-}
-
-Ref<EditorExportPlatform> EditorImportExport::get_export_platform(const StringName& p_platform) {
-
-	if (exporters.has(p_platform)) {
-		return exporters[p_platform];
-	} else {
-		return Ref<EditorExportPlatform>();
-	}
-}
-
-
-bool EditorImportExport::poll_export_platforms() {
-
-	bool changed=false;
-	for (Map<StringName,Ref<EditorExportPlatform> >::Element *E=exporters.front();E;E=E->next()) {
-
-		if (E->get()->poll_devices())
-			changed=true;
-	}
-
-	return changed;
-
-}
-
-void EditorImportExport::set_export_filter(ExportFilter p_enable) {
-
-	export_filter=p_enable;
-}
-
-EditorImportExport::ExportFilter EditorImportExport::get_export_filter() const{
-
-	return export_filter;
-}
-
-void EditorImportExport::set_export_custom_filter(const String& p_custom_filter){
-	export_custom_filter=p_custom_filter;
-}
-void EditorImportExport::set_export_custom_filter_exclude(const String& p_custom_filter){
-	export_custom_filter_exclude=p_custom_filter;
-}
-String EditorImportExport::get_export_custom_filter() const{
-	return export_custom_filter;
-}
-String EditorImportExport::get_export_custom_filter_exclude() const{
-	return export_custom_filter_exclude;
-}
-
-void EditorImportExport::set_export_image_action(ImageAction p_action) {
-
-	image_action=p_action;
-}
-
-EditorImportExport::ImageAction EditorImportExport::get_export_image_action() const{
-
-	return image_action;
-}
-
-void EditorImportExport::set_export_image_shrink(float p_shrink) {
-
-	image_shrink=p_shrink;
-}
-
-float EditorImportExport::get_export_image_shrink() const{
-
-	return image_shrink;
-}
-
-
-void EditorImportExport::set_export_image_quality(float p_quality){
-
-	image_action_compress_quality=p_quality;
-}
-
-float EditorImportExport::get_export_image_quality() const{
-
-	return image_action_compress_quality;
-}
-
-void EditorImportExport::image_export_group_create(const StringName& p_name) {
-
-	ERR_FAIL_COND(image_groups.has(p_name));
-	ImageGroup ig;
-	ig.action=IMAGE_ACTION_NONE; //default
-	ig.make_atlas=false;
-	ig.shrink=1;
-	ig.lossy_quality=0.7;
-	image_groups[p_name]=ig;
-
-
-}
-
-
-bool EditorImportExport::image_export_has_group(const StringName& p_name) const {
-
-	return image_groups.has(p_name);
-}
-void EditorImportExport::image_export_get_groups(List<StringName> *r_name) const {
-
-	for (Map<StringName,ImageGroup>::Element *E=image_groups.front();E;E=E->next()) {
-
-		r_name->push_back(E->key());
-	}
-}
-
-void EditorImportExport::image_export_group_remove(const StringName& p_name){
-
-	ERR_FAIL_COND(!image_groups.has(p_name));
-	image_groups.erase(p_name);
-}
-void EditorImportExport::image_export_group_set_image_action(const StringName& p_export_group,ImageAction p_action){
-
-	ERR_FAIL_COND(!image_groups.has(p_export_group));
-	image_groups[p_export_group].action=p_action;
-
-}
-EditorImportExport::ImageAction EditorImportExport::image_export_group_get_image_action(const StringName& p_export_group) const{
-
-	ERR_FAIL_COND_V(!image_groups.has(p_export_group),IMAGE_ACTION_NONE);
-	return image_groups[p_export_group].action;
-
-}
-void EditorImportExport::image_export_group_set_make_atlas(const StringName& p_export_group,bool p_make){
-
-	ERR_FAIL_COND(!image_groups.has(p_export_group));
-	image_groups[p_export_group].make_atlas=p_make;
-
-}
-bool EditorImportExport::image_export_group_get_make_atlas(const StringName& p_export_group) const{
-
-	ERR_FAIL_COND_V(!image_groups.has(p_export_group),false);
-	return image_groups[p_export_group].make_atlas;
-
-}
-void EditorImportExport::image_export_group_set_shrink(const StringName& p_export_group,float p_amount){
-	ERR_FAIL_COND(!image_groups.has(p_export_group));
-	image_groups[p_export_group].shrink=p_amount;
-
-}
-float EditorImportExport::image_export_group_get_shrink(const StringName& p_export_group) const{
-
-	ERR_FAIL_COND_V(!image_groups.has(p_export_group),1);
-	return image_groups[p_export_group].shrink;
-
-}
-
-void EditorImportExport::image_export_group_set_lossy_quality(const StringName& p_export_group,float p_amount){
-	ERR_FAIL_COND(!image_groups.has(p_export_group));
-	image_groups[p_export_group].lossy_quality=p_amount;
-
-}
-float EditorImportExport::image_export_group_get_lossy_quality(const StringName& p_export_group) const{
-
-	ERR_FAIL_COND_V(!image_groups.has(p_export_group),1);
-	return image_groups[p_export_group].lossy_quality;
-
-}
-
-StringName EditorImportExport::image_get_export_group(const StringName& p_image) const {
-
-	if (image_group_files.has(p_image))
-		return image_group_files[p_image];
-	else
-		return StringName();
-
-}
-
-void EditorImportExport::image_add_to_export_group(const StringName& p_image,const StringName& p_export_group) {
-
-
-	bool emptygroup = String(p_export_group)==String();
-	ERR_FAIL_COND(!emptygroup && !image_groups.has(p_export_group));
-
-	if (emptygroup)
-		image_group_files.erase(p_image);
-	else
-		image_group_files[p_image]=p_export_group;
-}
-
-void EditorImportExport::image_export_get_images_in_group(const StringName& p_group,List<StringName> *r_images) const {
-
-	for (Map<StringName,StringName>::Element *E=image_group_files.front();E;E=E->next()) {
-
-		if (p_group==E->get())
-			r_images->push_back(E->key());
-	}
-}
-
-void EditorImportExport::set_convert_text_scenes(bool p_convert) {
-
-	convert_text_scenes=p_convert;
-}
-
-bool EditorImportExport::get_convert_text_scenes() const{
-
-	return convert_text_scenes;
-}
-
-
-void EditorImportExport::load_config() {
-
-	Ref<ConfigFile> cf = memnew( ConfigFile );
-
-	Error err = cf->load("res://export.cfg");
-	if (err!=OK)
-		return; //no export config to be loaded!
-
-
-	export_custom_filter=cf->get_value("export_filter","filter");
-	export_custom_filter_exclude=cf->get_value("export_filter","filter_exclude");
-	String t=cf->get_value("export_filter","type");
-	if (t=="selected")
-		export_filter=EXPORT_SELECTED;
-	else if (t=="resources")
-		export_filter=EXPORT_RESOURCES;
-	else if (t=="all")
-		export_filter=EXPORT_ALL;
-
-	if (cf->has_section("convert_images")) {
-
-		String ci = "convert_images";
-		String action = cf->get_value(ci,"action");
-		if (action=="none")
-			image_action=IMAGE_ACTION_NONE;
-		else if (action=="compress_ram")
-			image_action=IMAGE_ACTION_COMPRESS_RAM;
-		else if (action=="compress_disk")
-			image_action=IMAGE_ACTION_COMPRESS_DISK;
-
-		image_action_compress_quality = cf->get_value(ci,"compress_quality");
-		if (cf->has_section_key(ci,"shrink"))
-			image_shrink = cf->get_value(ci,"shrink");
-		else
-			image_shrink=1;
-		String formats=cf->get_value(ci,"formats");
-		Vector<String> f = formats.split(",");
-		image_formats.clear();
-		for(int i=0;i<f.size();i++) {
-			image_formats.insert(f[i].strip_edges());
-		}
-	}
-
-	if (cf->has_section("convert_scenes")) {
-
-		convert_text_scenes = cf->get_value("convert_scenes","convert_text_scenes");
-	}
-
-
-	if (cf->has_section("export_filter_files")) {
-
-
-		String eff = "export_filter_files";
-		List<String> k;
-		cf->get_section_keys(eff,&k);
-		for(List<String>::Element *E=k.front();E;E=E->next()) {
-
-			String val = cf->get_value(eff,E->get());
-			if (val=="copy") {
-				files[E->get()]=ACTION_COPY;
-			} else if (val=="bundle") {
-				files[E->get()]=ACTION_BUNDLE;
-			}
-		}
-	}
-
-	List<String> sect;
-
-	cf->get_sections(&sect);
-
-	for(List<String>::Element *E=sect.front();E;E=E->next()) {
-
-		String s = E->get();
-		if (!s.begins_with("platform:"))
-			continue;
-		String p = s.substr(s.find(":")+1,s.length());
-
-		if (!exporters.has(p))
-			continue;
-
-		Ref<EditorExportPlatform> ep = exporters[p];
-		if (!ep.is_valid()) {
-			continue;
-		}
-		List<String> keys;
-		cf->get_section_keys(s,&keys);
-		for(List<String>::Element *F=keys.front();F;F=F->next()) {
-			ep->set(F->get(),cf->get_value(s,F->get()));
-		}
-	}
-
-	//save image groups
-
-	if (cf->has_section("image_groups")) {
-
-		sect.clear();
-		cf->get_section_keys("image_groups",&sect);
-		for(List<String>::Element *E=sect.front();E;E=E->next()) {
-
-			Dictionary d = cf->get_value("image_groups",E->get());
-			ImageGroup g;
-			g.action=IMAGE_ACTION_NONE;
-			g.make_atlas=false;
-			g.lossy_quality=0.7;
-			g.shrink=1;
-
-			if (d.has("action")) {
-				String action=d["action"];
-				if (action=="compress_ram")
-					g.action=IMAGE_ACTION_COMPRESS_RAM;
-				else if (action=="compress_disk")
-					g.action=IMAGE_ACTION_COMPRESS_DISK;
-				else if (action=="keep")
-					g.action=IMAGE_ACTION_KEEP;
-			}
-
-			if (d.has("atlas"))
-				g.make_atlas=d["atlas"];
-			if (d.has("lossy_quality"))
-				g.lossy_quality=d["lossy_quality"];
-			if (d.has("shrink")) {
-
-				g.shrink=d["shrink"];
-				g.shrink=CLAMP(g.shrink,1,8);
-			}
-
-			image_groups[E->get()]=g;
-
-		}
-
-		if (cf->has_section_key("image_group_files","files")) {
-
-			Vector<String> sa=cf->get_value("image_group_files","files");
-			if (sa.size()%2==0) {
-				for(int i=0;i<sa.size();i+=2) {
-					image_group_files[sa[i]]=sa[i+1];
-				}
-			}
-		}
-
-	}
-
-
-	if (cf->has_section("script")) {
-
-		if (cf->has_section_key("script","action")) {
-
-			String action = cf->get_value("script","action");
-			if (action=="compile")
-				script_action=SCRIPT_ACTION_COMPILE;
-			else if (action=="encrypt")
-				script_action=SCRIPT_ACTION_ENCRYPT;
-			else
-				script_action=SCRIPT_ACTION_NONE;
-
-		}
-
-		if (cf->has_section_key("script","encrypt_key")) {
-
-			script_key = cf->get_value("script","encrypt_key");
-		}
-	}
-
-	if (cf->has_section("convert_samples")) {
-
-		if (cf->has_section_key("convert_samples","action")) {
-			String action = cf->get_value("convert_samples","action");
-			if (action=="none") {
-				sample_action=SAMPLE_ACTION_NONE;
-			} else if (action=="compress_ram") {
-				sample_action=SAMPLE_ACTION_COMPRESS_RAM;
-			}
-		}
-
-		if (cf->has_section_key("convert_samples","max_hz"))
-			sample_action_max_hz=cf->get_value("convert_samples","max_hz");
-
-		if (cf->has_section_key("convert_samples","trim"))
-			sample_action_trim=cf->get_value("convert_samples","trim");
-	}
-
-
-
-}
-
-
-
-
-
-void EditorImportExport::save_config() {
-
-	Ref<ConfigFile> cf = memnew( ConfigFile );
-
-	switch(export_filter) {
-		case EXPORT_SELECTED: cf->set_value("export_filter","type","selected"); break;
-		case EXPORT_RESOURCES: cf->set_value("export_filter","type","resources"); break;
-		case EXPORT_ALL: cf->set_value("export_filter","type","all"); break;
-	}
-
-	cf->set_value("export_filter","filter",export_custom_filter);
-	cf->set_value("export_filter", "filter_exclude",export_custom_filter_exclude);
-
-	String file_action_section = "export_filter_files";
-
-	for (Map<StringName,FileAction>::Element *E=files.front();E;E=E->next()) {
-
-		String f=E->key();
-		String a;
-		switch (E->get()) {
-			case ACTION_NONE: {}
-			case ACTION_COPY: a="copy"; break;
-			case ACTION_BUNDLE: a="bundle"; break;
-		}
-
-		cf->set_value(file_action_section,f,a);
-	}
-
-
-	for (Map<StringName,Ref<EditorExportPlatform> >::Element *E=exporters.front();E;E=E->next()) {
-
-		String pname = "platform:"+String(E->key());
-
-		Ref<EditorExportPlatform> ep = E->get();
-
-		List<PropertyInfo> pl;
-		ep->get_property_list(&pl);
-
-		for (List<PropertyInfo>::Element *F=pl.front();F;F=F->next()) {
-
-			cf->set_value(pname,F->get().name,ep->get(F->get().name));
-		}
-
-	}
-
-	switch(image_action) {
-		case IMAGE_ACTION_NONE: cf->set_value("convert_images","action","none"); break;
-		case IMAGE_ACTION_COMPRESS_RAM: cf->set_value("convert_images","action","compress_ram"); break;
-		case IMAGE_ACTION_COMPRESS_DISK: cf->set_value("convert_images","action","compress_disk"); break;
-	}
-
-	cf->set_value("convert_images","shrink",image_shrink);
-	cf->set_value("convert_images","compress_quality",image_action_compress_quality);
-
-	String formats;
-	for(Set<String>::Element *E=image_formats.front();E;E=E->next()) {
-
-		if (E!=image_formats.front())
-			formats+=",";
-		formats+=E->get();
-	}
-
-	cf->set_value("convert_images","formats",formats);
-
-	//save image groups
-
-	for(Map<StringName,ImageGroup>::Element *E=image_groups.front();E;E=E->next()) {
-
-		Dictionary d;
-		switch(E->get().action) {
-			case IMAGE_ACTION_NONE: d["action"]="default"; break;
-			case IMAGE_ACTION_COMPRESS_RAM: d["action"]="compress_ram"; break;
-			case IMAGE_ACTION_COMPRESS_DISK: d["action"]="compress_disk"; break;
-			case IMAGE_ACTION_KEEP: d["action"]="keep"; break;
-		}
-
-
-		d["atlas"]=E->get().make_atlas;
-		d["shrink"]=E->get().shrink;
-		d["lossy_quality"]=E->get().lossy_quality;
-		cf->set_value("image_groups",E->key(),d);
-
-	}
-
-	if (image_groups.size() && image_group_files.size()){
-
-		Vector<String> igfkeys;
-		igfkeys.resize(image_group_files.size());
-		int idx=0;
-		for (Map<StringName,StringName>::Element *E=image_group_files.front();E;E=E->next()) {
-			igfkeys[idx++]=E->key();
-		}
-		igfkeys.sort();
-
-		Vector<String> igfsave;
-		igfsave.resize(image_group_files.size()*2);
-		idx=0;
-		for (int i=0;i<igfkeys.size();++i) {
-
-			igfsave[idx++]=igfkeys[i];
-			igfsave[idx++]=image_group_files[igfkeys[i]];
-		}
-		cf->set_value("image_group_files","files",igfsave);
-	}
-
-	switch(script_action) {
-		case SCRIPT_ACTION_NONE: cf->set_value("script","action","none"); break;
-		case SCRIPT_ACTION_COMPILE: cf->set_value("script","action","compile"); break;
-		case SCRIPT_ACTION_ENCRYPT: cf->set_value("script","action","encrypt"); break;
-	}
-
-	cf->set_value("convert_scenes","convert_text_scenes",convert_text_scenes);
-
-	cf->set_value("script","encrypt_key",script_key);
-
-	switch(sample_action) {
-		case SAMPLE_ACTION_NONE: cf->set_value("convert_samples","action","none"); break;
-		case SAMPLE_ACTION_COMPRESS_RAM: cf->set_value("convert_samples","action","compress_ram"); break;
-	}
-
-	cf->set_value("convert_samples","max_hz",sample_action_max_hz);
-	cf->set_value("convert_samples","trim",sample_action_trim);
-
-	cf->save("res://export.cfg");
-
-}
-
-
-void EditorImportExport::script_set_action(ScriptAction p_action) {
-
-	script_action=p_action;
-}
-
-EditorImportExport::ScriptAction EditorImportExport::script_get_action() const{
-
-	return script_action;
-}
-
-void EditorImportExport::script_set_encryption_key(const String& p_key){
-
-	script_key=p_key;
-}
-String EditorImportExport::script_get_encryption_key() const{
-
-	return script_key;
-}
-
-
-void EditorImportExport::sample_set_action(SampleAction p_action) {
-
-	sample_action=p_action;
-}
-
-EditorImportExport::SampleAction EditorImportExport::sample_get_action() const{
-
-	return sample_action;
-}
-
-void EditorImportExport::sample_set_max_hz(int p_hz){
-
-	sample_action_max_hz=p_hz;
-}
-int EditorImportExport::sample_get_max_hz() const{
-
-	return sample_action_max_hz;
-}
-
-void EditorImportExport::sample_set_trim(bool p_trim){
-
-	sample_action_trim=p_trim;
-}
-bool EditorImportExport::sample_get_trim() const{
-
-	return sample_action_trim;
-}
-
-PoolVector<String> EditorImportExport::_get_export_file_list() {
-
-	PoolVector<String> fl;
-	for (Map<StringName,FileAction>::Element *E=files.front();E;E=E->next()) {
-
-		fl.push_back(E->key());
-	}
-
-	return fl;
-}
-
-PoolVector<String> EditorImportExport::_get_export_platforms() {
-
-	PoolVector<String> ep;
-	for (Map<StringName,Ref<EditorExportPlatform> >::Element *E=exporters.front();E;E=E->next()) {
-
-		ep.push_back(E->key());
-	}
-
-	return ep;
-
-}
-
-void EditorImportExport::_bind_methods() {
-
-	ClassDB::bind_method(D_METHOD("add_import_plugin","plugin"),&EditorImportExport::add_import_plugin);
-	ClassDB::bind_method(D_METHOD("remove_import_plugin","plugin"),&EditorImportExport::remove_import_plugin);
-	ClassDB::bind_method(D_METHOD("get_import_plugin_count"),&EditorImportExport::get_import_plugin_count);
-	ClassDB::bind_method(D_METHOD("get_import_plugin","idx"),&EditorImportExport::get_import_plugin);
-	ClassDB::bind_method(D_METHOD("get_import_plugin_by_name","name"),&EditorImportExport::get_import_plugin_by_name);
-
-	ClassDB::bind_method(D_METHOD("add_export_plugin","plugin"),&EditorImportExport::add_export_plugin);
-	ClassDB::bind_method(D_METHOD("remove_export_plugin","plugin"),&EditorImportExport::remove_export_plugin);
-	ClassDB::bind_method(D_METHOD("get_export_plugin_count"),&EditorImportExport::get_export_plugin_count);
-	ClassDB::bind_method(D_METHOD("get_export_plugin","idx"),&EditorImportExport::get_export_plugin);
-
-	ClassDB::bind_method(D_METHOD("set_export_file_action","file","action"),&EditorImportExport::set_export_file_action);
-	ClassDB::bind_method(D_METHOD("get_export_file_action","file"),&EditorImportExport::get_export_file_action);
-	ClassDB::bind_method(D_METHOD("get_export_file_list"),&EditorImportExport::_get_export_file_list);
-
-	ClassDB::bind_method(D_METHOD("add_export_platform","platform"),&EditorImportExport::add_export_platform);
-	//ClassDB::bind_method(D_METHOD("remove_export_platform","platform"),&EditorImportExport::add_export_platform);
-	ClassDB::bind_method(D_METHOD("get_export_platform","name"),&EditorImportExport::get_export_platform);
-	ClassDB::bind_method(D_METHOD("get_export_platforms"),&EditorImportExport::_get_export_platforms);
-
-	ClassDB::bind_method(D_METHOD("set_export_filter","filter"),&EditorImportExport::set_export_filter);
-	ClassDB::bind_method(D_METHOD("get_export_filter"),&EditorImportExport::get_export_filter);
-
-	ClassDB::bind_method(D_METHOD("set_export_custom_filter","filter"),&EditorImportExport::set_export_custom_filter);
-	ClassDB::bind_method(D_METHOD("get_export_custom_filter"),&EditorImportExport::get_export_custom_filter);
-
-	ClassDB::bind_method(D_METHOD("set_export_custom_filter_exclude","filter_exclude"),&EditorImportExport::set_export_custom_filter_exclude);
-	ClassDB::bind_method(D_METHOD("get_export_custom_filter_exclude"),&EditorImportExport::get_export_custom_filter_exclude);
-
-
-	ClassDB::bind_method(D_METHOD("image_export_group_create"),&EditorImportExport::image_export_group_create);
-	ClassDB::bind_method(D_METHOD("image_export_group_remove"),&EditorImportExport::image_export_group_remove);
-	ClassDB::bind_method(D_METHOD("image_export_group_set_image_action"),&EditorImportExport::image_export_group_set_image_action);
-	ClassDB::bind_method(D_METHOD("image_export_group_set_make_atlas"),&EditorImportExport::image_export_group_set_make_atlas);
-	ClassDB::bind_method(D_METHOD("image_export_group_set_shrink"),&EditorImportExport::image_export_group_set_shrink);
-	ClassDB::bind_method(D_METHOD("image_export_group_get_image_action"),&EditorImportExport::image_export_group_get_image_action);
-	ClassDB::bind_method(D_METHOD("image_export_group_get_make_atlas"),&EditorImportExport::image_export_group_get_make_atlas);
-	ClassDB::bind_method(D_METHOD("image_export_group_get_shrink"),&EditorImportExport::image_export_group_get_shrink);
-	ClassDB::bind_method(D_METHOD("image_add_to_export_group"),&EditorImportExport::image_add_to_export_group);
-	ClassDB::bind_method(D_METHOD("script_set_action"),&EditorImportExport::script_set_action);
-	ClassDB::bind_method(D_METHOD("script_set_encryption_key"),&EditorImportExport::script_set_encryption_key);
-	ClassDB::bind_method(D_METHOD("script_get_action"),&EditorImportExport::script_get_action);
-	ClassDB::bind_method(D_METHOD("script_get_encryption_key"),&EditorImportExport::script_get_encryption_key);
-
-
-
-	BIND_ENUM_CONSTANT( ACTION_NONE );
-	BIND_ENUM_CONSTANT( ACTION_COPY );
-	BIND_ENUM_CONSTANT( ACTION_BUNDLE );
-
-	BIND_ENUM_CONSTANT( EXPORT_SELECTED );
-	BIND_ENUM_CONSTANT( EXPORT_RESOURCES );
-	BIND_ENUM_CONSTANT( EXPORT_ALL );
-
-	BIND_ENUM_CONSTANT( IMAGE_ACTION_NONE );
-	BIND_ENUM_CONSTANT( IMAGE_ACTION_COMPRESS_DISK );
-	BIND_ENUM_CONSTANT( IMAGE_ACTION_COMPRESS_RAM );
-	BIND_ENUM_CONSTANT( IMAGE_ACTION_KEEP  );
-
-	BIND_ENUM_CONSTANT( SCRIPT_ACTION_NONE );
-	BIND_ENUM_CONSTANT( SCRIPT_ACTION_COMPILE );
-	BIND_ENUM_CONSTANT( SCRIPT_ACTION_ENCRYPT );
-};
-
-
-
-EditorImportExport::EditorImportExport() {
-
-	export_filter=EXPORT_RESOURCES;
-	singleton=this;
-	image_action=IMAGE_ACTION_NONE;
-	image_action_compress_quality=0.7;
-	image_formats.insert("png");
-	image_shrink=1;
-
-
-	script_action=SCRIPT_ACTION_COMPILE;
-
-	sample_action=SAMPLE_ACTION_NONE;
-	sample_action_max_hz=44100;
-	sample_action_trim=false;
-
-	convert_text_scenes=true;
-
-}
-
-
-
-EditorImportExport::~EditorImportExport() {
-
-
-
-}
-#endif

editor/editor_help.cpp

@@ -530,49 +530,6 @@ void EditorHelp::_search(const String &) {
 	prev_search = stext;
 }
 
-#if 0
-void EditorHelp::_button_pressed(int p_idx) {
-
-	if (p_idx==PAGE_CLASS_LIST) {
-
-		//edited_class->set_pressed(false);
-		//class_list_button->set_pressed(true);
-		//tabs->set_current_tab(PAGE_CLASS_LIST);
-
-	} else if (p_idx==PAGE_CLASS_DESC) {
-
-		//edited_class->set_pressed(true);
-		//class_list_button->set_pressed(false);
-		//tabs->set_current_tab(PAGE_CLASS_DESC);
-
-	} else if (p_idx==PAGE_CLASS_PREV) {
-
-		if (history_pos<2)
-			return;
-		history_pos--;
-		ERR_FAIL_INDEX(history_pos-1,history.size());
-		_goto_desc(history[history_pos-1].c,false,history[history_pos-1].scroll);
-		_update_history_buttons();
-
-
-	} else if (p_idx==PAGE_CLASS_NEXT) {
-
-		if (history_pos>=history.size())
-			return;
-
-		history_pos++;
-		ERR_FAIL_INDEX(history_pos-1,history.size());
-		_goto_desc(history[history_pos-1].c,false,history[history_pos-1].scroll);
-		_update_history_buttons();
-
-	} else if (p_idx==PAGE_SEARCH) {
-
-		_search("");
-	}
-}
-
-#endif
-
 void EditorHelp::_class_list_select(const String &p_select) {
 
 	_goto_desc(p_select);

editor/editor_node.cpp

@@ -65,18 +65,9 @@
 #include "editor/import/resource_importer_scene.h"
 #include "editor/import/resource_importer_texture.h"
 #include "editor/import/resource_importer_wav.h"
-#include "editor/io_plugins/editor_bitmask_import_plugin.h"
-#include "editor/io_plugins/editor_export_scene.h"
-#include "editor/io_plugins/editor_font_import_plugin.h"
-#include "editor/io_plugins/editor_mesh_import_plugin.h"
-#include "editor/io_plugins/editor_scene_import_plugin.h"
-#include "editor/io_plugins/editor_scene_importer_fbxconv.h"
-#include "editor/io_plugins/editor_texture_import_plugin.h"
-#include "editor/io_plugins/editor_translation_import_plugin.h"
 #include "editor/plugins/animation_player_editor_plugin.h"
 #include "editor/plugins/animation_tree_editor_plugin.h"
 #include "editor/plugins/asset_library_editor_plugin.h"
-#include "editor/plugins/baked_light_editor_plugin.h"
 #include "editor/plugins/camera_editor_plugin.h"
 #include "editor/plugins/canvas_item_editor_plugin.h"
 #include "editor/plugins/collision_polygon_2d_editor_plugin.h"
@@ -107,7 +98,6 @@
 #include "editor/plugins/shader_graph_editor_plugin.h"
 #include "editor/plugins/spatial_editor_plugin.h"
 #include "editor/plugins/sprite_frames_editor_plugin.h"
-#include "editor/plugins/stream_editor_plugin.h"
 #include "editor/plugins/style_box_editor_plugin.h"
 #include "editor/plugins/texture_editor_plugin.h"
 #include "editor/plugins/texture_region_editor_plugin.h"

editor/editor_node.h

@@ -30,7 +30,6 @@
 #ifndef EDITOR_NODE_H
 #define EDITOR_NODE_H
 
-#include "editor/call_dialog.h"
 #include "editor/connections_dialog.h"
 #include "editor/create_dialog.h"
 #include "editor/editor_about.h"
@@ -40,7 +39,6 @@
 #include "editor/editor_name_dialog.h"
 #include "editor/editor_path.h"
 #include "editor/editor_plugin.h"
-#include "editor/editor_reimport_dialog.h"
 #include "editor/editor_resource_preview.h"
 #include "editor/editor_run.h"
 #include "editor/editor_run_native.h"

editor/editor_reimport_dialog.cpp

@@ -1,149 +0,0 @@
-/*************************************************************************/
-/*  editor_reimport_dialog.cpp                                           */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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.                */
-/*************************************************************************/
-#include "editor_reimport_dialog.h"
-
-#include "editor_file_system.h"
-#include "editor_node.h"
-
-#if 0
-void EditorReImportDialog::popup_reimport() {
-
-	if (EditorFileSystem::get_singleton()->is_scanning()) {
-		error->set_text(TTR("Please wait for scan to complete."));
-		error->popup_centered_minsize();
-		return;
-	}
-
-	tree->clear();
-	items.clear();
-	List<String> ril;
-	EditorFileSystem::get_singleton()->get_changed_sources(&ril);
-
-	scene_must_save=false;
-
-
-	TreeItem *root = tree->create_item();
-	for(List<String>::Element *E=ril.front();E;E=E->next()) {
-
-		TreeItem *item = tree->create_item(root);
-		item->set_cell_mode(0,TreeItem::CELL_MODE_CHECK);
-		item->set_metadata(0,E->get());
-		item->set_text(0,E->get().replace_first("res://",""));
-		item->set_tooltip(0,E->get());
-		item->set_checked(0,true);
-		item->set_editable(0,true);
-		items.push_back(item);
-
-		String name = E->get();
-
-		if (EditorFileSystem::get_singleton()->get_file_type(name)=="PackedScene" && EditorNode::get_singleton()->is_scene_in_use(name)) {
-
-			scene_must_save=true;
-		}
-	}
-
-
-	if (scene_must_save) {
-		if (EditorNode::get_singleton()->get_edited_scene() && EditorNode::get_singleton()->get_edited_scene()->get_filename()=="") {
-
-			error->set_text(TTR("Current scene must be saved to re-import."));
-			error->popup_centered_minsize();
-			get_ok()->set_text(TTR("Re-Import"));
-			get_ok()->set_disabled(true);
-			return;
-
-		}
-		get_ok()->set_disabled(false);
-		get_ok()->set_text(TTR("Save & Re-Import"));
-	} else {
-		get_ok()->set_text(TTR("Re-Import"));
-		get_ok()->set_disabled(false);
-	}
-
-	popup_centered(Size2(600,400));
-
-
-}
-
-
-void EditorReImportDialog::ok_pressed() {
-
-	if (EditorFileSystem::get_singleton()->is_scanning()) {
-		error->set_text(TTR("Please wait for scan to complete."));
-		error->popup_centered_minsize();
-		return;
-	}
-
-
-
-	EditorProgress ep("reimport",TTR("Re-Importing"),items.size());
-	String reload_fname;
-	if (scene_must_save && EditorNode::get_singleton()->get_edited_scene()) {
-		reload_fname = EditorNode::get_singleton()->get_edited_scene()->get_filename();
-		EditorNode::get_singleton()->save_scene(reload_fname);
-		EditorNode::get_singleton()->clear_scene();
-	}
-
-	for(int i=0;i<items.size();i++) {
-
-		String it = items[i]->get_metadata(0);
-		ep.step(items[i]->get_text(0),i);
-		print_line("reload import from: "+it);
-		Ref<ResourceImportMetadata> rimd = ResourceLoader::load_import_metadata(it);
-		ERR_CONTINUE(rimd.is_null());
-		String editor = rimd->get_editor();
-		Ref<EditorImportPlugin> eip = EditorImportExport::get_singleton()->get_import_plugin_by_name(editor);
-		ERR_CONTINUE(eip.is_null());
-		Error err = eip->import(it,rimd);
-		if (err!=OK) {
-			EditorNode::add_io_error("Error Importing:\n  "+it);
-		}
-
-	}
-	if (reload_fname!="") {
-		EditorNode::get_singleton()->load_scene(reload_fname);
-	}
-
-	EditorFileSystem::get_singleton()->scan_sources();
-}
-
-EditorReImportDialog::EditorReImportDialog() {
-
-	tree = memnew( Tree );
-	add_child(tree);
-	tree->set_hide_root(true);
-	//set_child_rect(tree);
-	set_title(TTR("Re-Import Changed Resources"));
-	error = memnew( AcceptDialog);
-	add_child(error);
-	scene_must_save=false;
-
-}
-#endif

editor/editor_reimport_dialog.h

@@ -1,54 +0,0 @@
-/*************************************************************************/
-/*  editor_reimport_dialog.h                                             */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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 EDITOR_REIMPORT_DIALOG_H
-#define EDITOR_REIMPORT_DIALOG_H
-
-#if 0
-#include "scene/gui/dialogs.h"
-#include "scene/gui/tree.h"
-
-class EditorReImportDialog : public ConfirmationDialog {
-
-	GDCLASS(EditorReImportDialog,ConfirmationDialog);
-
-	Tree *tree;
-	Vector<TreeItem*> items;
-	AcceptDialog *error;
-	bool scene_must_save;
-
-	void ok_pressed();
-public:
-
-	void popup_reimport();
-	EditorReImportDialog();
-};
-
-#endif // EDITOR_REIMPORT_DIALOG_H
-#endif

editor/editor_settings.h

@@ -35,7 +35,7 @@
 #include "core/io/config_file.h"
 #include "os/thread_safe.h"
 #include "resource.h"
-#include "scene/gui/input_action.h"
+#include "scene/gui/shortcut.h"
 #include "translation.h"
 
 class EditorPlugin;

editor/export_template_manager.cpp

@@ -313,77 +313,6 @@ void ExportTemplateManager::_bind_methods() {
 	ClassDB::bind_method("_uninstall_template", &ExportTemplateManager::_uninstall_template);
 	ClassDB::bind_method("_uninstall_template_confirm", &ExportTemplateManager::_uninstall_template_confirm);
 	ClassDB::bind_method("_install_from_file", &ExportTemplateManager::_install_from_file);
-
-#if 0
-	FileAccess *fa = NULL;
-	zlib_filefunc_def io = zipio_create_io_from_file(&fa);
-
-	unzFile pkg = unzOpen2(p_file.utf8().get_data(), &io);
-	if (!pkg) {
-
-		current_option = -1;
-		//confirmation->get_cancel()->hide();
-		accept->get_ok()->set_text(TTR("I see.."));
-		accept->set_text(TTR("Can't open export templates zip."));
-		accept->popup_centered_minsize();
-		return;
-	}
-	int ret = unzGoToFirstFile(pkg);
-
-	int fc = 0; //count them
-
-	while (ret == UNZ_OK) {
-		fc++;
-		ret = unzGoToNextFile(pkg);
-	}
-
-	ret = unzGoToFirstFile(pkg);
-
-	EditorProgress p("ltask", TTR("Loading Export Templates"), fc);
-
-	fc = 0;
-
-	while (ret == UNZ_OK) {
-
-		//get filename
-		unz_file_info info;
-		char fname[16384];
-		ret = unzGetCurrentFileInfo(pkg, &info, fname, 16384, NULL, 0, NULL, 0);
-
-		String file = fname;
-
-		Vector<uint8_t> data;
-		data.resize(info.uncompressed_size);
-
-		//read
-		ret = unzOpenCurrentFile(pkg);
-		ret = unzReadCurrentFile(pkg, data.ptr(), data.size());
-		unzCloseCurrentFile(pkg);
-
-		print_line(fname);
-		/*
-		for(int i=0;i<512;i++) {
-			print_line(itos(data[i]));
-		}
-		*/
-
-		file = file.get_file();
-
-		p.step(TTR("Importing:") + " " + file, fc);
-
-		FileAccess *f = FileAccess::open(EditorSettings::get_singleton()->get_settings_path() + "/templates/" + file, FileAccess::WRITE);
-
-		ERR_CONTINUE(!f);
-		f->store_buffer(data.ptr(), data.size());
-
-		memdelete(f);
-
-		ret = unzGoToNextFile(pkg);
-		fc++;
-	}
-
-	unzClose(pkg);
-#endif
 }
 
 ExportTemplateManager::ExportTemplateManager() {

editor/import/editor_import_collada.cpp

@@ -41,6 +41,7 @@
 #include "scene/animation/animation_player.h"
 #include "scene/resources/animation.h"
 #include "scene/resources/packed_scene.h"
+
 #include <iostream>
 
 struct ColladaImport {
@@ -1238,173 +1239,10 @@ Error ColladaImport::_create_mesh_surfaces(bool p_optimize, Ref<ArrayMesh> &p_me
 
 			Array mr;
 
-////////////////////////////
-// THEN THE MORPH TARGETS //
-////////////////////////////
-#if 0
-			if (p_morph_data) {
-
-				//add morphie target
-				ERR_FAIL_COND_V( !p_morph_data->targets.has("MORPH_TARGET"), ERR_INVALID_DATA );
-				String mt = p_morph_data->targets["MORPH_TARGET"];
-				ERR_FAIL_COND_V( !p_morph_data->sources.has(mt), ERR_INVALID_DATA);
-				int morph_targets = p_morph_data->sources[mt].sarray.size();
-				mr.resize(morph_targets);
-
-				for(int j=0;j<morph_targets;j++) {
-
-					Array mrt;
-					mrt.resize(VS::ARRAY_MAX);
-
-					String target = p_morph_data->sources[mt].sarray[j];
-					ERR_FAIL_COND_V( !collada.state.mesh_data_map.has(target), ERR_INVALID_DATA );
-					String name = collada.state.mesh_data_map[target].name;
-					Collada::MeshData &md = collada.state.mesh_data_map[target];
-
-					// collada in itself supports morphing everything. However, the spec is unclear and no examples or exporters that
-					// morph anything but "POSITIONS" seem to exit. Because of this, normals and binormals/tangents have to be regenerated here,
-					// which may result in inaccurate (but most of the time good enough) results.
-
-					PoolVector<Vector3> vertices;
-					vertices.resize(vlen);
-
-					ERR_FAIL_COND_V( md.vertices.size() != 1, ERR_INVALID_DATA);
-					String vertex_src_id=md.vertices.front()->key();
-					ERR_FAIL_COND_V(!md.vertices[vertex_src_id].sources.has("POSITION"),ERR_INVALID_DATA);
-					String position_src_id = md.vertices[vertex_src_id].sources["POSITION"];
-
-					ERR_FAIL_COND_V(!md.sources.has(position_src_id),ERR_INVALID_DATA);
-
-					const Collada::MeshData::Source *m=&md.sources[position_src_id];
-
-					ERR_FAIL_COND_V( m->array.size() != vertex_src->array.size(), ERR_INVALID_DATA);
-					int stride=m->stride;
-					if (stride==0)
-						stride=3;
-
-
-					//read vertices from morph target
-					PoolVector<Vector3>::Write vertw = vertices.write();
-
-					for(int m_i=0;m_i<m->array.size()/stride;m_i++) {
-
-						int pos = m_i*stride;
-						Vector3 vtx( m->array[pos+0], m->array[pos+1], m->array[pos+2] );
-
-#ifndef NO_UP_AXIS_SWAP
-						if (collada.state.up_axis==Vector3::AXIS_Z) {
-
-							SWAP( vtx.z, vtx.y );
-							vtx.z = -vtx.z;
-
-						}
-#endif
-
-						Collada::Vertex vertex;
-						vertex.vertex=vtx;
-						vertex.fix_unit_scale(collada);
-						vtx=vertex.vertex;
-
-						vtx = p_local_xform.xform(vtx);
-
-
-						if (vertex_map.has(m_i)) { //vertex may no longer be here, don't bother converting
-
-
-							for (Set<int> ::Element *E=vertex_map[m_i].front() ; E; E=E->next() ) {
-
-								vertw[E->get()]=vtx;
-							}
-						}
-					}
-
-
-					//vertices are in place, now generate everything else
-					vertw = PoolVector<Vector3>::Write();
-					PoolVector<Vector3> normals;
-					PoolVector<float> tangents;
-					print_line("vertex source id: "+vertex_src_id);
-					if(md.vertices[vertex_src_id].sources.has("NORMAL")){
-						//has normals
-						normals.resize(vlen);
-						//std::cout << "has normals" << std::endl;
-						String normal_src_id = md.vertices[vertex_src_id].sources["NORMAL"];
-						//std::cout << "normals source: "<< normal_src_id.utf8().get_data() <<std::endl;
-						ERR_FAIL_COND_V(!md.sources.has(normal_src_id),ERR_INVALID_DATA);
-
-						const Collada::MeshData::Source *m=&md.sources[normal_src_id];
-
-						ERR_FAIL_COND_V( m->array.size() != vertex_src->array.size(), ERR_INVALID_DATA);
-						int stride=m->stride;
-						if (stride==0)
-							stride=3;
-
-
-						//read normals from morph target
-						PoolVector<Vector3>::Write vertw = normals.write();
-
-						for(int m_i=0;m_i<m->array.size()/stride;m_i++) {
-
-							int pos = m_i*stride;
-							Vector3 vtx( m->array[pos+0], m->array[pos+1], m->array[pos+2] );
-
-#ifndef NO_UP_AXIS_SWAP
-							if (collada.state.up_axis==Vector3::AXIS_Z) {
-
-								SWAP( vtx.z, vtx.y );
-								vtx.z = -vtx.z;
-
-							}
-#endif
-
-							Collada::Vertex vertex;
-							vertex.vertex=vtx;
-							vertex.fix_unit_scale(collada);
-							vtx=vertex.vertex;
-
-							vtx = p_local_xform.xform(vtx);
-
-
-							if (vertex_map.has(m_i)) { //vertex may no longer be here, don't bother converting
-
-
-								for (Set<int> ::Element *E=vertex_map[m_i].front() ; E; E=E->next() ) {
-
-									vertw[E->get()]=vtx;
-								}
-							}
-						}
-
-						print_line("using built-in normals");
-					}else{
-						print_line("generating normals");
-						_generate_normals(index_array,vertices,normals);//no normals
-					}
-					if (final_tangent_array.size() && final_uv_array.size()) {
-
-						_generate_tangents_and_binormals(index_array,vertices,final_uv_array,normals,tangents);
-
-					}
-
-					mrt[Mesh::ARRAY_VERTEX]=vertices;
-
-					mrt[Mesh::ARRAY_NORMAL]=normals;
-					if (tangents.size())
-						mrt[Mesh::ARRAY_TANGENT]=tangents;
-					if (final_uv_array.size())
-						mrt[Mesh::ARRAY_TEX_UV]=final_uv_array;
-					if (final_uv2_array.size())
-						mrt[Mesh::ARRAY_TEX_UV2]=final_uv2_array;
-					if (final_color_array.size())
-						mrt[Mesh::ARRAY_COLOR]=final_color_array;
-
-					mr[j]=mrt;
-
-				}
-
-			}
+			////////////////////////////
+			// THEN THE MORPH TARGETS //
+			////////////////////////////
 
-#endif
 			for (int mi = 0; mi < p_morph_meshes.size(); mi++) {
 
 				//print_line("want surface "+itos(mi)+" has "+itos(p_morph_meshes[mi]->get_surface_count()));

editor/import/resource_importer_scene.cpp

@@ -171,38 +171,7 @@ Node *ResourceImporterScene::_fix_node(Node *p_node, Node *p_root, Map<Ref<Array
 		memdelete(p_node);
 		return NULL;
 	}
-#if 0
-	if (Object::cast_to<MeshInstance>(p_node)) {
-
-		MeshInstance *mi = Object::cast_to<MeshInstance>(p_node);
-
-		bool bb = false;
-
-		if ((_teststr(name, "bb"))) {
-			bb = true;
-		} else if (mi->get_mesh().is_valid() && (_teststr(mi->get_mesh()->get_name(), "bb"))) {
-			bb = true;
-		}
-
-		if (bb) {
-			mi->set_flag(GeometryInstance::FLAG_BILLBOARD, true);
-			if (mi->get_mesh().is_valid()) {
 
-				Ref<ArrayMesh> m = mi->get_mesh();
-				for (int i = 0; i < m->get_surface_count(); i++) {
-
-					Ref<SpatialMaterial> fm = m->surface_get_material(i);
-					if (fm.is_valid()) {
-						//fm->set_flag(Material::FLAG_UNSHADED,true);
-						//fm->set_flag(Material::FLAG_DOUBLE_SIDED,true);
-						//fm->set_depth_draw_mode(Material::DEPTH_DRAW_NEVER);
-						//fm->set_fixed_flag(SpatialMaterial::FLAG_USE_ALPHA,true);
-					}
-				}
-			}
-		}
-	}
-#endif
 	if (Object::cast_to<MeshInstance>(p_node)) {
 
 		MeshInstance *mi = Object::cast_to<MeshInstance>(p_node);
@@ -256,115 +225,7 @@ Node *ResourceImporterScene::_fix_node(Node *p_node, Node *p_root, Map<Ref<Array
 			}
 		}
 	}
-#if 0
-	if (Object::cast_to<MeshInstance>(p_node)) {
-
-		MeshInstance *mi = Object::cast_to<MeshInstance>(p_node);
-
-		String str;
-
-		if ((_teststr(name, "imp"))) {
-			str = name;
-		} else if (mi->get_mesh().is_valid() && (_teststr(mi->get_mesh()->get_name(), "imp"))) {
-			str = mi->get_mesh()->get_name();
-		}
-
-		if (Object::cast_to<MeshInstance>(p_node->get_parent())) {
-			MeshInstance *mi = Object::cast_to<MeshInstance>(p_node);
-			MeshInstance *mip = Object::cast_to<MeshInstance>(p_node->get_parent());
-			String d = str.substr(str.find("imp") + 3, str.length());
-			if (d != "") {
-				if ((d[0] < '0' || d[0] > '9'))
-					d = d.substr(1, d.length());
-				if (d.length() && d[0] >= '0' && d[0] <= '9') {
-					float dist = d.to_double();
-					mi->set_flag(GeometryInstance::FLAG_BILLBOARD, true);
-					mi->set_flag(GeometryInstance::FLAG_BILLBOARD_FIX_Y, true);
-					//mi->set_draw_range_begin(dist);
-					//mi->set_draw_range_end(100000);
-
-					//mip->set_draw_range_begin(0);
-					//mip->set_draw_range_end(dist);
-
-					if (mi->get_mesh().is_valid()) {
-
-						Ref<ArrayMesh> m = mi->get_mesh();
-						for (int i = 0; i < m->get_surface_count(); i++) {
-
-							Ref<SpatialMaterial> fm = m->surface_get_material(i);
-							if (fm.is_valid()) {
-								//fm->set_flag(Material::FLAG_UNSHADED,true);
-								//fm->set_flag(Material::FLAG_DOUBLE_SIDED,true);
-								//fm->set_depth_draw_mode(Material::DEPTH_DRAW_NEVER);
-								//fm->set_fixed_flag(SpatialMaterial::FLAG_USE_ALPHA,true);
-							}
-						}
-					}
-				}
-			}
-		}
-	}
 
-#endif
-#if 0
-    if (p_flags&SCENE_FLAG_CREATE_LODS && Object::cast_to<MeshInstance>(p_node)) {
-
-	MeshInstance *mi = Object::cast_to<MeshInstance>(p_node);
-
-	String str;
-
-	if ((_teststr(name,"lod"))) {
-	    str=name;
-	} else if (mi->get_mesh().is_valid() && (_teststr(mi->get_mesh()->get_name(),"lod"))) {
-	    str=mi->get_mesh()->get_name();
-
-	}
-
-
-	if (Object::cast_to<MeshInstance>(p_node->get_parent())) {
-	    MeshInstance *mi = Object::cast_to<MeshInstance>(p_node);
-	    MeshInstance *mip = Object::cast_to<MeshInstance>(p_node->get_parent());
-	    String d=str.substr(str.find("lod")+3,str.length());
-	    if (d!="") {
-		if ((d[0]<'0' || d[0]>'9'))
-		    d=d.substr(1,d.length());
-		if (d.length() && d[0]>='0' && d[0]<='9') {
-		    float dist = d.to_double();
-		  ///  mi->set_draw_range_begin(dist);
-		  //  mi->set_draw_range_end(100000);
-
-		  //  mip->set_draw_range_begin(0);
-		  //  mip->set_draw_range_end(dist);
-
-		    /*if (mi->get_mesh().is_valid()) {
-
-			Ref<ArrayMesh> m = mi->get_mesh();
-			for(int i=0;i<m->get_surface_count();i++) {
-
-			    Ref<SpatialMaterial> fm = m->surface_get_material(i);
-			    if (fm.is_valid()) {
-				fm->set_flag(Material::FLAG_UNSHADED,true);
-				fm->set_flag(Material::FLAG_DOUBLE_SIDED,true);
-				fm->set_hint(Material::HINT_NO_DEPTH_DRAW,true);
-				fm->set_fixed_flag(SpatialMaterial::FLAG_USE_ALPHA,true);
-			    }
-			}
-		    }*/
-		}
-	    }
-	}
-    }
-
-
-	if (p_flags&SCENE_FLAG_DETECT_LIGHTMAP_LAYER && _teststr(name,"lm") && Object::cast_to<MeshInstance>(p_node)) {
-
-		MeshInstance *mi = Object::cast_to<MeshInstance>(p_node);
-
-		String str=name;
-		int layer = str.substr(str.find("lm")+3,str.length()).to_int();
-		//mi->set_baked_light_texture_id(layer);
-	}
-#endif
 	if (_teststr(name, "colonly")) {
 
 		if (isroot)
@@ -681,38 +542,6 @@ Node *ResourceImporterScene::_fix_node(Node *p_node, Node *p_root, Map<Ref<Array
 					if (!shape.is_null())
 						collision_map[mesh] = shape;
 				}
-
-				if (!shape.is_null()) {
-#if 0
-					StaticBody* static_body = memnew( StaticBody );
-					ERR_FAIL_COND_V(!static_body,NULL);
-					static_body->set_name( String(mesh->get_name()) + "_col" );
-					shape->set_name(static_body->get_name());
-					static_body->add_shape(shape);
-
-					mi->add_child(static_body);
-					if (mi->get_owner())
-						static_body->set_owner( mi->get_owner() );
-#endif
-				}
-			}
-
-			for (int i = 0; i < mesh->get_surface_count(); i++) {
-
-				Ref<SpatialMaterial> fm = mesh->surface_get_material(i);
-				if (fm.is_valid()) {
-					String name = fm->get_name();
-					/*	if (_teststr(name,"alpha")) {
-						fm->set_fixed_flag(SpatialMaterial::FLAG_USE_ALPHA,true);
-						name=_fixstr(name,"alpha");
-					}
-
-					if (_teststr(name,"vcol")) {
-						fm->set_fixed_flag(SpatialMaterial::FLAG_USE_COLOR_ARRAY,true);
-						name=_fixstr(name,"vcol");
-					}*/
-					fm->set_name(name);
-				}
 			}
 		}
 	}

editor/inspector_dock.cpp

@@ -1,51 +0,0 @@
-/*************************************************************************/
-/*  inspector_dock.cpp                                                   */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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.                */
-/*************************************************************************/
-#include "inspector_dock.h"
-
-#if 0
-void InspectorDock::_go_next() {
-
-
-}
-
-void InspectorDock::_go_prev() {
-
-
-}
-
-void InspectorDock::_bind_methods() {
-
-}
-
-InspectorDock::InspectorDock() {
-
-
-}
-#endif

editor/inspector_dock.h

@@ -1,63 +0,0 @@
-/*************************************************************************/
-/*  inspector_dock.h                                                     */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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 INSPECTOR_DOCK_H
-#define INSPECTOR_DOCK_H
-
-#include "property_editor.h"
-#include "scene/gui/box_container.h"
-
-//this is for now bundled in EditorNode, will be moved away here eventually
-
-#if 0
-class InspectorDock : public VBoxContainer
-{
-	GDCLASS(InspectorDock,VBoxContainer);
-
-	PropertyEditor *property_editor;
-
-	EditorHistory editor_history;
-
-	void _go_next();
-	void _go_prev();
-
-protected:
-
-	static void _bind_methods();
-public:
-
-	EditorHistory &get_editor_history();
-
-	PropertyEditor *get_property_editor();
-
-	InspectorDock();
-};
-
-#endif
-#endif // INSPECTOR_DOCK_H

editor/io_plugins/SCsub

@@ -1,5 +0,0 @@
-#!/usr/bin/env python
-
-Import('env')
-Export('env')
-env.add_source_files(env.editor_sources, "*.cpp")

editor/io_plugins/editor_atlas.cpp

@@ -1,153 +0,0 @@
-/*************************************************************************/
-/*  editor_atlas.cpp                                                     */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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.                */
-/*************************************************************************/
-#include "editor_atlas.h"
-
-#include "print_string.h"
-
-struct _EditorAtlasWorkRect {
-
-	Size2i s;
-	Point2i p;
-	int idx;
-	_FORCE_INLINE_ bool operator<(const _EditorAtlasWorkRect &p_r) const { return s.width > p_r.s.width; };
-};
-
-struct _EditorAtlasWorkRectResult {
-
-	Vector<_EditorAtlasWorkRect> result;
-	int max_w;
-	int max_h;
-};
-
-void EditorAtlas::fit(const Vector<Size2i> &p_rects, Vector<Point2i> &r_result, Size2i &r_size) {
-
-	//super simple, almost brute force scanline stacking fitter
-	//it's pretty basic for now, but it tries to make sure that the aspect ratio of the
-	//resulting atlas is somehow square. This is necessary because video cards have limits
-	//on texture size (usually 2048 or 4096), so the more square a texture, the more chances
-	//it will work in every hardware.
-	// for example, it will prioritize a 1024x1024 atlas (works everywhere) instead of a
-	// 256x8192 atlas (won't work anywhere).
-
-	ERR_FAIL_COND(p_rects.size() == 0);
-
-	Vector<_EditorAtlasWorkRect> wrects;
-	wrects.resize(p_rects.size());
-	for (int i = 0; i < p_rects.size(); i++) {
-		wrects[i].s = p_rects[i];
-		wrects[i].idx = i;
-	}
-	wrects.sort();
-	int widest = wrects[0].s.width;
-
-	Vector<_EditorAtlasWorkRectResult> results;
-
-	for (int i = 0; i <= 12; i++) {
-
-		int w = 1 << i;
-		int max_h = 0;
-		int max_w = 0;
-		if (w < widest)
-			continue;
-
-		Vector<int> hmax;
-		hmax.resize(w);
-		for (int j = 0; j < w; j++)
-			hmax[j] = 0;
-
-		//place them
-		int ofs = 0;
-
-		for (int j = 0; j < wrects.size(); j++) {
-
-			if (ofs + wrects[j].s.width > w) {
-
-				ofs = 0;
-			}
-
-			int from_y = 0;
-			for (int k = 0; k < wrects[j].s.width; k++) {
-
-				if (hmax[ofs + k] > from_y)
-					from_y = hmax[ofs + k];
-			}
-
-			wrects[j].p.x = ofs;
-			wrects[j].p.y = from_y;
-
-			int end_h = from_y + wrects[j].s.height;
-			int end_w = ofs + wrects[j].s.width;
-
-			for (int k = 0; k < wrects[j].s.width; k++) {
-
-				hmax[ofs + k] = end_h;
-			}
-
-			if (end_h > max_h)
-				max_h = end_h;
-
-			if (end_w > max_w)
-				max_w = end_w;
-
-			ofs += wrects[j].s.width;
-		}
-
-		_EditorAtlasWorkRectResult result;
-		result.result = wrects;
-		result.max_h = max_h;
-		result.max_w = max_w;
-		results.push_back(result);
-	}
-
-	//find the result with the best aspect ratio
-
-	int best = -1;
-	float best_aspect = 1e20;
-
-	for (int i = 0; i < results.size(); i++) {
-
-		float h = results[i].max_h;
-		float w = results[i].max_w;
-		float aspect = h > w ? h / w : w / h;
-		if (aspect < best_aspect) {
-			best = i;
-			best_aspect = aspect;
-		}
-	}
-
-	r_result.resize(p_rects.size());
-
-	for (int i = 0; i < p_rects.size(); i++) {
-
-		r_result[results[best].result[i].idx] = results[best].result[i].p;
-	}
-
-	r_size = Size2(results[best].max_w, results[best].max_h);
-}

editor/io_plugins/editor_atlas.h

@@ -1,41 +0,0 @@
-/*************************************************************************/
-/*  editor_atlas.h                                                       */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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 EDITOR_ATLAS_H
-#define EDITOR_ATLAS_H
-
-#include "math_2d.h"
-#include "vector.h"
-
-class EditorAtlas {
-public:
-	static void fit(const Vector<Size2i> &p_rects, Vector<Point2i> &r_result, Size2i &r_size);
-};
-
-#endif // EDITOR_ATLAS_H

editor/io_plugins/editor_bitmask_import_plugin.cpp

@@ -1,388 +0,0 @@
-/*************************************************************************/
-/*  editor_bitmask_import_plugin.cpp                                     */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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.                */
-/*************************************************************************/
-#include "editor_bitmask_import_plugin.h"
-#if 0
-#include "editor/editor_dir_dialog.h"
-#include "editor/editor_file_dialog.h"
-#include "editor/editor_node.h"
-#include "editor/editor_settings.h"
-#include "editor/property_editor.h"
-#include "io/image_loader.h"
-#include "io/marshalls.h"
-#include "io/resource_saver.h"
-#include "os/file_access.h"
-
-class _EditorBitMaskImportOptions : public Object {
-
-	GDCLASS(_EditorBitMaskImportOptions, Object);
-public:
-
-	bool _set(const StringName& p_name, const Variant& p_value) {
-
-		return false;
-	}
-
-	bool _get(const StringName& p_name, Variant &r_ret) const{
-
-		return false;
-	}
-
-	void _get_property_list(List<PropertyInfo> *p_list) const{
-
-	}
-
-	static void _bind_methods() {
-
-		ADD_SIGNAL(MethodInfo("changed"));
-	}
-
-
-	_EditorBitMaskImportOptions() {
-
-	}
-
-};
-
-class EditorBitMaskImportDialog : public ConfirmationDialog {
-
-	GDCLASS(EditorBitMaskImportDialog, ConfirmationDialog);
-
-	EditorBitMaskImportPlugin *plugin;
-
-	LineEdit *import_path;
-	LineEdit *save_path;
-	EditorFileDialog *file_select;
-	EditorDirDialog *save_select;
-	ConfirmationDialog *error_dialog;
-	PropertyEditor *option_editor;
-
-public:
-
-	void _choose_files(const Vector<String>& p_path) {
-
-		String files;
-		for (int i = 0; i<p_path.size(); i++) {
-
-			if (i>0)
-				files += ",";
-			files += p_path[i];
-		}
-
-		import_path->set_text(files);
-
-	}
-	void _choose_save_dir(const String& p_path) {
-
-		save_path->set_text(p_path);
-	}
-
-	void _browse() {
-
-		file_select->popup_centered_ratio();
-	}
-
-	void _browse_target() {
-
-		save_select->popup_centered_ratio();
-
-	}
-
-
-	void popup_import(const String& p_path) {
-
-		popup_centered(Size2(400, 100)*EDSCALE);
-		if (p_path != "") {
-
-			Ref<ResourceImportMetadata> rimd = ResourceLoader::load_import_metadata(p_path);
-			ERR_FAIL_COND(!rimd.is_valid());
-
-			save_path->set_text(p_path.get_base_dir());
-
-			String src = "";
-			for (int i = 0; i<rimd->get_source_count(); i++) {
-				if (i>0)
-					src += ",";
-				src += EditorImportPlugin::expand_source_path(rimd->get_source_path(i));
-			}
-			import_path->set_text(src);
-		}
-	}
-
-
-	void _import() {
-
-		Vector<String> bitmasks = import_path->get_text().split(",");
-
-		if (bitmasks.size() == 0) {
-			error_dialog->set_text(TTR("No bit masks to import!"));
-			error_dialog->popup_centered(Size2(200, 100)*EDSCALE);
-		}
-
-		if (save_path->get_text().strip_edges() == "") {
-			error_dialog->set_text(TTR("Target path is empty."));
-			error_dialog->popup_centered_minsize();
-			return;
-		}
-
-		if (!save_path->get_text().begins_with("res://")) {
-			error_dialog->set_text(TTR("Target path must be a complete resource path."));
-			error_dialog->popup_centered_minsize();
-			return;
-		}
-
-		if (!DirAccess::exists(save_path->get_text())) {
-			error_dialog->set_text(TTR("Target path must exist."));
-			error_dialog->popup_centered_minsize();
-			return;
-		}
-
-		for (int i = 0; i<bitmasks.size(); i++) {
-
-			Ref<ResourceImportMetadata> imd = memnew(ResourceImportMetadata);
-
-			imd->add_source(EditorImportPlugin::validate_source_path(bitmasks[i]));
-
-			String dst = save_path->get_text();
-			if (dst == "") {
-				error_dialog->set_text(TTR("Save path is empty!"));
-				error_dialog->popup_centered(Size2(200, 100)*EDSCALE);
-			}
-
-			dst = dst.plus_file(bitmasks[i].get_file().get_basename() + ".pbm");
-
-			plugin->import(dst, imd);
-		}
-
-		hide();
-
-	}
-
-
-	void _notification(int p_what) {
-
-	}
-
-	static void _bind_methods() {
-
-
-		ClassDB::bind_method("_choose_files", &EditorBitMaskImportDialog::_choose_files);
-		ClassDB::bind_method("_choose_save_dir", &EditorBitMaskImportDialog::_choose_save_dir);
-		ClassDB::bind_method("_import", &EditorBitMaskImportDialog::_import);
-		ClassDB::bind_method("_browse", &EditorBitMaskImportDialog::_browse);
-		ClassDB::bind_method("_browse_target", &EditorBitMaskImportDialog::_browse_target);
-		//ADD_SIGNAL( MethodInfo("imported",PropertyInfo(Variant::OBJECT,"scene")) );
-	}
-
-	EditorBitMaskImportDialog(EditorBitMaskImportPlugin *p_plugin) {
-
-		plugin = p_plugin;
-
-
-		set_title(TTR("Import BitMasks"));
-
-		VBoxContainer *vbc = memnew(VBoxContainer);
-		add_child(vbc);
-		//set_child_rect(vbc);
-
-
-		HBoxContainer *hbc = memnew(HBoxContainer);
-		vbc->add_margin_child(TTR("Source Texture(s):"), hbc);
-
-		import_path = memnew(LineEdit);
-		import_path->set_h_size_flags(SIZE_EXPAND_FILL);
-		hbc->add_child(import_path);
-
-		Button * import_choose = memnew(Button);
-		import_choose->set_text(" .. ");
-		hbc->add_child(import_choose);
-
-		import_choose->connect("pressed", this, "_browse");
-
-		hbc = memnew(HBoxContainer);
-		vbc->add_margin_child(TTR("Target Path:"), hbc);
-
-		save_path = memnew(LineEdit);
-		save_path->set_h_size_flags(SIZE_EXPAND_FILL);
-		hbc->add_child(save_path);
-
-		Button * save_choose = memnew(Button);
-		save_choose->set_text(" .. ");
-		hbc->add_child(save_choose);
-
-		save_choose->connect("pressed", this, "_browse_target");
-
-		file_select = memnew(EditorFileDialog);
-		file_select->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
-		add_child(file_select);
-		file_select->set_mode(EditorFileDialog::MODE_OPEN_FILES);
-		file_select->connect("files_selected", this, "_choose_files");
-
-		List<String> extensions;
-		ImageLoader::get_recognized_extensions(&extensions);
-		file_select->clear_filters();
-		for (int i = 0; i<extensions.size(); i++) {
-
-			file_select->add_filter("*." + extensions[i] + " ; " + extensions[i].to_upper());
-		}
-
-		save_select = memnew(EditorDirDialog);
-		add_child(save_select);
-
-		//save_select->set_mode(EditorFileDialog::MODE_OPEN_DIR);
-		save_select->connect("dir_selected", this, "_choose_save_dir");
-
-		get_ok()->connect("pressed", this, "_import");
-		get_ok()->set_text(TTR("Import"));
-
-
-		error_dialog = memnew(ConfirmationDialog);
-		add_child(error_dialog);
-		error_dialog->get_ok()->set_text(TTR("Accept"));
-		//error_dialog->get_cancel()->hide();
-
-		set_hide_on_ok(false);
-	}
-
-	~EditorBitMaskImportDialog() {
-	}
-
-};
-
-
-String EditorBitMaskImportPlugin::get_name() const {
-
-	return "bitmask";
-}
-String EditorBitMaskImportPlugin::get_visible_name() const{
-
-	return TTR("Bit Mask");
-}
-void EditorBitMaskImportPlugin::import_dialog(const String& p_from){
-
-	dialog->popup_import(p_from);
-}
-Error EditorBitMaskImportPlugin::import(const String& p_path, const Ref<ResourceImportMetadata>& p_from){
-
-	ERR_FAIL_COND_V(p_from->get_source_count() != 1, ERR_INVALID_PARAMETER);
-
-	Ref<ResourceImportMetadata> from = p_from;
-
-	String src_path = EditorImportPlugin::expand_source_path(from->get_source_path(0));
-	Ref<ImageTexture> it = ResourceLoader::load(src_path);
-	ERR_FAIL_COND_V(it.is_null(), ERR_CANT_OPEN);
-
-	Ref<BitMap> target = memnew(BitMap);
-	target->create_from_image_alpha(it.ptr()->get_data());
-
-	from->set_source_md5(0, FileAccess::get_md5(src_path));
-	from->set_editor(get_name());
-	target->set_import_metadata(from);
-
-
-	Error err = ResourceSaver::save(p_path, target);
-
-	return err;
-
-}
-
-
-EditorBitMaskImportPlugin* EditorBitMaskImportPlugin::singleton = NULL;
-
-
-void EditorBitMaskImportPlugin::import_from_drop(const Vector<String>& p_drop, const String &p_dest_path) {
-
-	Vector<String> files;
-
-	List<String> valid_extensions;
-	ImageLoader::get_recognized_extensions(&valid_extensions);
-	for(int i=0;i<p_drop.size();i++) {
-
-		String extension=p_drop[i].get_extension().to_lower();
-
-		for (List<String>::Element *E=valid_extensions.front();E;E=E->next()) {
-
-			if (E->get()==extension) {
-				files.push_back(p_drop[i]);
-				break;
-			}
-		}
-	}
-
-	if (files.size()) {
-		import_dialog();
-		dialog->_choose_files(files);
-		dialog->_choose_save_dir(p_dest_path);
-	}
-}
-
-void EditorBitMaskImportPlugin::reimport_multiple_files(const Vector<String>& p_list) {
-
-	if (p_list.size() == 0)
-		return;
-
-	Vector<String> sources;
-	for (int i = 0; i<p_list.size(); i++) {
-		int idx;
-		EditorFileSystemDirectory *efsd = EditorFileSystem::get_singleton()->find_file(p_list[i], &idx);
-		if (efsd) {
-			for (int j = 0; j<efsd->get_source_count(idx); j++) {
-				String file = expand_source_path(efsd->get_source_file(idx, j));
-				if (sources.find(file) == -1) {
-					sources.push_back(file);
-				}
-
-			}
-		}
-	}
-
-	if (sources.size()) {
-
-		dialog->popup_import(p_list[0]);
-		dialog->_choose_files(sources);
-		dialog->_choose_save_dir(p_list[0].get_base_dir());
-	}
-}
-
-bool EditorBitMaskImportPlugin::can_reimport_multiple_files() const {
-
-	return true;
-}
-
-EditorBitMaskImportPlugin::EditorBitMaskImportPlugin(EditorNode* p_editor) {
-
-	singleton = this;
-	dialog = memnew(EditorBitMaskImportDialog(this));
-	p_editor->get_gui_base()->add_child(dialog);
-}
-
-EditorBitMaskExportPlugin::EditorBitMaskExportPlugin() {
-
-}
-#endif

editor/io_plugins/editor_bitmask_import_plugin.h

@@ -1,71 +0,0 @@
-/*************************************************************************/
-/*  editor_bitmask_import_plugin.h                                       */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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 EDITOR_BITMASK_IMPORT_PLUGIN_H
-#define EDITOR_BITMASK_IMPORT_PLUGIN_H
-#if 0
-#include "editor/editor_import_export.h"
-#include "scene/resources/font.h"
-
-class EditorNode;
-class EditorBitMaskImportDialog;
-
-class EditorBitMaskImportPlugin : public EditorImportPlugin {
-
-	GDCLASS(EditorBitMaskImportPlugin, EditorImportPlugin);
-
-	EditorBitMaskImportDialog *dialog;
-public:
-
-	static EditorBitMaskImportPlugin *singleton;
-
-	virtual String get_name() const;
-	virtual String get_visible_name() const;
-	virtual void import_dialog(const String& p_from = "");
-	virtual Error import(const String& p_path, const Ref<ResourceImportMetadata>& p_from);
-	void import_from_drop(const Vector<String>& p_drop, const String &p_dest_path);
-	virtual void reimport_multiple_files(const Vector<String>& p_list);
-	virtual bool can_reimport_multiple_files() const;
-
-
-	EditorBitMaskImportPlugin(EditorNode* p_editor);
-};
-
-class EditorBitMaskExportPlugin : public EditorExportPlugin {
-
-	GDCLASS(EditorBitMaskExportPlugin, EditorExportPlugin);
-
-
-public:
-
-	EditorBitMaskExportPlugin();
-};
-
-#endif
-#endif // EDITOR_SAMPLE_IMPORT_PLUGIN_H

editor/io_plugins/editor_export_scene.cpp

@@ -1,143 +0,0 @@
-/*************************************************************************/
-/*  editor_export_scene.cpp                                              */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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.                */
-/*************************************************************************/
-#include "editor_export_scene.h"
-#if 0
-#include "editor/editor_settings.h"
-#include "io/resource_loader.h"
-#include "io/resource_saver.h"
-#include "os/dir_access.h"
-#include "os/file_access.h"
-#include "project_settings.h"
-#include "scene/resources/packed_scene.h"
-
-Vector<uint8_t> EditorSceneExportPlugin::custom_export(String& p_path,const Ref<EditorExportPlatform> &p_platform) {
-
-	if (!EditorImportExport::get_singleton()->get_convert_text_scenes()) {
-		return Vector<uint8_t>();
-	}
-
-
-	String extension = p_path.get_extension();
-
-	//step 1 check if scene
-
-	if (extension=="xml" || extension=="xres") {
-
-		String type = ResourceLoader::get_resource_type(p_path);
-
-		if (type!="PackedScene")
-			return Vector<uint8_t>();
-
-	} else if (extension!="tscn" && extension!="xscn") {
-		return Vector<uint8_t>();
-	}
-
-	//step 2 check if cached
-
-	uint64_t sd=0;
-	String smd5;
-	String gp = ProjectSettings::get_singleton()->globalize_path(p_path);
-	String md5=gp.md5_text();
-	String tmp_path = EditorSettings::get_singleton()->get_settings_path().plus_file("tmp/");
-
-	bool valid=false;
-	{
-		//if existing, make sure it's valid
-		FileAccessRef f = FileAccess::open(tmp_path+"scnexp-"+md5+".txt",FileAccess::READ);
-		if (f) {
-
-			uint64_t d = f->get_line().strip_edges().to_int64();
-			sd = FileAccess::get_modified_time(p_path);
-
-			if (d==sd) {
-				valid=true;
-			} else {
-				String cmd5 = f->get_line().strip_edges();
-				smd5 = FileAccess::get_md5(p_path);
-				if (cmd5==smd5) {
-					valid=true;
-				}
-			}
-
-
-		}
-	}
-
-	if (!valid) {
-		//cache failed, convert
-		DirAccess *da = DirAccess::create(DirAccess::ACCESS_RESOURCES);
-
-		String copy = p_path+".convert."+extension;
-
-		// a copy will allow loading the internal resources without conflicting with opened scenes
-		da->copy(p_path,copy);
-
-		//@todo for tscn use something more efficient
-
-		Ref<PackedScene> copyres =  ResourceLoader::load(copy,"PackedScene");
-
-		da->remove(copy);
-
-		memdelete(da);
-
-		ERR_FAIL_COND_V(!copyres.is_valid(),Vector<uint8_t>());
-
-		Error err = ResourceSaver::save(tmp_path+"scnexp-"+md5+".scn",copyres);
-
-		copyres=Ref<PackedScene>();
-
-		ERR_FAIL_COND_V(err!=OK,Vector<uint8_t>());
-
-		FileAccessRef f = FileAccess::open(tmp_path+"scnexp-"+md5+".txt",FileAccess::WRITE);
-
-		if (sd==0)
-			sd = FileAccess::get_modified_time(p_path);
-		if (smd5==String())
-			smd5 = FileAccess::get_md5(p_path);
-
-		f->store_line(String::num(sd));
-		f->store_line(smd5);
-		f->store_line(gp); //source path for reference
-	}
-
-
-	Vector<uint8_t> ret = FileAccess::get_file_as_array(tmp_path+"scnexp-"+md5+".scn");
-
-	p_path+=".converted.scn";
-
-	return ret;
-
-}
-
-
-EditorSceneExportPlugin::EditorSceneExportPlugin()
-{
-}
-#endif

editor/io_plugins/editor_export_scene.h

@@ -1,45 +0,0 @@
-/*************************************************************************/
-/*  editor_export_scene.h                                                */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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 EDITOR_EXPORT_SCENE_H
-#define EDITOR_EXPORT_SCENE_H
-
-#include "editor/editor_export.h"
-
-#if 0
-class EditorSceneExportPlugin : public EditorExportPlugin {
-	GDCLASS( EditorSceneExportPlugin, EditorExportPlugin );
-public:
-
-	virtual Vector<uint8_t> custom_export(String& p_path,const Ref<EditorExportPlatform> &p_platform);
-
-	EditorSceneExportPlugin();
-};
-#endif
-#endif // EDITOR_EXPORT_SCENE_H

editor/io_plugins/editor_font_import_plugin.cpp

@@ -1,1705 +0,0 @@
-/*************************************************************************/
-/*  editor_font_import_plugin.cpp                                        */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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.                */
-/*************************************************************************/
-#include "editor_font_import_plugin.h"
-#if 0
-#include "editor/editor_file_dialog.h"
-#include "editor/editor_node.h"
-#include "editor_atlas.h"
-#include "io/image_loader.h"
-#include "io/resource_saver.h"
-#include "os/file_access.h"
-#include "scene/gui/dialogs.h"
-
-#ifdef FREETYPE_ENABLED
-#include <ft2build.h>
-#include FT_FREETYPE_H
-#endif
-
-
-class _EditorFontImportOptions : public Object {
-
-	GDCLASS(_EditorFontImportOptions,Object);
-public:
-
-	enum FontMode {
-
-		FONT_BITMAP,
-		FONT_DISTANCE_FIELD
-	};
-
-	enum ColorType {
-		COLOR_WHITE,
-		COLOR_CUSTOM,
-		COLOR_GRADIENT_RANGE,
-		COLOR_GRADIENT_IMAGE
-	};
-
-
-	int char_extra_spacing;
-	int top_extra_spacing;
-	int bottom_extra_spacing;
-	int space_extra_spacing;
-
-	enum CharacterSet {
-
-		CHARSET_ASCII,
-		CHARSET_LATIN,
-		CHARSET_UNICODE,
-		CHARSET_CUSTOM,
-		CHARSET_CUSTOM_LATIN
-	};
-
-
-	FontMode font_mode;
-
-	CharacterSet character_set;
-	String custom_file;
-
-	bool shadow;
-	Vector2 shadow_offset;
-	int shadow_radius;
-	Color shadow_color;
-	float shadow_transition;
-
-	bool shadow2;
-	Vector2 shadow2_offset;
-	int shadow2_radius;
-	Color shadow2_color;
-	float shadow2_transition;
-
-	ColorType color_type;
-	Color color;
-	Color gradient_begin;
-	Color gradient_end;
-	bool color_use_monochrome;
-	String gradient_image;
-
-	bool enable_filter;
-	bool round_advance;
-	bool premultiply_alpha;
-
-
-
-	bool _set(const StringName& p_name, const Variant& p_value) {
-
-		String n = p_name;
-		if (n=="mode/mode") {
-			font_mode=FontMode(int(p_value));
-			_change_notify();
-		} else if (n=="extra_space/char")
-			char_extra_spacing=p_value;
-		else if (n=="extra_space/space")
-			space_extra_spacing=p_value;
-		else if (n=="extra_space/top")
-			top_extra_spacing=p_value;
-		else if (n=="extra_space/bottom")
-			bottom_extra_spacing=p_value;
-
-		else if (n=="character_set/mode") {
-			character_set=CharacterSet(int(p_value));
-			_change_notify();
-		} else if (n=="character_set/custom")
-			custom_file=p_value;
-
-		else if (n=="shadow/enabled") {
-			shadow=p_value;
-			_change_notify();
-		}else if (n=="shadow/radius")
-			shadow_radius=p_value;
-		else if (n=="shadow/offset")
-			shadow_offset=p_value;
-		else if (n=="shadow/color")
-			shadow_color=p_value;
-		else if (n=="shadow/transition")
-			shadow_transition=p_value;
-
-		else if (n=="shadow2/enabled") {
-			shadow2=p_value;
-			_change_notify();
-		}else if (n=="shadow2/radius")
-			shadow2_radius=p_value;
-		else if (n=="shadow2/offset")
-			shadow2_offset=p_value;
-		else if (n=="shadow2/color")
-			shadow2_color=p_value;
-		else if (n=="shadow2/transition")
-			shadow2_transition=p_value;
-
-		else if (n=="color/mode") {
-			color_type=ColorType(int(p_value));
-			_change_notify();
-		}else if (n=="color/color")
-			color=p_value;
-		else if (n=="color/begin")
-			gradient_begin=p_value;
-		else if (n=="color/end")
-			gradient_end=p_value;
-		else if (n=="color/image")
-			gradient_image=p_value;
-		else if (n=="color/monochrome")
-			color_use_monochrome=p_value;
-		else if (n=="advanced/round_advance")
-			round_advance=p_value;
-		else if (n=="advanced/enable_filter")
-			enable_filter=p_value;
-		else if (n=="advanced/premultiply_alpha")
-			premultiply_alpha=p_value;
-		else
-			return false;
-
-		emit_signal("changed");
-
-
-		return true;
-
-	}
-
-	bool _get(const StringName& p_name,Variant &r_ret) const{
-
-		String n = p_name;
-		if (n=="mode/mode")
-			r_ret=font_mode;
-		else if (n=="extra_space/char")
-			r_ret=char_extra_spacing;
-		else if (n=="extra_space/space")
-			r_ret=space_extra_spacing;
-		else if (n=="extra_space/top")
-			r_ret=top_extra_spacing;
-		else if (n=="extra_space/bottom")
-			r_ret=bottom_extra_spacing;
-
-		else if (n=="character_set/mode")
-			r_ret=character_set;
-		else if (n=="character_set/custom")
-			r_ret=custom_file;
-
-		else if (n=="shadow/enabled")
-			r_ret=shadow;
-		else if (n=="shadow/radius")
-			r_ret=shadow_radius;
-		else if (n=="shadow/offset")
-			r_ret=shadow_offset;
-		else if (n=="shadow/color")
-			r_ret=shadow_color;
-		else if (n=="shadow/transition")
-			r_ret=shadow_transition;
-
-		else if (n=="shadow2/enabled")
-			r_ret=shadow2;
-		else if (n=="shadow2/radius")
-			r_ret=shadow2_radius;
-		else if (n=="shadow2/offset")
-			r_ret=shadow2_offset;
-		else if (n=="shadow2/color")
-			r_ret=shadow2_color;
-		else if (n=="shadow2/transition")
-			r_ret=shadow2_transition;
-
-
-		else if (n=="color/mode")
-			r_ret=color_type;
-		else if (n=="color/color")
-			r_ret=color;
-		else if (n=="color/begin")
-			r_ret=gradient_begin;
-		else if (n=="color/end")
-			r_ret=gradient_end;
-		else if (n=="color/image")
-			r_ret=gradient_image;
-		else if (n=="color/monochrome")
-			r_ret=color_use_monochrome;
-		else if (n=="advanced/round_advance")
-			r_ret=round_advance;
-		else if (n=="advanced/enable_filter")
-			r_ret=enable_filter;
-		else if (n=="advanced/premultiply_alpha")
-			r_ret=premultiply_alpha;
-		else
-			return false;
-
-		return true;
-
-	}
-
-	void _get_property_list( List<PropertyInfo> *p_list) const{
-
-
-		p_list->push_back(PropertyInfo(Variant::INT,"mode/mode",PROPERTY_HINT_ENUM,"Bitmap,Distance Field"));
-
-		p_list->push_back(PropertyInfo(Variant::INT,"extra_space/char",PROPERTY_HINT_RANGE,"-64,64,1"));
-		p_list->push_back(PropertyInfo(Variant::INT,"extra_space/space",PROPERTY_HINT_RANGE,"-64,64,1"));
-		p_list->push_back(PropertyInfo(Variant::INT,"extra_space/top",PROPERTY_HINT_RANGE,"-64,64,1"));
-		p_list->push_back(PropertyInfo(Variant::INT,"extra_space/bottom",PROPERTY_HINT_RANGE,"-64,64,1"));
-		p_list->push_back(PropertyInfo(Variant::INT,"character_set/mode",PROPERTY_HINT_ENUM,"Ascii,Latin,Unicode,Custom,Custom&Latin"));
-
-		if (character_set>=CHARSET_CUSTOM)
-			p_list->push_back(PropertyInfo(Variant::STRING,"character_set/custom",PROPERTY_HINT_GLOBAL_FILE));
-
-		int usage = PROPERTY_USAGE_DEFAULT;
-
-		if (font_mode==FONT_DISTANCE_FIELD) {
-			usage = PROPERTY_USAGE_NOEDITOR;
-		}
-
-		{
-
-			p_list->push_back(PropertyInfo(Variant::BOOL,"shadow/enabled",PROPERTY_HINT_NONE,"",usage));
-			if (shadow) {
-				p_list->push_back(PropertyInfo(Variant::INT,"shadow/radius",PROPERTY_HINT_RANGE,"-64,64,1",usage));
-				p_list->push_back(PropertyInfo(Variant::VECTOR2,"shadow/offset",PROPERTY_HINT_NONE,"",usage));
-				p_list->push_back(PropertyInfo(Variant::COLOR,"shadow/color",PROPERTY_HINT_NONE,"",usage));
-				p_list->push_back(PropertyInfo(Variant::REAL,"shadow/transition",PROPERTY_HINT_EXP_EASING,"",usage));
-			}
-
-			p_list->push_back(PropertyInfo(Variant::BOOL,"shadow2/enabled",PROPERTY_HINT_NONE,"",usage));
-			if (shadow2) {
-				p_list->push_back(PropertyInfo(Variant::INT,"shadow2/radius",PROPERTY_HINT_RANGE,"-64,64,1",usage));
-				p_list->push_back(PropertyInfo(Variant::VECTOR2,"shadow2/offset",PROPERTY_HINT_NONE,"",usage));
-				p_list->push_back(PropertyInfo(Variant::COLOR,"shadow2/color",PROPERTY_HINT_NONE,"",usage));
-				p_list->push_back(PropertyInfo(Variant::REAL,"shadow2/transition",PROPERTY_HINT_EXP_EASING,"",usage));
-			}
-
-			p_list->push_back(PropertyInfo(Variant::INT,"color/mode",PROPERTY_HINT_ENUM,"White,Color,Gradient,Gradient Image",usage));
-			if (color_type==COLOR_CUSTOM) {
-				p_list->push_back(PropertyInfo(Variant::COLOR,"color/color",PROPERTY_HINT_NONE,"",usage));
-
-			}
-			if (color_type==COLOR_GRADIENT_RANGE) {
-				p_list->push_back(PropertyInfo(Variant::COLOR,"color/begin",PROPERTY_HINT_NONE,"",usage));
-				p_list->push_back(PropertyInfo(Variant::COLOR,"color/end",PROPERTY_HINT_NONE,"",usage));
-			}
-			if (color_type==COLOR_GRADIENT_IMAGE) {
-				p_list->push_back(PropertyInfo(Variant::STRING,"color/image",PROPERTY_HINT_GLOBAL_FILE,"",usage));
-			}
-			p_list->push_back(PropertyInfo(Variant::BOOL,"color/monochrome",PROPERTY_HINT_NONE,"",usage));
-		}
-
-		p_list->push_back(PropertyInfo(Variant::BOOL,"advanced/round_advance"));
-		p_list->push_back(PropertyInfo(Variant::BOOL,"advanced/enable_filter"));
-		p_list->push_back(PropertyInfo(Variant::BOOL,"advanced/premultiply_alpha"));
-
-	}
-
-
-	static void _bind_methods() {
-
-
-		ADD_SIGNAL( MethodInfo("changed"));
-	}
-
-
-	void reset() {
-
-		char_extra_spacing=0;
-		top_extra_spacing=0;
-		bottom_extra_spacing=0;
-		space_extra_spacing=0;
-
-		character_set=CHARSET_LATIN;
-
-		shadow=false;
-		shadow_radius=2;
-		shadow_color=Color(0,0,0,0.3);
-		shadow_transition=1.0;
-
-		shadow2=false;
-		shadow2_radius=2;
-		shadow2_color=Color(0,0,0,0.3);
-		shadow2_transition=1.0;
-
-		color_type=COLOR_WHITE;
-		color=Color(1,1,1,1);
-		gradient_begin=Color(1,1,1,1);
-		gradient_end=Color(0.5,0.5,0.5,1);
-		color_use_monochrome=false;
-
-		font_mode=FONT_BITMAP;
-		round_advance=true;
-		enable_filter=true;
-		premultiply_alpha=false;
-
-	}
-
-	_EditorFontImportOptions() {
-
-		font_mode=FONT_BITMAP;
-
-		char_extra_spacing=0;
-		top_extra_spacing=0;
-		bottom_extra_spacing=0;
-		space_extra_spacing=0;
-
-		character_set=CHARSET_LATIN;
-
-		shadow=false;
-		shadow_radius=2;
-		shadow_color=Color(0,0,0,0.3);
-		shadow_transition=1.0;
-
-		shadow2=false;
-		shadow2_radius=2;
-		shadow2_color=Color(0,0,0,0.3);
-		shadow2_transition=1.0;
-
-		color_type=COLOR_WHITE;
-		color=Color(1,1,1,1);
-		gradient_begin=Color(1,1,1,1);
-		gradient_end=Color(0.5,0.5,0.5,1);
-		color_use_monochrome=false;
-
-		round_advance=true;
-		enable_filter=true;
-		premultiply_alpha=false;
-	}
-
-
-};
-
-
-class EditorFontImportDialog : public ConfirmationDialog {
-
-	GDCLASS(EditorFontImportDialog, ConfirmationDialog);
-
-
-	EditorLineEditFileChooser *source;
-	EditorLineEditFileChooser *dest;
-	SpinBox *font_size;
-	LineEdit *test_string;
-	ColorPickerButton *test_color;
-	Label *test_label;
-	PropertyEditor *prop_edit;
-	Timer *timer;
-	ConfirmationDialog *error_dialog;
-
-
-	Ref<ResourceImportMetadata> get_rimd() {
-
-		Ref<ResourceImportMetadata> imd = memnew( ResourceImportMetadata );
-		List<PropertyInfo> pl;
-		options->_get_property_list(&pl);
-		for(List<PropertyInfo>::Element *E=pl.front();E;E=E->next()) {
-
-			Variant v;
-			String opt=E->get().name;
-			options->_get(opt,v);
-			if (opt=="color/image" || opt=="character_set/custom") {
-				v = EditorImportPlugin::validate_source_path(v);
-			}
-			imd->set_option(opt,v);
-		}
-
-		String src_path = EditorImportPlugin::validate_source_path(source->get_line_edit()->get_text());
-		//print_line("pre src path "+source->get_line_edit()->get_text());
-		//print_line("src path "+src_path);
-		imd->add_source(src_path);
-		imd->set_option("font/size",font_size->get_value());
-
-		return imd;
-
-	}
-
-	void _src_changed(String) {
-		_prop_changed();
-	}
-
-	void _update_text2(String) {
-		_update_text();
-	}
-	void _update_text3(Color) {
-		_update_text();
-	}
-
-	void _update_text() {
-
-		test_label->set_text("");
-		test_label->set_text(test_string->get_text());
-		test_label->add_color_override("font_color",test_color->get_pick_color());
-	}
-
-	void _update() {
-
-		Ref<ResourceImportMetadata> imd = get_rimd();
-		Ref<BitmapFont> font = plugin->generate_font(imd);
-		test_label->add_font_override("font",font);
-		_update_text();
-	}
-
-	void _font_size_changed(double) {
-
-		_prop_changed();
-	}
-
-	void _prop_changed() {
-
-		timer->start();
-	}
-
-	void _import_inc(String p_font) {
-
-		Ref<BitmapFont> font = ResourceLoader::load(p_font);
-		if (!font.is_valid())
-			return;
-		Ref<ImageTexture> tex = font->get_texture(0);
-		if (tex.is_null())
-			return;
-		FileAccessRef f=FileAccess::open(p_font.get_basename()+".inc",FileAccess::WRITE);
-		Vector<CharType> ck = font->get_char_keys();
-
-		f->store_line("static const int _builtin_font_height="+itos(font->get_height())+";");
-		f->store_line("static const int _builtin_font_ascent="+itos(font->get_ascent())+";");
-		f->store_line("static const int _builtin_font_charcount="+itos(ck.size())+";");
-		f->store_line("static const int _builtin_font_charrects["+itos(ck.size())+"][8]={");
-		f->store_line("/* charidx , ofs_x, ofs_y, size_x, size_y, valign, halign, advance */");
-
-		for(int i=0;i<ck.size();i++) {
-			CharType k=ck[i];
-			BitmapFont::Character c=font->get_character(k);
-			f->store_line("{"+itos(k)+","+rtos(c.rect.pos.x)+","+rtos(c.rect.pos.y)+","+rtos(c.rect.size.x)+","+rtos(c.rect.size.y)+","+rtos(c.v_align)+","+rtos(c.h_align)+","+rtos(c.advance)+"},");
-		}
-		f->store_line("};");
-
-		Vector<BitmapFont::KerningPairKey> kp=font->get_kerning_pair_keys();
-		f->store_line("static const int _builtin_font_kerning_pair_count="+itos(kp.size())+";");
-		f->store_line("static const int _builtin_font_kerning_pairs["+itos(kp.size())+"][3]={");
-		for(int i=0;i<kp.size();i++) {
-
-			int d = font->get_kerning_pair(kp[i].A,kp[i].B);
-			f->store_line("{"+itos(kp[i].A)+","+itos(kp[i].B)+","+itos(d)+"},");
-		}
-
-		f->store_line("};");
-		Image img  = tex->get_data();
-
-		f->store_line("static const int _builtin_font_img_width="+itos(img.get_width())+";");
-		f->store_line("static const int _builtin_font_img_height="+itos(img.get_height())+";");		
-
-		String fname = p_font.get_basename()+".sv.png";
-		ResourceSaver::save(fname,tex);
-		Vector<uint8_t> data=FileAccess::get_file_as_array(fname);
-
-
-		f->store_line("static const int _builtin_font_img_data_size="+itos(data.size())+";");
-		f->store_line("static const unsigned char _builtin_font_img_data["+itos(data.size())+"]={");
-
-
-
-		for(int i=0;i<data.size();i++) {
-
-			f->store_line(itos(data[i])+",");
-
-		}
-		f->store_line("};");
-
-	}
-
-	void _import() {
-
-		if (source->get_line_edit()->get_text()=="") {
-			error_dialog->set_text(TTR("No source font file!"));
-			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
-			return;
-		}
-
-		if (dest->get_line_edit()->get_text()=="") {
-			error_dialog->set_text(TTR("No target font resource!"));
-			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
-			return;
-		}
-
-		if (dest->get_line_edit()->get_text().get_file()==".font") {
-			dest->get_line_edit()->set_text(dest->get_line_edit()->get_text().get_base_dir() + "/" + source->get_line_edit()->get_text().get_file().get_basename() + ".font" );
-		}
-
-		if (dest->get_line_edit()->get_text().get_extension() == dest->get_line_edit()->get_text()) {
-			dest->get_line_edit()->set_text(dest->get_line_edit()->get_text() + ".font");
-		}
-
-		if (dest->get_line_edit()->get_text().get_extension().to_lower() != "font") {
-			error_dialog->set_text(TTR("Invalid file extension.\nPlease use .font."));
-			error_dialog->popup_centered(Size2(200,100));
-			return;
-		}
-
-		Ref<ResourceImportMetadata> rimd = get_rimd();
-
-		if (rimd.is_null()) {
-			error_dialog->set_text(TTR("Can't load/process source font."));
-			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
-			return;
-		}
-
-		Error err = plugin->import(dest->get_line_edit()->get_text(),rimd);
-
-		if (err!=OK) {
-			error_dialog->set_text(TTR("Couldn't save font."));
-			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
-			return;
-		}
-
-		_import_inc(dest->get_line_edit()->get_text());
-
-		hide();
-	}
-
-	EditorFontImportPlugin *plugin;
-	_EditorFontImportOptions *options;
-
-	static void _bind_methods() {
-
-		ClassDB::bind_method("_update",&EditorFontImportDialog::_update);
-		ClassDB::bind_method("_update_text",&EditorFontImportDialog::_update_text);
-		ClassDB::bind_method("_update_text2",&EditorFontImportDialog::_update_text2);
-		ClassDB::bind_method("_update_text3",&EditorFontImportDialog::_update_text3);
-		ClassDB::bind_method("_prop_changed",&EditorFontImportDialog::_prop_changed);
-		ClassDB::bind_method("_src_changed",&EditorFontImportDialog::_src_changed);
-		ClassDB::bind_method("_font_size_changed",&EditorFontImportDialog::_font_size_changed);
-		ClassDB::bind_method("_import",&EditorFontImportDialog::_import);
-
-	}
-
-public:
-
-	void _notification(int p_what) {
-
-		if (p_what==NOTIFICATION_ENTER_TREE) {
-			prop_edit->edit(options);
-			_update_text();
-		}
-	}
-
-	void popup_import(const String& p_path) {
-
-		popup_centered(Size2(600,500)*EDSCALE);
-
-		if (p_path!="") {
-
-			Ref<ResourceImportMetadata> rimd = ResourceLoader::load_import_metadata(p_path);
-			ERR_FAIL_COND(!rimd.is_valid());
-
-			dest->get_line_edit()->set_text(p_path);
-			List<String> opts;
-			rimd->get_options(&opts);
-			options->reset();
-			for(List<String>::Element *E=opts.front();E;E=E->next()) {
-
-				options->_set(E->get(),rimd->get_option(E->get()));
-			}
-
-			String src = "";
-			for(int i=0;i<rimd->get_source_count();i++) {
-				if (i>0)
-					src+=",";
-				src+=EditorImportPlugin::expand_source_path(rimd->get_source_path(i));
-			}
-			source->get_line_edit()->set_text(src);
-
-			font_size->set_value(rimd->get_option("font/size"));
-		}
-	}
-
-
-	void set_source_and_dest(const String& p_font,const String& p_dest) {
-		source->get_line_edit()->set_text(p_font);
-		dest->get_line_edit()->set_text(p_dest);
-		_prop_changed();
-	}
-
-	EditorFontImportDialog(EditorFontImportPlugin *p_plugin) {
-		plugin=p_plugin;
-		VBoxContainer *vbc = memnew( VBoxContainer );
-		add_child(vbc);
-		//set_child_rect(vbc);
-		HBoxContainer *hbc = memnew( HBoxContainer);
-		vbc->add_child(hbc);
-		VBoxContainer *vbl = memnew( VBoxContainer );
-		hbc->add_child(vbl);
-		hbc->set_v_size_flags(SIZE_EXPAND_FILL);
-		vbl->set_h_size_flags(SIZE_EXPAND_FILL);
-		VBoxContainer *vbr = memnew( VBoxContainer );
-		hbc->add_child(vbr);
-		vbr->set_h_size_flags(SIZE_EXPAND_FILL);
-
-		source = memnew( EditorLineEditFileChooser );
-		source->get_file_dialog()->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
-		source->get_file_dialog()->set_mode(EditorFileDialog::MODE_OPEN_FILE);
-		source->get_file_dialog()->add_filter("*.ttf;TrueType");
-		source->get_file_dialog()->add_filter("*.otf;OpenType");
-		source->get_file_dialog()->add_filter("*.fnt;BMFont");
-		source->get_line_edit()->connect("text_entered",this,"_src_changed");
-
-		vbl->add_margin_child(TTR("Source Font:"),source);
-		font_size = memnew( SpinBox );
-		vbl->add_margin_child(TTR("Source Font Size:"),font_size);
-		font_size->set_min(3);
-		font_size->set_max(256);
-		font_size->set_value(16);
-		font_size->connect("value_changed",this,"_font_size_changed");
-		dest = memnew( EditorLineEditFileChooser );
-		//
-		List<String> fl;
-		Ref<BitmapFont> font= memnew(BitmapFont);
-		dest->get_file_dialog()->add_filter("*.font ; Font" );
-		/*
-		ResourceSaver::get_recognized_extensions(font,&fl);
-		for(List<String>::Element *E=fl.front();E;E=E->next()) {
-			dest->get_file_dialog()->add_filter("*."+E->get());
-		}
-		*/
-
-		vbl->add_margin_child(TTR("Dest Resource:"),dest);
-		HBoxContainer *testhb = memnew( HBoxContainer );
-		test_string = memnew( LineEdit );
-		test_string->set_text(TTR("The quick brown fox jumps over the lazy dog."));
-		test_string->set_h_size_flags(SIZE_EXPAND_FILL);
-		test_string->set_stretch_ratio(5);
-
-		testhb->add_child(test_string);
-		test_color = memnew( ColorPickerButton );
-		test_color->set_pick_color(get_color("font_color","Label"));
-		test_color->set_h_size_flags(SIZE_EXPAND_FILL);
-		test_color->set_stretch_ratio(1);
-		test_color->connect("color_changed",this,"_update_text3");
-		testhb->add_child(test_color);
-
-		vbl->add_spacer();
-		vbl->add_margin_child(TTR("Test:")+" ",testhb);
-		/*
-		HBoxContainer *upd_hb = memnew( HBoxContainer );
-		//vbl->add_child(upd_hb);
-		upd_hb->add_spacer();
-		Button *update = memnew( Button);
-		upd_hb->add_child(update);
-		update->set_text("Update");
-		update->connect("pressed",this,"_update");
-*/
-		options = memnew( _EditorFontImportOptions );
-		prop_edit = memnew( PropertyEditor() );
-		vbr->add_margin_child(TTR("Options:"),prop_edit,true);
-		options->connect("changed",this,"_prop_changed");
-
-		prop_edit->hide_top_label();
-
-		Panel *panel = memnew( Panel );
-		vbc->add_child(panel);
-		test_label = memnew( Label );
-		test_label->set_autowrap(true);
-		panel->add_child(test_label);
-		test_label->set_area_as_parent_rect();
-		panel->set_v_size_flags(SIZE_EXPAND_FILL);
-		test_string->connect("text_changed",this,"_update_text2");
-		set_title(TTR("Font Import"));
-		timer = memnew( Timer );
-		add_child(timer);
-		timer->connect("timeout",this,"_update");
-		timer->set_wait_time(0.4);
-		timer->set_one_shot(true);
-
-		get_ok()->connect("pressed", this,"_import");
-		get_ok()->set_text(TTR("Import"));
-
-		error_dialog = memnew ( ConfirmationDialog );
-		add_child(error_dialog);
-		error_dialog->get_ok()->set_text(TTR("Accept"));
-		set_hide_on_ok(false);
-
-
-	}
-
-	~EditorFontImportDialog() {
-		memdelete(options);
-	}
-};
-
-
-///////////////////////////////////////
-
-
-
-struct _EditorFontData {
-
-	Vector<uint8_t> bitmap;
-	int width,height;
-	int ofs_x; //offset to center, from ABOVE
-	int ofs_y; //offset to beginning, from LEFT
-	int valign; //vertical alignment
-	int halign;
-	float advance;
-	int character;
-	int glyph;
-
-	int texture;
-	Image blit;
-	Point2i blit_ofs;
-	//bool printable;
-
-};
-
-
-struct _EditorFontDataSort {
-
-	bool operator()(const _EditorFontData *p_A,const _EditorFontData *p_B)  const {
-		return p_A->height > p_B->height;
-	};
-};
-
-struct _EditorKerningKey {
-
-	CharType A,B;
-	bool operator<(const _EditorKerningKey& p_k) const { return (A==p_k.A)?(B<p_k.B):(A<p_k.A); }
-
-};
-
-
-static unsigned char get_SDF_radial(
-		unsigned char *fontmap,
-		int w, int h,
-		int x, int y,
-		int max_radius )
-{
-	//hideous brute force method
-	float d2 = max_radius*max_radius+1.0;
-	unsigned char v = fontmap[x+y*w];
-	for( int radius = 1; (radius <= max_radius) && (radius*radius < d2); ++radius )
-	{
-		int line, lo, hi;
-		//north
-		line = y - radius;
-		if( (line >= 0) && (line < h) )
-		{
-			lo = x - radius;
-			hi = x + radius;
-			if( lo < 0 ) { lo = 0; }
-			if( hi >= w ) { hi = w-1; }
-			int idx = line * w + lo;
-			for( int i = lo; i <= hi; ++i )
-			{
-				//check this pixel
-				if( fontmap[idx] != v )
-				{
-					float nx = i - x;
-					float ny = line - y;
-					float nd2 = nx*nx+ny*ny;
-					if( nd2 < d2 )
-					{
-						d2 = nd2;
-					}
-				}
-				//move on
-				++idx;
-			}
-		}
-		//south
-		line = y + radius;
-		if( (line >= 0) && (line < h) )
-		{
-			lo = x - radius;
-			hi = x + radius;
-			if( lo < 0 ) { lo = 0; }
-			if( hi >= w ) { hi = w-1; }
-			int idx = line * w + lo;
-			for( int i = lo; i <= hi; ++i )
-			{
-				//check this pixel
-				if( fontmap[idx] != v )
-				{
-					float nx = i - x;
-					float ny = line - y;
-					float nd2 = nx*nx+ny*ny;
-					if( nd2 < d2 )
-					{
-						d2 = nd2;
-					}
-				}
-				//move on
-				++idx;
-			}
-		}
-		//west
-		line = x - radius;
-		if( (line >= 0) && (line < w) )
-		{
-			lo = y - radius + 1;
-			hi = y + radius - 1;
-			if( lo < 0 ) { lo = 0; }
-			if( hi >= h ) { hi = h-1; }
-			int idx = lo * w + line;
-			for( int i = lo; i <= hi; ++i )
-			{
-				//check this pixel
-				if( fontmap[idx] != v )
-				{
-					float nx = line - x;
-					float ny = i - y;
-					float nd2 = nx*nx+ny*ny;
-					if( nd2 < d2 )
-					{
-						d2 = nd2;
-					}
-				}
-				//move on
-				idx += w;
-			}
-		}
-		//east
-		line = x + radius;
-		if( (line >= 0) && (line < w) )
-		{
-			lo = y - radius + 1;
-			hi = y + radius - 1;
-			if( lo < 0 ) { lo = 0; }
-			if( hi >= h ) { hi = h-1; }
-			int idx = lo * w + line;
-			for( int i = lo; i <= hi; ++i )
-			{
-				//check this pixel
-				if( fontmap[idx] != v )
-				{
-					float nx = line - x;
-					float ny = i - y;
-					float nd2 = nx*nx+ny*ny;
-					if( nd2 < d2 )
-					{
-						d2 = nd2;
-					}
-				}
-				//move on
-				idx += w;
-			}
-		}
-	}
-	d2 = sqrtf( d2 );
-	if( v==0 )
-	{
-		d2 = -d2;
-	}
-	d2 *= 127.5 / max_radius;
-	d2 += 127.5;
-	if( d2 < 0.0 ) d2 = 0.0;
-	if( d2 > 255.0 ) d2 = 255.0;
-	return (unsigned char)(d2 + 0.5);
-}
-
-
-Ref<BitmapFont> EditorFontImportPlugin::generate_font(const Ref<ResourceImportMetadata>& p_from, const String &p_existing) {
-
-
-
-	Ref<ResourceImportMetadata> from = p_from;
-	ERR_FAIL_COND_V(from->get_source_count()!=1,Ref<BitmapFont>());
-
-	String src_path = EditorImportPlugin::expand_source_path(from->get_source_path(0));
-
-	if (src_path.get_extension().to_lower()=="fnt") {
-
-		if (ResourceLoader::load(src_path).is_valid()) {
-			EditorNode::get_singleton()->show_warning(TTR("Path:")+" "+src_path+"\n"+TTR("This file is already a Godot font file, please supply a BMFont type file instead."));
-			return Ref<BitmapFont>();
-		}
-
-		Ref<BitmapFont> font;
-		font.instance();
-		Error err = font->create_from_fnt(src_path);
-		if (err) {
-			EditorNode::get_singleton()->show_warning(TTR("Path:")+" "+src_path+"\n"+TTR("Failed opening as BMFont file."));
-			return Ref<BitmapFont>();
-		}
-
-		return font;
-	}
-
-	int size = from->get_option("font/size");
-
-#ifdef FREETYPE_ENABLED
-	FT_Library   library;   /* handle to library     */
-	FT_Face      face;      /* handle to face object */
-
-	Vector<_EditorFontData*> font_data_list;
-
-	int error = FT_Init_FreeType( &library );
-
-	ERR_EXPLAIN(TTR("Error initializing FreeType."));
-	ERR_FAIL_COND_V( error !=0, Ref<BitmapFont>() );
-
-	print_line("loadfrom: "+src_path);
-	error = FT_New_Face( library, src_path.utf8().get_data(),0,&face );
-
-	if ( error == FT_Err_Unknown_File_Format ) {
-		ERR_EXPLAIN(TTR("Unknown font format."));
-		FT_Done_FreeType( library );
-	} else if ( error ) {
-
-		ERR_EXPLAIN(TTR("Error loading font."));
-		FT_Done_FreeType( library );
-
-	}
-
-	ERR_FAIL_COND_V(error,Ref<BitmapFont>());
-
-
-	int height=0;
-	int ascent=0;
-	int font_spacing=0;
-
-	error = FT_Set_Char_Size(face,0,64*size,512,512);
-
-	if ( error ) {
-		FT_Done_FreeType( library );
-		ERR_EXPLAIN(TTR("Invalid font size."));
-		ERR_FAIL_COND_V( error,Ref<BitmapFont>() );
-
-	}
-
-	int font_mode = from->get_option("mode/mode");
-
-	int scaler=(font_mode==_EditorFontImportOptions::FONT_DISTANCE_FIELD)?16:1;
-
-	error = FT_Set_Pixel_Sizes(face,0,size*scaler);
-
-	FT_GlyphSlot slot = face->glyph;
-
-	//error = FT_Set_Charmap(face,ft_encoding_unicode );   /* encoding..         */
-
-
-	/* PRINT CHARACTERS TO INDIVIDUAL BITMAPS */
-
-
-	//int space_size=5; //size for space, if none found.. 5!
-	//int min_valign=500; //some ridiculous number
-
-	FT_ULong  charcode;
-	FT_UInt   gindex;
-
-	int max_up=-1324345; ///gibberish
-	int max_down=124232;
-
-	Map<_EditorKerningKey,int> kerning_map;
-
-	charcode = FT_Get_First_Char( face, &gindex );
-
-	Set<CharType> import_chars;
-
-	int import_mode = from->get_option("character_set/mode");
-	bool round_advance = from->get_option("advanced/round_advance");
-
-	if (import_mode>=_EditorFontImportOptions::CHARSET_CUSTOM) {
-
-		//load from custom text
-		String path = from->get_option("character_set/custom");
-
-		FileAccess *fa = FileAccess::open(EditorImportPlugin::expand_source_path(path),FileAccess::READ);
-
-		if ( !fa ) {
-
-			FT_Done_FreeType( library );
-			ERR_EXPLAIN(TTR("Invalid font custom source."));
-			ERR_FAIL_COND_V( !fa,Ref<BitmapFont>() );
-
-		}
-
-
-		while(!fa->eof_reached()) {
-
-			String line = fa->get_line();
-			for(int i=0;i<line.length();i++) {
-				import_chars.insert(line[i]);
-			}
-		}
-
-		if (import_mode==_EditorFontImportOptions::CHARSET_CUSTOM_LATIN) {
-
-			for(int i=32;i<128;i++)
-				import_chars.insert(i);
-		}
-
-		memdelete(fa);
-	}
-
-	int xsize=0;
-	while ( gindex != 0 )
-	{
-
-		bool skip=false;
-		error = FT_Load_Char( face, charcode, font_mode==_EditorFontImportOptions::FONT_BITMAP?FT_LOAD_RENDER:FT_LOAD_MONOCHROME );
-		if (error) skip=true;
-		else error = FT_Render_Glyph( face->glyph, font_mode==_EditorFontImportOptions::FONT_BITMAP?ft_render_mode_normal:ft_render_mode_mono );
-		if (error) {
-			skip=true;
-		} else if (!skip) {
-
-			switch(import_mode) {
-
-				case _EditorFontImportOptions::CHARSET_ASCII: skip = charcode>127; break;
-				case _EditorFontImportOptions::CHARSET_LATIN: skip = charcode>255 ;break;
-				case _EditorFontImportOptions::CHARSET_UNICODE: break; //none
-				case _EditorFontImportOptions::CHARSET_CUSTOM:
-				case _EditorFontImportOptions::CHARSET_CUSTOM_LATIN: skip = !import_chars.has(charcode); break;
-
-			}
-		}
-
-		if (charcode<=32) //??
-			skip=true;
-
-		if (skip) {
-			charcode=FT_Get_Next_Char(face,charcode,&gindex);
-			continue;
-		}
-
-		_EditorFontData * fdata = memnew( _EditorFontData );
-
-
-		int w = slot->bitmap.width;
-		int h = slot->bitmap.rows;
-		int p = slot->bitmap.pitch;
-
-		//print_line("W: "+itos(w)+" P: "+itos(slot->bitmap.pitch));
-
-		if (font_mode==_EditorFontImportOptions::FONT_DISTANCE_FIELD) {
-
-			//oversize the holding buffer so I can smooth it!
-			int sw = w + scaler * 4;
-			int sh = h + scaler * 4;
-			//do the SDF
-			int sdfw = sw / scaler;
-			int sdfh = sh / scaler;
-
-			fdata->width=sdfw;
-			fdata->height=sdfh;
-		} else {
-			fdata->width=w;
-			fdata->height=h;
-		}
-
-		fdata->character=charcode;
-		fdata->glyph=FT_Get_Char_Index(face,charcode);
-		if  (charcode=='x')
-			xsize=w/scaler;
-
-
-
-		fdata->valign=slot->bitmap_top;
-		fdata->halign=slot->bitmap_left;
-
-		if (round_advance)
-			fdata->advance=(slot->advance.x+(1<<5))>>6;
-		else
-			fdata->advance=slot->advance.x/float(1<<6);
-
-		if (font_mode==_EditorFontImportOptions::FONT_DISTANCE_FIELD) {
-
-			fdata->halign = fdata->halign / scaler - 1.5;
-			fdata->valign = fdata->valign / scaler + 1.5;
-			fdata->advance/=scaler;
-
-		}
-
-		fdata->advance+=font_spacing;
-
-
-		if (charcode<127) {
-			int top = fdata->valign;
-			int hmax = h/scaler;
-
-			if (top>max_up) {
-
-				max_up=top;
-			}
-
-
-			if ( (top - hmax)<max_down ) {
-
-				max_down=top - hmax;
-			}
-		}
-
-		if (font_mode==_EditorFontImportOptions::FONT_DISTANCE_FIELD) {
-
-
-			//oversize the holding buffer so I can smooth it!
-			int sw = w + scaler * 4;
-			int sh = h + scaler * 4;
-
-			unsigned char *smooth_buf = new unsigned char[sw*sh];
-
-			for( int i = 0; i < sw*sh; ++i ) {
-				smooth_buf[i] = 0;
-			}
-
-			// copy the glyph into the buffer to be smoothed
-			unsigned char *buf = slot->bitmap.buffer;
-			for( int j = 0; j < h; ++j ) {
-				for( int i = 0; i < w; ++i ) {
-					smooth_buf[scaler*2+i+(j+scaler*2)*sw] = 255 * ((buf[j*p+(i>>3)] >> (7 - (i & 7))) & 1);
-				}
-			}
-
-			// do the SDF
-			int sdfw = fdata->width;
-			int sdfh = fdata->height;
-
-			fdata->bitmap.resize( sdfw*sdfh );
-
-			for( int j = 0; j < sdfh; ++j )	{
-				for( int i = 0; i < sdfw; ++i )	{
-					int pd_idx = j*sdfw+i;
-
-					//fdata->bitmap[j*slot->bitmap.width+i]=slot->bitmap.buffer[j*slot->bitmap.width+i];
-
-					fdata->bitmap[pd_idx] =
-							//get_SDF
-							get_SDF_radial
-							( smooth_buf, sw, sh,
-							  i*scaler + (scaler >>1), j*scaler + (scaler >>1),
-							  2*scaler );
-
-				}
-			}
-
-			delete [] smooth_buf;
-
-		} else {
-			fdata->bitmap.resize( slot->bitmap.width*slot->bitmap.rows );
-			for (int i=0;i<slot->bitmap.width;i++) {
-				for (int j=0;j<slot->bitmap.rows;j++) {
-
-					fdata->bitmap[j*slot->bitmap.width+i]=slot->bitmap.buffer[j*slot->bitmap.width+i];
-				}
-			}
-		}
-
-		font_data_list.push_back(fdata);
-		charcode=FT_Get_Next_Char(face,charcode,&gindex);
-//                printf("reading char %i\n",charcode);
-	}
-
-	/* SPACE */
-
-	_EditorFontData *spd = memnew( _EditorFontData );
-	spd->advance=0;
-	spd->character=' ';
-	spd->halign=0;
-	spd->valign=0;
-	spd->width=0;
-	spd->height=0;
-	spd->ofs_x=0;
-	spd->ofs_y=0;
-
-	if (!FT_Load_Char( face, ' ', FT_LOAD_RENDER ) && !FT_Render_Glyph( face->glyph, font_mode==_EditorFontImportOptions::FONT_BITMAP?ft_render_mode_normal:ft_render_mode_mono )) {
-
-		spd->advance = slot->advance.x>>6; //round to nearest or store as float
-		spd->advance/=scaler;
-		spd->advance+=font_spacing;
-	} else {
-
-		spd->advance=xsize;
-		spd->advance+=font_spacing;
-	}
-
-	font_data_list.push_back(spd);
-
-	Set<CharType> exported;
-	for (int i=0; i<font_data_list.size(); i++) {
-		exported.insert(font_data_list[i]->character);
-	};
-	int missing = 0;
-	for(Set<CharType>::Element *E=import_chars.front();E;E=E->next()) {
-		CharType c = E->get();
-		if (!exported.has(c)) {
-			CharType str[2] = {c, 0};
-			printf("** Warning: character %i (%ls) not exported\n", (int)c, str);
-			++missing;
-		};
-	};
-	print_line("total_chars: "+itos(font_data_list.size()));
-
-	/* KERNING */
-
-
-	for(int i=0;i<font_data_list.size();i++) {
-
-		if (font_data_list[i]->character>512)
-			continue;
-		for(int j=0;j<font_data_list.size();j++) {
-
-			if (font_data_list[j]->character>512)
-				continue;
-
-			FT_Vector  delta;
-			FT_Get_Kerning( face, font_data_list[i]->glyph,font_data_list[j]->glyph,  FT_KERNING_DEFAULT, &delta );
-
-			if (delta.x!=0) {
-
-				_EditorKerningKey kpk;
-				kpk.A = font_data_list[i]->character;
-				kpk.B = font_data_list[j]->character;
-				int kern = ((-delta.x)+(1<<5))>>6;
-
-				if (kern==0)
-					continue;
-				kerning_map[kpk]=kern/scaler;
-			}
-		}
-	}
-
-	height=max_up-max_down;
-	ascent=max_up;
-
-	/* FIND OUT WHAT THE FONT HEIGHT FOR THIS IS */
-
-	/* ADJUST THE VALIGN FOR EACH CHARACTER */
-
-	for (int i=0;i<(int)font_data_list.size();i++) {
-
-		font_data_list[i]->valign=max_up-font_data_list[i]->valign;
-	}
-
-
-
-	/* ADD THE SPACEBAR CHARACTER */
-/*
-	_EditorFontData * fdata = new _EditorFontData;
-
-	fdata->character=32;
-	fdata->bitmap=0;
-	fdata->width=xsize;
-	fdata->height=1;
-	fdata->valign=0;
-
-	font_data_list.push_back(fdata);
-*/
-	/* SORT BY HEIGHT, SO THEY FIT BETTER ON THE TEXTURE */
-
-	font_data_list.sort_custom<_EditorFontDataSort>();
-	Color *color=memnew_arr(Color,height);
-
-	int gradient_type=from->get_option("color/mode");
-	switch(gradient_type) {
-		case _EditorFontImportOptions::COLOR_WHITE: {
-
-			for(int i=0;i<height;i++){
-				color[i]=Color(1,1,1,1);
-			}
-
-		} break;
-		case _EditorFontImportOptions::COLOR_CUSTOM: {
-
-			Color cc = from->get_option("color/color");
-			for(int i=0;i<height;i++){
-				color[i]=cc;
-			}
-
-		} break;
-		case _EditorFontImportOptions::COLOR_GRADIENT_RANGE: {
-
-			Color src=from->get_option("color/begin");
-			Color to=from->get_option("color/end");
-			for(int i=0;i<height;i++){
-				color[i]=src.linear_interpolate(to,i/float(height));
-			}
-
-		} break;
-		case _EditorFontImportOptions::COLOR_GRADIENT_IMAGE: {
-
-			String fp = EditorImportPlugin::expand_source_path(from->get_option("color/image"));
-			Image img;
-			Error err = ImageLoader::load_image(fp,&img);
-			if (err==OK) {
-
-				for(int i=0;i<height;i++){
-					//color[i]=img.get_pixel(0,i*img.get_height()/height);
-				}
-			} else {
-
-				for(int i=0;i<height;i++){
-					color[i]=Color(1,1,1,1);
-				}
-			}
-
-		} break;
-	}
-
-
-	for(int i=0;i<font_data_list.size();i++) {
-
-		if (font_data_list[i]->bitmap.size()==0)
-			continue;
-
-		int margin[4]={0,0,0,0};
-
-		if (from->get_option("shadow/enabled").operator bool()) {
-			int r=from->get_option("shadow/radius");
-			Point2i ofs=Point2(from->get_option("shadow/offset"));
-			margin[ MARGIN_LEFT ] = MAX( r - ofs.x, 0);
-			margin[ MARGIN_RIGHT ] = MAX( r + ofs.x, 0);
-			margin[ MARGIN_TOP ] = MAX( r - ofs.y, 0);
-			margin[ MARGIN_BOTTOM ] = MAX( r + ofs.y, 0);
-
-		}
-
-		if (from->get_option("shadow2/enabled").operator bool()) {
-			int r=from->get_option("shadow2/radius");
-			Point2i ofs=Point2(from->get_option("shadow2/offset"));
-			margin[ MARGIN_LEFT ] = MAX( r - ofs.x, margin[ MARGIN_LEFT ]);
-			margin[ MARGIN_RIGHT ] = MAX( r + ofs.x, margin[ MARGIN_RIGHT ]);
-			margin[ MARGIN_TOP ] = MAX( r - ofs.y, margin[ MARGIN_TOP ]);
-			margin[ MARGIN_BOTTOM ] = MAX( r + ofs.y, margin[ MARGIN_BOTTOM ]);
-
-		}
-
-		Size2i s;
-		s.width=font_data_list[i]->width+margin[MARGIN_LEFT]+margin[MARGIN_RIGHT];
-		s.height=font_data_list[i]->height+margin[MARGIN_TOP]+margin[MARGIN_BOTTOM];
-		Point2i o;
-		o.x=margin[MARGIN_LEFT];
-		o.y=margin[MARGIN_TOP];
-
-		int ow=font_data_list[i]->width;
-		int oh=font_data_list[i]->height;
-
-		PoolVector<uint8_t> pixels;
-		pixels.resize(s.x*s.y*4);
-
-		PoolVector<uint8_t>::Write w = pixels.write();
-		//print_line("val: "+itos(font_data_list[i]->valign));
-		for(int y=0;y<s.height;y++) {
-
-			int yc=CLAMP(y-o.y+font_data_list[i]->valign,0,height-1);
-			Color c=color[yc];
-			c.a=0;
-
-			for(int x=0;x<s.width;x++) {
-
-				int ofs=y*s.x+x;
-				w[ofs*4+0]=c.r*255.0;
-				w[ofs*4+1]=c.g*255.0;
-				w[ofs*4+2]=c.b*255.0;
-				w[ofs*4+3]=c.a*255.0;
-			}
-		}
-
-
-		for(int si=0;si<2;si++) {
-
-#define S_VAR(m_v) (String(si == 0 ? "shadow/" : "shadow2/") + m_v)
-			if (from->get_option(S_VAR("enabled")).operator bool()) {
-				int r = from->get_option(S_VAR("radius"));
-
-				Color sc = from->get_option(S_VAR("color"));
-				Point2i so=Point2(from->get_option(S_VAR("offset")));
-
-				float tr = from->get_option(S_VAR("transition"));
-				print_line("shadow enabled: "+itos(si));
-
-				Vector<uint8_t> s2buf;
-				s2buf.resize(s.x*s.y);
-				uint8_t *wa=s2buf.ptr();
-
-				for(int j=0;j<s.x*s.y;j++){
-
-					wa[j]=0;
-				}
-
-				// blit shadowa
-				for(int x=0;x<ow;x++) {
-					for(int y=0;y<oh;y++) {
-						int ofs = (o.y+y+so.y)*s.x+x+o.x+so.x;
-						wa[ofs]=font_data_list[i]->bitmap[y*ow+x];
-					}
-				}
-				//blur shadow2 with separatable convolution
-
-				if (r>0) {
-
-					Vector<uint8_t> pixels2;
-					pixels2.resize(s2buf.size());
-					uint8_t *w2=pixels2.ptr();
-					//vert
-					for(int x=0;x<s.width;x++) {
-						for(int y=0;y<s.height;y++) {
-
-							int ofs = y*s.width+x;
-							int sum=wa[ofs];
-
-							for(int k=1;k<=r;k++) {
-
-								int ofs_d=MIN(y+k,s.height-1)*s.width+x;
-								int ofs_u=MAX(y-k,0)*s.width+x;
-								sum+=wa[ofs_d];
-								sum+=wa[ofs_u];
-							}
-
-							w2[ofs]=sum/(r*2+1);
-
-						}
-					}
-					//horiz
-					for(int x=0;x<s.width;x++) {
-						for(int y=0;y<s.height;y++) {
-
-							int ofs = y*s.width+x;
-							int sum=w2[ofs];
-
-							for(int k=1;k<=r;k++) {
-
-								int ofs_r=MIN(x+k,s.width-1)+s.width*y;
-								int ofs_l=MAX(x-k,0)+s.width*y;
-								sum+=w2[ofs_r];
-								sum+=w2[ofs_l];
-							}
-
-							wa[ofs]=Math::pow(float(sum/(r*2+1))/255.0f,tr)*255.0f;
-
-						}
-					}
-
-				}
-
-				//blend back
-
-				for(int j=0;j<s.x*s.y;j++){
-					Color wd(w[j*4+0]/255.0,w[j*4+1]/255.0,w[j*4+2]/255.0,w[j*4+3]/255.0);
-					Color ws(sc.r,sc.g,sc.b,sc.a*(wa[j]/255.0));
-					Color b = wd.blend(ws);
-
-					w[j*4+0]=b.r*255.0;
-					w[j*4+1]=b.g*255.0;
-					w[j*4+2]=b.b*255.0;
-					w[j*4+3]=b.a*255.0;
-
-				}
-			}
-		}
-
-		for(int y=0;y<oh;y++) {
-			int yc=CLAMP(y+font_data_list[i]->valign,0,height-1);
-			Color sc=color[yc];
-			for(int x=0;x<ow;x++) {
-				int ofs = (o.y+y)*s.x+x+o.x;
-				float c = font_data_list[i]->bitmap[y*ow+x]/255.0;
-				Color src_col=sc;
-				src_col.a*=c;
-				Color dst_col(w[ofs*4+0]/255.0,w[ofs*4+1]/255.0,w[ofs*4+2]/255.0,w[ofs*4+3]/255.0);
-				dst_col = dst_col.blend(src_col);
-				w[ofs*4+0]=dst_col.r*255.0;
-				w[ofs*4+1]=dst_col.g*255.0;
-				w[ofs*4+2]=dst_col.b*255.0;
-				w[ofs*4+3]=dst_col.a*255.0;
-			}
-		}
-
-
-		w=PoolVector<uint8_t>::Write();
-
-		Image img(s.width,s.height,0,Image::FORMAT_RGBA8,pixels);
-
-		font_data_list[i]->blit=img;
-		font_data_list[i]->blit_ofs=o;
-
-	}
-
-	//make atlas
-	int spacing=2;
-	Vector<Size2i> sizes;
-	sizes.resize(font_data_list.size());
-	for(int i=0;i<font_data_list.size();i++) {
-
-		sizes[i]=Size2(font_data_list[i]->blit.get_width()+spacing*2,font_data_list[i]->blit.get_height()+spacing*2);
-
-	}
-	Vector<Point2i> res;
-	Size2i res_size;
-	EditorAtlas::fit(sizes,res,res_size);
-	res_size.x=next_power_of_2(res_size.x);
-	res_size.y=next_power_of_2(res_size.y);
-	print_line("Atlas size: "+res_size);
-
-	Image atlas(res_size.x,res_size.y,0,Image::FORMAT_RGBA8);
-
-	for(int i=0;i<font_data_list.size();i++) {
-
-		if (font_data_list[i]->bitmap.size()==0)
-			continue;
-		atlas.blit_rect(font_data_list[i]->blit,Rect2(0,0,font_data_list[i]->blit.get_width(),font_data_list[i]->blit.get_height()),res[i]+Size2(spacing,spacing));
-		font_data_list[i]->ofs_x=res[i].x+spacing;
-		font_data_list[i]->ofs_y=res[i].y+spacing;
-
-
-	}
-
-	if (from->has_option("advanced/premultiply_alpha") && bool(from->get_option("advanced/premultiply_alpha"))) {
-
-		PoolVector<uint8_t> data = atlas.get_data();
-		int dl = data.size();
-		{
-			PoolVector<uint8_t>::Write w = data.write();
-
-			for(int i=0;i<dl;i+=4) {
-
-				w[i+0]= uint8_t(int(w[i+0])*int(w[i+3])/255);
-				w[i+1]= uint8_t(int(w[i+1])*int(w[i+3])/255);
-				w[i+2]= uint8_t(int(w[i+2])*int(w[i+3])/255);
-			}
-		}
-
-		atlas=Image(res_size.x,res_size.y,0,Image::FORMAT_RGBA8,data);
-	}
-
-	if (from->has_option("color/monochrome") && bool(from->get_option("color/monochrome"))) {
-
-		atlas.convert(Image::FORMAT_LA8);
-	}
-
-
-	if (0) {
-		//debug the texture
-		Ref<ImageTexture> atlast = memnew( ImageTexture );
-		atlast->create_from_image(atlas);
-		//atlast->create_from_image(font_data_list[5]->blit);
-		TextureRect *tf = memnew( TextureRect );
-		tf->set_texture(atlast);
-		dialog->add_child(tf);
-	}
-
-
-	/* CREATE FONT */
-
-	int char_space = from->get_option("extra_space/char");
-	int space_space = from->get_option("extra_space/space");
-	int top_space = from->get_option("extra_space/top");
-	int bottom_space = from->get_option("extra_space/bottom");
-	bool enable_filter = from->get_option("advanced/enable_filter");
-	if (from->has_option("advanced/disable_filter")){ // this is a compatibility check for a deprecated option
-		enable_filter = !from->get_option("advanced/disable_filter");
-	}
-
-	Ref<BitmapFont> font;
-
-	if (p_existing!=String() && ResourceCache::has(p_existing)) {
-
-		font = Ref<BitmapFont>( Object::cast_to<BitmapFont>(ResourceCache::get(p_existing)));
-	}
-
-	if (font.is_null()) {
-		 font = Ref<BitmapFont>( memnew( BitmapFont ) );
-	}
-
-	font->clear();
-	font->set_height(height+bottom_space+top_space);
-	font->set_ascent(ascent+top_space);
-	font->set_distance_field_hint(font_mode==_EditorFontImportOptions::FONT_DISTANCE_FIELD);
-
-	//register texures
-	{
-		Ref<ImageTexture> t = memnew(ImageTexture);
-		int flags;
-		if (!enable_filter)
-			flags=0;
-		else
-			flags=Texture::FLAG_FILTER;
-		t->create_from_image(atlas,flags);
-		t->set_storage( ImageTexture::STORAGE_COMPRESS_LOSSLESS );
-		font->add_texture(t);
-
-	}
-	//register characters
-
-
-	for(int i=0;i<font_data_list.size();i++) {
-		_EditorFontData *fd=font_data_list[i];
-		int tex_idx=0;
-
-		font->add_char(fd->character,tex_idx,Rect2( fd->ofs_x, fd->ofs_y, fd->blit.get_width(), fd->blit.get_height()),Point2(fd->halign-fd->blit_ofs.x,fd->valign-fd->blit_ofs.y+top_space), fd->advance+char_space+(fd->character==' '?space_space:0));
-		memdelete(fd);
-	}
-
-	for(Map<_EditorKerningKey,int>::Element *E=kerning_map.front();E;E=E->next()) {
-
-		font->add_kerning_pair(E->key().A,E->key().B,E->get());
-	}
-
-	FT_Done_FreeType( library );
-
-	return font;
-#else
-
-	return Ref<BitmapFont>();
-#endif
-}
-
-
-String EditorFontImportPlugin::get_name() const {
-
-	return "font";
-}
-String EditorFontImportPlugin::get_visible_name() const{
-
-	return TTR("Font");
-}
-void EditorFontImportPlugin::import_dialog(const String& p_from){
-
-	dialog->popup_import(p_from);
-}
-Error EditorFontImportPlugin::import(const String& p_path, const Ref<ResourceImportMetadata>& p_from){
-
-
-	Ref<BitmapFont> font  = EditorFontImportPlugin::generate_font(p_from,p_path);
-	if (!font.is_valid())
-		return ERR_CANT_CREATE;
-
-	Ref<ResourceImportMetadata> from=p_from;
-	from->set_source_md5(0,FileAccess::get_md5(EditorImportPlugin::expand_source_path(from->get_source_path(0))));
-	from->set_editor(get_name());
-	font->set_import_metadata(from);
-
-	return ResourceSaver::save(p_path,font);
-
-}
-
-void EditorFontImportPlugin::import_from_drop(const Vector<String>& p_drop, const String &p_dest_path) {
-
-	for(int i=0;i<p_drop.size();i++) {
-		String ext = p_drop[i].get_extension().to_lower();
-		String file = p_drop[i].get_file();
-		if (ext=="ttf" || ext=="otf" || ext=="fnt") {
-
-			import_dialog();
-			dialog->set_source_and_dest(p_drop[i],p_dest_path.plus_file(file.get_basename()+".font"));
-			break;
-		}
-	}
-}
-
-
-EditorFontImportPlugin::EditorFontImportPlugin(EditorNode* p_editor) {
-
-	dialog = memnew( EditorFontImportDialog(this) );
-	p_editor->get_gui_base()->add_child(dialog);
-}
-#endif

editor/io_plugins/editor_font_import_plugin.h

@@ -1,59 +0,0 @@
-/*************************************************************************/
-/*  editor_font_import_plugin.h                                          */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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 EDITOR_FONT_IMPORT_PLUGIN_H
-#define EDITOR_FONT_IMPORT_PLUGIN_H
-
-#include "editor/editor_export.h"
-#include "scene/resources/font.h"
-#if 0
-class EditorNode;
-class EditorFontImportDialog;
-
-class EditorFontImportPlugin : public EditorImportPlugin {
-
-	GDCLASS(EditorFontImportPlugin,EditorImportPlugin);
-
-	EditorFontImportDialog *dialog;
-public:
-
-	Ref<BitmapFont> generate_font(const Ref<ResourceImportMetadata>& p_from,const String& p_existing=String()); //used by editor
-
-	virtual String get_name() const;
-	virtual String get_visible_name() const;
-	virtual void import_dialog(const String& p_from="");
-	virtual Error import(const String& p_path, const Ref<ResourceImportMetadata>& p_from);
-	virtual void import_from_drop(const Vector<String>& p_drop,const String& p_dest_path);
-
-
-	EditorFontImportPlugin(EditorNode* p_editor);
-};
-
-#endif // EDITOR_FONT_IMPORT_PLUGIN_H
-#endif

editor/io_plugins/editor_mesh_import_plugin.cpp

@@ -1,594 +0,0 @@
-/*************************************************************************/
-/*  editor_mesh_import_plugin.cpp                                        */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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.                */
-/*************************************************************************/
-#include "editor_mesh_import_plugin.h"
-
-#if 0
-
-#include "editor/editor_dir_dialog.h"
-#include "editor/editor_file_dialog.h"
-#include "editor/editor_node.h"
-#include "editor/property_editor.h"
-//#include "scene/resources/sample.h"
-#include "io/marshalls.h"
-#include "io/resource_saver.h"
-#include "os/file_access.h"
-#include "scene/resources/surface_tool.h"
-
-class _EditorMeshImportOptions : public Object {
-
-	GDCLASS(_EditorMeshImportOptions,Object);
-public:
-
-
-	bool generate_tangents;
-	bool generate_normals;
-	bool flip_faces;
-	bool smooth_shading;
-	bool weld_vertices;
-	bool import_material;
-	bool import_textures;
-	float weld_tolerance;
-
-
-	bool _set(const StringName& p_name, const Variant& p_value) {
-
-		String n = p_name;
-		if (n=="generate/tangents")
-			generate_tangents=p_value;
-		else if (n=="generate/normals")
-			generate_normals=p_value;
-		else if (n=="import/materials")
-			import_material=p_value;
-		else if (n=="import/textures")
-			import_textures=p_value;
-		else if (n=="force/flip_faces")
-			flip_faces=p_value;
-		else if (n=="force/smooth_shading")
-			smooth_shading=p_value;
-		else if (n=="force/weld_vertices")
-			weld_vertices=p_value;
-		else if (n=="force/weld_tolerance")
-			weld_tolerance=p_value;
-		else
-			return false;
-
-		return true;
-
-	}
-
-	bool _get(const StringName& p_name,Variant &r_ret) const{
-
-		String n = p_name;
-		if (n=="generate/tangents")
-			r_ret=generate_tangents;
-		else if (n=="generate/normals")
-			r_ret=generate_normals;
-		else if (n=="import/materials")
-			r_ret=import_material;
-		else if (n=="import/textures")
-			r_ret=import_textures;
-		else if (n=="force/flip_faces")
-			r_ret=flip_faces;
-		else if (n=="force/smooth_shading")
-			r_ret=smooth_shading;
-		else if (n=="force/weld_vertices")
-			r_ret=weld_vertices;
-		else if (n=="force/weld_tolerance")
-			r_ret=weld_tolerance;
-		else
-			return false;
-
-		return true;
-
-	}
-	void _get_property_list( List<PropertyInfo> *p_list) const{
-
-		p_list->push_back(PropertyInfo(Variant::BOOL,"generate/tangents"));
-		p_list->push_back(PropertyInfo(Variant::BOOL,"generate/normals"));
-		//not for nowp
-		//p_list->push_back(PropertyInfo(Variant::BOOL,"import/materials"));
-		//p_list->push_back(PropertyInfo(Variant::BOOL,"import/textures"));
-		p_list->push_back(PropertyInfo(Variant::BOOL,"force/flip_faces"));
-		p_list->push_back(PropertyInfo(Variant::BOOL,"force/smooth_shading"));
-		p_list->push_back(PropertyInfo(Variant::BOOL,"force/weld_vertices"));
-		p_list->push_back(PropertyInfo(Variant::REAL,"force/weld_tolerance",PROPERTY_HINT_RANGE,"0.00001,16,0.00001"));
-		//p_list->push_back(PropertyInfo(Variant::BOOL,"compress/enable"));
-		//p_list->push_back(PropertyInfo(Variant::INT,"compress/bitrate",PROPERTY_HINT_ENUM,"64,96,128,192"));
-
-
-	}
-
-
-	static void _bind_methods() {
-
-
-		ADD_SIGNAL( MethodInfo("changed"));
-	}
-
-
-	_EditorMeshImportOptions() {
-
-		generate_tangents=true;
-		generate_normals=false;
-		flip_faces=false;
-		smooth_shading=false;
-		weld_vertices=true;
-		weld_tolerance=0.0001;
-		import_material=false;
-		import_textures=false;
-
-	}
-
-
-};
-
-class EditorMeshImportDialog : public ConfirmationDialog {
-
-	GDCLASS(EditorMeshImportDialog,ConfirmationDialog);
-
-	EditorMeshImportPlugin *plugin;
-
-	LineEdit *import_path;
-	LineEdit *save_path;
-	EditorFileDialog *file_select;
-	EditorDirDialog *save_select;
-	AcceptDialog *error_dialog;
-	PropertyEditor *option_editor;
-
-	_EditorMeshImportOptions *options;
-
-
-public:
-
-	void _choose_files(const Vector<String>& p_path) {
-
-		String files;
-		for(int i=0;i<p_path.size();i++) {
-
-			if (i>0)
-				files+=",";
-			files+=p_path[i];
-		}
-		/*
-		if (p_path.size()) {
-			String srctex=p_path[0];
-			String ipath = EditorImportDB::get_singleton()->find_source_path(srctex);
-
-			if (ipath!="")
-				save_path->set_text(ipath.get_base_dir());
-		}*/
-		import_path->set_text(files);
-
-	}
-	void _choose_save_dir(const String& p_path) {
-
-		save_path->set_text(p_path);
-	}
-
-	void _browse() {
-
-		file_select->popup_centered_ratio();
-	}
-
-	void _browse_target() {
-
-		save_select->popup_centered_ratio();
-	}
-
-	void popup_import(const String& p_path) {
-
-		popup_centered(Size2(400,400)*EDSCALE);
-
-		if (p_path!="") {
-
-			Ref<ResourceImportMetadata> rimd = ResourceLoader::load_import_metadata(p_path);
-			ERR_FAIL_COND(!rimd.is_valid());
-
-			save_path->set_text(p_path.get_base_dir());
-			List<String> opts;
-			rimd->get_options(&opts);
-			for(List<String>::Element *E=opts.front();E;E=E->next()) {
-
-				options->_set(E->get(),rimd->get_option(E->get()));
-			}
-
-			String src = "";
-			for(int i=0;i<rimd->get_source_count();i++) {
-				if (i>0)
-					src+=",";
-				src+=EditorImportPlugin::expand_source_path(rimd->get_source_path(i));
-			}
-			import_path->set_text(src);
-		}
-	}
-
-	void _import() {
-
-		Vector<String> meshes = import_path->get_text().split(",");
-		if (meshes.size()==0) {
-			error_dialog->set_text(TTR("No meshes to import!"));
-			error_dialog->popup_centered_minsize();
-			return;
-		}
-
-		String dst = save_path->get_text();
-		if (dst=="") {
-			error_dialog->set_text(TTR("Save path is empty!"));
-			error_dialog->popup_centered_minsize();
-			return;
-		}
-
-		for(int i=0;i<meshes.size();i++) {
-
-			Ref<ResourceImportMetadata> imd = memnew( ResourceImportMetadata );
-
-			List<PropertyInfo> pl;
-			options->_get_property_list(&pl);
-			for(List<PropertyInfo>::Element *E=pl.front();E;E=E->next()) {
-
-				Variant v;
-				String opt=E->get().name;
-				options->_get(opt,v);
-				imd->set_option(opt,v);
-
-			}
-
-			imd->add_source(EditorImportPlugin::validate_source_path(meshes[i]));
-
-			String file_path = dst.plus_file(meshes[i].get_file().get_basename()+".mesh");
-
-			plugin->import(file_path,imd);
-		}
-
-		hide();
-	}
-
-	void _notification(int p_what) {
-
-
-		if (p_what==NOTIFICATION_ENTER_TREE) {
-
-			option_editor->edit(options);
-		}
-	}
-
-	static void _bind_methods() {
-
-		ClassDB::bind_method("_choose_files",&EditorMeshImportDialog::_choose_files);
-		ClassDB::bind_method("_choose_save_dir",&EditorMeshImportDialog::_choose_save_dir);
-		ClassDB::bind_method("_import",&EditorMeshImportDialog::_import);
-		ClassDB::bind_method("_browse",&EditorMeshImportDialog::_browse);
-		ClassDB::bind_method("_browse_target",&EditorMeshImportDialog::_browse_target);
-	}
-
-	EditorMeshImportDialog(EditorMeshImportPlugin *p_plugin) {
-
-		plugin=p_plugin;
-
-		set_title(TTR("Single Mesh Import"));
-		set_hide_on_ok(false);
-
-		VBoxContainer *vbc = memnew( VBoxContainer );
-		add_child(vbc);
-		//set_child_rect(vbc);
-
-		HBoxContainer *hbc = memnew( HBoxContainer );
-		vbc->add_margin_child(TTR("Source Mesh(es):"),hbc);
-
-		import_path = memnew( LineEdit );
-		import_path->set_h_size_flags(SIZE_EXPAND_FILL);
-		hbc->add_child(import_path);
-
-		Button * import_choose = memnew( Button );
-		import_choose->set_text(" .. ");
-		hbc->add_child(import_choose);
-
-		import_choose->connect("pressed", this,"_browse");
-
-		hbc = memnew( HBoxContainer );
-		vbc->add_margin_child(TTR("Target Path:"),hbc);
-
-		save_path = memnew( LineEdit );
-		save_path->set_h_size_flags(SIZE_EXPAND_FILL);
-		hbc->add_child(save_path);
-
-		Button * save_choose = memnew( Button );
-		save_choose->set_text(" .. ");
-		hbc->add_child(save_choose);
-
-		save_choose->connect("pressed", this,"_browse_target");
-
-		file_select = memnew( EditorFileDialog );
-		file_select->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
-		file_select->set_mode(EditorFileDialog::MODE_OPEN_FILES);
-		file_select->add_filter("*.obj ; Wavefront OBJ");
-		add_child(file_select);
-		file_select->connect("files_selected", this,"_choose_files");
-
-		save_select = memnew( EditorDirDialog );
-		add_child(save_select);
-		save_select->connect("dir_selected", this,"_choose_save_dir");
-
-		get_ok()->connect("pressed", this,"_import");
-		get_ok()->set_text(TTR("Import"));
-
-		error_dialog = memnew( AcceptDialog );
-		add_child(error_dialog);
-
-		options = memnew( _EditorMeshImportOptions );
-
-		option_editor = memnew( PropertyEditor );
-		option_editor->hide_top_label();
-		vbc->add_margin_child(TTR("Options:"),option_editor,true);
-	}
-
-	~EditorMeshImportDialog() {
-		memdelete(options);
-	}
-
-};
-
-
-String EditorMeshImportPlugin::get_name() const {
-
-	return "mesh";
-}
-String EditorMeshImportPlugin::get_visible_name() const{
-
-	return TTR("Mesh");
-}
-void EditorMeshImportPlugin::import_dialog(const String& p_from){
-
-	dialog->popup_import(p_from);
-}
-Error EditorMeshImportPlugin::import(const String& p_path, const Ref<ResourceImportMetadata>& p_from){
-
-
-	ERR_FAIL_COND_V(p_from->get_source_count()!=1,ERR_INVALID_PARAMETER);
-
-	Ref<ResourceImportMetadata> from=p_from;
-
-	String src_path=EditorImportPlugin::expand_source_path(from->get_source_path(0));
-	FileAccessRef f = FileAccess::open(src_path,FileAccess::READ);
-	ERR_FAIL_COND_V(!f,ERR_CANT_OPEN);
-
-	Ref<Mesh> mesh;
-	Map<String,Ref<Material> > name_map;
-
-	if (FileAccess::exists(p_path)) {
-		mesh=ResourceLoader::load(p_path,"Mesh");
-		if (mesh.is_valid()) {
-			for(int i=0;i<mesh->get_surface_count();i++) {
-
-				if (!mesh->surface_get_material(i).is_valid())
-					continue;
-				String name;
-				if (mesh->surface_get_name(i)!="")
-					name=mesh->surface_get_name(i);
-				else
-					name=vformat(TTR("Surface %d"),i+1);
-
-				name_map[name]=mesh->surface_get_material(i);
-			}
-
-			while(mesh->get_surface_count()) {
-				mesh->surface_remove(0);
-			}
-		}
-	}
-
-	if (!mesh.is_valid())
-		mesh = Ref<Mesh>( memnew( Mesh ) );
-
-
-	bool generate_normals=from->get_option("generate/normals");
-	bool generate_tangents=from->get_option("generate/tangents");
-	bool flip_faces=from->get_option("force/flip_faces");
-	bool force_smooth=from->get_option("force/smooth_shading");
-	bool weld_vertices=from->get_option("force/weld_vertices");
-	float weld_tolerance=from->get_option("force/weld_tolerance");
-	Vector<Vector3> vertices;
-	Vector<Vector3> normals;
-	Vector<Vector2> uvs;
-	String name;
-
-	Ref<SurfaceTool> surf_tool = memnew( SurfaceTool) ;
-	surf_tool->begin(Mesh::PRIMITIVE_TRIANGLES);
-	if (force_smooth)
-		surf_tool->add_smooth_group(true);
-	int has_index_data=false;
-
-	while(true) {
-
-
-		String l = f->get_line().strip_edges();
-
-		if (l.begins_with("v ")) {
-			//vertex
-			Vector<String> v = l.split(" ",false);
-			ERR_FAIL_COND_V(v.size()<4,ERR_INVALID_DATA);
-			Vector3 vtx;
-			vtx.x=v[1].to_float();
-			vtx.y=v[2].to_float();
-			vtx.z=v[3].to_float();
-			vertices.push_back(vtx);
-		} else  if (l.begins_with("vt ")) {
-			//uv
-			Vector<String> v = l.split(" ",false);
-			ERR_FAIL_COND_V(v.size()<3,ERR_INVALID_DATA);
-			Vector2 uv;
-			uv.x=v[1].to_float();
-			uv.y=1.0-v[2].to_float();
-			uvs.push_back(uv);
-
-		} else if (l.begins_with("vn ")) {
-			//normal
-			Vector<String> v = l.split(" ",false);
-			ERR_FAIL_COND_V(v.size()<4,ERR_INVALID_DATA);
-			Vector3 nrm;
-			nrm.x=v[1].to_float();
-			nrm.y=v[2].to_float();
-			nrm.z=v[3].to_float();
-			normals.push_back(nrm);
-		} if (l.begins_with("f ")) {
-				//vertex
-
-			has_index_data=true;
-			Vector<String> v = l.split(" ",false);
-			ERR_FAIL_COND_V(v.size()<4,ERR_INVALID_DATA);
-
-			//not very fast, could be sped up
-
-
-			Vector<String> face[3];
-			face[0] = v[1].split("/");
-			face[1] = v[2].split("/");
-			ERR_FAIL_COND_V(face[0].size()==0,ERR_PARSE_ERROR);
-			ERR_FAIL_COND_V(face[0].size()!=face[1].size(),ERR_PARSE_ERROR);
-			for(int i=2;i<v.size()-1;i++) {
-
-				face[2] = v[i+1].split("/");
-				ERR_FAIL_COND_V(face[0].size()!=face[2].size(),ERR_PARSE_ERROR);
-				for(int j=0;j<3;j++) {
-
-					int idx=j;
-
-					if (!flip_faces && idx<2) {
-						idx=1^idx;
-					}
-
-
-					if (face[idx].size()==3) {
-						int norm = face[idx][2].to_int()-1;
-						ERR_FAIL_INDEX_V(norm,normals.size(),ERR_PARSE_ERROR);
-						surf_tool->add_normal(normals[norm]);
-					}
-
-					if (face[idx].size()>=2 && face[idx][1]!=String()) {
-
-						int uv = face[idx][1].to_int()-1;
-						ERR_FAIL_INDEX_V(uv,uvs.size(),ERR_PARSE_ERROR);
-						surf_tool->add_uv(uvs[uv]);
-					}
-
-					int vtx = face[idx][0].to_int()-1;
-					ERR_FAIL_INDEX_V(vtx,vertices.size(),ERR_PARSE_ERROR);
-
-					Vector3 vertex = vertices[vtx];
-					if (weld_vertices)
-						vertex=vertex.snapped(weld_tolerance);
-					surf_tool->add_vertex(vertex);
-				}
-
-				face[1]=face[2];
-			}
-		} else if (l.begins_with("s ") && !force_smooth) { //smoothing
-			String what = l.substr(2,l.length()).strip_edges();
-			if (what=="off")
-				surf_tool->add_smooth_group(false);
-			else
-				surf_tool->add_smooth_group(true);
-
-		} else if (l.begins_with("o ") || f->eof_reached()) { //new surface or done
-
-			if (has_index_data) {
-				//new object/surface
-				if (generate_normals || force_smooth)
-					surf_tool->generate_normals();
-				if (uvs.size() && (normals.size() || generate_normals) && generate_tangents)
-					surf_tool->generate_tangents();
-
-				surf_tool->index();
-				mesh = surf_tool->commit(mesh);
-				if (name=="")
-					name=vformat(TTR("Surface %d"),mesh->get_surface_count()-1);
-				mesh->surface_set_name(mesh->get_surface_count()-1,name);
-				name="";
-				surf_tool->clear();
-				surf_tool->begin(Mesh::PRIMITIVE_TRIANGLES);
-				if (force_smooth)
-					surf_tool->add_smooth_group(true);
-
-				has_index_data=false;
-
-				if (f->eof_reached())
-					break;
-			}
-
-			if (l.begins_with("o ")) //name
-				name=l.substr(2,l.length()).strip_edges();
-		}
-	}
-
-
-	from->set_source_md5(0,FileAccess::get_md5(src_path));
-	from->set_editor(get_name());
-	mesh->set_import_metadata(from);
-
-	//re-apply materials if exist
-	for(int i=0;i<mesh->get_surface_count();i++) {
-
-		String n = mesh->surface_get_name(i);
-		if (name_map.has(n))
-			mesh->surface_set_material(i,name_map[n]);
-	}
-
-	Error err = ResourceSaver::save(p_path,mesh);
-
-	return err;
-}
-
-
-void EditorMeshImportPlugin::import_from_drop(const Vector<String>& p_drop, const String &p_dest_path) {
-
-
-	Vector<String> files;
-	for(int i=0;i<p_drop.size();i++) {
-		String ext = p_drop[i].get_extension().to_lower();
-		String file = p_drop[i].get_file();
-		if (ext=="obj") {
-
-			files.push_back(p_drop[i]);
-		}
-	}
-
-	if (files.size()) {
-		import_dialog();
-		dialog->_choose_files(files);
-		dialog->_choose_save_dir(p_dest_path);
-	}
-}
-
-EditorMeshImportPlugin::EditorMeshImportPlugin(EditorNode* p_editor) {
-
-	dialog = memnew( EditorMeshImportDialog(this));
-	p_editor->get_gui_base()->add_child(dialog);
-}
-#endif

editor/io_plugins/editor_mesh_import_plugin.h

@@ -1,60 +0,0 @@
-/*************************************************************************/
-/*  editor_mesh_import_plugin.h                                          */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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 EDITOR_MESH_IMPORT_PLUGIN_H
-#define EDITOR_MESH_IMPORT_PLUGIN_H
-
-#if 0
-#include "editor/editor_import_export.h"
-#include "scene/resources/font.h"
-
-class EditorNode;
-class EditorMeshImportDialog;
-
-class EditorMeshImportPlugin : public EditorImportPlugin {
-
-	GDCLASS(EditorMeshImportPlugin,EditorImportPlugin);
-
-	EditorMeshImportDialog *dialog;
-
-
-public:
-
-	virtual String get_name() const;
-	virtual String get_visible_name() const;
-	virtual void import_dialog(const String& p_from="");
-	virtual Error import(const String& p_path, const Ref<ResourceImportMetadata>& p_from);
-	void import_from_drop(const Vector<String>& p_drop, const String &p_dest_path);
-
-
-	EditorMeshImportPlugin(EditorNode* p_editor);
-};
-
-#endif
-#endif // EDITOR_MESH_IMPORT_PLUGIN_H

editor/io_plugins/editor_sample_import_plugin.cpp

@@ -1,930 +0,0 @@
-/*************************************************************************/
-/*  editor_sample_import_plugin.cpp                                      */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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.                */
-/*************************************************************************/
-#include "editor_sample_import_plugin.h"
-
-#include "editor/editor_dir_dialog.h"
-#include "editor/editor_file_dialog.h"
-#include "editor/editor_node.h"
-#include "editor/editor_settings.h"
-#include "editor/property_editor.h"
-#include "io/marshalls.h"
-#include "io/resource_saver.h"
-#include "os/file_access.h"
-
-#if 0
-
-class _EditorSampleImportOptions : public Object {
-
-	GDCLASS(_EditorSampleImportOptions,Object);
-public:
-
-	enum CompressMode {
-		COMPRESS_MODE_DISABLED,
-		COMPRESS_MODE_RAM,
-		COMPRESS_MODE_DISK
-	};
-
-	enum CompressBitrate {
-		COMPRESS_64,
-		COMPRESS_96,
-		COMPRESS_128,
-		COMPRESS_192
-	};
-
-	bool force_8_bit;
-	bool force_mono;
-	bool force_rate;
-	float force_rate_hz;
-
-	bool edit_trim;
-	bool edit_normalize;
-	bool edit_loop;
-
-	CompressMode compress_mode;
-	CompressBitrate compress_bitrate;
-
-
-	bool _set(const StringName& p_name, const Variant& p_value) {
-
-		String n = p_name;
-		if (n=="force/8_bit")
-			force_8_bit=p_value;
-		else if (n=="force/mono")
-			force_mono=p_value;
-		else if (n=="force/max_rate")
-			force_rate=p_value;
-		else if (n=="force/max_rate_hz")
-			force_rate_hz=p_value;
-		else if (n=="edit/trim")
-			edit_trim=p_value;
-		else if (n=="edit/normalize")
-			edit_normalize=p_value;
-		else if (n=="edit/loop")
-			edit_loop=p_value;
-		else if (n=="compress/mode")
-			compress_mode=CompressMode(int(p_value));
-		else if (n=="compress/bitrate")
-			compress_bitrate=CompressBitrate(int(p_value));
-		else
-			return false;
-
-		return true;
-
-	}
-
-	bool _get(const StringName& p_name,Variant &r_ret) const{
-
-		String n = p_name;
-		if (n=="force/8_bit")
-			r_ret=force_8_bit;
-		else if (n=="force/mono")
-			r_ret=force_mono;
-		else if (n=="force/max_rate")
-			r_ret=force_rate;
-		else if (n=="force/max_rate_hz")
-			r_ret=force_rate_hz;
-		else if (n=="edit/trim")
-			r_ret=edit_trim;
-		else if (n=="edit/normalize")
-			r_ret=edit_normalize;
-		else if (n=="edit/loop")
-			r_ret=edit_loop;
-		else if (n=="compress/mode")
-			r_ret=compress_mode;
-		else if (n=="compress/bitrate")
-			r_ret=compress_bitrate;
-		else
-			return false;
-
-		return true;
-
-	}
-	void _get_property_list( List<PropertyInfo> *p_list) const{
-
-		p_list->push_back(PropertyInfo(Variant::BOOL,"force/8_bit"));
-		p_list->push_back(PropertyInfo(Variant::BOOL,"force/mono"));
-		p_list->push_back(PropertyInfo(Variant::BOOL,"force/max_rate"));
-		p_list->push_back(PropertyInfo(Variant::REAL,"force/max_rate_hz",PROPERTY_HINT_EXP_RANGE,"11025,192000,1"));
-		p_list->push_back(PropertyInfo(Variant::BOOL,"edit/trim"));
-		p_list->push_back(PropertyInfo(Variant::BOOL,"edit/normalize"));
-		p_list->push_back(PropertyInfo(Variant::BOOL,"edit/loop"));
-		p_list->push_back(PropertyInfo(Variant::INT,"compress/mode",PROPERTY_HINT_ENUM,"Disabled,RAM (Ima-ADPCM)"));
-		//p_list->push_back(PropertyInfo(Variant::INT,"compress/bitrate",PROPERTY_HINT_ENUM,"64,96,128,192"));
-
-
-	}
-
-
-	static void _bind_methods() {
-
-
-		ADD_SIGNAL( MethodInfo("changed"));
-	}
-
-
-	_EditorSampleImportOptions() {
-
-		force_8_bit=false;
-		force_mono=false;
-		force_rate=true;
-		force_rate_hz=44100;
-
-		edit_trim=true;
-		edit_normalize=true;
-		edit_loop=false;
-
-		compress_mode=COMPRESS_MODE_RAM;
-		compress_bitrate=COMPRESS_128;
-	}
-
-
-};
-
-class EditorSampleImportDialog : public ConfirmationDialog {
-
-	GDCLASS(EditorSampleImportDialog,ConfirmationDialog);
-
-	EditorSampleImportPlugin *plugin;
-
-	LineEdit *import_path;
-	LineEdit *save_path;
-	EditorFileDialog *file_select;
-	EditorDirDialog *save_select;
-	ConfirmationDialog *error_dialog;
-	PropertyEditor *option_editor;
-
-	_EditorSampleImportOptions *options;
-
-
-public:
-
-	void _choose_files(const Vector<String>& p_path) {
-
-		String files;
-		for(int i=0;i<p_path.size();i++) {
-
-			if (i>0)
-				files+=",";
-			files+=p_path[i];
-		}
-		/*
-		if (p_path.size()) {
-			String srctex=p_path[0];
-			String ipath = EditorImportDB::get_singleton()->find_source_path(srctex);
-
-			if (ipath!="")
-				save_path->set_text(ipath.get_base_dir());
-		}*/
-		import_path->set_text(files);
-
-	}
-	void _choose_save_dir(const String& p_path) {
-
-		save_path->set_text(p_path);
-	}
-
-	void _browse() {
-
-		file_select->popup_centered_ratio();
-	}
-
-	void _browse_target() {
-
-		save_select->popup_centered_ratio();
-
-	}
-
-
-	void popup_import(const String& p_path) {
-
-		popup_centered(Size2(400,400)*EDSCALE);
-		if (p_path!="") {
-
-			Ref<ResourceImportMetadata> rimd = ResourceLoader::load_import_metadata(p_path);
-			ERR_FAIL_COND(!rimd.is_valid());
-
-			save_path->set_text(p_path.get_base_dir());
-			List<String> opts;
-			rimd->get_options(&opts);
-			for(List<String>::Element *E=opts.front();E;E=E->next()) {
-
-				options->_set(E->get(),rimd->get_option(E->get()));
-			}
-
-			String src = "";
-			for(int i=0;i<rimd->get_source_count();i++) {
-				if (i>0)
-					src+=",";
-				src+=EditorImportPlugin::expand_source_path(rimd->get_source_path(i));
-			}
-			import_path->set_text(src);
-		}
-	}
-
-
-	void _import() {
-
-		Vector<String> samples = import_path->get_text().split(",");
-
-		if (samples.size()==0) {
-			error_dialog->set_text(TTR("No samples to import!"));
-			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
-		}
-
-		if (save_path->get_text().strip_edges()=="") {
-			error_dialog->set_text(TTR("Target path is empty."));
-			error_dialog->popup_centered_minsize();
-			return;
-		}
-
-		if (!save_path->get_text().begins_with("res://")) {
-			error_dialog->set_text(TTR("Target path must be a complete resource path."));
-			error_dialog->popup_centered_minsize();
-			return;
-		}
-
-		if (!DirAccess::exists(save_path->get_text())) {
-			error_dialog->set_text(TTR("Target path must exist."));
-			error_dialog->popup_centered_minsize();
-			return;
-		}
-
-		for(int i=0;i<samples.size();i++) {
-
-			Ref<ResourceImportMetadata> imd = memnew( ResourceImportMetadata );
-
-			List<PropertyInfo> pl;
-			options->_get_property_list(&pl);
-			for(List<PropertyInfo>::Element *E=pl.front();E;E=E->next()) {
-
-				Variant v;
-				String opt=E->get().name;
-				options->_get(opt,v);
-				imd->set_option(opt,v);
-
-			}
-
-			imd->add_source(EditorImportPlugin::validate_source_path(samples[i]));
-
-			String dst = save_path->get_text();
-			if (dst=="") {
-				error_dialog->set_text(TTR("Save path is empty!"));
-				error_dialog->popup_centered(Size2(200,100)*EDSCALE);
-			}
-
-			dst = dst.plus_file(samples[i].get_file().get_basename()+".sample");
-
-			plugin->import(dst,imd);
-		}
-
-		hide();
-
-	}
-
-
-	void _notification(int p_what) {
-
-
-		if (p_what==NOTIFICATION_ENTER_TREE) {
-
-			option_editor->edit(options);
-		}
-	}
-
-	static void _bind_methods() {
-
-
-		ClassDB::bind_method("_choose_files",&EditorSampleImportDialog::_choose_files);
-		ClassDB::bind_method("_choose_save_dir",&EditorSampleImportDialog::_choose_save_dir);
-		ClassDB::bind_method("_import",&EditorSampleImportDialog::_import);
-		ClassDB::bind_method("_browse",&EditorSampleImportDialog::_browse);
-		ClassDB::bind_method("_browse_target",&EditorSampleImportDialog::_browse_target);
-		//ADD_SIGNAL( MethodInfo("imported",PropertyInfo(Variant::OBJECT,"scene")) );
-	}
-
-	EditorSampleImportDialog(EditorSampleImportPlugin *p_plugin) {
-
-		plugin=p_plugin;
-
-
-		set_title(TTR("Import Audio Samples"));
-
-		VBoxContainer *vbc = memnew( VBoxContainer );
-		add_child(vbc);
-		//set_child_rect(vbc);
-
-
-		HBoxContainer *hbc = memnew( HBoxContainer );
-		vbc->add_margin_child(TTR("Source Sample(s):"),hbc);
-
-		import_path = memnew( LineEdit );
-		import_path->set_h_size_flags(SIZE_EXPAND_FILL);
-		hbc->add_child(import_path);
-
-		Button * import_choose = memnew( Button );
-		import_choose->set_text(" .. ");
-		hbc->add_child(import_choose);
-
-		import_choose->connect("pressed", this,"_browse");
-
-		hbc = memnew( HBoxContainer );
-		vbc->add_margin_child(TTR("Target Path:"),hbc);
-
-		save_path = memnew( LineEdit );
-		save_path->set_h_size_flags(SIZE_EXPAND_FILL);
-		hbc->add_child(save_path);
-
-		Button * save_choose = memnew( Button );
-		save_choose->set_text(" .. ");
-		hbc->add_child(save_choose);
-
-		save_choose->connect("pressed", this,"_browse_target");
-
-		file_select = memnew(EditorFileDialog);
-		file_select->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
-		add_child(file_select);
-		file_select->set_mode(EditorFileDialog::MODE_OPEN_FILES);
-		file_select->connect("files_selected", this,"_choose_files");
-		file_select->add_filter("*.wav ; MS Waveform");
-		save_select = memnew(	EditorDirDialog );
-		add_child(save_select);
-
-		//save_select->set_mode(EditorFileDialog::MODE_OPEN_DIR);
-		save_select->connect("dir_selected", this,"_choose_save_dir");
-
-		get_ok()->connect("pressed", this,"_import");
-		get_ok()->set_text(TTR("Import"));
-
-
-		error_dialog = memnew ( ConfirmationDialog );
-		add_child(error_dialog);
-		error_dialog->get_ok()->set_text(TTR("Accept"));
-		//error_dialog->get_cancel()->hide();
-
-		set_hide_on_ok(false);
-		options = memnew( _EditorSampleImportOptions );
-
-		option_editor = memnew( PropertyEditor );
-		option_editor->hide_top_label();
-		vbc->add_margin_child(TTR("Options:"),option_editor,true);
-	}
-
-	~EditorSampleImportDialog() {
-		memdelete(options);
-	}
-
-};
-
-
-String EditorSampleImportPlugin::get_name() const {
-
-	return "sample";
-}
-String EditorSampleImportPlugin::get_visible_name() const{
-
-	return TTR("Audio Sample");
-}
-void EditorSampleImportPlugin::import_dialog(const String& p_from){
-
-	dialog->popup_import(p_from);
-}
-Error EditorSampleImportPlugin::import(const String& p_path, const Ref<ResourceImportMetadata>& p_from){
-
-	ERR_FAIL_COND_V(p_from->get_source_count()!=1,ERR_INVALID_PARAMETER);
-
-	Ref<ResourceImportMetadata> from=p_from;
-
-	String src_path=EditorImportPlugin::expand_source_path(from->get_source_path(0));
-	Ref<Sample> smp = ResourceLoader::load(src_path);
-	ERR_FAIL_COND_V(smp.is_null(),ERR_CANT_OPEN);
-
-
-	float rate = smp->get_mix_rate();
-	bool is16 = smp->get_format()==Sample::FORMAT_PCM16;
-	int chans = smp->is_stereo()?2:1;
-	int len = smp->get_length();
-	Sample::LoopFormat loop= smp->get_loop_format();
-	int loop_beg = smp->get_loop_begin();
-	int loop_end = smp->get_loop_end();
-
-	print_line("Input Sample: ");
-	print_line("\tlen: "+itos(len));
-	print_line("\tchans: "+itos(chans));
-	print_line("\t16bits: "+itos(is16));
-	print_line("\trate: "+itos(rate));
-	print_line("\tloop: "+itos(loop));
-	print_line("\tloop begin: "+itos(loop_beg));
-	print_line("\tloop end: "+itos(loop_end));
-	Vector<float> data;
-	data.resize(len*chans);
-
-	{
-		PoolVector<uint8_t> src_data = smp->get_data();
-		PoolVector<uint8_t>::Read sr = src_data.read();
-
-
-		for(int i=0;i<len*chans;i++) {
-
-			float s=0;
-			if (is16) {
-
-				int16_t i16 = decode_uint16(&sr[i*2]);
-				s=i16/32767.0;
-			} else {
-
-				int8_t i8 = sr[i];
-				s=i8/127.0;
-			}
-			data[i]=s;
-		}
-	}
-
-	//apply frequency limit
-
-	bool limit_rate = from->get_option("force/max_rate");
-	int limit_rate_hz = from->get_option("force/max_rate_hz");
-	if (limit_rate && rate > limit_rate_hz) {
-		//resampleeee!!!
-		int new_data_len = len * limit_rate_hz / rate;
-		Vector<float> new_data;
-		new_data.resize( new_data_len * chans );
-		for(int c=0;c<chans;c++) {
-
-			for(int i=0;i<new_data_len;i++) {
-
-				//simple cubic interpolation should be enough.
-				float pos = float(i) * len / new_data_len;
-				float mu = pos-Math::floor(pos);
-				int ipos = int(Math::floor(pos));
-
-				float y0=data[MAX(0,ipos-1)*chans+c];
-				float y1=data[ipos*chans+c];
-				float y2=data[MIN(len-1,ipos+1)*chans+c];
-				float y3=data[MIN(len-1,ipos+2)*chans+c];
-
-				float mu2 = mu*mu;
-				float a0 = y3 - y2 - y0 + y1;
-				float a1 = y0 - y1 - a0;
-				float a2 = y2 - y0;
-				float a3 = y1;
-
-				float res=(a0*mu*mu2+a1*mu2+a2*mu+a3);
-
-				new_data[i*chans+c]=res;
-			}
-		}
-
-		if (loop) {
-
-			loop_beg=loop_beg*new_data_len/len;
-			loop_end=loop_end*new_data_len/len;
-		}
-		data=new_data;
-		rate=limit_rate_hz;
-		len=new_data_len;
-	}
-
-
-	bool normalize = from->get_option("edit/normalize");
-
-	if (normalize) {
-
-		float max=0;
-		for(int i=0;i<data.size();i++) {
-
-			float amp = Math::abs(data[i]);
-			if (amp>max)
-				max=amp;
-		}
-
-		if (max>0) {
-
-			float mult=1.0/max;
-			for(int i=0;i<data.size();i++) {
-
-				data[i]*=mult;
-			}
-
-		}
-	}
-
-	bool trim = from->get_option("edit/trim");
-
-	if (trim && !loop) {
-
-		int first=0;
-		int last=(len*chans)-1;
-		bool found=false;
-		float limit = Math::db2linear((float)-30);
-		for(int i=0;i<data.size();i++) {
-			float amp = Math::abs(data[i]);
-
-			if (!found && amp > limit) {
-				first=i;
-				found=true;
-			}
-
-			if (found && amp > limit) {
-				last=i;
-			}
-		}
-
-		first/=chans;
-		last/=chans;
-
-		if (first<last) {
-
-			Vector<float> new_data;
-			new_data.resize((last-first+1)*chans);
-			for(int i=first*chans;i<=last*chans;i++) {
-				new_data[i-first*chans]=data[i];
-			}
-
-			data=new_data;
-			len=data.size()/chans;
-		}
-
-	}
-
-	bool make_loop = from->get_option("edit/loop");
-
-	if (make_loop && !loop) {
-
-		loop=Sample::LOOP_FORWARD;
-		loop_beg=0;
-		loop_end=len;
-	}
-
-	int compression = from->get_option("compress/mode");
-	bool force_mono = from->get_option("force/mono");
-
-
-	if (force_mono && chans==2) {
-
-		Vector<float> new_data;
-		new_data.resize(data.size()/2);
-		for(int i=0;i<len;i++) {
-			new_data[i]=(data[i*2+0]+data[i*2+1])/2.0;
-		}
-
-		data=new_data;
-		chans=1;
-	}
-
-	bool force_8_bit = from->get_option("force/8_bit");
-	if (force_8_bit) {
-
-		is16=false;
-	}
-
-
-	PoolVector<uint8_t> dst_data;
-	Sample::Format dst_format;
-
-	if ( compression == _EditorSampleImportOptions::COMPRESS_MODE_RAM) {
-
-		dst_format=Sample::FORMAT_IMA_ADPCM;
-		if (chans==1) {
-			_compress_ima_adpcm(data,dst_data);
-		} else {
-
-			print_line("INTERLEAAVE!");
-
-
-
-			//byte interleave
-			Vector<float> left;
-			Vector<float> right;
-
-			int tlen = data.size()/2;
-			left.resize(tlen);
-			right.resize(tlen);
-
-			for(int i=0;i<tlen;i++) {
-				left[i]=data[i*2+0];
-				right[i]=data[i*2+1];
-			}
-
-			PoolVector<uint8_t> bleft;
-			PoolVector<uint8_t> bright;
-
-			_compress_ima_adpcm(left,bleft);
-			_compress_ima_adpcm(right,bright);
-
-			int dl = bleft.size();
-			dst_data.resize( dl *2 );
-
-			PoolVector<uint8_t>::Write w=dst_data.write();
-			PoolVector<uint8_t>::Read rl=bleft.read();
-			PoolVector<uint8_t>::Read rr=bright.read();
-
-			for(int i=0;i<dl;i++) {
-				w[i*2+0]=rl[i];
-				w[i*2+1]=rr[i];
-			}
-		}
-
-		//print_line("compressing ima-adpcm, resulting buffersize is "+itos(dst_data.size())+" from "+itos(data.size()));
-
-	} else {
-
-		dst_format=is16?Sample::FORMAT_PCM16:Sample::FORMAT_PCM8;
-		dst_data.resize( data.size() * (is16?2:1));
-		{
-			PoolVector<uint8_t>::Write w = dst_data.write();
-
-			int ds=data.size();
-			for(int i=0;i<ds;i++) {
-
-				if (is16) {
-					int16_t v = CLAMP(data[i]*32767,-32768,32767);
-					encode_uint16(v,&w[i*2]);
-				} else {
-					int8_t v = CLAMP(data[i]*127,-128,127);
-					w[i]=v;
-				}
-			}
-		}
-	}
-
-
-	Ref<Sample> target;
-
-	if (ResourceCache::has(p_path)) {
-
-		target = Ref<Sample>( Object::cast_to<Sample>(ResourceCache::get(p_path)) );
-	} else {
-
-		target = smp;
-	}
-
-	target->create(dst_format,chans==2?true:false,len);
-	target->set_data(dst_data);
-	target->set_mix_rate(rate);
-	target->set_loop_format(loop);
-	target->set_loop_begin(loop_beg);
-	target->set_loop_end(loop_end);
-
-	from->set_source_md5(0,FileAccess::get_md5(src_path));
-	from->set_editor(get_name());
-	target->set_import_metadata(from);
-
-
-	Error err = ResourceSaver::save(p_path,smp);
-
-	return err;
-
-}
-
-void EditorSampleImportPlugin::_compress_ima_adpcm(const Vector<float>& p_data,PoolVector<uint8_t>& dst_data) {
-
-
-	/*p_sample_data->data = (void*)malloc(len);
-	xm_s8 *dataptr=(xm_s8*)p_sample_data->data;*/
-
-	static const int16_t _ima_adpcm_step_table[89] = {
-		7, 8, 9, 10, 11, 12, 13, 14, 16, 17,
-		19, 21, 23, 25, 28, 31, 34, 37, 41, 45,
-		50, 55, 60, 66, 73, 80, 88, 97, 107, 118,
-		130, 143, 157, 173, 190, 209, 230, 253, 279, 307,
-		337, 371, 408, 449, 494, 544, 598, 658, 724, 796,
-		876, 963, 1060, 1166, 1282, 1411, 1552, 1707, 1878, 2066,
-		2272, 2499, 2749, 3024, 3327, 3660, 4026, 4428, 4871, 5358,
-		5894, 6484, 7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899,
-		15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767
-	};
-
-	static const int8_t _ima_adpcm_index_table[16] = {
-		-1, -1, -1, -1, 2, 4, 6, 8,
-		-1, -1, -1, -1, 2, 4, 6, 8
-	};
-
-
-	int datalen = p_data.size();
-	int datamax=datalen;
-	if (datalen&1)
-		datalen++;
-
-	dst_data.resize(datalen/2+4);
-	PoolVector<uint8_t>::Write w = dst_data.write();
-
-
-	int i,step_idx=0,prev=0;
-	uint8_t *out = w.ptr();
-	//int16_t xm_prev=0;
-	const float *in=p_data.ptr();
-
-
-	/* initial value is zero */
-	*(out++) =0;
-	*(out++) =0;
-	/* Table index initial value */
-	*(out++) =0;
-	/* unused */
-	*(out++) =0;
-
-	for (i=0;i<datalen;i++) {
-		int step,diff,vpdiff,mask;
-		uint8_t nibble;
-		int16_t xm_sample;
-
-		if (i>=datamax)
-			xm_sample=0;
-		else {
-
-
-			xm_sample=CLAMP(in[i]*32767.0,-32768,32767);
-			/*
-			if (xm_sample==32767 || xm_sample==-32768)
-				printf("clippy!\n",xm_sample);
-			*/
-		}
-
-		//xm_sample=xm_sample+xm_prev;
-		//xm_prev=xm_sample;
-
-		diff = (int)xm_sample - prev ;
-
-		nibble=0 ;
-		step =  _ima_adpcm_step_table[ step_idx ];
-		vpdiff = step >> 3 ;
-		if (diff < 0) {
-			nibble=8;
-			diff=-diff ;
-		}
-		mask = 4 ;
-		while (mask) {
-
-			if (diff >= step) {
-
-				nibble |= mask;
-				diff -= step;
-				vpdiff += step;
-			}
-
-			step >>= 1 ;
-			mask >>= 1 ;
-		};
-
-		if (nibble&8)
-			prev-=vpdiff ;
-		else
-			prev+=vpdiff ;
-
-		if (prev > 32767) {
-			//printf("%i,xms %i, prev %i,diff %i, vpdiff %i, clip up %i\n",i,xm_sample,prev,diff,vpdiff,prev);
-			prev=32767;
-		} else if (prev < -32768) {
-			//printf("%i,xms %i, prev %i,diff %i, vpdiff %i, clip down %i\n",i,xm_sample,prev,diff,vpdiff,prev);
-			prev = -32768 ;
-		}
-
-		step_idx += _ima_adpcm_index_table[nibble];
-		if (step_idx< 0)
-			step_idx= 0 ;
-		else if (step_idx> 88)
-			step_idx= 88 ;
-
-
-		if (i&1) {
-			*out|=nibble<<4;
-			out++;
-		} else {
-			*out=nibble;
-		}
-		/*dataptr[i]=prev>>8;*/
-	}
-
-}
-
-
-EditorSampleImportPlugin* EditorSampleImportPlugin::singleton=NULL;
-
-
-void EditorSampleImportPlugin::import_from_drop(const Vector<String>& p_drop, const String &p_dest_path) {
-
-
-	Vector<String> files;
-	for(int i=0;i<p_drop.size();i++) {
-		String ext = p_drop[i].get_extension().to_lower();
-
-		if (ext=="wav") {
-
-			files.push_back(p_drop[i]);
-		}
-	}
-
-	if (files.size()) {
-		import_dialog();
-		dialog->_choose_files(files);
-		dialog->_choose_save_dir(p_dest_path);
-	}
-}
-
-void EditorSampleImportPlugin::reimport_multiple_files(const Vector<String>& p_list) {
-
-	if (p_list.size()==0)
-		return;
-
-	Vector<String> sources;
-	for(int i=0;i<p_list.size();i++) {
-		int idx;
-		EditorFileSystemDirectory *efsd = EditorFileSystem::get_singleton()->find_file(p_list[i],&idx);
-		if (efsd) {
-			for(int j=0;j<efsd->get_source_count(idx);j++) {
-				String file = expand_source_path(efsd->get_source_file(idx,j));
-				if (sources.find(file)==-1) {
-					sources.push_back(file);
-				}
-
-			}
-		}
-	}
-
-	if (sources.size()) {
-
-		dialog->popup_import(p_list[0]);
-		dialog->_choose_files(sources);
-		dialog->_choose_save_dir(p_list[0].get_base_dir());
-	}
-}
-
-bool EditorSampleImportPlugin::can_reimport_multiple_files() const {
-
-	return true;
-}
-
-EditorSampleImportPlugin::EditorSampleImportPlugin(EditorNode* p_editor) {
-
-	singleton=this;
-	dialog = memnew( EditorSampleImportDialog(this));
-	p_editor->get_gui_base()->add_child(dialog);
-}
-
-Vector<uint8_t> EditorSampleExportPlugin::custom_export(String& p_path,const Ref<EditorExportPlatform> &p_platform) {
-
-
-
-	if (EditorImportExport::get_singleton()->sample_get_action()==EditorImportExport::SAMPLE_ACTION_NONE || p_path.get_extension().to_lower()!="wav") {
-
-		return Vector<uint8_t>();
-	}
-
-	Ref<ResourceImportMetadata> imd = memnew( ResourceImportMetadata );
-
-	imd->add_source(EditorImportPlugin::validate_source_path(p_path));
-
-	imd->set_option("force/8_bit",false);
-	imd->set_option("force/mono",false);
-	imd->set_option("force/max_rate",true);
-	imd->set_option("force/max_rate_hz",EditorImportExport::get_singleton()->sample_get_max_hz());
-	imd->set_option("edit/trim",EditorImportExport::get_singleton()->sample_get_trim());
-	imd->set_option("edit/normalize",false);
-	imd->set_option("edit/loop",false);
-	imd->set_option("compress/mode",1);
-
-	String savepath = EditorSettings::get_singleton()->get_settings_path().plus_file("tmp/smpconv.sample");
-	Error err = EditorSampleImportPlugin::singleton->import(savepath,imd);
-
-
-	ERR_FAIL_COND_V(err!=OK,Vector<uint8_t>());
-
-	p_path=p_path.get_basename()+".converted.sample";
-	return FileAccess::get_file_as_array(savepath);
-
-}
-
-
-
-EditorSampleExportPlugin::EditorSampleExportPlugin() {
-
-}
-
-#endif

editor/io_plugins/editor_sample_import_plugin.h

@@ -1,75 +0,0 @@
-/*************************************************************************/
-/*  editor_sample_import_plugin.h                                        */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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 EDITOR_SAMPLE_IMPORT_PLUGIN_H
-#define EDITOR_SAMPLE_IMPORT_PLUGIN_H
-
-#if 0
-#include "editor/editor_import_export.h"
-#include "scene/resources/font.h"
-
-class EditorNode;
-class EditorSampleImportDialog;
-
-class EditorSampleImportPlugin : public EditorImportPlugin {
-
-	GDCLASS(EditorSampleImportPlugin,EditorImportPlugin);
-
-	EditorSampleImportDialog *dialog;
-	void _compress_ima_adpcm(const Vector<float>& p_data,PoolVector<uint8_t>& dst_data);
-public:
-
-	static EditorSampleImportPlugin *singleton;
-
-	virtual String get_name() const;
-	virtual String get_visible_name() const;
-	virtual void import_dialog(const String& p_from="");
-	virtual Error import(const String& p_path, const Ref<ResourceImportMetadata>& p_from);
-	void import_from_drop(const Vector<String>& p_drop, const String &p_dest_path);
-	virtual void reimport_multiple_files(const Vector<String>& p_list);
-	virtual bool can_reimport_multiple_files() const;
-
-
-	EditorSampleImportPlugin(EditorNode* p_editor);
-};
-
-class EditorSampleExportPlugin : public EditorExportPlugin {
-
-	GDCLASS( EditorSampleExportPlugin, EditorExportPlugin);
-
-
-public:
-
-	virtual Vector<uint8_t> custom_export(String& p_path,const Ref<EditorExportPlatform> &p_platform);
-
-	EditorSampleExportPlugin();
-};
-
-#endif // EDITOR_SAMPLE_IMPORT_PLUGIN_H
-#endif

editor/io_plugins/editor_scene_import_plugin.cpp

@@ -1,2986 +0,0 @@
-/*************************************************************************/
-/*  editor_scene_import_plugin.cpp                                       */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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.                */
-/*************************************************************************/
-#include "editor_scene_import_plugin.h"
-#if 0
-#include "editor/create_dialog.h"
-#include "editor/editor_node.h"
-#include "io/resource_saver.h"
-#include "os/file_access.h"
-#include "os/os.h"
-#include "project_settings.h"
-#include "scene/3d/body_shape.h"
-#include "scene/3d/mesh_instance.h"
-#include "scene/3d/navigation.h"
-#include "scene/3d/path.h"
-#include "scene/3d/physics_body.h"
-#include "scene/3d/portal.h"
-#include "scene/3d/room_instance.h"
-#include "scene/3d/vehicle_body.h"
-#include "scene/animation/animation_player.h"
-#include "scene/resources/box_shape.h"
-#include "scene/resources/packed_scene.h"
-#include "scene/resources/sphere_shape.h"
-#include <scene/resources/box_shape.h>
-#include <scene/resources/plane_shape.h>
-#include <scene/resources/ray_shape.h>
-
-
-
-
-EditorSceneImporter::EditorSceneImporter() {
-
-
-}
-
-void EditorScenePostImport::_bind_methods() {
-
-	BIND_VMETHOD( MethodInfo("post_import",PropertyInfo(Variant::OBJECT,"scene")) );
-
-}
-
-Node *EditorScenePostImport::post_import(Node* p_scene) {
-
-	if (get_script_instance())
-		return get_script_instance()->call("post_import",p_scene);
-
-	return p_scene;
-}
-
-EditorScenePostImport::EditorScenePostImport() {
-
-
-}
-
-
-/////////////////////////////
-
-
-class EditorImportAnimationOptions : public VBoxContainer {
-
-	GDCLASS( EditorImportAnimationOptions, VBoxContainer );
-
-
-
-	TreeItem *fps;
-	TreeItem* optimize_linear_error;
-	TreeItem* optimize_angular_error;
-	TreeItem* optimize_max_angle;
-
-	TreeItem *clips_base;
-
-	TextEdit *filters;
-	Vector<TreeItem*> clips;
-
-	Tree *flags;
-	Tree *clips_tree;
-	Tree *optimization_tree;
-	Vector<TreeItem*> items;
-
-
-	bool updating;
-	bool validating;
-
-
-
-	void _changed();
-	void _item_edited();
-	void _button_action(Object *p_obj,int p_col,int p_id);
-
-protected:
-	static void _bind_methods();
-	void _notification(int p_what);
-
-public:
-
-	void set_flags(uint32_t p_flags);
-	uint32_t get_flags() const;
-
-	void set_fps(int p_fps);
-	int get_fps() const;
-
-	void set_optimize_linear_error(float p_error);
-	float get_optimize_linear_error() const;
-
-	void set_optimize_angular_error(float p_error);
-	float get_optimize_angular_error() const;
-
-	void set_optimize_max_angle(float p_error);
-	float get_optimize_max_angle() const;
-
-	void setup_clips(const Array& p_clips);
-	Array get_clips() const;
-
-	void set_filter(const String& p_filter);
-	String get_filter() const;
-
-	EditorImportAnimationOptions();
-
-
-};
-
-////////////////////////////
-
-class EditorSceneImportDialog : public ConfirmationDialog  {
-
-	GDCLASS(EditorSceneImportDialog,ConfirmationDialog);
-
-
-	struct FlagInfo {
-		int value;
-		const char *category;
-		const char *text;
-		bool defval;
-	};
-
-	static const FlagInfo scene_flag_names[];
-
-	EditorImportTextureOptions *texture_options;
-	EditorImportAnimationOptions *animation_options;
-
-	EditorSceneImportPlugin *plugin;
-
-	EditorNode *editor;
-
-	LineEdit *import_path;
-	LineEdit *save_path;
-	LineEdit *script_path;
-	Tree *import_options;
-	EditorFileDialog *file_select;
-	EditorFileDialog *script_select;
-	EditorDirDialog *save_select;
-	OptionButton *texture_action;
-	CreateDialog *root_type_choose;
-	LineEdit *root_node_name;
-
-	ConfirmationDialog *confirm_open;
-
-	ConfirmationDialog *confirm_import;
-	RichTextLabel *missing_files;
-
-	Vector<TreeItem*> scene_flags;
-
-	Map<Ref<Mesh>,Ref<Shape> > collision_map;
-	ConfirmationDialog *error_dialog;
-
-	Button *root_type;
-	CheckBox *root_default;
-
-
-	void _root_default_pressed();
-	void _root_type_pressed();
-	void _set_root_type();
-
-	void _choose_file(const String& p_path);
-	void _choose_save_file(const String& p_path);
-	void _choose_script(const String& p_path);
-	void _browse();
-	void _browse_target();
-	void _browse_script();
-	void _import(bool p_and_open=false);
-	void _import_confirm();
-
-	Ref<ResourceImportMetadata> wip_rimd;
-	Node *wip_import;
-	String wip_save_file;
-	bool wip_blocked;
-	bool wip_open;
-
-	void _dialog_hid();
-	void _open_and_import();
-
-
-protected:
-
-	void _notification(int p_what);
-	static void _bind_methods();
-public:
-
-	void setup_popup(const String& p_from,const String& p_to_path) {
-		_choose_file(p_from);
-		_choose_save_file(p_to_path);
-	}
-
-	Error import(const String& p_from, const String& p_to, const String& p_preset);
-	void popup_import(const String& p_from);
-	EditorSceneImportDialog(EditorNode *p_editor,EditorSceneImportPlugin *p_plugin);
-};
-
-///////////////////////////////////
-
-
-static const char *anim_flag_names[]={
-	"Detect Loop (-loop,-cycle)",
-	"Keep Value Tracks",
-	"Optimize",
-	"Force All Tracks in All Clips",
-	NULL
-};
-
-static const char *anim_flag_descript[]={
-	"Set loop flag for animation names that\ncontain 'cycle' or 'loop' in the name.",
-	"When merging an existing aimation,\nkeep the user-created value-tracks.",
-	"Remove redundant keyframes in\n transform tacks.",
-	"Some exporters will rely on default pose for some bones.\nThis forces those bones to have at least one animation key.",
-	NULL
-};
-
-
-
-void EditorImportAnimationOptions::set_flags(uint32_t p_flags){
-
-	updating=true;
-	for(int i=0;i<items.size();i++) {
-
-		items[i]->set_checked(0,p_flags&(1<<i));
-	}
-	updating=false;
-
-}
-uint32_t EditorImportAnimationOptions::get_flags() const{
-
-	uint32_t f=0;
-	for(int i=0;i<items.size();i++) {
-
-		if (items[i]->is_checked(0))
-			f|=(1<<i);
-	}
-
-	return f;
-}
-
-
-void EditorImportAnimationOptions::_changed() {
-
-	if (updating)
-		return;
-	emit_signal("changed");
-}
-
-
-void EditorImportAnimationOptions::_button_action(Object *p_obj,int p_col,int p_id) {
-
-	memdelete(p_obj);
-
-}
-
-
-void EditorImportAnimationOptions::_item_edited() {
-
-	if (validating)
-		return;
-
-	if (clips.size()==0)
-		return;
-	validating=true;
-	print_line("edited");
-	TreeItem *item = clips_tree->get_edited();
-	if (item==clips[clips.size()-1]) {
-		//add new
-		print_line("islast");
-		if (item->get_text(0).find("<")!=-1 || item->get_text(0).find(">")!=-1) {
-			validating=false;
-			return; //fuckit
-		}
-
-		item->set_editable(1,true);
-		item->set_editable(2,true);
-		item->add_button(0,EditorNode::get_singleton()->get_gui_base()->get_icon("Del","EditorIcons"));
-		item->set_cell_mode(1,TreeItem::CELL_MODE_RANGE);
-		item->set_range_config(1,0,3600,0.01);
-		item->set_range(1,0);
-		item->set_editable(1,true);
-		item->set_cell_mode(2,TreeItem::CELL_MODE_RANGE);
-		item->set_range_config(2,0,3600,0.01);
-		item->set_range(2,0);
-		item->set_cell_mode(3,TreeItem::CELL_MODE_CHECK);
-		item->set_editable(3,true);
-
-		TreeItem *newclip = clips_tree->create_item(clips_base);
-		newclip->set_text(0,"<new clip>");
-		newclip->set_editable(0,true);
-		newclip->set_editable(1,false);
-		newclip->set_editable(2,false);
-		clips.push_back(newclip);
-
-
-
-	}
-
-
-	//make name unique JUST IN CASE
-	String name = item->get_text(0);
-	name=name.replace("/","_").replace(":","_").strip_edges();
-	if (name=="")
-		name=TTR("New Clip");
-
-	if (clips.size()>2) {
-		int index=1;
-		while(true) {
-			bool valid = true;
-			String try_name=name;
-			if (index>1)
-				try_name+=" "+itos(index);
-
-			for(int i=0;i<clips.size()-1;i++) {
-
-				if (clips[i]==item)
-					continue;
-				if (clips[i]->get_text(0)==try_name) {
-					index++;
-					valid=false;
-					break;
-				}
-			}
-
-			if (valid) {
-				name=try_name;
-				break;
-			}
-
-		}
-	}
-
-	if (item->get_text(0)!=name)
-		item->set_text(0,name);
-
-	validating=false;
-
-}
-
-void EditorImportAnimationOptions::_bind_methods() {
-
-	ClassDB::bind_method("_changed",&EditorImportAnimationOptions::_changed);
-	ClassDB::bind_method("_item_edited",&EditorImportAnimationOptions::_item_edited);
-	ClassDB::bind_method("_button_action",&EditorImportAnimationOptions::_button_action);
-	//ClassDB::bind_method("_changedp",&EditorImportAnimationOptions::_changedp);
-
-	ADD_SIGNAL(MethodInfo("changed"));
-}
-
-
-void EditorImportAnimationOptions::_notification(int p_what) {
-
-	if (p_what==NOTIFICATION_ENTER_TREE) {
-
-		flags->connect("item_edited",this,"_changed");
-		clips_tree->connect("item_edited",this,"_item_edited");
-		clips_tree->connect("button_pressed",this,"_button_action",varray(),CONNECT_DEFERRED);
-		//format->connect("item_selected",this,"_changedp");
-	}
-}
-
-
-Array EditorImportAnimationOptions::get_clips()  const {
-
-	Array arr;
-	for(int i=0;i<clips.size()-1;i++) {
-
-		arr.push_back(clips[i]->get_text(0));
-		arr.push_back(clips[i]->get_range(1));
-		arr.push_back(clips[i]->get_range(2));
-		arr.push_back(clips[i]->is_checked(3));
-	}
-
-	return arr;
-}
-
-
-void EditorImportAnimationOptions::setup_clips(const Array& p_clips) {
-
-	ERR_FAIL_COND(p_clips.size()%4!=0);
-	for(int i=0;i<clips.size();i++) {
-
-		memdelete(clips[i]);
-	}
-
-
-	clips.clear();
-
-	for(int i=0;i<p_clips.size();i+=4) {
-
-		TreeItem *clip = clips_tree->create_item(clips_base);
-		clip->set_text(0,p_clips[i]);
-		clip->add_button(0,EditorNode::get_singleton()->get_gui_base()->get_icon("Del","EditorIcons"));
-		clip->set_editable(0,true);
-		clip->set_cell_mode(1,TreeItem::CELL_MODE_RANGE);
-		clip->set_range_config(1,0,3600,0.01);
-		clip->set_range(1,p_clips[i+1]);
-		clip->set_editable(1,true);
-		clip->set_cell_mode(2,TreeItem::CELL_MODE_RANGE);
-		clip->set_range_config(2,0,3600,0.01);
-		clip->set_range(2,p_clips[i+2]);
-		clip->set_editable(2,true);
-		clip->set_cell_mode(3,TreeItem::CELL_MODE_CHECK);
-		clip->set_editable(3,true);
-		clip->set_checked(3,p_clips[i+3]);
-		clips.push_back(clip);
-
-	}
-
-	TreeItem *newclip = clips_tree->create_item(clips_base);
-	newclip->set_text(0,"<new clip>");
-	newclip->set_editable(0,true);
-	newclip->set_editable(1,false);
-	newclip->set_editable(2,false);
-	newclip->set_editable(3,false);
-	clips.push_back(newclip);
-
-}
-
-
-EditorImportAnimationOptions::EditorImportAnimationOptions() {
-
-
-	updating=false;
-	validating=false;
-
-	TabContainer *tab= memnew(TabContainer);
-	add_margin_child(TTR("Animation Options"),tab,true);
-
-	flags = memnew( Tree );
-	flags->set_hide_root(true);
-	tab->add_child(flags);
-	flags->set_name(TTR("Flags"));
-	TreeItem *root = flags->create_item();
-
-	const char ** fname=anim_flag_names;
-	const char ** fdescr=anim_flag_descript;
-
-	while( *fname ) {
-
-		TreeItem*ti = flags->create_item(root);
-		ti->set_cell_mode(0,TreeItem::CELL_MODE_CHECK);
-		ti->set_text(0,*fname);
-		ti->set_editable(0,true);
-		ti->set_tooltip(0,*fdescr);
-		items.push_back(ti);
-		fname++;
-		fdescr++;
-	}
-
-
-	TreeItem *fps_base = flags->create_item(root);
-	fps_base->set_text(0,TTR("Bake FPS:"));
-	fps_base->set_editable(0,false);
-	fps = flags->create_item(fps_base);
-	fps->set_cell_mode(0,TreeItem::CELL_MODE_RANGE);
-	fps->set_editable(0,true);
-	fps->set_range_config(0,1,120,1);
-	fps->set_range(0,15);
-
-	optimization_tree = memnew( Tree );
-	optimization_tree->set_columns(2);
-	tab->add_child(optimization_tree);
-	optimization_tree->set_name(TTR("Optimizer"));
-	optimization_tree->set_column_expand(0,true);
-	optimization_tree->set_column_expand(1,false);
-	optimization_tree->set_column_min_width(1,80);
-	optimization_tree->set_hide_root(true);
-
-
-	TreeItem *optimize_root = optimization_tree->create_item();
-
-	optimize_linear_error = optimization_tree->create_item(optimize_root);
-	optimize_linear_error->set_text(0,TTR("Max Linear Error"));
-	optimize_linear_error->set_cell_mode(1,TreeItem::CELL_MODE_RANGE);
-	optimize_linear_error->set_editable(1,true);
-	optimize_linear_error->set_range_config(1,0,1,0.001);
-	optimize_linear_error->set_range(1,0.05);
-
-	optimize_angular_error = optimization_tree->create_item(optimize_root);
-	optimize_angular_error->set_text(0,TTR("Max Angular Error"));
-	optimize_angular_error->set_cell_mode(1,TreeItem::CELL_MODE_RANGE);
-	optimize_angular_error->set_editable(1,true);
-	optimize_angular_error->set_range_config(1,0,1,0.001);
-	optimize_angular_error->set_range(1,0.01);
-
-	optimize_max_angle = optimization_tree->create_item(optimize_root);
-	optimize_max_angle->set_text(0,TTR("Max Angle"));
-	optimize_max_angle->set_cell_mode(1,TreeItem::CELL_MODE_RANGE);
-	optimize_max_angle->set_editable(1,true);
-	optimize_max_angle->set_range_config(1,0,360,0.001);
-	optimize_max_angle->set_range(1,int(180*0.125));
-
-	clips_tree = memnew( Tree );
-	clips_tree->set_hide_root(true);
-	tab->add_child(clips_tree);
-	clips_tree->set_name(TTR("Clips"));
-
-	clips_tree->set_columns(4);
-	clips_tree->set_column_expand(0,1);
-	clips_tree->set_column_expand(1,0);
-	clips_tree->set_column_expand(2,0);
-	clips_tree->set_column_expand(3,0);
-	clips_tree->set_column_min_width(1,60);
-	clips_tree->set_column_min_width(2,60);
-	clips_tree->set_column_min_width(3,40);
-	clips_tree->set_column_titles_visible(true);
-	clips_tree->set_column_title(0,TTR("Name"));
-	clips_tree->set_column_title(1,TTR("Start(s)"));
-	clips_tree->set_column_title(2,TTR("End(s)"));
-	clips_tree->set_column_title(3,TTR("Loop"));
-	clips_base =clips_tree->create_item(0);
-
-
-	setup_clips(Array());
-
-
-	filters = memnew( TextEdit );
-	tab->add_child(filters);
-	filters->set_name(TTR("Filters"));
-}
-
-
-
-void EditorImportAnimationOptions::set_fps(int p_fps) {
-
-	fps->set_range(0,p_fps);
-}
-
-int EditorImportAnimationOptions::get_fps() const {
-
-	return fps->get_range(0);
-}
-
-
-void EditorImportAnimationOptions::set_optimize_linear_error(float p_optimize_linear_error) {
-
-	optimize_linear_error->set_range(1,p_optimize_linear_error);
-}
-
-float EditorImportAnimationOptions::get_optimize_linear_error() const {
-
-	return optimize_linear_error->get_range(1);
-}
-
-void EditorImportAnimationOptions::set_optimize_angular_error(float p_optimize_angular_error) {
-
-	optimize_angular_error->set_range(1,p_optimize_angular_error);
-}
-
-float EditorImportAnimationOptions::get_optimize_angular_error() const {
-
-	return optimize_angular_error->get_range(1);
-}
-
-void EditorImportAnimationOptions::set_optimize_max_angle(float p_optimize_max_angle) {
-
-	optimize_max_angle->set_range(1,p_optimize_max_angle);
-}
-
-float EditorImportAnimationOptions::get_optimize_max_angle() const {
-
-	return optimize_max_angle->get_range(1);
-}
-
-
-void EditorImportAnimationOptions::set_filter(const String& p_filter) {
-
-	filters->set_text(p_filter);
-}
-
-String EditorImportAnimationOptions::get_filter() const {
-
-	return filters->get_text();
-}
-
-
-
-
-
-////////////////////////////////////////////////////////
-
-
-
-void EditorSceneImportDialog::_choose_file(const String& p_path) {
-#if 0
-	StringName sn = EditorImportDB::get_singleton()->find_source_path(p_path);
-	if (sn!=StringName()) {
-
-		EditorImportDB::ImportScene isc;
-		if (EditorImportDB::get_singleton()->get_scene(sn,isc)==OK) {
-
-			save_path->set_text(String(sn).get_base_dir());
-			texture_options->set_flags( isc.image_flags );
-			texture_options->set_quality( isc.image_quality );
-			texture_options->set_format( isc.image_format );
-			animation_options->set_flags( isc.anim_flags );
-			script_path->set_text( isc.import_script );
-			uint32_t f = isc.flags;
-			for(int i=0;i<scene_flags.size();i++) {
-
-				scene_flags[i]->set_checked(0,f&(1<<i));
-			}
-		}
-	} else {
-#endif
-		save_path->set_text("");
-		root_node_name->set_text("");
-		//save_path->set_text(p_path.get_file().basename()+".scn");
-#if 0
-	}
-#endif
-
-	if (p_path!=String()) {
-
-		String from_path = EditorFileSystem::get_singleton()->find_resource_from_source(EditorImportPlugin::validate_source_path(p_path));
-		print_line("from path.."+from_path);
-		if (from_path!=String()) {
-			popup_import(from_path);
-
-		}
-	}
-
-
-	import_path->set_text(p_path);
-	if (root_node_name->get_text().size()==0){
-		root_node_name->set_text(import_path->get_text().get_file().get_basename());
-	}
-
-}
-void EditorSceneImportDialog::_choose_save_file(const String& p_path) {
-
-	save_path->set_text(p_path);
-}
-
-void EditorSceneImportDialog::_choose_script(const String& p_path) {
-
-	String p = ProjectSettings::get_singleton()->localize_path(p_path);
-	if (!p.is_resource_file())
-		p=ProjectSettings::get_singleton()->get_resource_path().path_to(p_path.get_base_dir())+p_path.get_file();
-	script_path->set_text(p);
-
-}
-
-
-void EditorSceneImportDialog::_open_and_import() {
-
-	bool unsaved=EditorNode::has_unsaved_changes();
-
-	if (unsaved) {
-
-		confirm_open->popup_centered_minsize(Size2(300,80)*EDSCALE);
-	} else {
-		_import(true);
-	}
-}
-
-void EditorSceneImportDialog::_import(bool p_and_open) {
-
-	wip_open=p_and_open;
-//'	ImportMonitorBlock imb;
-
-
-	if (import_path->get_text().strip_edges()=="") {
-		error_dialog->set_text(TTR("Source path is empty."));
-		error_dialog->popup_centered_minsize();
-		return;
-	}
-
-	if (save_path->get_text().strip_edges()=="") {
-		error_dialog->set_text(TTR("Target path is empty."));
-		error_dialog->popup_centered_minsize();
-		return;
-	}
-
-	if (!save_path->get_text().begins_with("res://")) {
-		error_dialog->set_text(TTR("Target path must be a complete resource path."));
-		error_dialog->popup_centered_minsize();
-		return;
-	}
-
-	if (!DirAccess::exists(save_path->get_text())) {
-		error_dialog->set_text(TTR("Target path must exist."));
-		error_dialog->popup_centered_minsize();
-		return;
-	}
-
-	String dst_path;
-
-	if (texture_action->get_selected()==0)
-		dst_path=save_path->get_text();//.get_base_dir();
-	else
-		dst_path=ProjectSettings::get_singleton()->get("import/shared_textures");
-
-	uint32_t flags=0;
-
-	for(int i=0;i<scene_flags.size();i++) {
-
-		if (scene_flags[i]->is_checked(0)) {
-			int md = scene_flags[i]->get_metadata(0);
-			flags|=md;
-		}
-	}
-
-
-
-
-
-	if (script_path->get_text()!="") {
-		Ref<Script> scr = ResourceLoader::load(script_path->get_text());
-		if (!scr.is_valid()) {
-			error_dialog->set_text(TTR("Couldn't load post-import script."));
-			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
-			return;
-		}
-
-		Ref<EditorScenePostImport> pi = Ref<EditorScenePostImport>( memnew( EditorScenePostImport ) );
-		pi->set_script(scr.get_ref_ptr());
-		if (!pi->get_script_instance()) {
-
-			error_dialog->set_text(TTR("Invalid/broken script for post-import."));
-			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
-			return;
-		}
-
-	}
-
-
-	// Scenes should always be imported as binary format since vertex data is large and would take
-	// up a lot of space and time to load if imported as text format (GH-5778)
-	String save_file = save_path->get_text().plus_file(import_path->get_text().get_file().get_basename()+".scn");
-	print_line("Saving to: "+save_file);
-
-
-
-
-
-	Node *scene=NULL;
-
-
-	Ref<ResourceImportMetadata> rim = memnew( ResourceImportMetadata );
-
-	rim->add_source(EditorImportPlugin::validate_source_path(import_path->get_text()));
-	rim->set_option("flags",flags);
-	print_line("GET FLAGS: "+itos(texture_options->get_flags()));
-	rim->set_option("texture_flags",texture_options->get_flags());
-	rim->set_option("texture_format",texture_options->get_format());
-	rim->set_option("texture_quality",texture_options->get_quality());
-	rim->set_option("animation_flags",animation_options->get_flags());
-	rim->set_option("animation_bake_fps",animation_options->get_fps());
-	rim->set_option("animation_optimizer_linear_error",animation_options->get_optimize_linear_error());
-	rim->set_option("animation_optimizer_angular_error",animation_options->get_optimize_angular_error());
-	rim->set_option("animation_optimizer_max_angle",animation_options->get_optimize_max_angle());
-	rim->set_option("animation_filters",animation_options->get_filter());
-	rim->set_option("animation_clips",animation_options->get_clips());
-	rim->set_option("post_import_script",script_path->get_text());
-	rim->set_option("reimport",true);
-	if (!root_default->is_pressed()) {
-		rim->set_option("root_type",root_type->get_text());
-	}
-	if (root_node_name->get_text().size()==0) {
-		root_node_name->set_text(import_path->get_text().get_file().get_basename());
-	}
-	rim->set_option("root_name",root_node_name->get_text());
-
-	List<String> missing;
-	Error err = plugin->import1(rim,&scene,&missing);
-
-	if (err || !scene) {
-
-		error_dialog->set_text(TTR("Error importing scene."));
-		error_dialog->popup_centered(Size2(200,100)*EDSCALE);
-		return;
-	}
-
-	if (missing.size()) {
-
-		missing_files->clear();
-		for(List<String>::Element *E=missing.front();E;E=E->next()) {
-
-			missing_files->add_text(E->get());
-			missing_files->add_newline();
-		}
-		wip_import=scene;
-		wip_rimd=rim;
-		wip_save_file=save_file;
-		confirm_import->popup_centered_ratio();
-		return;
-
-	} else {
-
-		err = plugin->import2(scene,save_file,rim);
-
-		if (err) {
-
-			error_dialog->set_text(TTR("Error importing scene."));
-			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
-			return;
-		}
-		if (wip_open)
-			EditorNode::get_singleton()->load_scene(save_file,false,false,false);
-
-	}
-
-	hide();
-
-	/*
-	editor->clear_scene();
-
-	Error err = EditorImport::import_scene(import_path->get_text(),save_file,dst_path,flags,texture_options->get_format(),compression,texture_options->get_flags(),texture_options->get_quality(),animation_options->get_flags(), &scene,pi);
-
-	if (err) {
-
-		error_dialog->set_text("Error importing scene.");
-		error_dialog->popup_centered(Size2(200,100));
-		return;
-	}
-
-	editor->save_import_export();
-	if (scene)
-		editor->set_edited_scene(scene);
-
-	hide();
-	*/
-};
-
-
-void EditorSceneImportDialog::_import_confirm() {
-
-	wip_blocked=true;
-	print_line("import confirm!");
-	Error err = plugin->import2(wip_import,wip_save_file,wip_rimd);
-	wip_blocked=false;
-	wip_import=NULL;
-	wip_rimd=Ref<ResourceImportMetadata>();
-	confirm_import->hide();
-	if (err) {
-
-		wip_save_file="";
-		error_dialog->set_text(TTR("Error importing scene."));
-		error_dialog->popup_centered(Size2(200,100)*EDSCALE);
-		return;
-	}
-
-	if (wip_open)
-		EditorNode::get_singleton()->load_scene(wip_save_file,false,false,false);
-	wip_open=false;
-	wip_save_file="";
-
-	hide();
-
-}
-
-
-void EditorSceneImportDialog::_browse() {
-
-	file_select->popup_centered_ratio();
-}
-
-void EditorSceneImportDialog::_browse_target() {
-
-	save_select->popup_centered_ratio();
-	if (save_path->get_text()!="")
-		save_select->set_current_path(save_path->get_text());
-
-}
-
-void EditorSceneImportDialog::_browse_script() {
-
-	script_select->popup_centered_ratio();
-
-}
-
-void EditorSceneImportDialog::popup_import(const String &p_from) {
-
-	popup_centered(Size2(750,550)*EDSCALE);
-	if (p_from!="") {
-		Ref<ResourceImportMetadata> rimd = ResourceLoader::load_import_metadata(p_from);
-		if (rimd.is_null())
-			return;
-
-		int flags = rimd->get_option("flags");
-
-		for(int i=0;i<scene_flags.size();i++) {
-
-			int md = scene_flags[i]->get_metadata(0);
-			scene_flags[i]->set_checked(0,flags&md);
-		}
-
-		texture_options->set_flags(rimd->get_option("texture_flags"));
-		texture_options->set_format(EditorTextureImportPlugin::ImageFormat(int(rimd->get_option("texture_format"))));
-		texture_options->set_quality(rimd->get_option("texture_quality"));
-		animation_options->set_flags(rimd->get_option("animation_flags"));
-		if (rimd->has_option("animation_clips"))
-			animation_options->setup_clips(rimd->get_option("animation_clips"));
-		if (rimd->has_option("animation_filters"))
-			animation_options->set_filter(rimd->get_option("animation_filters"));
-		if (rimd->has_option("animation_bake_fps"))
-			animation_options->set_fps(rimd->get_option("animation_bake_fps"));
-		if (rimd->has_option("animation_optimizer_linear_error"))
-			animation_options->set_optimize_linear_error(rimd->get_option("animation_optimizer_linear_error"));
-		if (rimd->has_option("animation_optimizer_angular_error"))
-			animation_options->set_optimize_angular_error(rimd->get_option("animation_optimizer_angular_error"));
-		if (rimd->has_option("animation_optimizer_max_angle"))
-			animation_options->set_optimize_max_angle(rimd->get_option("animation_optimizer_max_angle"));
-
-		if (rimd->has_option("root_type")) {
-			root_default->set_pressed(false);
-			String type = rimd->get_option("root_type");
-			root_type->set_text(type);
-			root_type->set_disabled(false);
-
-			if (has_icon(type,"EditorIcons")) {
-				root_type->set_icon(get_icon(type,"EditorIcons"));
-			} else {
-				root_type->set_icon(get_icon("Object","EditorIcons"));
-			}
-
-		} else {
-			root_default->set_pressed(true);
-			root_type->set_disabled(true);
-		}
-		if (rimd->has_option("root_name")) {
-			root_node_name->set_text(rimd->get_option("root_name"));
-		} else {
-			root_node_name->set_text(root_type->get_text()); // backward compatibility for 2.1 or before
-		}
-		script_path->set_text(rimd->get_option("post_import_script"));
-
-		save_path->set_text(p_from.get_base_dir());
-		import_path->set_text(EditorImportPlugin::expand_source_path(rimd->get_source_path(0)));
-
-	}
-}
-
-
-void EditorSceneImportDialog::_notification(int p_what) {
-
-
-	if (p_what==NOTIFICATION_ENTER_TREE) {
-
-
-		List<String> extensions;
-		file_select->clear_filters();
-		root_type->set_icon(get_icon("Spatial","EditorIcons"));
-		root_type->set_text("Spatial");
-		root_type->set_disabled(true);
-
-		for(int i=0;i<plugin->get_importers().size();i++) {
-			plugin->get_importers()[i]->get_extensions(&extensions);
-		}
-
-
-		for(int i=0;i<extensions.size();i++) {
-
-			file_select->add_filter("*."+extensions[i]+" ; "+extensions[i].to_upper());
-		}
-
-		extensions.clear();
-
-		//EditorImport::get_import_extensions(&extensions)
-	/*	ResourceLoader::get_recognized_extensions_for_type("PackedScene",&extensions);
-		save_select->clear_filters();
-		for(int i=0;i<extensions.size();i++) {
-
-			save_select->add_filter("*."+extensions[i]+" ; "+extensions[i].to_upper());
-		}*/
-
-
-	}
-}
-
-Error EditorSceneImportDialog::import(const String& p_from, const String& p_to, const String& p_preset) {
-
-	import_path->set_text(p_from);
-	save_path->set_text(p_to);
-	script_path->set_text(p_preset);
-
-	_import();
-
-
-
-	return OK;
-}
-
-void EditorSceneImportDialog::_dialog_hid() {
-
-	if (wip_blocked)
-		return;
-	print_line("DIALOGHID!");
-	if (wip_import) {
-		memdelete(wip_import);
-		wip_import=NULL;
-		wip_save_file="";
-		wip_rimd=Ref<ResourceImportMetadata>();
-	}
-}
-void EditorSceneImportDialog::_root_default_pressed() {
-
-	root_type->set_disabled(root_default->is_pressed());
-}
-
-void EditorSceneImportDialog::_root_type_pressed() {
-
-
-	root_type_choose->popup(false);
-}
-
-
-void EditorSceneImportDialog::_set_root_type() {
-
-	String type = root_type_choose->get_selected_type();
-	if (type==String())
-		return;
-	root_type->set_text(type);
-	if (has_icon(type,"EditorIcons")) {
-		root_type->set_icon(get_icon(type,"EditorIcons"));
-	} else {
-		root_type->set_icon(get_icon("Object","EditorIcons"));
-	}
-}
-
-void EditorSceneImportDialog::_bind_methods() {
-
-
-	ClassDB::bind_method("_choose_file",&EditorSceneImportDialog::_choose_file);
-	ClassDB::bind_method("_choose_save_file",&EditorSceneImportDialog::_choose_save_file);
-	ClassDB::bind_method("_choose_script",&EditorSceneImportDialog::_choose_script);
-	ClassDB::bind_method("_import",&EditorSceneImportDialog::_import,DEFVAL(false));
-	ClassDB::bind_method("_browse",&EditorSceneImportDialog::_browse);
-	ClassDB::bind_method("_browse_target",&EditorSceneImportDialog::_browse_target);
-	ClassDB::bind_method("_browse_script",&EditorSceneImportDialog::_browse_script);
-	ClassDB::bind_method("_dialog_hid",&EditorSceneImportDialog::_dialog_hid);
-	ClassDB::bind_method("_import_confirm",&EditorSceneImportDialog::_import_confirm);
-	ClassDB::bind_method("_open_and_import",&EditorSceneImportDialog::_open_and_import);
-	ClassDB::bind_method("_root_default_pressed",&EditorSceneImportDialog::_root_default_pressed);
-	ClassDB::bind_method("_root_type_pressed",&EditorSceneImportDialog::_root_type_pressed);
-	ClassDB::bind_method("_set_root_type",&EditorSceneImportDialog::_set_root_type);
-
-
-	ADD_SIGNAL( MethodInfo("imported",PropertyInfo(Variant::OBJECT,"scene")) );
-}
-
-
-
-const EditorSceneImportDialog::FlagInfo EditorSceneImportDialog::scene_flag_names[]={
-
-	{EditorSceneImportPlugin::SCENE_FLAG_REMOVE_NOIMP,("Actions"),"Remove Nodes (-noimp)",true},
-	{EditorSceneImportPlugin::SCENE_FLAG_IMPORT_ANIMATIONS,("Actions"),"Import Animations",true},
-	{EditorSceneImportPlugin::SCENE_FLAG_COMPRESS_GEOMETRY,("Actions"),"Compress Geometry",false},
-	{EditorSceneImportPlugin::SCENE_FLAG_GENERATE_TANGENT_ARRAYS,("Actions"),"Force Generation of Tangent Arrays",false},
-	{EditorSceneImportPlugin::SCENE_FLAG_LINEARIZE_DIFFUSE_TEXTURES,("Actions"),"SRGB->Linear Of Diffuse Textures",false},
-	{EditorSceneImportPlugin::SCENE_FLAG_CONVERT_NORMALMAPS_TO_XY,("Actions"),"Convert Normal Maps to XY",true},
-	{EditorSceneImportPlugin::SCENE_FLAG_SET_LIGHTMAP_TO_UV2_IF_EXISTS,("Actions"),"Set Material Lightmap to UV2 if Tex2Array Exists",true},
-	{EditorSceneImportPlugin::SCENE_FLAG_MERGE_KEEP_MATERIALS,("Merge"),"Keep Materials after first import (delete them for re-import).",true},
-	{EditorSceneImportPlugin::SCENE_FLAG_MERGE_KEEP_EXTRA_ANIM_TRACKS,("Merge"),"Keep user-added Animation tracks.",true},
-	{EditorSceneImportPlugin::SCENE_FLAG_DETECT_ALPHA,("Materials"),"Set Alpha in Materials (-alpha)",true},
-	{EditorSceneImportPlugin::SCENE_FLAG_DETECT_VCOLOR,("Materials"),"Set Vert. Color in Materials (-vcol)",true},
-	{EditorSceneImportPlugin::SCENE_FLAG_CREATE_COLLISIONS,("Create"),"Create Collisions and/or Rigid Bodies (-col,-colonly,-rigid,-rigidonly)",true},
-	{EditorSceneImportPlugin::SCENE_FLAG_CREATE_PORTALS,("Create"),"Create Portals (-portal)",true},
-	{EditorSceneImportPlugin::SCENE_FLAG_CREATE_ROOMS,("Create"),"Create Rooms (-room)",true},
-	{EditorSceneImportPlugin::SCENE_FLAG_SIMPLIFY_ROOMS,("Create"),"Simplify Rooms",false},
-	{EditorSceneImportPlugin::SCENE_FLAG_CREATE_BILLBOARDS,("Create"),"Create Billboards (-bb)",true},
-	{EditorSceneImportPlugin::SCENE_FLAG_CREATE_IMPOSTORS,("Create"),"Create Impostors (-imp:dist)",true},
-	{EditorSceneImportPlugin::SCENE_FLAG_CREATE_LODS,("Create"),"Create LODs (-lod:dist)",true},
-	{EditorSceneImportPlugin::SCENE_FLAG_CREATE_CARS,("Create"),"Create Vehicles (-vehicle)",true},
-	{EditorSceneImportPlugin::SCENE_FLAG_CREATE_WHEELS,("Create"),"Create Vehicle Wheels (-wheel)",true},
-	{EditorSceneImportPlugin::SCENE_FLAG_CREATE_NAVMESH,("Create"),"Create Navigation Meshes (-navmesh)",true},
-	{EditorSceneImportPlugin::SCENE_FLAG_DETECT_LIGHTMAP_LAYER,("Create"),"Detect LightMap Layer (-lm:<int>).",true},
-	{-1,NULL,NULL,false}
-};
-
-
-EditorSceneImportDialog::EditorSceneImportDialog(EditorNode *p_editor, EditorSceneImportPlugin *p_plugin) {
-
-
-	editor=p_editor;
-	plugin=p_plugin;
-
-	set_title(TTR("Import 3D Scene"));
-	HBoxContainer *import_hb = memnew( HBoxContainer );
-	add_child(import_hb);
-	//set_child_rect(import_hb);
-
-	VBoxContainer *vbc = memnew( VBoxContainer );
-	import_hb->add_child(vbc);
-	vbc->set_h_size_flags(SIZE_EXPAND_FILL);
-
-	HBoxContainer *hbc = memnew( HBoxContainer );
-	vbc->add_margin_child(TTR("Source Scene:"),hbc);
-
-	import_path = memnew( LineEdit );
-	import_path->set_h_size_flags(SIZE_EXPAND_FILL);
-	hbc->add_child(import_path);
-
-	Button * import_choose = memnew( Button );
-	import_choose->set_text(" .. ");
-	hbc->add_child(import_choose);
-
-	import_choose->connect("pressed", this,"_browse");
-
-	hbc = memnew( HBoxContainer );
-	vbc->add_margin_child(TTR("Target Path:"),hbc);
-
-	save_path = memnew( LineEdit );
-	save_path->set_h_size_flags(SIZE_EXPAND_FILL);
-	hbc->add_child(save_path);
-
-	Button * save_choose = memnew( Button );
-	save_choose->set_text(" .. ");
-	hbc->add_child(save_choose);
-
-	save_choose->connect("pressed", this,"_browse_target");
-
-	texture_action = memnew( OptionButton );
-	texture_action->add_item(TTR("Same as Target Scene"));
-	texture_action->add_item(TTR("Shared"));
-	texture_action->select(0);
-	vbc->add_margin_child(TTR("Target Texture Folder:"),texture_action);
-
-	import_options = memnew( Tree );
-	vbc->set_v_size_flags(SIZE_EXPAND_FILL);
-	vbc->add_margin_child(TTR("Options:"),import_options,true);
-
-	file_select = memnew(EditorFileDialog);
-	file_select->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
-	add_child(file_select);
-
-
-	file_select->set_mode(EditorFileDialog::MODE_OPEN_FILE);
-
-	file_select->connect("file_selected", this,"_choose_file");
-
-	save_select = memnew(EditorDirDialog);
-	add_child(save_select);
-
-	//save_select->set_mode(EditorFileDialog::MODE_SAVE_FILE);
-	save_select->connect("dir_selected", this,"_choose_save_file");
-
-	get_ok()->connect("pressed", this,"_import");
-	get_ok()->set_text(TTR("Import"));
-
-	TreeItem *root = import_options->create_item(NULL);
-	import_options->set_hide_root(true);
-
-	const FlagInfo* fn=scene_flag_names;
-
-	Map<String,TreeItem*> categories;
-
-	while(fn->text) {
-
-		String cat = fn->category;
-		TreeItem *parent;
-		if (!categories.has(cat)) {
-			parent = import_options->create_item(root);
-			parent->set_text(0,cat);
-			categories[cat]=parent;
-		} else {
-			parent=categories[cat];
-		}
-
-		TreeItem *opt = import_options->create_item(parent);
-		opt->set_cell_mode(0,TreeItem::CELL_MODE_CHECK);
-		opt->set_checked(0,fn->defval);
-		opt->set_editable(0,true);
-		opt->set_text(0,fn->text);
-		opt->set_metadata(0,fn->value);
-
-		scene_flags.push_back(opt);
-		fn++;
-	}
-
-	hbc = memnew( HBoxContainer );
-	vbc->add_margin_child(TTR("Post-Process Script:"),hbc);
-
-	script_path = memnew( LineEdit );
-	script_path->set_h_size_flags(SIZE_EXPAND_FILL);
-	hbc->add_child(script_path);
-
-	Button * script_choose = memnew( Button );
-	script_choose->set_text(" .. ");
-	hbc->add_child(script_choose);
-
-	script_choose->connect("pressed", this,"_browse_script");
-
-	script_select = memnew(EditorFileDialog);
-	add_child(script_select);
-	for(int i=0;i<ScriptServer::get_language_count();i++) {
-
-		ScriptLanguage *sl=ScriptServer::get_language(i);
-		String ext = sl->get_extension();
-		if (ext=="")
-			continue;
-		script_select->add_filter("*."+ext+" ; "+sl->get_name());
-	}
-
-
-	script_select->set_mode(EditorFileDialog::MODE_OPEN_FILE);
-
-	script_select->connect("file_selected", this,"_choose_script");
-
-	error_dialog = memnew ( ConfirmationDialog );
-	add_child(error_dialog);
-	error_dialog->get_ok()->set_text(TTR("Accept"));
-	//error_dialog->get_cancel()->hide();
-
-
-	HBoxContainer *custom_root_hb = memnew( HBoxContainer );
-	vbc->add_margin_child(TTR("Custom Root Node Type:"),custom_root_hb);
-	root_type = memnew(Button);
-	root_type->set_h_size_flags(SIZE_EXPAND_FILL);
-	root_type->set_text_align(Button::ALIGN_LEFT);
-	root_type->connect("pressed",this,"_root_type_pressed");
-	custom_root_hb->add_child(root_type);
-
-	root_default = memnew(CheckBox);
-	root_default->set_text(TTR("Auto"));
-	root_default->set_pressed(true);
-	root_default->connect("pressed",this,"_root_default_pressed");
-	custom_root_hb->add_child(root_default);
-
-	root_node_name = memnew( LineEdit );
-	root_node_name->set_h_size_flags(SIZE_EXPAND_FILL);
-	vbc->add_margin_child(TTR("Root Node Name:"),root_node_name);
-	/*
-	this_import = memnew( OptionButton );
-	this_import->add_item("Overwrite Existing Scene");
-	this_import->add_item("Overwrite Existing, Keep Materials");
-	this_import->add_item("Keep Existing, Merge with New");
-	this_import->add_item("Keep Existing, Ignore New");
-	vbc->add_margin_child("This Time:",this_import);
-
-	next_import = memnew( OptionButton );
-	next_import->add_item("Overwrite Existing Scene");
-	next_import->add_item("Overwrite Existing, Keep Materials");
-	next_import->add_item("Keep Existing, Merge with New");
-	next_import->add_item("Keep Existing, Ignore New");
-	vbc->add_margin_child("Next Time:",next_import);
-*/
-	set_hide_on_ok(false);
-
-	GLOBAL_DEF("import/shared_textures","res://");
-	ProjectSettings::get_singleton()->set_custom_property_info("import/shared_textures",PropertyInfo(Variant::STRING,"import/shared_textures",PROPERTY_HINT_DIR));
-
-	import_hb->add_constant_override("separation",30);
-
-
-	VBoxContainer *ovb = memnew( VBoxContainer);
-	ovb->set_h_size_flags(SIZE_EXPAND_FILL);
-	import_hb->add_child(ovb);
-
-	texture_options = memnew( EditorImportTextureOptions );
-	ovb->add_child(texture_options);
-	texture_options->set_v_size_flags(SIZE_EXPAND_FILL);
-	//animation_options->set_flags(EditorImport::
-	texture_options->set_format(EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_RAM);
-	texture_options->set_flags( EditorTextureImportPlugin::IMAGE_FLAG_FIX_BORDER_ALPHA | EditorTextureImportPlugin::IMAGE_FLAG_REPEAT  | EditorTextureImportPlugin::IMAGE_FLAG_FILTER );
-
-
-	animation_options = memnew( EditorImportAnimationOptions );
-	ovb->add_child(animation_options);
-	animation_options->set_v_size_flags(SIZE_EXPAND_FILL);
-	animation_options->set_flags(EditorSceneAnimationImportPlugin::ANIMATION_DETECT_LOOP|EditorSceneAnimationImportPlugin::ANIMATION_KEEP_VALUE_TRACKS|EditorSceneAnimationImportPlugin::ANIMATION_OPTIMIZE|EditorSceneAnimationImportPlugin::ANIMATION_FORCE_ALL_TRACKS_IN_ALL_CLIPS);
-
-
-	confirm_import = memnew( ConfirmationDialog );
-	add_child(confirm_import);
-	VBoxContainer *cvb = memnew( VBoxContainer );
-	confirm_import->add_child(cvb);
-	//confirm_import->set_child_rect(cvb);
-
-	PanelContainer *pc = memnew( PanelContainer );
-	pc->add_style_override("panel", EditorNode::get_singleton()->get_gui_base()->get_stylebox("normal","TextEdit"));
-	//ec->add_child(pc);
-	missing_files = memnew( RichTextLabel );
-	cvb->add_margin_child(TTR("The Following Files are Missing:"),pc,true);
-	pc->add_child(missing_files);
-	confirm_import->get_ok()->set_text(TTR("Import Anyway"));
-	confirm_import->get_cancel()->set_text(TTR("Cancel"));
-	confirm_import->connect("popup_hide",this,"_dialog_hid");
-	confirm_import->connect("confirmed",this,"_import_confirm");
-	confirm_import->set_hide_on_ok(false);
-
-	add_button(TTR("Import & Open"),!OS::get_singleton()->get_swap_ok_cancel())->connect("pressed",this,"_open_and_import");
-
-	confirm_open = memnew( ConfirmationDialog );
-	add_child(confirm_open);
-	confirm_open->set_text(TTR("Edited scene has not been saved, open imported scene anyway?"));
-	confirm_open->connect("confirmed",this,"_import",varray(true));
-
-
-	wip_import=NULL;
-	wip_blocked=false;
-	wip_open=false;
-	//texture_options->set_format(EditorImport::IMAGE_FORMAT_C);
-
-	root_type_choose = memnew( CreateDialog );
-	add_child(root_type_choose);
-	root_type_choose->set_base_type("Node");
-	root_type_choose->connect("create",this,"_set_root_type");
-}
-
-
-
-////////////////////////////////
-
-
-
-String EditorSceneImportPlugin::get_name() const {
-
-	return "scene_3d";
-}
-
-String EditorSceneImportPlugin::get_visible_name() const{
-
-	return TTR("Scene");
-}
-
-void EditorSceneImportPlugin::import_dialog(const String& p_from){
-
-	dialog->popup_import(p_from);
-}
-
-
-//////////////////////////
-
-
-static bool _teststr(const String& p_what,const String& p_str) {
-
-	if (p_what.findn("$"+p_str)!=-1) //blender and other stuff
-		return true;
-	if (p_what.to_lower().ends_with("-"+p_str)) //collada only supports "_" and "-" besides letters
-		return true;
-	if (p_what.to_lower().ends_with("_"+p_str)) //collada only supports "_" and "-" besides letters
-		return true;
-	return false;
-}
-
-static String _fixstr(const String& p_what,const String& p_str) {
-
-	if (p_what.findn("$"+p_str)!=-1) //blender and other stuff
-		return p_what.replace("$"+p_str,"");
-	if (p_what.to_lower().ends_with("-"+p_str)) //collada only supports "_" and "-" besides letters
-		return p_what.substr(0,p_what.length()-(p_str.length()+1));
-	if (p_what.to_lower().ends_with("_"+p_str)) //collada only supports "_" and "-" besides letters
-		return p_what.substr(0,p_what.length()-(p_str.length()+1));
-	return p_what;
-}
-
-
-
-void EditorSceneImportPlugin::_find_resources(const Variant& p_var, Map<Ref<ImageTexture>, TextureRole> &image_map,int p_flags) {
-
-
-	switch(p_var.get_type()) {
-
-		case Variant::OBJECT: {
-
-			Ref<Resource> res = p_var;
-			if (res.is_valid()) {
-
-				if (res->is_class("Texture") && !image_map.has(res)) {
-
-					image_map.insert(res,TEXTURE_ROLE_DEFAULT);
-
-
-				} else {
-
-
-					List<PropertyInfo> pl;
-					res->get_property_list(&pl);
-					for(List<PropertyInfo>::Element *E=pl.front();E;E=E->next()) {
-
-						if (E->get().type==Variant::OBJECT || E->get().type==Variant::ARRAY || E->get().type==Variant::DICTIONARY) {
-							if (E->get().type==Variant::OBJECT && Object::cast_to<SpatialMaterial>(*res) && (E->get().name=="textures/diffuse" || E->get().name=="textures/detail" || E->get().name=="textures/emission")) {
-
-								Ref<ImageTexture> tex =res->get(E->get().name);
-								if (tex.is_valid()) {
-
-									image_map.insert(tex,TEXTURE_ROLE_DIFFUSE);
-								}
-
-							} else if (E->get().type==Variant::OBJECT && Object::cast_to<SpatialMaterial>(*res) && (E->get().name=="textures/normal")) {
-
-								Ref<ImageTexture> tex =res->get(E->get().name);
-								if (tex.is_valid()) {
-
-									image_map.insert(tex,TEXTURE_ROLE_NORMALMAP);
-									/*
-									if (p_flags&SCENE_FLAG_CONVERT_NORMALMAPS_TO_XY)
-										Object::cast_to<SpatialMaterial>(*res)->set_fixed_flag(SpatialMaterial::FLAG_USE_XY_NORMALMAP,true);
-									*/
-								}
-
-
-							} else {
-								_find_resources(res->get(E->get().name),image_map,p_flags);
-							}
-						}
-					}
-
-				}
-			}
-
-		} break;
-		case Variant::DICTIONARY: {
-
-			Dictionary d= p_var;
-
-			List<Variant> keys;
-			d.get_key_list(&keys);
-
-			for(List<Variant>::Element *E=keys.front();E;E=E->next()) {
-
-
-				_find_resources(E->get(),image_map,p_flags);
-				_find_resources(d[E->get()],image_map,p_flags);
-
-			}
-
-
-		} break;
-		case Variant::ARRAY: {
-
-			Array a = p_var;
-			for(int i=0;i<a.size();i++) {
-
-				_find_resources(a[i],image_map,p_flags);
-			}
-
-		} break;
-		default: {}
-
-	}
-
-}
-
-
-Node* EditorSceneImportPlugin::_fix_node(Node *p_node,Node *p_root,Map<Ref<Mesh>,Ref<Shape> > &collision_map,uint32_t p_flags,Map<Ref<ImageTexture>,TextureRole >& image_map) {
-
-	// children first..
-	for(int i=0;i<p_node->get_child_count();i++) {
-
-
-		Node *r = _fix_node(p_node->get_child(i),p_root,collision_map,p_flags,image_map);
-		if (!r) {
-			print_line("was erased..");
-			i--; //was erased
-		}
-	}
-
-	String name = p_node->get_name();
-
-	bool isroot = p_node==p_root;
-
-
-	if (!isroot && p_flags&SCENE_FLAG_REMOVE_NOIMP && _teststr(name,"noimp")) {
-
-		memdelete(p_node);
-		return NULL;
-	}
-
-	{
-
-		List<PropertyInfo> pl;
-		p_node->get_property_list(&pl);
-		for(List<PropertyInfo>::Element *E=pl.front();E;E=E->next()) {
-
-			if (E->get().type==Variant::OBJECT || E->get().type==Variant::ARRAY || E->get().type==Variant::DICTIONARY) {
-				_find_resources(p_node->get(E->get().name),image_map,p_flags);
-			}
-		}
-
-	}
-
-
-
-
-	if (p_flags&SCENE_FLAG_CREATE_BILLBOARDS && Object::cast_to<MeshInstance>(p_node)) {
-
-		MeshInstance *mi = Object::cast_to<MeshInstance>(p_node);
-
-		bool bb=false;
-
-		if ((_teststr(name,"bb"))) {
-			bb=true;
-		} else if (mi->get_mesh().is_valid() && (_teststr(mi->get_mesh()->get_name(),"bb"))) {
-			bb=true;
-
-		}
-
-		if (bb) {
-			mi->set_flag(GeometryInstance::FLAG_BILLBOARD,true);
-			if (mi->get_mesh().is_valid()) {
-
-				Ref<Mesh> m = mi->get_mesh();
-				for(int i=0;i<m->get_surface_count();i++) {
-
-					Ref<SpatialMaterial> fm = m->surface_get_material(i);
-					if (fm.is_valid()) {
-						//fm->set_flag(Material::FLAG_UNSHADED,true);
-						//fm->set_flag(Material::FLAG_DOUBLE_SIDED,true);
-						//fm->set_depth_draw_mode(Material::DEPTH_DRAW_NEVER);
-						//fm->set_fixed_flag(SpatialMaterial::FLAG_USE_ALPHA,true);
-					}
-				}
-			}
-		}
-	}
-
-
-	if (p_flags&(SCENE_FLAG_DETECT_ALPHA|SCENE_FLAG_DETECT_VCOLOR|SCENE_FLAG_SET_LIGHTMAP_TO_UV2_IF_EXISTS) && Object::cast_to<MeshInstance>(p_node)) {
-
-		MeshInstance *mi = Object::cast_to<MeshInstance>(p_node);
-
-		Ref<Mesh> m = mi->get_mesh();
-
-		if (m.is_valid()) {
-
-			for(int i=0;i<m->get_surface_count();i++) {
-
-				Ref<SpatialMaterial> mat = m->surface_get_material(i);
-				if (!mat.is_valid())
-					continue;
-
-				if (p_flags&SCENE_FLAG_DETECT_ALPHA && _teststr(mat->get_name(),"alpha")) {
-
-					//mat->set_fixed_flag(SpatialMaterial::FLAG_USE_ALPHA,true);
-					//mat->set_name(_fixstr(mat->get_name(),"alpha"));
-				}
-				if (p_flags&SCENE_FLAG_DETECT_VCOLOR && _teststr(mat->get_name(),"vcol")) {
-
-					//mat->set_fixed_flag(SpatialMaterial::FLAG_USE_COLOR_ARRAY,true);
-					//mat->set_name(_fixstr(mat->get_name(),"vcol"));
-				}
-
-				if (p_flags&SCENE_FLAG_SET_LIGHTMAP_TO_UV2_IF_EXISTS && m->surface_get_format(i)&Mesh::ARRAY_FORMAT_TEX_UV2) {
-					//mat->set_flag(Material::FLAG_LIGHTMAP_ON_UV2,true);
-				}
-
-			}
-		}
-	}
-
-	if (p_flags&SCENE_FLAG_REMOVE_NOIMP && Object::cast_to<AnimationPlayer>(p_node)) {
-		//remove animations referencing non-importable nodes
-		AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(p_node);
-
-		List<StringName> anims;
-		ap->get_animation_list(&anims);
-		for(List<StringName>::Element *E=anims.front();E;E=E->next()) {
-
-			Ref<Animation> anim=ap->get_animation(E->get());
-			ERR_CONTINUE(anim.is_null());
-			for(int i=0;i<anim->get_track_count();i++) {
-				NodePath path = anim->track_get_path(i);
-
-				for(int j=0;j<path.get_name_count();j++) {
-					String node = path.get_name(j);
-					if (_teststr(node,"noimp")) {
-						anim->remove_track(i);
-						i--;
-						break;
-					}
-				}
-			}
-
-		}
-	}
-
-
-	if (p_flags&SCENE_FLAG_CREATE_IMPOSTORS && Object::cast_to<MeshInstance>(p_node)) {
-
-		MeshInstance *mi = Object::cast_to<MeshInstance>(p_node);
-
-		String str;
-
-		if ((_teststr(name,"imp"))) {
-			str=name;
-		} else if (mi->get_mesh().is_valid() && (_teststr(mi->get_mesh()->get_name(),"imp"))) {
-			str=mi->get_mesh()->get_name();
-
-		}
-
-
-		if (Object::cast_to<MeshInstance>(p_node->get_parent())) {
-			MeshInstance *mi = Object::cast_to<MeshInstance>(p_node);
-			MeshInstance *mip = Object::cast_to<MeshInstance>(p_node->get_parent());
-			String d=str.substr(str.find("imp")+3,str.length());
-			if (d!="") {
-				if ((d[0]<'0' || d[0]>'9'))
-					d=d.substr(1,d.length());
-				if (d.length() && d[0]>='0' && d[0]<='9') {
-					float dist = d.to_double();
-					mi->set_flag(GeometryInstance::FLAG_BILLBOARD,true);
-					mi->set_flag(GeometryInstance::FLAG_BILLBOARD_FIX_Y,true);
-					//mi->set_draw_range_begin(dist);
-					//mi->set_draw_range_end(100000);
-
-					//mip->set_draw_range_begin(0);
-					//mip->set_draw_range_end(dist);
-
-					if (mi->get_mesh().is_valid()) {
-
-						Ref<Mesh> m = mi->get_mesh();
-						for(int i=0;i<m->get_surface_count();i++) {
-
-							Ref<SpatialMaterial> fm = m->surface_get_material(i);
-							if (fm.is_valid()) {
-								//fm->set_flag(Material::FLAG_UNSHADED,true);
-								//fm->set_flag(Material::FLAG_DOUBLE_SIDED,true);
-								//fm->set_depth_draw_mode(Material::DEPTH_DRAW_NEVER);
-								//fm->set_fixed_flag(SpatialMaterial::FLAG_USE_ALPHA,true);
-							}
-						}
-					}
-				}
-			}
-		}
-	}
-
-    if (p_flags&SCENE_FLAG_CREATE_LODS && Object::cast_to<MeshInstance>(p_node)) {
-
-	MeshInstance *mi = Object::cast_to<MeshInstance>(p_node);
-
-	String str;
-
-	if ((_teststr(name,"lod"))) {
-	    str=name;
-	} else if (mi->get_mesh().is_valid() && (_teststr(mi->get_mesh()->get_name(),"lod"))) {
-	    str=mi->get_mesh()->get_name();
-
-	}
-
-
-	if (Object::cast_to<MeshInstance>(p_node->get_parent())) {
-	    MeshInstance *mi = Object::cast_to<MeshInstance>(p_node);
-	    MeshInstance *mip = Object::cast_to<MeshInstance>(p_node->get_parent());
-	    String d=str.substr(str.find("lod")+3,str.length());
-	    if (d!="") {
-		if ((d[0]<'0' || d[0]>'9'))
-		    d=d.substr(1,d.length());
-		if (d.length() && d[0]>='0' && d[0]<='9') {
-		    float dist = d.to_double();
-		  ///  mi->set_draw_range_begin(dist);
-		  //  mi->set_draw_range_end(100000);
-
-		  //  mip->set_draw_range_begin(0);
-		  //  mip->set_draw_range_end(dist);
-
-		    /*if (mi->get_mesh().is_valid()) {
-
-			Ref<Mesh> m = mi->get_mesh();
-			for(int i=0;i<m->get_surface_count();i++) {
-
-			    Ref<SpatialMaterial> fm = m->surface_get_material(i);
-			    if (fm.is_valid()) {
-				fm->set_flag(Material::FLAG_UNSHADED,true);
-				fm->set_flag(Material::FLAG_DOUBLE_SIDED,true);
-				fm->set_hint(Material::HINT_NO_DEPTH_DRAW,true);
-				fm->set_fixed_flag(SpatialMaterial::FLAG_USE_ALPHA,true);
-			    }
-			}
-		    }*/
-		}
-	    }
-	}
-    }
-
-
-	if (p_flags&SCENE_FLAG_DETECT_LIGHTMAP_LAYER && _teststr(name,"lm") && Object::cast_to<MeshInstance>(p_node)) {
-
-		MeshInstance *mi = Object::cast_to<MeshInstance>(p_node);
-
-		String str=name;
-		int layer = str.substr(str.find("lm")+3,str.length()).to_int();
-		//mi->set_baked_light_texture_id(layer);
-	}
-
-	bool is_rigid = _teststr(name, "rigidonly");
-
-	if (p_flags & SCENE_FLAG_CREATE_COLLISIONS && (_teststr(name, "colonly") || is_rigid)) {
-
-		if (isroot)
-			return p_node;
-
-		if (Object::cast_to<MeshInstance>(p_node) && !is_rigid) {
-			MeshInstance *mi = Object::cast_to<MeshInstance>(p_node);
-			Node * col = mi->create_trimesh_collision_node();
-			ERR_FAIL_COND_V(!col,NULL);
-
-			col->set_name(_fixstr(name,"colonly"));
-			Object::cast_to<Spatial>(col)->set_transform(mi->get_transform());
-			p_node->replace_by(col);
-			memdelete(p_node);
-			p_node=col;
-
-			StaticBody *sb = Object::cast_to<StaticBody>(col);
-			CollisionShape *colshape = memnew( CollisionShape);
-			colshape->set_shape(sb->get_shape(0));
-			colshape->set_name("shape");
-			sb->add_child(colshape);
-			colshape->set_owner(p_node->get_owner());
-		} else if (p_node->has_meta("empty_draw_type")) {
-			String empty_draw_type = String(p_node->get_meta("empty_draw_type"));
-			print_line(empty_draw_type);
-			PhysicsBody *pb;
-			if (is_rigid) {
-				pb = memnew(RigidBody);
-				pb->set_name(_fixstr(name, "rigidonly"));
-			} else {
-				pb = memnew(StaticBody);
-				pb->set_name(_fixstr(name, "colonly"));
-			}
-			Object::cast_to<Spatial>(pb)->set_transform(Object::cast_to<Spatial>(p_node)->get_transform());
-			p_node->replace_by(pb);
-			memdelete(p_node);
-			CollisionShape *colshape = memnew( CollisionShape);
-			if (empty_draw_type == "CUBE") {
-				BoxShape *boxShape = memnew( BoxShape);
-				boxShape->set_extents(Vector3(1, 1, 1));
-				colshape->set_shape(boxShape);
-				colshape->set_name("BoxShape");
-			} else if (empty_draw_type == "SINGLE_ARROW") {
-				RayShape *rayShape = memnew( RayShape);
-				rayShape->set_length(1);
-				colshape->set_shape(rayShape);
-				colshape->set_name("RayShape");
-				Object::cast_to<Spatial>(pb)->rotate_x(Math_PI / 2);
-			} else if (empty_draw_type == "IMAGE") {
-				PlaneShape *planeShape = memnew( PlaneShape);
-				colshape->set_shape(planeShape);
-				colshape->set_name("PlaneShape");
-			} else {
-				SphereShape *sphereShape = memnew( SphereShape);
-				sphereShape->set_radius(1);
-				colshape->set_shape(sphereShape);
-				colshape->set_name("SphereShape");
-			}
-			pb->add_child(colshape);
-			colshape->set_owner(pb->get_owner());
-		}
-
-	} else if (p_flags&SCENE_FLAG_CREATE_COLLISIONS && _teststr(name,"rigid") && Object::cast_to<MeshInstance>(p_node)) {
-
-		if (isroot)
-			return p_node;
-
-		// get mesh instance and bounding box
-		MeshInstance *mi = Object::cast_to<MeshInstance>(p_node);
-		Rect3 aabb = mi->get_aabb();
-
-		// create a new rigid body collision node
-		RigidBody * rigid_body = memnew( RigidBody );
-		Node * col = rigid_body;
-		ERR_FAIL_COND_V(!col,NULL);
-
-		// remove node name postfix
-		col->set_name(_fixstr(name,"rigid"));
-		// get mesh instance xform matrix to the rigid body collision node
-		Object::cast_to<Spatial>(col)->set_transform(mi->get_transform());
-		// save original node by duplicating it into a new instance and correcting the name
-		Node * mesh = p_node->duplicate();
-		mesh->set_name(_fixstr(name,"rigid"));
-		// reset the xform matrix of the duplicated node so it can inherit parent node xform
-		Object::cast_to<Spatial>(mesh)->set_transform(Transform(Basis()));
-		// reparent the new mesh node to the rigid body collision node
-		p_node->add_child(mesh);
-		mesh->set_owner(p_node->get_owner());
-		// replace the original node with the rigid body collision node
-		p_node->replace_by(col);
-		memdelete(p_node);
-		p_node=col;
-
-		// create an alias for the rigid body collision node
-		RigidBody *rb = Object::cast_to<RigidBody>(col);
-		// create a new Box collision shape and set the right extents
-		Ref<BoxShape> shape = memnew( BoxShape );
-		shape->set_extents(aabb.get_size() * 0.5);
-		CollisionShape *colshape = memnew( CollisionShape);
-		colshape->set_name("shape");
-		colshape->set_shape(shape);
-		// reparent the new collision shape to the rigid body collision node
-		rb->add_child(colshape);
-		colshape->set_owner(p_node->get_owner());
-
-	} else if (p_flags&SCENE_FLAG_CREATE_COLLISIONS &&_teststr(name,"col") && Object::cast_to<MeshInstance>(p_node)) {
-
-
-		MeshInstance *mi = Object::cast_to<MeshInstance>(p_node);
-
-		mi->set_name(_fixstr(name,"col"));
-		Node *col= mi->create_trimesh_collision_node();
-		ERR_FAIL_COND_V(!col,NULL);
-
-		col->set_name("col");
-		p_node->add_child(col);
-
-		StaticBody *sb=Object::cast_to<StaticBody>(col);
-		CollisionShape *colshape = memnew( CollisionShape);
-		colshape->set_shape(sb->get_shape(0));
-		colshape->set_name("shape");
-		col->add_child(colshape);
-		colshape->set_owner(p_node->get_owner());
-		sb->set_owner(p_node->get_owner());
-
-	} else if (p_flags&SCENE_FLAG_CREATE_NAVMESH &&_teststr(name,"navmesh") && Object::cast_to<MeshInstance>(p_node)) {
-
-		if (isroot)
-			return p_node;
-
-		MeshInstance *mi = Object::cast_to<MeshInstance>(p_node);
-
-		Ref<Mesh> mesh=mi->get_mesh();
-		ERR_FAIL_COND_V(mesh.is_null(),NULL);
-		NavigationMeshInstance *nmi = memnew(  NavigationMeshInstance );
-
-
-		nmi->set_name(_fixstr(name,"navmesh"));
-		Ref<NavigationMesh> nmesh = memnew( NavigationMesh);
-		nmesh->create_from_mesh(mesh);
-		nmi->set_navigation_mesh(nmesh);
-		Object::cast_to<Spatial>(nmi)->set_transform(mi->get_transform());
-		p_node->replace_by(nmi);
-		memdelete(p_node);
-		p_node=nmi;
-	} else if (p_flags&SCENE_FLAG_CREATE_CARS &&_teststr(name,"vehicle")) {
-
-		if (isroot)
-			return p_node;
-
-		Node *owner = p_node->get_owner();
-		Spatial *s = Object::cast_to<Spatial>(p_node);
-		VehicleBody *bv = memnew( VehicleBody );
-		String n = _fixstr(p_node->get_name(),"vehicle");
-		bv->set_name(n);
-		p_node->replace_by(bv);
-		p_node->set_name(n);
-		bv->add_child(p_node);
-		bv->set_owner(owner);
-		p_node->set_owner(owner);
-		bv->set_transform(s->get_transform());
-		s->set_transform(Transform());
-
-		p_node=bv;
-
-
-	} else if (p_flags&SCENE_FLAG_CREATE_CARS &&_teststr(name,"wheel")) {
-
-		if (isroot)
-			return p_node;
-
-		Node *owner = p_node->get_owner();
-		Spatial *s = Object::cast_to<Spatial>(p_node);
-		VehicleWheel *bv = memnew( VehicleWheel );
-		String n = _fixstr(p_node->get_name(),"wheel");
-		bv->set_name(n);
-		p_node->replace_by(bv);
-		p_node->set_name(n);
-		bv->add_child(p_node);
-		bv->set_owner(owner);
-		p_node->set_owner(owner);
-		bv->set_transform(s->get_transform());
-		s->set_transform(Transform());
-
-		p_node=bv;
-
-	} else if (p_flags&SCENE_FLAG_CREATE_ROOMS && _teststr(name,"room") && Object::cast_to<MeshInstance>(p_node)) {
-
-
-		if (isroot)
-			return p_node;
-
-		MeshInstance *mi = Object::cast_to<MeshInstance>(p_node);
-		PoolVector<Face3> faces = mi->get_faces(VisualInstance::FACES_SOLID);
-
-
-		BSP_Tree bsptree(faces);
-
-		Ref<RoomBounds> area = memnew( RoomBounds );
-		//area->set_bounds(faces);
-		//area->set_geometry_hint(faces);
-
-
-		Room * room = memnew( Room );
-		room->set_name(_fixstr(name,"room"));
-		room->set_transform(mi->get_transform());
-		room->set_room(area);
-
-		p_node->replace_by(room);
-		memdelete(p_node);
-		p_node=room;
-
-	} else if (p_flags&SCENE_FLAG_CREATE_ROOMS &&_teststr(name,"room")) {
-
-		if (isroot)
-			return p_node;
-
-		Spatial *dummy = Object::cast_to<Spatial>(p_node);
-		ERR_FAIL_COND_V(!dummy,NULL);
-
-		Room * room = memnew( Room );
-		room->set_name(_fixstr(name,"room"));
-		room->set_transform(dummy->get_transform());
-
-		p_node->replace_by(room);
-		memdelete(p_node);
-		p_node=room;
-
-		//room->compute_room_from_subtree();
-
-	} else if (p_flags&SCENE_FLAG_CREATE_PORTALS &&_teststr(name,"portal") && Object::cast_to<MeshInstance>(p_node)) {
-
-		if (isroot)
-			return p_node;
-
-		MeshInstance *mi = Object::cast_to<MeshInstance>(p_node);
-		PoolVector<Face3> faces = mi->get_faces(VisualInstance::FACES_SOLID);
-
-		ERR_FAIL_COND_V(faces.size()==0,NULL);
-		//step 1 compute the plane
-		Set<Vector3> points;
-		Plane plane;
-
-		Vector3 center;
-
-		for(int i=0;i<faces.size();i++) {
-
-			Face3 f = faces.get(i);
-			Plane p = f.get_plane();
-			plane.normal+=p.normal;
-			plane.d+=p.d;
-
-			for(int i=0;i<3;i++) {
-
-				Vector3 v = f.vertex[i].snapped(0.01);
-				if (!points.has(v)) {
-					points.insert(v);
-					center+=v;
-				}
-			}
-		}
-
-		plane.normal.normalize();
-		plane.d/=faces.size();
-		center/=points.size();
-
-		//step 2, create points
-
-		Transform t;
-		t.basis.from_z(plane.normal);
-		t.basis.transpose();
-		t.origin=center;
-
-		Vector<Point2> portal_points;
-
-		for(Set<Vector3>::Element *E=points.front();E;E=E->next()) {
-
-			Vector3 local = t.xform_inv(E->get());
-			portal_points.push_back(Point2(local.x,local.y));
-		}
-		// step 3 bubbly sort points
-
-		int swaps=0;
-
-		do {
-			swaps=0;
-
-			for(int i=0;i<portal_points.size()-1;i++) {
-
-				float a = portal_points[i].angle();
-				float b = portal_points[i+1].angle();
-
-				if (a>b) {
-					SWAP( portal_points[i], portal_points[i+1] );
-					swaps++;
-				}
-
-			}
-
-		} while(swaps);
-
-
-		Portal *portal = memnew( Portal );
-
-		portal->set_shape(portal_points);
-		portal->set_transform( mi->get_transform() * t);
-
-		p_node->replace_by(portal);
-		memdelete(p_node);
-		p_node=portal;
-
-	} else if (Object::cast_to<MeshInstance>(p_node)) {
-
-		//last attempt, maybe collision insde the mesh data
-
-		MeshInstance *mi = Object::cast_to<MeshInstance>(p_node);
-
-		Ref<Mesh> mesh = mi->get_mesh();
-		if (!mesh.is_null()) {
-
-			if (p_flags&SCENE_FLAG_CREATE_COLLISIONS && _teststr(mesh->get_name(),"col")) {
-
-				mesh->set_name( _fixstr(mesh->get_name(),"col") );
-				Ref<Shape> shape;
-
-				if (collision_map.has(mesh)) {
-					shape = collision_map[mesh];
-
-				} else {
-
-					shape = mesh->create_trimesh_shape();
-					if (!shape.is_null())
-						collision_map[mesh]=shape;
-
-
-				}
-
-				if (!shape.is_null()) {
-#if 0
-					StaticBody* static_body = memnew( StaticBody );
-					ERR_FAIL_COND_V(!static_body,NULL);
-					static_body->set_name( String(mesh->get_name()) + "_col" );
-					shape->set_name(static_body->get_name());
-					static_body->add_shape(shape);
-
-					mi->add_child(static_body);
-					if (mi->get_owner())
-						static_body->set_owner( mi->get_owner() );
-#endif
-				}
-
-			}
-
-			for(int i=0;i<mesh->get_surface_count();i++) {
-
-				Ref<SpatialMaterial> fm = mesh->surface_get_material(i);
-				if (fm.is_valid()) {
-					String name = fm->get_name();
-				/*	if (_teststr(name,"alpha")) {
-						fm->set_fixed_flag(SpatialMaterial::FLAG_USE_ALPHA,true);
-						name=_fixstr(name,"alpha");
-					}
-
-					if (_teststr(name,"vcol")) {
-						fm->set_fixed_flag(SpatialMaterial::FLAG_USE_COLOR_ARRAY,true);
-						name=_fixstr(name,"vcol");
-					}*/
-					fm->set_name(name);
-				}
-			}
-
-		}
-
-	}
-
-
-	return p_node;
-}
-
-void EditorSceneImportPlugin::_tag_import_paths(Node *p_scene,Node *p_node) {
-
-	if (p_scene!=p_node && p_node->get_owner()!=p_scene)
-		return;
-
-	NodePath path = p_scene->get_path_to(p_node);
-	p_node->set_import_path( path );
-
-	Spatial *snode=Object::cast_to<Spatial>(p_node);
-
-	if (snode) {
-
-		snode->set_import_transform(snode->get_transform());
-	}
-
-	for(int i=0;i<p_node->get_child_count();i++) {
-		_tag_import_paths(p_scene,p_node->get_child(i));
-	}
-
-}
-
-Error EditorSceneImportPlugin::import1(const Ref<ResourceImportMetadata>& p_from,Node**r_node,List<String> *r_missing) {
-
-	Ref<ResourceImportMetadata> from=p_from;
-
-	ERR_FAIL_COND_V(from->get_source_count()!=1,ERR_INVALID_PARAMETER);
-
-	String src_path=EditorImportPlugin::expand_source_path(from->get_source_path(0));
-
-	Ref<EditorSceneImporter> importer;
-	String ext=src_path.get_extension().to_lower();
-
-
-	EditorProgress progress("import",TTR("Import Scene"),104);
-	progress.step(TTR("Importing Scene.."),0);
-
-	for(int i=0;i<importers.size();i++) {
-
-		List<String> extensions;
-		importers[i]->get_extensions(&extensions);
-
-		for(List<String>::Element *E=extensions.front();E;E=E->next()) {
-
-			if (E->get().to_lower()==ext) {
-
-				importer = importers[i];
-				break;
-			}
-		}
-
-		if (importer.is_valid())
-			break;
-	}
-
-	ERR_FAIL_COND_V(!importer.is_valid(),ERR_FILE_UNRECOGNIZED);
-
-	int animation_flags=p_from->get_option("animation_flags");
-	int scene_flags = from->get_option("flags");
-	int fps = 24;
-	if (from->has_option("animation_bake_fps"))
-		fps=from->get_option("animation_bake_fps");
-
-
-	Array clips;
-	if (from->has_option("animation_clips"))
-		clips=from->get_option("animation_clips");
-
-	uint32_t import_flags=0;
-	if (animation_flags&EditorSceneAnimationImportPlugin::ANIMATION_DETECT_LOOP)
-		import_flags|=EditorSceneImporter::IMPORT_ANIMATION_DETECT_LOOP;
-	if (animation_flags&EditorSceneAnimationImportPlugin::ANIMATION_KEEP_VALUE_TRACKS)
-		import_flags |= EditorSceneImporter::IMPORT_ANIMATION_KEEP_VALUE_TRACKS;
-	if (animation_flags&EditorSceneAnimationImportPlugin::ANIMATION_OPTIMIZE)
-		import_flags|=EditorSceneImporter::IMPORT_ANIMATION_OPTIMIZE;
-	if (animation_flags&EditorSceneAnimationImportPlugin::ANIMATION_FORCE_ALL_TRACKS_IN_ALL_CLIPS)
-		import_flags|=EditorSceneImporter::IMPORT_ANIMATION_FORCE_ALL_TRACKS_IN_ALL_CLIPS;
-	if (scene_flags&SCENE_FLAG_IMPORT_ANIMATIONS)
-		import_flags|=EditorSceneImporter::IMPORT_ANIMATION;
-	/*
-	if (scene_flags&SCENE_FLAG_FAIL_ON_MISSING_IMAGES)
-		import_flags|=EditorSceneImporter::IMPORT_FAIL_ON_MISSING_DEPENDENCIES;
-	*/
-	if (scene_flags&SCENE_FLAG_GENERATE_TANGENT_ARRAYS)
-		import_flags|=EditorSceneImporter::IMPORT_GENERATE_TANGENT_ARRAYS;
-
-
-
-
-
-	Error err=OK;
-	Node *scene = importer->import_scene(src_path,import_flags,fps,r_missing,&err);
-	if (!scene || err!=OK) {
-		return err;
-	}
-
-	if (from->has_option("root_type")) {
-		String type = from->get_option("root_type");
-		Node *base_node = Object::cast_to<Node>(ClassDB::instance(type));
-
-		if (base_node) {
-
-			scene->replace_by(base_node);
-			memdelete(scene);
-			scene=base_node;
-		}
-	}
-
-	scene->set_name(from->get_option("root_name"));
-	_tag_import_paths(scene,scene);
-
-	*r_node=scene;
-	return OK;
-}
-
-
-void EditorSceneImportPlugin::_create_clips(Node *scene, const Array& p_clips,bool p_bake_all) {
-
-	if (!scene->has_node(String("AnimationPlayer")))
-		return;
-
-	Node* n = scene->get_node(String("AnimationPlayer"));
-	ERR_FAIL_COND(!n);
-	AnimationPlayer *anim = Object::cast_to<AnimationPlayer>(n);
-	ERR_FAIL_COND(!anim);
-
-	if (!anim->has_animation("default"))
-		return;
-
-
-	Ref<Animation> default_anim = anim->get_animation("default");
-
-	for(int i=0;i<p_clips.size();i+=4) {
-
-		String name = p_clips[i];
-		float from=p_clips[i+1];
-		float to=p_clips[i+2];
-		bool loop=p_clips[i+3];
-		if (from>=to)
-			continue;
-
-		Ref<Animation> new_anim = memnew( Animation );
-
-		for(int j=0;j<default_anim->get_track_count();j++) {
-
-
-			List<float> keys;
-			int kc = default_anim->track_get_key_count(j);
-			int dtrack=-1;
-			for(int k=0;k<kc;k++) {
-
-				float kt = default_anim->track_get_key_time(j,k);
-				if (kt>=from && kt<to) {
-
-					//found a key within range, so create track
-					if (dtrack==-1) {
-						new_anim->add_track(default_anim->track_get_type(j));
-						dtrack = new_anim->get_track_count()-1;
-						new_anim->track_set_path(dtrack,default_anim->track_get_path(j));
-
-						if (kt>(from+0.01) && k>0) {
-
-							if (default_anim->track_get_type(j)==Animation::TYPE_TRANSFORM) {
-								Quat q;
-								Vector3 p;
-								Vector3 s;
-								default_anim->transform_track_interpolate(j,from,&p,&q,&s);
-								new_anim->transform_track_insert_key(dtrack,0,p,q,s);
-							}
-						}
-
-					}
-
-					if (default_anim->track_get_type(j)==Animation::TYPE_TRANSFORM) {
-						Quat q;
-						Vector3 p;
-						Vector3 s;
-						default_anim->transform_track_get_key(j,k,&p,&q,&s);
-						new_anim->transform_track_insert_key(dtrack,kt-from,p,q,s);
-					}
-
-				}
-
-				if (dtrack!=-1 && kt>=to) {
-
-					if (default_anim->track_get_type(j)==Animation::TYPE_TRANSFORM) {
-						Quat q;
-						Vector3 p;
-						Vector3 s;
-						default_anim->transform_track_interpolate(j,to,&p,&q,&s);
-						new_anim->transform_track_insert_key(dtrack,to-from,p,q,s);
-					}
-				}
-
-			}
-
-			if (dtrack==-1 && p_bake_all) {
-				new_anim->add_track(default_anim->track_get_type(j));
-				dtrack = new_anim->get_track_count()-1;
-				new_anim->track_set_path(dtrack,default_anim->track_get_path(j));
-				if (default_anim->track_get_type(j)==Animation::TYPE_TRANSFORM) {
-
-
-					Quat q;
-					Vector3 p;
-					Vector3 s;
-					default_anim->transform_track_interpolate(j,from,&p,&q,&s);
-					new_anim->transform_track_insert_key(dtrack,0,p,q,s);
-					default_anim->transform_track_interpolate(j,to,&p,&q,&s);
-					new_anim->transform_track_insert_key(dtrack,to-from,p,q,s);
-				}
-
-			}
-		}
-
-
-		new_anim->set_loop(loop);
-		new_anim->set_length(to-from);
-		anim->add_animation(name,new_anim);
-	}
-
-	anim->remove_animation("default"); //remove default (no longer needed)
-}
-
-void EditorSceneImportPlugin::_filter_anim_tracks(Ref<Animation> anim,Set<String> &keep) {
-
-	Ref<Animation> a = anim;
-	ERR_FAIL_COND(!a.is_valid());
-
-	print_line("From Anim "+anim->get_name()+":");
-
-	for(int j=0;j<a->get_track_count();j++) {
-
-		String path = a->track_get_path(j);
-
-		if (!keep.has(path)) {
-
-			print_line("Remove: "+path);
-			a->remove_track(j);
-			j--;
-		}
-
-	}
-}
-
-
-void EditorSceneImportPlugin::_filter_tracks(Node *scene, const String& p_text) {
-
-	if (!scene->has_node(String("AnimationPlayer")))
-		return;
-	Node* n = scene->get_node(String("AnimationPlayer"));
-	ERR_FAIL_COND(!n);
-	AnimationPlayer *anim = Object::cast_to<AnimationPlayer>(n);
-	ERR_FAIL_COND(!anim);
-
-	Vector<String> strings = p_text.split("\n");
-	for(int i=0;i<strings.size();i++) {
-
-		strings[i]=strings[i].strip_edges();
-	}
-
-	List<StringName> anim_names;
-	anim->get_animation_list(&anim_names);
-	for(List<StringName>::Element *E=anim_names.front();E;E=E->next()) {
-
-		String name = E->get();
-		bool valid_for_this=false;
-		bool valid=false;
-
-		Set<String> keep;
-		Set<String> keep_local;
-
-
-		for(int i=0;i<strings.size();i++) {
-
-
-			if (strings[i].begins_with("@")) {
-
-				valid_for_this=false;
-				for(Set<String>::Element *F=keep_local.front();F;F=F->next()) {
-					keep.insert(F->get());
-				}
-				keep_local.clear();
-
-				Vector<String> filters=strings[i].substr(1,strings[i].length()).split(",");
-				for(int j=0;j<filters.size();j++) {
-
-					String fname = filters[j].strip_edges();
-					if (fname=="")
-						continue;
-					int fc = fname[0];
-					bool plus;
-					if (fc=='+')
-						plus=true;
-					else if (fc=='-')
-						 plus=false;
-					else
-						continue;
-
-					String filter=fname.substr(1,fname.length()).strip_edges();
-
-					if (!name.matchn(filter))
-						continue;
-					valid_for_this=plus;
-				}
-
-				if (valid_for_this)
-					valid=true;
-
-			} else if (valid_for_this) {
-
-				Ref<Animation> a = anim->get_animation(name);
-				if (!a.is_valid())
-					continue;
-
-				for(int j=0;j<a->get_track_count();j++) {
-
-					String path = a->track_get_path(j);
-
-					String tname = strings[i];
-					if (tname=="")
-						continue;
-					int fc = tname[0];
-					bool plus;
-					if (fc=='+')
-						plus=true;
-					else if (fc=='-')
-						 plus=false;
-					else
-						continue;
-
-					String filter=tname.substr(1,tname.length()).strip_edges();
-
-					if (!path.matchn(filter))
-						continue;
-
-					if (plus)
-						keep_local.insert(path);
-					else if (!keep.has(path)) {
-						keep_local.erase(path);
-					}
-				}
-
-			}
-
-		}
-
-		if (valid) {
-			for(Set<String>::Element *F=keep_local.front();F;F=F->next()) {
-				keep.insert(F->get());
-			}
-			print_line("FILTERING ANIM: "+String(E->get()));
-			_filter_anim_tracks(anim->get_animation(name),keep);
-		} else {
-			print_line("NOT FILTERING ANIM: "+String(E->get()));
-
-		}
-
-	}
-
-
-
-}
-
-void EditorSceneImportPlugin::_optimize_animations(Node *scene, float p_max_lin_error,float p_max_ang_error,float p_max_angle) {
-
-	if (!scene->has_node(String("AnimationPlayer")))
-		return;
-	Node* n = scene->get_node(String("AnimationPlayer"));
-	ERR_FAIL_COND(!n);
-	AnimationPlayer *anim = Object::cast_to<AnimationPlayer>(n);
-	ERR_FAIL_COND(!anim);
-
-
-	List<StringName> anim_names;
-	anim->get_animation_list(&anim_names);
-	for(List<StringName>::Element *E=anim_names.front();E;E=E->next()) {
-
-		Ref<Animation> a = anim->get_animation(E->get());
-		a->optimize(p_max_lin_error,p_max_ang_error,Math::deg2rad(p_max_angle));
-	}
-}
-
-
-void EditorSceneImportPlugin::_find_resources_to_merge(Node *scene, Node *node, bool p_merge_material, Map<String, Ref<Material> > &materials, bool p_merge_anims, Map<String,Ref<Animation> >& merged_anims,Set<Ref<Mesh> > &tested_meshes) {
-
-	if (node!=scene && node->get_owner()!=scene)
-		return;
-
-	String path = scene->get_path_to(node);
-
-	if (p_merge_anims && Object::cast_to<AnimationPlayer>(node)) {
-
-		AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(node);
-		List<StringName> anims;
-		ap->get_animation_list(&anims);
-		for (List<StringName>::Element *E=anims.front();E;E=E->next()) {
-			Ref<Animation> anim = ap->get_animation(E->get());
-			Ref<Animation> clone;
-
-			bool has_user_tracks=false;
-
-			for(int i=0;i<anim->get_track_count();i++) {
-
-				if (!anim->track_is_imported(i)) {
-					has_user_tracks=true;
-					break;
-				}
-			}
-
-			if (has_user_tracks) {
-
-				clone = anim->duplicate();
-				for(int i=0;i<clone->get_track_count();i++) {
-					if (clone->track_is_imported(i)) {
-						clone->remove_track(i);
-						i--;
-					}
-				}
-
-				merged_anims[path+"::"+String(E->get())]=clone;
-			}
-		}
-	}
-
-
-
-	if (p_merge_material && Object::cast_to<MeshInstance>(node)) {
-		MeshInstance *mi=Object::cast_to<MeshInstance>(node);
-		Ref<Mesh> mesh = mi->get_mesh();
-		if (mesh.is_valid() && mesh->get_name()!=String() && !tested_meshes.has(mesh)) {
-
-			for(int i=0;i<mesh->get_surface_count();i++) {
-				Ref<Material> material = mesh->surface_get_material(i);
-
-				if (material.is_valid()) {
-
-					String sname = mesh->surface_get_name(i);
-					if (sname=="")
-						sname="surf_"+itos(i);
-
-					sname=mesh->get_name()+":surf:"+sname;
-					materials[sname]=material;
-				}
-			}
-
-			tested_meshes.insert(mesh);
-		}
-
-		if (mesh.is_valid()) {
-
-			for(int i=0;i<mesh->get_surface_count();i++) {
-				Ref<Material> material = mi->get_surface_material(i);
-				if (material.is_valid()) {
-					String sname = mesh->surface_get_name(i);
-					if (sname=="")
-						sname="surf_"+itos(i);
-
-					sname=path+":inst_surf:"+sname;
-					materials[sname]=material;
-				}
-			}
-
-		}
-
-		Ref<Material> override = mi->get_material_override();
-
-		if (override.is_valid()) {
-
-			materials[path+":override"]=override;
-		}
-	}
-
-
-
-	for(int i=0;i<node->get_child_count();i++) {
-		_find_resources_to_merge(scene,node->get_child(i),p_merge_material,materials,p_merge_anims,merged_anims,tested_meshes);
-	}
-
-}
-
-
-void EditorSceneImportPlugin::_merge_found_resources(Node *scene, Node *node, bool p_merge_material, const Map<String, Ref<Material> > &materials, bool p_merge_anims, const Map<String,Ref<Animation> >& merged_anims, Set<Ref<Mesh> > &tested_meshes) {
-
-	if (node!=scene && node->get_owner()!=scene)
-		return;
-
-	String path = scene->get_path_to(node);
-
-	print_line("at path: "+path);
-
-	if (AnimationPlayer *ap = Object::cast_to<AnimationPlayer>(node)) {
-
-		List<StringName> anims;
-		ap->get_animation_list(&anims);
-		for (List<StringName>::Element *E=anims.front();E;E=E->next()) {
-			Ref<Animation> anim = ap->get_animation(E->get());
-
-			String anim_path = path+"::"+String(E->get());
-
-			if (merged_anims.has(anim_path)) {
-
-				Ref<Animation> user_tracks = merged_anims[anim_path];
-				for(int i=0;i<user_tracks->get_track_count();i++) {
-
-					int idx = anim->get_track_count();
-					anim->add_track(user_tracks->track_get_type(i));
-					anim->track_set_path(idx,user_tracks->track_get_path(i));
-					anim->track_set_interpolation_type(idx,user_tracks->track_get_interpolation_type(i));
-					for(int j=0;j<user_tracks->track_get_key_count(i);j++) {
-
-						float ofs = user_tracks->track_get_key_time(i,j);
-						float trans = user_tracks->track_get_key_transition(i,j);
-						Variant value = user_tracks->track_get_key_value(i,j);
-
-						anim->track_insert_key(idx,ofs,value,trans);
-					}
-				}
-			}
-		}
-	}
-
-
-
-	if (MeshInstance *mi=Object::cast_to<MeshInstance>(node)) {
-
-		Ref<Mesh> mesh = mi->get_mesh();
-		if (mesh.is_valid() && mesh->get_name()!=String() && !tested_meshes.has(mesh)) {
-
-			for(int i=0;i<mesh->get_surface_count();i++) {
-
-				String sname = mesh->surface_get_name(i);
-				if (sname=="")
-					sname="surf_"+itos(i);
-
-				sname=mesh->get_name()+":surf:"+sname;
-
-
-				if (materials.has(sname)) {
-
-					mesh->surface_set_material(i,materials[sname]);
-				}
-			}
-
-			tested_meshes.insert(mesh);
-		}
-
-		if (mesh.is_valid()) {
-
-			for(int i=0;i<mesh->get_surface_count();i++) {
-
-				String sname = mesh->surface_get_name(i);
-				if (sname=="")
-					sname="surf_"+itos(i);
-
-				sname=path+":inst_surf:"+sname;
-
-
-				if (materials.has(sname)) {
-
-					mi->set_surface_material(i,materials[sname]);
-				}
-			}
-
-		}
-
-
-		String opath = path+":override";
-		if (materials.has(opath)) {
-			mi->set_material_override(materials[opath]);
-		}
-
-	}
-
-
-
-	for(int i=0;i<node->get_child_count();i++) {
-		_merge_found_resources(scene,node->get_child(i),p_merge_material,materials,p_merge_anims,merged_anims,tested_meshes);
-	}
-
-}
-
-Error EditorSceneImportPlugin::import2(Node *scene, const String& p_dest_path, const Ref<ResourceImportMetadata>& p_from) {
-
-	Error err=OK;
-	Ref<ResourceImportMetadata> from=p_from;
-	String src_path=EditorImportPlugin::expand_source_path(from->get_source_path(0));
-	int animation_flags=p_from->get_option("animation_flags");
-	Array animation_clips = p_from->get_option("animation_clips");
-	String animation_filter = p_from->get_option("animation_filters");
-	int scene_flags = from->get_option("flags");
-	float anim_optimizer_linerr=0.05;
-	float anim_optimizer_angerr=0.01;
-	float anim_optimizer_maxang=22;
-
-	if (from->has_option("animation_optimizer_linear_error"))
-		anim_optimizer_linerr=from->get_option("animation_optimizer_linear_error");
-	if (from->has_option("animation_optimizer_angular_error"))
-		anim_optimizer_angerr=from->get_option("animation_optimizer_angular_error");
-	if (from->has_option("animation_optimizer_max_angle"))
-		anim_optimizer_maxang=from->get_option("animation_optimizer_max_angle");
-
-	EditorProgress progress("import",TTR("Import Scene"),104);
-	progress.step(TTR("Importing Scene.."),2);
-
-
-	from->set_source_md5(0,FileAccess::get_md5(src_path));
-	from->set_editor(get_name());
-
-	from->set_option("reimport",false);
-	String target_res_path=p_dest_path.get_base_dir();
-
-	Map<Ref<Mesh>,Ref<Shape> > collision_map;
-
-	Map< Ref<ImageTexture>,TextureRole > imagemap;
-
-	scene=_fix_node(scene,scene,collision_map,scene_flags,imagemap);
-	if (animation_flags&EditorSceneAnimationImportPlugin::ANIMATION_OPTIMIZE)
-		_optimize_animations(scene,anim_optimizer_linerr,anim_optimizer_angerr,anim_optimizer_maxang);
-	if (animation_clips.size())
-		_create_clips(scene,animation_clips,animation_flags&EditorSceneAnimationImportPlugin::ANIMATION_FORCE_ALL_TRACKS_IN_ALL_CLIPS);
-
-	_filter_tracks(scene,animation_filter);
-
-
-	if (scene_flags&(SCENE_FLAG_MERGE_KEEP_MATERIALS|SCENE_FLAG_MERGE_KEEP_EXTRA_ANIM_TRACKS) && FileAccess::exists(p_dest_path)) {
-		//must merge!
-
-		print_line("MUST MERGE");
-		Ref<PackedScene> pscene = ResourceLoader::load(p_dest_path,"PackedScene",true);
-		if (pscene.is_valid()) {
-
-			Node *instance = pscene->instance();
-			if (instance) {
-				Map<String,Ref<Animation> > merged_anims;
-				Map<String,Ref<Material> > merged_materials;
-				Set<Ref<Mesh> > tested_meshes;
-
-				_find_resources_to_merge(instance,instance,scene_flags&SCENE_FLAG_MERGE_KEEP_MATERIALS,merged_materials,scene_flags&SCENE_FLAG_MERGE_KEEP_EXTRA_ANIM_TRACKS,merged_anims,tested_meshes);
-
-				tested_meshes.clear();
-				_merge_found_resources(scene,scene,scene_flags&SCENE_FLAG_MERGE_KEEP_MATERIALS,merged_materials,scene_flags&SCENE_FLAG_MERGE_KEEP_EXTRA_ANIM_TRACKS,merged_anims,tested_meshes);
-
-				memdelete(instance);
-			}
-
-		}
-
-	}
-
-	/// BEFORE ANYTHING, RUN SCRIPT
-
-	progress.step(TTR("Running Custom Script.."),2);
-
-	String post_import_script_path = from->get_option("post_import_script");
-	Ref<EditorScenePostImport>  post_import_script;
-
-	if (post_import_script_path!="") {
-		post_import_script_path = post_import_script_path;
-		Ref<Script> scr = ResourceLoader::load(post_import_script_path);
-		if (!scr.is_valid()) {
-			EditorNode::add_io_error(TTR("Couldn't load post-import script:")+" "+post_import_script_path);
-		} else {
-
-			post_import_script = Ref<EditorScenePostImport>( memnew( EditorScenePostImport ) );
-			post_import_script->set_script(scr.get_ref_ptr());
-			if (!post_import_script->get_script_instance()) {
-				EditorNode::add_io_error(TTR("Invalid/broken script for post-import (check console):")+" "+post_import_script_path);
-				post_import_script.unref();
-				return ERR_CANT_CREATE;
-			}
-		}
-	}
-
-
-	if (post_import_script.is_valid()) {
-		scene = post_import_script->post_import(scene);
-		if (!scene) {
-			EditorNode::add_io_error(TTR("Error running post-import script:")+" "+post_import_script_path);
-			return err;
-		}
-
-
-	}
-
-
-	/// IMPORT IMAGES
-
-
-	int idx=0;
-
-	int image_format = from->get_option("texture_format");
-	int image_flags =  from->get_option("texture_flags");
-	float image_quality = from->get_option("texture_quality");
-
-	for (Map< Ref<ImageTexture>,TextureRole >::Element *E=imagemap.front();E;E=E->next()) {
-
-		//texture could be converted to something more useful for 3D, that could load individual mipmaps and stuff
-		//but not yet..
-
-		Ref<ImageTexture> texture = E->key();
-
-		ERR_CONTINUE(!texture.is_valid());
-
-		String path = texture->get_path();
-		String fname= path.get_file();
-		String target_path = ProjectSettings::get_singleton()->localize_path(target_res_path.plus_file(fname));
-		progress.step(TTR("Import Image:")+" "+fname,3+(idx)*100/imagemap.size());
-
-		idx++;
-
-		if (path==target_path) {
-
-			EditorNode::add_io_error(TTR("Can't import a file over itself:")+" "+target_path);
-			continue;
-		}
-
-		if (!target_path.begins_with("res://")) {
-			EditorNode::add_io_error(vformat(TTR("Couldn't localize path: %s (already local)"),target_path));
-			continue;
-		}
-
-
-		{
-
-
-			target_path=target_path.get_basename()+".tex";
-
-			Ref<ResourceImportMetadata> imd = memnew( ResourceImportMetadata );
-
-			uint32_t flags = image_flags;
-			if (E->get()==TEXTURE_ROLE_DIFFUSE && scene_flags&SCENE_FLAG_LINEARIZE_DIFFUSE_TEXTURES)
-				flags|=EditorTextureImportPlugin::IMAGE_FLAG_CONVERT_TO_LINEAR;
-
-			if (E->get()==TEXTURE_ROLE_NORMALMAP && scene_flags&SCENE_FLAG_CONVERT_NORMALMAPS_TO_XY)
-				flags|=EditorTextureImportPlugin::IMAGE_FLAG_CONVERT_NORMAL_TO_XY;
-
-			imd->set_option("flags",flags);
-			imd->set_option("format",image_format);
-			imd->set_option("quality",image_quality);
-			imd->set_option("atlas",false);
-			imd->add_source(EditorImportPlugin::validate_source_path(path));
-
-
-			if (FileAccess::exists(target_path)) {
-
-				 Ref<ResourceImportMetadata> rimdex = ResourceLoader::load_import_metadata(target_path);
-				 if (rimdex.is_valid()) {
-					//make sure the options are the same, otherwise re-import
-					List<String> opts;
-					imd->get_options(&opts);
-					bool differ=false;
-					for (List<String>::Element *E=opts.front();E;E=E->next()) {
-						if (!(rimdex->get_option(E->get())==imd->get_option(E->get()))) {
-							differ=true;
-							break;
-						}
-					}
-
-					if (!differ) {
-						texture->set_path(target_path);
-						continue; //already imported
-					}
-				}
-			}
-
-			EditorTextureImportPlugin::get_singleton()->import(target_path,imd);
-
-		}
-	}
-
-
-
-	progress.step(TTR("Saving.."),104);
-
-	Ref<PackedScene> packer = memnew( PackedScene );
-	packer->pack(scene);
-	//packer->set_path(p_dest_path); do not take over, let the changed files reload themselves
-	packer->set_import_metadata(from);
-
-	print_line("SAVING TO: "+p_dest_path);
-	err = ResourceSaver::save(p_dest_path,packer); //do not take over, let the changed files reload themselves
-
-	//EditorFileSystem::get_singleton()->update_resource(packer);
-
-	memdelete(scene);
-
-	/*
-	scene->set_filename(p_dest_path);
-	if (r_scene) {
-		*r_scene=scene;
-	} else {
-		memdelete(scene);
-	}
-
-	String sp;
-	if (p_post_import.is_valid() && !p_post_import->get_script().is_null()) {
-		Ref<Script> scr = p_post_import->get_script();
-		if (scr.is_valid())
-			sp=scr->get_path();
-	}
-
-	String op=_getrelpath(p_path,p_dest_path);
-
-	*/
-
-	EditorNode::get_singleton()->reload_scene(p_dest_path);
-
-	return err;
-
-}
-
-
-Error EditorSceneImportPlugin::import(const String& p_dest_path, const Ref<ResourceImportMetadata>& p_from){
-
-
-	Node *n=NULL;
-	Error err = import1(p_from,&n);
-	if (err!=OK) {
-		if (n) {
-			memdelete(n);
-		}
-		return err;
-	}
-	return import2(n,p_dest_path,p_from);
-}
-
-void EditorSceneImportPlugin::add_importer(const Ref<EditorSceneImporter>& p_importer) {
-
-	importers.push_back(p_importer);
-}
-
-void EditorSceneImportPlugin::import_from_drop(const Vector<String>& p_drop,const String& p_dest_path) {
-
-	List<String> extensions;
-	for(int i=0;i<importers.size();i++) {
-		importers[i]->get_extensions(&extensions);
-	}
-	//bool warn_compatible=false;
-	for(int i=0;i<p_drop.size();i++) {
-
-		String extension = p_drop[i].get_extension().to_lower();
-
-		for(List<String>::Element *E=extensions.front();E;E=E->next()) {
-
-			if (E->get()==extension) {
-
-				dialog->popup_import(String());
-				dialog->setup_popup(p_drop[i],p_dest_path);
-				return;
-			}
-		}
-	}
-
-}
-
-
-EditorSceneImportPlugin::EditorSceneImportPlugin(EditorNode* p_editor) {
-
-	dialog = memnew( EditorSceneImportDialog(p_editor,this) );
-	p_editor->get_gui_base()->add_child(dialog);
-}
-
-
-///////////////////////////////
-
-
-String EditorSceneAnimationImportPlugin::get_name() const {
-
-	return "anim_3d";
-}
-String EditorSceneAnimationImportPlugin::get_visible_name() const{
-
-
-	return TTR("3D Scene Animation");
-}
-void EditorSceneAnimationImportPlugin::import_dialog(const String& p_from){
-
-
-}
-Error EditorSceneAnimationImportPlugin::import(const String& p_path, const Ref<ResourceImportMetadata>& p_from){
-
-	return OK;
-}
-
-EditorSceneAnimationImportPlugin::EditorSceneAnimationImportPlugin(EditorNode* p_editor) {
-
-
-}
-#endif

editor/io_plugins/editor_scene_import_plugin.h

@@ -1,201 +0,0 @@
-/*************************************************************************/
-/*  editor_scene_import_plugin.h                                         */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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 EDITOR_SCENE_IMPORT_PLUGIN_H
-#define EDITOR_SCENE_IMPORT_PLUGIN_H
-#if 0
-#include "editor/editor_dir_dialog.h"
-#include "editor/editor_file_system.h"
-#include "editor/editor_import_export.h"
-#include "editor/io_plugins/editor_texture_import_plugin.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/file_dialog.h"
-#include "scene/gui/label.h"
-#include "scene/gui/line_edit.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/progress_bar.h"
-#include "scene/gui/slider.h"
-#include "scene/gui/spin_box.h"
-#include "scene/gui/tree.h"
-#include "scene/resources/animation.h"
-#include "scene/resources/mesh.h"
-
-
-class EditorNode;
-class EditorSceneImportDialog;
-
-class EditorSceneImporter : public Reference {
-
-	GDCLASS(EditorSceneImporter,Reference );
-public:
-
-	enum ImportFlags {
-		IMPORT_SCENE=1,
-		IMPORT_ANIMATION=2,
-		IMPORT_ANIMATION_DETECT_LOOP=4,
-		IMPORT_ANIMATION_OPTIMIZE=8,
-		IMPORT_ANIMATION_FORCE_ALL_TRACKS_IN_ALL_CLIPS=16,
-		IMPORT_ANIMATION_KEEP_VALUE_TRACKS=32,
-		IMPORT_GENERATE_TANGENT_ARRAYS=256,
-		IMPORT_FAIL_ON_MISSING_DEPENDENCIES=512
-
-	};
-
-	virtual uint32_t get_import_flags() const=0;
-	virtual void get_extensions(List<String> *r_extensions) const=0;
-	virtual Node* import_scene(const String& p_path,uint32_t p_flags,int p_bake_fps,List<String> *r_missing_deps,Error* r_err=NULL)=0;
-	virtual Ref<Animation> import_animation(const String& p_path,uint32_t p_flags)=0;
-
-
-
-	EditorSceneImporter();
-};
-
-/////////////////////////////////////////
-
-
-//Plugin for post processing scenes or images
-
-class EditorScenePostImport : public Reference {
-
-	GDCLASS(EditorScenePostImport,Reference );
-protected:
-
-	static void _bind_methods();
-public:
-
-	virtual Node* post_import(Node* p_scene);
-	EditorScenePostImport();
-};
-
-
-class EditorSceneImportPlugin : public EditorImportPlugin {
-
-	GDCLASS(EditorSceneImportPlugin,EditorImportPlugin);
-
-	EditorSceneImportDialog *dialog;
-
-	Vector<Ref<EditorSceneImporter> > importers;
-
-	enum TextureRole {
-		TEXTURE_ROLE_DEFAULT,
-		TEXTURE_ROLE_DIFFUSE,
-		TEXTURE_ROLE_NORMALMAP
-	};
-
-	void _find_resources(const Variant& p_var,Map<Ref<ImageTexture>,TextureRole >& image_map,int p_flags);
-	Node* _fix_node(Node *p_node,Node *p_root,Map<Ref<Mesh>,Ref<Shape> > &collision_map,uint32_t p_flags,Map<Ref<ImageTexture>,TextureRole >& image_map);
-	void _create_clips(Node *scene, const Array& p_clips, bool p_bake_all);
-	void _filter_anim_tracks(Ref<Animation> anim,Set<String> &keep);
-	void _filter_tracks(Node *scene, const String& p_text);
-	void _optimize_animations(Node *scene, float p_max_lin_error,float p_max_ang_error,float p_max_angle);
-
-	void _tag_import_paths(Node *p_scene,Node *p_node);
-
-	void _find_resources_to_merge(Node *scene, Node *node, bool p_merge_material, Map<String,Ref<Material> >&materials, bool p_merge_anims, Map<String,Ref<Animation> >& merged_anims, Set<Ref<Mesh> > &tested_meshes);
-	void _merge_found_resources(Node *scene, Node *node, bool p_merge_material, const Map<String, Ref<Material> > &materials, bool p_merge_anims, const Map<String,Ref<Animation> >& merged_anims, Set<Ref<Mesh> > &tested_meshes);
-
-
-public:
-
-	enum SceneFlags {
-
-		SCENE_FLAG_CREATE_COLLISIONS=1<<0,
-		SCENE_FLAG_CREATE_PORTALS=1<<1,
-		SCENE_FLAG_CREATE_ROOMS=1<<2,
-		SCENE_FLAG_SIMPLIFY_ROOMS=1<<3,
-		SCENE_FLAG_CREATE_BILLBOARDS=1<<4,
-		SCENE_FLAG_CREATE_IMPOSTORS=1<<5,
-		SCENE_FLAG_CREATE_LODS=1<<6,
-		SCENE_FLAG_CREATE_CARS=1<<8,
-		SCENE_FLAG_CREATE_WHEELS=1<<9,
-		SCENE_FLAG_DETECT_ALPHA=1<<15,
-		SCENE_FLAG_DETECT_VCOLOR=1<<16,
-		SCENE_FLAG_CREATE_NAVMESH=1<<17,
-		SCENE_FLAG_DETECT_LIGHTMAP_LAYER=1<<18,
-
-		SCENE_FLAG_MERGE_KEEP_MATERIALS=1<<20,
-		SCENE_FLAG_MERGE_KEEP_EXTRA_ANIM_TRACKS=1<<21,
-
-		SCENE_FLAG_REMOVE_NOIMP=1<<24,
-		SCENE_FLAG_IMPORT_ANIMATIONS=1<<25,
-		SCENE_FLAG_COMPRESS_GEOMETRY=1<<26,
-		SCENE_FLAG_GENERATE_TANGENT_ARRAYS=1<<27,
-		SCENE_FLAG_LINEARIZE_DIFFUSE_TEXTURES=1<<28,
-		SCENE_FLAG_SET_LIGHTMAP_TO_UV2_IF_EXISTS=1<<29,
-		SCENE_FLAG_CONVERT_NORMALMAPS_TO_XY=1<<30,
-	};
-
-
-
-	virtual String get_name() const;
-	virtual String get_visible_name() const;
-	virtual void import_dialog(const String& p_from="");
-	virtual Error import(const String& p_path, const Ref<ResourceImportMetadata>& p_from);
-
-	Error import1(const Ref<ResourceImportMetadata>& p_from,Node**r_node,List<String> *r_missing=NULL);
-	Error import2(Node* p_scene,const String& p_path, const Ref<ResourceImportMetadata>& p_from);
-
-	void add_importer(const Ref<EditorSceneImporter>& p_importer);
-	const Vector<Ref<EditorSceneImporter> >& get_importers() { return importers; }
-
-	virtual void import_from_drop(const Vector<String>& p_drop,const String& p_dest_path);
-
-	EditorSceneImportPlugin(EditorNode* p_editor=NULL);
-
-
-};
-
-
-class EditorSceneAnimationImportPlugin : public EditorImportPlugin {
-
-	GDCLASS(EditorSceneAnimationImportPlugin,EditorImportPlugin);
-public:
-
-
-	enum AnimationFlags {
-
-		ANIMATION_DETECT_LOOP=1,
-		ANIMATION_KEEP_VALUE_TRACKS=2,
-		ANIMATION_OPTIMIZE=4,
-		ANIMATION_FORCE_ALL_TRACKS_IN_ALL_CLIPS=8
-	};
-
-	virtual String get_name() const;
-	virtual String get_visible_name() const;
-	virtual void import_dialog(const String& p_from="");
-	virtual Error import(const String& p_path, const Ref<ResourceImportMetadata>& p_from);
-
-	EditorSceneAnimationImportPlugin(EditorNode* p_editor=NULL);
-
-
-};
-
-#endif
-#endif // EDITOR_SCENE_IMPORT_PLUGIN_H

editor/io_plugins/editor_scene_importer_fbxconv.cpp

@@ -1,1137 +0,0 @@
-/*************************************************************************/
-/*  editor_scene_importer_fbxconv.cpp                                    */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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.                */
-/*************************************************************************/
-#include "editor_scene_importer_fbxconv.h"
-
-#include "editor/editor_settings.h"
-#include "os/file_access.h"
-#include "os/os.h"
-#include "scene/3d/mesh_instance.h"
-#include "scene/animation/animation_player.h"
-
-#if 0
-String EditorSceneImporterFBXConv::_id(const String& p_id) const {
-
-	return p_id.replace(":","_").replace("/","_");
-}
-
-uint32_t EditorSceneImporterFBXConv::get_import_flags() const {
-
-	return IMPORT_SCENE|IMPORT_ANIMATION;
-}
-void EditorSceneImporterFBXConv::get_extensions(List<String> *r_extensions) const{
-
-	r_extensions->push_back("fbx");
-	r_extensions->push_back("g3dj");
-}
-
-
-Color EditorSceneImporterFBXConv::_get_color(const Array& a) {
-
-	if (a.size()<3)
-		return Color();
-	Color c;
-	c.r=a[0];
-	c.g=a[1];
-	c.b=a[2];
-	if (a.size()>=4)
-		c.a=a[3];
-	return c;
-
-}
-
-Transform EditorSceneImporterFBXConv::_get_transform_mixed(const Dictionary& d,const Dictionary& dbase) {
-
-
-
-
-	Array translation;
-
-	if (d.has("translation"))
-		translation=d["translation"];
-	else if (dbase.has("translation"))
-		translation=dbase["translation"];
-
-	Array rotation;
-
-	if (d.has("rotation"))
-		rotation=d["rotation"];
-	else if (dbase.has("rotation"))
-		rotation=dbase["rotation"];
-
-	Array scale;
-
-	if (d.has("scale"))
-		scale=d["scale"];
-	else if (dbase.has("scale"))
-		scale=dbase["scale"];
-
-	Transform t;
-
-
-	if (translation.size()) {
-		Array tr = translation;
-		if (tr.size()>=3) {
-			t.origin.x=tr[0];
-			t.origin.y=tr[1];
-			t.origin.z=tr[2];
-		}
-	}
-
-	if (rotation.size()) {
-
-		Array r = rotation;
-		if (r.size()>=4) {
-
-			Quat q;
-			q.x = r[0];
-			q.y = r[1];
-			q.z = r[2];
-			q.w = r[3];
-			t.basis=Matrix3(q);
-		}
-	}
-
-
-	if (scale.size()) {
-
-		Array sc = scale;
-		if (sc.size()>=3) {
-			Vector3 s;
-			s.x=sc[0];
-			s.y=sc[1];
-			s.z=sc[2];
-			t.basis.scale(s);
-		}
-	}
-
-	return t;
-
-
-}
-
-Transform EditorSceneImporterFBXConv::_get_transform(const Dictionary& d) {
-
-
-	Transform t;
-
-	if (d.has("translation")) {
-		Array tr = d["translation"];
-		if (tr.size()>=3) {
-			t.origin.x=tr[0];
-			t.origin.y=tr[1];
-			t.origin.z=tr[2];
-		}
-	}
-
-	if (d.has("rotation")) {
-
-		Array r = d["rotation"];
-		if (r.size()>=4) {
-
-			Quat q;
-			q.x = r[0];
-			q.y = r[1];
-			q.z = r[2];
-			q.w = r[3];
-			t.basis=Matrix3(q);
-		}
-	}
-
-
-	if (d.has("scale")) {
-
-		Array sc = d["scale"];
-		if (sc.size()>=3) {
-			Vector3 s;
-			s.x=sc[0];
-			s.y=sc[1];
-			s.z=sc[2];
-			t.basis.scale(s);
-		}
-	}
-
-	return t;
-}
-
-
-void EditorSceneImporterFBXConv::_detect_bones_in_nodes(State& state,const Array& p_nodes) {
-
-
-	for(int i=0;i<p_nodes.size();i++) {
-
-		Dictionary d = p_nodes[i];
-		if (d.has("isBone") && bool(d["isBone"])) {
-
-			String bone_name=_id(d["id"]);
-			print_line("IS BONE: "+bone_name);
-			if (!state.bones.has(bone_name)) {
-				state.bones.insert(bone_name,BoneInfo());
-			}
-
-			if (!state.bones[bone_name].has_rest) {
-				state.bones[bone_name].rest=_get_transform(d).affine_inverse();
-			}
-
-			state.bones[bone_name].node=d;
-
-			//state.bones[name].rest=_get_transform(b);
-		}
-
-		if (d.has("parts")) {
-
-			Array parts=d["parts"];
-			for(int j=0;j<parts.size();j++) {
-
-				Dictionary p=parts[j];
-				if (p.has("bones")) {
-					Array bones=p["bones"];
-					//omfg
-					for(int k=0;k<bones.size();k++) {
-
-						Dictionary b = bones[k];
-						if (b.has("node")) {
-
-							String name = _id(b["node"]);
-							if (!state.bones.has(name)) {
-								state.bones.insert(name,BoneInfo());
-							}
-
-							state.bones[name].rest=_get_transform(b);
-							state.bones[name].has_rest=true;
-						}
-					}
-				}
-
-			}
-		}
-
-		if (d.has("children")) {
-
-			_detect_bones_in_nodes(state,d["children"]);
-		}
-	}
-
-}
-
-void EditorSceneImporterFBXConv::_parse_skeletons(const String& p_name,State& state, const Array &p_nodes, Skeleton *p_skeleton,int p_parent) {
-
-
-
-	for(int i=0;i<p_nodes.size();i++) {
-
-
-		Dictionary d = p_nodes[i];
-		int bone_idx=-1;
-		String id;
-		Skeleton* skeleton=p_skeleton;
-		if (d.has("id")) {
-
-			id=_id(d["id"]);
-			if (state.bones.has(id)) {
-				//BONER
-				if (!skeleton) {
-					skeleton=memnew( Skeleton );
-					state.skeletons[id]=skeleton;
-				}
-				bone_idx = skeleton->get_bone_count();
-				skeleton->add_bone(id);
-				skeleton->set_bone_parent(bone_idx,p_parent);
-				skeleton->set_bone_rest(bone_idx,state.bones[id].rest);
-				state.bones[id].skeleton=skeleton;
-			}
-		}
-
-		if (d.has("children")) {
-
-			_parse_skeletons(id,state,d["children"],skeleton,bone_idx);
-		}
-	}
-
-}
-
-void EditorSceneImporterFBXConv::_detect_bones(State& state) {
-	//This format should mark when a node is a bone,
-	//which is the only thing that Collada does right.
-	//think about others implementing a parser.
-	//Just _one_ string and you avoid loads of lines of code to other people.
-
-	for(int i=0;i<state.animations.size();i++) {
-
-		Dictionary an = state.animations[i];
-		if (an.has("bones")) {
-
-			Array bo=an["bones"];
-			for(int j=0;j<bo.size();j++) {
-
-				Dictionary b=bo[j];
-				if (b.has("boneId")) {
-
-					String id = b["boneId"];
-					if (!state.bones.has(id)) {
-						state.bones.insert(id,BoneInfo());
-					}
-					state.bones[id].has_anim_chan=true; //used in anim
-
-
-				}
-			}
-		}
-	}
-
-	_detect_bones_in_nodes(state,state.nodes);
-	_parse_skeletons("",state,state.nodes,NULL,-1);
-
-	print_line("found bones: "+itos(state.bones.size()));
-	print_line("found skeletons: "+itos(state.skeletons.size()));
-}
-
-Error EditorSceneImporterFBXConv::_parse_bones(State& state,const Array &p_bones,Skeleton* p_skeleton) {
-
-
-
-	return OK;
-}
-
-
-void EditorSceneImporterFBXConv::_add_surface(State& state,Ref<Mesh>& m,const Dictionary &part) {
-
-	if (part.has("meshpartid")) {
-
-		String id = part["meshpartid"];
-		ERR_FAIL_COND(!state.surface_cache.has(id));
-
-
-		Ref<Material> mat;
-		if (part.has("materialid")) {
-			String matid=part["materialid"];
-			if (state.material_cache.has(matid)) {
-				mat=state.material_cache[matid];
-			}
-		}
-		int idx = m->get_surface_count();
-
-		Array array = state.surface_cache[id].array;
-		PoolVector<float> indices = array[Mesh::ARRAY_BONES];
-		if (indices.size() && part.has("bones")) {
-
-
-			Map<int,int> index_map;
-
-			Array bones=part["bones"];
-
-			for(int i=0;i<bones.size();i++) {
-
-				Dictionary bone=bones[i];
-				String name=_id(bone["node"]);
-
-				if (state.bones.has(name)) {
-					int idx=state.bones[name].skeleton->find_bone(name);
-					if (idx==-1)
-						idx=0;
-					index_map[i]=idx;
-				}
-			}
-
-
-
-			int ilen=indices.size();
-			{
-				PoolVector<float>::Write iw=indices.write();
-				for(int j=0;j<ilen;j++) {
-					int b = iw[j];
-					ERR_CONTINUE(!index_map.has(b));
-					b=index_map[b];
-					iw[j]=b;
-				}
-			}
-
-			array[Mesh::ARRAY_BONES]=indices;
-
-
-		}
-
-		m->add_surface(state.surface_cache[id].primitive,array);
-		m->surface_set_material(idx,mat);
-		m->surface_set_name(idx,id);
-	}
-
-}
-
-Error EditorSceneImporterFBXConv::_parse_nodes(State& state,const Array &p_nodes,Node* p_base) {
-
-	for(int i=0;i<p_nodes.size();i++) {
-
-		Dictionary n = p_nodes[i];
-		Spatial *node=NULL;
-		bool skip=false;
-
-		String id;
-		if (n.has("id")) {
-			id=_id(n["id"]);
-		}
-
-		print_line("ID: "+id);
-
-		if (state.skeletons.has(id)) {
-
-			Skeleton *skeleton = state.skeletons[id];
-			node=skeleton;
-			skeleton->localize_rests();
-			print_line("IS SKELETON! ");
-		} else if (state.bones.has(id)) {
-			if (p_base)
-				node=Object::cast_to<Spatial>(p_base);
-			if (!state.bones[id].has_anim_chan) {
-				print_line("no has anim "+id);
-			}
-			skip=true;
-		} else if (n.has("parts")) {
-			//is a mesh
-			MeshInstance *mesh = memnew( MeshInstance );
-			node=mesh;
-
-			Array parts=n["parts"];
-			String long_identifier;
-			for(int j=0;j<parts.size();j++) {
-
-				Dictionary part=parts[j];
-				if (part.has("meshpartid")) {
-					String partid=part["meshpartid"];
-					long_identifier+=partid;
-				}
-			}
-
-			Ref<Mesh> m;
-
-			if (state.mesh_cache.has(long_identifier)) {
-				m=state.mesh_cache[long_identifier];
-			} else {
-				m = Ref<Mesh>( memnew( Mesh ) );
-
-				//and parts are surfaces
-				for(int j=0;j<parts.size();j++) {
-
-					Dictionary part=parts[j];
-					if (part.has("meshpartid")) {
-						_add_surface(state,m,part);
-					}
-				}
-
-
-				state.mesh_cache[long_identifier]=m;
-			}
-
-			mesh->set_mesh(m);
-		}
-
-		if (!skip) {
-
-			if (!node) {
-				node = memnew( Spatial );
-			}
-
-			node->set_name(id);
-			node->set_transform(_get_transform(n));
-			p_base->add_child(node);
-			node->set_owner(state.scene);
-		}
-
-
-		if (n.has("children")) {
-			Error err = _parse_nodes(state,n["children"],node);
-			if (err)
-				return err;
-		}
-	}
-
-	return OK;
-}
-
-
-void EditorSceneImporterFBXConv::_parse_materials(State& state) {
-
-	for(int i=0;i<state.materials.size();i++)	 {
-
-		Dictionary material = state.materials[i];
-
-		ERR_CONTINUE(!material.has("id"));
-		String id = _id(material["id"]);
-
-		Ref<SpatialMaterial> mat = memnew( SpatialMaterial );
-
-		if (material.has("diffuse")) {
-			mat->set_parameter(SpatialMaterial::PARAM_DIFFUSE,_get_color(material["diffuse"]));
-		}
-
-		if (material.has("specular")) {
-			mat->set_parameter(SpatialMaterial::PARAM_SPECULAR,_get_color(material["specular"]));
-		}
-
-		if (material.has("emissive")) {
-			mat->set_parameter(SpatialMaterial::PARAM_EMISSION,_get_color(material["emissive"]));
-		}
-
-		if (material.has("shininess")) {
-			float exp = material["shininess"];
-			mat->set_parameter(SpatialMaterial::PARAM_SPECULAR_EXP,exp);
-		}
-
-		if (material.has("opacity")) {
-			Color c = mat->get_parameter(SpatialMaterial::PARAM_DIFFUSE);
-			c.a=material["opacity"];
-			mat->set_parameter(SpatialMaterial::PARAM_DIFFUSE,c);
-		}
-
-
-		if (material.has("textures")) {
-
-			Array textures = material["textures"];
-			for(int j=0;j<textures.size();j++) {
-
-				Dictionary texture=textures[j];
-				Ref<Texture> tex;
-				if (texture.has("filename")) {
-
-
-					String filename=texture["filename"];
-					String path=state.base_path+"/"+filename.replace("\\","/");
-					if (state.texture_cache.has(path)) {
-						tex=state.texture_cache[path];
-					} else {
-						tex = ResourceLoader::load(path,"ImageTexture");
-						if (tex.is_null()) {
-							if (state.missing_deps)
-								state.missing_deps->push_back(path);
-						}
-						state.texture_cache[path]=tex; //add anyway
-					}
-				}
-
-				if (tex.is_valid() && texture.has("type")) {
-
-					String type=texture["type"];
-					if (type=="DIFFUSE")
-						mat->set_texture(SpatialMaterial::PARAM_DIFFUSE,tex);
-					else if (type=="SPECULAR")
-						mat->set_texture(SpatialMaterial::PARAM_SPECULAR,tex);
-					else if (type=="SHININESS")
-						mat->set_texture(SpatialMaterial::PARAM_SPECULAR_EXP,tex);
-					else if (type=="NORMAL")
-						mat->set_texture(SpatialMaterial::PARAM_NORMAL,tex);
-					else if (type=="EMISSIVE")
-						mat->set_texture(SpatialMaterial::PARAM_EMISSION,tex);
-				}
-
-			}
-		}
-
-		state.material_cache[id]=mat;
-
-	}
-
-}
-
-void EditorSceneImporterFBXConv::_parse_surfaces(State& state) {
-
-	for(int i=0;i<state.meshes.size();i++)	 {
-
-		Dictionary mesh = state.meshes[i];
-
-		ERR_CONTINUE(!mesh.has("attributes"));
-		ERR_CONTINUE(!mesh.has("vertices"));
-		ERR_CONTINUE(!mesh.has("parts"));
-
-		print_line("MESH #"+itos(i));
-
-		Array attrlist=mesh["attributes"];
-		Array vertices=mesh["vertices"];
-		bool exists[Mesh::ARRAY_MAX];
-		int ofs[Mesh::ARRAY_MAX];
-		int weight_max=0;
-		int binormal_ofs=-1;
-		int weight_ofs[4];
-
-		for(int j=0;j<Mesh::ARRAY_MAX;j++) {
-			exists[j]=false;
-			ofs[j]=0;
-		}
-		exists[Mesh::ARRAY_INDEX]=true;
-		float stride=0;
-
-		for(int j=0;j<attrlist.size();j++) {
-
-			String attr=attrlist[j];
-			if (attr=="POSITION") {
-				exists[Mesh::ARRAY_VERTEX]=true;
-				ofs[Mesh::ARRAY_VERTEX]=stride;
-				stride+=3;
-			} else if (attr=="NORMAL") {
-				exists[Mesh::ARRAY_NORMAL]=true;
-				ofs[Mesh::ARRAY_NORMAL]=stride;
-				stride+=3;
-			} else if (attr=="COLOR") {
-				exists[Mesh::ARRAY_COLOR]=true;
-				ofs[Mesh::ARRAY_COLOR]=stride;
-				stride+=4;
-			} else if (attr=="COLORPACKED") {
-				stride+=1; //ignore
-			} else if (attr=="TANGENT") {
-				exists[Mesh::ARRAY_TANGENT]=true;
-				ofs[Mesh::ARRAY_TANGENT]=stride;
-				stride+=3;
-			} else if (attr=="BINORMAL") {
-				binormal_ofs=stride;
-				stride+=3;
-			} else if (attr=="TEXCOORD0") {
-				exists[Mesh::ARRAY_TEX_UV]=true;
-				ofs[Mesh::ARRAY_TEX_UV]=stride;
-				stride+=2;
-			} else if (attr=="TEXCOORD1") {
-				exists[Mesh::ARRAY_TEX_UV2]=true;
-				ofs[Mesh::ARRAY_TEX_UV2]=stride;
-				stride+=2;
-			} else if (attr.begins_with("TEXCOORD")) {
-				stride+=2;
-			} else if (attr.begins_with("BLENDWEIGHT")) {
-				int idx=attr.replace("BLENDWEIGHT","").to_int();
-				if (idx==0) {
-					exists[Mesh::ARRAY_BONES]=true;
-					ofs[Mesh::ARRAY_BONES]=stride;
-					exists[Mesh::ARRAY_WEIGHTS]=true;
-					ofs[Mesh::ARRAY_WEIGHTS]=stride+1;
-				} if (idx<4) {
-					weight_ofs[idx]=stride;
-					weight_max=MAX(weight_max,idx+1);
-				}
-
-				stride+=2;
-			}
-
-			print_line("ATTR "+attr+" OFS: "+itos(stride));
-
-		}
-
-		Array parts=mesh["parts"];
-
-		for(int j=0;j<parts.size();j++) {
-
-
-
-			Dictionary part=parts[j];
-			ERR_CONTINUE(!part.has("indices"));
-			ERR_CONTINUE(!part.has("id"));
-
-			print_line("PART: "+String(part["id"]));
-			Array indices=part["indices"];
-			Map<int,int> iarray;
-			Map<int,int> array;
-
-			for(int k=0;k<indices.size();k++) {
-
-				int idx = indices[k];
-				if (!iarray.has(idx)) {
-					int map_to=array.size();
-					iarray[idx]=map_to;
-					array[map_to]=idx;
-				}
-			}
-
-			print_line("indices total "+itos(indices.size())+" vertices used: "+itos(array.size()));
-
-			Array arrays;
-			arrays.resize(Mesh::ARRAY_MAX);
-
-
-
-			for(int k=0;k<Mesh::ARRAY_MAX;k++) {
-
-
-				if (!exists[k])
-					continue;
-				print_line("exists: "+itos(k));
-				int lofs = ofs[k];
-				switch(k) {
-
-					case Mesh::ARRAY_VERTEX:
-					case Mesh::ARRAY_NORMAL: {
-
-						PoolVector<Vector3> vtx;
-						vtx.resize(array.size());
-						{
-							int len=array.size();
-							PoolVector<Vector3>::Write w = vtx.write();
-							for(int l=0;l<len;l++) {
-
-								int pos = array[l];
-								w[l].x=vertices[pos*stride+lofs+0];
-								w[l].y=vertices[pos*stride+lofs+1];
-								w[l].z=vertices[pos*stride+lofs+2];
-							}
-						}
-						arrays[k]=vtx;
-
-					} break;
-					case Mesh::ARRAY_TANGENT: {
-
-						if (binormal_ofs<0)
-							break;
-
-						PoolVector<float> tangents;
-						tangents.resize(array.size()*4);
-						{
-							int len=array.size();
-
-							PoolVector<float>::Write w = tangents.write();
-							for(int l=0;l<len;l++) {
-
-								int pos = array[l];
-								Vector3 n;
-								n.x=vertices[pos*stride+ofs[Mesh::ARRAY_NORMAL]+0];
-								n.y=vertices[pos*stride+ofs[Mesh::ARRAY_NORMAL]+1];
-								n.z=vertices[pos*stride+ofs[Mesh::ARRAY_NORMAL]+2];
-								Vector3 t;
-								t.x=vertices[pos*stride+lofs+0];
-								t.y=vertices[pos*stride+lofs+1];
-								t.z=vertices[pos*stride+lofs+2];
-								Vector3 bi;
-								bi.x=vertices[pos*stride+binormal_ofs+0];
-								bi.y=vertices[pos*stride+binormal_ofs+1];
-								bi.z=vertices[pos*stride+binormal_ofs+2];
-								float d = bi.dot(n.cross(t));
-
-								w[l*4+0]=t.x;
-								w[l*4+1]=t.y;
-								w[l*4+2]=t.z;
-								w[l*4+3]=d;
-
-							}
-						}
-						arrays[k]=tangents;
-
-					} break;
-					case Mesh::ARRAY_COLOR: {
-
-						PoolVector<Color> cols;
-						cols.resize(array.size());
-						{
-							int len=array.size();
-							PoolVector<Color>::Write w = cols.write();
-							for(int l=0;l<len;l++) {
-
-								int pos = array[l];
-								w[l].r=vertices[pos*stride+lofs+0];
-								w[l].g=vertices[pos*stride+lofs+1];
-								w[l].b=vertices[pos*stride+lofs+2];
-								w[l].a=vertices[pos*stride+lofs+3];
-							}
-						}
-						arrays[k]=cols;
-
-					} break;
-					case Mesh::ARRAY_TEX_UV:
-					case Mesh::ARRAY_TEX_UV2: {
-
-						PoolVector<Vector2> uvs;
-						uvs.resize(array.size());
-						{
-							int len=array.size();
-							PoolVector<Vector2>::Write w = uvs.write();
-							for(int l=0;l<len;l++) {
-
-								int pos = array[l];
-								w[l].x=vertices[pos*stride+lofs+0];
-								w[l].y=vertices[pos*stride+lofs+1];
-								w[l].y=1.0-w[l].y;
-							}
-						}
-						arrays[k]=uvs;
-
-					} break;
-					case Mesh::ARRAY_BONES:
-					case Mesh::ARRAY_WEIGHTS: {
-
-						PoolVector<float> arr;
-						arr.resize(array.size()*4);
-						int po=k==Mesh::ARRAY_WEIGHTS?1:0;
-						lofs=ofs[Mesh::ARRAY_BONES];
-						{
-							int len=array.size();
-
-							PoolVector<float>::Write w = arr.write();
-							for(int l=0;l<len;l++) {
-
-								int pos = array[l];
-
-								for(int m=0;m<4;m++) {
-
-									float val=0;
-									if (m<=weight_max)
-										val=vertices[pos*stride+lofs+m*2+po];
-									w[l*4+m]=val;
-								}
-							}
-						}
-
-						arrays[k]=arr;
-					} break;
-					case Mesh::ARRAY_INDEX: {
-
-						PoolVector<int> arr;
-						arr.resize(indices.size());
-						{
-							int len=indices.size();
-
-							PoolVector<int>::Write w = arr.write();
-							for(int l=0;l<len;l++) {
-
-								w[l]=iarray[ indices[l] ];
-							}
-						}
-
-						arrays[k]=arr;
-
-					} break;
-
-
-				}
-
-
-			}
-
-			Mesh::PrimitiveType pt=Mesh::PRIMITIVE_TRIANGLES;
-
-			if (part.has("type")) {
-				String type=part["type"];
-				if (type=="LINES")
-					pt=Mesh::PRIMITIVE_LINES;
-				else if (type=="POINTS")
-					pt=Mesh::PRIMITIVE_POINTS;
-				else if (type=="TRIANGLE_STRIP")
-					pt=Mesh::PRIMITIVE_TRIANGLE_STRIP;
-				else if (type=="LINE_STRIP")
-					pt=Mesh::PRIMITIVE_LINE_STRIP;
-			}
-
-			if (pt==Mesh::PRIMITIVE_TRIANGLES) {
-				PoolVector<int> ia=arrays[Mesh::ARRAY_INDEX];
-				int len=ia.size();
-				{
-					PoolVector<int>::Write w=ia.write();
-					for(int l=0;l<len;l+=3) {
-						SWAP(w[l+1],w[l+2]);
-					}
-				}
-				arrays[Mesh::ARRAY_INDEX]=ia;
-
-
-			}
-			SurfaceInfo si;
-			si.array=arrays;
-			si.primitive=pt;
-			state.surface_cache[_id(part["id"])]=si;
-
-		}
-	}
-}
-
-
-Error EditorSceneImporterFBXConv::_parse_animations(State& state) {
-
-	AnimationPlayer *ap = memnew( AnimationPlayer );
-
-	state.scene->add_child(ap);
-	ap->set_owner(state.scene);
-
-	for(int i=0;i<state.animations.size();i++) {
-
-		Dictionary anim = state.animations[i];
-		ERR_CONTINUE(!anim.has("id"));
-		Ref<Animation> an = memnew( Animation );
-		an->set_name(_id(anim["id"]));
-
-
-		if (anim.has("bones")) {
-
-			Array bone_tracks = anim["bones"];
-			for(int j=0;j<bone_tracks.size();j++) {
-				Dictionary bone_track=bone_tracks[j];
-				String bone = bone_track["boneId"];
-				if (!bone_track.has("keyframes"))
-					continue;
-				if (!state.bones.has(bone))
-					continue;
-
-				Skeleton *sk = state.bones[bone].skeleton;
-
-				if (!sk)
-					continue;
-				int bone_idx=sk->find_bone(bone);
-				if (bone_idx==-1)
-					continue;
-
-
-
-				String path = state.scene->get_path_to(sk);
-				path+=":"+bone;
-				an->add_track(Animation::TYPE_TRANSFORM);
-				int tidx = an->get_track_count()-1;
-				an->track_set_path(tidx,path);
-
-
-				Dictionary parent_xform_dict;
-				Dictionary xform_dict;
-
-				if (state.bones.has(bone)) {
-					xform_dict=state.bones[bone].node;
-				}
-
-
-				Array parent_keyframes;
-				if (sk->get_bone_parent(bone_idx)!=-1) {
-					String parent_name = sk->get_bone_name(sk->get_bone_parent(bone_idx));
-					if (state.bones.has(parent_name)) {
-						parent_xform_dict=state.bones[parent_name].node;
-					}
-
-					print_line("parent for "+bone+"? "+parent_name+" XFD: "+String(Variant(parent_xform_dict)));
-					for(int k=0;k<bone_tracks.size();k++) {
-						Dictionary d = bone_tracks[k];
-						if (d["boneId"]==parent_name) {
-							parent_keyframes=d["keyframes"];
-							print_line("found keyframes");
-							break;
-						}
-					}
-
-
-				}
-
-				print_line("BONE XFD "+String(Variant(xform_dict)));
-
-				Array keyframes=bone_track["keyframes"];
-
-				for(int k=0;k<keyframes.size();k++) {
-
-					Dictionary key=keyframes[k];
-					Transform xform=_get_transform_mixed(key,xform_dict);
-					float time = key["keytime"];
-					time=time/1000.0;
-#if 0
-					if (parent_keyframes.size()) {
-						//localize
-						print_line(itos(k)+" localizate for: "+bone);
-
-						float prev_kt=-1;
-						float kt;
-						int idx=0;
-
-						for(int l=0;l<parent_keyframes.size();l++) {
-
-							Dictionary d=parent_keyframes[l];
-							kt=d["keytime"];
-							kt=kt/1000.0;
-							if (kt>time)
-								break;
-							prev_kt=kt;
-							idx++;
-
-						}
-
-						Transform t;
-						if (idx==0) {
-							t=_get_transform_mixed(parent_keyframes[0],parent_xform_dict);
-						} else if (idx==parent_keyframes.size()){
-							t=_get_transform_mixed(parent_keyframes[idx-1],parent_xform_dict);
-						} else {
-							t=_get_transform_mixed(parent_keyframes[idx-1],parent_xform_dict);
-							float d = (time-prev_kt)/(kt-prev_kt);
-							if (d>0) {
-								Transform t2=_get_transform_mixed(parent_keyframes[idx],parent_xform_dict);
-								t=t.interpolate_with(t2,d);
-							} else {
-								print_line("exact: "+rtos(kt));
-							}
-						}
-
-						xform = t.affine_inverse() * xform; //localize
-					} else if (!parent_xform_dict.empty()) {
-						Transform t = _get_transform(parent_xform_dict);
-						xform = t.affine_inverse() * xform; //localize
-					}
-#endif
-
-					xform = sk->get_bone_rest(bone_idx).affine_inverse() * xform;
-
-
-					Quat q = xform.basis;
-					q.normalize();
-					Vector3 s = xform.basis.get_scale();
-					Vector3 l = xform.origin;
-
-
-
-					an->transform_track_insert_key(tidx,time,l,q,s);
-
-				}
-
-			}
-
-
-		}
-
-
-		ap->add_animation(_id(anim["id"]),an);
-
-	}
-
-	return OK;
-}
-
-Error EditorSceneImporterFBXConv::_parse_json(State& state, const String &p_path) {
-
-	//not the happiest....
-	Vector<uint8_t> data = FileAccess::get_file_as_array(p_path);
-	ERR_FAIL_COND_V(!data.size(),ERR_FILE_CANT_OPEN);
-	String str;
-	bool utferr = str.parse_utf8((const char*)data.ptr(),data.size());
-	ERR_FAIL_COND_V(utferr,ERR_PARSE_ERROR);
-
-	Dictionary dict;
-	Error err = dict.parse_json(str);
-	str=String(); //free mem immediately
-	ERR_FAIL_COND_V(err,err);
-
-	if (dict.has("meshes"))
-		state.meshes=dict["meshes"];
-	if (dict.has("materials"))
-		state.materials=dict["materials"];
-	if (dict.has("nodes"))
-		state.nodes=dict["nodes"];
-	if (dict.has("animations"))
-		state.animations=dict["animations"];
-
-
-	state.scene = memnew( Spatial );
-	_detect_bones(state);
-	_parse_surfaces(state);
-	_parse_materials(state);
-	err = _parse_nodes(state,state.nodes,state.scene);
-	if (err)
-		return err;
-
-	if (state.import_animations) {
-		err = _parse_animations(state);
-		if (err)
-			return err;
-	}
-
-	print_line("JSON PARSED O-K!");
-
-	return OK;
-}
-
-Error EditorSceneImporterFBXConv::_parse_fbx(State& state,const String& p_path) {
-
-	state.base_path=p_path.get_base_dir();
-
-	if (p_path.to_lower().ends_with("g3dj")) {
-		return _parse_json(state,p_path.basename()+".g3dj");
-	}
-
-	String tool = EDITOR_DEF("fbxconv/path","");
-	ERR_FAIL_COND_V( !FileAccess::exists(tool),ERR_UNCONFIGURED);
-	String wine = EDITOR_DEF("fbxconv/use_wine","");
-
-	List<String> args;
-	String path=p_path;
-	if (wine!="") {
-		List<String> wpargs;
-		wpargs.push_back("-w");
-		wpargs.push_back(p_path);
-		String pipe; //winepath to convert to windows path
-		int wpres;
-		Error wperr = OS::get_singleton()->execute(wine+"path",wpargs,true,NULL,&pipe,&wpres);
-		ERR_FAIL_COND_V(wperr!=OK,ERR_CANT_CREATE);
-		ERR_FAIL_COND_V(wpres!=0,ERR_CANT_CREATE);
-		path=pipe.strip_edges();
-		args.push_back(tool);
-		tool=wine;
-	}
-
-	args.push_back("-o");
-	args.push_back("G3DJ");
-	args.push_back(path);
-
-	int res;
-	Error err = OS::get_singleton()->execute(tool,args,true,NULL,NULL,&res);
-	ERR_FAIL_COND_V(err!=OK,ERR_CANT_CREATE);
-	ERR_FAIL_COND_V(res!=0,ERR_CANT_CREATE);
-
-	return _parse_json(state,p_path.basename()+".g3dj");
-
-
-}
-
-Node* EditorSceneImporterFBXConv::import_scene(const String& p_path,uint32_t p_flags,List<String> *r_missing_deps,Error* r_err){
-
-	State state;
-	state.scene=NULL;
-	state.missing_deps=r_missing_deps;
-	state.import_animations=p_flags&IMPORT_ANIMATION;
-	Error err = _parse_fbx(state,p_path);
-	if (err!=OK) {
-		if (r_err)
-			*r_err=err;
-		return NULL;
-	}
-
-
-	return state.scene;
-}
-Ref<Animation> EditorSceneImporterFBXConv::import_animation(const String& p_path,uint32_t p_flags){
-
-
-	return Ref<Animation>();
-}
-
-
-EditorSceneImporterFBXConv::EditorSceneImporterFBXConv() {
-
-	EDITOR_DEF("fbxconv/path","");
-#ifndef WINDOWS_ENABLED
-	EDITOR_DEF("fbxconv/use_wine","");
-	EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING,"fbxconv/use_wine",PROPERTY_HINT_GLOBAL_FILE));
-	EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING,"fbxconv/path",PROPERTY_HINT_GLOBAL_FILE));
-#else
-	EditorSettings::get_singleton()->add_property_hint(PropertyInfo(Variant::STRING,"fbxconv/path",PROPERTY_HINT_GLOBAL_FILE,"exe"));
-#endif
-
-}
-#endif

editor/io_plugins/editor_scene_importer_fbxconv.h

@@ -1,112 +0,0 @@
-/*************************************************************************/
-/*  editor_scene_importer_fbxconv.h                                      */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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 EDITOR_SCENE_IMPORTER_FBXCONV_H
-#define EDITOR_SCENE_IMPORTER_FBXCONV_H
-
-#include "editor/io_plugins/editor_scene_import_plugin.h"
-#include "scene/3d/skeleton.h"
-
-#if 0
-
-class EditorSceneImporterFBXConv : public EditorSceneImporter {
-
-	GDCLASS(EditorSceneImporterFBXConv,EditorSceneImporter );
-
-
-	struct BoneInfo {
-
-		Skeleton *skeleton;
-		Transform rest;
-		int index;
-		bool has_anim_chan;
-		bool has_rest;
-		Dictionary node;
-		BoneInfo() {
-			has_rest=false;
-			skeleton=NULL;
-			index=-1;
-			has_anim_chan=false;
-		}
-	};
-
-	struct SurfaceInfo {
-		Array array;
-		Mesh::PrimitiveType primitive;
-	};
-
-	struct State {
-
-		Node *scene;
-		Array meshes;
-		Array materials;
-		Array nodes;
-		Array animations;
-		Map<String,BoneInfo > bones;
-		Map<String,Skeleton*> skeletons;
-		Map<String,Ref<Mesh> > mesh_cache;
-		Map<String,SurfaceInfo> surface_cache;
-		Map<String,Ref<Material> > material_cache;
-		Map<String,Ref<Texture> > texture_cache;
-		List<String> *missing_deps;
-		String base_path;
-		bool import_animations;
-	};
-
-	String _id(const String& p_id) const;
-
-	Transform _get_transform_mixed(const Dictionary& d, const Dictionary& dbase);
-	Transform _get_transform(const Dictionary& d);
-	Color _get_color(const Array& a);
-	void _detect_bones_in_nodes(State& state,const Array& p_nodes);
-	void _detect_bones(State& state);
-
-	Error _parse_bones(State& state,const Array &p_bones,Skeleton* p_skeleton);
-	void _parse_skeletons(const String& p_name,State& state, const Array &p_nodes, Skeleton*p_skeleton=NULL, int p_parent=-1);
-
-	void _add_surface(State& state,Ref<Mesh>& m,const Dictionary &part);
-	Error _parse_nodes(State& state,const Array &p_nodes,Node* p_base);
-	Error _parse_animations(State& state);
-	void _parse_materials(State& state);
-	void _parse_surfaces(State& state);
-	Error _parse_json(State& state,const String& p_path);
-	Error _parse_fbx(State &state, const String &p_path);
-
-public:
-
-	virtual uint32_t get_import_flags() const;
-	virtual void get_extensions(List<String> *r_extensions) const;
-	virtual Node* import_scene(const String& p_path,uint32_t p_flags,List<String> *r_missing_deps=NULL,Error* r_err=NULL);
-	virtual Ref<Animation> import_animation(const String& p_path,uint32_t p_flags);
-
-	EditorSceneImporterFBXConv();
-};
-
-#endif // EDITOR_SCENE_IMPORTER_FBXCONV_H
-#endif

editor/io_plugins/editor_texture_import_plugin.cpp

@@ -1,1896 +0,0 @@
-/*************************************************************************/
-/*  editor_texture_import_plugin.cpp                                     */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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.                */
-/*************************************************************************/
-#include "editor_texture_import_plugin.h"
-
-#if 0
-#include "editor/editor_node.h"
-#include "editor/editor_settings.h"
-#include "editor_atlas.h"
-#include "io/image_loader.h"
-#include "io/marshalls.h"
-#include "io/resource_saver.h"
-#include "project_settings.h"
-#include "scene/gui/button_group.h"
-#include "scene/gui/check_button.h"
-#include "scene/gui/margin_container.h"
-#include "scene/io/resource_format_image.h"
-
-#include "thirdparty/misc/md5.h"
-
-static const char *flag_names[]={
-	("Streaming Format"),
-	("Fix Border Alpha"),
-	("Alpha Bit Hint"),
-	("Compress Extra (PVRTC2)"),
-	("No MipMaps"),
-	("Repeat"),
-	("Filter (Magnifying)"),
-	("Premultiply Alpha"),
-	("Convert SRGB->Linear"),
-	("Convert NormalMap to XY"),
-	("Use Anisotropy"),
-	NULL
-};
-
-#if 0 // not used
-static const char *flag_short_names[]={
-	"Stream",
-	"FixBorder",
-	"AlphBit",
-	"ExtComp",
-	"NoMipMap",
-	"Repeat",
-	"Filter",
-	"PMAlpha",
-	"ToLinear",
-	"ToRG",
-	"Anisoropic",
-	NULL
-};
-#endif
-
-
-void EditorImportTextureOptions::set_format(EditorTextureImportPlugin::ImageFormat p_format) {
-
-	updating=true;
-	format->select(p_format);
-	if (p_format==EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_DISK_LOSSY) {
-		quality_vb->show();
-	} else {
-		quality_vb->hide();
-	}
-
-	updating=false;
-
-}
-
-EditorTextureImportPlugin::ImageFormat EditorImportTextureOptions::get_format() const{
-
-	return (EditorTextureImportPlugin::ImageFormat)format->get_selected();
-
-}
-
-void EditorImportTextureOptions::set_flags(uint32_t p_flags){
-
-	updating=true;
-	for(int i=0;i<items.size();i++) {
-
-		items[i]->set_checked(0,p_flags&(1<<i));
-	}
-	updating=false;
-
-}
-
-void EditorImportTextureOptions::set_quality(float p_quality) {
-
-	quality->set_value(p_quality);
-}
-
-float EditorImportTextureOptions::get_quality() const {
-
-    return quality->get_value();
-}
-
-
-uint32_t EditorImportTextureOptions::get_flags() const{
-
-	uint32_t f=0;
-	for(int i=0;i<items.size();i++) {
-
-		if (items[i]->is_checked(0))
-			f|=(1<<i);
-	}
-
-	return f;
-}
-
-void EditorImportTextureOptions::_changedp(int p_value) {
-
-	_changed();
-}
-
-void EditorImportTextureOptions::_changed() {
-
-	if (updating)
-		return;
-	if (format->get_selected()==EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_DISK_LOSSY) {
-		quality_vb->show();
-	} else {
-		quality_vb->hide();
-	}
-
-	emit_signal("changed");
-}
-
-
-void EditorImportTextureOptions::_bind_methods() {
-
-	ClassDB::bind_method("_changed",&EditorImportTextureOptions::_changed);
-	ClassDB::bind_method("_changedp",&EditorImportTextureOptions::_changedp);
-
-	ADD_SIGNAL(MethodInfo("changed"));
-}
-
-
-void EditorImportTextureOptions::_notification(int p_what) {
-
-	if (p_what==NOTIFICATION_ENTER_TREE) {
-
-		flags->connect("item_edited",this,"_changed");
-		format->connect("item_selected",this,"_changedp");
-	}
-}
-
-void EditorImportTextureOptions::show_2d_notice() {
-
-	//notice_for_2d->show();
-}
-
-EditorImportTextureOptions::EditorImportTextureOptions() {
-
-
-	add_constant_override("separation",3);
-	updating=false;
-	format = memnew( OptionButton );
-
-	format->add_item(TTR("Uncompressed"),EditorTextureImportPlugin::IMAGE_FORMAT_UNCOMPRESSED);
-	format->add_item(TTR("Compress Lossless (PNG)"),EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_DISK_LOSSLESS);
-	format->add_item(TTR("Compress Lossy (WebP)"),EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_DISK_LOSSY);
-	format->add_item(TTR("Compress (VRAM)"),EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_RAM);
-
-
-	add_margin_child(TTR("Texture Format"),format);
-
-	quality_vb = memnew( VBoxContainer );
-
-	HBoxContainer *quality_hb = memnew(HBoxContainer);
-	HSlider *hs = memnew( HSlider );
-	hs->set_h_size_flags(SIZE_EXPAND_FILL);
-	hs->set_stretch_ratio(0.8);
-	quality_hb->add_child(hs);
-	quality_hb->set_h_size_flags(SIZE_EXPAND_FILL);
-	SpinBox *sb = memnew( SpinBox );
-	sb->set_h_size_flags(SIZE_EXPAND_FILL);
-	sb->set_stretch_ratio(0.2);
-	quality_hb->add_child(sb);
-	sb->share(hs);
-	hs->set_min(0);
-	hs->set_max(1.0);
-	hs->set_step(0.01);
-	hs->set_value(0.7);
-	quality=hs;
-	quality_vb->add_margin_child(TTR("Texture Compression Quality (WebP):"),quality_hb);
-
-	add_child(quality_vb);
-
-	flags = memnew( Tree );
-	flags->set_hide_root(true);
-	TreeItem *root = flags->create_item();
-
-
-
-	const char ** fname=flag_names;
-
-	while( *fname ) {
-
-		TreeItem*ti = flags->create_item(root);
-		ti->set_cell_mode(0,TreeItem::CELL_MODE_CHECK);
-		ti->set_text(0,*fname);
-		ti->set_editable(0,true);
-		items.push_back(ti);
-		fname++;
-	}
-
-	add_margin_child(TTR("Texture Options"),flags,true);
-
-
-}
-
-///////////////////////////////////////////////////////////
-
-
-
-
-class EditorTextureImportDialog : public ConfirmationDialog  {
-
-	GDCLASS(EditorTextureImportDialog,ConfirmationDialog);
-
-
-
-	HBoxContainer *mode_hb;
-	CheckBox *mode_check[EditorTextureImportPlugin::MODE_MAX];
-
-	EditorImportTextureOptions *texture_options;
-
-	EditorTextureImportPlugin::Mode mode;
-	//EditorNode *editor;
-
-	LineEdit *import_path;
-	LineEdit *save_path;
-	EditorFileDialog *file_select;
-	EditorFileDialog *save_file_select;
-	EditorDirDialog *save_select;
-	OptionButton *texture_action;
-	ConfirmationDialog *error_dialog;
-	CheckButton *crop_source;
-	SpinBox *size;
-
-	MarginContainer *size_mc;
-	Label* size_label;
-
-	Label* source_label;
-	Label *notice_for_2d;
-
-	EditorTextureImportPlugin *plugin;
-
-	void _mode_changed(int p_mode);
-	void _choose_files(const Vector<String>& p_path);
-	void _choose_file(const String& p_path);
-	void _choose_save_dir(const String& p_path);
-	void _browse();
-	void _browse_target();
-	void _import();
-
-
-protected:
-
-	void _notification(int p_what);
-	static void _bind_methods();
-public:
-
-
-	void setup_multiple_import_3d(const Vector<String>& p_path,const String& p_dest) {
-
-		_mode_changed(EditorTextureImportPlugin::MODE_TEXTURE_3D);
-		_choose_files(p_path);
-		_choose_save_dir(p_dest);
-	}
-
-	void add_sources_and_dest(const Vector<String>& p_path,const String& p_dest) {
-
-		_choose_files(p_path);
-		_choose_save_dir(p_dest);
-	}
-
-	Error import(const String& p_from, const String& p_to, const String& p_preset);
-	void popup_import(const String &p_from=String());
-	EditorTextureImportDialog(EditorTextureImportPlugin *p_plugin=NULL);
-};
-
-
-/////////////////////////////////////////////////////////
-
-
-
-
-void EditorTextureImportDialog::_choose_files(const Vector<String>& p_path) {
-
-	String files;
-	for(int i=0;i<p_path.size();i++) {
-
-		if (i>0)
-			files+=",";
-		files+=p_path[i];
-	}
-	/*
-	if (p_path.size()) {
-		String srctex=p_path[0];
-		String ipath = EditorImportDB::get_singleton()->find_source_path(srctex);
-
-		if (ipath!="")
-			save_path->set_text(ipath.get_base_dir());
-	}*/
-	import_path->set_text(files);
-
-}
-
-
-
-void EditorTextureImportDialog::_choose_file(const String& p_path) {
-
-
-	import_path->set_text(p_path);
-
-}
-void EditorTextureImportDialog::_choose_save_dir(const String& p_path) {
-
-	save_path->set_text(p_path);
-}
-
-
-void EditorTextureImportDialog::_import() {
-
-
-	//ImportMonitorBlock imb;
-
-	Vector<String> files=import_path->get_text().split(",");
-
-	if (!files.size()) {
-
-		error_dialog->set_text(TTR("Please specify some files!"));
-		error_dialog->popup_centered(Size2(200,100)*EDSCALE);
-		return;
-	}
-
-	String dst_path=save_path->get_text();
-
-	if (save_path->get_text().strip_edges()=="") {
-		error_dialog->set_text(TTR("Target path is empty."));
-		error_dialog->popup_centered_minsize();
-		return;
-	}
-
-	if (!save_path->get_text().begins_with("res://")) {
-		error_dialog->set_text(TTR("Target path must be a complete resource path."));
-		error_dialog->popup_centered_minsize();
-		return;
-	}
-
-
-	if (mode!=EditorTextureImportPlugin::MODE_ATLAS && mode!=EditorTextureImportPlugin::MODE_LARGE && !DirAccess::exists(save_path->get_text())) {
-		error_dialog->set_text(TTR("Target path must exist."));
-		error_dialog->popup_centered_minsize();
-		return;
-	}
-
-	if (mode==EditorTextureImportPlugin::MODE_ATLAS) { //atlas
-
-		if (files.size()==0) {
-
-			error_dialog->set_text(TTR("At least one file needed for Atlas."));
-			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
-			return;
-
-		}
-		String dst_file = dst_path;
-		//dst_file=dst_file.basename()+".tex";
-		Ref<ResourceImportMetadata> imd = memnew( ResourceImportMetadata );
-		//imd->set_editor();
-		for(int i=0;i<files.size();i++) {
-			imd->add_source(EditorImportPlugin::validate_source_path(files[i]));
-		}
-		imd->set_option("format",texture_options->get_format());
-		imd->set_option("flags",texture_options->get_flags());
-		imd->set_option("quality",texture_options->get_quality());
-		imd->set_option("atlas",true);
-		imd->set_option("atlas_size",int(size->get_value()));
-		imd->set_option("large",false);
-		imd->set_option("crop",crop_source->is_pressed());
-		imd->set_option("mode",mode);
-
-		Error err = plugin->import(dst_file,imd);
-		if (err) {
-
-			error_dialog->set_text(TTR("Error importing:")+" "+dst_file.get_file());
-			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
-			return;
-
-		}
-	} else if (mode==EditorTextureImportPlugin::MODE_LARGE) { //large
-
-		if (files.size()!=1) {
-
-			error_dialog->set_text(TTR("Only one file is required for large texture."));
-			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
-			return;
-
-		}
-		String dst_file = dst_path;
-		//dst_file=dst_file.basename()+".tex";
-		Ref<ResourceImportMetadata> imd = memnew( ResourceImportMetadata );
-		//imd->set_editor();
-		for(int i=0;i<files.size();i++) {
-			imd->add_source(EditorImportPlugin::validate_source_path(files[i]));
-		}
-		imd->set_option("format",texture_options->get_format());
-		imd->set_option("flags",texture_options->get_flags());
-		imd->set_option("quality",texture_options->get_quality());
-		imd->set_option("atlas",false);
-		imd->set_option("large",true);
-		imd->set_option("large_cell_size",int(size->get_value()));
-		imd->set_option("crop",crop_source->is_pressed());
-		imd->set_option("mode",mode);
-
-		Error err = plugin->import(dst_file,imd);
-		if (err) {
-
-			error_dialog->set_text(TTR("Error importing:")+" "+dst_file.get_file());
-			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
-			return;
-
-		}
-	} else {
-
-
-		for(int i=0;i<files.size();i++) {
-
-			String dst_file = dst_path.plus_file(files[i].get_file());
-			dst_file=dst_file.get_basename()+".tex";
-			Ref<ResourceImportMetadata> imd = memnew( ResourceImportMetadata );
-			//imd->set_editor();
-			imd->add_source(EditorImportPlugin::validate_source_path(files[i]));
-			imd->set_option("format",texture_options->get_format());
-			imd->set_option("flags",texture_options->get_flags());
-			imd->set_option("quality",texture_options->get_quality());
-			imd->set_option("atlas",false);
-			imd->set_option("large",false);
-			imd->set_option("mode",mode);
-
-			Error err = plugin->import(dst_file,imd);
-			if (err) {
-
-				error_dialog->set_text(TTR("Error importing:")+" "+dst_file.get_file());
-				error_dialog->popup_centered(Size2(200,100)*EDSCALE);
-				return;
-
-			}
-		}
-	}
-
-	hide();
-}
-
-void EditorTextureImportDialog::_browse() {
-
-	file_select->popup_centered_ratio();
-}
-
-void EditorTextureImportDialog::_browse_target() {
-
-	if (mode==EditorTextureImportPlugin::MODE_ATLAS || mode==EditorTextureImportPlugin::MODE_LARGE) {
-		save_file_select->popup_centered_ratio();
-	} else {
-		save_select->popup_centered_ratio();
-	}
-
-}
-
-
-void EditorTextureImportDialog::popup_import(const String& p_from) {
-
-	popup_centered(Size2(600,500)*EDSCALE);
-	if (p_from!="") {
-		Ref<ResourceImportMetadata> rimd = ResourceLoader::load_import_metadata(p_from);
-		ERR_FAIL_COND(!rimd.is_valid());
-
-		if (rimd->has_option("mode")) {
-			//new imported stuff uses this option
-			_mode_changed(rimd->get_option("mode"));
-		} else {
-			//this one is for compatibility, will have to guess it
-			if (rimd->has_option("atlas") && rimd->get_option("atlas")) {
-				_mode_changed(EditorTextureImportPlugin::MODE_ATLAS);
-			} else if (rimd->has_option("large") && rimd->get_option("large")) {
-				_mode_changed(EditorTextureImportPlugin::MODE_LARGE);
-			} else {
-				//guess by usage of mipmaps..?
-				_mode_changed(EditorTextureImportPlugin::MODE_TEXTURE_2D);
-			}
-
-		}
-
-		if (mode==EditorTextureImportPlugin::MODE_ATLAS || mode==EditorTextureImportPlugin::MODE_LARGE)
-			save_path->set_text(p_from);
-		else
-			save_path->set_text(p_from.get_base_dir());
-
-		texture_options->set_format(EditorTextureImportPlugin::ImageFormat(int(rimd->get_option("format"))));
-		texture_options->set_flags(rimd->get_option("flags"));
-		texture_options->set_quality(rimd->get_option("quality"));
-		String src = "";
-		for(int i=0;i<rimd->get_source_count();i++) {
-			if (i>0)
-				src+=",";
-			src+=EditorImportPlugin::expand_source_path(rimd->get_source_path(i));
-		}
-		import_path->set_text(src);
-	}
-}
-
-
-void EditorTextureImportDialog::_notification(int p_what) {
-
-
-	if (p_what==NOTIFICATION_ENTER_TREE) {
-
-
-		List<String> extensions;
-		ImageLoader::get_recognized_extensions(&extensions);
-		//ResourceLoader::get_recognized_extensions_for_type("PackedTexture",&extensions);
-		file_select->clear_filters();
-		for(int i=0;i<extensions.size();i++) {
-
-			file_select->add_filter("*."+extensions[i]+" ; "+extensions[i].to_upper());
-		}
-	}
-}
-
-Error EditorTextureImportDialog::import(const String& p_from, const String& p_to, const String& p_preset) {
-
-
-	import_path->set_text(p_from);
-	save_path->set_text(p_to);
-	_import();
-
-	return OK;
-}
-
-void EditorTextureImportDialog::_mode_changed(int p_mode) {
-
-	mode = EditorTextureImportPlugin::Mode(p_mode);
-
-	for(int i=0;i<EditorTextureImportPlugin::MODE_MAX;i++) {
-		mode_check[i]->set_pressed(i==mode);
-	}
-
-	if (p_mode==EditorTextureImportPlugin::MODE_ATLAS) {
-
-		size_label->set_text(TTR("Max Texture Size:"));
-		size->set_value(2048);
-		crop_source->show();
-		size_label->show();
-		size->show();
-
-		texture_options->set_flags(EditorTextureImportPlugin::IMAGE_FLAG_FIX_BORDER_ALPHA|EditorTextureImportPlugin::IMAGE_FLAG_NO_MIPMAPS|EditorTextureImportPlugin::IMAGE_FLAG_FILTER);
-		texture_options->set_quality(0.7);
-		texture_options->set_format(EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_DISK_LOSSY);
-		set_title(TTR("Import Textures for Atlas (2D)"));
-
-	} else {
-		crop_source->hide();
-	}
-
-
-	if (p_mode==EditorTextureImportPlugin::MODE_LARGE) {
-
-		size_label->set_text(TTR("Cell Size:"));
-		size->set_value(256);
-		size_label->show();
-		size->show();
-
-		file_select->set_mode(EditorFileDialog::MODE_OPEN_FILE);
-		save_file_select->add_filter("*.largetex;"+TTR("Large Texture"));
-
-		texture_options->set_flags(EditorTextureImportPlugin::IMAGE_FLAG_FIX_BORDER_ALPHA|EditorTextureImportPlugin::IMAGE_FLAG_NO_MIPMAPS|EditorTextureImportPlugin::IMAGE_FLAG_FILTER);
-		texture_options->set_quality(0.7);
-		texture_options->set_format(EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_DISK_LOSSLESS);
-		set_title(TTR("Import Large Textures (2D)"));
-		source_label->set_text(TTR("Source Texture"));
-
-	} else {
-		file_select->set_mode(EditorFileDialog::MODE_OPEN_FILES);
-		save_file_select->add_filter("*.tex;"+TTR("Base Atlas Texture"));
-		source_label->set_text(TTR("Source Texture(s)"));
-	}
-
-	if (p_mode==EditorTextureImportPlugin::MODE_TEXTURE_2D) {
-
-		size_label->hide();
-		size->hide();
-
-		texture_options->set_flags(EditorTextureImportPlugin::IMAGE_FLAG_NO_MIPMAPS|EditorTextureImportPlugin::IMAGE_FLAG_FIX_BORDER_ALPHA|EditorTextureImportPlugin::IMAGE_FLAG_FILTER);
-		texture_options->set_quality(0.7);
-		texture_options->set_format(EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_DISK_LOSSY);
-		notice_for_2d->show();
-		set_title(TTR("Import Textures for 2D"));
-
-	} else {
-		notice_for_2d->hide();
-	}
-
-	if (p_mode==EditorTextureImportPlugin::MODE_TEXTURE_3D) {
-
-		size_label->hide();
-		size->hide();
-		//texture_options->set_flags(EditorTextureImportPlugin::IMAGE_FLAG_);
-		//texture_options->set_flags(EditorTextureImportPlugin::IMAGE_FLAG_NO_MIPMAPS);
-		texture_options->set_flags(EditorTextureImportPlugin::IMAGE_FLAG_FIX_BORDER_ALPHA|EditorTextureImportPlugin::IMAGE_FLAG_FILTER|EditorTextureImportPlugin::IMAGE_FLAG_REPEAT);
-		texture_options->set_format(EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_RAM);
-		set_title(TTR("Import Textures for 3D"));
-	}
-}
-
-void EditorTextureImportDialog::_bind_methods() {
-
-
-	ClassDB::bind_method("_choose_files",&EditorTextureImportDialog::_choose_files);
-	ClassDB::bind_method("_choose_file",&EditorTextureImportDialog::_choose_file);
-	ClassDB::bind_method("_choose_save_dir",&EditorTextureImportDialog::_choose_save_dir);
-	ClassDB::bind_method("_import",&EditorTextureImportDialog::_import);
-	ClassDB::bind_method("_browse",&EditorTextureImportDialog::_browse);
-	ClassDB::bind_method("_browse_target",&EditorTextureImportDialog::_browse_target);
-	ClassDB::bind_method("_mode_changed",&EditorTextureImportDialog::_mode_changed);
-	//ADD_SIGNAL( MethodInfo("imported",PropertyInfo(Variant::OBJECT,"scene")) );
-}
-
-EditorTextureImportDialog::EditorTextureImportDialog(EditorTextureImportPlugin* p_plugin) {
-
-
-
-
-
-	plugin=p_plugin;
-	set_title(TTR("Import Textures"));
-
-	mode_hb = memnew( HBoxContainer );
-	add_child(mode_hb);
-	//set_child_rect(mode_hb);
-
-	VBoxContainer *vbcg = memnew( VBoxContainer);
-
-
-	mode_hb->add_child(vbcg);
-	mode_hb->add_constant_override("separation",15);
-	VBoxContainer *bg = memnew( VBoxContainer );
-	vbcg->add_margin_child("Import Mode",bg);
-
-	for(int i=0;i<EditorTextureImportPlugin::MODE_MAX;i++) {
-		String mode_name[EditorTextureImportPlugin::MODE_MAX]={
-			TTR("2D Texture"),
-			TTR("3D Texture"),
-			TTR("Atlas Texture"),
-			TTR("Large Texture")
-		};
-
-
-		mode_check[i]=memnew(CheckBox);
-		bg->add_child(mode_check[i]);
-		mode_check[i]->set_text(mode_name[i]);
-		mode_check[i]->connect("pressed",this,"_mode_changed",varray(i));
-	}
-
-	VBoxContainer *vbc = memnew(VBoxContainer);
-	mode_hb->add_child(vbc);
-	vbc->set_h_size_flags(SIZE_EXPAND_FILL);
-	vbc->add_constant_override("separation",4);
-
-	notice_for_2d = memnew( Label );
-	notice_for_2d->set_text(TTR("NOTICE: Importing 2D textures is not mandatory. Just copy png/jpg files to the project."));
-	//notice_for_2d->set_custom_minimum_size(Size2(0,50));
-	notice_for_2d->set_autowrap(true);
-	notice_for_2d->hide();
-	vbcg->add_child(notice_for_2d);
-	notice_for_2d->set_v_size_flags(SIZE_EXPAND_FILL);
-	notice_for_2d->set_valign(Label::VALIGN_BOTTOM);
-
-	VBoxContainer *source_vb=memnew(VBoxContainer);
-	MarginContainer *source_mc = vbc->add_margin_child(TTR("Source Texture(s):"),source_vb);
-
-	source_label = Object::cast_to<Label>(vbc->get_child(source_mc->get_index()-1));
-
-	HBoxContainer *hbc = memnew( HBoxContainer );
-	source_vb->add_child(hbc);
-
-	import_path = memnew( LineEdit );
-	import_path->set_h_size_flags(SIZE_EXPAND_FILL);
-	hbc->add_child(import_path);
-	crop_source = memnew( CheckButton );
-	crop_source->set_pressed(true);
-	source_vb->add_child(crop_source);
-	crop_source->set_text(TTR("Crop empty space."));
-
-
-	Button * import_choose = memnew( Button );
-	import_choose->set_text(" .. ");
-	hbc->add_child(import_choose);
-
-	import_choose->connect("pressed", this,"_browse");
-
-	hbc = memnew( HBoxContainer );
-	vbc->add_margin_child(TTR("Target Path:"),hbc);
-
-	size = memnew( SpinBox );
-	size->set_min(128);
-	size->set_max(16384);
-
-
-	size->set_value(256);
-	size_mc=vbc->add_margin_child(TTR("Cell Size:"),size);
-	size_label=Object::cast_to<Label>(vbc->get_child(size_mc->get_index()-1));
-
-
-	save_path = memnew( LineEdit );
-	save_path->set_h_size_flags(SIZE_EXPAND_FILL);
-	hbc->add_child(save_path);
-
-	Button * save_choose = memnew( Button );
-	save_choose->set_text(" .. ");
-	hbc->add_child(save_choose);
-
-	save_choose->connect("pressed", this,"_browse_target");
-
-	file_select = memnew(EditorFileDialog);
-	file_select->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
-	add_child(file_select);
-
-	file_select->connect("files_selected", this,"_choose_files");
-	file_select->connect("file_selected", this,"_choose_file");
-
-	save_file_select = memnew(EditorFileDialog);
-	save_file_select->set_access(EditorFileDialog::ACCESS_RESOURCES);
-	add_child(save_file_select);
-	save_file_select->set_mode(EditorFileDialog::MODE_SAVE_FILE);
-	save_file_select->clear_filters();
-
-	save_file_select->connect("file_selected", this,"_choose_save_dir");
-
-	save_select = memnew(	EditorDirDialog );
-	add_child(save_select);
-
-	//save_select->set_mode(EditorFileDialog::MODE_OPEN_DIR);
-	save_select->connect("dir_selected", this,"_choose_save_dir");
-
-	get_ok()->connect("pressed", this,"_import");
-	get_ok()->set_text(TTR("Import"));
-
-	//move stuff up
-	/*
-	for(int i=0;i<4;i++)
-		vbc->move_child( vbc->get_child( vbc->get_child_count() -1), 0);
-	*/
-
-	error_dialog = memnew ( ConfirmationDialog );
-	add_child(error_dialog);
-	error_dialog->get_ok()->set_text(TTR("Accept"));
-	//error_dialog->get_cancel()->hide();
-
-	set_hide_on_ok(false);
-
-	texture_options = memnew( EditorImportTextureOptions );
-	vbc->add_child(texture_options);
-	texture_options->set_v_size_flags(SIZE_EXPAND_FILL);
-
-	_mode_changed(EditorTextureImportPlugin::MODE_TEXTURE_3D);
-
-
-	//GLOBAL_DEF("import/shared_textures","res://");
-	//Globals::get_singleton()->set_custom_property_info("import/shared_textures",PropertyInfo(Variant::STRING,"import/shared_textures",PROPERTY_HINT_DIR));
-
-
-}
-
-
-
-///////////////////////////////////////////////////////////
-
-
-String EditorTextureImportPlugin::get_name() const {
-
-	return "texture";
-#if 0 //old names, kept for compatibility reference
-	switch(mode) {
-		case MODE_TEXTURE_2D: {
-
-			return "texture_2d";
-		} break;
-		case MODE_TEXTURE_3D: {
-
-			return "texture_3d";
-
-		} break;
-		case MODE_ATLAS: {
-
-			return "texture_atlas";
-		} break;
-		case MODE_LARGE: {
-
-			return "texture_large";
-		} break;
-
-	}
-
-
-	return "";
-#endif
-}
-
-String EditorTextureImportPlugin::get_visible_name() const {
-
-	return TTR("Texture");
-
-}
-void EditorTextureImportPlugin::import_dialog(const String& p_from) {
-
-	dialog->popup_import(p_from);
-}
-
-void EditorTextureImportPlugin::compress_image(EditorExportPlatform::ImageCompression p_mode,Image& image,bool p_smaller) {
-
-
-	switch(p_mode) {
-		case EditorExportPlatform::IMAGE_COMPRESSION_NONE: {
-
-			//do absolutely nothing
-
-		} break;	
-		case EditorExportPlatform::IMAGE_COMPRESSION_BC: {
-
-
-			// for maximum compatibility, BC shall always use mipmaps and be PO2
-			image.resize_to_po2();
-			if (!image.has_mipmaps())
-				image.generate_mipmaps();
-
-			image.compress(Image::COMPRESS_S3TC);
-			/*
-			if (has_alpha) {
-
-				if (flags&IMAGE_FLAG_ALPHA_BIT) {
-					image.convert(Image::FORMAT_DXT5);
-				} else {
-					image.convert(Image::FORMAT_DXT3);
-				}
-			} else {
-
-				image.convert(Image::FORMAT_DXT1);
-			}*/
-
-
-		} break;
-		case EditorExportPlatform::IMAGE_COMPRESSION_PVRTC:
-		case EditorExportPlatform::IMAGE_COMPRESSION_PVRTC_SQUARE: {
-
-			// for maximum compatibility (hi apple!), PVRT shall always
-			// use mipmaps, be PO2 and square
-
-			if (!image.has_mipmaps())
-				image.generate_mipmaps();
-			image.resize_to_po2(true);
-
-			if (p_smaller) {
-
-				image.compress(Image::COMPRESS_PVRTC2);
-				//image.convert(has_alpha ? Image::FORMAT_PVRTC2A : Image::FORMAT_PVRTC2);
-			} else {
-				image.compress(Image::COMPRESS_PVRTC4);
-				//image.convert(has_alpha ? Image::FORMAT_PVRTC4A : Image::FORMAT_PVRTC4);
-			}
-
-		} break;
-		case EditorExportPlatform::IMAGE_COMPRESSION_ETC1: {
-
-			image.resize_to_po2(); //square or not?
-			if (!image.has_mipmaps())
-				image.generate_mipmaps();
-			if (!image.detect_alpha()) {
-				//ETC1 is only opaque
-				image.compress(Image::COMPRESS_ETC);
-			}
-
-		} break;
-		case EditorExportPlatform::IMAGE_COMPRESSION_ETC2: {
-
-
-		} break;
-	}
-
-
-}
-
-Error EditorTextureImportPlugin::import(const String& p_path, const Ref<ResourceImportMetadata>& p_from) {
-
-
-	return import2(p_path,p_from,EditorExportPlatform::IMAGE_COMPRESSION_BC,false);
-}
-
-
-Error EditorTextureImportPlugin::_process_texture_data(Ref<ImageTexture> &texture,int format, float quality,int flags,EditorExportPlatform::ImageCompression p_compr,int tex_flags,float shrink)  {
-
-
-	if (format==IMAGE_FORMAT_COMPRESS_DISK_LOSSLESS || format==IMAGE_FORMAT_COMPRESS_DISK_LOSSY) {
-
-		Image image=texture->get_data();
-		ERR_FAIL_COND_V(image.empty(),ERR_INVALID_DATA);
-
-		bool has_alpha=image.detect_alpha();
-		if (!has_alpha && image.get_format()==Image::FORMAT_RGBA8) {
-
-			image.convert(Image::FORMAT_RGB8);
-
-		}
-
-		if (image.get_format()==Image::FORMAT_RGBA8 && flags&IMAGE_FLAG_FIX_BORDER_ALPHA) {
-
-			image.fix_alpha_edges();
-		}
-
-		if (image.get_format()==Image::FORMAT_RGBA8 && flags&IMAGE_FLAG_PREMULT_ALPHA) {
-
-			image.premultiply_alpha();
-		}
-
-		if (flags&IMAGE_FLAG_CONVERT_NORMAL_TO_XY) {
-			image.normalmap_to_xy();
-		}
-
-		/*
-		if ((image.get_format()==Image::FORMAT_RGB8 || image.get_format()==Image::FORMAT_RGBA8) && flags&IMAGE_FLAG_CONVERT_TO_LINEAR) {
-
-			image.srgb_to_linear();
-		}
-		*/
-
-		if (shrink>1) {
-
-			int orig_w=image.get_width();
-			int orig_h=image.get_height();
-			image.resize(orig_w/shrink,orig_h/shrink,Image::INTERPOLATE_CUBIC);
-			texture->create_from_image(image,tex_flags);
-			texture->set_size_override(Size2(orig_w,orig_h));
-
-
-		} else {
-
-			texture->create_from_image(image,tex_flags);
-		}
-
-
-		if (format==IMAGE_FORMAT_COMPRESS_DISK_LOSSLESS) {
-			texture->set_storage(ImageTexture::STORAGE_COMPRESS_LOSSLESS);
-		} else {
-			texture->set_storage(ImageTexture::STORAGE_COMPRESS_LOSSY);
-		}
-
-
-
-		texture->set_lossy_storage_quality(quality);
-
-
-	} else {
-
-
-		Image image=texture->get_data();
-		ERR_FAIL_COND_V(image.empty(),ERR_INVALID_DATA);
-
-
-		bool has_alpha=image.detect_alpha();
-		if (!has_alpha && image.get_format()==Image::FORMAT_RGBA8) {
-
-			image.convert(Image::FORMAT_RGB8);
-
-		}
-
-		if (image.get_format()==Image::FORMAT_RGBA8 && flags&IMAGE_FLAG_FIX_BORDER_ALPHA) {
-
-			image.fix_alpha_edges();
-		}
-
-		if (image.get_format()==Image::FORMAT_RGBA8 && flags&IMAGE_FLAG_PREMULT_ALPHA) {
-
-			image.premultiply_alpha();
-		}
-
-		if (flags&IMAGE_FLAG_CONVERT_NORMAL_TO_XY) {
-			image.normalmap_to_xy();
-		}
-
-		/*
-		if ((image.get_format()==Image::FORMAT_RGB8 || image.get_format()==Image::FORMAT_RGBA8) && flags&IMAGE_FLAG_CONVERT_TO_LINEAR) {
-
-			print_line("CONVERT BECAUSE: "+itos(flags));
-			image.srgb_to_linear();
-		}
-		*/
-
-		int orig_w=image.get_width();
-		int orig_h=image.get_height();
-
-		if (shrink>1) {
-			image.resize(orig_w/shrink,orig_h/shrink,Image::INTERPOLATE_CUBIC);
-			texture->create_from_image(image,tex_flags);
-			texture->set_size_override(Size2(orig_w,orig_h));
-		}
-
-		if (!(flags&IMAGE_FLAG_NO_MIPMAPS)) {
-			image.generate_mipmaps();
-
-		}
-
-		if (format!=IMAGE_FORMAT_UNCOMPRESSED) {
-
-			compress_image(p_compr,image,flags&IMAGE_FLAG_COMPRESS_EXTRA);
-		}
-
-
-		texture->create_from_image(image,tex_flags);
-
-
-		if (shrink>1 || (format!=IMAGE_FORMAT_UNCOMPRESSED && (image.get_width()!=orig_w || image.get_height()!=orig_h))) {
-			texture->set_size_override(Size2(orig_w,orig_h));
-		}
-
-		//uint32_t save_flags=ResourceSaver::FLAG_COMPRESS;
-	}
-
-	return OK;
-}
-
-
-Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<ResourceImportMetadata>& p_from,EditorExportPlatform::ImageCompression p_compr, bool p_external){
-
-
-
-	ERR_FAIL_COND_V(p_from->get_source_count()==0,ERR_INVALID_PARAMETER);
-
-	Ref<ResourceImportMetadata> from=p_from;
-
-	Ref<ImageTexture> texture;
-	Vector<Ref<AtlasTexture> > atlases;
-	bool atlas = from->get_option("atlas");
-	bool large = from->get_option("large");
-
-	int flags=from->get_option("flags");
-	int format=from->get_option("format");
-	float quality=from->get_option("quality");
-
-	uint32_t tex_flags=0;
-
-	if (flags&EditorTextureImportPlugin::IMAGE_FLAG_REPEAT)
-		tex_flags|=Texture::FLAG_REPEAT;
-	if (flags&EditorTextureImportPlugin::IMAGE_FLAG_FILTER)
-		tex_flags|=Texture::FLAG_FILTER;
-	if (!(flags&EditorTextureImportPlugin::IMAGE_FLAG_NO_MIPMAPS))
-		tex_flags|=Texture::FLAG_MIPMAPS;
-	if (flags&EditorTextureImportPlugin::IMAGE_FLAG_CONVERT_TO_LINEAR)
-		tex_flags|=Texture::FLAG_CONVERT_TO_LINEAR;
-	if (flags&EditorTextureImportPlugin::IMAGE_FLAG_USE_ANISOTROPY)
-		tex_flags|=Texture::FLAG_ANISOTROPIC_FILTER;
-
-	print_line("path: "+p_path+" flags: "+itos(tex_flags));
-	float shrink=1;
-	if (from->has_option("shrink"))
-		shrink=from->get_option("shrink");
-
-	if (large) {
-		ERR_FAIL_COND_V(from->get_source_count()!=1,ERR_INVALID_PARAMETER);
-
-		String src_path = EditorImportPlugin::expand_source_path(from->get_source_path(0));
-
-
-		int cell_size=from->get_option("large_cell_size");
-		ERR_FAIL_COND_V(cell_size<128 || cell_size>16384,ERR_CANT_OPEN);
-
-		EditorProgress pg("largetex",TTR("Import Large Texture"),3);
-
-		pg.step(TTR("Load Source Image"),0);
-		Image img;
-		Error err = ImageLoader::load_image(src_path,&img);
-		if (err) {
-			return err;
-		}
-
-		pg.step(TTR("Slicing"),1);
-
-		Map<Vector2,Image> pieces;
-		for(int i=0;i<img.get_width();i+=cell_size) {
-			int w = MIN(img.get_width()-i,cell_size);
-			for(int j=0;j<img.get_height();j+=cell_size) {
-				int h = MIN(img.get_height()-j,cell_size);
-
-				Image piece(w,h,0,img.get_format());
-				piece.blit_rect(img,Rect2(i,j,w,h),Point2(0,0));
-				if (!piece.is_invisible()) {
-					pieces[Vector2(i,j)]=piece;
-					//print_line("ADDING PIECE AT "+Vector2(i,j));
-				}
-			}
-		}
-
-		Ref<LargeTexture> existing;
-		if (ResourceCache::has(p_path)) {
-			existing = ResourceCache::get(p_path);
-		}
-
-		if (existing.is_valid()) {
-			existing->clear();
-		} else {
-			existing = Ref<LargeTexture>(memnew( LargeTexture ));
-		}
-
-		existing->set_size(Size2(img.get_width(),img.get_height()));
-		pg.step(TTR("Inserting"),2);
-
-		for (Map<Vector2,Image>::Element *E=pieces.front();E;E=E->next()) {
-
-			Ref<ImageTexture> imgtex = Ref<ImageTexture>( memnew( ImageTexture ) );
-			imgtex->create_from_image(E->get(),tex_flags);
-			_process_texture_data(imgtex,format,quality,flags,p_compr,tex_flags,shrink);
-			existing->add_piece(E->key(),imgtex);
-		}
-
-		if (!p_external) {
-			from->set_editor(get_name());
-			from->set_source_md5(0,FileAccess::get_md5(src_path));
-			existing->set_path(p_path);
-			existing->set_import_metadata(from);
-		}
-		pg.step(TTR("Saving"),3);
-
-		err = ResourceSaver::save(p_path,existing);
-		if (err!=OK) {
-			EditorNode::add_io_error(TTR("Couldn't save large texture:")+" "+p_path);
-			return err;
-		}
-
-		return OK;
-
-
-	} else if (atlas) {
-
-		//prepare atlas!
-		Vector< Image > sources;
-		Vector< Image > tsources;
-		bool alpha=false;
-		bool crop = from->get_option("crop");
-
-		EditorProgress ep("make_atlas",TTR("Build Atlas For:")+" "+p_path.get_file(),from->get_source_count()+3);
-
-		print_line("sources: "+itos(from->get_source_count()));
-
-		for(int i=0;i<from->get_source_count();i++) {
-
-			String path = EditorImportPlugin::expand_source_path(from->get_source_path(i));
-			String md5 = FileAccess::get_md5(path);
-			from->set_source_md5(i,FileAccess::get_md5(path));
-			ep.step(TTR("Loading Image:")+" "+path,i);
-			print_line("source path: "+path+" md5 "+md5);
-			Image src;
-			Error err = ImageLoader::load_image(path,&src);
-			if (err) {
-				EditorNode::add_io_error(TTR("Couldn't load image:")+" "+path);
-				return err;
-			}
-
-			if (src.detect_alpha())
-				alpha=true;
-
-			tsources.push_back(src);
-		}
-		ep.step(TTR("Converting Images"),sources.size());
-
-
-		Map<uint64_t,int> source_md5;
-		Map<int,List<int> > source_map;
-
-		for(int i=0;i<tsources.size();i++) {
-
-			Image src = tsources[i];
-
-			if (alpha) {
-				src.convert(Image::FORMAT_RGBA8);
-			} else {
-				src.convert(Image::FORMAT_RGB8);
-			}
-
-			PoolVector<uint8_t> data = src.get_data();
-			MD5_CTX md5;
-			PoolVector<uint8_t>::Read r=data.read();
-			MD5Init(&md5);
-			int len=data.size();
-			for(int j=0;j<len;j++) {
-				uint8_t b = r[j];
-				b>>=2; //to aid in comparing
-				MD5Update(&md5,(unsigned char*)&b,1);
-			}
-			MD5Final(&md5);
-			uint64_t *cmp = (uint64_t*)md5.digest; //less bits, but still useful for this
-
-			tsources[i]=Image(); //clear
-
-			if (source_md5.has(*cmp)) {
-				int sidx=source_md5[*cmp];
-				source_map[sidx].push_back(i);
-				print_line("REUSING "+from->get_source_path(i));
-
-			} else {
-				int sidx=sources.size();
-				source_md5[*cmp]=sidx;
-				sources.push_back(src);
-				List<int> sm;
-				sm.push_back(i);
-				source_map[sidx]=sm;
-
-			}
-
-
-		}
-
-		//texturepacker is not really good for optimizing, so..
-		//will at some point likely replace with my own
-		//first, will find the nearest to a square packing
-		int border=1;
-
-		Vector<Size2i> src_sizes;
-		Vector<Rect2> crops;
-
-		ep.step(TTR("Cropping Images"),sources.size()+1);
-
-		for(int j=0;j<sources.size();j++) {
-
-			Size2i s;
-			if (crop) {
-				Rect2 crop = sources[j].get_used_rect();
-				print_line("CROP: "+crop);
-				s=crop.size;
-				crops.push_back(crop);
-			} else {
-
-				s=Size2i(sources[j].get_width(),sources[j].get_height());
-			}
-			s+=Size2i(border*2,border*2);
-			src_sizes.push_back(s); //add a line to constraint width
-		}
-
-		Vector<Point2i> dst_positions;
-		Size2i dst_size;
-		EditorAtlas::fit(src_sizes,dst_positions,dst_size);
-
-		print_line("size that worked: "+itos(dst_size.width)+","+itos(dst_size.height));
-
-		ep.step(TTR("Blitting Images"),sources.size()+2);
-
-		bool blit_to_po2=tex_flags&Texture::FLAG_MIPMAPS;
-		int atlas_w=dst_size.width;
-		int atlas_h=dst_size.height;
-		if (blit_to_po2) {
-			atlas_w=next_power_of_2(dst_size.width);
-			atlas_h=next_power_of_2(dst_size.height);
-		}
-		Image atlas;
-		atlas.create(atlas_w,atlas_h,0,alpha?Image::FORMAT_RGBA8:Image::FORMAT_RGB8);
-
-
-		atlases.resize(from->get_source_count());
-
-		for(int i=0;i<sources.size();i++) {
-
-			int x=dst_positions[i].x;
-			int y=dst_positions[i].y;
-
-			Size2 sz = Size2(sources[i].get_width(),sources[i].get_height());
-
-			Rect2 region;
-			Rect2 margin;
-
-			if (crop && sz!=crops[i].size) {
-				Rect2 rect = crops[i];
-				rect.size=sz-rect.size;
-				region=Rect2(x+border,y+border,crops[i].size.width,crops[i].size.height);
-				margin=rect;
-				atlas.blit_rect(sources[i],crops[i],Point2(x+border,y+border));
-			} else {
-				region=Rect2(x+border,y+border,sz.x,sz.y);
-				atlas.blit_rect(sources[i],Rect2(0,0,sources[i].get_width(),sources[i].get_height()),Point2(x+border,y+border));
-			}
-
-			ERR_CONTINUE( !source_map.has(i) );
-			for (List<int>::Element *E=source_map[i].front();E;E=E->next()) {
-
-				String apath;
-				String spath = from->get_source_path(E->get()).get_file();
-
-				if (p_external) {
-					apath = p_path.get_base_dir().plus_file(spath.get_basename()+"."+from->get_source_path(E->get()).md5_text()+".atlastex");
-				} else {
-					apath = p_path.get_base_dir().plus_file(spath.get_basename()+".atlastex");
-				}
-
-				Ref<AtlasTexture> at;
-
-				if (ResourceCache::has(apath)) {
-
-					at = Ref<AtlasTexture>( Object::cast_to<AtlasTexture>(ResourceCache::get(apath)) );
-				} else {
-
-					at = Ref<AtlasTexture>( memnew( AtlasTexture ) );
-
-				}
-				at->set_region(region);
-				at->set_margin(margin);
-				at->set_path(apath);
-				atlases[E->get()]=at;
-
-			}
-		}
-		if (ResourceCache::has(p_path)) {
-			texture = Ref<ImageTexture> ( Object::cast_to<ImageTexture>(ResourceCache::get(p_path)) );
-		} else {
-			texture = Ref<ImageTexture>( memnew( ImageTexture ) );
-		}
-		texture->create_from_image(atlas,tex_flags);
-
-	} else {
-		ERR_FAIL_COND_V(from->get_source_count()!=1,ERR_INVALID_PARAMETER);
-
-		String src_path = EditorImportPlugin::expand_source_path(from->get_source_path(0));
-
-		if (ResourceCache::has(p_path)) {
-			Resource *r = ResourceCache::get(p_path);
-
-			texture = Ref<ImageTexture> ( Object::cast_to<ImageTexture>(r) );
-
-			Image img;
-			Error err = img.load(src_path);
-			ERR_FAIL_COND_V(err!=OK,ERR_CANT_OPEN);
-			texture->create_from_image(img);
-		} else {
-			texture=ResourceLoader::load(src_path,"ImageTexture");
-		}
-
-		ERR_FAIL_COND_V(texture.is_null(),ERR_CANT_OPEN);
-		if (!p_external)
-			from->set_source_md5(0,FileAccess::get_md5(src_path));
-
-	}
-
-
-
-	if (!p_external) {
-		from->set_editor(get_name());
-		texture->set_path(p_path);
-		texture->set_import_metadata(from);
-	}
-
-	if (atlas) {
-
-		if (p_external) {
-			//used by exporter
-			Array rects;
-			for(int i=0;i<atlases.size();i++) {
-				rects.push_back(atlases[i]->get_region());
-				rects.push_back(atlases[i]->get_margin());
-			}
-			from->set_option("rects",rects);
-
-		} else {
-			//used by importer
-			for(int i=0;i<atlases.size();i++) {
-				String apath = atlases[i]->get_path();
-				atlases[i]->set_atlas(texture);
-				Error err = ResourceSaver::save(apath,atlases[i]);
-				if (err) {
-					EditorNode::add_io_error(TTR("Couldn't save atlas image:")+" "+apath);
-					return err;
-				}
-				//from->set_source_md5(i,FileAccess::get_md5(apath));
-			}
-		}
-	}
-
-	bool compress=false;
-#if 1
-
-	_process_texture_data(texture,format,quality,flags,p_compr,tex_flags,shrink);
-#else
-	if (format==IMAGE_FORMAT_COMPRESS_DISK_LOSSLESS || format==IMAGE_FORMAT_COMPRESS_DISK_LOSSY) {
-
-		Image image=texture->get_data();
-		ERR_FAIL_COND_V(image.empty(),ERR_INVALID_DATA);
-
-		bool has_alpha=image.detect_alpha();
-		if (!has_alpha && image.get_format()==Image::FORMAT_RGBA8) {
-
-			image.convert(Image::FORMAT_RGB8);
-
-		}
-
-		if (image.get_format()==Image::FORMAT_RGBA8 && flags&IMAGE_FLAG_FIX_BORDER_ALPHA) {
-
-			image.fix_alpha_edges();
-		}
-
-		if (image.get_format()==Image::FORMAT_RGBA8 && flags&IMAGE_FLAG_PREMULT_ALPHA) {
-
-			image.premultiply_alpha();
-		}
-
-		if (flags&IMAGE_FLAG_CONVERT_NORMAL_TO_XY) {
-			image.normalmap_to_xy();
-		}
-
-		/*
-		if ((image.get_format()==Image::FORMAT_RGB8 || image.get_format()==Image::FORMAT_RGBA8) && flags&IMAGE_FLAG_CONVERT_TO_LINEAR) {
-
-			image.srgb_to_linear();
-		}
-		*/
-
-		if (shrink>1) {
-
-			int orig_w=image.get_width();
-			int orig_h=image.get_height();
-			image.resize(orig_w/shrink,orig_h/shrink);
-			texture->create_from_image(image,tex_flags);
-			texture->set_size_override(Size2(orig_w,orig_h));
-
-
-		} else {
-
-			texture->create_from_image(image,tex_flags);
-		}
-
-
-		if (format==IMAGE_FORMAT_COMPRESS_DISK_LOSSLESS) {
-			texture->set_storage(ImageTexture::STORAGE_COMPRESS_LOSSLESS);
-		} else {
-			texture->set_storage(ImageTexture::STORAGE_COMPRESS_LOSSY);
-		}
-
-
-
-		texture->set_lossy_storage_quality(quality);
-
-
-	} else {
-
-
-		Image image=texture->get_data();
-		ERR_FAIL_COND_V(image.empty(),ERR_INVALID_DATA);
-
-
-		bool has_alpha=image.detect_alpha();
-		if (!has_alpha && image.get_format()==Image::FORMAT_RGBA8) {
-
-			image.convert(Image::FORMAT_RGB8);
-
-		}
-
-		if (image.get_format()==Image::FORMAT_RGBA8 && flags&IMAGE_FLAG_FIX_BORDER_ALPHA) {
-
-			image.fix_alpha_edges();
-		}
-
-		if (image.get_format()==Image::FORMAT_RGBA8 && flags&IMAGE_FLAG_PREMULT_ALPHA) {
-
-			image.premultiply_alpha();
-		}
-
-		if (flags&IMAGE_FLAG_CONVERT_NORMAL_TO_XY) {
-			image.normalmap_to_xy();
-		}
-
-		/*
-		if ((image.get_format()==Image::FORMAT_RGB8 || image.get_format()==Image::FORMAT_RGBA8) && flags&IMAGE_FLAG_CONVERT_TO_LINEAR) {
-
-			print_line("CONVERT BECAUSE: "+itos(flags));
-			image.srgb_to_linear();
-		}
-		*/
-
-		int orig_w=image.get_width();
-		int orig_h=image.get_height();
-
-		if (shrink>1) {
-			image.resize(orig_w/shrink,orig_h/shrink);
-			texture->create_from_image(image,tex_flags);
-			texture->set_size_override(Size2(orig_w,orig_h));
-		}
-
-		if (!(flags&IMAGE_FLAG_NO_MIPMAPS)) {
-			image.generate_mipmaps();
-
-		}
-
-		if (format!=IMAGE_FORMAT_UNCOMPRESSED) {
-
-			compress_image(p_compr,image,flags&IMAGE_FLAG_COMPRESS_EXTRA);
-		}
-
-
-		texture->create_from_image(image,tex_flags);
-
-
-		if (shrink>1 || (format!=IMAGE_FORMAT_UNCOMPRESSED && (image.get_width()!=orig_w || image.get_height()!=orig_h))) {
-			texture->set_size_override(Size2(orig_w,orig_h));
-		}
-
-		compress=true;
-
-
-	}
-#endif
-	uint32_t save_flags=0;
-	if (compress)
-		save_flags=ResourceSaver::FLAG_COMPRESS;
-
-	Error err = ResourceSaver::save(p_path,texture,save_flags);
-	if (err!=OK) {
-		EditorNode::add_io_error(TTR("Couldn't save converted texture:")+" "+p_path);
-		return err;
-	}
-
-	return OK;
-}
-
-Vector<uint8_t> EditorTextureImportPlugin::custom_export(const String& p_path, const Ref<EditorExportPlatform> &p_platform) {
-
-
-	Ref<ResourceImportMetadata> rimd = ResourceLoader::load_import_metadata(p_path);
-
-	if (rimd.is_null()) {
-
-		StringName group = EditorImportExport::get_singleton()->image_get_export_group(p_path);
-
-		if (group!=StringName()) {
-			//handled by export group
-			rimd = Ref<ResourceImportMetadata>( memnew( ResourceImportMetadata ) );
-
-			int group_format=0;
-			float group_lossy_quality=EditorImportExport::get_singleton()->image_export_group_get_lossy_quality(group);
-			int group_shrink=EditorImportExport::get_singleton()->image_export_group_get_shrink(group);
-			group_shrink*=EditorImportExport::get_singleton()->get_export_image_shrink();
-
-			switch(EditorImportExport::get_singleton()->image_export_group_get_image_action(group)) {
-				case EditorImportExport::IMAGE_ACTION_NONE: {
-
-					switch(EditorImportExport::get_singleton()->get_export_image_action()) {
-						case EditorImportExport::IMAGE_ACTION_NONE: {
-
-							group_format=EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_DISK_LOSSLESS; //?
-
-						} break; //use default
-						case EditorImportExport::IMAGE_ACTION_COMPRESS_DISK: {
-							group_format=EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_DISK_LOSSY;
-						} break; //use default
-						case EditorImportExport::IMAGE_ACTION_COMPRESS_RAM: {
-							group_format=EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_RAM;
-						} break; //use default
-					}
-
-					group_lossy_quality=EditorImportExport::get_singleton()->get_export_image_quality();
-
-				} break; //use default
-				case EditorImportExport::IMAGE_ACTION_COMPRESS_DISK: {
-					group_format=EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_DISK_LOSSY;
-				} break; //use default
-				case EditorImportExport::IMAGE_ACTION_COMPRESS_RAM: {
-					group_format=EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_RAM;
-				} break; //use default
-				case EditorImportExport::IMAGE_ACTION_KEEP: {
-					return Vector<uint8_t>();
-				} break; //use default
-			}
-
-			String validated_path=EditorImportPlugin::validate_source_path(p_path);
-
-			int flags=texture_flags_to_export_flags(ResourceFormatLoaderImage::load_image_flags(validated_path));
-			flags|=IMAGE_FLAG_FIX_BORDER_ALPHA;
-
-			print_line("group format"+itos(group_format));
-			rimd->set_option("format",group_format);
-			rimd->set_option("flags",flags);
-			rimd->set_option("quality",group_lossy_quality);
-			rimd->set_option("atlas",false);
-			rimd->set_option("shrink",group_shrink);
-			rimd->add_source(validated_path,FileAccess::get_md5(p_path));
-
-		} else if (EditorImportExport::get_singleton()->get_image_formats().has(p_path.get_extension().to_lower()) && EditorImportExport::get_singleton()->get_export_image_action()!=EditorImportExport::IMAGE_ACTION_NONE) {
-			//handled by general image export settings
-
-			rimd = Ref<ResourceImportMetadata>( memnew( ResourceImportMetadata ) );
-
-			switch(EditorImportExport::get_singleton()->get_export_image_action()) {
-				case EditorImportExport::IMAGE_ACTION_COMPRESS_DISK: rimd->set_option("format",IMAGE_FORMAT_COMPRESS_DISK_LOSSY); break;
-				case EditorImportExport::IMAGE_ACTION_COMPRESS_RAM: rimd->set_option("format",IMAGE_FORMAT_COMPRESS_RAM); break;
-			}
-
-			String validated_path=EditorImportPlugin::validate_source_path(p_path);
-
-			int flags=texture_flags_to_export_flags(ResourceFormatLoaderImage::load_image_flags(validated_path));
-			flags|=IMAGE_FLAG_FIX_BORDER_ALPHA;
-
-			rimd->set_option("shrink",EditorImportExport::get_singleton()->get_export_image_shrink());
-			rimd->set_option("flags",flags);
-			rimd->set_option("quality",EditorImportExport::get_singleton()->get_export_image_quality());
-			rimd->set_option("atlas",false);
-			rimd->add_source(validated_path,FileAccess::get_md5(p_path));
-
-		} else {
-			return Vector<uint8_t>();
-		}
-	}
-
-	int fmt = rimd->get_option("format");
-
-	if (fmt!=IMAGE_FORMAT_COMPRESS_RAM && fmt!=IMAGE_FORMAT_COMPRESS_DISK_LOSSY)  {
-		print_line("no compress ram or lossy");
-		return Vector<uint8_t>(); //pointless to do anything, since no need to reconvert
-	}
-
-	uint32_t flags = rimd->get_option("flags");
-	uint8_t shrink = rimd->has_option("shrink") ? rimd->get_option("shrink"): Variant(1);
-	uint8_t format = rimd->get_option("format");
-	uint8_t comp = (format==EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_RAM)?uint8_t(p_platform->get_image_compression()):uint8_t(255);
-
-	MD5_CTX ctx;
-	uint8_t f4[4];
-	encode_uint32(flags,&f4[0]);
-	MD5Init(&ctx);
-	String gp = ProjectSettings::get_singleton()->globalize_path(p_path);
-	CharString cs = gp.utf8();
-	MD5Update(&ctx,(unsigned char*)cs.get_data(),cs.length());
-	MD5Update(&ctx,f4,4);
-	MD5Update(&ctx,&format,1);
-	MD5Update(&ctx,&comp,1);
-	MD5Update(&ctx,&shrink,1);
-	MD5Final(&ctx);
-
-
-
-	uint64_t sd=0;
-	String smd5;
-
-	String md5 = String::md5(ctx.digest);
-	print_line(p_path+" MD5: "+md5+" FLAGS: "+itos(flags));
-
-	String tmp_path = EditorSettings::get_singleton()->get_settings_path().plus_file("tmp/");
-
-	bool valid=false;
-	{
-		//if existing, make sure it's valid
-		FileAccessRef f = FileAccess::open(tmp_path+"imgexp-"+md5+".txt",FileAccess::READ);
-		if (f) {
-
-			uint64_t d = f->get_line().strip_edges().to_int64();
-			sd = FileAccess::get_modified_time(p_path);
-
-			if (d==sd) {
-				valid=true;
-			} else {
-				String cmd5 = f->get_line().strip_edges();
-				smd5 = FileAccess::get_md5(p_path);
-				if (cmd5==smd5) {
-					valid=true;
-				}
-			}
-
-
-		}
-	}
-
-	if (!valid) {
-		//cache failed, convert
-		Error err = import2(tmp_path+"imgexp-"+md5+".tex",rimd,p_platform->get_image_compression(),true);
-		ERR_FAIL_COND_V(err!=OK,Vector<uint8_t>());
-		FileAccessRef f = FileAccess::open(tmp_path+"imgexp-"+md5+".txt",FileAccess::WRITE);
-
-		if (sd==0)
-			sd = FileAccess::get_modified_time(p_path);
-		if (smd5==String())
-			smd5 = FileAccess::get_md5(p_path);
-
-		f->store_line(String::num(sd));
-		f->store_line(smd5);
-		f->store_line(gp); //source path for reference
-	}
-
-
-	Vector<uint8_t> ret;
-	FileAccessRef f = FileAccess::open(tmp_path+"imgexp-"+md5+".tex",FileAccess::READ);
-	ERR_FAIL_COND_V(!f,ret);
-
-	ret.resize(f->get_len());
-	f->get_buffer(ret.ptr(),ret.size());
-
-	return ret;
-}
-
-uint32_t EditorTextureImportPlugin::texture_flags_to_export_flags(uint32_t p_tex_flags) const {
-
-	uint32_t flags=0;
-
-	if (!(p_tex_flags&Texture::FLAG_MIPMAPS)) {
-		flags|=IMAGE_FLAG_NO_MIPMAPS;
-	}
-	if (p_tex_flags&Texture::FLAG_REPEAT) {
-		flags|=IMAGE_FLAG_REPEAT;
-	}
-	if (p_tex_flags&Texture::FLAG_FILTER) {
-		flags|=IMAGE_FLAG_FILTER;
-	}
-	if (p_tex_flags&Texture::FLAG_ANISOTROPIC_FILTER) {
-		flags|=IMAGE_FLAG_USE_ANISOTROPY;
-	}
-	if (p_tex_flags&Texture::FLAG_CONVERT_TO_LINEAR) {
-		flags|=IMAGE_FLAG_CONVERT_TO_LINEAR;
-	}
-	/* // no correspondence yet
-	if (p_tex_flags&Texture::TEXTURE_FLAG_MIRRORED_REPEAT) {
-		flags|=;
-	}*/
-
-	return flags;
-}
-
-void EditorTextureImportPlugin::import_from_drop(const Vector<String>& p_drop,const String& p_dest_path) {
-
-	Vector<String> valid;
-
-	List<String> valid_extensions;
-	ImageLoader::get_recognized_extensions(&valid_extensions);
-	for(int i=0;i<p_drop.size();i++) {
-
-		String extension=p_drop[i].get_extension().to_lower();
-
-		for (List<String>::Element *E=valid_extensions.front();E;E=E->next()) {
-
-			if (E->get()==extension) {
-				valid.push_back(p_drop[i]);
-				break;
-			}
-		}
-	}
-
-	if (valid.size()) {
-		dialog->popup_import();
-		dialog->setup_multiple_import_3d(valid,p_dest_path);
-	}
-}
-
-void EditorTextureImportPlugin::reimport_multiple_files(const Vector<String>& p_list) {
-
-	Vector<String> valid;
-
-
-	for(int i=0;i<p_list.size();i++) {
-
-		Ref<ResourceImportMetadata> rimd = ResourceLoader::load_import_metadata(p_list[i]);
-		String type = rimd->get_editor();
-		if (type=="texture" || type.begins_with("texture_")) {
-
-			if ((rimd->has_option("atlas") && rimd->get_option("atlas")) || (rimd->has_option("large") && rimd->get_option("large"))) {
-				continue;
-			}
-
-			valid.push_back(p_list[i]);
-		}
-	}
-
-	if (valid.size()) {
-
-		dialog->popup_import(valid[0]);
-
-		Vector<String> sources;
-		for(int i=0;i<valid.size();i++) {
-			int idx;
-			EditorFileSystemDirectory *efsd = EditorFileSystem::get_singleton()->find_file(valid[i],&idx);
-			if (efsd) {
-				for(int j=0;j<efsd->get_source_count(idx);j++) {
-					String file = expand_source_path(efsd->get_source_file(idx,j));
-					if (sources.find(file)==-1) {
-						sources.push_back(file);
-					}
-
-				}
-			}
-		}
-
-		if (sources.size()) {
-
-			dialog->add_sources_and_dest(sources,valid[0].get_base_dir());
-		}
-	}
-}
-
-bool EditorTextureImportPlugin::can_reimport_multiple_files() const {
-
-	return true;
-
-}
-
-
-
-EditorTextureImportPlugin *EditorTextureImportPlugin::singleton=NULL;
-
-EditorTextureImportPlugin::EditorTextureImportPlugin(EditorNode *p_editor) {
-
-	singleton=this;
-	editor=p_editor;
-	dialog = memnew( EditorTextureImportDialog(this) );
-	editor->get_gui_base()->add_child(dialog);
-
-}
-
-////////////////////////////
-
-
- Vector<uint8_t> EditorTextureExportPlugin::custom_export(String& p_path,const Ref<EditorExportPlatform> &p_platform) {
-
-	Ref<ResourceImportMetadata> rimd = ResourceLoader::load_import_metadata(p_path);
-
-	if (rimd.is_valid()) {
-
-		if (rimd->get_editor()!="") {
-			int compression = rimd->get_option("format");
-			if (compression!=EditorTextureImportPlugin::IMAGE_FORMAT_COMPRESS_RAM)
-				return Vector<uint8_t>(); //only useful for RAM compression to reconvert
-			Ref<EditorImportPlugin> pl = EditorImportExport::get_singleton()->get_import_plugin_by_name(rimd->get_editor());
-			if (pl.is_valid()) {
-				Vector<uint8_t> ce = pl->custom_export(p_path,p_platform);
-				if (ce.size())
-					return ce;
-			}
-		}
-	} else if (EditorImportExport::get_singleton()->image_get_export_group(p_path)) {
-
-
-		Ref<EditorImportPlugin> pl = EditorImportExport::get_singleton()->get_import_plugin_by_name("texture");
-		if (pl.is_valid()) {
-			Vector<uint8_t> ce = pl->custom_export(p_path,p_platform);
-			if (ce.size()) {
-				p_path=p_path.get_basename()+".converted.tex";
-				return ce;
-			}
-		}
-
-	} else if (EditorImportExport::get_singleton()->get_export_image_action()!=EditorImportExport::IMAGE_ACTION_NONE){
-
-		String xt = p_path.get_extension().to_lower();
-		if (EditorImportExport::get_singleton()->get_image_formats().has(xt)) { //should check for more I guess?
-
-			Ref<EditorImportPlugin> pl = EditorImportExport::get_singleton()->get_import_plugin_by_name("texture");
-			if (pl.is_valid()) {
-				Vector<uint8_t> ce = pl->custom_export(p_path,p_platform);
-				if (ce.size()) {
-					p_path=p_path.get_basename()+".converted.tex";
-					return ce;
-				}
-			}
-		}
-	}
-
-	return Vector<uint8_t>();
-}
-
-EditorTextureExportPlugin::EditorTextureExportPlugin() {
-
-
-}
-#endif

editor/io_plugins/editor_texture_import_plugin.h

@@ -1,175 +0,0 @@
-/*************************************************************************/
-/*  editor_texture_import_plugin.h                                       */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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 EDITOR_TEXTURE_IMPORT_PLUGIN_H
-#define EDITOR_TEXTURE_IMPORT_PLUGIN_H
-
-#if 0
-#include "editor/editor_dir_dialog.h"
-#include "editor/editor_file_system.h"
-#include "editor/editor_import_export.h"
-#include "scene/gui/dialogs.h"
-#include "scene/gui/file_dialog.h"
-#include "scene/gui/label.h"
-#include "scene/gui/line_edit.h"
-#include "scene/gui/option_button.h"
-#include "scene/gui/progress_bar.h"
-#include "scene/gui/slider.h"
-#include "scene/gui/spin_box.h"
-#include "scene/gui/tree.h"
-
-
-
-class EditorNode;
-class EditorTextureImportDialog;
-
-class EditorTextureImportPlugin : public EditorImportPlugin {
-
-	GDCLASS(EditorTextureImportPlugin,EditorImportPlugin);
-public:
-
-
-	enum Mode {
-		MODE_TEXTURE_2D,
-		MODE_TEXTURE_3D,
-		MODE_ATLAS,
-		MODE_LARGE,
-		MODE_MAX
-	};
-
-
-
-private:
-
-	EditorNode *editor;
-	EditorTextureImportDialog *dialog;
-	static EditorTextureImportPlugin *singleton;
-	//used by other importers such as mesh
-
-	Error _process_texture_data(Ref<ImageTexture> &texture, int format, float quality, int flags,EditorExportPlatform::ImageCompression p_compr,int tex_flags,float shrink);
-	void compress_image(EditorExportPlatform::ImageCompression p_mode,Image& image,bool p_smaller);
-
-	uint32_t texture_flags_to_export_flags(uint32_t p_tex_flags) const;
-public:
-
-
-	static EditorTextureImportPlugin *get_singleton() { return singleton; }
-
-	enum ImageFormat {
-
-		IMAGE_FORMAT_UNCOMPRESSED,
-		IMAGE_FORMAT_COMPRESS_DISK_LOSSLESS,
-		IMAGE_FORMAT_COMPRESS_DISK_LOSSY,
-		IMAGE_FORMAT_COMPRESS_RAM,
-	};
-
-	enum ImageFlags {
-
-		IMAGE_FLAG_STREAM_FORMAT=1,
-		IMAGE_FLAG_FIX_BORDER_ALPHA=2,
-		IMAGE_FLAG_ALPHA_BIT=4, //hint for compressions that use a bit for alpha
-		IMAGE_FLAG_COMPRESS_EXTRA=8, // used for pvrtc2
-		IMAGE_FLAG_NO_MIPMAPS=16, //normal for 2D games
-		IMAGE_FLAG_REPEAT=32, //usually disabled in 2D
-		IMAGE_FLAG_FILTER=64, //almost always enabled
-		IMAGE_FLAG_PREMULT_ALPHA=128,//almost always enabled
-		IMAGE_FLAG_CONVERT_TO_LINEAR=256, //convert image to linear
-		IMAGE_FLAG_CONVERT_NORMAL_TO_XY=512, //convert image to linear
-		IMAGE_FLAG_USE_ANISOTROPY=1024, //convert image to linear
-	};
-
-	virtual String get_name() const;
-	virtual String get_visible_name() const;
-	virtual void import_dialog(const String& p_from="");
-	virtual Error import(const String& p_path, const Ref<ResourceImportMetadata>& p_from);
-	virtual Error import2(const String& p_path, const Ref<ResourceImportMetadata>& p_from,EditorExportPlatform::ImageCompression p_compr, bool p_external=false);
-	virtual Vector<uint8_t> custom_export(const String& p_path,const Ref<EditorExportPlatform> &p_platform);
-
-	virtual void import_from_drop(const Vector<String>& p_drop,const String& p_dest_path);
-	virtual void reimport_multiple_files(const Vector<String>& p_list);
-	virtual bool can_reimport_multiple_files() const;
-
-	EditorTextureImportPlugin(EditorNode* p_editor=NULL);
-};
-
-
-class EditorTextureExportPlugin : public EditorExportPlugin {
-
-	GDCLASS( EditorTextureExportPlugin, EditorExportPlugin);
-
-
-public:
-
-	virtual Vector<uint8_t> custom_export(String& p_path,const Ref<EditorExportPlatform> &p_platform);
-	EditorTextureExportPlugin();
-};
-
-class EditorImportTextureOptions : public VBoxContainer {
-
-	GDCLASS( EditorImportTextureOptions, VBoxContainer );
-
-
-	OptionButton *format;
-	VBoxContainer *quality_vb;
-	HSlider *quality;
-	Tree *flags;
-	Vector<TreeItem*> items;
-
-
-	bool updating;
-
-	void _changedp(int p_value);
-	void _changed();
-
-
-protected:
-	static void _bind_methods();
-	void _notification(int p_what);
-
-public:
-
-
-
-	void set_format(EditorTextureImportPlugin::ImageFormat p_format);
-	EditorTextureImportPlugin::ImageFormat get_format() const;
-
-	void set_flags(uint32_t p_flags);
-	uint32_t get_flags() const;
-
-	void set_quality(float p_quality);
-	float get_quality() const;
-
-	void show_2d_notice();
-
-	EditorImportTextureOptions();
-
-
-};
-#endif // EDITOR_TEXTURE_IMPORT_PLUGIN_H
-#endif

editor/io_plugins/editor_translation_import_plugin.cpp

@@ -1,480 +0,0 @@
-/*************************************************************************/
-/*  editor_translation_import_plugin.cpp                                 */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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.                */
-/*************************************************************************/
-#include "editor_translation_import_plugin.h"
-
-#if 0
-#include "editor/editor_dir_dialog.h"
-#include "editor/editor_node.h"
-#include "editor/property_editor.h"
-#include "scene/gui/file_dialog.h"
-//#include "scene/resources/sample.h"
-#include "compressed_translation.h"
-#include "editor/project_settings.h"
-#include "io/resource_saver.h"
-#include "os/file_access.h"
-#include "translation.h"
-
-
-class EditorTranslationImportDialog : public ConfirmationDialog {
-
-	GDCLASS(EditorTranslationImportDialog,ConfirmationDialog);
-
-	EditorTranslationImportPlugin *plugin;
-
-	LineEdit *import_path;
-	LineEdit *save_path;
-	EditorFileDialog *file_select;
-	CheckButton *ignore_first;
-	CheckButton *compress;
-	CheckButton *add_to_project;
-	EditorDirDialog *save_select;
-	ConfirmationDialog *error_dialog;
-	Vector<TreeItem*> items;
-	Tree *columns;
-
-public:
-
-	void _choose_file(const String& p_path) {
-
-		import_path->set_text(p_path);
-		FileAccess *f = FileAccess::open(p_path,FileAccess::READ);
-		if (!f) {
-
-			error_dialog->set_text(TTR("Invalid source!"));
-			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
-			return;
-
-		}
-
-		Vector<String> csvh = f->get_csv_line();
-		memdelete(f);
-
-		if (csvh.size()<2) {
-
-			error_dialog->set_text(TTR("Invalid translation source!"));
-			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
-			return;
-
-		}
-
-		columns->clear();
-		columns->set_columns(2);
-		TreeItem *root = columns->create_item();
-		columns->set_hide_root(true);
-		columns->set_column_titles_visible(true);
-		columns->set_column_title(0,TTR("Column"));
-		columns->set_column_title(1,TTR("Language"));
-		Vector<String> langs = TranslationServer::get_all_locales();
-		Vector<String> names = TranslationServer::get_all_locale_names();
-		if (csvh[0]=="")
-			ignore_first->set_pressed(true);
-
-
-		items.clear();
-
-		for(int i=1;i<csvh.size();i++) {
-
-			TreeItem *ti = columns->create_item(root);
-
-			ti->set_editable(0,true);
-			ti->set_selectable(0,false);
-			ti->set_cell_mode(0,TreeItem::CELL_MODE_CHECK);
-			ti->set_checked(0,true);
-			ti->set_text(0,itos(i));
-			items.push_back(ti);
-
-			String lname = csvh[i].to_lower().strip_edges();
-			int idx=-1;
-			String hint;
-			for(int j=0;j<langs.size();j++) {
-
-				if (langs[j]==lname.substr(0,langs[j].length()).to_lower()) {
-					idx=j;
-				}
-				if (j>0) {
-					hint+=",";
-				}
-				hint+=names[j].replace(","," ");
-			}
-
-			ti->set_cell_mode(1,TreeItem::CELL_MODE_RANGE);
-			ti->set_text(1,hint);
-			ti->set_editable(1,true);
-
-
-			if (idx!=-1) {
-				ignore_first->set_pressed(true);
-				ti->set_range(1,idx);
-			} else {
-
-				//not found, maybe used stupid name
-				if (lname.begins_with("br")) //brazilian
-					ti->set_range(1,langs.find("pt"));
-				else if (lname.begins_with("ch")) //chinese
-					ti->set_range(1,langs.find("zh"));
-				else if (lname.begins_with("sp")) //spanish
-					ti->set_range(1,langs.find("es"));
-				else if (lname.begins_with("kr"))// kprean
-					ti->set_range(1,langs.find("ko"));
-				else if (i==0)
-					ti->set_range(1,langs.find("en"));
-				else
-					ti->set_range(1,langs.find("es"));
-			}
-
-			ti->set_metadata(1,names[ti->get_range(1)]);
-		}
-
-
-
-	}
-	void _choose_save_dir(const String& p_path) {
-
-		save_path->set_text(p_path);
-	}
-
-	void _browse() {
-
-		file_select->popup_centered_ratio();
-	}
-
-	void _browse_target() {
-
-		save_select->popup_centered_ratio();
-
-	}
-
-
-	void popup_import(const String& p_from) {
-
-		popup_centered(Size2(400,400)*EDSCALE);
-
-		if (p_from!="") {
-
-			Ref<ResourceImportMetadata> rimd = ResourceLoader::load_import_metadata(p_from);
-			ERR_FAIL_COND(!rimd.is_valid());
-			ERR_FAIL_COND(rimd->get_source_count()!=1);
-			_choose_file(EditorImportPlugin::expand_source_path(rimd->get_source_path(0)));
-			_choose_save_dir(p_from.get_base_dir());
-			String locale = rimd->get_option("locale");
-			bool skip_first=rimd->get_option("skip_first");
-			bool compressed = rimd->get_option("compress");
-
-			int idx=-1;
-
-			for(int i=0;i<items.size();i++) {
-
-				String il = TranslationServer::get_all_locales()[items[i]->get_range(1)];
-				if (il==locale) {
-					idx=i;
-					break;
-				}
-			}
-
-			if (idx!=-1) {
-				idx=rimd->get_option("index");
-			}
-
-			for(int i=0;i<items.size();i++) {
-
-				if (i==idx) {
-
-					Vector<String> locs = TranslationServer::get_all_locales();
-					for(int j=0;j<locs.size();j++) {
-						if (locs[j]==locale) {
-							items[i]->set_range(1,j);
-						}
-
-					}
-					items[i]->set_checked(0,true);
-				} else {
-					items[i]->set_checked(0,false);
-
-				}
-			}
-
-			ignore_first->set_pressed(skip_first);
-			compress->set_pressed(compressed);
-
-
-
-		}
-
-	}
-
-
-	void _import() {
-
-
-		if (items.size()==0) {
-			error_dialog->set_text(TTR("No items to import!"));
-			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
-		}
-
-		if (!save_path->get_text().begins_with("res://")) {
-			error_dialog->set_text(TTR("No target path!"));
-			error_dialog->popup_centered(Size2(200,100)*EDSCALE);
-		}
-
-		EditorProgress progress("import_xl",TTR("Import Translations"),items.size());
-		for(int i=0;i<items.size();i++) {
-
-			progress.step(items[i]->get_metadata(1),i);
-			if (!items[i]->is_checked(0))
-				continue;
-
-			String locale = TranslationServer::get_all_locales()[items[i]->get_range(1)];
-			Ref<ResourceImportMetadata> imd = memnew( ResourceImportMetadata );
-			imd->add_source(EditorImportPlugin::validate_source_path(import_path->get_text()));
-			imd->set_option("locale",locale);
-			imd->set_option("index",i);
-			imd->set_option("skip_first",ignore_first->is_pressed());
-			imd->set_option("compress",compress->is_pressed());
-
-			String savefile = save_path->get_text().plus_file(import_path->get_text().get_file().get_basename()+"."+locale+".translation");
-			Error err = plugin->import(savefile,imd);
-			if (err!=OK) {
-				error_dialog->set_text(TTR("Couldn't import!"));
-				error_dialog->popup_centered(Size2(200,100)*EDSCALE);
-			} else if (add_to_project->is_pressed()) {
-
-				ProjectSettings::get_singleton()->add_translation(savefile);
-			}
-		}
-		hide();
-
-	}
-
-
-	void _notification(int p_what) {
-
-
-		if (p_what==NOTIFICATION_ENTER_TREE) {
-
-
-		}
-	}
-
-	static void _bind_methods() {
-
-
-		ClassDB::bind_method("_choose_file",&EditorTranslationImportDialog::_choose_file);
-		ClassDB::bind_method("_choose_save_dir",&EditorTranslationImportDialog::_choose_save_dir);
-		ClassDB::bind_method("_import",&EditorTranslationImportDialog::_import);
-		ClassDB::bind_method("_browse",&EditorTranslationImportDialog::_browse);
-		ClassDB::bind_method("_browse_target",&EditorTranslationImportDialog::_browse_target);
-		//ADD_SIGNAL( MethodInfo("imported",PropertyInfo(Variant::OBJECT,"scene")) );
-	}
-
-	EditorTranslationImportDialog(EditorTranslationImportPlugin *p_plugin) {
-
-		plugin=p_plugin;
-
-
-		set_title(TTR("Import Translation"));
-
-		VBoxContainer *vbc = memnew( VBoxContainer );
-		add_child(vbc);
-		//set_child_rect(vbc);
-
-
-
-		VBoxContainer *csvb = memnew( VBoxContainer );
-
-		HBoxContainer *hbc = memnew( HBoxContainer );
-		csvb->add_child(hbc);
-		vbc->add_margin_child(TTR("Source CSV:"),csvb);
-
-		import_path = memnew( LineEdit );
-		import_path->set_h_size_flags(SIZE_EXPAND_FILL);
-		hbc->add_child(import_path);
-		ignore_first = memnew( CheckButton );
-		ignore_first->set_text(TTR("Ignore First Row"));
-		csvb->add_child(ignore_first);
-
-		Button * import_choose = memnew( Button );
-		import_choose->set_text(" .. ");
-		hbc->add_child(import_choose);
-
-		import_choose->connect("pressed", this,"_browse");
-
-		VBoxContainer *tcomp = memnew( VBoxContainer);
-		hbc = memnew( HBoxContainer );
-		tcomp->add_child(hbc);
-		vbc->add_margin_child(TTR("Target Path:"),tcomp);
-
-		save_path = memnew( LineEdit );
-		save_path->set_h_size_flags(SIZE_EXPAND_FILL);
-		hbc->add_child(save_path);
-
-		Button * save_choose = memnew( Button );
-		save_choose->set_text(" .. ");
-		hbc->add_child(save_choose);
-
-		save_choose->connect("pressed", this,"_browse_target");
-
-		compress = memnew( CheckButton);
-		compress->set_pressed(true);
-		compress->set_text(TTR("Compress"));
-		tcomp->add_child(compress);
-
-		add_to_project = memnew( CheckButton);
-		add_to_project->set_pressed(true);
-		add_to_project->set_text(TTR("Add to Project (project.godot)"));
-		tcomp->add_child(add_to_project);
-
-		file_select = memnew(EditorFileDialog);
-		file_select->set_access(EditorFileDialog::ACCESS_FILESYSTEM);
-		add_child(file_select);
-		file_select->set_mode(EditorFileDialog::MODE_OPEN_FILE);
-		file_select->connect("file_selected", this,"_choose_file");
-		file_select->add_filter("*.csv ; Translation CSV");
-		save_select = memnew(	EditorDirDialog );
-		add_child(save_select);
-
-		//save_select->set_mode(EditorFileDialog::MODE_OPEN_DIR);
-		save_select->connect("dir_selected", this,"_choose_save_dir");
-
-		get_ok()->connect("pressed", this,"_import");
-		get_ok()->set_text(TTR("Import"));
-
-
-		error_dialog = memnew ( ConfirmationDialog );
-		add_child(error_dialog);
-		error_dialog->get_ok()->set_text(TTR("Accept"));
-		//error_dialog->get_cancel()->hide();
-
-		set_hide_on_ok(false);
-
-		columns = memnew( Tree );
-		vbc->add_margin_child(TTR("Import Languages:"),columns,true);
-	}
-
-	~EditorTranslationImportDialog() {
-
-	}
-
-};
-
-
-String EditorTranslationImportPlugin::get_name() const {
-
-	return "translation";
-}
-String EditorTranslationImportPlugin::get_visible_name() const {
-
-	return TTR("Translation");
-}
-void EditorTranslationImportPlugin::import_dialog(const String& p_from) {
-
-	dialog->popup_import(p_from);
-}
-
-
-
-void EditorTranslationImportPlugin::import_from_drop(const Vector<String>& p_drop, const String &p_dest_path) {
-
-
-	for(int i=0;i<p_drop.size();i++) {
-		String ext = p_drop[i].get_extension().to_lower();
-
-		if (ext=="csv") {
-
-			import_dialog();
-			dialog->_choose_file(p_drop[i]);
-			dialog->_choose_save_dir(p_dest_path);
-			break;
-		}
-	}
-
-
-}
-
-Error EditorTranslationImportPlugin::import(const String& p_path, const Ref<ResourceImportMetadata>& p_from) {
-
-	Ref<ResourceImportMetadata> from = p_from;
-	ERR_FAIL_COND_V( from->get_source_count()!=1, ERR_INVALID_PARAMETER);
-
-	String source = EditorImportPlugin::expand_source_path( from->get_source_path(0) );
-
-	FileAccessRef f = FileAccess::open(source,FileAccess::READ);
-
-	ERR_FAIL_COND_V( !f, ERR_INVALID_PARAMETER );
-
-	bool skip_first = from->get_option("skip_first");
-	int index = from->get_option("index");
-	index+=1;
-	String locale = from->get_option("locale");
-
-	Ref<Translation> translation = memnew( Translation );
-
-	translation->set_locale( locale );
-
-	Vector<String> line = f->get_csv_line();
-
-	while(line.size()>1) {
-
-		if (!skip_first) {
-			ERR_FAIL_INDEX_V(index,line.size(),ERR_INVALID_DATA );
-			translation->add_message(line[0].strip_edges(),line[index]);
-
-		} else {
-
-			skip_first=false;
-		}
-
-		line = f->get_csv_line();
-	}
-
-	from->set_source_md5(0,FileAccess::get_md5(source));
-	from->set_editor(get_name());
-
-	String dst_path = p_path;
-
-	if (from->get_option("compress")) {
-
-		Ref<PHashTranslation> cxl = memnew( PHashTranslation );
-		cxl->generate( translation );
-		translation=cxl;
-	}
-
-	translation->set_import_metadata(from);
-	return ResourceSaver::save(dst_path,translation);
-
-}
-
-
-EditorTranslationImportPlugin::EditorTranslationImportPlugin(EditorNode* p_editor) {
-
-	dialog = memnew(EditorTranslationImportDialog(this));
-	p_editor->get_gui_base()->add_child(dialog);
-}
-
-#endif

editor/io_plugins/editor_translation_import_plugin.h

@@ -1,57 +0,0 @@
-/*************************************************************************/
-/*  editor_translation_import_plugin.h                                   */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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 EDITOR_TRANSLATION_IMPORT_PLUGIN_H
-#define EDITOR_TRANSLATION_IMPORT_PLUGIN_H
-
-#include "editor/editor_export.h"
-#include "scene/resources/font.h"
-#if 0
-class EditorNode;
-class EditorTranslationImportDialog;
-
-class EditorTranslationImportPlugin : public EditorImportPlugin {
-
-	GDCLASS(EditorTranslationImportPlugin,EditorImportPlugin);
-
-	EditorTranslationImportDialog *dialog;
-public:
-
-	virtual String get_name() const;
-	virtual String get_visible_name() const;
-	virtual void import_dialog(const String& p_from="");
-	virtual Error import(const String& p_path, const Ref<ResourceImportMetadata>& p_from);
-	void import_from_drop(const Vector<String>& p_drop, const String &p_dest_path);
-
-
-	EditorTranslationImportPlugin(EditorNode* p_editor);
-};
-
-#endif
-#endif // EDITOR_TRANSLATION_IMPORT_PLUGIN_H

editor/plugins/animation_player_editor_plugin.cpp

@@ -965,71 +965,6 @@ void AnimationPlayerEditor::_list_changed() {
 	if (is_visible_in_tree())
 		_update_player();
 }
-#if 0
-void AnimationPlayerEditor::_editor_store() {
-
-	if (animation->get_item_count()==0)
-		return;
-	String current = animation->get_item_text(animation->get_selected());
-	Ref<Animation> anim =  player->get_animation(current);
-
-	if (key_editor->get_current_animation()==anim)
-		return; //already there
-
-
-	undo_redo->create_action("Store anim in editor");
-	undo_redo->add_do_method(key_editor,"set_animation",anim);
-	undo_redo->add_undo_method(key_editor,"remove_animation",anim);
-	undo_redo->commit_action();
-}
-
-void AnimationPlayerEditor::_editor_load(){
-
-	Ref<Animation> anim = key_editor->get_current_animation();
-	if (anim.is_null())
-		return;
-
-	String existing = player->find_animation(anim);
-	if (existing!="") {
-		_select_anim_by_name(existing);
-		return; //already has
-	}
-
-	int count=1;
-	String base=anim->get_name();
-	bool noname=false;
-	if (base=="") {
-		base="New Anim";
-		noname=true;
-	}
-
-	while(true) {
-		String attempt  = base;
-		if (count>1)
-			attempt+=" ("+itos(count)+")";
-		if (player->has_animation(attempt)) {
-			count++;
-			continue;
-		}
-		base=attempt;
-		break;
-	}
-
-	if (noname)
-		anim->set_name(base);
-
-	undo_redo->create_action("Add Animation From Editor");
-	undo_redo->add_do_method(player,"add_animation",base,anim);
-	undo_redo->add_undo_method(player,"remove_animation",base);
-	undo_redo->add_do_method(this,"_animation_player_changed",player);
-	undo_redo->add_undo_method(this,"_animation_player_changed",player);
-	undo_redo->commit_action();
-
-	_select_anim_by_name(base);
-
-
-}
-#endif
 
 void AnimationPlayerEditor::_animation_key_editor_anim_len_changed(float p_len) {
 

editor/plugins/animation_tree_editor_plugin.cpp

@@ -605,15 +605,6 @@ void AnimationTreeEditor::_draw_node(const StringName &p_node) {
 	}
 }
 
-#if 0
-void AnimationTreeEditor::_node_param_changed() {
-
-	//anim_tree->node_set_param( click_node,property_editor->get_variant() );
-	//update();
-	//_write_anim_tree_graph();
-}
-#endif
-
 AnimationTreeEditor::ClickType AnimationTreeEditor::_locate_click(const Point2 &p_click, StringName *p_node_id, int *p_slot_index) const {
 
 	Ref<StyleBox> style = get_stylebox("panel", "PopupMenu");
@@ -714,32 +705,6 @@ Point2 AnimationTreeEditor::_get_slot_pos(const StringName &p_node_id, bool p_in
 	return pos;
 }
 
-#if 0
-void AnimationTreeEditor::_node_edit_property(const StringName& p_node) {
-
-	Ref<StyleBox> style = get_stylebox("panel","PopupMenu");
-	Size2 size = get_node_size(p_node);
-	Point2 pos = Point2( anim_tree->node_get_pos_x(p_node), anim_tree->node_get_pos_y(p_node) )-offset;
-
-	VisualServer::AnimationTreeNodeType type=anim_tree->node_get_type(p_node);
-
-	PropertyInfo ph = VisualServer::get_singleton()->anim_tree_node_get_type_info(type);
-	if (ph.type==Variant::NIL)
-		return;
-	if (ph.type==Variant::_RID)
-		ph.type=Variant::RESOURCE;
-
-	property_editor->edit(NULL,ph.name,ph.type,anim_tree->node_get_param(p_node),ph.hint,ph.hint_string);
-
-	Point2 popup_pos=Point2( pos.x+(size.width-property_editor->get_size().width)/2.0,pos.y+(size.y-style->get_margin(MARGIN_BOTTOM))).floor();
-	popup_pos+=get_global_position();
-	property_editor->set_position(popup_pos);
-
-	property_editor->popup();
-
-}
-#endif
-
 void AnimationTreeEditor::_gui_input(Ref<InputEvent> p_event) {
 
 	Ref<InputEventMouseButton> mb = p_event;

editor/plugins/baked_light_baker.cpp

@@ -1,2727 +0,0 @@
-/*************************************************************************/
-/*  baked_light_baker.cpp                                                */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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.                */
-/*************************************************************************/
-#include "baked_light_baker.h"
-
-#include "editor/editor_node.h"
-#include "editor/editor_settings.h"
-#include "io/marshalls.h"
-#include <stdlib.h>
-#include <cmath>
-
-#if 0
-void baked_light_baker_add_64f(double *dst,double value);
-void baked_light_baker_add_64i(int64_t *dst,int64_t value);
-
-//-separar en 2 testuras?
-//*mejorar performance y threads
-//*modos lineales
-//*saturacion
-
-_FORCE_INLINE_ static uint64_t get_uv_normal_bit(const Vector3& p_vector) {
-
-	int lat = Math::fast_ftoi(Math::floor(Math::acos(p_vector.dot(Vector3(0,1,0)))*6.0/Math_PI+0.5));
-
-	if (lat==0) {
-		return 60;
-	} else if (lat==6) {
-		return 61;
-	}
-
-	int lon = Math::fast_ftoi(Math::floor( (Math_PI+Math::atan2(p_vector.x,p_vector.z))*12.0/(Math_PI*2.0) + 0.5))%12;
-
-	return lon+(lat-1)*12;
-}
-
-
-
-_FORCE_INLINE_ static Vector3 get_bit_normal(int p_bit) {
-
-	if (p_bit==61) {
-		return Vector3(0,1,0);
-	} else if (p_bit==62){
-		return Vector3(0,-1,0);
-	}
-
-	float latang = ((p_bit / 12)+1)*Math_PI/6.0;
-
-	Vector2 latv(Math::sin(latang),Math::cos(latang));
-
-	float lonang = ((p_bit%12)*Math_PI*2.0/12.0)-Math_PI;
-
-	Vector2 lonv(Math::sin(lonang),Math::cos(lonang));
-
-	return Vector3(lonv.x*latv.x,latv.y,lonv.y*latv.x).normalized();
-
-}
-
-
-BakedLightBaker::MeshTexture* BakedLightBaker::_get_mat_tex(const Ref<Texture>& p_tex) {
-
-	if (!tex_map.has(p_tex)) {
-
-		Ref<ImageTexture> imgtex=p_tex;
-		if (imgtex.is_null())
-			return NULL;
-		Image image=imgtex->get_data();
-		if (image.empty())
-			return NULL;
-
-		if (image.get_format()!=Image::FORMAT_RGBA8) {
-			if (image.get_format()>Image::FORMAT_INDEXED_ALPHA) {
-				Error err = image.decompress();
-				if (err)
-					return NULL;
-			}
-
-			if (image.get_format()!=Image::FORMAT_RGBA8)
-				image.convert(Image::FORMAT_RGBA8);
-		}
-
-		if (imgtex->get_flags()&Texture::FLAG_CONVERT_TO_LINEAR) {
-			Image copy = image;
-			copy.srgb_to_linear();
-			image=copy;
-		}
-
-		PoolVector<uint8_t> dvt=image.get_data();
-		PoolVector<uint8_t>::Read r=dvt.read();
-		MeshTexture mt;
-		mt.tex_w=image.get_width();
-		mt.tex_h=image.get_height();
-		int len = image.get_width()*image.get_height()*4;
-		mt.tex.resize(len);
-		copymem(mt.tex.ptr(),r.ptr(),len);
-
-		textures.push_back(mt);
-		tex_map[p_tex]=&textures.back()->get();
-	}
-
-	return tex_map[p_tex];
-}
-
-
-void BakedLightBaker::_add_mesh(const Ref<Mesh>& p_mesh,const Ref<Material>& p_mat_override,const Transform& p_xform,int p_baked_texture) {
-
-
-	for(int i=0;i<p_mesh->get_surface_count();i++) {
-
-		if (p_mesh->surface_get_primitive_type(i)!=Mesh::PRIMITIVE_TRIANGLES)
-			continue;
-		Ref<Material> mat = p_mat_override.is_valid()?p_mat_override:p_mesh->surface_get_material(i);
-
-		MeshMaterial *matptr=NULL;
-		int baked_tex=p_baked_texture;
-
-		if (mat.is_valid()) {
-
-			if (!mat_map.has(mat)) {
-
-				MeshMaterial mm;
-
-				Ref<SpatialMaterial> fm = mat;
-				if (fm.is_valid()) {
-					//fixed route
-					mm.diffuse.color=fm->get_parameter(SpatialMaterial::PARAM_DIFFUSE);
-					if (linear_color)
-						mm.diffuse.color=mm.diffuse.color.to_linear();
-					mm.diffuse.tex=_get_mat_tex(fm->get_texture(SpatialMaterial::PARAM_DIFFUSE));
-					mm.specular.color=fm->get_parameter(SpatialMaterial::PARAM_SPECULAR);
-					if (linear_color)
-						mm.specular.color=mm.specular.color.to_linear();
-
-					mm.specular.tex=_get_mat_tex(fm->get_texture(SpatialMaterial::PARAM_SPECULAR));
-				} else {
-
-					mm.diffuse.color=Color(1,1,1,1);
-					mm.diffuse.tex=NULL;
-					mm.specular.color=Color(0,0,0,1);
-					mm.specular.tex=NULL;
-				}
-
-				materials.push_back(mm);
-				mat_map[mat]=&materials.back()->get();
-
-			}
-
-			matptr=mat_map[mat];
-
-		}
-
-
-		int facecount=0;
-
-
-		if (p_mesh->surface_get_format(i)&Mesh::ARRAY_FORMAT_INDEX) {
-
-			facecount=p_mesh->surface_get_array_index_len(i);
-		} else {
-
-			facecount=p_mesh->surface_get_array_len(i);
-		}
-
-		ERR_CONTINUE((facecount==0 || (facecount%3)!=0));
-
-		facecount/=3;
-
-		int tbase=triangles.size();
-		triangles.resize(facecount+tbase);
-
-
-		Array a = p_mesh->surface_get_arrays(i);
-
-		PoolVector<Vector3> vertices = a[Mesh::ARRAY_VERTEX];
-		PoolVector<Vector3>::Read vr=vertices.read();
-		PoolVector<Vector2> uv;
-		PoolVector<Vector2>::Read uvr;
-		PoolVector<Vector2> uv2;
-		PoolVector<Vector2>::Read uv2r;
-		PoolVector<Vector3> normal;
-		PoolVector<Vector3>::Read normalr;
-		bool read_uv=false;
-		bool read_normal=false;
-
-		if (p_mesh->surface_get_format(i)&Mesh::ARRAY_FORMAT_TEX_UV) {
-
-			uv=a[Mesh::ARRAY_TEX_UV];
-			uvr=uv.read();
-			read_uv=true;
-
-			if (mat.is_valid() && mat->get_flag(Material::FLAG_LIGHTMAP_ON_UV2) && p_mesh->surface_get_format(i)&Mesh::ARRAY_FORMAT_TEX_UV2) {
-
-				uv2=a[Mesh::ARRAY_TEX_UV2];
-				uv2r=uv2.read();
-
-			} else {
-				uv2r=uv.read();
-				if (baked_light->get_transfer_lightmaps_only_to_uv2()) {
-					baked_tex=-1;
-				}
-			}
-		}
-
-		if (p_mesh->surface_get_format(i)&Mesh::ARRAY_FORMAT_NORMAL) {
-
-			normal=a[Mesh::ARRAY_NORMAL];
-			normalr=normal.read();
-			read_normal=true;
-		}
-
-		Matrix3 normal_xform = p_xform.basis.inverse().transposed();
-
-
-		if (p_mesh->surface_get_format(i)&Mesh::ARRAY_FORMAT_INDEX) {
-
-			PoolVector<int> indices = a[Mesh::ARRAY_INDEX];
-			PoolVector<int>::Read ir = indices.read();
-
-			for(int i=0;i<facecount;i++) {
-				Triangle &t=triangles[tbase+i];
-				t.vertices[0]=p_xform.xform(vr[ ir[i*3+0] ]);
-				t.vertices[1]=p_xform.xform(vr[ ir[i*3+1] ]);
-				t.vertices[2]=p_xform.xform(vr[ ir[i*3+2] ]);
-				t.material=matptr;
-				t.baked_texture=baked_tex;
-				if (read_uv) {
-
-					t.uvs[0]=uvr[ ir[i*3+0] ];
-					t.uvs[1]=uvr[ ir[i*3+1] ];
-					t.uvs[2]=uvr[ ir[i*3+2] ];
-
-					t.bake_uvs[0]=uv2r[ ir[i*3+0] ];
-					t.bake_uvs[1]=uv2r[ ir[i*3+1] ];
-					t.bake_uvs[2]=uv2r[ ir[i*3+2] ];
-				}
-				if (read_normal) {
-
-					t.normals[0]=normal_xform.xform(normalr[ ir[i*3+0] ]).normalized();
-					t.normals[1]=normal_xform.xform(normalr[ ir[i*3+1] ]).normalized();
-					t.normals[2]=normal_xform.xform(normalr[ ir[i*3+2] ]).normalized();
-				}
-			}
-
-		} else {
-
-			for(int i=0;i<facecount;i++) {
-				Triangle &t=triangles[tbase+i];
-				t.vertices[0]=p_xform.xform(vr[ i*3+0 ]);
-				t.vertices[1]=p_xform.xform(vr[ i*3+1 ]);
-				t.vertices[2]=p_xform.xform(vr[ i*3+2 ]);
-				t.material=matptr;
-				t.baked_texture=baked_tex;
-				if (read_uv) {
-
-					t.uvs[0]=uvr[ i*3+0 ];
-					t.uvs[1]=uvr[ i*3+1 ];
-					t.uvs[2]=uvr[ i*3+2 ];
-
-					t.bake_uvs[0]=uv2r[ i*3+0 ];
-					t.bake_uvs[1]=uv2r[ i*3+1 ];
-					t.bake_uvs[2]=uv2r[ i*3+2 ];
-
-				}
-				if (read_normal) {
-
-					t.normals[0]=normal_xform.xform(normalr[ i*3+0 ]).normalized();
-					t.normals[1]=normal_xform.xform(normalr[ i*3+1 ]).normalized();
-					t.normals[2]=normal_xform.xform(normalr[ i*3+2 ]).normalized();
-				}
-			}
-		}
-	}
-
-}
-
-
-void BakedLightBaker::_parse_geometry(Node* p_node) {
-
-	if (MeshInstance *meshi=Object::cast_to<MeshInstance>(p_node)) {
-
-		Ref<Mesh> mesh=meshi->get_mesh();
-		if (mesh.is_valid()) {
-			_add_mesh(mesh,meshi->get_material_override(),base_inv * meshi->get_global_transform(),meshi->get_baked_light_texture_id());
-		}
-	} else if (Light *dl=Object::cast_to<Light>(p_node)) {
-
-		if (dl->get_bake_mode()!=Light::BAKE_MODE_DISABLED) {
-
-
-			LightData dirl;
-			dirl.type=VS::LightType(dl->get_light_type());
-			dirl.diffuse=dl->get_color(DirectionalLight::COLOR_DIFFUSE);
-			dirl.specular=dl->get_color(DirectionalLight::COLOR_SPECULAR);
-			if (linear_color)
-				dirl.diffuse=dirl.diffuse.to_linear();
-			if (linear_color)
-				dirl.specular=dirl.specular.to_linear();
-
-			dirl.energy=dl->get_parameter(DirectionalLight::PARAM_ENERGY);
-			dirl.pos=dl->get_global_transform().origin;
-			dirl.up=dl->get_global_transform().basis.get_axis(1).normalized();
-			dirl.left=dl->get_global_transform().basis.get_axis(0).normalized();
-			dirl.dir=-dl->get_global_transform().basis.get_axis(2).normalized();
-			dirl.spot_angle=dl->get_parameter(DirectionalLight::PARAM_SPOT_ANGLE);
-			dirl.spot_attenuation=dl->get_parameter(DirectionalLight::PARAM_SPOT_ATTENUATION);
-			dirl.attenuation=dl->get_parameter(DirectionalLight::PARAM_ATTENUATION);
-			dirl.darkening=dl->get_parameter(DirectionalLight::PARAM_SHADOW_DARKENING);
-			dirl.radius=dl->get_parameter(DirectionalLight::PARAM_RADIUS);
-			dirl.bake_direct=dl->get_bake_mode()==Light::BAKE_MODE_FULL;
-			dirl.rays_thrown=0;
-			dirl.bake_shadow=dl->get_bake_mode()==Light::BAKE_MODE_INDIRECT_AND_SHADOWS;
-			lights.push_back(dirl);
-		}
-
-	} else if (Spatial *sp = Object::cast_to<Spatial>(p_node)){
-
-		Array arr = p_node->call("_get_baked_light_meshes");
-		for(int i=0;i<arr.size();i+=2) {
-
-			Transform xform=arr[i];
-			Ref<Mesh> mesh=arr[i+1];
-			_add_mesh(mesh,Ref<Material>(),base_inv * (sp->get_global_transform() * xform));
-		}
-	}
-
-	for(int i=0;i<p_node->get_child_count();i++) {
-
-		_parse_geometry(p_node->get_child(i));
-	}
-}
-
-
-void BakedLightBaker::_fix_lights() {
-
-
-	total_light_area=0;
-	for(int i=0;i<lights.size();i++) {
-
-		LightData &dl=lights[i];
-
-		switch(dl.type) {
-			case VS::LIGHT_DIRECTIONAL: {
-
-				float up_max=-1e10;
-				float dir_max=-1e10;
-				float left_max=-1e10;
-				float up_min=1e10;
-				float dir_min=1e10;
-				float left_min=1e10;
-
-				for(int j=0;j<triangles.size();j++) {
-
-					for(int k=0;k<3;k++) {
-
-						Vector3 v = triangles[j].vertices[k];
-
-						float up_d = dl.up.dot(v);
-						float dir_d = dl.dir.dot(v);
-						float left_d = dl.left.dot(v);
-
-						if (up_d>up_max)
-							up_max=up_d;
-						if (up_d<up_min)
-							up_min=up_d;
-
-						if (left_d>left_max)
-							left_max=left_d;
-						if (left_d<left_min)
-							left_min=left_d;
-
-						if (dir_d>dir_max)
-							dir_max=dir_d;
-						if (dir_d<dir_min)
-							dir_min=dir_d;
-
-					}
-				}
-
-				//make a center point, then the upvector and leftvector
-				dl.pos = dl.left*( left_max+left_min )*0.5 + dl.up*( up_max+up_min )*0.5 + dl.dir*(dir_min-(dir_max-dir_min));
-				dl.left*=(left_max-left_min)*0.5;
-				dl.up*=(up_max-up_min)*0.5;
-				dl.length = (dir_max - dir_min)*10; //arbitrary number to keep it in scale
-				dl.area=dl.left.length()*2*dl.up.length()*2;
-				dl.constant=1.0/dl.area;
-			} break;
-			case VS::LIGHT_OMNI:
-			case VS::LIGHT_SPOT: {
-
-				dl.attenuation_table.resize(ATTENUATION_CURVE_LEN);
-				for(int j=0;j<ATTENUATION_CURVE_LEN;j++) {
-					dl.attenuation_table[j]=1.0-Math::pow(j/float(ATTENUATION_CURVE_LEN),dl.attenuation);
-					float falloff=j*dl.radius/float(ATTENUATION_CURVE_LEN);
-					if (falloff==0)
-						falloff=0.000001;
-					float intensity=4*Math_PI*(falloff*falloff);
-					//dl.attenuation_table[j]*=falloff*falloff;
-					dl.attenuation_table[j]*=1.0/(3.0/intensity);
-
-				}
-				if (dl.type==VS::LIGHT_OMNI) {
-
-					dl.area=4.0*Math_PI*pow(dl.radius,2.0f);
-					dl.constant=1.0/3.5;
-				} else {
-
-
-					float r = Math::tan(Math::deg2rad(dl.spot_angle))*dl.radius;
-					float c = 1.0-(Math::deg2rad(dl.spot_angle)*0.5+0.5);
-					dl.constant=1.0/3.5;
-					dl.constant*=1.0/c;
-
-					dl.area=Math_PI*r*r*c;
-				}
-
-			} break;
-
-
-		}
-
-		total_light_area+=dl.area;
-	}
-}
-
-BakedLightBaker::BVH* BakedLightBaker::_parse_bvh(BVH** p_children, int p_size, int p_depth, int &max_depth) {
-
-	if (p_depth>max_depth) {
-		max_depth=p_depth;
-	}
-
-	if (p_size==1) {
-
-		return p_children[0];
-	} else if (p_size==0) {
-
-		return NULL;
-	}
-
-
-	AABB aabb;
-	aabb=p_children[0]->aabb;
-	for(int i=1;i<p_size;i++) {
-
-		aabb.merge_with(p_children[i]->aabb);
-	}
-
-	int li=aabb.get_longest_axis_index();
-
-	switch(li) {
-
-		case Vector3::AXIS_X: {
-			SortArray<BVH*,BVHCmpX> sort_x;
-			sort_x.nth_element(0,p_size,p_size/2,p_children);
-			//sort_x.sort(&p_bb[p_from],p_size);
-		} break;
-		case Vector3::AXIS_Y: {
-			SortArray<BVH*,BVHCmpY> sort_y;
-			sort_y.nth_element(0,p_size,p_size/2,p_children);
-			//sort_y.sort(&p_bb[p_from],p_size);
-		} break;
-		case Vector3::AXIS_Z: {
-			SortArray<BVH*,BVHCmpZ> sort_z;
-			sort_z.nth_element(0,p_size,p_size/2,p_children);
-			//sort_z.sort(&p_bb[p_from],p_size);
-
-		} break;
-	}
-
-
-	BVH* left = _parse_bvh(p_children,p_size/2,p_depth+1,max_depth);
-	BVH* right = _parse_bvh(&p_children[p_size/2],p_size-p_size/2,p_depth+1,max_depth);
-
-	BVH *_new = memnew(BVH);
-	_new->aabb=aabb;
-	_new->center=aabb.pos+aabb.size*0.5;
-	_new->children[0]=left;
-	_new->children[1]=right;
-	_new->leaf=NULL;
-
-	return _new;
-}
-
-void BakedLightBaker::_make_bvh() {
-
-	Vector<BVH*> bases;
-	bases.resize(triangles.size());
-	int max_depth=0;
-	for(int i=0;i<triangles.size();i++) {
-		bases[i]=memnew( BVH );
-		bases[i]->leaf=&triangles[i];
-		bases[i]->aabb.pos=triangles[i].vertices[0];
-		bases[i]->aabb.expand_to(triangles[i].vertices[1]);
-		bases[i]->aabb.expand_to(triangles[i].vertices[2]);
-		triangles[i].aabb=bases[i]->aabb;
-		bases[i]->center=bases[i]->aabb.pos+bases[i]->aabb.size*0.5;
-	}
-
-	bvh=_parse_bvh(bases.ptr(),bases.size(),1,max_depth);
-
-	ray_stack = memnew_arr(uint32_t,max_depth);
-	bvh_stack = memnew_arr(BVH*,max_depth);
-
-	bvh_depth = max_depth;
-}
-
-void BakedLightBaker::_octree_insert(int p_octant,Triangle* p_triangle, int p_depth) {
-
-
-
-
-	uint32_t *stack=octant_stack;
-	uint32_t *ptr_stack=octantptr_stack;
-	Octant *octants=octant_pool.ptr();
-
-	stack[0]=0;
-	ptr_stack[0]=0;
-
-	int stack_pos=0;
-
-
-	while(true) {
-
-		Octant *octant=&octants[ptr_stack[stack_pos]];
-		if (stack[stack_pos]<8) {
-
-			int i = stack[stack_pos];
-			stack[stack_pos]++;
-
-
-
-			//fit_aabb=fit_aabb.grow(bvh->aabb.size.x*0.0001);
-
-			int child_idx =octant->children[i];
-			bool encloses;
-			if (!child_idx) {
-
-				AABB aabb=octant->aabb;
-				aabb.size*=0.5;
-				if (i&1)
-					aabb.pos.x+=aabb.size.x;
-				if (i&2)
-					aabb.pos.y+=aabb.size.y;
-				if (i&4)
-					aabb.pos.z+=aabb.size.z;
-
-				aabb.grow_by(cell_size*octree_extra_margin);
-				if (!aabb.intersects(p_triangle->aabb))
-					continue;
-				encloses=aabb.grow(cell_size*-octree_extra_margin*2.0).encloses(p_triangle->aabb);
-				if (!encloses && !Face3(p_triangle->vertices[0],p_triangle->vertices[1],p_triangle->vertices[2]).intersects_aabb2(aabb))
-					continue;
-			} else {
-
-				Octant *child=&octants[child_idx];
-				AABB aabb=child->aabb;
-				aabb.grow_by(cell_size*octree_extra_margin);
-				if (!aabb.intersects(p_triangle->aabb))
-					continue;
-				encloses=aabb.grow(cell_size*-octree_extra_margin*2.0).encloses(p_triangle->aabb);
-				if (!encloses && !Face3(p_triangle->vertices[0],p_triangle->vertices[1],p_triangle->vertices[2]).intersects_aabb2(aabb))
-					continue;
-
-			}
-
-			if (encloses)
-				stack[stack_pos]=8; // quick and dirty opt
-
-			if (!child_idx) {
-
-
-				if (octant_pool_size==octant_pool.size()) {
-					octant_pool.resize(octant_pool_size+OCTANT_POOL_CHUNK);
-					octants=octant_pool.ptr();
-					octant=&octants[ptr_stack[stack_pos]];
-				}
-				child_idx=octant_pool_size++;
-				octant->children[i]=child_idx;
-				Octant *child=&octants[child_idx];
-
-				child->aabb=octant->aabb;
-				child->texture_x=0;
-				child->texture_y=0;
-
-				child->aabb.size*=0.5;
-				if (i&1)
-					child->aabb.pos.x+=child->aabb.size.x;
-				if (i&2)
-					child->aabb.pos.y+=child->aabb.size.y;
-				if (i&4)
-					child->aabb.pos.z+=child->aabb.size.z;
-
-
-				child->full_accum[0]=0;
-				child->full_accum[1]=0;
-				child->full_accum[2]=0;
-				child->sampler_ofs=0;
-
-
-
-				if (stack_pos==octree_depth-1) {
-					child->leaf=true;
-					child->offset[0]=child->aabb.pos.x+child->aabb.size.x*0.5;
-					child->offset[1]=child->aabb.pos.y+child->aabb.size.y*0.5;
-					child->offset[2]=child->aabb.pos.z+child->aabb.size.z*0.5;
-					child->next_leaf=leaf_list;
-
-
-					for(int ci=0;ci<8;ci++) {
-						child->normal_accum[ci][0]=0;
-						child->normal_accum[ci][1]=0;
-						child->normal_accum[ci][2]=0;
-
-					}
-
-					child->bake_neighbour=0;
-					child->first_neighbour=true;
-					leaf_list=child_idx;
-					cell_count++;
-
-					for(int ci=0;ci<8;ci++) {
-						child->light_accum[ci][0]=0;
-						child->light_accum[ci][1]=0;
-						child->light_accum[ci][2]=0;
-					}
-
-					child->parent=ptr_stack[stack_pos];
-
-				} else {
-
-					child->leaf=false;
-					for(int j=0;j<8;j++) {
-						child->children[j]=0;
-					}
-				}
-			}
-
-			if (!octants[child_idx].leaf) {
-				stack_pos++;
-				stack[stack_pos]=0;
-				ptr_stack[stack_pos]=child_idx;
-			} else {
-
-				Octant *child=&octants[child_idx];
-
-				Vector3 n = Plane(p_triangle->vertices[0],p_triangle->vertices[1],p_triangle->vertices[2]).normal;
-
-
-				for(int ci=0;ci<8;ci++) {
-
-					Vector3 pos = child->aabb.pos;
-
-					if (ci&1)
-						pos.x+=child->aabb.size.x;
-					if (ci&2)
-						pos.y+=child->aabb.size.y;
-					if (ci&4)
-						pos.z+=child->aabb.size.z;
-
-
-					pos.x=floor((pos.x+cell_size*0.5)/cell_size);
-					pos.y=floor((pos.y+cell_size*0.5)/cell_size);
-					pos.z=floor((pos.z+cell_size*0.5)/cell_size);
-
-					{
-						Map<Vector3,Vector3>::Element *E=endpoint_normal.find(pos);
-						if (!E) {
-							endpoint_normal[pos]=n;
-						} else {
-							E->get()+=n;
-						}
-					}
-
-					{
-
-						uint64_t bit = get_uv_normal_bit(n);
-
-						Map<Vector3,uint64_t>::Element *E=endpoint_normal_bits.find(pos);
-						if (!E) {
-							endpoint_normal_bits[pos]=(1<<bit);
-						} else {
-							E->get()|=(1<<bit);
-						}
-
-					}
-
-				}
-
-			}
-
-
-		} else {
-			stack_pos--;
-			if (stack_pos<0)
-				break;
-		}
-	}
-
-
-}
-
-
-void BakedLightBaker::_make_octree() {
-
-
-	AABB base = bvh->aabb;
-	float lal=base.get_longest_axis_size();
-	//must be square because we want square blocks
-	base.size.x=lal;
-	base.size.y=lal;
-	base.size.z=lal;
-	base.grow_by(lal*0.001); //for precision
-	octree_aabb=base;
-
-	cell_size=base.size.x;
-	for(int i=0;i<octree_depth;i++)
-		cell_size/=2.0;
-	octant_stack = memnew_arr(uint32_t,octree_depth*2 );
-	octantptr_stack = memnew_arr(uint32_t,octree_depth*2 );
-
-	octant_pool.resize(OCTANT_POOL_CHUNK);
-	octant_pool_size=1;
-	Octant *root=octant_pool.ptr();
-	root->leaf=false;
-	root->aabb=octree_aabb;
-	root->parent=-1;
-	for(int i=0;i<8;i++)
-		root->children[i]=0;
-
-	EditorProgress ep("bake_octree",vformat(TTR("Parsing %d Triangles:"), triangles.size()),triangles.size());
-
-	for(int i=0;i<triangles.size();i++) {
-
-		_octree_insert(0,&triangles[i],octree_depth-1);
-		if ((i%1000)==0) {
-
-			ep.step(TTR("Triangle #")+itos(i),i);
-		}
-	}
-
-	{
-		uint32_t oct_idx=leaf_list;
-		Octant *octants=octant_pool.ptr();
-		while(oct_idx) {
-
-			BakedLightBaker::Octant *oct = &octants[oct_idx];
-			for(int ci=0;ci<8;ci++) {
-
-
-				Vector3 pos = oct->aabb.pos;
-
-				if (ci&1)
-					pos.x+=oct->aabb.size.x;
-				if (ci&2)
-					pos.y+=oct->aabb.size.y;
-				if (ci&4)
-					pos.z+=oct->aabb.size.z;
-
-
-				pos.x=floor((pos.x+cell_size*0.5)/cell_size);
-				pos.y=floor((pos.y+cell_size*0.5)/cell_size);
-				pos.z=floor((pos.z+cell_size*0.5)/cell_size);
-
-				{
-					Map<Vector3,Vector3>::Element *E=endpoint_normal.find(pos);
-					if (!E) {
-						//?
-						print_line("lolwut?");
-					} else {
-						Vector3 n = E->get().normalized();
-						oct->normal_accum[ci][0]=n.x;
-						oct->normal_accum[ci][1]=n.y;
-						oct->normal_accum[ci][2]=n.z;
-
-					}
-
-				}
-
-				{
-
-					Map<Vector3,uint64_t>::Element *E=endpoint_normal_bits.find(pos);
-					if (!E) {
-						//?
-						print_line("lolwut?");
-					} else {
-
-						float max_aper=0;
-						for(uint64_t i=0;i<62;i++) {
-
-							if (!(E->get()&(1<<i)))
-								continue;
-							Vector3 ang_i = get_bit_normal(i);
-
-							for(uint64_t j=0;j<62;j++) {
-
-								if (i==j)
-									continue;
-								if (!(E->get()&(1<<j)))
-									continue;
-								Vector3 ang_j = get_bit_normal(j);
-								float ang = Math::acos(ang_i.dot(ang_j));
-								if (ang>max_aper)
-									max_aper=ang;
-							}
-						}
-						if (max_aper>0.75*Math_PI) {
-							//angle too wide prevent problems and forget
-							oct->normal_accum[ci][0]=0;
-							oct->normal_accum[ci][1]=0;
-							oct->normal_accum[ci][2]=0;
-						}
-					}
-				}
-
-
-			}
-
-			oct_idx=oct->next_leaf;
-		}
-	}
-
-
-}
-
-
-
-
-
-void BakedLightBaker::_plot_light(ThreadStack& thread_stack,const Vector3& p_plot_pos, const AABB& p_plot_aabb, const Color& p_light,const Color& p_tint_light,bool p_only_full, const Plane& p_plane) {
-
-	//stackless version
-
-	uint32_t *stack=thread_stack.octant_stack;
-	uint32_t *ptr_stack=thread_stack.octantptr_stack;
-	Octant *octants=octant_pool.ptr();
-
-	stack[0]=0;
-	ptr_stack[0]=0;
-
-	int stack_pos=0;
-
-
-	while(true) {
-
-		Octant &octant=octants[ptr_stack[stack_pos]];
-
-		if (stack[stack_pos]==0) {
-
-
-			Vector3 pos = octant.aabb.pos + octant.aabb.size*0.5;
-			float md = 1<<(octree_depth - stack_pos );
-			float r=cell_size*plot_size*md;
-			float div = 1.0/(md*md*md);
-			//div=1.0;
-
-
-			float d = p_plot_pos.distance_to(pos);
-
-			if ((p_plane.distance_to(pos)>-cell_size*1.75*md) && d<=r) {
-
-
-				float intensity = 1.0 - (d/r)*(d/r); //not gauss but..
-
-				baked_light_baker_add_64f(&octant.full_accum[0],p_tint_light.r*intensity*div);
-				baked_light_baker_add_64f(&octant.full_accum[1],p_tint_light.g*intensity*div);
-				baked_light_baker_add_64f(&octant.full_accum[2],p_tint_light.b*intensity*div);
-			}
-		}
-
-		if (octant.leaf) {
-
-
-
-			//if (p_plane.normal.dot(octant.aabb.get_support(p_plane.normal)) < p_plane.d-CMP_EPSILON) { //octants behind are no go
-
-
-			if (!p_only_full) {
-				float r=cell_size*plot_size;
-				for(int i=0;i<8;i++) {
-					Vector3 pos=octant.aabb.pos;
-					if (i&1)
-						pos.x+=octant.aabb.size.x;
-					if (i&2)
-						pos.y+=octant.aabb.size.y;
-					if (i&4)
-						pos.z+=octant.aabb.size.z;
-
-
-
-					float d = p_plot_pos.distance_to(pos);
-
-					if ((p_plane.distance_to(pos)>-cell_size*1.75) && d<=r) {
-
-
-						float intensity = 1.0 - (d/r)*(d/r); //not gauss but..
-						if (edge_damp>0) {
-							Vector3 normal = Vector3(octant.normal_accum[i][0],octant.normal_accum[i][1],octant.normal_accum[i][2]);
-							if (normal.x>0 || normal.y>0 || normal.z>0) {
-
-								float damp = Math::abs(p_plane.normal.dot(normal));
-								intensity*=pow(damp,edge_damp);
-
-							}
-						}
-
-						//intensity*=1.0-Math::abs(p_plane.distance_to(pos))/(plot_size*cell_size);
-						//intensity = Math::cos(d*Math_PI*0.5/r);
-
-						baked_light_baker_add_64f(&octant.light_accum[i][0],p_light.r*intensity);
-						baked_light_baker_add_64f(&octant.light_accum[i][1],p_light.g*intensity);
-						baked_light_baker_add_64f(&octant.light_accum[i][2],p_light.b*intensity);
-
-
-					}
-				}
-			}
-
-			stack_pos--;
-		} else if (stack[stack_pos]<8) {
-
-			int i = stack[stack_pos];
-			stack[stack_pos]++;
-
-			if (!octant.children[i]) {
-				continue;
-			}
-
-			Octant &child=octants[octant.children[i]];
-
-			if (!child.aabb.intersects(p_plot_aabb))
-				continue;
-
-			if (child.aabb.encloses(p_plot_aabb)) {
-				stack[stack_pos]=8; //don't test the rest
-			}
-
-			stack_pos++;
-			stack[stack_pos]=0;
-			ptr_stack[stack_pos]=octant.children[i];
-		} else {
-			stack_pos--;
-			if (stack_pos<0)
-				break;
-		}
-	}
-
-
-}
-
-
-float BakedLightBaker::_throw_ray(ThreadStack& thread_stack,bool p_bake_direct,const Vector3& p_begin, const Vector3& p_end,float p_rest,const Color& p_light,float *p_att_curve,float p_att_pos,int p_att_curve_len,int p_bounces,bool p_first_bounce,bool p_only_dist) {
-
-
-	uint32_t* stack = thread_stack.ray_stack;
-	BVH **bstack = thread_stack.bvh_stack;
-
-	enum {
-		TEST_AABB_BIT=0,
-		VISIT_LEFT_BIT=1,
-		VISIT_RIGHT_BIT=2,
-		VISIT_DONE_BIT=3,
-
-
-	};
-
-	Vector3 n = (p_end-p_begin);
-	float len=n.length();
-	if (len==0)
-		return 0;
-	n/=len;
-
-
-
-	real_t d=1e10;
-	bool inters=false;
-	Vector3 r_normal;
-	Vector3 r_point;
-	Vector3 end=p_end;
-
-	Triangle *triangle=NULL;
-
-	/*
-	for(int i=0;i<max_depth;i++)
-		stack[i]=0;
-	*/
-
-	int level=0;
-	//AABB ray_aabb;
-	//ray_aabb.pos=p_begin;
-	//ray_aabb.expand_to(p_end);
-
-
-	bstack[0]=bvh;
-	stack[0]=TEST_AABB_BIT;
-
-
-	while(true) {
-
-		uint32_t mode = stack[level];
-		const BVH &b = *bstack[level];
-		bool done=false;
-
-		switch(mode) {
-			case TEST_AABB_BIT: {
-
-				if (b.leaf) {
-
-
-					Face3 f3(b.leaf->vertices[0],b.leaf->vertices[1],b.leaf->vertices[2]);
-
-
-					Vector3 res;
-
-					if (f3.intersects_segment(p_begin,end,&res)) {
-
-
-						float nd = n.dot(res);
-						if (nd<d) {
-
-							d=nd;
-							r_point=res;
-							end=res;
-							len=(p_begin-end).length();
-							r_normal=f3.get_plane().get_normal();
-							triangle=b.leaf;
-							inters=true;
-						}
-
-					}
-
-					stack[level]=VISIT_DONE_BIT;
-				} else {
-
-
-					bool valid = b.aabb.smits_intersect_ray(p_begin,n,0,len);
-					//bool valid = b.aabb.intersects_segment(p_begin,p_end);
-					//bool valid = b.aabb.intersects(ray_aabb);
-
-					if (!valid) {
-
-						stack[level]=VISIT_DONE_BIT;
-
-					} else {
-
-						stack[level]=VISIT_LEFT_BIT;
-					}
-				}
-
-			} continue;
-			case VISIT_LEFT_BIT: {
-
-				stack[level]=VISIT_RIGHT_BIT;
-				bstack[level+1]=b.children[0];
-				stack[level+1]=TEST_AABB_BIT;
-				level++;
-
-			} continue;
-			case VISIT_RIGHT_BIT: {
-
-				stack[level]=VISIT_DONE_BIT;
-				bstack[level+1]=b.children[1];
-				stack[level+1]=TEST_AABB_BIT;
-				level++;
-			} continue;
-			case VISIT_DONE_BIT: {
-
-				if (level==0) {
-					done=true;
-					break;
-				} else
-					level--;
-
-			} continue;
-		}
-
-
-		if (done)
-			break;
-	}
-
-
-
-	if (inters) {
-
-		if (p_only_dist) {
-
-			return p_begin.distance_to(r_point);
-		}
-
-
-		//should check if there is normals first
-		Vector2 uv;
-		if (true) {
-
-			triangle->get_uv_and_normal(r_point,uv,r_normal);
-
-		} else {
-
-		}
-
-		if (n.dot(r_normal)>0)
-			return -1;
-
-		if (n.dot(r_normal)>0)
-			r_normal=-r_normal;
-
-
-		//ok...
-		Color diffuse_at_point(0.8,0.8,0.8);
-		Color specular_at_point(0.0,0.0,0.0);
-
-
-		float dist = p_begin.distance_to(r_point);
-
-		AABB aabb;
-		aabb.pos=r_point;
-		aabb.pos-=Vector3(1,1,1)*cell_size*plot_size;
-		aabb.size=Vector3(2,2,2)*cell_size*plot_size;
-
-		Color res_light=p_light;
-		float att=1.0;
-		float dp=(1.0-normal_damp)*n.dot(-r_normal)+normal_damp;
-
-		if (p_att_curve) {
-
-			p_att_pos+=dist;
-			int cpos = Math::fast_ftoi((p_att_pos/p_att_curve_len)*ATTENUATION_CURVE_LEN);
-			cpos=CLAMP(cpos,0,ATTENUATION_CURVE_LEN-1);
-			att=p_att_curve[cpos];
-		}
-
-
-		res_light.r*=dp;
-		res_light.g*=dp;
-		res_light.b*=dp;
-
-		//light is plotted before multiplication with diffuse, this way
-		//the multiplication can happen with more detail in the shader
-
-
-
-		if (triangle->material) {
-
-			//triangle->get_uv(r_point);
-
-			diffuse_at_point=triangle->material->diffuse.get_color(uv);
-			specular_at_point=triangle->material->specular.get_color(uv);
-		}
-
-
-		diffuse_at_point.r=res_light.r*diffuse_at_point.r;
-		diffuse_at_point.g=res_light.g*diffuse_at_point.g;
-		diffuse_at_point.b=res_light.b*diffuse_at_point.b;
-
-		if (p_bounces>0) {
-
-
-			p_rest-=dist;
-			if (p_rest<CMP_EPSILON)
-				return 0;
-
-			if (r_normal==-n)
-				return 0; //todo change a little
-
-			r_point+=r_normal*0.01;
-
-
-
-
-			specular_at_point.r=res_light.r*specular_at_point.r;
-			specular_at_point.g=res_light.g*specular_at_point.g;
-			specular_at_point.b=res_light.b*specular_at_point.b;
-
-
-
-			if (use_diffuse && (diffuse_at_point.r>CMP_EPSILON || diffuse_at_point.g>CMP_EPSILON || diffuse_at_point.b>CMP_EPSILON)) {
-				//diffuse bounce
-
-				Vector3 c1=r_normal.cross(n).normalized();
-				Vector3 c2=r_normal.cross(c1).normalized();
-				double r1 = double(rand())/RAND_MAX;
-				double r2 = double(rand())/RAND_MAX;
-				double r3 = double(rand())/RAND_MAX;
-#if 0
-				Vector3 next = - ((c1*(r1-0.5)) + (c2*(r2-0.5)) + (r_normal*(r3-0.5))).normalized()*0.5 + r_normal*0.5;
-
-				if (next==Vector3())
-					next=r_normal;
-				Vector3 rn=next.normalized();
-
-#else
-				Vector3 rn = ((c1*(r1-0.5)) + (c2*(r2-0.5)) + (r_normal*r3*0.5)).normalized();
-#endif
-
-
-				_throw_ray(thread_stack,p_bake_direct,r_point,r_point+rn*p_rest,p_rest,diffuse_at_point,p_att_curve,p_att_pos,p_att_curve_len,p_bounces-1);
-			}
-
-			if (use_specular && (specular_at_point.r>CMP_EPSILON || specular_at_point.g>CMP_EPSILON || specular_at_point.b>CMP_EPSILON)) {
-				//specular bounce
-
-				//Vector3 c1=r_normal.cross(n).normalized();
-				//Vector3 c2=r_normal.cross(c1).normalized();
-
-				Vector3 rn = n - r_normal *r_normal.dot(n) * 2.0;
-
-				_throw_ray(thread_stack,p_bake_direct,r_point,r_point+rn*p_rest,p_rest,specular_at_point,p_att_curve,p_att_pos,p_att_curve_len,p_bounces-1);
-			}
-		}
-
-		//specular later
-		//_plot_light_point(r_point,octree,octree_aabb,p_light);
-
-
-		Color plot_light=res_light.linear_interpolate(diffuse_at_point,tint);
-		plot_light.r*=att;
-		plot_light.g*=att;
-		plot_light.b*=att;
-		Color tint_light=diffuse_at_point;
-		tint_light.r*=att;
-		tint_light.g*=att;
-		tint_light.b*=att;
-
-		bool skip=false;
-
-		if (!p_first_bounce || p_bake_direct) {
-
-
-			float r = plot_size * cell_size*2;
-			if (dist<r) {
-				//avoid accumulaiton of light on corners
-				//plot_light=plot_light.linear_interpolate(Color(0,0,0,0),1.0-sd/plot_size*plot_size);
-				skip=true;
-
-			} else {
-
-
-				Vector3 c1=r_normal.cross(n).normalized();
-				Vector3 c2=r_normal.cross(c1).normalized();
-				double r1 = double(rand())/RAND_MAX;
-				double r2 = double(rand())/RAND_MAX;
-				double r3 = double(rand())/RAND_MAX;
-				Vector3 rn = ((c1*(r1-0.5)) + (c2*(r2-0.5)) + (r_normal*r3*0.25)).normalized();
-				float d =_throw_ray(thread_stack,p_bake_direct,r_point,r_point+rn*p_rest,p_rest,diffuse_at_point,p_att_curve,p_att_pos,p_att_curve_len,p_bounces-1,false,true);
-				r = plot_size*cell_size*ao_radius;
-				if (d>0 && d<r) {
-					//avoid accumulaiton of light on corners
-					//plot_light=plot_light.linear_interpolate(Color(0,0,0,0),1.0-sd/plot_size*plot_size);
-					skip=true;
-
-				} else {
-					//plot_light=Color(0,0,0,0);
-				}
-			}
-		}
-
-
-		Plane plane(r_point,r_normal);
-		if (!skip)
-			_plot_light(thread_stack,r_point,aabb,plot_light,tint_light,!(!p_first_bounce || p_bake_direct),plane);
-
-
-		return dist;
-	}
-
-	return -1;
-
-}
-
-
-
-
-void BakedLightBaker::_make_octree_texture() {
-
-
-	BakedLightBaker::Octant *octants=octant_pool.ptr();
-
-	//find neighbours first, to have a better idea of what amount of space is needed
-	{
-
-		Vector<OctantHash> octant_hashing;
-		octant_hashing.resize(octant_pool_size);
-		Vector<uint32_t> hash_table;
-		int hash_table_size=Math::larger_prime(16384);
-		hash_table.resize(hash_table_size);
-		uint32_t*hashptr = hash_table.ptr();
-		OctantHash*octhashptr = octant_hashing.ptr();
-
-		for(int i=0;i<hash_table_size;i++)
-			hashptr[i]=0;
-
-
-		//step 1 add to hash table
-
-		uint32_t oct_idx=leaf_list;
-
-
-		while(oct_idx) {
-
-			BakedLightBaker::Octant *oct = &octants[oct_idx];
-			uint64_t base=0;
-			Vector3 pos = oct->aabb.pos - octree_aabb.pos; //make sure is always positive
-			base=int((pos.x+cell_size*0.5)/cell_size);
-			base<<=16;
-			base|=int((pos.y+cell_size*0.5)/cell_size);
-			base<<=16;
-			base|=int((pos.z+cell_size*0.5)/cell_size);
-
-			uint32_t hash = HashMapHasherDefault::hash(base);
-			uint32_t idx = hash % hash_table_size;
-			octhashptr[oct_idx].next=hashptr[idx];
-			octhashptr[oct_idx].hash=hash;
-			octhashptr[oct_idx].value=base;
-			hashptr[idx]=oct_idx;
-
-			oct_idx=oct->next_leaf;
-
-		}
-
-		//step 2 find neighbours
-		oct_idx=leaf_list;
-		int neighbours=0;
-
-
-		while(oct_idx) {
-
-			BakedLightBaker::Octant *oct = &octants[oct_idx];
-			Vector3 pos = oct->aabb.pos - octree_aabb.pos; //make sure is always positive
-			pos.x+=cell_size;
-			uint64_t base=0;
-			base=int((pos.x+cell_size*0.5)/cell_size);
-			base<<=16;
-			base|=int((pos.y+cell_size*0.5)/cell_size);
-			base<<=16;
-			base|=int((pos.z+cell_size*0.5)/cell_size);
-
-			uint32_t hash = HashMapHasherDefault::hash(base);
-			uint32_t idx = hash % hash_table_size;
-
-			uint32_t bucket = hashptr[idx];
-
-			while(bucket) {
-
-				if (octhashptr[bucket].value==base) {
-
-					oct->bake_neighbour=bucket;
-					octants[bucket].first_neighbour=false;
-					neighbours++;
-					break;
-				}
-
-				bucket = octhashptr[bucket].next;
-			}
-
-			oct_idx=oct->next_leaf;
-
-		}
-
-		print_line("octant with neighbour: "+itos(neighbours));
-
-	}
-
-
-	//ok let's try to just create a texture
-
-	int otex_w=256;
-
-	while (true) {
-
-
-
-		uint32_t oct_idx=leaf_list;
-
-		int row=0;
-
-
-		print_line("begin at row "+itos(row));
-		int longest_line_reused=0;
-		int col=0;
-		int processed=0;
-
-		//reset
-		while(oct_idx) {
-
-			BakedLightBaker::Octant *oct = &octants[oct_idx];
-			oct->texture_x=0;
-			oct->texture_y=0;
-			oct_idx=oct->next_leaf;
-
-		}
-
-		oct_idx=leaf_list;
-		//assign
-		while(oct_idx) {
-
-			BakedLightBaker::Octant *oct = &octants[oct_idx];
-			if (oct->first_neighbour && oct->texture_x==0 && oct->texture_y==0) {
-				//was not processed
-				uint32_t current_idx=oct_idx;
-				int reused=0;
-
-				while(current_idx) {
-					BakedLightBaker::Octant *o = &octants[current_idx];
-					if (col+1 >= otex_w) {
-						col=0;
-						row+=4;
-					}
-					o->texture_x=col;
-					o->texture_y=row;
-					processed++;
-
-					if (o->bake_neighbour) {
-						reused++;
-					}
-					col+=o->bake_neighbour ? 1 : 2; //reuse neighbour
-					current_idx=o->bake_neighbour;
-				}
-
-				if (reused>longest_line_reused) {
-					longest_line_reused=reused;
-				}
-			}
-			oct_idx=oct->next_leaf;
-		}
-
-		row+=4;
-
-		if (otex_w < row) {
-
-			otex_w*=2;
-		} else {
-
-			baked_light_texture_w=otex_w;
-			baked_light_texture_h=next_power_of_2(row);
-			print_line("w: "+itos(otex_w));
-			print_line("h: "+itos(row));
-			break;
-		}
-
-
-	}
-
-
-	{
-
-		otex_w=(1<<lattice_size)*(1<<lattice_size)*2; //make sure lattice fits horizontally
-		Vector3 lattice_cell_size=octree_aabb.size;
-		for(int i=0;i<lattice_size;i++) {
-
-			lattice_cell_size*=0.5;
-		}
-
-
-
-		while(true) {
-
-			//let's plot the leafs first, given the octree is not so obvious which size it will have
-			int row=4+4*(1<<lattice_size);
-			int col=0;
-
-			col=0;
-			row+=4;
-			print_line("end at row "+itos(row));
-
-			//put octree, no need for recursion, just loop backwards.
-			int regular_octants=0;
-			for(int i=octant_pool_size-1;i>=0;i--) {
-
-				BakedLightBaker::Octant *oct = &octants[i];
-				if (oct->leaf) //ignore leaf
-					continue;
-				if (oct->aabb.size.x>lattice_cell_size.x*1.1) { //bigger than latice, skip
-					oct->texture_x=0;
-					oct->texture_y=0;
-				} else if (oct->aabb.size.x>lattice_cell_size.x*0.8) {
-					//this is the initial lattice
-					Vector3 pos = oct->aabb.pos - octree_aabb.pos; //make sure is always positive
-					int x = int((pos.x+lattice_cell_size.x*0.5)/lattice_cell_size.x);
-					int y = int((pos.y+lattice_cell_size.y*0.5)/lattice_cell_size.y);
-					int z = int((pos.z+lattice_cell_size.z*0.5)/lattice_cell_size.z);
-					//bug net
-					ERR_FAIL_INDEX(x,(1<<lattice_size));
-					ERR_FAIL_INDEX(y,(1<<lattice_size));
-					ERR_FAIL_INDEX(z,(1<<lattice_size));
-
-					/*int ofs = z*(1<<lattice_size)*(1<<lattice_size)+y*(1<<lattice_size)+x;
-					ofs*=4;
-					oct->texture_x=ofs%otex_w;
-					oct->texture_y=(ofs/otex_w)*4+4;
-					*/
-
-					oct->texture_x=(x+(1<<lattice_size)*z)*2;
-					oct->texture_y=4+y*4;
-					//print_line("pos: "+itos(x)+","+itos(y)+","+itos(z)+" -  ofs"+itos(oct->texture_x)+","+itos(oct->texture_y));
-
-
-				} else {
-					//an everyday regular octant
-
-					if (col+2 > otex_w) {
-						col=0;
-						row+=4;
-					}
-
-					oct->texture_x=col;
-					oct->texture_y=row;
-					col+=2;
-					regular_octants++;
-
-
-				}
-			}
-			print_line("octants end at row "+itos(row)+" totalling"+itos(regular_octants));
-
-			//ok evaluation.
-
-			if (otex_w<=2048 && row>2048) { //too big upwards, try bigger texture
-				otex_w*=2;
-				continue;
-			} else {
-				baked_octree_texture_w=otex_w;
-				baked_octree_texture_h=row+4;
-				break;
-			}
-
-		}
-
-
-	}
-
-
-	baked_octree_texture_h=next_power_of_2(baked_octree_texture_h);
-	print_line("RESULT! "+itos(baked_octree_texture_w)+","+itos(baked_octree_texture_h));
-
-}
-
-
-
-
-
-
-
-
-double BakedLightBaker::get_normalization(int p_light_idx) const {
-
-	double nrg=0;
-
-	const LightData &dl=lights[p_light_idx];
-	double cell_area = cell_size*cell_size;
-	//nrg+= /*dl.energy */ (dl.rays_thrown * cell_area / dl.area);
-	nrg=dl.rays_thrown * cell_area;
-	nrg*=(Math_PI*plot_size*plot_size)*0.5; // damping of radial linear gradient kernel
-	nrg*=dl.constant;
-	//nrg*=5;
-
-
-	return nrg;
-}
-
-
-
-double BakedLightBaker::get_modifier(int p_light_idx) const {
-
-	double nrg=0;
-
-	const LightData &dl=lights[p_light_idx];
-	double cell_area = cell_size*cell_size;
-	//nrg+= /*dl.energy */ (dl.rays_thrown * cell_area / dl.area);
-	nrg=cell_area;
-	nrg*=(Math_PI*plot_size*plot_size)*0.5; // damping of radial linear gradient kernel
-	nrg*=dl.constant;
-	//nrg*=5;
-
-
-	return nrg;
-}
-
-void BakedLightBaker::throw_rays(ThreadStack& thread_stack,int p_amount) {
-
-
-
-	for(int i=0;i<lights.size();i++) {
-
-		LightData &dl=lights[i];
-
-
-		int amount = p_amount * total_light_area / dl.area;
-		double mod = 1.0/double(get_modifier(i));
-		mod*=p_amount/float(amount);
-
-		switch(dl.type) {
-
-			case VS::LIGHT_DIRECTIONAL: {
-
-
-				for(int j=0;j<amount;j++) {
-					Vector3 from = dl.pos;
-					double r1 = double(rand())/RAND_MAX;
-					double r2 = double(rand())/RAND_MAX;
-					from+=dl.up*(r1*2.0-1.0);
-					from+=dl.left*(r2*2.0-1.0);
-					Vector3 to = from+dl.dir*dl.length;
-					Color col=dl.diffuse;
-					float m = mod*dl.energy;
-					col.r*=m;
-					col.g*=m;
-					col.b*=m;
-
-					dl.rays_thrown++;
-					baked_light_baker_add_64i(&total_rays,1);
-
-					_throw_ray(thread_stack,dl.bake_direct,from,to,dl.length,col,NULL,0,0,max_bounces,true);
-				}
-			} break;
-			case VS::LIGHT_OMNI: {
-
-
-				for(int j=0;j<amount;j++) {
-					Vector3 from = dl.pos;
-
-					double r1 = double(rand())/RAND_MAX;
-					double r2 = double(rand())/RAND_MAX;
-					double r3 = double(rand())/RAND_MAX;
-
-#if 0
-					//crap is not uniform..
-					Vector3 dir = Vector3(r1*2.0-1.0,r2*2.0-1.0,r3*2.0-1.0).normalized();
-
-#else
-
-					double phi = r1*Math_PI*2.0;
-					double costheta = r2*2.0-1.0;
-					double u = r3;
-
-					double theta = acos( costheta );
-					double r = 1.0 * pow( u,1/3.0 );
-
-					Vector3 dir(
-						r * sin( theta) * cos( phi ),
-						r * sin( theta) * sin( phi ),
-						r * cos( theta )
-					);
-					dir.normalize();
-
-#endif
-					Vector3 to = dl.pos+dir*dl.radius;
-					Color col=dl.diffuse;
-					float m = mod*dl.energy;
-					col.r*=m;
-					col.g*=m;
-					col.b*=m;
-
-					dl.rays_thrown++;
-					baked_light_baker_add_64i(&total_rays,1);
-					_throw_ray(thread_stack,dl.bake_direct,from,to,dl.radius,col,dl.attenuation_table.ptr(),0,dl.radius,max_bounces,true);
-					//_throw_ray(i,from,to,dl.radius,col,NULL,0,dl.radius,max_bounces,true);
-				}
-
-			} break;
-			case VS::LIGHT_SPOT: {
-
-				for(int j=0;j<amount;j++) {
-					Vector3 from = dl.pos;
-
-					double r1 = double(rand())/RAND_MAX;
-					//double r2 = double(rand())/RAND_MAX;
-					double r3 = double(rand())/RAND_MAX;
-
-					float d=Math::tan(Math::deg2rad(dl.spot_angle));
-
-					float x = sin(r1*Math_PI*2.0)*d;
-					float y = cos(r1*Math_PI*2.0)*d;
-
-					Vector3 dir = r3*(dl.dir + dl.up*y + dl.left*x) + (1.0-r3)*dl.dir;
-					dir.normalize();
-
-
-					Vector3 to = dl.pos+dir*dl.radius;
-					Color col=dl.diffuse;
-					float m = mod*dl.energy;
-					col.r*=m;
-					col.g*=m;
-					col.b*=m;
-
-					dl.rays_thrown++;
-					baked_light_baker_add_64i(&total_rays,1);
-					_throw_ray(thread_stack,dl.bake_direct,from,to,dl.radius,col,dl.attenuation_table.ptr(),0,dl.radius,max_bounces,true);
-					//_throw_ray(i,from,to,dl.radius,col,NULL,0,dl.radius,max_bounces,true);
-				}
-
-			} break;
-
-		}
-	}
-}
-
-
-
-
-
-
-
-
-
-
-
-
-
-void BakedLightBaker::bake(const Ref<BakedLight> &p_light, Node* p_node) {
-
-	if (baking)
-		return;
-	cell_count=0;
-
-	base_inv=Object::cast_to<Spatial>(p_node)->get_global_transform().affine_inverse();
-	EditorProgress ep("bake",TTR("Light Baker Setup:"),5);
-	baked_light=p_light;
-	lattice_size=baked_light->get_initial_lattice_subdiv();
-	octree_depth=baked_light->get_cell_subdivision();
-	plot_size=baked_light->get_plot_size();
-	max_bounces=baked_light->get_bounces();
-	use_diffuse=baked_light->get_bake_flag(BakedLight::BAKE_DIFFUSE);
-	use_specular=baked_light->get_bake_flag(BakedLight::BAKE_SPECULAR);
-	use_translucency=baked_light->get_bake_flag(BakedLight::BAKE_TRANSLUCENT);
-
-	edge_damp=baked_light->get_edge_damp();
-	normal_damp=baked_light->get_normal_damp();
-	octree_extra_margin=baked_light->get_cell_extra_margin();
-	tint=baked_light->get_tint();
-	ao_radius=baked_light->get_ao_radius();
-	ao_strength=baked_light->get_ao_strength();
-	linear_color=baked_light->get_bake_flag(BakedLight::BAKE_LINEAR_COLOR);
-
-	baked_textures.clear();
-	for(int i=0;i<baked_light->get_lightmaps_count();i++) {
-		BakeTexture bt;
-		bt.width=baked_light->get_lightmap_gen_size(i).x;
-		bt.height=baked_light->get_lightmap_gen_size(i).y;
-		baked_textures.push_back(bt);
-	}
-
-
-	ep.step(TTR("Parsing Geometry"),0);
-	_parse_geometry(p_node);
-	mat_map.clear();
-	tex_map.clear();
-	print_line("\ttotal triangles: "+itos(triangles.size()));
-	// no geometry
-	if (triangles.size() == 0) {
-		return;
-	}
-	ep.step(TTR("Fixing Lights"),1);
-	_fix_lights();
-	ep.step(TTR("Making BVH"),2);
-	_make_bvh();
-	ep.step(TTR("Creating Light Octree"),3);
-	_make_octree();
-	ep.step(TTR("Creating Octree Texture"),4);
-	_make_octree_texture();
-	baking=true;
-	_start_thread();
-
-}
-
-
-void BakedLightBaker::update_octree_sampler(PoolVector<int> &p_sampler) {
-
-	BakedLightBaker::Octant *octants=octant_pool.ptr();
-	double norm = 1.0/double(total_rays);
-
-
-
-	if (p_sampler.size()==0 || first_bake_to_map) {
-
-		Vector<int> tmp_smp;
-		tmp_smp.resize(32); //32 for header
-
-		for(int i=0;i<32;i++) {
-			tmp_smp[i]=0;
-		}
-
-		for(int i=octant_pool_size-1;i>=0;i--) {
-
-			if (i==0)
-				tmp_smp[1]=tmp_smp.size();
-
-			Octant &octant=octants[i];
-			octant.sampler_ofs = tmp_smp.size();
-			int idxcol[2]={0,0};
-
-			int r = CLAMP((octant.full_accum[0]*norm)*2048,0,32767);
-			int g = CLAMP((octant.full_accum[1]*norm)*2048,0,32767);
-			int b = CLAMP((octant.full_accum[2]*norm)*2048,0,32767);
-
-			idxcol[0]|=r;
-			idxcol[1]|=(g<<16)|b;
-
-			if (octant.leaf) {
-				tmp_smp.push_back(idxcol[0]);
-				tmp_smp.push_back(idxcol[1]);
-			} else {
-
-				for(int j=0;j<8;j++) {
-					if (octant.children[j]) {
-						idxcol[0]|=(1<<(j+16));
-					}
-				}
-				tmp_smp.push_back(idxcol[0]);
-				tmp_smp.push_back(idxcol[1]);
-				for(int j=0;j<8;j++) {
-					if (octant.children[j]) {
-						tmp_smp.push_back(octants[octant.children[j]].sampler_ofs);
-						if (octants[octant.children[j]].sampler_ofs==0) {
-							print_line("FUUUUUUUUCK");
-						}
-					}
-				}
-			}
-
-		}
-
-		p_sampler.resize(tmp_smp.size());
-		PoolVector<int>::Write w = p_sampler.write();
-		int ss = tmp_smp.size();
-		for(int i=0;i<ss;i++) {
-			w[i]=tmp_smp[i];
-		}
-
-		first_bake_to_map=false;
-
-	}
-
-	double gamma = baked_light->get_gamma_adjust();
-	double mult = baked_light->get_energy_multiplier();
-	float saturation = baked_light->get_saturation();
-
-	PoolVector<int>::Write w = p_sampler.write();
-
-	encode_uint32(octree_depth,(uint8_t*)&w[2]);
-	encode_uint32(linear_color,(uint8_t*)&w[3]);
-
-	encode_float(octree_aabb.pos.x,(uint8_t*)&w[4]);
-	encode_float(octree_aabb.pos.y,(uint8_t*)&w[5]);
-	encode_float(octree_aabb.pos.z,(uint8_t*)&w[6]);
-	encode_float(octree_aabb.size.x,(uint8_t*)&w[7]);
-	encode_float(octree_aabb.size.y,(uint8_t*)&w[8]);
-	encode_float(octree_aabb.size.z,(uint8_t*)&w[9]);
-
-	//norm*=multiplier;
-
-	for(int i=octant_pool_size-1;i>=0;i--) {
-
-		Octant &octant=octants[i];
-		int idxcol[2]={w[octant.sampler_ofs],w[octant.sampler_ofs+1]};
-
-		double rf=pow(octant.full_accum[0]*norm*mult,gamma);
-		double gf=pow(octant.full_accum[1]*norm*mult,gamma);
-		double bf=pow(octant.full_accum[2]*norm*mult,gamma);
-
-		double gray = (rf+gf+bf)/3.0;
-		rf = gray + (rf-gray)*saturation;
-		gf = gray + (gf-gray)*saturation;
-		bf = gray + (bf-gray)*saturation;
-
-
-		int r = CLAMP((rf)*2048,0,32767);
-		int g = CLAMP((gf)*2048,0,32767);
-		int b = CLAMP((bf)*2048,0,32767);
-
-		idxcol[0]=((idxcol[0]>>16)<<16)|r;
-		idxcol[1]=(g<<16)|b;
-		w[octant.sampler_ofs]=idxcol[0];
-		w[octant.sampler_ofs+1]=idxcol[1];
-	}
-
-}
-
-void BakedLightBaker::update_octree_images(PoolVector<uint8_t> &p_octree,PoolVector<uint8_t> &p_light) {
-
-
-	int len = baked_octree_texture_w*baked_octree_texture_h*4;
-	p_octree.resize(len);
-
-	int ilen = baked_light_texture_w*baked_light_texture_h*4;
-	p_light.resize(ilen);
-
-
-	PoolVector<uint8_t>::Write w = p_octree.write();
-	zeromem(w.ptr(),len);
-
-	PoolVector<uint8_t>::Write iw = p_light.write();
-	zeromem(iw.ptr(),ilen);
-
-	float gamma = baked_light->get_gamma_adjust();
-	float mult = baked_light->get_energy_multiplier();
-
-	for(int i=0;i<len;i+=4) {
-		w[i+0]=0xFF;
-		w[i+1]=0;
-		w[i+2]=0xFF;
-		w[i+3]=0xFF;
-	}
-
-	for(int i=0;i<ilen;i+=4) {
-		iw[i+0]=0xFF;
-		iw[i+1]=0;
-		iw[i+2]=0xFF;
-		iw[i+3]=0xFF;
-	}
-
-	float multiplier=1.0;
-
-	if (baked_light->get_format()==BakedLight::FORMAT_HDR8)
-		multiplier=8;
-	encode_uint32(baked_octree_texture_w,&w[0]);
-	encode_uint32(baked_octree_texture_h,&w[4]);
-	encode_uint32(0,&w[8]);
-	encode_float(1<<lattice_size,&w[12]);
-	encode_uint32(octree_depth-lattice_size,&w[16]);
-	encode_uint32(multiplier,&w[20]);
-	encode_uint16(baked_light_texture_w,&w[24]); //if present, use the baked light texture
-	encode_uint16(baked_light_texture_h,&w[26]);
-	encode_uint32(0,&w[28]); //baked light texture format
-
-	encode_float(octree_aabb.pos.x,&w[32]);
-	encode_float(octree_aabb.pos.y,&w[36]);
-	encode_float(octree_aabb.pos.z,&w[40]);
-	encode_float(octree_aabb.size.x,&w[44]);
-	encode_float(octree_aabb.size.y,&w[48]);
-	encode_float(octree_aabb.size.z,&w[52]);
-
-
-	BakedLightBaker::Octant *octants=octant_pool.ptr();
-	int octant_count=octant_pool_size;
-	uint8_t *ptr = w.ptr();
-	uint8_t *lptr = iw.ptr();
-
-
-	int child_offsets[8]={
-		0,
-		4,
-		baked_octree_texture_w*4,
-		baked_octree_texture_w*4+4,
-		baked_octree_texture_w*8+0,
-		baked_octree_texture_w*8+4,
-		baked_octree_texture_w*8+baked_octree_texture_w*4,
-		baked_octree_texture_w*8+baked_octree_texture_w*4+4,
-	};
-
-	int lchild_offsets[8]={
-		0,
-		4,
-		baked_light_texture_w*4,
-		baked_light_texture_w*4+4,
-		baked_light_texture_w*8+0,
-		baked_light_texture_w*8+4,
-		baked_light_texture_w*8+baked_light_texture_w*4,
-		baked_light_texture_w*8+baked_light_texture_w*4+4,
-	};
-
-	/*Vector<double> norm_arr;
-	norm_arr.resize(lights.size());
-
-	for(int i=0;i<lights.size();i++) {
-		norm_arr[i] =  1.0/get_normalization(i);
-	}
-
-	const double *normptr=norm_arr.ptr();
-*/
-	double norm = 1.0/double(total_rays);
-	mult/=multiplier;
-	double saturation = baked_light->get_saturation();
-
-	for(int i=0;i<octant_count;i++) {
-
-		Octant &oct=octants[i];
-		if (oct.texture_x==0 && oct.texture_y==0)
-			continue;
-
-
-		if (oct.leaf) {
-
-			int ofs = (oct.texture_y * baked_light_texture_w + oct.texture_x)<<2;
-			ERR_CONTINUE(ofs<0 || ofs >ilen);
-			//write colors
-			for(int j=0;j<8;j++) {
-
-				/*
-				if (!oct.children[j])
-					continue;
-				*/
-				uint8_t *iptr=&lptr[ofs+lchild_offsets[j]];
-
-				float r=oct.light_accum[j][0]*norm;
-				float g=oct.light_accum[j][1]*norm;
-				float b=oct.light_accum[j][2]*norm;
-
-				r=pow(r*mult,gamma);
-				g=pow(g*mult,gamma);
-				b=pow(b*mult,gamma);
-
-				double gray = (r+g+b)/3.0;
-				r = gray + (r-gray)*saturation;
-				g = gray + (g-gray)*saturation;
-				b = gray + (b-gray)*saturation;
-
-				float ic[3]={
-					r,
-					g,
-					b,
-				};
-				iptr[0]=CLAMP(ic[0]*255.0,0,255);
-				iptr[1]=CLAMP(ic[1]*255.0,0,255);
-				iptr[2]=CLAMP(ic[2]*255.0,0,255);
-				iptr[3]=255;
-			}
-
-		} else {
-
-			int ofs = (oct.texture_y * baked_octree_texture_w + oct.texture_x)<<2;
-			ERR_CONTINUE(ofs<0 || ofs >len);
-
-			//write indices
-			for(int j=0;j<8;j++) {
-
-				if (!oct.children[j])
-					continue;
-				Octant&choct=octants[oct.children[j]];
-				uint8_t *iptr=&ptr[ofs+child_offsets[j]];
-
-				iptr[0]=choct.texture_x>>8;
-				iptr[1]=choct.texture_x&0xFF;
-				iptr[2]=choct.texture_y>>8;
-				iptr[3]=choct.texture_y&0xFF;
-
-			}
-		}
-
-	}
-
-
-}
-
-
-void BakedLightBaker::_free_bvh(BVH* p_bvh) {
-
-	if (!p_bvh->leaf) {
-		if (p_bvh->children[0])
-			_free_bvh(p_bvh->children[0]);
-		if (p_bvh->children[1])
-			_free_bvh(p_bvh->children[1]);
-	}
-
-	memdelete(p_bvh);
-
-}
-
-
-bool BakedLightBaker::is_baking() {
-
-	return baking;
-}
-
-void BakedLightBaker::set_pause(bool p_pause){
-
-	if (paused==p_pause)
-		return;
-
-	paused=p_pause;
-
-	if (paused) {
-		_stop_thread();
-	} else {
-		_start_thread();
-	}
-}
-bool BakedLightBaker::is_paused() {
-
-	return paused;
-
-}
-
-void BakedLightBaker::_bake_thread_func(void *arg) {
-
-	BakedLightBaker *ble = (BakedLightBaker*)arg;
-
-
-
-	ThreadStack thread_stack;
-
-	thread_stack.ray_stack = memnew_arr(uint32_t,ble->bvh_depth);
-	thread_stack.bvh_stack = memnew_arr(BVH*,ble->bvh_depth);
-	thread_stack.octant_stack = memnew_arr(uint32_t,ble->octree_depth*2 );
-	thread_stack.octantptr_stack = memnew_arr(uint32_t,ble->octree_depth*2 );
-
-	while(!ble->bake_thread_exit) {
-
-		ble->throw_rays(thread_stack,1000);
-	}
-
-	memdelete_arr(thread_stack.ray_stack );
-	memdelete_arr(thread_stack.bvh_stack );
-	memdelete_arr(thread_stack.octant_stack );
-	memdelete_arr(thread_stack.octantptr_stack );
-
-}
-
-void BakedLightBaker::_start_thread() {
-
-	if (threads.size()!=0)
-		return;
-	bake_thread_exit=false;
-
-	int thread_count = EDITOR_DEF("light_baker/custom_bake_threads",0);
-	if (thread_count<=0 || thread_count>64)
-		thread_count=OS::get_singleton()->get_processor_count();
-
-	//thread_count=1;
-	threads.resize(thread_count);
-	for(int i=0;i<threads.size();i++) {
-		threads[i]=Thread::create(_bake_thread_func,this);
-	}
-}
-
-void BakedLightBaker::_stop_thread() {
-
-	if (threads.size()==0)
-		return;
-	bake_thread_exit=true;
-	for(int i=0;i<threads.size();i++) {
-		Thread::wait_to_finish(threads[i]);
-		memdelete(threads[i]);
-	}
-	threads.clear();
-}
-
-void BakedLightBaker::_plot_pixel_to_lightmap(int x, int y, int width, int height, uint8_t *image, const Vector3& p_pos,const Vector3& p_normal,double *p_norm_ptr,float mult,float gamma) {
-
-
-	uint8_t *ptr = &image[(y*width+x)*4];
-	//int lc = lights.size();
-	double norm = 1.0/double(total_rays);
-
-
-	Color color;
-
-	Octant *octants=octant_pool.ptr();
-
-
-	int octant_idx=0;
-
-
-	while(true) {
-
-		Octant &octant=octants[octant_idx];
-
-		if (octant.leaf) {
-
-			Vector3 lpos = p_pos-octant.aabb.pos;
-			lpos/=octant.aabb.size;
-
-			Vector3 cols[8];
-
-			for(int i=0;i<8;i++) {
-
-				cols[i].x+=octant.light_accum[i][0]*norm;
-				cols[i].y+=octant.light_accum[i][1]*norm;
-				cols[i].z+=octant.light_accum[i][2]*norm;
-			}
-
-
-			/*Vector3 final = (cols[0] + (cols[1] - cols[0]) * lpos.y);
-			final = final + ((cols[2] + (cols[3] - cols[2]) * lpos.y) - final)*lpos.x;
-
-			Vector3 final2 = (cols[4+0] + (cols[4+1] - cols[4+0]) * lpos.y);
-			final2 = final2 + ((cols[4+2] + (cols[4+3] - cols[4+2]) * lpos.y) - final2)*lpos.x;*/
-
-			Vector3 finala = cols[0].linear_interpolate(cols[1],lpos.x);
-			Vector3 finalb = cols[2].linear_interpolate(cols[3],lpos.x);
-			Vector3 final = finala.linear_interpolate(finalb,lpos.y);
-
-			Vector3 final2a = cols[4+0].linear_interpolate(cols[4+1],lpos.x);
-			Vector3 final2b = cols[4+2].linear_interpolate(cols[4+3],lpos.x);
-			Vector3 final2 = final2a.linear_interpolate(final2b,lpos.y);
-
-			final = final.linear_interpolate(final2,lpos.z);
-			if (baked_light->get_format()==BakedLight::FORMAT_HDR8)
-				final*=8.0;
-
-
-			color.r=pow(final.x*mult,gamma);
-			color.g=pow(final.y*mult,gamma);
-			color.b=pow(final.z*mult,gamma);
-			color.a=1.0;
-
-			int lc = lights.size();
-			LightData *lv = lights.ptr();
-			for(int i=0;i<lc;i++) {
-				//shadow baking
-				if (!lv[i].bake_shadow)
-					continue;
-				Vector3 from = p_pos+p_normal*0.01;
-				Vector3 to;
-				float att=0;
-				switch(lv[i].type) {
-					case VS::LIGHT_DIRECTIONAL: {
-						to=from-lv[i].dir*lv[i].length;
-					} break;
-					case VS::LIGHT_OMNI: {
-						to=lv[i].pos;
-						float d = MIN(lv[i].radius,to.distance_to(from))/lv[i].radius;
-						att=d;//1.0-d;
-					} break;
-					default: continue;
-				}
-
-				uint32_t* stack = ray_stack;
-				BVH **bstack = bvh_stack;
-
-				enum {
-					TEST_RAY_BIT=0,
-					VISIT_LEFT_BIT=1,
-					VISIT_RIGHT_BIT=2,
-					VISIT_DONE_BIT=3,
-
-
-				};
-
-				bool intersected=false;
-
-				int level=0;
-
-				Vector3 n = (to-from);
-				float len=n.length();
-				if (len==0)
-					continue;
-				n/=len;
-
-				bstack[0]=bvh;
-				stack[0]=TEST_RAY_BIT;
-
-
-				while(!intersected) {
-
-					uint32_t mode = stack[level];
-					const BVH &b = *bstack[level];
-					bool done=false;
-
-					switch(mode) {
-						case TEST_RAY_BIT: {
-
-							if (b.leaf) {
-
-
-								Face3 f3(b.leaf->vertices[0],b.leaf->vertices[1],b.leaf->vertices[2]);
-
-
-								Vector3 res;
-
-								if (f3.intersects_segment(from,to)) {
-									intersected=true;
-									done=true;
-								}
-
-								stack[level]=VISIT_DONE_BIT;
-							} else {
-
-
-								bool valid = b.aabb.smits_intersect_ray(from,n,0,len);
-								//bool valid = b.aabb.intersects_segment(p_begin,p_end);
-								//bool valid = b.aabb.intersects(ray_aabb);
-
-								if (!valid) {
-
-									stack[level]=VISIT_DONE_BIT;
-
-								} else {
-
-									stack[level]=VISIT_LEFT_BIT;
-								}
-							}
-
-						} continue;
-						case VISIT_LEFT_BIT: {
-
-							stack[level]=VISIT_RIGHT_BIT;
-							bstack[level+1]=b.children[0];
-							stack[level+1]=TEST_RAY_BIT;
-							level++;
-
-						} continue;
-						case VISIT_RIGHT_BIT: {
-
-							stack[level]=VISIT_DONE_BIT;
-							bstack[level+1]=b.children[1];
-							stack[level+1]=TEST_RAY_BIT;
-							level++;
-						} continue;
-						case VISIT_DONE_BIT: {
-
-							if (level==0) {
-								done=true;
-								break;
-							} else
-								level--;
-
-						} continue;
-					}
-
-
-					if (done)
-						break;
-				}
-
-
-
-				if (intersected) {
-
-					color.a=Math::lerp(MAX(0.01,lv[i].darkening),1.0,att);
-				}
-
-			}
-
-			break;
-		} else {
-
-			Vector3 lpos = p_pos - octant.aabb.pos;
-			Vector3 half = octant.aabb.size * 0.5;
-
-			int ofs=0;
-
-			if (lpos.x >= half.x)
-				ofs|=1;
-			if (lpos.y >= half.y)
-				ofs|=2;
-			if (lpos.z >= half.z)
-				ofs|=4;
-
-			octant_idx = octant.children[ofs];
-
-			if (octant_idx==0)
-				return;
-
-		}
-	}
-
-	ptr[0]=CLAMP(color.r*255.0,0,255);
-	ptr[1]=CLAMP(color.g*255.0,0,255);
-	ptr[2]=CLAMP(color.b*255.0,0,255);
-	ptr[3]=CLAMP(color.a*255.0,0,255);
-
-}
-
-
-Error BakedLightBaker::transfer_to_lightmaps() {
-
-	if (!triangles.size() || baked_textures.size()==0)
-		return ERR_UNCONFIGURED;
-
-	EditorProgress ep("transfer_to_lightmaps",TTR("Transfer to Lightmaps:"),baked_textures.size()*2+triangles.size());
-
-	for(int i=0;i<baked_textures.size();i++) {
-
-		ERR_FAIL_COND_V( baked_textures[i].width<=0 || baked_textures[i].height<=0,ERR_UNCONFIGURED );
-
-		baked_textures[i].data.resize( baked_textures[i].width*baked_textures[i].height*4 );
-		zeromem(baked_textures[i].data.ptr(),baked_textures[i].data.size());
-		ep.step(TTR("Allocating Texture #")+itos(i+1),i);
-	}
-
-	Vector<double> norm_arr;
-	norm_arr.resize(lights.size());
-
-	for(int i=0;i<lights.size();i++) {
-		norm_arr[i] =  1.0/get_normalization(i);
-	}
-	float gamma = baked_light->get_gamma_adjust();
-	float mult = baked_light->get_energy_multiplier();
-
-	for(int i=0;i<triangles.size();i++) {
-
-		if (i%200==0) {
-			ep.step(TTR("Baking Triangle #")+itos(i),i+baked_textures.size());
-		}
-		Triangle &t=triangles[i];
-		if (t.baked_texture<0 || t.baked_texture>=baked_textures.size())
-			continue;
-
-		BakeTexture &bt=baked_textures[t.baked_texture];
-		Vector3 normal = Plane(t.vertices[0],t.vertices[1],t.vertices[2]).normal;
-
-
-		int x[3];
-		int y[3];
-
-		Vector3 vertices[3]={
-			t.vertices[0],
-			t.vertices[1],
-			t.vertices[2]
-		};
-
-		for(int j=0;j<3;j++) {
-
-			x[j]=t.bake_uvs[j].x*bt.width;
-			y[j]=t.bake_uvs[j].y*bt.height;
-			x[j]=CLAMP(x[j],0,bt.width-1);
-			y[j]=CLAMP(y[j],0,bt.height-1);
-		}
-
-
-		{
-
-			// sort the points vertically
-			if (y[1] > y[2])  {
-				SWAP(x[1], x[2]);
-				SWAP(y[1], y[2]);
-				SWAP(vertices[1],vertices[2]);
-			}
-			if (y[0] > y[1]) {
-				SWAP(x[0], x[1]);
-				SWAP(y[0], y[1]);
-				SWAP(vertices[0],vertices[1]);
-			}
-			if (y[1] > y[2]) {
-				SWAP(x[1], x[2]);
-				SWAP(y[1], y[2]);
-				SWAP(vertices[1],vertices[2]);
-			}
-
-			double dx_far = double(x[2] - x[0]) / (y[2] - y[0] + 1);
-			double dx_upper = double(x[1] - x[0]) / (y[1] - y[0] + 1);
-			double dx_low = double(x[2] - x[1]) / (y[2] - y[1] + 1);
-			double xf = x[0];
-			double xt = x[0] + dx_upper; // if y[0] == y[1], special case
-			for (int yi = y[0]; yi <= (y[2] > bt.height-1 ? bt.height-1 : y[2]); yi++)
-			{
-				if (yi >= 0) {
-					for (int xi = (xf > 0 ? int(xf) : 0); xi <= (xt < bt.width ? xt : bt.width-1) ; xi++) {
-						//pixels[int(x + y * width)] = color;
-
-						Vector2 v0 = Vector2(x[1]-x[0],y[1]-y[0]);
-						Vector2 v1 = Vector2(x[2]-x[0],y[2]-y[0]);
-						//vertices[2] - vertices[0];
-						Vector2 v2 = Vector2(xi-x[0],yi-y[0]);
-						float d00 = v0.dot( v0);
-						float d01 = v0.dot( v1);
-						float d11 = v1.dot( v1);
-						float d20 = v2.dot( v0);
-						float d21 = v2.dot( v1);
-						float denom = (d00 * d11 - d01 * d01);
-						Vector3 pos;
-						if (denom==0) {
-							pos=t.vertices[0];
-						} else {
-							float v = (d11 * d20 - d01 * d21) / denom;
-							float w = (d00 * d21 - d01 * d20) / denom;
-							float u = 1.0f - v - w;
-							pos = vertices[0]*u + vertices[1]*v  + vertices[2]*w;
-						}
-						_plot_pixel_to_lightmap(xi,yi,bt.width,bt.height,bt.data.ptr(),pos,normal,norm_arr.ptr(),mult,gamma);
-
-					}
-
-					for (int xi = (xf < bt.width ? int(xf) : bt.width-1); xi >= (xt > 0 ? xt : 0); xi--) {
-						//pixels[int(x + y * width)] = color;
-						Vector2 v0 = Vector2(x[1]-x[0],y[1]-y[0]);
-						Vector2 v1 = Vector2(x[2]-x[0],y[2]-y[0]);
-						//vertices[2] - vertices[0];
-						Vector2 v2 = Vector2(xi-x[0],yi-y[0]);
-						float d00 = v0.dot( v0);
-						float d01 = v0.dot( v1);
-						float d11 = v1.dot( v1);
-						float d20 = v2.dot( v0);
-						float d21 = v2.dot( v1);
-						float denom = (d00 * d11 - d01 * d01);
-						Vector3 pos;
-						if (denom==0) {
-							pos=t.vertices[0];
-						} else {
-							float v = (d11 * d20 - d01 * d21) / denom;
-							float w = (d00 * d21 - d01 * d20) / denom;
-							float u = 1.0f - v - w;
-							pos = vertices[0]*u + vertices[1]*v  + vertices[2]*w;
-						}
-
-						_plot_pixel_to_lightmap(xi,yi,bt.width,bt.height,bt.data.ptr(),pos,normal,norm_arr.ptr(),mult,gamma);
-
-					}
-				}
-				xf += dx_far;
-				if (yi < y[1])
-					xt += dx_upper;
-				else
-					xt += dx_low;
-			}
-		}
-
-	}
-
-
-	for(int i=0;i<baked_textures.size();i++) {
-
-
-		{
-
-			ep.step(TTR("Post-Processing Texture #")+itos(i),i+baked_textures.size()+triangles.size());
-
-			BakeTexture &bt=baked_textures[i];
-
-			Vector<uint8_t> copy_data=bt.data;
-			uint8_t *data=bt.data.ptr();
-			const int max_radius=8;
-			const int shadow_radius=2;
-			const int max_dist=0x7FFFFFFF;
-
-			for(int x=0;x<bt.width;x++) {
-
-				for(int y=0;y<bt.height;y++) {
-
-
-					uint8_t a = copy_data[(y*bt.width+x)*4+3];
-
-					if (a>0) {
-						//blur shadow
-
-						int from_x = MAX(0,x-shadow_radius);
-						int to_x = MIN(bt.width-1,x+shadow_radius);
-						int from_y = MAX(0,y-shadow_radius);
-						int to_y = MIN(bt.height-1,y+shadow_radius);
-
-						int sum=0;
-						int sumc=0;
-
-						for(int k=from_y;k<=to_y;k++) {
-							for(int l=from_x;l<=to_x;l++) {
-
-								const uint8_t * rp = &copy_data[(k*bt.width+l)<<2];
-
-								sum+=rp[3];
-								sumc++;
-							}
-						}
-
-						sum/=sumc;
-						data[(y*bt.width+x)*4+3]=sum;
-
-					} else {
-
-						int closest_dist=max_dist;
-						uint8_t closest_color[4];
-
-						int from_x = MAX(0,x-max_radius);
-						int to_x = MIN(bt.width-1,x+max_radius);
-						int from_y = MAX(0,y-max_radius);
-						int to_y = MIN(bt.height-1,y+max_radius);
-
-						for(int k=from_y;k<=to_y;k++) {
-							for(int l=from_x;l<=to_x;l++) {
-
-								int dy = y-k;
-								int dx = x-l;
-								int dist = dy*dy+dx*dx;
-								if (dist>=closest_dist)
-									continue;
-
-								const uint8_t * rp = &copy_data[(k*bt.width+l)<<2];
-
-								if (rp[3]==0)
-									continue;
-
-								closest_dist=dist;
-								closest_color[0]=rp[0];
-								closest_color[1]=rp[1];
-								closest_color[2]=rp[2];
-								closest_color[3]=rp[3];
-							}
-						}
-
-
-						if (closest_dist!=max_dist) {
-
-							data[(y*bt.width+x)*4+0]=closest_color[0];
-							data[(y*bt.width+x)*4+1]=closest_color[1];
-							data[(y*bt.width+x)*4+2]=closest_color[2];
-							data[(y*bt.width+x)*4+3]=closest_color[3];
-						}
-					}
-				}
-			}
-		}
-
-		PoolVector<uint8_t> dv;
-		dv.resize(baked_textures[i].data.size());
-		{
-			PoolVector<uint8_t>::Write w = dv.write();
-			copymem(w.ptr(),baked_textures[i].data.ptr(),baked_textures[i].data.size());
-		}
-
-		Image img(baked_textures[i].width,baked_textures[i].height,0,Image::FORMAT_RGBA8,dv);
-		Ref<ImageTexture> tex = memnew( ImageTexture );
-		tex->create_from_image(img);
-		baked_light->set_lightmap_texture(i,tex);
-	}
-
-
-	return OK;
-}
-
-void BakedLightBaker::clear() {
-
-
-
-	_stop_thread();
-
-	if (bvh)
-		_free_bvh(bvh);
-
-	if (ray_stack)
-		memdelete_arr(ray_stack);
-	if (octant_stack)
-		memdelete_arr(octant_stack);
-	if (octantptr_stack)
-		memdelete_arr(octantptr_stack);
-	if (bvh_stack)
-		memdelete_arr(bvh_stack);
-/*
- * ???
-	for(int i=0;i<octant_pool.size();i++) {
-		/*
-		if (octant_pool[i].leaf) {
-			memdelete_arr( octant_pool[i].light );
-		}
-		Vector<double> norm_arr;
-		norm_arr.resize(lights.size());
-		*/
-
-		for(int i=0;i<lights.size();i++) {
-			norm_arr[i] =  1.0/get_normalization(i);
-		}
-
-		const double *normptr=norm_arr.ptr();
-	}
-*/
-	octant_pool.clear();
-	octant_pool_size=0;
-	bvh=NULL;
-	leaf_list=0;
-	cell_count=0;
-	ray_stack=NULL;
-	octant_stack=NULL;
-	octantptr_stack=NULL;
-	bvh_stack=NULL;
-	materials.clear();
-	materials.clear();
-	textures.clear();
-	lights.clear();
-	triangles.clear();
-	endpoint_normal.clear();
-	endpoint_normal_bits.clear();
-	baked_octree_texture_w=0;
-	baked_octree_texture_h=0;
-	paused=false;
-	baking=false;
-
-	bake_thread_exit=false;
-	first_bake_to_map=true;
-	baked_light=Ref<BakedLight>();
-	total_rays=0;
-
-}
-
-BakedLightBaker::BakedLightBaker() {
-	octree_depth=9;
-	lattice_size=4;
-	octant_pool.clear();
-	octant_pool_size=0;
-	bvh=NULL;
-	leaf_list=0;
-	cell_count=0;
-	ray_stack=NULL;
-	bvh_stack=NULL;
-	octant_stack=NULL;
-	octantptr_stack=NULL;
-	plot_size=2.5;
-	max_bounces=2;
-	materials.clear();
-	baked_octree_texture_w=0;
-	baked_octree_texture_h=0;
-	paused=false;
-	baking=false;
-
-	bake_thread_exit=false;
-	total_rays=0;
-	first_bake_to_map=true;
-	linear_color=false;
-
-}
-
-BakedLightBaker::~BakedLightBaker() {
-
-	clear();
-}
-#endif

editor/plugins/baked_light_baker.h

@@ -1,382 +0,0 @@
-/*************************************************************************/
-/*  baked_light_baker.h                                                  */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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 BAKED_LIGHT_BAKER_H
-#define BAKED_LIGHT_BAKER_H
-
-#include "os/thread.h"
-
-#include "scene/3d/light.h"
-#include "scene/3d/mesh_instance.h"
-
-#if 0
-
-class BakedLightBaker {
-public:
-
-	enum {
-
-		ATTENUATION_CURVE_LEN=256,
-		OCTANT_POOL_CHUNK=1000000
-	};
-
-	/*
-	struct OctantLight {
-		double accum[8][3];
-	};
-	*/
-
-	struct Octant {
-		bool leaf;
-		AABB aabb;
-		uint16_t texture_x;
-		uint16_t texture_y;
-		int sampler_ofs;
-		float normal_accum[8][3];
-		double full_accum[3];
-		int parent;
-		union {
-			struct {
-				int next_leaf;
-				float offset[3];
-				int bake_neighbour;
-				bool first_neighbour;
-				double light_accum[8][3];
-			};
-			int children[8];
-		};
-	};
-
-	struct OctantHash {
-
-		int next;
-		uint32_t hash;
-		uint64_t value;
-
-	};
-
-	struct MeshTexture {
-
-		Vector<uint8_t> tex;
-		int tex_w,tex_h;
-
-		_FORCE_INLINE_ void get_color(const Vector2& p_uv,Color& ret) {
-
-			if (tex_w && tex_h) {
-
-				int x = Math::fast_ftoi(Math::fposmod(p_uv.x,1.0)*tex_w);
-				int y = Math::fast_ftoi(Math::fposmod(p_uv.y,1.0)*tex_w);
-				x=CLAMP(x,0,tex_w-1);
-				y=CLAMP(y,0,tex_h-1);
-				const uint8_t*ptr = &tex[(y*tex_w+x)*4];
-				ret.r*=ptr[0]/255.0;
-				ret.g*=ptr[1]/255.0;
-				ret.b*=ptr[2]/255.0;
-				ret.a*=ptr[3]/255.0;
-			}
-		}
-
-	};
-
-	struct Param {
-
-		Color color;
-		MeshTexture*tex;
-		_FORCE_INLINE_ Color get_color(const Vector2& p_uv) {
-
-			Color ret=color;
-			if (tex)
-				tex->get_color(p_uv,ret);
-			return ret;
-
-		}
-
-	};
-
-	struct MeshMaterial {
-
-		Param diffuse;
-		Param specular;
-		Param emission;
-	};
-
-	struct Triangle {
-
-		AABB aabb;
-		Vector3 vertices[3];
-		Vector2 uvs[3];
-		Vector2 bake_uvs[3];
-		Vector3 normals[3];
-		MeshMaterial *material;
-		int baked_texture;
-
-		_FORCE_INLINE_ Vector2 get_uv(const Vector3& p_pos) {
-
-			Vector3 v0 = vertices[1] - vertices[0];
-			Vector3 v1 = vertices[2] - vertices[0];
-			Vector3 v2 = p_pos - vertices[0];
-
-			float d00 = v0.dot( v0);
-			float d01 = v0.dot( v1);
-			float d11 = v1.dot( v1);
-			float d20 = v2.dot( v0);
-			float d21 = v2.dot( v1);
-			float denom = (d00 * d11 - d01 * d01);
-			if (denom==0)
-				return uvs[0];
-			float v = (d11 * d20 - d01 * d21) / denom;
-			float w = (d00 * d21 - d01 * d20) / denom;
-			float u = 1.0f - v - w;
-
-			return uvs[0]*u + uvs[1]*v  + uvs[2]*w;
-		}
-
-		_FORCE_INLINE_ void get_uv_and_normal(const Vector3& p_pos,Vector2& r_uv,Vector3& r_normal) {
-
-			Vector3 v0 = vertices[1] - vertices[0];
-			Vector3 v1 = vertices[2] - vertices[0];
-			Vector3 v2 = p_pos - vertices[0];
-
-			float d00 = v0.dot( v0);
-			float d01 = v0.dot( v1);
-			float d11 = v1.dot( v1);
-			float d20 = v2.dot( v0);
-			float d21 = v2.dot( v1);
-			float denom = (d00 * d11 - d01 * d01);
-			if (denom==0) {
-				r_normal=normals[0];
-				r_uv=uvs[0];
-				return;
-			}
-			float v = (d11 * d20 - d01 * d21) / denom;
-			float w = (d00 * d21 - d01 * d20) / denom;
-			float u = 1.0f - v - w;
-
-			r_uv=uvs[0]*u + uvs[1]*v  + uvs[2]*w;
-			r_normal=(normals[0]*u+normals[1]*v+normals[2]*w).normalized();
-		}
-	};
-
-
-	struct BVH {
-
-		AABB aabb;
-		Vector3 center;
-		Triangle *leaf;
-		BVH*children[2];
-	};
-
-
-	struct BVHCmpX {
-
-		bool operator()(const BVH* p_left, const BVH* p_right) const {
-
-			return p_left->center.x < p_right->center.x;
-		}
-	};
-
-	struct BVHCmpY {
-
-		bool operator()(const BVH* p_left, const BVH* p_right) const {
-
-			return p_left->center.y < p_right->center.y;
-		}
-	};
-	struct BVHCmpZ {
-
-		bool operator()(const BVH* p_left, const BVH* p_right) const {
-
-			return p_left->center.z < p_right->center.z;
-		}
-	};
-
-	struct BakeTexture {
-
-		Vector<uint8_t> data;
-		int width,height;
-	};
-
-
-	struct LightData {
-
-		VS::LightType type;
-
-		Vector3 pos;
-		Vector3 up;
-		Vector3 left;
-		Vector3 dir;
-		Color diffuse;
-		Color specular;
-		float energy;
-		float length;
-		int rays_thrown;
-		bool bake_shadow;
-
-		float radius;
-		float attenuation;
-		float spot_angle;
-		float darkening;
-		float spot_attenuation;
-		float area;
-
-		float constant;
-
-		bool bake_direct;
-
-		Vector<float> attenuation_table;
-
-	};
-
-
-	Vector<LightData> lights;
-
-	List<MeshMaterial> materials;
-	List<MeshTexture> textures;
-
-	AABB octree_aabb;
-	Vector<Octant> octant_pool;
-	int octant_pool_size;
-	BVH*bvh;
-	Vector<Triangle> triangles;
-	Vector<BakeTexture> baked_textures;
-	Transform base_inv;
-	int leaf_list;
-	int octree_depth;
-	int bvh_depth;
-	int cell_count;
-	uint32_t *ray_stack;
-	BVH **bvh_stack;
-	uint32_t *octant_stack;
-	uint32_t *octantptr_stack;
-
-	struct ThreadStack {
-		uint32_t *octant_stack;
-		uint32_t *octantptr_stack;
-		uint32_t *ray_stack;
-		BVH **bvh_stack;
-	};
-
-	Map<Vector3,Vector3> endpoint_normal;
-	Map<Vector3,uint64_t> endpoint_normal_bits;
-
-	float cell_size;
-	float plot_size; //multiplied by cell size
-	float octree_extra_margin;
-
-	int max_bounces;
-	int64_t total_rays;
-	bool use_diffuse;
-	bool use_specular;
-	bool use_translucency;
-	bool linear_color;
-
-
-	int baked_octree_texture_w;
-	int baked_octree_texture_h;
-	int baked_light_texture_w;
-	int baked_light_texture_h;
-	int lattice_size;
-	float edge_damp;
-	float normal_damp;
-	float tint;
-	float ao_radius;
-	float ao_strength;
-
-	bool paused;
-	bool baking;
-	bool first_bake_to_map;
-
-	Map<Ref<Material>,MeshMaterial*> mat_map;
-	Map<Ref<Texture>,MeshTexture*> tex_map;
-
-
-
-	MeshTexture* _get_mat_tex(const Ref<Texture>& p_tex);
-	void _add_mesh(const Ref<Mesh>& p_mesh,const Ref<Material>& p_mat_override,const Transform& p_xform,int p_baked_texture=-1);
-	void _parse_geometry(Node* p_node);
-	BVH* _parse_bvh(BVH** p_children,int p_size,int p_depth,int& max_depth);
-	void _make_bvh();
-	void _make_octree();
-	void _make_octree_texture();
-	void _octree_insert(int p_octant, Triangle* p_triangle, int p_depth);
-	_FORCE_INLINE_ void _plot_pixel_to_lightmap(int x, int y, int width, int height, uint8_t *image, const Vector3& p_pos,const Vector3& p_normal,double *p_norm_ptr,float mult,float gamma);
-
-
-	void _free_bvh(BVH* p_bvh);
-
-	void _fix_lights();
-
-	Ref<BakedLight> baked_light;
-
-
-	//void _plot_light(const Vector3& p_plot_pos,const AABB& p_plot_aabb,const Color& p_light,int p_octant=0);
-	void _plot_light(ThreadStack& thread_stack,const Vector3& p_plot_pos,const AABB& p_plot_aabb,const Color& p_light,const Color& p_tint_light,bool p_only_full,const Plane& p_plane);
-	//void _plot_light_point(const Vector3& p_plot_pos, Octant *p_octant, const AABB& p_aabb,const Color& p_light);
-
-	float _throw_ray(ThreadStack& thread_stack,bool p_bake_direct,const Vector3& p_begin, const Vector3& p_end,float p_rest,const Color& p_light,float *p_att_curve,float p_att_pos,int p_att_curve_len,int p_bounces,bool p_first_bounce=false,bool p_only_dist=false);
-
-
-	float total_light_area;
-
-	Vector<Thread*> threads;
-
-	bool bake_thread_exit;
-	static void _bake_thread_func(void *arg);
-
-	void _start_thread();
-	void _stop_thread();
-public:
-
-
-	void throw_rays(ThreadStack &thread_stack, int p_amount);
-	double get_normalization(int p_light_idx) const;
-	double get_modifier(int p_light_idx) const;
-
-	void bake(const Ref<BakedLight>& p_light,Node *p_base);
-	bool is_baking();
-	void set_pause(bool p_pause);
-	bool is_paused();
-	uint64_t get_rays_thrown() { return total_rays; }
-
-	Error transfer_to_lightmaps();
-
-	void update_octree_sampler(PoolVector<int> &p_sampler);
-	void update_octree_images(PoolVector<uint8_t> &p_octree,PoolVector<uint8_t> &p_light);
-
-	Ref<BakedLight> get_baked_light() { return baked_light; }
-
-	void clear();
-
-	BakedLightBaker();
-	~BakedLightBaker();
-
-};
-
-#endif // BAKED_LIGHT_BAKER_H
-#endif

editor/plugins/baked_light_baker_cmpxchg.cpp

@@ -1,105 +0,0 @@
-/*************************************************************************/
-/*  baked_light_baker_cmpxchg.cpp                                        */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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.                */
-/*************************************************************************/
-#include "typedefs.h"
-
-#if (__GNUC__ * 10000 + __GNUC_MINOR__ * 100 + __GNUC_PATCHLEVEL__) > 40100
-
-void baked_light_baker_add_64f(double *dst, double value) {
-
-	union {
-		int64_t i;
-		double f;
-	} swapy;
-
-	while (true) {
-		swapy.f = *dst;
-		int64_t from = swapy.i;
-		swapy.f += value;
-		int64_t to = swapy.i;
-		if (__sync_bool_compare_and_swap((int64_t *)dst, from, to))
-			break;
-	}
-}
-
-void baked_light_baker_add_64i(int64_t *dst, int64_t value) {
-
-	while (!__sync_bool_compare_and_swap(dst, *dst, (*dst) + value)) {
-	}
-}
-
-#elif defined(WINDOWS_ENABLED)
-
-#include "windows.h"
-
-void baked_light_baker_add_64f(double *dst, double value) {
-
-	union {
-		int64_t i;
-		double f;
-	} swapy;
-
-	while (true) {
-		swapy.f = *dst;
-		int64_t from = swapy.i;
-		swapy.f += value;
-		int64_t to = swapy.i;
-		int64_t result = InterlockedCompareExchange64((int64_t *)dst, to, from);
-		if (result == from)
-			break;
-	}
-}
-
-void baked_light_baker_add_64i(int64_t *dst, int64_t value) {
-
-	while (true) {
-		int64_t from = *dst;
-		int64_t to = from + value;
-		int64_t result = InterlockedCompareExchange64(dst, to, from);
-		if (result == from)
-			break;
-	}
-}
-
-#else
-
-//in goder (the god of programmers) we trust
-#warning seems this platform or compiler does not support safe cmpxchg, your baked lighting may be funny
-
-void baked_light_baker_add_64f(double *dst, double value) {
-
-	*dst += value;
-}
-
-void baked_light_baker_add_64i(int64_t *dst, int64_t value) {
-
-	*dst += value;
-}
-
-#endif

editor/plugins/baked_light_editor_plugin.cpp

@@ -1,377 +0,0 @@
-/*************************************************************************/
-/*  baked_light_editor_plugin.cpp                                        */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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.                */
-/*************************************************************************/
-#include "baked_light_editor_plugin.h"
-
-#include "io/marshalls.h"
-#include "io/resource_saver.h"
-#include "scene/3d/mesh_instance.h"
-#include "scene/gui/box_container.h"
-
-#if 0
-
-
-void BakedLightEditor::_end_baking() {
-
-	baker->clear();
-	set_process(false);
-	button_bake->set_pressed(false);
-	bake_info->set_text("");
-}
-
-void BakedLightEditor::_node_removed(Node *p_node) {
-
-	if(p_node==node) {
-		_end_baking();
-		node=NULL;
-
-		hide();
-	}
-
-}
-
-
-
-
-
-void BakedLightEditor::_notification(int p_option) {
-
-
-	if (p_option==NOTIFICATION_ENTER_TREE) {
-
-		button_bake->set_icon(get_icon("Bake","EditorIcons"));
-		button_reset->set_icon(get_icon("Reload","EditorIcons"));
-		button_make_lightmaps->set_icon(get_icon("LightMap","EditorIcons"));
-	}
-
-	if (p_option==NOTIFICATION_PROCESS) {
-
-		if (baker->is_baking() && !baker->is_paused()) {
-
-			update_timeout-=get_process_delta_time();
-			if (update_timeout<0) {
-
-				if (baker->get_baked_light()!=node->get_baked_light()) {
-					_end_baking();
-					return;
-				}
-
-				uint64_t t = OS::get_singleton()->get_ticks_msec();
-
-#ifdef DEBUG_CUBES
-				double norm =  baker->get_normalization();
-				float max_lum=0;
-
-				{
-					PoolVector<Color>::Write cw=colors.write();
-					BakedLightBaker::Octant *octants=baker->octant_pool.ptr();
-					BakedLightBaker::Octant *oct = &octants[baker->leaf_list];
-					int vert_idx=0;
-
-					while(oct) {
-
-
-
-						Color colors[8];
-						for(int i=0;i<8;i++) {
-
-							colors[i].r=oct->light_accum[i][0]/norm;
-							colors[i].g=oct->light_accum[i][1]/norm;
-							colors[i].b=oct->light_accum[i][2]/norm;
-
-							float lum = colors[i].get_v();
-							/*
-							if (lum<0.05)
-								color.a=0;
-							*/
-							if (lum>max_lum)
-								max_lum=lum;
-
-						}
-						static const int vert2cub[36]={7,3,1,1,5,7,7,6,2,2,3,7,7,5,4,4,6,7,2,6,4,4,0,2,4,5,1,1,0,4,1,3,2,2,0,1};
-						for (int i=0;i<36;i++) {
-
-
-							cw[vert_idx++]=colors[vert2cub[i]];
-						}
-
-						if (oct->next_leaf)
-							oct=&octants[oct->next_leaf];
-						else
-							oct=NULL;
-
-					}
-				}
-				print_line("MSCOL: "+itos(OS::get_singleton()->get_ticks_msec()-t));
-				t = OS::get_singleton()->get_ticks_msec();
-
-				Array a;
-				a.resize(Mesh::ARRAY_MAX);
-				a[Mesh::ARRAY_VERTEX]=vertices;
-				a[Mesh::ARRAY_COLOR]=colors;
-				while(mesh->get_surface_count())
-					mesh->surface_remove(0);
-				mesh->add_surface(Mesh::PRIMITIVE_TRIANGLES,a);
-				mesh->surface_set_material(0,material);
-#endif
-				ERR_FAIL_COND(node->get_baked_light().is_null());
-
-				baker->update_octree_images(octree_texture,light_texture);
-				baker->update_octree_sampler(octree_sampler);
-				//print_line("sampler size: "+itos(octree_sampler.size()*4));
-
-#if 1
-//debug
-				Image img(baker->baked_octree_texture_w,baker->baked_octree_texture_h,0,Image::FORMAT_RGBA8,octree_texture);
-				Ref<ImageTexture> it = memnew( ImageTexture );
-				it->create_from_image(img);
-				ResourceSaver::save("baked_octree.png",it);
-
-#endif
-
-
-				uint64_t rays_snap = baker->get_rays_thrown();
-				int rays_sec = (rays_snap-last_rays_time)*1.0-(update_timeout);
-				last_rays_time=rays_snap;
-
-				bake_info->set_text("rays/s: "+itos(rays_sec));
-				update_timeout=1;
-				print_line("MSUPDATE: "+itos(OS::get_singleton()->get_ticks_msec()-t));
-				t=OS::get_singleton()->get_ticks_msec();
-				node->get_baked_light()->set_octree(octree_texture);
-				node->get_baked_light()->set_light(light_texture);
-				node->get_baked_light()->set_sampler_octree(octree_sampler);
-				node->get_baked_light()->set_edited(true);
-
-				print_line("MSSET: "+itos(OS::get_singleton()->get_ticks_msec()-t));
-
-
-
-			}
-		}
-	}
-}
-
-
-void BakedLightEditor::_menu_option(int p_option) {
-
-
-	switch(p_option) {
-
-
-		case MENU_OPTION_BAKE: {
-
-			ERR_FAIL_COND(!node);
-			ERR_FAIL_COND(node->get_baked_light().is_null());
-			baker->bake(node->get_baked_light(),node);
-			node->get_baked_light()->set_mode(BakedLight::MODE_OCTREE);
-			update_timeout=0;
-			set_process(true);
-
-
-		} break;
-		case MENU_OPTION_CLEAR: {
-
-
-
-		} break;
-
-	}
-}
-
-void BakedLightEditor::_bake_pressed() {
-
-	ERR_FAIL_COND(!node);
-	const String conf_warning = node->get_configuration_warning();
-	if (!conf_warning.empty()) {
-		err_dialog->set_text(conf_warning);
-		err_dialog->popup_centered_minsize();
-		button_bake->set_pressed(false);
-		return;
-	}
-
-	if (baker->is_baking()) {
-
-		baker->set_pause(!button_bake->is_pressed());
-		if (baker->is_paused()) {
-
-			set_process(false);
-			bake_info->set_text("");
-			button_reset->show();
-			button_make_lightmaps->show();
-
-		} else {
-
-			update_timeout=0;
-			set_process(true);
-			button_make_lightmaps->hide();
-			button_reset->hide();
-		}
-	} else {
-		baker->bake(node->get_baked_light(),node);
-		node->get_baked_light()->set_mode(BakedLight::MODE_OCTREE);
-		update_timeout=0;
-
-		last_rays_time=0;
-		button_bake->set_pressed(false);
-
-		set_process(true);
-	}
-
-}
-
-void BakedLightEditor::_clear_pressed(){
-
-	baker->clear();
-	button_bake->set_pressed(false);
-	bake_info->set_text("");
-
-}
-
-void BakedLightEditor::edit(BakedLightInstance *p_baked_light) {
-
-	if (p_baked_light==NULL || node==p_baked_light) {
-		return;
-	}
-	if (node && node!=p_baked_light)
-		_end_baking();
-
-
-	node=p_baked_light;
-	//_end_baking();
-
-}
-
-void BakedLightEditor::_bake_lightmaps() {
-
-	Error err = baker->transfer_to_lightmaps();
-	if (err) {
-
-		err_dialog->set_text("Error baking to lightmaps!\nMake sure that a bake has just\n happened and that lightmaps are\n configured. ");
-		err_dialog->popup_centered_minsize();
-		return;
-	}
-
-	node->get_baked_light()->set_mode(BakedLight::MODE_LIGHTMAPS);
-
-
-}
-
-void BakedLightEditor::_bind_methods() {
-
-	ClassDB::bind_method("_menu_option",&BakedLightEditor::_menu_option);
-	ClassDB::bind_method("_bake_pressed",&BakedLightEditor::_bake_pressed);
-	ClassDB::bind_method("_clear_pressed",&BakedLightEditor::_clear_pressed);
-	ClassDB::bind_method("_bake_lightmaps",&BakedLightEditor::_bake_lightmaps);
-}
-
-BakedLightEditor::BakedLightEditor() {
-
-
-	bake_hbox = memnew( HBoxContainer );
-	button_bake = memnew( ToolButton );
-	button_bake->set_text(TTR("Bake!"));
-	button_bake->set_toggle_mode(true);
-	button_reset = memnew( Button );
-	button_make_lightmaps = memnew( Button );
-	button_bake->set_tooltip("Start/Unpause the baking process.\nThis bakes lighting into the lightmap octree.");
-	button_make_lightmaps ->set_tooltip("Convert the lightmap octree to lightmap textures\n(must have set up UV/Lightmaps properly before!).");
-
-
-	bake_info = memnew( Label );
-	bake_hbox->add_child( button_bake );
-	bake_hbox->add_child( button_reset );
-	bake_hbox->add_child( bake_info );
-
-	err_dialog = memnew( AcceptDialog );
-	add_child(err_dialog);
-	node=NULL;
-	baker = memnew( BakedLightBaker );
-
-	bake_hbox->add_child(button_make_lightmaps);
-	button_make_lightmaps->hide();
-
-	button_bake->connect("pressed",this,"_bake_pressed");
-	button_reset->connect("pressed",this,"_clear_pressed");
-	button_make_lightmaps->connect("pressed",this,"_bake_lightmaps");
-	button_reset->hide();
-	button_reset->set_tooltip(TTR("Reset the lightmap octree baking process (start over)."));
-
-
-	update_timeout=0;
-
-
-
-}
-
-BakedLightEditor::~BakedLightEditor() {
-
-	memdelete(baker);
-}
-
-void BakedLightEditorPlugin::edit(Object *p_object) {
-
-	baked_light_editor->edit(Object::cast_to<BakedLightInstance>(p_object));
-}
-
-bool BakedLightEditorPlugin::handles(Object *p_object) const {
-
-	return p_object->is_type("BakedLightInstance");
-}
-
-void BakedLightEditorPlugin::make_visible(bool p_visible) {
-
-	if (p_visible) {
-		baked_light_editor->show();
-		baked_light_editor->bake_hbox->show();
-	} else {
-
-		baked_light_editor->hide();
-		baked_light_editor->bake_hbox->hide();
-		baked_light_editor->edit(NULL);
-	}
-
-}
-
-BakedLightEditorPlugin::BakedLightEditorPlugin(EditorNode *p_node) {
-
-	editor=p_node;
-	baked_light_editor = memnew( BakedLightEditor );
-	editor->get_viewport()->add_child(baked_light_editor);
-	add_control_to_container(CONTAINER_SPATIAL_EDITOR_MENU,baked_light_editor->bake_hbox);
-	baked_light_editor->hide();
-	baked_light_editor->bake_hbox->hide();
-}
-
-
-BakedLightEditorPlugin::~BakedLightEditorPlugin()
-{
-}
-
-#endif

editor/plugins/baked_light_editor_plugin.h

@@ -1,118 +0,0 @@
-/*************************************************************************/
-/*  baked_light_editor_plugin.h                                          */
-/*************************************************************************/
-/*                       This file is part of:                           */
-/*                           GODOT ENGINE                                */
-/*                      https://godotengine.org                          */
-/*************************************************************************/
-/* Copyright (c) 2007-2017 Juan Linietsky, Ariel Manzur.                 */
-/* Copyright (c) 2014-2017 Godot Engine contributors (cf. AUTHORS.md)    */
-/*                                                                       */
-/* 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 BAKED_LIGHT_EDITOR_PLUGIN_H
-#define BAKED_LIGHT_EDITOR_PLUGIN_H
-
-#include "editor/editor_node.h"
-#include "editor/editor_plugin.h"
-#include "editor/plugins/baked_light_baker.h"
-#include "scene/gui/spin_box.h"
-
-/**
-	@author Juan Linietsky <[email protected]>
-*/
-
-#if 0
-
-class MeshInstance;
-
-class BakedLightEditor : public Control {
-
-	GDCLASS(BakedLightEditor, Control );
-
-
-	float update_timeout;
-	PoolVector<uint8_t> octree_texture;
-	PoolVector<uint8_t> light_texture;
-	PoolVector<int> octree_sampler;
-
-	BakedLightBaker *baker;
-	AcceptDialog *err_dialog;
-
-	HBoxContainer *bake_hbox;
-	Button *button_bake;
-	Button *button_reset;
-	Button *button_make_lightmaps;
-	Label *bake_info;
-
-	uint64_t last_rays_time;
-
-
-
-	BakedLightInstance *node;
-
-	enum Menu {
-
-		MENU_OPTION_BAKE,
-		MENU_OPTION_CLEAR
-	};
-
-	void _bake_lightmaps();
-
-	void _bake_pressed();
-	void _clear_pressed();
-
-	void _end_baking();
-	void _menu_option(int);
-
-friend class BakedLightEditorPlugin;
-protected:
-	void _node_removed(Node *p_node);
-	static void _bind_methods();
-	void _notification(int p_what);
-public:
-
-	void edit(BakedLightInstance *p_baked_light);
-	BakedLightEditor();
-	~BakedLightEditor();
-};
-
-class BakedLightEditorPlugin : public EditorPlugin {
-
-	GDCLASS( BakedLightEditorPlugin, EditorPlugin );
-
-	BakedLightEditor *baked_light_editor;
-	EditorNode *editor;
-
-public:
-
-	virtual String get_name() const { return "BakedLight"; }
-	bool has_main_screen() const { return false; }
-	virtual void edit(Object *p_node);
-	virtual bool handles(Object *p_node) const;
-	virtual void make_visible(bool p_visible);
-
-	BakedLightEditorPlugin(EditorNode *p_node);
-	~BakedLightEditorPlugin();
-
-};
-
-#endif // MULTIMESH_EDITOR_PLUGIN_H
-#endif

editor/plugins/canvas_item_editor_plugin.cpp

@@ -382,54 +382,15 @@ void CanvasItemEditor::set_state(const Dictionary &p_state) {
 void CanvasItemEditor::_add_canvas_item(CanvasItem *p_canvas_item) {
 
 	editor_selection->add_node(p_canvas_item);
-#if 0
-	if (canvas_items.has(p_canvas_item))
-		return;
-
-	canvas_items.insert(p_canvas_item,p_info);
-	p_canvas_item->connect("hide",this,"_visibility_changed",varray(p_canvas_item->get_instance_id()),CONNECT_ONESHOT);
-#endif
 }
 
 void CanvasItemEditor::_remove_canvas_item(CanvasItem *p_canvas_item) {
 
 	editor_selection->remove_node(p_canvas_item);
-#if 0
-	p_canvas_item->disconnect("hide",this,"_visibility_changed");
-	canvas_items.erase(p_canvas_item);
-#endif
 }
 void CanvasItemEditor::_clear_canvas_items() {
 
 	editor_selection->clear();
-#if 0
-	while(canvas_items.size())
-		_remove_canvas_item(canvas_items.front()->key());
-#endif
-}
-
-void CanvasItemEditor::_visibility_changed(ObjectID p_canvas_item) {
-#if 0
-	Object *c = ObjectDB::get_instance(p_canvas_item);
-	if (!c)
-		return;
-	CanvasItem *ct = Object::cast_to<CanvasItem>(c);
-	if (!ct)
-		return;
-	canvas_items.erase(ct);
-	//_remove_canvas_item(ct);
-	update();
-#endif
-}
-
-void CanvasItemEditor::_node_removed(Node *p_node) {
-#if 0
-	CanvasItem *canvas_item = (CanvasItem*)p_node; //not a good cast, but safe
-	if (canvas_items.has(canvas_item))
-		_remove_canvas_item(canvas_item);
-
-	update();
-#endif
 }
 
 void CanvasItemEditor::_keying_changed() {
@@ -993,11 +954,6 @@ void CanvasItemEditor::_selection_menu_hide() {
 	selection_menu->set_size(Vector2(0, 0));
 }
 
-bool CanvasItemEditor::get_remove_list(List<Node *> *p_list) {
-
-	return false; //!p_list->empty();
-}
-
 void CanvasItemEditor::_list_select(const Ref<InputEventMouseButton> &b) {
 
 	Point2 click = b->get_position();
@@ -2392,14 +2348,6 @@ void CanvasItemEditor::_notification(int p_what) {
 		AnimationPlayerEditor::singleton->get_key_editor()->connect("visibility_changed", this, "_keying_changed");
 		_keying_changed();
 	}
-
-	if (p_what == NOTIFICATION_READY) {
-
-		get_tree()->connect("node_removed", this, "_node_removed");
-	}
-
-	if (p_what == NOTIFICATION_DRAW) {
-	}
 }
 
 void CanvasItemEditor::edit(CanvasItem *p_canvas_item) {
@@ -2774,50 +2722,6 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 			viewport->update();
 
 		} break;
-
-		case ALIGN_VERTICAL: {
-#if 0
-			if ( ref_item && canvas_items.size() > 1 ) {
-				Vector2 ref_pos = ref_item->get_global_transform().elements[2];
-				Rect2 ref_r = ref_item->get_item_rect();
-				for ( CanvasItemMap::Element *E = canvas_items.front(); E; E = E->next() ) {
-					CanvasItem *it_curr = E->key();
-					if ( it_curr == ref_item ) continue;
-					Vector2 v = it_curr->get_global_transform().elements[2];
-					Rect2 r = it_curr->get_item_rect();
-					r.pos.x = ( ref_pos.x + ref_r.size.x / 2 ) - ( v.x + r.size.x / 2 );
-					it_curr->edit_set_rect( r );
-				}
-				viewport->update();
-			}
-#endif
-		} break;
-
-		case ALIGN_HORIZONTAL: {
-#if 0
-			if ( ref_item && canvas_items.size() > 1 ) {
-				Vector2 ref_pos = ref_item->get_global_transform().elements[2];
-				Rect2 ref_r = ref_item->get_item_rect();
-				for ( CanvasItemMap::Element *E = canvas_items.front(); E; E = E->next() ) {
-					CanvasItem *it_curr = E->key();
-					if ( it_curr == ref_item ) continue;
-					Vector2 v = it_curr->get_global_transform().elements[2];
-					Rect2 r = it_curr->get_item_rect();
-					r.pos.y = ( ref_pos.y + ref_r.size.y / 2 ) - ( v.y + r.size.y / 2 );
-					it_curr->edit_set_rect( r );
-				}
-				viewport->update();
-			}
-#endif
-		} break;
-
-		case SPACE_HORIZONTAL: {
-			//space_selected_items< proj_vector2_x, compare_items_x >();
-		} break;
-
-		case SPACE_VERTICAL: {
-			//space_selected_items< proj_vector2_y, compare_items_y >();
-		} break;
 		case ANCHOR_ALIGN_TOP_LEFT: {
 			_set_anchors_preset(PRESET_TOP_LEFT);
 		} break;
@@ -3154,34 +3058,6 @@ void CanvasItemEditor::_popup_callback(int p_op) {
 		} break;
 	}
 }
-#if 0
-template< class P, class C > void CanvasItemEditor::space_selected_items() {
-	P p;
-	if ( canvas_items.size() > 2 ) {
-		Vector< CanvasItem * > items;
-		for ( CanvasItemMap::Element *E = canvas_items.front(); E; E = E->next() ) {
-			CanvasItem *it_curr = E->key();
-			items.push_back( it_curr );
-		}
-		items.sort_custom< C >();
-
-		float width_s = p.get( items[0]->get_item_rect().size );
-		float width_e = p.get( items[ items.size() - 1 ]->get_item_rect().size );
-		float start_x = p.get( items[0]->get_global_transform().elements[2] ) + ( width_s / 2 );
-		float end_x = p.get( items[ items.size() - 1 ]->get_global_transform().elements[2] ) + ( width_e / 2 );
-		float sp = ( end_x - start_x ) / ( items.size() - 1 );
-
-		for ( int i = 0; i < items.size(); i++ ) {
-			CanvasItem *it_curr = items[i];
-			Vector2 v = it_curr->get_global_transform().elements[2];
-			Rect2 r = it_curr->get_item_rect();
-			p.set( r.pos, ( start_x + sp * i ) - ( p.get( v ) + p.get( r.size ) / 2 ) );
-			it_curr->edit_set_rect( r );
-		}
-		viewport->update();
-	}
-}
-#endif
 
 void CanvasItemEditor::_focus_selection(int p_op) {
 	Vector2 center(0.f, 0.f);
@@ -3238,10 +3114,8 @@ void CanvasItemEditor::_focus_selection(int p_op) {
 
 void CanvasItemEditor::_bind_methods() {
 
-	ClassDB::bind_method("_node_removed", &CanvasItemEditor::_node_removed);
 	ClassDB::bind_method("_update_scroll", &CanvasItemEditor::_update_scroll);
 	ClassDB::bind_method("_popup_callback", &CanvasItemEditor::_popup_callback);
-	ClassDB::bind_method("_visibility_changed", &CanvasItemEditor::_visibility_changed);
 	ClassDB::bind_method("_dialog_value_changed", &CanvasItemEditor::_dialog_value_changed);
 	ClassDB::bind_method("_get_editor_data", &CanvasItemEditor::_get_editor_data);
 	ClassDB::bind_method("_tool_select", &CanvasItemEditor::_tool_select);
@@ -3257,74 +3131,6 @@ void CanvasItemEditor::_bind_methods() {
 	ADD_SIGNAL(MethodInfo("item_group_status_changed"));
 }
 
-#if 0
-void CanvasItemEditor::end_drag() {
-	print_line( "end drag" );
-
-	if (undo_redo) {
-
-		undo_redo->create_action("Edit CanvasItem");
-		for(CanvasItemMap::Element *E=canvas_items.front();E;E=E->next()) {
-			CanvasItem *canvas_item = E->key();
-			Variant state=canvas_item->edit_get_state();
-			undo_redo->add_do_method(canvas_item,"edit_set_state",state);
-			undo_redo->add_undo_method(canvas_item,"edit_set_state",E->get().undo_state);
-		}
-		undo_redo->commit_action();
-	}
-
-	drag=DRAG_NONE;
-	viewport->update();
-}
-
-void CanvasItemEditor::box_selection_start( Point2 &click ) {
-	print_line( "box selection start" );
-
-	drag_from=transform.affine_inverse().xform(click);
-
-	box_selecting=true;
-	box_selecting_to=drag_from;
-	viewport->update();
-}
-
-bool CanvasItemEditor::box_selection_end() {
-	print_line( "box selection end" );
-
-	Node* scene = Object::cast_to<EditorNode>(get_scene()->get_root_node())->get_edited_scene();
-	if (scene) {
-
-		List<CanvasItem*> selitems;
-
-		Point2 bsfrom = transform.xform(drag_from);
-		Point2 bsto= transform.xform(box_selecting_to);
-		if (bsfrom.x>bsto.x)
-			SWAP(bsfrom.x,bsto.x);
-		if (bsfrom.y>bsto.y)
-			SWAP(bsfrom.y,bsto.y);
-
-		if ( bsfrom.distance_to( bsto ) < 3 ) {
-			print_line( "box selection too small" );
-			box_selecting=false;
-			viewport->update();
-			return false;
-		}
-
-		_find_canvas_items_at_rect(Rect2(bsfrom,bsto-bsfrom),scene,transform,&selitems);
-
-		for(List<CanvasItem*>::Element *E=selitems.front();E;E=E->next()) {
-
-			_append_canvas_item(E->get());
-		}
-
-	}
-
-	box_selecting=false;
-	viewport->update();
-
-	return true;
-}
-#endif
-
 void CanvasItemEditor::add_control_to_menu_panel(Control *p_control) {
 
 	hb->add_child(p_control);
@@ -3495,12 +3301,6 @@ CanvasItemEditor::CanvasItemEditor(EditorNode *p_editor) {
 	skeleton_menu->set_hide_on_checkable_item_selection(false);
 	skeleton_menu->connect("id_pressed", this, "_popup_callback");
 
-	/*
-	p->add_item("Align Horizontal",ALIGN_HORIZONTAL);
-	p->add_item("Align Vertical",ALIGN_VERTICAL);
-	p->add_item("Space Horizontal",SPACE_HORIZONTAL);
-	p->add_item("Space Vertical",SPACE_VERTICAL);*/
-
 	view_menu = memnew(MenuButton);
 	view_menu->set_text(TTR("View"));
 	hb->add_child(view_menu);

editor/plugins/canvas_item_editor_plugin.h

@@ -94,8 +94,6 @@ class CanvasItemEditor : public VBoxContainer {
 		UNLOCK_SELECTED,
 		GROUP_SELECTED,
 		UNGROUP_SELECTED,
-		ALIGN_HORIZONTAL,
-		ALIGN_VERTICAL,
 		ANCHOR_ALIGN_TOP_LEFT,
 		ANCHOR_ALIGN_TOP_RIGHT,
 		ANCHOR_ALIGN_BOTTOM_LEFT,
@@ -113,9 +111,6 @@ class CanvasItemEditor : public VBoxContainer {
 		ANCHOR_ALIGN_HCENTER_WIDE,
 		ANCHOR_ALIGN_WIDE,
 		ANCHOR_ALIGN_WIDE_FIT,
-
-		SPACE_HORIZONTAL,
-		SPACE_VERTICAL,
 		ANIM_INSERT_KEY,
 		ANIM_INSERT_KEY_EXISTING,
 		ANIM_INSERT_POS,
@@ -289,20 +284,7 @@ class CanvasItemEditor : public VBoxContainer {
 	bool updating_value_dialog;
 	Point2 display_rotate_from;
 	Point2 display_rotate_to;
-#if 0
-	struct EditInfo {
-
-		Variant undo_state;
 
-		Matrix32 prev_xform;
-		float prev_rot;
-		Rect2 prev_rect;
-		EditInfo() { prev_rot=0; }
-	};
-
-	typedef Map<CanvasItem*,EditInfo> CanvasItemMap;
-	CanvasItemMap canvas_items;
-#endif
 	Ref<StyleBoxTexture> select_sb;
 	Ref<Texture> select_handle;
 	Ref<Texture> anchor_handle;
@@ -327,7 +309,6 @@ class CanvasItemEditor : public VBoxContainer {
 	void _add_canvas_item(CanvasItem *p_canvas_item);
 	void _remove_canvas_item(CanvasItem *p_canvas_item);
 	void _clear_canvas_items();
-	void _visibility_changed(ObjectID p_canvas_item);
 	void _key_move(const Vector2 &p_dir, bool p_snap, KeyMoveMODE p_move_mode);
 	void _list_select(const Ref<InputEventMouseButton> &b);
 
@@ -384,7 +365,6 @@ class CanvasItemEditor : public VBoxContainer {
 protected:
 	void _notification(int p_what);
 
-	void _node_removed(Node *p_node);
 	static void _bind_methods();
 	void end_drag();
 	void box_selection_start(Point2 &click);
@@ -436,7 +416,6 @@ public:
 
 	Control *get_viewport_control() { return viewport; }
 
-	bool get_remove_list(List<Node *> *p_list);
 	void set_undo_redo(UndoRedo *p_undo_redo) { undo_redo = p_undo_redo; }
 	void edit(CanvasItem *p_canvas_item);
 
@@ -458,7 +437,6 @@ public:
 	virtual void edit(Object *p_object);
 	virtual bool handles(Object *p_object) const;
 	virtual void make_visible(bool p_visible);
-	virtual bool get_remove_list(List<Node *> *p_list) { return canvas_item_editor->get_remove_list(p_list); }
 	virtual Dictionary get_state() const;
 	virtual void set_state(const Dictionary &p_state);
 

editor/plugins/collision_polygon_2d_editor_plugin.cpp

@@ -386,17 +386,6 @@ CollisionPolygon2DEditor::CollisionPolygon2DEditor(EditorNode *p_editor) {
 	button_edit->set_toggle_mode(true);
 	button_edit->set_tooltip(TTR("Edit existing polygon:\nLMB: Move Point.\nCtrl+LMB: Split Segment.\nRMB: Erase Point."));
 
-//add_constant_override("separation",0);
-
-#if 0
-	options = memnew( MenuButton );
-	add_child(options);
-	options->set_area_as_parent_rect();
-	options->set_text("Polygon");
-	//options->get_popup()->add_item("Parse BBCode",PARSE_BBCODE);
-	options->get_popup()->connect("id_pressed", this,"_menu_option");
-#endif
-
 	mode = MODE_EDIT;
 	wip_active = false;
 }

editor/plugins/collision_polygon_editor_plugin.cpp

@@ -510,17 +510,6 @@ CollisionPolygonEditor::CollisionPolygonEditor(EditorNode *p_editor) {
 	button_edit->connect("pressed", this, "_menu_option", varray(MODE_EDIT));
 	button_edit->set_toggle_mode(true);
 
-//add_constant_override("separation",0);
-
-#if 0
-	options = memnew( MenuButton );
-	add_child(options);
-	options->set_area_as_parent_rect();
-	options->set_text("Polygon");
-	//options->get_popup()->add_item("Parse BBCode",PARSE_BBCODE);
-	options->get_popup()->connect("id_pressed", this,"_menu_option");
-#endif
-
 	mode = MODE_EDIT;
 	wip_active = false;
 	imgeom = memnew(ImmediateGeometry);

editor/plugins/light_occluder_2d_editor_plugin.cpp

@@ -424,17 +424,6 @@ LightOccluder2DEditor::LightOccluder2DEditor(EditorNode *p_editor) {
 	add_child(create_poly);
 	create_poly->get_ok()->set_text(TTR("Create"));
 
-//add_constant_override("separation",0);
-
-#if 0
-	options = memnew( MenuButton );
-	add_child(options);
-	options->set_area_as_parent_rect();
-	options->set_text("Polygon");
-	//options->get_popup()->add_item("Parse BBCode",PARSE_BBCODE);
-	options->get_popup()->connect("id_pressed", this,"_menu_option");
-#endif
-
 	mode = MODE_EDIT;
 	wip_active = false;
 }

editor/plugins/multimesh_editor_plugin.cpp

@@ -144,22 +144,7 @@ void MultiMeshEditor::_populate() {
 	}
 
 	w = PoolVector<Face3>::Write();
-#if 0
-	node->get_multimesh()->set_instance_count(populate_amount->get_val());
-	node->populate_parent(populate_rotate_random->get_val(),populate_tilt_random->get_val(),populate_scale_random->get_val(),populate_scale->get_val());
 
-
-	ERR_EXPLAIN("Parent is not of type VisualInstance.");
-	ERR_FAIL_COND(!get_parent() || !get_parent()->is_type("VisualInstance"));
-
-	ERR_EXPLAIN("Multimesh not present.");
-	ERR_FAIL_COND(multimesh.is_null());
-
-	VisualInstance *vi = Object::cast_to<VisualInstance>(get_parent());
-	ERR_EXPLAIN("Parent is not of type VisualInstance, can't be populated.");
-	ERR_FAIL_COND(!vi);
-
-#endif
 	PoolVector<Face3> faces = geometry;
 	ERR_EXPLAIN(TTR("Parent has no solid faces to populate."));
 	int facecount = faces.size();

editor/plugins/navigation_polygon_editor_plugin.cpp

@@ -468,17 +468,6 @@ NavigationPolygonEditor::NavigationPolygonEditor(EditorNode *p_editor) {
 	add_child(create_nav);
 	create_nav->get_ok()->set_text(TTR("Create"));
 
-//add_constant_override("separation",0);
-
-#if 0
-	options = memnew( MenuButton );
-	add_child(options);
-	options->set_area_as_parent_rect();
-	options->set_text("Polygon");
-	//options->get_popup()->add_item("Parse BBCode",PARSE_BBCODE);
-	options->get_popup()->connect("id_pressed", this,"_menu_option");
-#endif
-
 	mode = MODE_EDIT;
 	wip_active = false;
 	edited_outline = -1;

editor/plugins/path_2d_editor_plugin.cpp

@@ -33,6 +33,7 @@
 #include "editor/editor_settings.h"
 #include "os/file_access.h"
 #include "os/keyboard.h"
+
 void Path2DEditor::_notification(int p_what) {
 
 	switch (p_what) {
@@ -228,200 +229,6 @@ bool Path2DEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
 
 			return true;
 		}
-
-#if 0
-		switch(mode) {
-
-
-			case MODE_CREATE: {
-
-				if (mb->get_button_index()==BUTTON_LEFT && mb->is_pressed()) {
-
-
-					if (!wip_active) {
-
-						wip.clear();
-						wip.push_back( canvas_item_editor->snap_point(cpoint) );
-						wip_active=true;
-						edited_point_pos=canvas_item_editor->snap_point(cpoint);
-						canvas_item_editor->update();
-						edited_point=1;
-						return true;
-					} else {
-						if (wip.size()>1 && xform.xform(wip[0]).distance_to(gpoint)<grab_threshold) {
-							//wip closed
-							_wip_close();
-
-
-							return true;
-						} else {
-
-							wip.push_back( canvas_item_editor->snap_point(cpoint) );
-							edited_point=wip.size();
-							canvas_item_editor->update();
-							return true;
-
-							//add wip point
-						}
-					}
-				} else if (mb->get_button_index()==BUTTON_RIGHT && mb->is_pressed() && wip_active) {
-					_wip_close();
-				}
-
-			} break;
-
-			case MODE_EDIT: {
-
-				if (mb->get_button_index()==BUTTON_LEFT) {
-					if (mb->is_pressed()) {
-
-						if (mb->get_control()) {
-
-
-							if (poly.size() < 3) {
-
-								undo_redo->create_action(TTR("Edit Poly"));
-								undo_redo->add_undo_method(node,"set_polygon",poly);
-								poly.push_back(cpoint);
-								undo_redo->add_do_method(node,"set_polygon",poly);
-								undo_redo->add_do_method(canvas_item_editor->get_viewport_control(),"update");
-								undo_redo->add_undo_method(canvas_item_editor->get_viewport_control(),"update");
-								undo_redo->commit_action();
-								return true;
-							}
-
-							//search edges
-							int closest_idx=-1;
-							Vector2 closest_pos;
-							real_t closest_dist=1e10;
-							for(int i=0;i<poly.size();i++) {
-
-									if (d<closest_dist && d<grab_threshold) {
-										closest_dist=d;
-										closest_pos=cp;
-										closest_idx=i;
-									}
-
-								Vector2 cp = Geometry::get_closest_point_to_segment_2d(gpoint,points);
-								if (cp.distance_squared_to(points[0])<CMP_EPSILON2 || cp.distance_squared_to(points[1])<CMP_EPSILON2)
-									continue; //not valid to reuse point
-
-								real_t d = cp.distance_to(gpoint);
-								if (d<closest_dist && d<grab_threshold) {
-									closest_dist=d;
-									closest_pos=cp;
-									closest_idx=i;
-								}
-
-
-							}
-
-							if (closest_idx>=0) {
-
-								pre_move_edit=poly;
-								poly.insert(closest_idx+1,canvas_item_editor->snap_point(xform.affine_inverse().xform(closest_pos)));
-								edited_point=closest_idx+1;
-								edited_point_pos=canvas_item_editor->snap_point(xform.affine_inverse().xform(closest_pos));
-								node->set_polygon(poly);
-								canvas_item_editor->update();
-								return true;
-							}
-						} else {
-
-									real_t d = cp.distance_to(gpoint);
-									if (d<closest_dist && d<grab_threshold) {
-										closest_dist=d;
-										closest_pos=cp;
-										closest_idx=i;
-									}
-
-							int closest_idx=-1;
-							Vector2 closest_pos;
-							real_t closest_dist=1e10;
-							for(int i=0;i<poly.size();i++) {
-
-								Vector2 cp =xform.xform(poly[i]);
-
-								real_t d = cp.distance_to(gpoint);
-								if (d<closest_dist && d<grab_threshold) {
-									closest_dist=d;
-									closest_pos=cp;
-									closest_idx=i;
-								}
-
-							}
-
-							if (closest_idx>=0) {
-
-								pre_move_edit=poly;
-								edited_point=closest_idx;
-								edited_point_pos=xform.affine_inverse().xform(closest_pos);
-								canvas_item_editor->update();
-								return true;
-							}
-						}
-					} else {
-
-						if (edited_point!=-1) {
-
-							//apply
-
-							ERR_FAIL_INDEX_V(edited_point,poly.size(),false);
-							poly[edited_point]=edited_point_pos;
-							undo_redo->create_action(TTR("Edit Poly"));
-							undo_redo->add_do_method(node,"set_polygon",poly);
-							undo_redo->add_undo_method(node,"set_polygon",pre_move_edit);
-							undo_redo->add_do_method(canvas_item_editor->get_viewport_control(),"update");
-							undo_redo->add_undo_method(canvas_item_editor->get_viewport_control(),"update");
-							undo_redo->commit_action();
-
-							edited_point=-1;
-							return true;
-						}
-					}
-				} if (mb->get_button_index()==BUTTON_RIGHT && mb->is_pressed() && edited_point==-1) {
-
-							real_t d = cp.distance_to(gpoint);
-							if (d<closest_dist && d<grab_threshold) {
-								closest_dist=d;
-								closest_pos=cp;
-								closest_idx=i;
-							}
-
-					int closest_idx=-1;
-					Vector2 closest_pos;
-					real_t closest_dist=1e10;
-					for(int i=0;i<poly.size();i++) {
-
-						Vector2 cp =xform.xform(poly[i]);
-
-						real_t d = cp.distance_to(gpoint);
-						if (d<closest_dist && d<grab_threshold) {
-							closest_dist=d;
-							closest_pos=cp;
-							closest_idx=i;
-						}
-
-					}
-
-					if (closest_idx>=0) {
-
-
-						undo_redo->create_action(TTR("Edit Poly (Remove Point)"));
-						undo_redo->add_undo_method(node,"set_polygon",poly);
-						poly.remove(closest_idx);
-						undo_redo->add_do_method(node,"set_polygon",poly);
-						undo_redo->add_do_method(canvas_item_editor->get_viewport_control(),"update");
-						undo_redo->add_undo_method(canvas_item_editor->get_viewport_control(),"update");
-						undo_redo->commit_action();
-						return true;
-					}
-
-				}
-
-			} break;
-		}
-#endif
 	}
 
 	Ref<InputEventMouseMotion> mm = p_event;
@@ -463,19 +270,6 @@ bool Path2DEditor::forward_gui_input(const Ref<InputEvent> &p_event) {
 			canvas_item_editor->get_viewport_control()->update();
 			return true;
 		}
-
-#if 0
-		if (edited_point!=-1 && (wip_active || mm->get_button_mask()&BUTTON_MASK_LEFT)) {
-
-
-			Matrix32 xform = canvas_item_editor->get_canvas_transform() * node->get_global_transform();
-
-			Vector2 gpoint = Point2(mm.x,mm.y);
-			edited_point_pos = canvas_item_editor->snap_point(xform.affine_inverse().xform(gpoint));
-			canvas_item_editor->update();
-
-		}
-#endif
 	}
 
 	return false;
@@ -619,16 +413,7 @@ Path2DEditor::Path2DEditor(EditorNode *p_editor) {
 	undo_redo = editor->get_undo_redo();
 
 	mode = MODE_EDIT;
-
 	action = ACTION_NONE;
-#if 0
-	options = memnew( MenuButton );
-	add_child(options);
-	options->set_area_as_parent_rect();
-	options->set_text("Polygon");
-	//options->get_popup()->add_item("Parse BBCode",PARSE_BBCODE);
-	options->get_popup()->connect("id_pressed", this,"_menu_option");
-#endif
 
 	base_hb = memnew(HBoxContainer);
 	CanvasItemEditor::get_singleton()->add_control_to_menu_panel(base_hb);

editor/plugins/polygon_2d_editor_plugin.cpp

@@ -770,17 +770,6 @@ Polygon2DEditor::Polygon2DEditor(EditorNode *p_editor) {
 	add_child(button_uv);
 	button_uv->connect("pressed", this, "_menu_option", varray(MODE_EDIT_UV));
 
-//add_constant_override("separation",0);
-
-#if 0
-	options = memnew( MenuButton );
-	add_child(options);
-	options->set_area_as_parent_rect();
-	options->set_text("Polygon");
-	//options->get_popup()->add_item("Parse BBCode",PARSE_BBCODE);
-	options->get_popup()->connect("id_pressed", this,"_menu_option");
-#endif
-
 	mode = MODE_EDIT;
 	wip_active = false;
 

editor/plugins/script_editor_plugin.cpp

@@ -1192,117 +1192,6 @@ static const Node *_find_node_with_script(const Node *p_node, const RefPtr &p_sc
 	return NULL;
 }
 
-Dictionary ScriptEditor::get_state() const {
-
-	//apply_scripts();
-
-	Dictionary state;
-#if 0
-	Array paths;
-	int open=-1;
-
-	for(int i=0;i<tab_container->get_child_count();i++) {
-
-		ScriptTextEditor *se = Object::cast_to<ScriptTextEditor>(tab_container->get_child(i));
-		if (!se)
-			continue;
-
-
-		Ref<Script> script = se->get_edited_script();
-		if (script->get_path()!="" && script->get_path().find("local://")==-1 && script->get_path().find("::")==-1) {
-
-			paths.push_back(script->get_path());
-		} else {
-
-
-			const Node *owner = _find_node_with_script(get_tree()->get_root(),script.get_ref_ptr());
-			if (owner)
-				paths.push_back(owner->get_path());
-
-		}
-
-		if (i==tab_container->get_current_tab())
-			open=i;
-	}
-
-	if (paths.size())
-		state["sources"]=paths;
-	if (open!=-1)
-		state["current"]=open;
-
-#endif
-	return state;
-}
-void ScriptEditor::set_state(const Dictionary &p_state) {
-
-#if 0
-	print_line("attempt set state: "+String(Variant(p_state)));
-
-	if (!p_state.has("sources"))
-		return; //bleh
-
-	Array sources = p_state["sources"];
-	for(int i=0;i<sources.size();i++) {
-
-		Variant source=sources[i];
-
-		Ref<Script> script;
-
-		if (source.get_type()==Variant::NODE_PATH) {
-
-
-			Node *owner=get_tree()->get_root()->get_node(source);
-			if (!owner)
-				continue;
-
-			script = owner->get_script();
-		} else if (source.get_type()==Variant::STRING) {
-
-
-			script = ResourceLoader::load(source,"Script");
-		}
-
-
-		if (script.is_null()) //ah well..
-			continue;
-
-		editor->call("_resource_selected",script);
-	}
-
-	if (p_state.has("current")) {
-		tab_container->set_current_tab(p_state["current"]);
-	}
-#endif
-}
-void ScriptEditor::clear() {
-#if 0
-	List<ScriptTextEditor*> stes;
-	for(int i=0;i<tab_container->get_child_count();i++) {
-
-		ScriptTextEditor *se = Object::cast_to<ScriptTextEditor>(tab_container->get_child(i));
-		if (!se)
-			continue;
-		stes.push_back(se);
-
-	}
-
-	while(stes.size()) {
-
-		memdelete(stes.front()->get());
-		stes.pop_front();
-	}
-
-	int idx = tab_container->get_current_tab();
-	if (idx>=tab_container->get_child_count())
-		idx=tab_container->get_child_count()-1;
-	if (idx>=0) {
-		tab_container->set_current_tab(idx);
-		script_list->select( script_list->find_metadata(idx) );
-	}
-
-#endif
-}
-
 void ScriptEditor::get_breakpoints(List<String> *p_breakpoints) {
 
 	for (int i = 0; i < tab_container->get_child_count(); i++) {
@@ -2361,19 +2250,6 @@ ScriptEditor::ScriptEditor(EditorNode *p_editor) {
 	debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_BREAK), true);
 	debug_menu->get_popup()->set_item_disabled(debug_menu->get_popup()->get_item_index(DEBUG_CONTINUE), true);
 
-#if 0
-	window_menu = memnew( MenuButton );
-	menu_hb->add_child(window_menu);
-	window_menu->set_text(TTR("Window"));
-	window_menu->get_popup()->add_item(TTR("Close"),WINDOW_CLOSE,KEY_MASK_CMD|KEY_W);
-	window_menu->get_popup()->add_separator();
-	window_menu->get_popup()->add_item(TTR("Move Left"),WINDOW_MOVE_LEFT,KEY_MASK_CMD|KEY_LEFT);
-	window_menu->get_popup()->add_item(TTR("Move Right"),WINDOW_MOVE_RIGHT,KEY_MASK_CMD|KEY_RIGHT);
-	window_menu->get_popup()->add_separator();
-	window_menu->get_popup()->connect("id_pressed", this,"_menu_option");
-
-#endif
-
 	menu_hb->add_spacer();
 
 	script_icon = memnew(TextureRect);
@@ -2542,20 +2418,6 @@ void ScriptEditorPlugin::selected_notify() {
 	script_editor->ensure_select_current();
 }
 
-Dictionary ScriptEditorPlugin::get_state() const {
-
-	return script_editor->get_state();
-}
-
-void ScriptEditorPlugin::set_state(const Dictionary &p_state) {
-
-	script_editor->set_state(p_state);
-}
-void ScriptEditorPlugin::clear() {
-
-	script_editor->clear();
-}
-
 void ScriptEditorPlugin::save_external_data() {
 
 	script_editor->save_all_scripts();

editor/plugins/script_editor_plugin.h

@@ -344,14 +344,8 @@ public:
 	_FORCE_INLINE_ bool edit(const Ref<Script> &p_script, bool p_grab_focus = true) { return edit(p_script, -1, 0, p_grab_focus); }
 	bool edit(const Ref<Script> &p_script, int p_line, int p_col, bool p_grab_focus = true);
 
-	Dictionary get_state() const;
-	void set_state(const Dictionary &p_state);
-	void clear();
-
 	void get_breakpoints(List<String> *p_breakpoints);
 
-	//void swap_lines(TextEdit *tx, int line1, int line2);
-
 	void save_all_scripts();
 
 	void set_window_layout(Ref<ConfigFile> p_layout);
@@ -398,10 +392,6 @@ public:
 	virtual void make_visible(bool p_visible);
 	virtual void selected_notify();
 
-	Dictionary get_state() const;
-	virtual void set_state(const Dictionary &p_state);
-	virtual void clear();
-
 	virtual void save_external_data();
 	virtual void apply_changes();
 

editor/plugins/shader_editor_plugin.cpp

@@ -252,9 +252,6 @@ void ShaderEditor::_menu_option(int p_option) {
 
 			current->get_find_replace_bar()->popup_replace();
 		} break;
-		//case SEARCH_LOCATE_SYMBOL: {
-
-		//} break;
 		case SEARCH_GOTO_LINE: {
 
 			goto_line_dialog->popup_find_line(current->get_text_edit());
@@ -274,90 +271,6 @@ void ShaderEditor::_notification(int p_what) {
 	}
 }
 
-Dictionary ShaderEditor::get_state() const {
-#if 0
-	apply_shaders();
-
-	Dictionary state;
-
-	Array paths;
-	int open=-1;
-
-	for(int i=0;i<tab_container->get_child_count();i++) {
-
-		ShaderTextEditor *ste = tab_container->Object::cast_to<ShaderTextEditor>(get_child(i));
-		if (!ste)
-			continue;
-
-
-		Ref<Shader> shader = ste->get_edited_shader();
-		if (shader->get_path()!="" && shader->get_path().find("local://")==-1 && shader->get_path().find("::")==-1) {
-
-			paths.push_back(shader->get_path());
-		} else {
-
-
-			const Node *owner = _find_node_with_shader(get_root_node(),shader.get_ref_ptr());
-			if (owner)
-				paths.push_back(owner->get_path());
-
-		}
-
-		if (i==tab_container->get_current_tab())
-			open=i;
-	}
-
-	if (paths.size())
-		state["sources"]=paths;
-	if (open!=-1)
-		state["current"]=open;
-
-
-	return state;
-#endif
-	return Dictionary();
-}
-void ShaderEditor::set_state(const Dictionary &p_state) {
-#if 0
-	print_line("setting state..");
-	if (!p_state.has("sources"))
-		return; //bleh
-
-	Array sources = p_state["sources"];
-	for(int i=0;i<sources.size();i++) {
-
-		Variant source=sources[i];
-
-		Ref<Shader> shader;
-
-		if (source.get_type()==Variant::NODE_PATH) {
-
-			print_line("cain find owner at path "+String(source));
-			Node *owner=get_root_node()->get_node(source);
-			if (!owner)
-				continue;
-
-			shader = owner->get_shader();
-		} else if (source.get_type()==Variant::STRING) {
-
-			print_line("loading at path "+String(source));
-			shader = ResourceLoader::load(source,"Shader");
-		}
-
-		print_line("found shader at "+String(source)+"? - "+itos(shader.is_null()));
-		if (shader.is_null()) //ah well..
-			continue;
-
-		get_scene()->get_root_node()->call("_resource_selected",shader);
-	}
-
-	if (p_state.has("current"))
-	tab_container->set_current_tab(p_state["current"]);
-#endif
-}
-void ShaderEditor::clear() {
-}
-
 void ShaderEditor::_params_changed() {
 
 	shader_editor->_validate_script();
@@ -519,20 +432,6 @@ void ShaderEditorPlugin::selected_notify() {
 	shader_editor->ensure_select_current();
 }
 
-Dictionary ShaderEditorPlugin::get_state() const {
-
-	return shader_editor->get_state();
-}
-
-void ShaderEditorPlugin::set_state(const Dictionary &p_state) {
-
-	shader_editor->set_state(p_state);
-}
-void ShaderEditorPlugin::clear() {
-
-	shader_editor->clear();
-}
-
 void ShaderEditorPlugin::save_external_data() {
 
 	shader_editor->save_external_data();

editor/plugins/shader_editor_plugin.h

@@ -77,7 +77,6 @@ class ShaderEditor : public VBoxContainer {
 		SEARCH_FIND_NEXT,
 		SEARCH_FIND_PREV,
 		SEARCH_REPLACE,
-		//SEARCH_LOCATE_SYMBOL,
 		SEARCH_GOTO_LINE,
 
 	};
@@ -108,10 +107,6 @@ public:
 	void ensure_select_current();
 	void edit(const Ref<Shader> &p_shader);
 
-	Dictionary get_state() const;
-	void set_state(const Dictionary &p_state);
-	void clear();
-
 	virtual Size2 get_minimum_size() const { return Size2(0, 200); }
 	void save_external_data();
 
@@ -135,10 +130,6 @@ public:
 	virtual void make_visible(bool p_visible);
 	virtual void selected_notify();
 
-	Dictionary get_state() const;
-	virtual void set_state(const Dictionary &p_state);
-	virtual void clear();
-
 	virtual void save_external_data();
 	virtual void apply_changes();
 

editor/plugins/shader_graph_editor_plugin.cpp

@@ -541,22 +541,7 @@ void GraphCurveMapEdit::_plot_curve(const Vector2& p_a,const Vector2& p_b,const
 		newy = CLAMP ((Math::round (y)), 0, ymax);
 
 		/* if this point is different than the last one...then draw it */
-		if ((lastx != newx) || (lasty != newy))
-		{
-#if 0
-			if(fix255)
-			{
-				/* use fixed array size (for the curve graph) */
-				cd->curve[cd->outline][newx] = newy;
-			}
-			else
-			{
-				/* use dynamic allocated curve_ptr (for the real curve) */
-				cd->curve_ptr[cd->outline][newx] = newy;
-
-				if(gb_debug) printf("outline: %d  cX: %d cY: %d\n", (int)cd->outline, (int)newx, (int)newy);
-			}
-#endif
+		if ((lastx != newx) || (lasty != newy)) {
 			draw_line(Vector2(lastx,ymax-lasty),Vector2(newx,ymax-newy),Color(0.8,0.8,0.8,0.8),2.0);
 		}
 

editor/plugins/spatial_editor_plugin.cpp

@@ -3585,21 +3585,6 @@ void SpatialEditor::_unhandled_key_input(Ref<InputEvent> p_event) {
 	if (!is_visible_in_tree() || get_viewport()->gui_has_modal_stack())
 		return;
 
-#if 0
-//i don't remember this being used, why was it here?
-	{
-
-		EditorNode *en = editor;
-		EditorPluginList *over_plugin_list = en->get_editor_plugins_over();
-
-		if (!over_plugin_list->empty() && over_plugin_list->forward_gui_input(p_event)) {
-
-			return; //ate the over input event
-		}
-
-	}
-#endif
-
 	Ref<InputEventKey> k = p_event;
 
 	if (k.is_valid()) {