Skip to content
Toggle navigation
P
Projects
G
Groups
S
Snippets
Help
José Pardo Madera
/
ProjectoMultimeda2025
This project
Loading...
Sign in
Toggle navigation
Go to a project
Project
Repository
Issues
0
Merge Requests
0
Pipelines
Wiki
Snippets
Settings
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Commit
c90bd355
authored
Mar 06, 2025
by
Tecnicos
Browse files
Options
_('Browse Files')
Download
Email Patches
Plain Diff
Cambio en la localización de hitbox
parent
d114e67e
Hide whitespace changes
Inline
Side-by-side
Showing
3 changed files
with
11 additions
and
9 deletions
Objeto.cpp
Objeto.h
main.cpp
Objeto.cpp
View file @
c90bd355
...
@@ -7,16 +7,13 @@ Hitbox & Objeto::getHitbox(){
...
@@ -7,16 +7,13 @@ Hitbox & Objeto::getHitbox(){
void
Objeto
::
renderizar
(
SDL_Renderer
*
renderer
){
void
Objeto
::
renderizar
(
SDL_Renderer
*
renderer
){
switch
(
estado
){
switch
(
estado
){
normal
:
normal
:
//normal.renderizar(renderer, colision.getxSuperiorDer(), colision.getySuperiorDer(),
sprite_normal
.
renderizar
(
renderer
,
x
,
y
,
w
,
h
);
// colision.getxInferiorIzq()-colision.getxSuperiorDer(),colision.getyInferiorIzq()-colision.getySuperiorDer());
break
;
break
;
overworld
:
overworld
:
//overworld.renderizar(renderer, colision.getxSuperiorDer(), colision.getySuperiorDer(),
sprite_overworld
.
renderizar
(
renderer
,
x
,
y
,
w
,
h
);
// colision.getxInferiorIzq()-colision.getxSuperiorDer(),colision.getyInferiorIzq()-colision.getySuperiorDer());
break
;
break
;
overworld_highlight
:
overworld_highlight
:
//overworld_highlight.renderizar(renderer, colision.getxSuperiorDer(), colision.getySuperiorDer(),
sprite_overworld_highlight
.
renderizar
(
renderer
,
x
,
y
,
w
,
h
);
// colision.getxInferiorIzq()-colision.getxSuperiorDer(),colision.getyInferiorIzq()-colision.getySuperiorDer());
break
;
break
;
}
}
}
}
Objeto.h
View file @
c90bd355
...
@@ -15,12 +15,17 @@ class Objeto {
...
@@ -15,12 +15,17 @@ class Objeto {
Sprite
sprite_overworld_highlight
;
Sprite
sprite_overworld_highlight
;
Hitbox
colision
;
Hitbox
colision
;
State
estado
=
normal
;
State
estado
=
normal
;
int
x
;
int
y
;
int
w
;
int
h
;
public
:
public
:
Hitbox
&
getHitbox
();
Hitbox
&
getHitbox
();
Objeto
(
Sprite
sprite_normal_
,
Sprite
sprite_overworld_
,
Sprite
sprite_overworld_highlight_
,
Hitbox
colision_
)
:
sprite_normal
(
sprite_normal_
),
sprite_overworld
(
sprite_overworld_
),
Objeto
(
Sprite
sprite_normal_
,
Sprite
sprite_overworld_
,
Sprite
sprite_overworld_highlight_
,
Hitbox
colision_
,
int
_x
,
int
_y
,
int
_w
,
int
_h
)
:
sprite_overworld_highlight
(
sprite_overworld_highlight_
),
colision
(
colision_
){}
sprite_normal
(
sprite_normal_
),
sprite_overworld
(
sprite_overworld_
),
sprite_overworld_highlight
(
sprite_overworld_highlight_
),
colision
(
colision_
),
x
(
_x
),
y
(
_y
),
w
(
_w
),
h
(
_h
){}
void
renderizar
(
SDL_Renderer
*
renderer
);
void
renderizar
(
SDL_Renderer
*
renderer
);
};
};
main.cpp
View file @
c90bd355
...
@@ -72,7 +72,7 @@ int main(){
...
@@ -72,7 +72,7 @@ int main(){
Sprite
Fondo1
(
"assets/fondoHabitacion.jpg"
);
Sprite
Fondo1
(
"assets/fondoHabitacion.jpg"
);
Sprite
sprPlanta
(
"assets/planta.png"
);
Sprite
sprPlanta
(
"assets/planta.png"
);
Hitbox
hitPlanta
(
10
,
50
,
110
,
100
);
Hitbox
hitPlanta
(
10
,
50
,
110
,
100
);
Objeto
Planta
(
sprPlanta
,
sprPlanta
,
sprPlanta
,
hitPlanta
);
Objeto
Planta
(
sprPlanta
,
sprPlanta
,
sprPlanta
,
hitPlanta
,
10
,
50
,
100
,
50
);
objetos
.
push_back
(
&
Planta
);
objetos
.
push_back
(
&
Planta
);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment