asgardius/virtualx-engine
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source
This commit is contained in:
Juan Linietsky 2015-04-18 16:18:59 -03:00
commit 170a9349d2
8 changed files with 47 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
modules/gdscript/gd_editor.cpp
View file

@ -33,7 +33,7 @@
void GDScriptLanguage::get_comment_delimiters(List<String> *p_delimiters) const { void GDScriptLanguage::get_comment_delimiters(List<String> *p_delimiters) const {
p_delimiters->push_back("#"); p_delimiters->push_back("#");
p_delimiters->push_back("\"\"\""); p_delimiters->push_back("\"\"\" \"\"\"");
} }
void GDScriptLanguage::get_string_delimiters(List<String> *p_delimiters) const { void GDScriptLanguage::get_string_delimiters(List<String> *p_delimiters) const {

2
servers/physics/body_sw.h
View file

@ -85,7 +85,7 @@ class BodySW : public CollisionObjectSW {
AreaSW *area; AreaSW *area;
_FORCE_INLINE_ bool operator==(const AreaCMP& p_cmp) const { return area->get_self() == p_cmp.area->get_self();} _FORCE_INLINE_ bool operator==(const AreaCMP& p_cmp) const { return area->get_self() == p_cmp.area->get_self();}
_FORCE_INLINE_ bool operator<(const AreaCMP a) const { return area->get_priority() < a.area->get_priority();} _FORCE_INLINE_ bool operator<(const AreaCMP& p_cmp) const { return area->get_priority() < p_cmp.area->get_priority();}
_FORCE_INLINE_ AreaCMP() {} _FORCE_INLINE_ AreaCMP() {}
_FORCE_INLINE_ AreaCMP(AreaSW *p_area) { area=p_area;} _FORCE_INLINE_ AreaCMP(AreaSW *p_area) { area=p_area;}
}; };

37
servers/physics_2d/body_2d_sw.cpp
View file

@ -379,13 +379,12 @@ void Body2DSW::_compute_area_gravity(const Area2DSW *p_area) {
if (p_area->is_gravity_point()) { if (p_area->is_gravity_point()) {
gravity = (p_area->get_transform().xform(p_area->get_gravity_vector()) - get_transform().get_origin()).normalized() * p_area->get_gravity(); gravity += (p_area->get_transform().xform(p_area->get_gravity_vector()) - get_transform().get_origin()).normalized() * p_area->get_gravity();
} else { } else {
gravity = p_area->get_gravity_vector() * p_area->get_gravity(); gravity += p_area->get_gravity_vector() * p_area->get_gravity();
} }
gravity*=gravity_scale;
} }
void Body2DSW::integrate_forces(real_t p_step) { void Body2DSW::integrate_forces(real_t p_step) {
@ -393,32 +392,39 @@ void Body2DSW::integrate_forces(real_t p_step) {
if (mode==Physics2DServer::BODY_MODE_STATIC) if (mode==Physics2DServer::BODY_MODE_STATIC)
return; return;
Area2DSW *current_area = get_space()->get_default_area(); Area2DSW *def_area = get_space()->get_default_area();
ERR_FAIL_COND(!current_area); Area2DSW *damp_area = def_area;
ERR_FAIL_COND(!def_area);
int prio = current_area->get_priority();
int ac = areas.size(); int ac = areas.size();
bool replace = false;
gravity=Vector2(0,0);
if (ac) { if (ac) {
areas.sort();
const AreaCMP *aa = &areas[0]; const AreaCMP *aa = &areas[0];
for(int i=0;i<ac;i++) { damp_area = aa[ac-1].area;
if (aa[i].area->get_priority() > prio) { for(int i=ac-1;i>=0;i--) {
current_area=aa[i].area; _compute_area_gravity(aa[i].area);
prio=current_area->get_priority(); if (aa[i].area->get_space_override_mode() == Physics2DServer::AREA_SPACE_OVERRIDE_REPLACE) {
replace = true;
break;
} }
} }
} }
if( !replace ) {
_compute_area_gravity(current_area); _compute_area_gravity(def_area);
}
gravity*=gravity_scale;
if (angular_damp>=0) if (angular_damp>=0)
area_angular_damp=angular_damp; area_angular_damp=angular_damp;
else else
area_angular_damp=current_area->get_angular_damp(); area_angular_damp=damp_area->get_angular_damp();
if (linear_damp>=0) if (linear_damp>=0)
area_linear_damp=linear_damp; area_linear_damp=linear_damp;
else else
area_linear_damp=current_area->get_linear_damp(); area_linear_damp=damp_area->get_linear_damp();
Vector2 motion; Vector2 motion;
bool do_motion=false; bool do_motion=false;
@ -482,7 +488,8 @@ void Body2DSW::integrate_forces(real_t p_step) {
_update_shapes_with_motion(motion); _update_shapes_with_motion(motion);
} }
current_area=NULL; // clear the area, so it is set in the next frame damp_area=NULL; // clear the area, so it is set in the next frame
def_area=NULL; // clear the area, so it is set in the next frame
contact_count=0; contact_count=0;
} }

