Update kinematic_character demo

This commit is contained in:
lupoDharkael
2018-12-01 16:16:48 +01:00
parent 9f333600b6
commit e842557980
25 changed files with 587 additions and 136 deletions

View File

@@ -0,0 +1,31 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/playerRed_fall.png-301bfd41d778b32114baf3c9c50ff2be.stex"
[deps]
source_file="res://Player Red/playerRed_fall.png"
dest_files=[ "res://.import/playerRed_fall.png-301bfd41d778b32114baf3c9c50ff2be.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

View File

@@ -0,0 +1,31 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/playerRed_stand.png-af591b973e2c87f6a38b4a41e4833941.stex"
[deps]
source_file="res://Player Red/playerRed_stand.png"
dest_files=[ "res://.import/playerRed_stand.png-af591b973e2c87f6a38b4a41e4833941.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

View File

@@ -0,0 +1,31 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/playerRed_up1.png-f260a896e5f77f9f0845c53613477c85.stex"
[deps]
source_file="res://Player Red/playerRed_up1.png"
dest_files=[ "res://.import/playerRed_up1.png-f260a896e5f77f9f0845c53613477c85.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

View File

@@ -0,0 +1,31 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/playerRed_up2.png-87399f0c9fe53fc55fe801604850254a.stex"
[deps]
source_file="res://Player Red/playerRed_up2.png"
dest_files=[ "res://.import/playerRed_up2.png-87399f0c9fe53fc55fe801604850254a.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

View File

@@ -0,0 +1,31 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/playerRed_up3.png-95b2956869d268a117ea111914f90220.stex"
[deps]
source_file="res://Player Red/playerRed_up3.png"
dest_files=[ "res://.import/playerRed_up3.png-95b2956869d268a117ea111914f90220.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

View File

@@ -0,0 +1,31 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/playerRed_walk1.png-ade6ae6ec480d525ec4bd65536c4f3dc.stex"
[deps]
source_file="res://Player Red/playerRed_walk1.png"
dest_files=[ "res://.import/playerRed_walk1.png-ade6ae6ec480d525ec4bd65536c4f3dc.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

View File

@@ -0,0 +1,31 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/playerRed_walk2.png-dee2c8490b7429a8491012a77edabca6.stex"
[deps]
source_file="res://Player Red/playerRed_walk2.png"
dest_files=[ "res://.import/playerRed_walk2.png-dee2c8490b7429a8491012a77edabca6.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

View File

@@ -0,0 +1,31 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/playerRed_walk3.png-1bd3d8c9ff5f381422a5ef2523fe18dc.stex"
[deps]
source_file="res://Player Red/playerRed_walk3.png"
dest_files=[ "res://.import/playerRed_walk3.png-1bd3d8c9ff5f381422a5ef2523fe18dc.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

View File

@@ -0,0 +1,31 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/playerRed_walk4.png-6009a111ffdcb8be52e3e006cb9940b3.stex"
[deps]
source_file="res://Player Red/playerRed_walk4.png"
dest_files=[ "res://.import/playerRed_walk4.png-6009a111ffdcb8be52e3e006cb9940b3.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

View File

@@ -0,0 +1,31 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/playerRed_walk5.png-23e13d3afa791a065240513219f17404.stex"
[deps]
source_file="res://Player Red/playerRed_walk5.png"
dest_files=[ "res://.import/playerRed_walk5.png-23e13d3afa791a065240513219f17404.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

View File

@@ -1,3 +1,2 @@
all:
scons cpp_bindings=../../../../godot-cpp/ headers=../../../../godot_headers/
scons cpp_bindings="../../../godot-cpp/" headers="../../../godot-cpp/godot_headers/"

View File

@@ -11,8 +11,8 @@ env = Environment()
if platform == "windows":
env = Environment(ENV = os.environ)
godot_headers_path = ARGUMENTS.get("headers", os.getenv("GODOT_HEADERS", "godot_headers"))
godot_bindings_path = ARGUMENTS.get("cpp_bindings", os.getenv("CPP_BINDINGS", "cpp_bindings"))
godot_headers_path = ARGUMENTS.get("headers", os.getenv("GODOT_HEADERS", "godot-cpp/godot_headers"))
godot_bindings_path = ARGUMENTS.get("cpp_bindings", os.getenv("CPP_BINDINGS", "godot-cpp"))
# default to debug build, must be same setting as used for cpp_bindings
target = ARGUMENTS.get("target", "debug")
@@ -41,9 +41,12 @@ def add_sources(sources, dir):
if f.endswith(".cpp"):
sources.append(dir + "/" + f)
env.Append(CPPPATH=[godot_headers_path, godot_bindings_path + '/include/', godot_bindings_path + '/include/core/', 'src' ])
env.Append(CPPPATH=[godot_headers_path, godot_bindings_path + '/include/gen/', godot_bindings_path + '/include/core/', godot_bindings_path + '/include/'])
env.Append(LIBS=['godot_cpp_bindings'])
if target == "debug":
env.Append(LIBS=['libgodot-cpp.linux.debug.64'])
else:
env.Append(LIBS=['libgodot-cpp.linux.release.64'])
env.Append(LIBPATH=[ godot_bindings_path + '/bin/' ])
sources = []

View File

@@ -14,7 +14,7 @@
* limitations under the License.
**/
#include <colworld.h>
#include "colworld.h"
#include <Label.hpp>
using namespace godot;
@@ -29,18 +29,18 @@ void ColWorld::_init() {
}
void ColWorld::_ready() {
owner->get_node("princess")->connect("body_entered", owner, "_on_princess_body_enter");
get_node("princess")->connect("body_entered", this, "_on_princess_body_enter");
}
void ColWorld::_on_princess_body_enter(KinematicBody2D *body) {
if (body->get_name() == "Character") {
((Label *)owner->get_node("youwin"))->show();
((Label *)get_node("youwin"))->show();
}
}
void ColWorld::_register_methods() {
register_method((char *)"_init", &ColWorld::_init);
register_method((char *)"_ready", &ColWorld::_ready);
register_method("_init", &ColWorld::_init);
register_method("_ready", &ColWorld::_ready);
register_method((char *)"_on_princess_body_enter", &ColWorld::_on_princess_body_enter);
register_method("_on_princess_body_enter", &ColWorld::_on_princess_body_enter);
}

View File

@@ -23,8 +23,8 @@
namespace godot {
class ColWorld : public GodotScript<Node2D> {
GODOT_CLASS(ColWorld)
class ColWorld : public Node2D {
GODOT_CLASS(ColWorld, Node2D)
public:
ColWorld();

View File

@@ -16,8 +16,8 @@
#include <Godot.hpp>
#include <colworld.h>
#include <player.h>
#include "colworld.h"
#include "player.h"
using namespace godot;

View File

@@ -14,13 +14,13 @@
* limitations under the License.
**/
#include <player.h>
#include "player.h"
#include "colworld.h"
#include <AnimatedSprite.hpp>
#include <Input.hpp>
#include <cmath>
#include <colworld.h>
#include <ClassDB.hpp>
using namespace godot;
@@ -58,13 +58,13 @@ void GDPlayer::_init() {
}
void GDPlayer::_ready() {
ray0 = ((RayCast2D *)owner->get_node("Ray0"));
ray1 = ((RayCast2D *)owner->get_node("Ray1"));
ray0 = ((RayCast2D *)get_node("Ray0"));
ray1 = ((RayCast2D *)get_node("Ray1"));
ray0->add_exception(owner);
ray1->add_exception(owner);
ray0->add_exception(this);
ray1->add_exception(this);
owner->connect("move", owner, "_move");
connect("move", this, "_move");
}
void GDPlayer::moving() {
@@ -74,9 +74,9 @@ void GDPlayer::moving() {
void GDPlayer::_physics_process(const float delta) {
Vector2 _force = Vector2(0, _gravity);
bool left = Input::is_action_pressed("ui_left");
bool right = Input::is_action_pressed("ui_right");
bool jump = Input::is_action_pressed("ui_up");
bool left = Input::get_singleton()->is_action_pressed("ui_left");
bool right = Input::get_singleton()->is_action_pressed("ui_right");
bool jump = Input::get_singleton()->is_action_pressed("ui_up");
bool stop = true;
@@ -108,18 +108,18 @@ void GDPlayer::_physics_process(const float delta) {
// Integrate forces to velocity
_velocity += _force * delta;
// Integrate velocity into motion and move
_velocity = owner->move_and_slide(_velocity, Vector2(0, -1));
_velocity = move_and_slide(_velocity, Vector2(0, -1));
bool floor_colliding = (ray0->is_colliding() || ray1->is_colliding());
if (owner->is_on_floor() || floor_colliding) {
if (is_on_floor() || floor_colliding) {
_on_air_time = 0;
}
if (_on_air_time < _max_airborn_time && jump && !_prev_jump_pressed && !_jumping) {
_velocity.y = -_jump_speed;
_jumping = false;
owner->emit_signal("move");
emit_signal("move");
}
_on_air_time += delta;
@@ -134,14 +134,14 @@ void GDPlayer::_physics_process(const float delta) {
bool animating = false;
if (left) {
((AnimatedSprite *)owner->get_node("AnimatedSprite"))->set_flip_h(true);
((AnimatedSprite *)get_node("AnimatedSprite"))->set_flip_h(true);
if (floor_colliding) {
_current_anim = "Run";
}
animating = true;
}
if (right) {
((AnimatedSprite *)owner->get_node("AnimatedSprite"))->set_flip_h(false);
((AnimatedSprite *)get_node("AnimatedSprite"))->set_flip_h(false);
if (floor_colliding) {
_current_anim = "Run";
}
@@ -159,7 +159,7 @@ void GDPlayer::_physics_process(const float delta) {
_current_anim = "Default";
}
((AnimatedSprite *)owner->get_node("AnimatedSprite"))->play(_current_anim);
((AnimatedSprite *)get_node("AnimatedSprite"))->play(_current_anim);
}
void GDPlayer::_register_methods() {

View File

@@ -25,8 +25,8 @@
using namespace godot;
class GDPlayer : public GodotScript<KinematicBody2D> {
GODOT_CLASS(GDPlayer)
class GDPlayer : public KinematicBody2D {
GODOT_CLASS(GDPlayer, KinematicBody2D)
public:
GDPlayer();

View File

@@ -0,0 +1,31 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/circle.png-10953cad44a8947fbdd4128a631e9e52.stex"
[deps]
source_file="res://circle.png"
dest_files=[ "res://.import/circle.png-10953cad44a8947fbdd4128a631e9e52.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

File diff suppressed because one or more lines are too long

View File

@@ -0,0 +1,31 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex"
[deps]
source_file="res://icon.png"
dest_files=[ "res://.import/icon.png-487276ed1e3a0c39cad0279d744ee560.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

View File

@@ -0,0 +1,31 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/long_obstacle.png-1b33440a15b4db156b2a9ec7e9a2a80e.stex"
[deps]
source_file="res://long_obstacle.png"
dest_files=[ "res://.import/long_obstacle.png-1b33440a15b4db156b2a9ec7e9a2a80e.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

View File

@@ -0,0 +1,31 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/obstacle.png-dfb3e99d3af573251007cdf5e1c252b9.stex"
[deps]
source_file="res://obstacle.png"
dest_files=[ "res://.import/obstacle.png-dfb3e99d3af573251007cdf5e1c252b9.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

View File

@@ -0,0 +1,31 @@
[remap]
importer="texture"
type="StreamTexture"
path="res://.import/princess.png-9b4caf2cfe324ae3734249d5b559d39d.stex"
[deps]
source_file="res://princess.png"
dest_files=[ "res://.import/princess.png-9b4caf2cfe324ae3734249d5b559d39d.stex" ]
[params]
compress/mode=0
compress/lossy_quality=0.7
compress/hdr_mode=0
compress/bptc_ldr=0
compress/normal_map=0
flags/repeat=0
flags/filter=true
flags/mipmaps=false
flags/anisotropic=false
flags/srgb=2
process/fix_alpha_border=true
process/premult_alpha=false
process/HDR_as_SRGB=false
process/invert_color=false
stream=false
size_limit=0
detect_3d=true
svg/scale=1.0

View File

@@ -6,7 +6,12 @@
; [section] ; section goes between []
; param=value ; assign values to parameters
config_version=3
config_version=4
_global_script_classes=[ ]
_global_script_class_icons={
}
[application]
@@ -32,16 +37,31 @@ singletons=[ ]
[input]
jump=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null)
jump={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":32,"unicode":0,"echo":false,"script":null)
]
move_bottom=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null)
}
move_bottom={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777234,"unicode":0,"echo":false,"script":null)
]
move_left=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null)
}
move_left={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777231,"unicode":0,"echo":false,"script":null)
]
move_right=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null)
}
move_right={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777233,"unicode":0,"echo":false,"script":null)
]
move_up=[ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null)
}
move_up={
"deadzone": 0.5,
"events": [ Object(InputEventKey,"resource_local_to_scene":false,"resource_name":"","device":0,"alt":false,"shift":false,"control":false,"meta":false,"command":false,"pressed":false,"scancode":16777232,"unicode":0,"echo":false,"script":null)
]
}
[memory]