Merge branch 'master' of https://github.com/okamstudio/godot

drivers/gles2/rasterizer_gles2.cpp

@@ -9164,7 +9164,11 @@ void RasterizerGLES2::_canvas_item_setup_shader_params(CanvasItemMaterial *mater
 		glBindTexture(GL_TEXTURE_2D,framebuffer.sample_color);
 		if (framebuffer.scale==1 && !canvas_texscreen_used) {
 #ifdef GLEW_ENABLED
-			glReadBuffer(GL_COLOR_ATTACHMENT0);
+			if (current_rt) {
+				glReadBuffer(GL_COLOR_ATTACHMENT0);
+			} else {
+				glReadBuffer(GL_BACK);
+			}
 #endif
 			glCopyTexSubImage2D(GL_TEXTURE_2D,0,x,y,x,y,viewport.width,viewport.height);
 //			if (current_clip) {
@@ -9344,7 +9348,11 @@ void RasterizerGLES2::canvas_render_items(CanvasItem *p_item_list,int p_z,const
 			glBindTexture(GL_TEXTURE_2D,framebuffer.sample_color);
 
 #ifdef GLEW_ENABLED
-			glReadBuffer(GL_COLOR_ATTACHMENT0);
+			if (current_rt) {
+				glReadBuffer(GL_COLOR_ATTACHMENT0);
+			} else {
+				glReadBuffer(GL_BACK);
+			}
 #endif
 			glCopyTexSubImage2D(GL_TEXTURE_2D,0,x,y,x,y,w,h);
 //			if (current_clip) {

drivers/vorbis/audio_stream_ogg_vorbis.cpp

@@ -361,7 +361,7 @@ void AudioStreamPlaybackOGGVorbis::_clear_stream() {
 	_close_file();
 
 	stream_loaded=false;
-	stream_channels=1;
+	//stream_channels=1;
 	playing=false;
 }
 

platform/flash/rasterizer_flash.h

@@ -577,7 +577,7 @@ class RasterizerFlash : public Rasterizer {
 					}
 				} else {
 
-					return B->material->shader_cache < B->material->shader_cache;
+					return A->material->shader_cache < B->material->shader_cache;
 				}
 			}
 		};

scene/3d/spatial_stream_player.cpp

@@ -171,6 +171,7 @@ void SpatialStreamPlayer::stop() {
 	//AudioServer::get_singleton()->stream_set_active(stream_rid,false);
 	SpatialSoundServer::get_singleton()->source_set_audio_stream(get_source_rid(),NULL);
 	playback->stop();
+	resampler.flush();
 	//set_idle_process(false);
 }
 

scene/audio/stream_player.cpp

@@ -165,6 +165,8 @@ void StreamPlayer::stop() {
 	//_THREAD_SAFE_METHOD_
 	AudioServer::get_singleton()->stream_set_active(stream_rid,false);
 	playback->stop();
+	resampler.flush();
+
 	//set_idle_process(false);
 }
 

scene/gui/texture_progress.cpp

@@ -80,9 +80,50 @@ Ref<Texture> TextureProgress::get_progress_texture() const{
 
 }
 
+Point2 TextureProgress::unit_val_to_uv(float val) {
+	if (progress.is_null())
+		return Point2();
+
+	if (val<0)
+		val+=1;
+	if (val>1)
+		val-=1;
+
+	Point2 p=get_relative_center();
+
+	if (val<0.125)
+		return Point2(p.x+(1-p.x)*val*8,0);
+	if (val<0.25)
+		return Point2(1,p.y*(val-0.125)*8);
+	if (val<0.375)
+		return Point2(1,p.y+(1-p.y)*(val-0.25)*8);
+	if (val<0.5)
+		return Point2(1-(1-p.x)*(val-0.375)*8,1);
+	if (val<0.625)
+		return Point2(p.x*(1-(val-0.5)*8),1);
+	if (val<0.75)
+		return Point2(0,1-((1-p.y)*(val-0.625)*8));
+	if (val<0.875)
+		return Point2(0,p.y-p.y*(val-0.75)*8);
+	else
+		return Point2(p.x*(val-0.875)*8,0);
+}
 
