zdoom/gzdoom
0
0
Fork 0
mirror of https://github.com/ZDoom/gzdoom.git synced 2024-11-10 14:51:40 +00:00
Code Issues Projects Releases Packages Wiki Activity

- backend update from Raze.

Browse source 
(No, the AnimTexture isn't used yet.)
This commit is contained in:
Christoph Oelckers 2020-06-16 00:09:19 +02:00
parent 2c57d5e768
commit d1cbabff66
4 changed files with 80 additions and 31 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

66
src/common/textures/animtexture.cpp
View file

@ -33,6 +33,8 @@
*/
#include "animtexture.h"
#include "bitmap.h"
#include "texturemanager.h"
#include "templates.h"
//==========================================================================
//
@ -40,17 +42,19 @@
//
//==========================================================================
void AnimTexture::SetFrameSize(int width, int height)
void AnimTexture::SetFrameSize(int format, int width, int height)
{
FTexture::SetSize(width, height);
Image.Resize(width * height);
Image.Resize(width * height * (format == Paletted ? 1 : 3));
pixelformat = format;
}
void AnimTexture::SetFrame(const uint8_t* palette, const void* data_)
{
memcpy(Palette, palette, 768);
memcpy(Image.Data(), data_, Width * Height);
memcpy(Image.Data(), data_, Width * Height * (pixelformat == Paletted ? 1 : 3));
CleanHardwareTextures();
pixelformat = Paletted;
}
//===========================================================================
@ -67,6 +71,8 @@ FBitmap AnimTexture::GetBgraBitmap(const PalEntry* remap, int* trans)
auto spix = Image.Data();
auto dpix = bmp.GetPixels();
if (pixelformat == Paletted)
{
for (int i = 0; i < Width * Height; i++)
{
int p = i * 4;
@ -76,6 +82,41 @@ FBitmap AnimTexture::GetBgraBitmap(const PalEntry* remap, int* trans)
dpix[p + 2] = Palette[index * 3];
dpix[p + 3] = 255;
}
}
else if (pixelformat == RGB)
{
for (int i = 0; i < Width * Height; i++)
{
int p = i * 4;
dpix[p + 0] = spix[p + 2];
dpix[p + 1] = spix[p + 1];
dpix[p + 2] = spix[p];
dpix[p + 3] = 255;
}
}
else if (pixelformat == YUV)
{
for (int i = 0; i < Width * Height; i++)
{
int p = i * 4;
float y = spix[p] * (1 / 255.f);
float u = spix[p + 1] * (1 / 255.f) - 0.5f;
float v = spix[p + 2] * (1 / 255.f) - 0.5f;
y = 1.1643f * (y - 0.0625f);
float r = y + 1.5958f * v;
float g = y - 0.39173f * u - 0.81290f * v;
float b = y + 2.017f * u;
dpix[p + 0] = (uint8_t)(clamp(b, 0.f, 1.f) * 255);
dpix[p + 1] = (uint8_t)(clamp(g, 0.f, 1.f) * 255);
dpix[p + 2] = (uint8_t)(clamp(r, 0.f, 1.f) * 255);
dpix[p + 3] = 255;
}
return bmp;
}
return bmp;
}
@ -88,20 +129,20 @@ FBitmap AnimTexture::GetBgraBitmap(const PalEntry* remap, int* trans)
AnimTextures::AnimTextures()
{
active = 1;
tex[0] = MakeGameTexture(new AnimTexture, "", ETextureType::Special);
tex[1] = MakeGameTexture(new AnimTexture, "", ETextureType::Special);
tex[0] = TexMan.FindGameTexture("AnimTextureFrame1", ETextureType::Override);
tex[1] = TexMan.FindGameTexture("AnimTextureFrame2", ETextureType::Override);
}
AnimTextures::~AnimTextures()
{
delete tex[0];
delete tex[1];
tex[0]->CleanHardwareData(true);
tex[1]->CleanHardwareData(true);
}
void AnimTextures::SetSize(int width, int height)
void AnimTextures::SetSize(int format, int width, int height)
{
static_cast<AnimTexture*>(tex[0]->GetTexture())->SetFrameSize(width, height);
static_cast<AnimTexture*>(tex[1]->GetTexture())->SetFrameSize(width, height);
static_cast<AnimTexture*>(tex[0]->GetTexture())->SetFrameSize(format, width, height);
static_cast<AnimTexture*>(tex[1]->GetTexture())->SetFrameSize(format, width, height);
tex[0]->SetSize(width, height);
tex[1]->SetSize(width, height);
}
@ -111,8 +152,3 @@ void AnimTextures::SetFrame(const uint8_t* palette, const void* data)
active ^= 1;
static_cast<AnimTexture*>(tex[active]->GetTexture())->SetFrame(palette, data);
}
FGameTexture* AnimTextures::GetFrame()
{
return tex[active];
}

21
src/common/textures/animtexture.h
View file

@ -7,9 +7,16 @@ class AnimTexture : public FTexture
{
uint8_t Palette[768];
TArray<uint8_t> Image;
int pixelformat;
public:
enum
{
Paletted = 0,
RGB = 1,
YUV = 2
};
AnimTexture() = default;
void SetFrameSize(int width, int height);
void SetFrameSize(int format, int width, int height);
void SetFrame(const uint8_t* palette, const void* data);
virtual FBitmap GetBgraBitmap(const PalEntry* remap, int* trans) override;
};
@ -22,7 +29,15 @@ class AnimTextures
public:
AnimTextures();
~AnimTextures();
void SetSize(int width, int height);
void SetSize(int format, int width, int height);
void SetFrame(const uint8_t* palette, const void* data);
FGameTexture* GetFrame();
FGameTexture* GetFrame()
{
return tex[active];
}
FTextureID GetFrameID()
{
return tex[active]->GetID();
}
};

4
src/common/textures/texturemanager.cpp
View file

@ -45,6 +45,7 @@
#include "sc_man.h"
#include "image.h"
#include "vectors.h"
#include "animtexture.h"
#include "formats/multipatchtexture.h"
FTextureManager TexMan;
@ -1158,6 +1159,9 @@ void FTextureManager::Init(void (*progressFunc_)(), void (*checkForHacks)(BuildI
AddGameTexture(CreateShaderTexture(false, true));
AddGameTexture(CreateShaderTexture(true, false));
AddGameTexture(CreateShaderTexture(true, true));
// Add two animtexture entries so that movie playback can call functions using texture IDs.
AddGameTexture(MakeGameTexture(new AnimTexture(), "AnimTextureFrame1", ETextureType::Override));
AddGameTexture(MakeGameTexture(new AnimTexture(), "AnimTextureFrame2", ETextureType::Override));
int wadcnt = fileSystem.GetNumWads();

6
wadsrc/static/menudef.txt
View file

@ -801,12 +801,6 @@ OptionMenu "JoystickConfigMenu" protected
//
//-------------------------------------------------------------------------------------------
OptionValue ColumnMethods
{
0.0, "$OPTVAL_ORIGINAL"
1.0, "$OPTVAL_OPTIMIZED"
}
OptionValue BlendMethods
{
0.0, "$OPTVAL_CLASSIC"