From 15bfb3f6a9b4fa2b44adbd9a67a4670fcf567b7a Mon Sep 17 00:00:00 2001 From: Estrela Allan p1923381 Date: Sat, 28 Mar 2020 12:53:53 +0100 Subject: [PATCH] Mouvement de notre joueur (tj probleme de saut) --- DungeonAndDeamon/.export/dugeonanddemon.pck | Bin 1434816 -> 1434832 bytes DungeonAndDeamon/script/Node2D.tscn | 39 +++++++++--------- DungeonAndDeamon/script/Player.gdns | 4 +- .../DungeonAndDemaonScript/GestionCollision.h | 2 +- .../DungeonAndDemaonScript/GestionJeu.h | 2 +- .../DungeonAndDemaonScript/GestionPlayer.cpp | 22 +++++----- .../DungeonAndDemaonScript/GestionPlayer.h | 18 ++++---- .../DungeonAndDemaonScript/GodotLibrary.cpp | 4 +- 8 files changed, 44 insertions(+), 47 deletions(-) diff --git a/DungeonAndDeamon/.export/dugeonanddemon.pck b/DungeonAndDeamon/.export/dugeonanddemon.pck index f2e3f41e2ea2f9cf4320b3c4595550e8c4a2efcf..a9a86a4071f1e786ee703f4013172ac7600699aa 100644 GIT binary patch delta 300 zcmX?bGW^2H@C{F*7!4*rjq(XIu8CG*TrhcIv^C>~=DX4DccU4BmGO!7H_{+3{MsHSgrdl^XvVSYob*cCrn-#ZOyo#`EGRk-DpN2W&&bnAZ7t#Rv=~rVs;?r0Afxc z<^p1FAm#yLULfWJVtybN0AfKP76M{nAQstvH(KD9*m5p+u7aUfCq7&cwj5eNL08NfH1oa&N5w diff --git a/DungeonAndDeamon/script/Node2D.tscn b/DungeonAndDeamon/script/Node2D.tscn index 23e80ad..570ba0b 100644 --- a/DungeonAndDeamon/script/Node2D.tscn +++ b/DungeonAndDeamon/script/Node2D.tscn @@ -96,19 +96,14 @@ animations = [ { "name": "degat", "speed": 5.0 }, { -"frames": [ ExtResource( 45 ), ExtResource( 41 ), ExtResource( 42 ), ExtResource( 63 ), ExtResource( 58 ), ExtResource( 59 ), ExtResource( 40 ), ExtResource( 55 ), ExtResource( 36 ) ], +"frames": [ ExtResource( 37 ), ExtResource( 60 ), ExtResource( 61 ), ExtResource( 50 ), ExtResource( 38 ), ExtResource( 33 ), ExtResource( 39 ) ], "loop": true, -"name": "attack02", +"name": "jump", "speed": 5.0 }, { -"frames": [ ExtResource( 13 ), ExtResource( 16 ), ExtResource( 17 ), ExtResource( 14 ), ExtResource( 12 ), ExtResource( 15 ), ExtResource( 21 ), ExtResource( 18 ), ExtResource( 20 ), ExtResource( 19 ) ], +"frames": [ ExtResource( 56 ), ExtResource( 48 ), ExtResource( 44 ), ExtResource( 34 ), ExtResource( 54 ), ExtResource( 35 ), ExtResource( 49 ), ExtResource( 46 ), ExtResource( 47 ) ], "loop": true, -"name": "run", -"speed": 5.0 -}, { -"frames": [ ExtResource( 71 ), ExtResource( 66 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 74 ), ExtResource( 77 ), ExtResource( 80 ), ExtResource( 79 ), ExtResource( 75 ) ], -"loop": true, -"name": "roulade", +"name": "mort", "speed": 5.0 }, { "frames": [ ExtResource( 65 ), ExtResource( 81 ), ExtResource( 76 ), ExtResource( 70 ), ExtResource( 68 ) ], @@ -121,24 +116,29 @@ animations = [ { "name": "attack01", "speed": 5.0 }, { +"frames": [ ExtResource( 57 ), ExtResource( 52 ), ExtResource( 69 ), ExtResource( 64 ), ExtResource( 78 ), ExtResource( 73 ), ExtResource( 65 ) ], +"loop": true, +"name": "shield", +"speed": 5.0 +}, { +"frames": [ ExtResource( 71 ), ExtResource( 66 ), ExtResource( 67 ), ExtResource( 72 ), ExtResource( 74 ), ExtResource( 77 ), ExtResource( 80 ), ExtResource( 79 ), ExtResource( 75 ) ], +"loop": true, +"name": "roulade", +"speed": 5.0 +}, { "frames": [ ExtResource( 33 ), ExtResource( 38 ), ExtResource( 33 ), ExtResource( 39 ), ExtResource( 38 ), ExtResource( 50 ) ], "loop": true, "name": "fall", "speed": 5.0 }, { -"frames": [ ExtResource( 56 ), ExtResource( 48 ), ExtResource( 44 ), ExtResource( 34 ), ExtResource( 54 ), ExtResource( 35 ), ExtResource( 49 ), ExtResource( 46 ), ExtResource( 47 ) ], +"frames": [ ExtResource( 45 ), ExtResource( 41 ), ExtResource( 42 ), ExtResource( 63 ), ExtResource( 58 ), ExtResource( 59 ), ExtResource( 40 ), ExtResource( 55 ), ExtResource( 36 ) ], "loop": true, -"name": "mort", +"name": "attack02", "speed": 5.0 }, { -"frames": [ ExtResource( 37 ), ExtResource( 60 ), ExtResource( 61 ), ExtResource( 50 ), ExtResource( 38 ), ExtResource( 33 ), ExtResource( 39 ) ], +"frames": [ ExtResource( 13 ), ExtResource( 16 ), ExtResource( 17 ), ExtResource( 14 ), ExtResource( 12 ), ExtResource( 15 ), ExtResource( 21 ), ExtResource( 18 ), ExtResource( 20 ), ExtResource( 19 ) ], "loop": true, -"name": "jump", -"speed": 5.0 -}, { -"frames": [ ExtResource( 57 ), ExtResource( 52 ), ExtResource( 69 ), ExtResource( 64 ), ExtResource( 78 ), ExtResource( 73 ), ExtResource( 65 ) ], -"loop": true, -"name": "shield", +"name": "run", "speed": 5.0 } ] @@ -160,7 +160,7 @@ position = Vector2( 1.91107, 18.2282 ) texture = ExtResource( 1 ) [node name="Player" type="KinematicBody2D" parent="."] -position = Vector2( 382.61, 374.846 ) +position = Vector2( 499.61, 264.846 ) script = ExtResource( 3 ) __meta__ = { "_edit_group_": true @@ -173,7 +173,6 @@ shape = SubResource( 1 ) [node name="AnimatedSprite" type="AnimatedSprite" parent="Player"] frames = SubResource( 2 ) animation = "fall" -frame = 5 playing = true [node name="TileMap" type="TileMap" parent="."] diff --git a/DungeonAndDeamon/script/Player.gdns b/DungeonAndDeamon/script/Player.gdns index 65242c0..6ece999 100644 --- a/DungeonAndDeamon/script/Player.gdns +++ b/DungeonAndDeamon/script/Player.gdns @@ -1,10 +1,10 @@ [gd_resource type="NativeScript" load_steps=2 format=2] [sub_resource type="GDNativeLibrary" id=1] -entry/Windows.64 = "res://Dungeonanddemon.dll" +entry/Windows.64 = "res://.script/DungeonAndDeamonScript.dll" dependency/Windows.64 = [ ] [resource] resource_name = "Player" -class_name = "Player" +class_name = "GestionPlayer" library = SubResource( 1 ) diff --git a/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionCollision.h b/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionCollision.h index 62c10a4..43ca107 100644 --- a/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionCollision.h +++ b/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionCollision.h @@ -10,7 +10,7 @@ class GestionCollision public : GestionTerrain gTerrain; GestionMobs gMobs; - GestionPlayer gPlayer; + public: std::vector CheckCollisonSol(); diff --git a/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.h b/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.h index 5780a0d..8259eba 100644 --- a/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.h +++ b/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionJeu.h @@ -9,7 +9,7 @@ class GestionJeu { public: - GestionPlayer gPlayer; + GestionMobs gMobs; GestionTerrain gTerrain; GestionCollision gCollision; diff --git a/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionPlayer.cpp b/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionPlayer.cpp index 5f78612..37bf070 100644 --- a/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionPlayer.cpp +++ b/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionPlayer.cpp @@ -1,24 +1,26 @@ #include "GestionPlayer.h" +#include +#include + -#include "GestionPlayer.h" using namespace godot; -void Player::_register_methods() { - register_method((char*)"_process", &Player::_process); +void GestionPlayer::_register_methods() { + register_method((char*)"_process", &GestionPlayer::_process); } -void Player::_init() {} +void GestionPlayer::_init() {} -Player::Player() { +GestionPlayer::GestionPlayer() { velocity = Vector2(0, 0); } -Player::~Player() {} +GestionPlayer::~GestionPlayer() {} -void Player::_process(float delta) +void GestionPlayer::_process(float delta) { UpdateMotionFromInput(); @@ -26,7 +28,7 @@ void Player::_process(float delta) velocity = move_and_slide(velocity, FLOOR); } -void Player::UpdateMotionFromInput() +void GestionPlayer::UpdateMotionFromInput() { velocity = Vector2(0, 0); FLOOR = Vector2(0, -1); @@ -36,11 +38,7 @@ void Player::UpdateMotionFromInput() if (i->is_action_pressed("ui_left")) { - velocity.x -= speed; - void play(String anim = "run", bool backwards = false); - - } diff --git a/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionPlayer.h b/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionPlayer.h index 20cda05..05bf1e2 100644 --- a/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionPlayer.h +++ b/DungeonAndDeamonScript/DungeonAndDemaonScript/GestionPlayer.h @@ -1,5 +1,4 @@ -#pragma once -#include "Player.h" + #pragma once @@ -8,19 +7,19 @@ #include namespace godot { - class Player : public KinematicBody2D + class GestionPlayer : public KinematicBody2D { // Godot structure private: - GODOT_CLASS(Player, KinematicBody2D) + GODOT_CLASS(GestionPlayer, KinematicBody2D) public: static void _register_methods(); void _init(); void _process(float delta); - Player(); - ~Player(); + GestionPlayer(); + ~GestionPlayer(); // Gameplay variables @@ -34,12 +33,14 @@ namespace godot { bool left; bool jump; - private: Vector2 velocity; Vector2 FLOOR; + + + // Gameplay methods public: @@ -54,6 +55,5 @@ namespace godot { } -attack(); -}; + diff --git a/DungeonAndDeamonScript/DungeonAndDemaonScript/GodotLibrary.cpp b/DungeonAndDeamonScript/DungeonAndDemaonScript/GodotLibrary.cpp index 9feb3c6..5b11e2b 100644 --- a/DungeonAndDeamonScript/DungeonAndDemaonScript/GodotLibrary.cpp +++ b/DungeonAndDeamonScript/DungeonAndDemaonScript/GodotLibrary.cpp @@ -1,4 +1,4 @@ -#include "Player.h" +#include "GestionPlayer.h" using namespace godot; @@ -12,5 +12,5 @@ extern "C" void GDN_EXPORT godot_gdnative_terminate(godot_gdnative_terminate_opt extern "C" void GDN_EXPORT godot_nativescript_init(void* handle) { Godot::nativescript_init(handle); - register_class(); + register_class(); } \ No newline at end of file