-void TextureProgress::_notification(int p_what){
+Point2 TextureProgress::get_relative_center()
+{
+	if (progress.is_null())
+		return Point2();
+	Point2 p = progress->get_size()/2;
+	p+=rad_center_off;
+	p.x/=progress->get_width();
+	p.y/=progress->get_height();
+	p.x=CLAMP(p.x,0,1);
+	p.y=CLAMP(p.y,0,1);
+	return p;
+}
 
+void TextureProgress::_notification(int p_what){
+	const float corners[12]={-0.125,-0.375,-0.625,-0.875,0.125,0.375,0.625,0.875,1.125,1.375,1.625,1.875};
 	switch(p_what) {
 
 		case NOTIFICATION_DRAW: {
@@ -92,7 +133,69 @@ void TextureProgress::_notification(int p_what){
 				draw_texture(under,Point2());
 			if (progress.is_valid()) {
 				Size2 s = progress->get_size();
-				draw_texture_rect_region(progress,Rect2(Point2(),Size2(s.x*get_unit_value(),s.y)),Rect2(Point2(),Size2(s.x*get_unit_value(),s.y)));
+				switch (mode) {
+				case FILL_LEFT_TO_RIGHT: {
+					Rect2 region=Rect2(Point2(),Size2(s.x*get_unit_value(),s.y));
+					draw_texture_rect_region(progress,region,region);
+				} break;
+				case FILL_RIGHT_TO_LEFT: {
+					Rect2 region=Rect2(Point2(s.x-s.x*get_unit_value(),0),Size2(s.x*get_unit_value(),s.y));
+					draw_texture_rect_region(progress,region,region);
+				} break;
+				case FILL_TOP_TO_BOTTOM: {
+					Rect2 region=Rect2(Point2(),Size2(s.x,s.y*get_unit_value()));
+					draw_texture_rect_region(progress,region,region);
+				} break;
+				case FILL_BOTTOM_TO_TOP: {
+					Rect2 region=Rect2(Point2(0,s.y-s.y*get_unit_value()),Size2(s.x,s.y*get_unit_value()));
+					draw_texture_rect_region(progress,region,region);
+				} break;
+				case FILL_CLOCKWISE:
+				case FILL_COUNTER_CLOCKWISE: {
+					float val=get_unit_value()*rad_max_degrees/360;
+					if (val==1) {
+						Rect2 region=Rect2(Point2(),s);
+						draw_texture_rect_region(progress,region,region);
+					} else if (val!=0) {
+						Array pts;
+						float direction=mode==FILL_CLOCKWISE?1:-1;
+						float start=rad_init_angle/360;
+						float end=start+direction*val;
+						pts.append(start);
+						pts.append(end);
+						float from=MIN(start,end);
+						float to=MAX(start,end);
+						for (int i=0;i<12;i++)
+							if (corners[i]>from&&corners[i]<to)
+								pts.append(corners[i]);
+						pts.sort();
+						Vector<Point2> uvs;
+						Vector<Point2> points;
+						uvs.push_back(get_relative_center());
+						points.push_back(Point2(s.x*get_relative_center().x,s.y*get_relative_center().y));
+						for (int i=0;i<pts.size();i++) {
+							Point2 uv=unit_val_to_uv(pts[i]);
+							if (uvs.find(uv)>=0)
+								continue;
+							uvs.push_back(uv);
+							points.push_back(Point2(uv.x*s.x,uv.y*s.y));
+						}
+						draw_polygon(points,Vector<Color>(),uvs,progress);
+					}
+					if (get_tree()->is_editor_hint()) {
+						Point2 p=progress->get_size();
+						p.x*=get_relative_center().x;
+						p.y*=get_relative_center().y;
+						p=p.floor();
+						draw_line(p-Point2(8,0),p+Point2(8,0),Color(0.9,0.5,0.5),2);
+						draw_line(p-Point2(0,8),p+Point2(0,8),Color(0.9,0.5,0.5),2);
+					}
+				} break;
+				default:
+					draw_texture_rect_region(progress,Rect2(Point2(),Size2(s.x*get_unit_value(),s.y)),Rect2(Point2(),Size2(s.x*get_unit_value(),s.y)));
+				}
+
+				
 			}
 			if (over.is_valid())
 				draw_texture(over,Point2());
@@ -101,6 +204,59 @@ void TextureProgress::_notification(int p_what){
 	}
 }
 
+void TextureProgress::set_fill_mode(int p_fill)
+{
+	ERR_FAIL_INDEX(p_fill,6);
+	mode=(FillMode)p_fill;
+	update();
+}
+
+int TextureProgress::get_fill_mode()
+{
+	return mode;
+}
+
+void TextureProgress::set_radial_initial_angle(float p_angle)
+{
+	while(p_angle>360)
+		p_angle-=360;
+	while (p_angle<0)
+		p_angle+=360;
+	rad_init_angle=p_angle;
+	update();
+}
+
+float TextureProgress::get_radial_initial_angle()
+{
+	return rad_init_angle;
+}
+
+void TextureProgress::set_fill_degrees(float p_angle)
+{
+	while(p_angle>360)
+		p_angle-=360;
+	while (p_angle<0)
+		p_angle+=360;
+	rad_max_degrees=p_angle;
+	update();
+}
+
+float TextureProgress::get_fill_degrees()
+{
+	return rad_max_degrees;
+}
+
+void TextureProgress::set_radial_center_offset(const Point2 &p_off)
+{
+	rad_center_off=p_off;
+	update();
+}
+
+Point2 TextureProgress::get_radial_center_offset()
+{
+	return rad_center_off;
+}
+
 void TextureProgress::_bind_methods() {
 
 	ObjectTypeDB::bind_method(_MD("set_under_texture","tex"),&TextureProgress::set_under_texture);
@@ -112,13 +268,38 @@ void TextureProgress::_bind_methods() {
 	ObjectTypeDB::bind_method(_MD("set_over_texture","tex"),&TextureProgress::set_over_texture);
 	ObjectTypeDB::bind_method(_MD("get_over_texture"),&TextureProgress::get_over_texture);
 
+	ObjectTypeDB::bind_method(_MD("set_fill_mode","mode"),&TextureProgress::set_fill_mode);
+	ObjectTypeDB::bind_method(_MD("get_fill_mode"), &TextureProgress::get_fill_mode);
+
+	ObjectTypeDB::bind_method(_MD("set_radial_initial_angle","mode"),&TextureProgress::set_radial_initial_angle);
+	ObjectTypeDB::bind_method(_MD("get_radial_initial_angle"), &TextureProgress::get_radial_initial_angle);
+	
+	ObjectTypeDB::bind_method(_MD("set_radial_center_offset","mode"),&TextureProgress::set_radial_center_offset);
+	ObjectTypeDB::bind_method(_MD("get_radial_center_offset"), &TextureProgress::get_radial_center_offset);
+	
+	ObjectTypeDB::bind_method(_MD("set_fill_degrees","mode"),&TextureProgress::set_fill_degrees);
+	ObjectTypeDB::bind_method(_MD("get_fill_degrees"), &TextureProgress::get_fill_degrees);
+
 	ADD_PROPERTY( PropertyInfo(Variant::OBJECT,"texture/under",PROPERTY_HINT_RESOURCE_TYPE,"Texture"),_SCS("set_under_texture"),_SCS("get_under_texture"));
 	ADD_PROPERTY( PropertyInfo(Variant::OBJECT,"texture/over",PROPERTY_HINT_RESOURCE_TYPE,"Texture"),_SCS("set_over_texture"),_SCS("get_over_texture"));
 	ADD_PROPERTY( PropertyInfo(Variant::OBJECT,"texture/progress",PROPERTY_HINT_RESOURCE_TYPE,"Texture"),_SCS("set_progress_texture"),_SCS("get_progress_texture"));
+	ADD_PROPERTYNZ( PropertyInfo(Variant::INT,"mode",PROPERTY_HINT_ENUM,"Left to Right,Right to Left,Top to Bottom,Bottom to Top,Clockwise,Counter Clockwise"),_SCS("set_fill_mode"),_SCS("get_fill_mode"));
+	ADD_PROPERTYNZ( PropertyInfo(Variant::REAL,"radial_fill/initial_angle",PROPERTY_HINT_RANGE,"0.0,360.0,0.1,slider"),_SCS("set_radial_initial_angle"),_SCS("get_radial_initial_angle"));
+	ADD_PROPERTYNZ( PropertyInfo(Variant::REAL,"radial_fill/fill_degrees",PROPERTY_HINT_RANGE,"0.0,360.0,0.1,slider"),_SCS("set_fill_degrees"),_SCS("get_fill_degrees"));
+	ADD_PROPERTY( PropertyInfo(Variant::VECTOR2,"radial_fill/center_offset"),_SCS("set_radial_center_offset"),_SCS("get_radial_center_offset"));
+
+	BIND_CONSTANT( FILL_LEFT_TO_RIGHT );
+	BIND_CONSTANT( FILL_RIGHT_TO_LEFT );
+	BIND_CONSTANT( FILL_TOP_TO_BOTTOM );
+	BIND_CONSTANT( FILL_BOTTOM_TO_TOP );
+	BIND_CONSTANT( FILL_CLOCKWISE );
+	BIND_CONSTANT( FILL_COUNTER_CLOCKWISE );
 
 }
 
 
 TextureProgress::TextureProgress()
 {
+	mode=FILL_LEFT_TO_RIGHT;
+	rad_center_off=Point2();
 }

scene/gui/texture_progress.h

@@ -45,6 +45,27 @@ protected:
 	void _notification(int p_what);
 public:
 
+	enum FillMode {
+		FILL_LEFT_TO_RIGHT=0,
+		FILL_RIGHT_TO_LEFT,
+		FILL_TOP_TO_BOTTOM,
+		FILL_BOTTOM_TO_TOP,
+		FILL_CLOCKWISE,
+		FILL_COUNTER_CLOCKWISE
+	};
+
+	void set_fill_mode(int p_fill);
+	int get_fill_mode();
+
+	void set_radial_initial_angle(float p_angle);
+	float get_radial_initial_angle();
+
+	void set_fill_degrees(float p_angle);
+	float get_fill_degrees();
+
+	void set_radial_center_offset(const Point2 &p_off);
+	Point2 get_radial_center_offset();
+
 	void set_under_texture(const Ref<Texture>& p_texture);
 	Ref<Texture> get_under_texture() const;
 
@@ -57,6 +78,16 @@ public:
 	Size2 get_minimum_size() const;
 
 	TextureProgress();
+
+private:
+
+	FillMode mode;
+	float rad_init_angle;
+	float rad_max_degrees;
+	Point2 rad_center_off;
+
+	Point2 unit_val_to_uv(float val);
+	Point2 get_relative_center();
 };
 
 #endif // TEXTURE_PROGRESS_H

tools/editor/io_plugins/editor_texture_import_plugin.cpp

@@ -1180,8 +1180,15 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc
 
 		ep.step("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=nearest_power_of_2(dst_size.width);
+			atlas_h=nearest_power_of_2(dst_size.height);
+		}
 		Image atlas;
-		atlas.create(nearest_power_of_2(dst_size.width),nearest_power_of_2(dst_size.height),0,alpha?Image::FORMAT_RGBA:Image::FORMAT_RGB);
+		atlas.create(atlas_w,atlas_h,0,alpha?Image::FORMAT_RGBA:Image::FORMAT_RGB);
 
 
 		atlases.resize(from->get_source_count());
@@ -1210,16 +1217,21 @@ Error EditorTextureImportPlugin::import2(const String& p_path, const Ref<Resourc
 			ERR_CONTINUE( !source_map.has(i) );
 			for (List<int>::Element *E=source_map[i].front();E;E=E->next()) {
 
-				Ref<AtlasTexture> at = memnew( AtlasTexture );
+				String apath = p_path.get_base_dir().plus_file(from->get_source_path(E->get()).get_file().basename()+".atex");
+
+				Ref<AtlasTexture> at;
 
+				if (ResourceCache::has(apath)) {
+					at = Ref<AtlasTexture>( ResourceCache::get(apath)->cast_to<AtlasTexture>() );
+				} else {
 
+					at = Ref<AtlasTexture>( memnew( AtlasTexture ) );
+				}
 				at->set_region(region);
 				at->set_margin(margin);
-				String apath = p_path.get_base_dir().plus_file(from->get_source_path(E->get()).get_file().basename()+".atex");
 				at->set_path(apath);
 				atlases[E->get()]=at;
 				print_line("Atlas Tex: "+apath);
-
 			}
 		}
 		if (ResourceCache::has(p_path)) {

tools/editor/script_editor_debugger.cpp

@@ -1322,6 +1322,38 @@ ScriptEditorDebugger::ScriptEditorDebugger(EditorNode *p_editor){
 
 	}
 
+	VBoxContainer *vmem_vb = memnew( VBoxContainer );
+	HBoxContainer *vmem_hb = memnew( HBoxContainer );
+	Label *vmlb = memnew(Label("List of Video Memory Usage by Resource: ") );
+	vmlb->set_h_size_flags(SIZE_EXPAND_FILL);
+	vmem_hb->add_child( vmlb );
+	vmem_refresh = memnew( Button );
+	vmem_hb->add_child(vmem_refresh);
+	vmem_vb->add_child(vmem_hb);
+
+	MarginContainer *vmmc = memnew( MarginContainer );
+	vmmc = memnew( MarginContainer );
+	vmem_tree = memnew( Tree );
+	vmem_tree->set_v_size_flags(SIZE_EXPAND_FILL);
+	vmem_tree->set_h_size_flags(SIZE_EXPAND_FILL);
+	vmmc->add_child(vmem_tree);
+	vmmc->set_v_size_flags(SIZE_EXPAND_FILL);
+	vmem_vb->add_child(vmmc);
+
+	vmem_vb->set_name("Video Mem");
+	vmem_tree->set_columns(3);
+	vmem_tree->set_column_titles_visible(true);
+	vmem_tree->set_column_title(0,"Resource Path");
+	vmem_tree->set_column_expand(0,true);
+	vmem_tree->set_column_expand(1,false);
+	vmem_tree->set_column_title(1,"Type");
+	vmem_tree->set_column_min_width(1,150);
+	vmem_tree->set_column_expand(2,false);
+	vmem_tree->set_column_title(2,"Usage");
+	vmem_tree->set_column_min_width(2,150);
+
+	tabs->add_child(vmem_vb);
+
 	info = memnew( HSplitContainer );
 	info->set_name("Info");
 	tabs->add_child(info);

tools/editor/script_editor_debugger.h

@@ -96,6 +96,9 @@ class ScriptEditorDebugger : public Control {
 	Tree *perf_monitors;
 	Control *perf_draw;
 
+	Tree *vmem_tree;
+	Button *vmem_refresh;
+
 	Tree *stack_dump;
 	PropertyEditor *inspector;