Sara/behaviour-tree-test
1
0
Fork 0
Code Issues Pull requests Projects Releases 2 Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
santiagopf 2015-12-13 02:16:11 -03:00
commit 477b174d9d
10 changed files with 120 additions and 19 deletions
Download patch file Download diff file Expand all files Collapse all files

2
core/variant_parser.cpp
View file

@ -468,7 +468,7 @@ Error VariantParser::parse_value(Token& token,Variant &value,Stream *p_stream,in
return err;
if (args.size()!=4) {
r_err_str="Expected 2 arguments for constructor";
r_err_str="Expected 4 arguments for constructor";
}
value=Rect2(args[0],args[1],args[2],args[3]);

9
scene/gui/option_button.cpp
View file

@ -77,9 +77,14 @@ void OptionButton::_selected(int p_which) {
}
}
ERR_FAIL_COND(selid==-1);
if (selid==-1 && p_which>=0 && p_which<popup->get_item_count()) {
_select(p_which,true);
} else {
_select(selid,true);
ERR_FAIL_COND(selid==-1);
_select(selid,true);
}
}

3
scene/gui/popup_menu.cpp
View file

@ -370,7 +370,7 @@ void PopupMenu::_input_event(const InputEvent &p_event) {
}
int over=_get_mouse_over(Point2(m.x,m.y));
int id = (over<0 || items[over].separator || items[over].disabled)?-1:items[over].ID;
int id = (over<0 || items[over].separator || items[over].disabled)?-1:(items[over].ID>=0?items[over].ID:over);
if (id<0) {
mouse_over=-1;
@ -753,6 +753,7 @@ int PopupMenu::find_item_by_accelerator(uint32_t p_accel) const {
void PopupMenu::activate_item(int p_item) {
ERR_FAIL_INDEX(p_item,items.size());
ERR_FAIL_COND(items[p_item].separator);
int id = items[p_item].ID>=0?items[p_item].ID:p_item;

2
scene/gui/texture_button.cpp
View file

@ -163,7 +163,7 @@ void TextureButton::_bind_methods() {
ADD_PROPERTYNZ(PropertyInfo(Variant::OBJECT,"textures/disabled",PROPERTY_HINT_RESOURCE_TYPE,"Texture"), _SCS("set_disabled_texture"), _SCS("get_disabled_texture"));
ADD_PROPERTYNZ(PropertyInfo(Variant::OBJECT,"textures/focused",PROPERTY_HINT_RESOURCE_TYPE,"Texture"), _SCS("set_focused_texture"), _SCS("get_focused_texture"));
ADD_PROPERTYNZ(PropertyInfo(Variant::OBJECT,"textures/click_mask",PROPERTY_HINT_RESOURCE_TYPE,"BitMap"), _SCS("set_click_mask"), _SCS("get_click_mask")) ;
ADD_PROPERTYNO(PropertyInfo(Variant::VECTOR2,"params/scale",PROPERTY_HINT_RANGE,"0.01,1024,0.01"), _SCS("set_texture_scale"), _SCS("set_texture_scale"));
ADD_PROPERTYNO(PropertyInfo(Variant::VECTOR2,"params/scale",PROPERTY_HINT_RANGE,"0.01,1024,0.01"), _SCS("set_texture_scale"), _SCS("get_texture_scale"));
ADD_PROPERTYNO(PropertyInfo(Variant::COLOR,"params/modulate"), _SCS("set_modulate"), _SCS("get_modulate"));
}

9
scene/gui/video_player.cpp
View file

@ -338,6 +338,13 @@ float VideoPlayer::get_stream_pos() const {
return playback->get_pos();
};
Ref<Texture> VideoPlayer::get_video_texture() {
if (playback.is_valid())
return playback->get_texture();
return Ref<Texture> ();
}
void VideoPlayer::set_autoplay(bool p_enable) {
@ -384,6 +391,8 @@ void VideoPlayer::_bind_methods() {
ObjectTypeDB::bind_method(_MD("set_buffering_msec","msec"),&VideoPlayer::set_buffering_msec);
ObjectTypeDB::bind_method(_MD("get_buffering_msec"),&VideoPlayer::get_buffering_msec);
ObjectTypeDB::bind_method(_MD("get_video_texutre:Texture"), &VideoPlayer::get_video_texture );
ADD_PROPERTY( PropertyInfo(Variant::INT, "stream/audio_track",PROPERTY_HINT_RANGE,"0,128,1"), _SCS("set_audio_track"), _SCS("get_audio_track") );
ADD_PROPERTY( PropertyInfo(Variant::OBJECT, "stream/stream", PROPERTY_HINT_RESOURCE_TYPE,"VideoStream"), _SCS("set_stream"), _SCS("get_stream") );
// ADD_PROPERTY( PropertyInfo(Variant::BOOL, "stream/loop"), _SCS("set_loop"), _SCS("has_loop") );

6
scene/gui/video_player.h
View file

@ -88,6 +88,8 @@ public:
bool has_expand() const;
Ref<Texture> get_video_texture();
void set_stream(const Ref<VideoStream> &p_stream);
Ref<VideoStream> get_stream() const;
@ -110,8 +112,8 @@ public:
void set_autoplay(bool p_vol);
bool has_autoplay() const;
void set_audio_track(int p_track);
int get_audio_track() const;
void set_audio_track(int p_track);
int get_audio_track() const;
void set_buffering_msec(int p_msec);
int get_buffering_msec() const;

5
tools/editor/editor_file_dialog.cpp
View file

@ -6,6 +6,8 @@
#include "editor_resource_preview.h"
#include "editor_settings.h"
#include "scene/gui/margin_container.h"
#include "os/file_access.h"
EditorFileDialog::GetIconFunc EditorFileDialog::get_icon_func=NULL;
EditorFileDialog::GetIconFunc EditorFileDialog::get_large_icon_func=NULL;
@ -194,6 +196,9 @@ void EditorFileDialog::_thumbnail_done(const String& p_path,const Ref<Texture>&
void EditorFileDialog::_request_single_thumbnail(const String& p_path) {
if (!FileAccess::exists(p_path))
return;
EditorResourcePreview::get_singleton()->queue_resource_preview(p_path,this,"_thumbnail_done",p_path);
//print_line("want file "+p_path);
set_process(true);

54
tools/editor/editor_import_export.cpp
View file

@ -41,6 +41,7 @@
#include "io/md5.h"
#include "io_plugins/editor_texture_import_plugin.h"
#include "tools/editor/plugins/script_editor_plugin.h"
#include "io/zip_io.h"
String EditorImportPlugin::validate_source_path(const String& p_path) {
@ -1077,6 +1078,59 @@ Error EditorExportPlatform::save_pack_file(void *p_userdata,const String& p_path
}
Error EditorExportPlatform::save_zip_file(void *p_userdata,const String& p_path, const Vector<uint8_t>& p_data,int p_file,int p_total) {
ZipData *zd = (ZipData*)p_userdata;
zipFile zip=(zipFile)zd->zip;
zipOpenNewFileInZip(zip,
p_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("Storing File: "+p_path,2+p_file*100/p_total);
zd->count++;
return OK;
}
Error EditorExportPlatform::save_zip(const String& p_path, bool p_make_bundles) {
EditorProgress ep("savezip","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);
if (err)
return err;
}
Error EditorExportPlatform::save_pack(FileAccess *dst,bool p_make_bundles, int p_alignment) {
EditorProgress ep("savepack","Packing",102);

12
tools/editor/editor_import_export.h
View file

@ -33,6 +33,7 @@
#include "scene/main/node.h"
#include "scene/resources/texture.h"
class EditorExportPlatform;
class FileAccess;
class EditorProgress;
@ -107,8 +108,17 @@ protected:
};
struct ZipData {
void* zip;
EditorProgress *ep;
int count;
};
void gen_export_flags(Vector<String> &r_flags, int p_flags);
static Error save_pack_file(void *p_userdata,const String& p_path, const Vector<uint8_t>& p_data,int p_file,int p_total);
static Error save_zip_file(void *p_userdata,const String& p_path, const Vector<uint8_t>& p_data,int p_file,int p_total);
public:
@ -134,6 +144,8 @@ public:
Error export_project_files(EditorExportSaveFunction p_func, void* p_udata,bool p_make_bundles);
Error save_pack(FileAccess *p_where, bool p_make_bundles=false, int p_alignment = 1);
Error save_zip(const String& p_path, bool p_make_bundles=false);
virtual String get_name() const =0;
virtual ImageCompression get_image_compression() const=0;
virtual Ref<Texture> get_logo() const =0;

37
tools/editor/project_export.cpp
View file

@ -471,20 +471,32 @@ void ProjectExportDialog::_export_action_pck(const String& p_file) {
ERR_PRINT("Invalid platform for export of PCK");
return;
}
FileAccess *f = FileAccess::open(p_file,FileAccess::WRITE);
if (!f) {
error->set_text("Error exporting project PCK! Can't write");
error->popup_centered_minsize();
}
ERR_FAIL_COND(!f);
Error err = exporter->save_pack(f,false);
memdelete(f);
if (p_file.ends_with(".pck")) {
FileAccess *f = FileAccess::open(p_file,FileAccess::WRITE);
if (!f) {
error->set_text("Error exporting project PCK! Can't write");
error->popup_centered_minsize();
}
ERR_FAIL_COND(!f);
if (err!=OK) {
error->set_text("Error exporting project!");
error->popup_centered_minsize();
return;
Error err = exporter->save_pack(f,false);
memdelete(f);
if (err!=OK) {
error->set_text("Error exporting project!");
error->popup_centered_minsize();
return;
}
} else if (p_file.ends_with(".zip")) {
Error err = exporter->save_zip(p_file,false);
if (err!=OK) {
error->set_text("Error exporting project!");
error->popup_centered_minsize();
return;
}
}
}
@ -1425,6 +1437,7 @@ ProjectExportDialog::ProjectExportDialog(EditorNode *p_editor) {
pck_export->set_title("Export Project PCK");
pck_export->connect("file_selected", this,"_export_action_pck");
pck_export->add_filter("*.pck ; Data Pack");
pck_export->add_filter("*.zip ; Zip");
add_child(pck_export);
button_export = add_button("Export..",!OS::get_singleton()->get_swap_ok_cancel(),"export_pck");