aboutsummaryrefslogtreecommitdiff
path: root/main
diff options
context:
space:
mode:
Diffstat (limited to 'main')
-rw-r--r--main/input_default.cpp8
-rw-r--r--main/main.cpp152
2 files changed, 83 insertions, 77 deletions
diff --git a/main/input_default.cpp b/main/input_default.cpp
index d84b0b0f5..089772edc 100644
--- a/main/input_default.cpp
+++ b/main/input_default.cpp
@@ -504,7 +504,7 @@ void InputDefault::action_release(const StringName& p_action){
action.fixed_frame=OS::get_singleton()->get_fixed_frames();
action.idle_frame=OS::get_singleton()->get_idle_frames();
- action.pressed=true;
+ action.pressed=false;
action_state[p_action]=action;
}
@@ -655,7 +655,7 @@ static const char *s_ControllerMappings [] =
"030000004f04000015b3000010010000,Thrustmaster Dual Analog 4,a:b0,b:b2,x:b1,y:b3,start:b9,back:b8,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b6,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b5,righttrigger:b7,",
"030000004f04000020b3000010010000,Thrustmaster 2 in 1 DT,a:b0,b:b2,y:b3,x:b1,start:b9,guide:,back:b8,leftstick:b10,rightstick:b11,leftshoulder:b4,rightshoulder:b6,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:b5,righttrigger:b7,",
"030000004f04000023b3000000010000,Thrustmaster Dual Trigger 3-in-1,x:b0,a:b1,b:b2,y:b3,back:b8,start:b9,dpleft:h0.8,dpdown:h0.0,dpdown:h0.4,dpright:h0.0,dpright:h0.2,dpup:h0.0,dpup:h0.1,leftshoulder:h0.0,leftshoulder:b4,lefttrigger:b6,rightshoulder:b5,righttrigger:b7,leftstick:b10,rightstick:b11,leftx:a0,lefty:a1,rightx:a2,righty:a5,",
- "030000005e0400001907000000010000,X360 Wireless Controller,a:b0,b:b1,back:b6,dpdown:b14,dpleft:b11,dpright:b12,dpup:b13,guide:b8,leftshoulder:b4,leftstick:b9,lefttrigger:a2,leftx:a0,lefty:a1,rightshoulder:b5,rightstick:b10,righttrigger:a5,rightx:a3,righty:a4,start:b7,x:b2,y:b3,",
+ "030000005e0400001907000000010000,X360 Wireless Controller,leftx:a0,lefty:a1,dpdown:h0.4,rightstick:b10,rightshoulder:b5,rightx:a3,start:b7,righty:a4,dpleft:h0.8,lefttrigger:a2,x:b2,dpup:h0.1,back:b6,leftstick:b9,leftshoulder:b4,y:b3,a:b0,dpright:h0.2,righttrigger:a5,b:b1,",
"030000005e0400008902000021010000,Microsoft X-Box pad v2 (US),x:b3,a:b0,b:b1,y:b4,back:b6,start:b7,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,dpup:h0.1,leftshoulder:b5,lefttrigger:a2,rightshoulder:b2,righttrigger:a5,leftstick:b8,rightstick:b9,leftx:a0,lefty:a1,rightx:a3,righty:a4,",
"030000005e0400008e02000001000000,Microsoft X-Box 360 pad,leftstick:b9,leftx:a0,lefty:a1,dpdown:h0.1,rightstick:b10,rightshoulder:b5,rightx:a3,start:b7,righty:a4,dpleft:h0.2,lefttrigger:a2,x:b2,dpup:h0.4,back:b6,leftshoulder:b4,y:b3,a:b0,dpright:h0.8,righttrigger:a5,b:b1,",
"030000005e0400008e02000004010000,Microsoft X-Box 360 pad,a:b0,b:b1,x:b2,y:b3,back:b6,start:b7,guide:b8,leftshoulder:b4,rightshoulder:b5,leftstick:b9,rightstick:b10,leftx:a0,lefty:a1,rightx:a3,righty:a4,lefttrigger:a2,righttrigger:a5,dpup:h0.1,dpleft:h0.8,dpdown:h0.4,dpright:h0.2,",
@@ -738,6 +738,10 @@ static const char *s_ControllerMappings [] =
"303534632d303563342d576972656c65,PS4 Controller USB/Win,leftx:a0,lefty:a1,dpdown:b15,rightstick:b11,rightshoulder:b5,rightx:a2,start:b9,righty:a5,lefttrigger:a3,x:b0,dpup:b14,dpleft:b16,dpright:b17,back:b8,leftstick:b10,leftshoulder:b4,y:b3,a:b1,righttrigger:b7,b:b2,",
"c2a94d6963726f736f66742058626f78,Wireless X360 Controller,leftx:a0,lefty:a1,dpdown:b14,rightstick:b10,rightshoulder:b5,rightx:a3,start:b7,righty:a4,dpleft:b11,lefttrigger:a2,x:b2,dpup:b13,back:b6,leftstick:b9,leftshoulder:b4,y:b3,a:b0,dpright:b12,righttrigger:a5,b:b1,",
#endif
+
+ #ifdef WINRT_ENABLED
+ "__WINRT_GAMEPAD__,Xbox Controller,a:b2,b:b3,x:b4,y:b5,start:b0,back:b1,leftstick:b12,rightstick:b13,leftshoulder:b10,rightshoulder:b11,dpup:b6,dpdown:b7,dpleft:b8,dpright:b9,leftx:a0,lefty:a1,rightx:a2,righty:a3,lefttrigger:a4,righttrigger:a5,",
+ #endif
NULL
};
diff --git a/main/main.cpp b/main/main.cpp
index e339f399d..d2ba38b09 100644
--- a/main/main.cpp
+++ b/main/main.cpp
@@ -994,8 +994,11 @@ Error Main::setup2() {
}
}
#ifdef TOOLS_ENABLED
+ ObjectTypeDB::set_current_api(ObjectTypeDB::API_EDITOR);
EditorNode::register_editor_types();
ObjectTypeDB::register_type<PCKPacker>(); // todo: move somewhere else
+ ObjectTypeDB::set_current_api(ObjectTypeDB::API_CORE);
+
#endif
MAIN_PRINT("Main: Load Scripts, Modules, Drivers");
@@ -1022,6 +1025,8 @@ Error Main::setup2() {
_start_success=true;
locale=String();
+ ObjectTypeDB::set_current_api(ObjectTypeDB::API_NONE); //no more api is registered at this point
+
MAIN_PRINT("Main: Done");
return OK;
@@ -1294,9 +1299,10 @@ bool Main::start() {
}
+ String local_game_path;
if (game_path!="" && !project_manager_request) {
- String local_game_path=game_path.replace("\\","/");
+ local_game_path=game_path.replace("\\","/");
if (!local_game_path.begins_with("res://")) {
bool absolute=(local_game_path.size()>1) && (local_game_path[0]=='/' || local_game_path[1]==':');
@@ -1363,98 +1369,99 @@ bool Main::start() {
OS::get_singleton()->set_context(OS::CONTEXT_EDITOR);
//editor_node->set_edited_scene(game);
- } else {
+ }
#endif
+ }
- {
- //autoload
- List<PropertyInfo> props;
- Globals::get_singleton()->get_property_list(&props);
-
- //first pass, add the constants so they exist before any script is loaded
- for(List<PropertyInfo>::Element *E=props.front();E;E=E->next()) {
-
- String s = E->get().name;
- if (!s.begins_with("autoload/"))
- continue;
- String name = s.get_slicec('/',1);
- String path = Globals::get_singleton()->get(s);
- bool global_var=false;
- if (path.begins_with("*")) {
- global_var=true;
- }
+ if (!project_manager_request && !editor) {
+ if (game_path!="" || script!="") {
+ //autoload
+ List<PropertyInfo> props;
+ Globals::get_singleton()->get_property_list(&props);
- if (global_var) {
- for(int i=0;i<ScriptServer::get_language_count();i++) {
- ScriptServer::get_language(i)->add_global_constant(name,Variant());
- }
- }
+ //first pass, add the constants so they exist before any script is loaded
+ for(List<PropertyInfo>::Element *E=props.front();E;E=E->next()) {
+ String s = E->get().name;
+ if (!s.begins_with("autoload/"))
+ continue;
+ String name = s.get_slicec('/',1);
+ String path = Globals::get_singleton()->get(s);
+ bool global_var=false;
+ if (path.begins_with("*")) {
+ global_var=true;
}
- //second pass, load into global constants
- List<Node*> to_add;
- for(List<PropertyInfo>::Element *E=props.front();E;E=E->next()) {
-
- String s = E->get().name;
- if (!s.begins_with("autoload/"))
- continue;
- String name = s.get_slicec('/',1);
- String path = Globals::get_singleton()->get(s);
- bool global_var=false;
- if (path.begins_with("*")) {
- global_var=true;
- path=path.substr(1,path.length()-1);
+ if (global_var) {
+ for(int i=0;i<ScriptServer::get_language_count();i++) {
+ ScriptServer::get_language(i)->add_global_constant(name,Variant());
}
+ }
- RES res = ResourceLoader::load(path);
- ERR_EXPLAIN("Can't autoload: "+path);
- ERR_CONTINUE(res.is_null());
- Node *n=NULL;
- if (res->is_type("PackedScene")) {
- Ref<PackedScene> ps = res;
- n=ps->instance();
- } else if (res->is_type("Script")) {
- Ref<Script> s = res;
- StringName ibt = s->get_instance_base_type();
- bool valid_type = ObjectTypeDB::is_type(ibt,"Node");
- ERR_EXPLAIN("Script does not inherit a Node: "+path);
- ERR_CONTINUE( !valid_type );
-
- Object *obj = ObjectTypeDB::instance(ibt);
+ }
- ERR_EXPLAIN("Cannot instance script for autoload, expected 'Node' inheritance, got: "+String(ibt));
- ERR_CONTINUE( obj==NULL );
+ //second pass, load into global constants
+ List<Node*> to_add;
+ for(List<PropertyInfo>::Element *E=props.front();E;E=E->next()) {
- n = obj->cast_to<Node>();
- n->set_script(s.get_ref_ptr());
- }
+ String s = E->get().name;
+ if (!s.begins_with("autoload/"))
+ continue;
+ String name = s.get_slicec('/',1);
+ String path = Globals::get_singleton()->get(s);
+ bool global_var=false;
+ if (path.begins_with("*")) {
+ global_var=true;
+ path=path.substr(1,path.length()-1);
+ }
- ERR_EXPLAIN("Path in autoload not a node or script: "+path);
- ERR_CONTINUE(!n);
- n->set_name(name);
+ RES res = ResourceLoader::load(path);
+ ERR_EXPLAIN("Can't autoload: "+path);
+ ERR_CONTINUE(res.is_null());
+ Node *n=NULL;
+ if (res->is_type("PackedScene")) {
+ Ref<PackedScene> ps = res;
+ n=ps->instance();
+ } else if (res->is_type("Script")) {
+ Ref<Script> s = res;
+ StringName ibt = s->get_instance_base_type();
+ bool valid_type = ObjectTypeDB::is_type(ibt,"Node");
+ ERR_EXPLAIN("Script does not inherit a Node: "+path);
+ ERR_CONTINUE( !valid_type );
- //defer so references are all valid on _ready()
- //sml->get_root()->add_child(n);
- to_add.push_back(n);
+ Object *obj = ObjectTypeDB::instance(ibt);
- if (global_var) {
- for(int i=0;i<ScriptServer::get_language_count();i++) {
- ScriptServer::get_language(i)->add_global_constant(name,n);
- }
- }
+ ERR_EXPLAIN("Cannot instance script for autoload, expected 'Node' inheritance, got: "+String(ibt));
+ ERR_CONTINUE( obj==NULL );
+ n = obj->cast_to<Node>();
+ n->set_script(s.get_ref_ptr());
}
- for(List<Node*>::Element *E=to_add.front();E;E=E->next()) {
+ ERR_EXPLAIN("Path in autoload not a node or script: "+path);
+ ERR_CONTINUE(!n);
+ n->set_name(name);
- sml->get_root()->add_child(E->get());
+ //defer so references are all valid on _ready()
+ //sml->get_root()->add_child(n);
+ to_add.push_back(n);
+
+ if (global_var) {
+ for(int i=0;i<ScriptServer::get_language_count();i++) {
+ ScriptServer::get_language(i)->add_global_constant(name,n);
+ }
}
+ }
+ for(List<Node*>::Element *E=to_add.front();E;E=E->next()) {
+ sml->get_root()->add_child(E->get());
}
+ //singletons
+ }
+ if (game_path!="") {
Node *scene=NULL;
Ref<PackedScene> scenedata = ResourceLoader::load(local_game_path);
if (scenedata.is_valid())
@@ -1471,12 +1478,7 @@ bool Main::start() {
if (icon.load(iconpath)==OK)
OS::get_singleton()->set_icon(icon);
}
-
-
- //singletons
-#ifdef TOOLS_ENABLED
}
-#endif
}
#ifdef TOOLS_ENABLED
generated by cgit v1.2.3-70-g09d2 (git 2.52.0) at 2026-01-03 09:28:19 +0000