drinkingtea/ox
2
0
Fork 0
Code Issues Pull Requests Actions Releases Wiki Activity

[nostalgia/core/userland] Fix Tile row skipping and move some non-SDL code into userland

Browse Source
This commit is contained in:
Gary Talent
2021-03-17 01:25:59 -05:00
parent 94011c8b18
commit d000c7f34f
4 changed files with 87 additions and 112 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/nostalgia/core/userland/gfx_opengl.cpp
+13 -12
View File
@@ -22,15 +22,16 @@ using TileMap = std::array<std::array<int, 128>, 128>;
namespace renderer {
constexpr auto TileRows = 16;
constexpr auto TileColumns = 16;
constexpr auto TileRows = 128;
constexpr auto TileColumns = 128;
constexpr auto TileCount = TileRows * TileColumns;
constexpr auto BgVertexVboRows = 4;
constexpr auto BgVertexVboLength = 16;
constexpr auto BgVertexEboLength = 6;
struct BackgroundBufferset: public Bufferset {
std::array<float, TileCount * BgVertexVboLength * 4> bgVertices;
std::array<GLuint, TileCount * BgVertexEboLength * 4> bgEbos;
std::array<float, TileCount * BgVertexVboLength> bgVertices;
std::array<GLuint, TileCount * BgVertexEboLength> bgEbos;
};
struct GlImplData {
@@ -64,16 +65,17 @@ constexpr const GLchar *bgfshad = R"(
void initTileBufferObjects(unsigned vi, float x, float y, float *vbo, GLuint *ebo) {
// don't worry, this gets optimized to something much more ideal
constexpr float xmod = 0.06f;
constexpr float ymod = 0.1f;
x *= xmod;
y *= 0.1f;
const float vertices[BgVertexVboLength] = {
y *= ymod;
const float vertices[] = {
x, y, 0, 0.04, // bottom left
x + xmod, y, 1, 0.04, // bottom right
x + xmod, y + 0.1f, 1, 0, // top right
x, y + 0.1f, 0, 0, // top left
x + xmod, y + ymod, 1, 0.02, // top right
x, y + ymod, 0, 0.02, // top left
};
memcpy(vbo, vertices, sizeof(vertices));
const GLuint elms[BgVertexEboLength] = {
const GLuint elms[] = {
vi + 0, vi + 1, vi + 2,
vi + 2, vi + 3, vi + 0,
};
@@ -84,10 +86,9 @@ void initBackgroundBufferObjects(GLuint shader, BackgroundBufferset *bs) {
auto i = 0u;
for (auto x = 0u; x < TileColumns; ++x) {
for (auto y = 0u; y < TileRows; ++y) {
const auto vi = i * BgVertexVboLength;
auto vbo = &bs->bgVertices[vi];
auto vbo = &bs->bgVertices[i * BgVertexVboLength];
auto ebo = &bs->bgEbos[i * BgVertexEboLength];
initTileBufferObjects(vi, x, y, vbo, ebo);
initTileBufferObjects(i * BgVertexVboRows, x, y, vbo, ebo);
++i;
}
}