7
servers/physics_2d/body_2d_sw.h
View file

@ -91,13 +91,14 @@ class Body2DSW : public CollisionObject2DSW {
struct AreaCMP { struct AreaCMP {
Area2DSW *area; Area2DSW *area;
_FORCE_INLINE_ bool operator<(const AreaCMP& p_cmp) const { return area->get_self() < p_cmp.area->get_self() ; } _FORCE_INLINE_ bool operator==(const AreaCMP& p_cmp) const { return area->get_self() == p_cmp.area->get_self();}
_FORCE_INLINE_ bool operator<(const AreaCMP& p_cmp) const { return area->get_priority() < p_cmp.area->get_priority();}
_FORCE_INLINE_ AreaCMP() {} _FORCE_INLINE_ AreaCMP() {}
_FORCE_INLINE_ AreaCMP(Area2DSW *p_area) { area=p_area;} _FORCE_INLINE_ AreaCMP(Area2DSW *p_area) { area=p_area;}
}; };
VSet<AreaCMP> areas; Vector<AreaCMP> areas;
struct Contact { struct Contact {
@ -140,7 +141,7 @@ public:
void set_force_integration_callback(ObjectID p_id, const StringName& p_method, const Variant &p_udata=Variant()); void set_force_integration_callback(ObjectID p_id, const StringName& p_method, const Variant &p_udata=Variant());
_FORCE_INLINE_ void add_area(Area2DSW *p_area) { areas.insert(AreaCMP(p_area)); } _FORCE_INLINE_ void add_area(Area2DSW *p_area) { areas.ordered_insert(AreaCMP(p_area)); }
_FORCE_INLINE_ void remove_area(Area2DSW *p_area) { areas.erase(AreaCMP(p_area)); } _FORCE_INLINE_ void remove_area(Area2DSW *p_area) { areas.erase(AreaCMP(p_area)); }
_FORCE_INLINE_ void set_max_contacts_reported(int p_size) { contacts.resize(p_size); contact_count=0; if (mode==Physics2DServer::BODY_MODE_KINEMATIC && p_size) set_active(true);} _FORCE_INLINE_ void set_max_contacts_reported(int p_size) { contacts.resize(p_size); contact_count=0; if (mode==Physics2DServer::BODY_MODE_KINEMATIC && p_size) set_active(true);}

17
tools/editor/plugins/multimesh_editor_plugin.cpp
View file

@ -29,8 +29,7 @@
#include "multimesh_editor_plugin.h" #include "multimesh_editor_plugin.h"
#include "scene/gui/box_container.h" #include "scene/gui/box_container.h"
#include "scene/3d/mesh_instance.h" #include "scene/3d/mesh_instance.h"
#include "spatial_editor_plugin.h"
void MultiMeshEditor::_node_removed(Node *p_node) { void MultiMeshEditor::_node_removed(Node *p_node) {
@ -299,7 +298,7 @@ void MultiMeshEditor::_menu_option(int p_option) {
void MultiMeshEditor::edit(MultiMeshInstance *p_multimesh) { void MultiMeshEditor::edit(MultiMeshInstance *p_multimesh) {
node=p_multimesh; node=p_multimesh;
} }
@ -326,7 +325,8 @@ MultiMeshEditor::MultiMeshEditor() {
options = memnew( MenuButton ); options = memnew( MenuButton );
add_child(options); //add_child(options);
SpatialEditor::get_singleton()->add_control_to_menu_panel(options);
options->set_area_as_parent_rect(); options->set_area_as_parent_rect();
options->set_text("MultiMesh"); options->set_text("MultiMesh");
@ -341,7 +341,6 @@ MultiMeshEditor::MultiMeshEditor() {
populate_dialog->add_child(vbc); populate_dialog->add_child(vbc);
populate_dialog->set_child_rect(vbc); populate_dialog->set_child_rect(vbc);
HBoxContainer *hbc = memnew( HBoxContainer ); HBoxContainer *hbc = memnew( HBoxContainer );
surface_source = memnew( LineEdit ); surface_source = memnew( LineEdit );
@ -435,10 +434,10 @@ bool MultiMeshEditorPlugin::handles(Object *p_object) const {
void MultiMeshEditorPlugin::make_visible(bool p_visible) { void MultiMeshEditorPlugin::make_visible(bool p_visible) {
if (p_visible) { if (p_visible) {
multimesh_editor->show(); multimesh_editor->options->show();
} else { } else {
multimesh_editor->hide(); multimesh_editor->options->hide();
multimesh_editor->edit(NULL); multimesh_editor->edit(NULL);
} }
@ -457,9 +456,7 @@ MultiMeshEditorPlugin::MultiMeshEditorPlugin(EditorNode *p_node) {
multimesh_editor->set_margin(MARGIN_TOP,0); multimesh_editor->set_margin(MARGIN_TOP,0);
multimesh_editor->set_margin(MARGIN_BOTTOM,10); multimesh_editor->set_margin(MARGIN_BOTTOM,10);
multimesh_editor->options->hide();
multimesh_editor->hide();
} }

4
tools/editor/plugins/multimesh_editor_plugin.h
View file

@ -42,14 +42,14 @@ class MultiMeshEditor : public Control {
OBJ_TYPE(MultiMeshEditor, Control ); OBJ_TYPE(MultiMeshEditor, Control );
friend class MultiMeshEditorPlugin;
AcceptDialog *err_dialog; AcceptDialog *err_dialog;
MenuButton * options;
MultiMeshInstance *_last_pp_node; MultiMeshInstance *_last_pp_node;
bool browsing_source; bool browsing_source;
Panel *panel; Panel *panel;
MenuButton * options;
MultiMeshInstance *node; MultiMeshInstance *node;
LineEdit *surface_source; LineEdit *surface_source;

14
tools/editor/plugins/rich_text_editor_plugin.cpp
View file

@ -28,6 +28,8 @@
/*************************************************************************/ /*************************************************************************/
#include "rich_text_editor_plugin.h" #include "rich_text_editor_plugin.h"
#include "os/file_access.h" #include "os/file_access.h"
#include "canvas_item_editor_plugin.h"
void RichTextEditor::_notification(int p_what) { void RichTextEditor::_notification(int p_what) {
switch(p_what) { switch(p_what) {
@ -100,7 +102,8 @@ void RichTextEditor::edit(Node *p_rich_text) {
RichTextEditor::RichTextEditor() { RichTextEditor::RichTextEditor() {
options = memnew( MenuButton ); options = memnew( MenuButton );
add_child(options); //add_child(options);
CanvasItemEditor::get_singleton()->add_control_to_menu_panel(options);
options->set_area_as_parent_rect(); options->set_area_as_parent_rect();
options->set_text("RichText"); options->set_text("RichText");
@ -129,10 +132,10 @@ bool RichTextEditorPlugin::handles(Object *p_object) const {
void RichTextEditorPlugin::make_visible(bool p_visible) { void RichTextEditorPlugin::make_visible(bool p_visible) {
if (p_visible) { if (p_visible) {
rich_text_editor->show(); rich_text_editor->options->show();
} else { } else {
rich_text_editor->hide(); rich_text_editor->options->hide();
rich_text_editor->edit(NULL); rich_text_editor->edit(NULL);
} }
@ -149,10 +152,7 @@ RichTextEditorPlugin::RichTextEditorPlugin(EditorNode *p_node) {
rich_text_editor->set_margin(MARGIN_TOP,0); rich_text_editor->set_margin(MARGIN_TOP,0);
rich_text_editor->set_margin(MARGIN_BOTTOM,10); rich_text_editor->set_margin(MARGIN_BOTTOM,10);
rich_text_editor->options->hide();
rich_text_editor->hide();
} }

4
tools/editor/plugins/rich_text_editor_plugin.h
View file

@ -42,6 +42,8 @@ class RichTextEditor : public Control {
OBJ_TYPE(RichTextEditor, Control ); OBJ_TYPE(RichTextEditor, Control );
friend class RichTextEditorPlugin;
enum { enum {
PARSE_BBCODE, PARSE_BBCODE,
@ -49,8 +51,8 @@ class RichTextEditor : public Control {
}; };
Panel *panel; Panel *panel;
MenuButton *options;
RichTextLabel *node; RichTextLabel *node;
MenuButton *options;
FileDialog *file_dialog; FileDialog *file_dialog;
void _file_selected(const String& p_path); void _file_selected(const String& p_path);