Merge branch 'features/character-movement'
This is for my sanity
This commit is contained in:
BIN
raw/mrsh.ase
Normal file
BIN
raw/mrsh.ase
Normal file
Binary file not shown.
24
raw/mrsh.json
Normal file
24
raw/mrsh.json
Normal file
@@ -0,0 +1,24 @@
|
||||
{ "frames": {
|
||||
"mrsh.ase": {
|
||||
"frame": { "x": 0, "y": 0, "w": 16, "h": 16 },
|
||||
"rotated": false,
|
||||
"trimmed": false,
|
||||
"spriteSourceSize": { "x": 0, "y": 0, "w": 16, "h": 16 },
|
||||
"sourceSize": { "w": 16, "h": 16 },
|
||||
"duration": 100
|
||||
}
|
||||
},
|
||||
"meta": {
|
||||
"app": "https://github.com/LibreSprite/LibreSprite/",
|
||||
"version": "1.2-973d0e3d-SDL",
|
||||
"image": "C:\\Code\\test-game\\raw\\mrsh.png",
|
||||
"format": "RGBA8888",
|
||||
"size": { "w": 16, "h": 16 },
|
||||
"scale": "1",
|
||||
"frameTags": [
|
||||
],
|
||||
"layers": [
|
||||
{ "name": "Layer 1", "opacity": 255, "blendMode": "normal" }
|
||||
]
|
||||
}
|
||||
}
|
||||
BIN
raw/mrsh.png
Normal file
BIN
raw/mrsh.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 206 B |
26
raylib.make
26
raylib.make
@@ -44,54 +44,54 @@ endef
|
||||
|
||||
ifeq ($(config),debug_x64)
|
||||
TARGETDIR = bin/Debug
|
||||
TARGET = $(TARGETDIR)/raylib.lib
|
||||
TARGET = $(TARGETDIR)/libraylib.a
|
||||
OBJDIR = obj/x64/Debug/raylib
|
||||
DEFINES += -DDEBUG -DPLATFORM_DESKTOP -DGRAPHICS_API_OPENGL_33
|
||||
DEFINES += -DDEBUG -DPLATFORM_DESKTOP -DGRAPHICS_API_OPENGL_33 -D_GLFW_X11
|
||||
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -g
|
||||
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -g
|
||||
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64
|
||||
|
||||
else ifeq ($(config),debug_x86)
|
||||
TARGETDIR = bin/Debug
|
||||
TARGET = $(TARGETDIR)/raylib.lib
|
||||
TARGET = $(TARGETDIR)/libraylib.a
|
||||
OBJDIR = obj/x86/Debug/raylib
|
||||
DEFINES += -DDEBUG -DPLATFORM_DESKTOP -DGRAPHICS_API_OPENGL_33
|
||||
DEFINES += -DDEBUG -DPLATFORM_DESKTOP -DGRAPHICS_API_OPENGL_33 -D_GLFW_X11
|
||||
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -g
|
||||
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -g
|
||||
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32
|
||||
|
||||
else ifeq ($(config),debug_arm64)
|
||||
TARGETDIR = bin/Debug
|
||||
TARGET = $(TARGETDIR)/raylib.lib
|
||||
TARGET = $(TARGETDIR)/libraylib.a
|
||||
OBJDIR = obj/ARM64/Debug/raylib
|
||||
DEFINES += -DDEBUG -DPLATFORM_DESKTOP -DGRAPHICS_API_OPENGL_33
|
||||
DEFINES += -DDEBUG -DPLATFORM_DESKTOP -DGRAPHICS_API_OPENGL_33 -D_GLFW_X11
|
||||
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -g
|
||||
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -g
|
||||
ALL_LDFLAGS += $(LDFLAGS)
|
||||
|
||||
else ifeq ($(config),release_x64)
|
||||
TARGETDIR = bin/Release
|
||||
TARGET = $(TARGETDIR)/raylib.lib
|
||||
TARGET = $(TARGETDIR)/libraylib.a
|
||||
OBJDIR = obj/x64/Release/raylib
|
||||
DEFINES += -DNDEBUG -DPLATFORM_DESKTOP -DGRAPHICS_API_OPENGL_33
|
||||
DEFINES += -DNDEBUG -DPLATFORM_DESKTOP -DGRAPHICS_API_OPENGL_33 -D_GLFW_X11
|
||||
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m64 -O2
|
||||
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m64 -O2
|
||||
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib64 -m64 -s
|
||||
|
||||
else ifeq ($(config),release_x86)
|
||||
TARGETDIR = bin/Release
|
||||
TARGET = $(TARGETDIR)/raylib.lib
|
||||
TARGET = $(TARGETDIR)/libraylib.a
|
||||
OBJDIR = obj/x86/Release/raylib
|
||||
DEFINES += -DNDEBUG -DPLATFORM_DESKTOP -DGRAPHICS_API_OPENGL_33
|
||||
DEFINES += -DNDEBUG -DPLATFORM_DESKTOP -DGRAPHICS_API_OPENGL_33 -D_GLFW_X11
|
||||
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -m32 -O2
|
||||
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -m32 -O2
|
||||
ALL_LDFLAGS += $(LDFLAGS) -L/usr/lib32 -m32 -s
|
||||
|
||||
else ifeq ($(config),release_arm64)
|
||||
TARGETDIR = bin/Release
|
||||
TARGET = $(TARGETDIR)/raylib.lib
|
||||
TARGET = $(TARGETDIR)/libraylib.a
|
||||
OBJDIR = obj/ARM64/Release/raylib
|
||||
DEFINES += -DNDEBUG -DPLATFORM_DESKTOP -DGRAPHICS_API_OPENGL_33
|
||||
DEFINES += -DNDEBUG -DPLATFORM_DESKTOP -DGRAPHICS_API_OPENGL_33 -D_GLFW_X11
|
||||
ALL_CFLAGS += $(CFLAGS) $(ALL_CPPFLAGS) -O2
|
||||
ALL_CXXFLAGS += $(CXXFLAGS) $(ALL_CPPFLAGS) -O2
|
||||
ALL_LDFLAGS += $(LDFLAGS) -s
|
||||
@@ -159,7 +159,7 @@ ifeq (posix,$(SHELLTYPE))
|
||||
$(SILENT) rm -rf $(OBJDIR)
|
||||
else
|
||||
$(SILENT) if exist $(subst /,\\,$(TARGET)) del $(subst /,\\,$(TARGET))
|
||||
$(SILENT) $(foreach f,$(subst /,\\,$(GENERATED)),if exist $(f) del /s /q $(f) >nul &)
|
||||
$(SILENT) if exist $(subst /,\\,$(GENERATED)) del /s /q $(subst /,\\,$(GENERATED))
|
||||
$(SILENT) if exist $(subst /,\\,$(OBJDIR)) rmdir /s /q $(subst /,\\,$(OBJDIR))
|
||||
endif
|
||||
|
||||
|
||||
BIN
resources/mrsh.png
Normal file
BIN
resources/mrsh.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 206 B |
91
src/main.c
91
src/main.c
@@ -12,6 +12,17 @@ by Jeffery Myers is marked with CC0 1.0. To view a copy of this license, visit h
|
||||
#include "resource_dir.h" // utility header for SearchAndSetResourceDir
|
||||
#include <stdlib.h>
|
||||
|
||||
typedef struct Player {
|
||||
Vector2 position;
|
||||
Vector2 size;
|
||||
int life;
|
||||
} Player;
|
||||
|
||||
static Player player = {0};
|
||||
|
||||
static void characterMovement(void);
|
||||
|
||||
|
||||
int main ()
|
||||
{
|
||||
// Tell the window to use vsync and work on high DPI displays
|
||||
@@ -24,21 +35,13 @@ int main ()
|
||||
SearchAndSetResourceDir("resources");
|
||||
|
||||
// Load a texture from the resources directory
|
||||
Image image = LoadImage("emi.png");
|
||||
Image image = LoadImage("mrsh.png");
|
||||
Texture2D emi = LoadTextureFromImage(image);
|
||||
UnloadImage(image);
|
||||
|
||||
int HorizontalPosition = 400;
|
||||
int VerticalPosition = 300;
|
||||
|
||||
int point = 0;
|
||||
|
||||
//Start point of the colectible
|
||||
|
||||
int positionXCollectible = GetRandomValue(0, 600);
|
||||
int positionYCollectible = GetRandomValue(0, 800);
|
||||
|
||||
|
||||
// game loop
|
||||
while (!WindowShouldClose()) // run the loop until the user presses ESCAPE or presses the Close button on the window
|
||||
{
|
||||
@@ -48,52 +51,12 @@ int main ()
|
||||
// Setup the back buffer for drawing (clear color and depth buffers)
|
||||
ClearBackground(BLACK);
|
||||
|
||||
DrawRectangle(HorizontalPosition, VerticalPosition, 10, 10, BLUE);
|
||||
// DrawRectangle(HorizontalPosition, VerticalPosition, 10, 10, BLUE);
|
||||
DrawTexture(emi, player.position.x, player.position.y, WHITE);
|
||||
|
||||
DrawCircle(positionXCollectible, positionYCollectible, 10, YELLOW);
|
||||
|
||||
//draw score
|
||||
DrawText(TextFormat("score : %d", point), 500,50,20,PINK);
|
||||
characterMovement();
|
||||
|
||||
|
||||
if(point >= 10){
|
||||
DrawText("Emi la plus belle", 50,50,20,PINK);
|
||||
if (IsKeyDown(74) ) {
|
||||
point=0;
|
||||
};
|
||||
}else{
|
||||
|
||||
//up
|
||||
if (IsKeyDown(74) && VerticalPosition != 580 ) {
|
||||
// draw some text using the default font
|
||||
VerticalPosition = VerticalPosition+10;
|
||||
};
|
||||
//down
|
||||
if (IsKeyDown(75) && VerticalPosition != 0) {
|
||||
VerticalPosition = VerticalPosition-10;
|
||||
// draw some text using the default font
|
||||
};
|
||||
//left
|
||||
if (IsKeyDown(72) && HorizontalPosition != 0) {
|
||||
HorizontalPosition = HorizontalPosition-10;
|
||||
// draw some text using the default font
|
||||
};
|
||||
//right
|
||||
if (IsKeyDown(76)&& HorizontalPosition != 780) {
|
||||
HorizontalPosition = HorizontalPosition+10;
|
||||
// draw some text using the default font
|
||||
};
|
||||
|
||||
}
|
||||
|
||||
if (abs(positionXCollectible - HorizontalPosition) < 10 &&
|
||||
abs(positionYCollectible - VerticalPosition) < 10){
|
||||
positionXCollectible = GetRandomValue(0, 800);
|
||||
positionYCollectible = GetRandomValue(0, 600);
|
||||
point = point + 1;
|
||||
}
|
||||
|
||||
// end the frame and get ready for the next one (display frame, poll input, etc...)
|
||||
EndDrawing();
|
||||
}
|
||||
|
||||
@@ -105,3 +68,27 @@ int main ()
|
||||
CloseWindow();
|
||||
return 0;
|
||||
}
|
||||
void characterMovement(void){
|
||||
|
||||
//up
|
||||
if (IsKeyDown(74) ) {
|
||||
// draw some text using the default font
|
||||
player.position.y = player.position.y+10;
|
||||
};
|
||||
//down
|
||||
if (IsKeyDown(75) ) {
|
||||
player.position.y = player.position.y-10;
|
||||
// draw some text using the default font
|
||||
};
|
||||
//left
|
||||
if (IsKeyDown(72) ) {
|
||||
player.position.x = player.position.x-10;
|
||||
// draw some text using the default font
|
||||
};
|
||||
//right
|
||||
if (IsKeyDown(76)) {
|
||||
player.position.x = player.position.x+10;
|
||||
// draw some text using the default font
|
||||
};
|
||||
|
||||
}
|
||||
Reference in New Issue
Block a user