Skip to content
GitLab
Explore
Sign in
Primary navigation
Search or go to…
Project
C
cpp-project
Manage
Activity
Members
Labels
Plan
Issues
Issue boards
Milestones
Wiki
Code
Merge requests
Repository
Branches
Commits
Tags
Repository graph
Compare revisions
Snippets
Build
Pipelines
Jobs
Pipeline schedules
Artifacts
Deploy
Releases
Package registry
Container registry
Model registry
Operate
Environments
Terraform modules
Monitor
Incidents
Service Desk
Analyze
Value stream analytics
Contributor analytics
CI/CD analytics
Repository analytics
Model experiments
Help
Help
Support
GitLab documentation
Compare GitLab plans
GitLab community forum
Contribute to GitLab
Provide feedback
Terms and privacy
Keyboard shortcuts
?
Snippets
Groups
Projects
Show more breadcrumbs
David Maul
cpp-project
Commits
a70e683d
Commit
a70e683d
authored
5 months ago
by
David Maul
Browse files
Options
Downloads
Patches
Plain Diff
fix tiles not rendering bug
parent
532fe773
Branches
Branches containing commit
No related tags found
1 merge request
!2
Basic spritesheet
Changes
5
Show whitespace changes
Inline
Side-by-side
Showing
5 changed files
src/engine.cpp
+3
-3
3 additions, 3 deletions
src/engine.cpp
src/engine.hpp
+3
-3
3 additions, 3 deletions
src/engine.hpp
src/level.cpp
+6
-6
6 additions, 6 deletions
src/level.cpp
src/spritesheet.cpp
+4
-15
4 additions, 15 deletions
src/spritesheet.cpp
src/spritesheet.hpp
+4
-0
4 additions, 0 deletions
src/spritesheet.hpp
with
20 additions
and
27 deletions
src/engine.cpp
+
3
−
3
View file @
a70e683d
...
...
@@ -36,11 +36,11 @@ Engine::Engine(Window &window) : window(window), quit(false) {
void
Engine
::
set_scene
(
Scene
&
scene
)
{
this
->
scene
=
&
scene
;
}
void
Engine
::
set_spritesheet
(
Spritesheet
spritesheet
)
{
this
->
spritesheet
=
spritesheet
;
void
Engine
::
set_spritesheet
(
Spritesheet
&
spritesheet
)
{
this
->
spritesheet
=
&
spritesheet
;
}
Spritesheet
&
Engine
::
get_spritesheet
()
{
return
spritesheet
.
value
();
}
Spritesheet
*
Engine
::
get_spritesheet
()
{
return
spritesheet
.
value
();
}
void
Engine
::
pump
()
{
SDL_Event
e
;
...
...
This diff is collapsed.
Click to expand it.
src/engine.hpp
+
3
−
3
View file @
a70e683d
...
...
@@ -26,9 +26,9 @@ public:
void
set_scene
(
Scene
&
scene
);
void
set_spritesheet
(
Spritesheet
spritesheet
);
void
set_spritesheet
(
Spritesheet
&
spritesheet
);
Spritesheet
&
get_spritesheet
();
Spritesheet
*
get_spritesheet
();
void
render
();
...
...
@@ -40,7 +40,7 @@ private:
Window
&
window
;
SDL_Renderer
*
sdl_renderer
;
std
::
optional
<
Scene
*>
scene
;
std
::
optional
<
Spritesheet
>
spritesheet
;
std
::
optional
<
Spritesheet
*
>
spritesheet
;
std
::
vector
<
SDL_Event
>
events
;
bool
quit
;
};
...
...
This diff is collapsed.
Click to expand it.
src/level.cpp
+
6
−
6
View file @
a70e683d
...
...
@@ -29,15 +29,15 @@ void Level::render(Engine &engine, std::vector<SDL_Event> &events) {
for
(
int
y
=
0
;
y
<
this
->
height
;
y
++
)
{
for
(
int
x
=
0
;
x
<
this
->
width
;
x
++
)
{
Spritesheet
&
spritesheet
=
engine
.
get_spritesheet
();
Spritesheet
*
spritesheet
=
engine
.
get_spritesheet
();
SDL_Rect
dst
;
dst
.
x
=
x
*
spritesheet
.
get_tile_width
();
dst
.
y
=
y
*
spritesheet
.
get_tile_height
();
dst
.
w
=
spritesheet
.
get_tile_width
();
dst
.
h
=
spritesheet
.
get_tile_height
();
dst
.
x
=
x
*
spritesheet
->
get_tile_width
();
dst
.
y
=
y
*
spritesheet
->
get_tile_height
();
dst
.
w
=
spritesheet
->
get_tile_width
();
dst
.
h
=
spritesheet
->
get_tile_height
();
if
(
spritesheet
.
render_tile
(
engine
.
renderer
(),
0
,
0
,
&
dst
)
=
=
0
)
{
if
(
spritesheet
->
render_tile
(
engine
.
renderer
(),
0
,
0
,
&
dst
)
!
=
0
)
{
throw
std
::
runtime_error
(
"error while rendering a tile: "
+
std
::
string
(
SDL_GetError
()));
}
...
...
This diff is collapsed.
Click to expand it.
src/spritesheet.cpp
+
4
−
15
View file @
a70e683d
#include
"spritesheet.hpp"
#include
"SDL_render.h"
#include
"SDL_stdinc.h"
#include
"SDL_surface.h"
#include
"engine.hpp"
#include
<SDL_image.h>
#include
<iostream>
#include
<ostream>
#include
<stdexcept>
namespace
advanced_wars
{
...
...
@@ -52,18 +49,10 @@ int Spritesheet::render_tile(SDL_Renderer *renderer, int tile, int step,
src
.
w
=
tile_width
;
src
.
h
=
tile_height
;
/*
std::cout << rect->x << " " << rect->y << " " << rect->w << " " << rect->h
<< std::endl;
Uint32
format
=
0
;
int
width
=
0
;
int
height
=
0
;
int
access
=
0
;
SDL_QueryTexture
(
texture
,
&
format
,
&
access
,
&
width
,
&
height
);
std
::
cout
<<
format
<<
" "
<<
width
<<
" "
<<
height
<<
" "
<<
access
<<
std
::
endl
;
*/
return
SDL_RenderCopyEx
(
renderer
,
texture
,
&
src
,
rect
,
0
,
NULL
,
SDL_FLIP_NONE
);
...
...
This diff is collapsed.
Click to expand it.
src/spritesheet.hpp
+
4
−
0
View file @
a70e683d
...
...
@@ -16,6 +16,10 @@ public:
~
Spritesheet
();
Spritesheet
(
const
Spritesheet
&
)
=
delete
;
Spritesheet
&
operator
=
(
const
Spritesheet
&
)
=
delete
;
// Tiles
int
get_tile_steps
(
int
tile
);
...
...
This diff is collapsed.
Click to expand it.
Preview
0%
Loading
Try again
or
attach a new file
.
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Save comment
Cancel
Please
register
or
sign in
to comment