drinkingtea/nostalgia
drinkingtea/nostalgia
2
0
Fork 0
Code Issues 6 Pull Requests Actions Releases 6 Activity

[nostalgia/sample_project] Update integer type descriptor names

Browse Source
This commit is contained in:
Gary Talent 2022-07-21 02:14:40 -05:00
parent 3a2995a67b
commit d2d9aae9d5
11 changed files with 16 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
sample_project/.nostalgia/type_descriptors/B.int32_t;0 → sample_project/.nostalgia/type_descriptors/B.int32;0
View File

@ -1,5 +1,5 @@
O1;net.drinkingtea.ox.DescriptorType;2;{ O1;net.drinkingtea.ox.DescriptorType;2;{
"length" : 4, "length" : 4,
"primitiveType" : 1, "primitiveType" : 1,
"typeName" : "B.int32_t" "typeName" : "B.int32"
} }

2
sample_project/.nostalgia/type_descriptors/B.int8_t;0 → sample_project/.nostalgia/type_descriptors/B.int8;0
View File

@ -1,5 +1,5 @@
O1;net.drinkingtea.ox.DescriptorType;2;{ O1;net.drinkingtea.ox.DescriptorType;2;{
"length" : 1, "length" : 1,
"primitiveType" : 1, "primitiveType" : 1,
"typeName" : "B.int8_t" "typeName" : "B.int8"
} }

2
sample_project/.nostalgia/type_descriptors/B.uint16_t;0 → sample_project/.nostalgia/type_descriptors/B.uint16;0
View File

@ -1,4 +1,4 @@
O1;net.drinkingtea.ox.DescriptorType;2;{ O1;net.drinkingtea.ox.DescriptorType;2;{
"length" : 2, "length" : 2,
"typeName" : "B.uint16_t" "typeName" : "B.uint16"
} }

2
sample_project/.nostalgia/type_descriptors/B.uint64_t;0 → sample_project/.nostalgia/type_descriptors/B.uint64;0
View File

@ -1,4 +1,4 @@
O1;net.drinkingtea.ox.DescriptorType;2;{ O1;net.drinkingtea.ox.DescriptorType;2;{
"length" : 8, "length" : 8,
"typeName" : "B.uint64_t" "typeName" : "B.uint64"
} }

2
sample_project/.nostalgia/type_descriptors/B.uint8_t;0 → sample_project/.nostalgia/type_descriptors/B.uint8;0
View File

@ -1,4 +1,4 @@
O1;net.drinkingtea.ox.DescriptorType;2;{ O1;net.drinkingtea.ox.DescriptorType;2;{
"length" : 1, "length" : 1,
"typeName" : "B.uint8_t" "typeName" : "B.uint8"
} }

2
sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.Palette;1
View File

@ -4,7 +4,7 @@ O1;net.drinkingtea.ox.DescriptorType;2;{
{ {
"fieldName" : "colors", "fieldName" : "colors",
"subscriptLevels" : 1, "subscriptLevels" : 1,
"typeName" : "B.uint16_t" "typeName" : "B.uint16"
} }
], ],
"primitiveType" : 5, "primitiveType" : 5,

6
sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet.SubSheet;1
View File

@ -7,11 +7,11 @@ O1;net.drinkingtea.ox.DescriptorType;2;{
}, },
{ {
"fieldName" : "rows", "fieldName" : "rows",
"typeName" : "B.int32_t" "typeName" : "B.int32"
}, },
{ {
"fieldName" : "columns", "fieldName" : "columns",
"typeName" : "B.int32_t" "typeName" : "B.int32"
}, },
{ {
"fieldName" : "subsheets", "fieldName" : "subsheets",
@ -21,7 +21,7 @@ O1;net.drinkingtea.ox.DescriptorType;2;{
{ {
"fieldName" : "pixels", "fieldName" : "pixels",
"subscriptLevels" : 1, "subscriptLevels" : 1,
"typeName" : "B.uint8_t" "typeName" : "B.uint8"
} }
], ],
"primitiveType" : 5, "primitiveType" : 5,

2
sample_project/.nostalgia/type_descriptors/net.drinkingtea.nostalgia.core.TileSheet;2
View File

@ -3,7 +3,7 @@ O1;net.drinkingtea.ox.DescriptorType;2;{
[ [
{ {
"fieldName" : "bpp", "fieldName" : "bpp",
"typeName" : "B.int8_t" "typeName" : "B.int8"
}, },
{ {
"fieldName" : "defaultPalette", "fieldName" : "defaultPalette",

2
sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress.Data;1
View File

@ -11,7 +11,7 @@ O1;net.drinkingtea.ox.DescriptorType;2;{
}, },
{ {
"fieldName" : "inode", "fieldName" : "inode",
"typeName" : "B.uint64_t" "typeName" : "B.uint64"
} }
], ],
"primitiveType" : 6, "primitiveType" : 6,

2
sample_project/.nostalgia/type_descriptors/net.drinkingtea.ox.FileAddress;1
View File

@ -3,7 +3,7 @@ O1;net.drinkingtea.ox.DescriptorType;2;{
[ [
{ {
"fieldName" : "type", "fieldName" : "type",
"typeName" : "B.int8_t" "typeName" : "B.int8"
}, },
{ {
"fieldName" : "data", "fieldName" : "data",

9
src/nostalgia/core/userland/gfx_opengl.cpp
View File

@ -4,16 +4,15 @@
#include <imgui_impl_opengl3.h> #include <imgui_impl_opengl3.h>
#include <nostalgia/glutils/glutils.hpp>
#include <ox/std/array.hpp> #include <ox/std/array.hpp>
#include <ox/std/fmt.hpp> #include <ox/std/fmt.hpp>
#include <nostalgia/glutils/glutils.hpp>
#include <nostalgia/core/config.hpp> #include <nostalgia/core/config.hpp>
#include <nostalgia/core/gfx.hpp> #include <nostalgia/core/gfx.hpp>
#include "nostalgia/core/context.hpp" #include "nostalgia/core/context.hpp"
namespace nostalgia::core { namespace nostalgia::core {
void ImGui_Impl_NewFrame() noexcept; void ImGui_Impl_NewFrame() noexcept;
@ -99,8 +98,8 @@ static void initBackgroundBufferObjects(Context *ctx, glutils::BufferSet *bg) no
for (auto x = 0u; x < TileColumns; ++x) { for (auto x = 0u; x < TileColumns; ++x) {
for (auto y = 0u; y < TileRows; ++y) { for (auto y = 0u; y < TileRows; ++y) {
const auto i = bgVertexRow(x, y); const auto i = bgVertexRow(x, y);
auto vbo = &bg->vertices[i * BgVertexVboLength]; auto vbo = &bg->vertices[i * static_cast<std::size_t>(BgVertexVboLength)];
auto ebo = &bg->elements[i * BgVertexEboLength]; auto ebo = &bg->elements[i * static_cast<std::size_t>(BgVertexEboLength)];
setTileBufferObject(ctx, i * BgVertexVboRows, static_cast<float>(x), static_cast<float>(y), 0, vbo, ebo); setTileBufferObject(ctx, i * BgVertexVboRows, static_cast<float>(x), static_cast<float>(y), 0, vbo, ebo);
} }
} }