scawful/yaze
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

update includes

Browse Source
This commit is contained in:
Justin Scofield
2022-07-27 20:13:08 +00:00
parent 92252c548f
commit 6e50beb2ba
6 changed files with 17 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

1
src/app/gfx/bitmap.cc
View File

@@ -2,6 +2,7 @@
#include <SDL2/SDL.h> #include <SDL2/SDL.h>
#include <cstdint>
#include <memory> #include <memory>
#include "absl/status/status.h" #include "absl/status/status.h"

3
src/app/gfx/bitmap.h
View File

@@ -3,9 +3,12 @@
#include <SDL2/SDL.h> #include <SDL2/SDL.h>
#include <cstdint>
#include <memory> #include <memory>
#include "absl/status/status.h"
#include "absl/status/statusor.h" #include "absl/status/statusor.h"
#include "absl/strings/str_cat.h"
#include "app/core/constants.h" #include "app/core/constants.h"
#include "app/gfx/snes_palette.h" #include "app/gfx/snes_palette.h"

8
src/app/gfx/snes_palette.cc
View File

@@ -10,6 +10,8 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
#include "app/core/constants.h"
namespace yaze { namespace yaze {
namespace app { namespace app {
namespace gfx { namespace gfx {
@@ -36,7 +38,7 @@ snes_color ConvertSNEStoRGB(const ushort color) {
snes_palette* Extract(const char* data, const unsigned int offset, snes_palette* Extract(const char* data, const unsigned int offset,
const unsigned int palette_size) { const unsigned int palette_size) {
snes_palette* toret = palette_create(palette_size, 0); snes_palette* toret = nullptr; // palette_create(palette_size, 0)
unsigned colnum = 0; unsigned colnum = 0;
for (int i = 0; i < palette_size * 2; i += 2) { for (int i = 0; i < palette_size * 2; i += 2) {
unsigned short snes_color; unsigned short snes_color;
@@ -76,7 +78,7 @@ void SNESColor::setRgb(ImVec4 val) {
col.red = val.x; col.red = val.x;
col.blue = val.y; col.blue = val.y;
col.green = val.z; col.green = val.z;
snes = convertcolor_rgb_to_snes(col); snes = ConvertRGBtoSNES(col);
} }
void SNESColor::setSNES(uint16_t val) { void SNESColor::setSNES(uint16_t val) {
@@ -113,7 +115,7 @@ SNESPalette::SNESPalette(const unsigned char* snes_pal)
SNESColor col; SNESColor col;
col.snes = snes_pal[i + 1] << (uint16_t)8; col.snes = snes_pal[i + 1] << (uint16_t)8;
col.snes = col.snes | snes_pal[i]; col.snes = col.snes | snes_pal[i];
snes_color mColor = convertcolor_snes_to_rgb(col.snes); snes_color mColor = ConvertSNEStoRGB(col.snes);
col.rgb = ImVec4(mColor.red, mColor.green, mColor.blue, 1.f); col.rgb = ImVec4(mColor.red, mColor.green, mColor.blue, 1.f);
colors.push_back(col); colors.push_back(col);
} }

2
src/app/gfx/snes_palette.h
View File

@@ -11,6 +11,8 @@
#include <memory> #include <memory>
#include <vector> #include <vector>
#include "app/core/constants.h"
namespace yaze { namespace yaze {
namespace app { namespace app {
namespace gfx { namespace gfx {

2
src/app/gfx/snes_tile.cc
View File

@@ -3,6 +3,8 @@
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>
#include "app/core/constants.h"
namespace yaze { namespace yaze {
namespace app { namespace app {
namespace gfx { namespace gfx {

6
src/app/gfx/snes_tile.h
View File

@@ -4,6 +4,8 @@
#include <cstdint> #include <cstdint>
#include <vector> #include <vector>
#include "app/core/constants.h"
namespace yaze { namespace yaze {
namespace app { namespace app {
namespace gfx { namespace gfx {
@@ -14,8 +16,6 @@ typedef struct {
unsigned int palette_id; unsigned int palette_id;
} tile8; } tile8;
TileInfo GetTilesInfo(ushort tile);
// vhopppcc cccccccc // vhopppcc cccccccc
// [0, 1] // [0, 1]
// [2, 3] // [2, 3]
@@ -35,6 +35,8 @@ class TileInfo {
palette_(palette) {} palette_(palette) {}
}; };
TileInfo GetTilesInfo(ushort tile);
class Tile32 { class Tile32 {
public: public:
ushort tile0_; ushort tile0_;