Skip to content

O
openjazz
Commit 9f304c22 authored by anotherguest's avatar anotherguest
Browse files
Options

Add initial decoding of FF frames. Works with shareware intro. Looks nice with... 

Add initial decoding of FF frames. Works with shareware intro. Looks nice with level over, but repeat needs a small fix.
parent ac000e21
Hide whitespace changes
Inline Side-by-side
Showing with 197 additions and 29 deletions
src/scene/scene.cpp
View file @ 9f304c22
...@@ -34,7 +34,7 @@ ...@@ -34,7 +34,7 @@
#include "io/gfx/font.h" #include "io/gfx/font.h"
#include "io/gfx/paletteeffects.h" #include "io/gfx/paletteeffects.h"
#include "io/gfx/video.h" #include "io/gfx/video.h"
#include "io/sound.h" #include "io/sound.h"
#include "loop.h" #include "loop.h"
#include <string.h> #include <string.h>
...@@ -256,7 +256,7 @@ int Scene::play () { ...@@ -256,7 +256,7 @@ int Scene::play () {
SceneImage *image; SceneImage *image;
SceneAnimation* animation = NULL; SceneAnimation* animation = NULL;
SceneFrame* currentFrame = NULL; SceneFrame* currentFrame = NULL;
SceneFrame* lastFrame = NULL; SceneFrame* lastFrame = NULL;
PaletteEffect* paletteEffect = NULL; PaletteEffect* paletteEffect = NULL;
int frameDelay = 0; int frameDelay = 0;
int prevFrame = 0; int prevFrame = 0;
...@@ -271,20 +271,20 @@ int Scene::play () { ...@@ -271,20 +271,20 @@ int Scene::play () {
while (true) { while (true) {
if (loop(NORMAL_LOOP, paletteEffect) == E_QUIT) { if (loop(NORMAL_LOOP, paletteEffect) == E_QUIT) {
if (paletteEffect) delete paletteEffect; if (paletteEffect) delete paletteEffect;
return E_QUIT; return E_QUIT;
} }
if (controls.release(C_ESCAPE) || (controls.release(C_NO) && pages[sceneIndex].askForYesNo)) { if (controls.release(C_ESCAPE) || (controls.release(C_NO) && pages[sceneIndex].askForYesNo)) {
if (paletteEffect) delete paletteEffect; if (paletteEffect) delete paletteEffect;
return E_NONE; return E_NONE;
} }
SDL_Delay(T_FRAME); SDL_Delay(T_FRAME);
...@@ -312,12 +312,12 @@ int Scene::play () { ...@@ -312,12 +312,12 @@ int Scene::play () {
if (upOrLeft) sceneIndex--; if (upOrLeft) sceneIndex--;
else sceneIndex++; else sceneIndex++;
if (sceneIndex == scriptItems) { if (sceneIndex == scriptItems) {
if (paletteEffect) delete paletteEffect; if (paletteEffect) delete paletteEffect;
return E_NONE; return E_NONE;
} }
lastTicks = globalTicks; lastTicks = globalTicks;
...@@ -330,7 +330,7 @@ int Scene::play () { ...@@ -330,7 +330,7 @@ int Scene::play () {
if (newpage) { if (newpage) {
//if (paletteEffect) delete paletteEffect; //if (paletteEffect) delete paletteEffect;
//paletteEffect = new FadeOutPaletteEffect(250, NULL); //paletteEffect = new FadeOutPaletteEffect(250, NULL);
textRect.x = 0; textRect.x = 0;
...@@ -345,7 +345,7 @@ int Scene::play () { ...@@ -345,7 +345,7 @@ int Scene::play () {
video.setPalette(palette->palette); video.setPalette(palette->palette);
// Fade in from black // Fade in from black
if (paletteEffect) delete paletteEffect; if (paletteEffect) delete paletteEffect;
paletteEffect = new FadeInPaletteEffect(250, NULL); paletteEffect = new FadeInPaletteEffect(250, NULL);
...@@ -408,6 +408,12 @@ int Scene::play () { ...@@ -408,6 +408,12 @@ int Scene::play () {
loadCompactedMem(currentFrame->frameSize, currentFrame->frameData,(unsigned char*) animation->background->pixels, SW, SH); loadCompactedMem(currentFrame->frameSize, currentFrame->frameData,(unsigned char*) animation->background->pixels, SW, SH);
} }
break; break;
case EFFAniHeader:
{
unsigned char* data = currentFrame->frameData;
int size = currentFrame->frameSize;
loadFFMem(size, currentFrame->frameData, (unsigned char*) animation->background->pixels);
}break;
default: default:
LOG("Scene::Play unknown type", currentFrame->frameType); LOG("Scene::Play unknown type", currentFrame->frameType);
break; break;
...@@ -439,13 +445,15 @@ int Scene::play () { ...@@ -439,13 +445,15 @@ int Scene::play () {
} }
SDL_Delay(frameDelay); SDL_Delay(frameDelay);
if(currentFrame == NULL && animation->reverseAnimation) { if(currentFrame == NULL && animation->reverseAnimation) {
prevFrame = 1-prevFrame; /*prevFrame = 1-prevFrame;
if(prevFrame) {
/*if(prevFrame) {
currentFrame = lastFrame->prev; currentFrame = lastFrame->prev;
} }
else { else {
currentFrame = lastFrame->next; currentFrame = lastFrame->next;
} }*/
currentFrame = NULL;//animation->sceneFrames;
} }
else if(currentFrame == NULL && !pageTime && !pages[sceneIndex].askForYesNo && pages[sceneIndex].nextPageAfterAnim) { else if(currentFrame == NULL && !pageTime && !pages[sceneIndex].askForYesNo && pages[sceneIndex].nextPageAfterAnim) {
continueToNextPage = 1; continueToNextPage = 1;
......
src/scene/scene.h
View file @ 9f304c22
...@@ -234,8 +234,9 @@ class Scene { ...@@ -234,8 +234,9 @@ class Scene {
void loadScripts (File* f); void loadScripts (File* f);
void loadData (File* f); void loadData (File* f);
void loadAni (File* f, int dataIndex); void loadAni (File* f, int dataIndex);
void loadCompacted(int& size, File* f, unsigned char* pixdata, int width, int height); void loadCompacted(int size, File* f, unsigned char* pixdata, int width, int height);
void loadCompactedMem(int& size, unsigned char* frameData, unsigned char* pixdata, int width, int height); void loadCompactedMem(int size, unsigned char* frameData, unsigned char* pixdata, int width, int height);
void loadFFMem(int size, unsigned char* frameData, unsigned char* pixdata);
public: public:
Scene (const char* fileName); Scene (const char* fileName);
~Scene (); ~Scene ();
......
src/scene/sceneload.cpp
View file @ 9f304c22
...@@ -33,6 +33,165 @@ ...@@ -33,6 +33,165 @@
#include <string.h> #include <string.h>
void Scene::loadFFMem(int size, unsigned char* frameData, unsigned char* pixdata) {
int pixels = 0;
int fillWidth = 0;
unsigned char fillColor = 0;
int trans = 1;
int opCodeNo = 0;
unsigned char* repeatPos = NULL;
unsigned char* startPix = pixdata;
unsigned char* framestart = frameData;
/*FILE* out = fopen("c:\\output.dat", "wb");
fwrite(frameData, size, 1, out);
fclose(out);*/
while (size > 0) {
LOG("PL FF frame offset",(frameData-framestart));
opCodeNo++;
fflush(stderr);
unsigned char header = *frameData;frameData++;
if(header == 0xFF) {
unsigned short skip = *frameData;frameData++;
skip+=((unsigned short)(*frameData))<<8;frameData++;
if(trans) {
skip+=255;
}
LOG("PL FF 0xff skip", skip);
pixels+=skip;
pixdata+=skip;
size -= 2;
trans = 0;
}
else if (header == 0x7f) {
fillWidth = *frameData;frameData++;
fillWidth+=((unsigned short)(*frameData))<<8;frameData++;
if(trans) {
fillWidth+=255;
}
//fillColor = *frameData;frameData++;
//memset(pixdata, fillColor, fillWidth);
LOG("PL FF 0x7f fillWidth", fillWidth);
pixels+=fillWidth;
pixdata+=fillWidth;
size-=2;
trans = 1;
}
else if ((header & 0xe0) == 0xe0) {
LOG("PL FF 0xe0 skip", header);
pixels+=header;
pixdata+=header;
trans = 0;
}
else if ((header & 0xA0) == 0xA0) {
fillWidth = (header-0xA0);
LOG("PL FF 0xa0 fill next op",fillWidth);
// fill ?
unsigned char* readfill = pixdata-320;
for(int col = 0;col < fillWidth;col++) {
*pixdata = *readfill;
pixels++;
pixdata++;
readfill++;
}
trans = 0;
}
else if ((header & 0xC0) == 0xc0) {
fillWidth = (header - 0xC0);
LOG("PL FF 0xc0 fillWidth", fillWidth);
fillColor = *frameData;frameData++;
memset(pixdata, fillColor, fillWidth);
pixdata+=fillWidth;
pixels+=fillWidth;
size--;
trans = 0;
}
else if (header & 0x80) {
fillWidth = (header-0x80);
if(trans) {
LOG("PL FF 0x8? SKIP bytes",fillWidth);
pixels+=(fillWidth);
pixdata+=(fillWidth);
}
else {
LOG("PL FF 0x8? Copy bytes", fillWidth);
for(int col = 0;col < fillWidth;col++) {
fillColor= *frameData;frameData++;
*pixdata = fillColor;
pixels++;
pixdata++;
size--;
}
}
trans = 1-trans;
}
else if (header & 0x40) {
fillWidth = (header-0x40);
fillColor = *frameData;frameData++;
memset(pixdata, fillColor, fillWidth);
LOG("PL FF 0x40 fillWidth", fillWidth);
pixels+=fillWidth;
pixdata+=fillWidth;
size--;
trans = 1;
}
else if (header & 0x20)
{
// fill ?
unsigned char* readfill = pixdata-320;
fillWidth = header-0x20;
for(int col = 0;col < fillWidth;col++) {
*pixdata = *readfill;
pixels++;
pixdata++;
readfill++;
}
LOG("PL FF Fill 0x20 ", (header-0x20));
trans = 1;
}
else if(header) {
if(trans) {
LOG("PL FF 0x0? SKIP bytes", header);
pixels+=(header);
pixdata+=(header);
}
else {
LOG("PL FF 0x0? Copy bytes", header);
for(int col = 0;col < (header);col++) {
fillColor= *frameData;frameData++;
*pixdata = fillColor;
pixels++;
pixdata++;
size--;
}
}
trans = 1-trans;
}
else
{
size = 1; // end
LOG("PL FF END OF STREAM", size);
}
size--;
SDL_Rect dst;
dst.x = (canvasW - SW) >> 1;
dst.y = (canvasH - SH) >> 1;
}
LOG("PL FF pixels", pixels);
}
/* /*
* $0x $... Next x + 1 bytes are 'literals'; each byte colors 1 column (Max val $3F) * $0x $... Next x + 1 bytes are 'literals'; each byte colors 1 column (Max val $3F)
* $4x $yy Next x + 1 columns drawn in color yy (Max value $7E) * $4x $yy Next x + 1 columns drawn in color yy (Max value $7E)
...@@ -40,7 +199,7 @@ ...@@ -40,7 +199,7 @@
* $8x Next x + 1 pixels are skipped, they're already the right color (Max val $FE) * $8x Next x + 1 pixels are skipped, they're already the right color (Max val $FE)
* $FF $xxxx Skip next xxxx pixels of picture, they're already the right color * $FF $xxxx Skip next xxxx pixels of picture, they're already the right color
*/ */
void Scene::loadCompacted(int& size, File* f, unsigned char* pixdata, int width, int height) { void Scene::loadCompacted(int size, File* f, unsigned char* pixdata, int width, int height) {
int pixels = 0; int pixels = 0;
unsigned char* endpixdata = pixdata + (width*height); unsigned char* endpixdata = pixdata + (width*height);
unsigned char* fillstart = NULL; unsigned char* fillstart = NULL;
...@@ -122,7 +281,7 @@ void Scene::loadCompacted(int& size, File* f, unsigned char* pixdata, int width, ...@@ -122,7 +281,7 @@ void Scene::loadCompacted(int& size, File* f, unsigned char* pixdata, int width,
LOG("PL Compacts pixels", pixels); LOG("PL Compacts pixels", pixels);
} }
void Scene::loadCompactedMem(int& size, unsigned char* frameData, unsigned char* pixdata, int width, int height) { void Scene::loadCompactedMem(int size, unsigned char* frameData, unsigned char* pixdata, int width, int height) {
int pixels = 0; int pixels = 0;
unsigned char* endpixdata = pixdata + (width*height); unsigned char* endpixdata = pixdata + (width*height);
unsigned char* fillstart = NULL; unsigned char* fillstart = NULL;
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment