still wip
This commit is contained in:
3
Makefile
3
Makefile
@@ -4,7 +4,8 @@ SRC=src/main.c \
|
|||||||
src/world.c \
|
src/world.c \
|
||||||
src/player.c \
|
src/player.c \
|
||||||
src/physics.c \
|
src/physics.c \
|
||||||
src/render.c
|
src/render.c \
|
||||||
|
src/collision.c\
|
||||||
|
|
||||||
OUT=wrldbox
|
OUT=wrldbox
|
||||||
|
|
||||||
|
|||||||
@@ -4,5 +4,36 @@
|
|||||||
#include "collision.h"
|
#include "collision.h"
|
||||||
|
|
||||||
void checkCollision(){
|
void checkCollision(){
|
||||||
for(int i; s)
|
float playerx=0.0;
|
||||||
|
float playery=0.0;
|
||||||
|
float plrsize=0.0;
|
||||||
|
for (int i = 0; i < MAX_ENTITIES; i++){
|
||||||
|
Entity *e = &entities[i];
|
||||||
|
|
||||||
|
if (!e->active)
|
||||||
|
continue;
|
||||||
|
if(e->isPlayer == false){
|
||||||
|
float objposx=e->position.x;
|
||||||
|
//float objposy=e->position.y;
|
||||||
|
float objsize=e->size;
|
||||||
|
|
||||||
|
if(playerx-(plrsize/2)<objposx+(objsize/2) && playerx-(plrsize/2)>objposx-(objsize/2)){
|
||||||
|
ApplyForce(
|
||||||
|
e,
|
||||||
|
(Vector2){1000, 1000}
|
||||||
|
);
|
||||||
|
ApplyForce(
|
||||||
|
player,
|
||||||
|
(Vector2){-1000, 1000}
|
||||||
|
);
|
||||||
|
}
|
||||||
|
}
|
||||||
|
else{
|
||||||
|
playerx=e->position.x;
|
||||||
|
playery=e->position.y;
|
||||||
|
if(playery==playery)
|
||||||
|
|
||||||
|
plrsize=e->size;
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|||||||
8
src/collision.h
Normal file
8
src/collision.h
Normal file
@@ -0,0 +1,8 @@
|
|||||||
|
#ifndef COLLISION_H
|
||||||
|
#define COLLISION_H
|
||||||
|
|
||||||
|
// FUNction declaration! yay!!!
|
||||||
|
// run by main.c constantly to allow player input.
|
||||||
|
void checkCollision();
|
||||||
|
|
||||||
|
#endif
|
||||||
@@ -78,6 +78,7 @@ int main(void)
|
|||||||
{
|
{
|
||||||
// allow player to be controlled, fit everything within the size of the screen
|
// allow player to be controlled, fit everything within the size of the screen
|
||||||
UpdatePlayerControls();
|
UpdatePlayerControls();
|
||||||
|
checkCollision();
|
||||||
UpdateEntities(dt, screenWidth);
|
UpdateEntities(dt, screenWidth);
|
||||||
|
|
||||||
simTime += dt;
|
simTime += dt;
|
||||||
|
|||||||
Reference in New Issue
Block a user