diff options
Diffstat (limited to 'main')
| -rw-r--r-- | main/SCsub | 8 | ||||
| -rw-r--r-- | main/input_default.cpp | 2 | ||||
| -rw-r--r-- | main/main.cpp | 4 | ||||
| -rw-r--r-- | main/tests/test_gui.cpp | 7 |
4 files changed, 9 insertions, 12 deletions
diff --git a/main/SCsub b/main/SCsub index 56dfbaa0f1..1675a6e6ab 100644 --- a/main/SCsub +++ b/main/SCsub @@ -47,11 +47,11 @@ env.add_source_files(env.main_sources, "*.cpp") Export('env') -env.Depends("#main/splash.h", "#main/splash.png") -env.Command("#main/splash.h", "#main/splash.png", make_splash) +env.Depends("#main/splash.gen.h", "#main/splash.png") +env.Command("#main/splash.gen.h", "#main/splash.png", make_splash) -env.Depends("#main/app_icon.h", "#main/app_icon.png") -env.Command("#main/app_icon.h", "#main/app_icon.png", make_app_icon) +env.Depends("#main/app_icon.gen.h", "#main/app_icon.png") +env.Command("#main/app_icon.gen.h", "#main/app_icon.png", make_app_icon) SConscript('tests/SCsub') diff --git a/main/input_default.cpp b/main/input_default.cpp index e488438059..bde1e84926 100644 --- a/main/input_default.cpp +++ b/main/input_default.cpp @@ -874,6 +874,8 @@ void InputDefault::joy_axis(int p_device, int p_axis, const JoyAxis &p_value) { _THREAD_SAFE_METHOD_; + ERR_FAIL_INDEX(p_axis, JOY_AXIS_MAX); + Joypad &joy = joy_names[p_device]; if (joy.last_axis[p_axis] == p_value.value) { diff --git a/main/main.cpp b/main/main.cpp index e00c136596..cd464de1aa 100644 --- a/main/main.cpp +++ b/main/main.cpp @@ -28,7 +28,7 @@ /* SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. */ /*************************************************************************/ #include "main.h" -#include "app_icon.h" +#include "app_icon.gen.h" #include "core/register_core_types.h" #include "drivers/register_driver_types.h" #include "global_config.h" @@ -39,7 +39,7 @@ #include "script_debugger_local.h" #include "script_debugger_remote.h" #include "servers/register_server_types.h" -#include "splash.h" +#include "splash.gen.h" #include "input_map.h" #include "io/resource_loader.h" diff --git a/main/tests/test_gui.cpp b/main/tests/test_gui.cpp index 3d0b96ae5b..291a557d04 100644 --- a/main/tests/test_gui.cpp +++ b/main/tests/test_gui.cpp @@ -53,7 +53,6 @@ #include "scene/main/scene_main_loop.h" #include "scene/3d/camera.h" -#include "scene/3d/test_cube.h" #include "scene/main/viewport.h" namespace TestGUI { @@ -87,10 +86,6 @@ public: vp->add_child(camera); camera->make_current(); - TestCube *testcube = memnew( TestCube ); - vp->add_child(testcube); - testcube->set_transform(Transform( Basis().rotated(Vector3(0,1,0),Math_PI*0.25), Vector3(0,0,-8))); - Sprite *sp = memnew( Sprite ); sp->set_texture( vp->get_render_target_texture() ); //sp->set_texture( ResourceLoader::load("res://ball.png") ); @@ -375,6 +370,6 @@ MainLoop *test() { return memnew(TestMainLoop); } -} +} // namespace TestGUI #endif |