mirror of
https://github.com/simtactics/mysimulation.git
synced 2025-03-15 23:01:21 +00:00
Graphics: Added font rendering functions Graphics::DrawText and Graphics::StringImage.
FileHandler: Added support for wav Audio: Added support to play back a sound with XAudio2. We can't delete sounds until we make our own system to keep track of available voices. LoginScreen scene: Upped framerate from 15fps to tickless, and added new logic to clone the scrolling text at the bottom. All of it.
This commit is contained in:
Fatbag
parent
64a5c0a425
commit
06f13d50ac
14 changed files with 429 additions and 162 deletions
|
|
@ -16,8 +16,21 @@
|
|||
*/
|
||||
|
||||
#include "windows/xaudio2.hpp"
|
||||
#ifdef PlaySound //defined by the Windows API
|
||||
#undef PlaySound
|
||||
#endif
|
||||
|
||||
struct PlayableSound_t {
|
||||
bool Playing;
|
||||
uint8_t * Data;
|
||||
IXAudio2SourceVoice* pSourceVoice;
|
||||
};
|
||||
|
||||
namespace Audio {
|
||||
int Initialize();
|
||||
PlayableSound_t * LoadSound(const Sound_t * Sound);
|
||||
bool PlaySound(PlayableSound_t * Sound);
|
||||
bool StopSound(PlayableSound_t * Sound);
|
||||
void DeleteSound(PlayableSound_t * Sound);
|
||||
void Shutdown();
|
||||
}
|
||||
|
|
@ -49,6 +49,65 @@ int Initialize(){
|
|||
return 0;
|
||||
}
|
||||
|
||||
PlayableSound_t * LoadSound(const Sound_t * Sound){
|
||||
const WAVEFORMATEX wfx = {
|
||||
WAVE_FORMAT_PCM, //wFormatTag
|
||||
Sound->Channels, //nChannels
|
||||
Sound->SamplingRate, //nSamplesPerSec
|
||||
((Sound->Channels * Sound->BitDepth) >> 3) * Sound->SamplingRate, //nAvgBytesPerSec
|
||||
((Sound->Channels * Sound->BitDepth) >> 3), //nBlockAlign
|
||||
Sound->BitDepth, //wBitsPerSample;
|
||||
0 //cbSize
|
||||
};
|
||||
|
||||
const XAUDIO2_BUFFER buffer = {
|
||||
0, //Flags
|
||||
Sound->Duration * wfx.nBlockAlign, //AudioBytes
|
||||
Sound->Data, //pAudioData
|
||||
0, //PlayBegin
|
||||
0, //PlayLength
|
||||
0, //LoopBegin
|
||||
0, //LoopLength
|
||||
XAUDIO2_LOOP_INFINITE, //LoopCount
|
||||
NULL, //pContext
|
||||
};
|
||||
|
||||
IXAudio2SourceVoice* pSourceVoice;
|
||||
if(FAILED(pXAudio2->CreateSourceVoice(&pSourceVoice, &wfx)))
|
||||
return NULL;
|
||||
if(FAILED(pSourceVoice->SubmitSourceBuffer(&buffer)))
|
||||
return NULL;
|
||||
|
||||
PlayableSound_t * PlayableSound = (PlayableSound_t*) malloc(sizeof(PlayableSound_t));
|
||||
if(!PlayableSound)
|
||||
return NULL;
|
||||
PlayableSound->pSourceVoice = pSourceVoice;
|
||||
PlayableSound->Playing = false;
|
||||
PlayableSound->Data = Sound->Data;
|
||||
return PlayableSound;
|
||||
}
|
||||
|
||||
bool PlaySound(PlayableSound_t * Sound){
|
||||
if(!Sound->Playing && !FAILED(Sound->pSourceVoice->Start(0))){
|
||||
Sound->Playing = true;
|
||||
return true;
|
||||
}
|
||||
return false;
|
||||
}
|
||||
|
||||
bool StopSound(PlayableSound_t * Sound){
|
||||
int success = false;
|
||||
if(Sound->Playing && !FAILED(Sound->pSourceVoice->Stop(0)))
|
||||
success = true;
|
||||
Sound->Playing = false;
|
||||
return success;
|
||||
}
|
||||
|
||||
void DeleteSound(PlayableSound_t * Sound){
|
||||
StopSound(Sound);
|
||||
//Sound->pSourceVoice->Release();
|
||||
}
|
||||
|
||||
void Shutdown(){
|
||||
if(MasterVoice){
|
||||
MasterVoice->DestroyVoice();
|
||||
|
|
|
|||
|
|
@ -23,6 +23,7 @@ DECLARE_INTERFACE(IXAudio2Voice);
|
|||
#define XAUDIO2_DEFAULT_SAMPLERATE 0
|
||||
#define XAUDIO2_DEFAULT_FREQ_RATIO 4.0f
|
||||
#define XAUDIO2_DEBUG_ENGINE 0x0001
|
||||
#define XAUDIO2_LOOP_INFINITE 255
|
||||
#define XAUDIO2_VOICE_NOSRC 0x0004
|
||||
|
||||
enum XAUDIO2_DEVICE_ROLE
|
||||
|
|
|
|||
|
|
@ -22,7 +22,7 @@ namespace Graphics {
|
|||
FT_Library FreeTypeLibrary;
|
||||
FT_Face FontFace;
|
||||
|
||||
static void FindStringSize(const wchar_t * String, unsigned * width, unsigned * height, int font){
|
||||
static void FindStringSize(const wchar_t * String, unsigned * width, unsigned * height, int * xoffset, int * yoffset, int font){
|
||||
int x = 0, y = 0;
|
||||
int lowestx = 0, lowesty = 0, highestx = 0, highesty = 0;
|
||||
|
||||
|
|
@ -30,19 +30,22 @@ static void FindStringSize(const wchar_t * String, unsigned * width, unsigned *
|
|||
int error = FT_Load_Char(FontFace, letter, FT_LOAD_RENDER);
|
||||
if(error) continue;
|
||||
|
||||
if(x < lowestx) lowestx = x;
|
||||
if(y < lowesty) lowesty = y;
|
||||
int bottomx = x + FontFace->glyph->bitmap_left;
|
||||
int bottomy = y + FontFace->glyph->bitmap_top - FontFace->glyph->bitmap.rows;
|
||||
if(bottomx < lowestx) lowestx = bottomx;
|
||||
if(bottomy < lowesty) lowesty = bottomy;
|
||||
|
||||
int newx = x + FontFace->glyph->bitmap.width + FontFace->glyph->bitmap_left;
|
||||
int newy = y + FontFace->glyph->bitmap_top;
|
||||
if(newx > highestx) highestx = newx;
|
||||
if(newy > highesty) highesty = newy;
|
||||
int topx = x + FontFace->glyph->bitmap_left + FontFace->glyph->bitmap.width;
|
||||
int topy = y + FontFace->glyph->bitmap_top;
|
||||
if(topx > highestx) highestx = topx;
|
||||
if(topy > highesty) highesty = topy;
|
||||
|
||||
x += FontFace->glyph->advance.x >> 6;
|
||||
y += FontFace->glyph->advance.y >> 6;
|
||||
}
|
||||
|
||||
*width = highestx-lowestx, *height = highesty-lowesty;
|
||||
*xoffset = -lowestx, *yoffset = -lowesty;
|
||||
}
|
||||
|
||||
void DrawText(Image_t * Image, const wchar_t * String, int x, int y, unsigned width, unsigned height,
|
||||
|
|
@ -52,13 +55,11 @@ void DrawText(Image_t * Image, const wchar_t * String, int x, int y, unsigned wi
|
|||
//The destination image must be stored in bottom-up order.
|
||||
|
||||
if(x >= (signed)Image->Width || y >= (signed)Image->Height) return;
|
||||
|
||||
int Blue = GetBValue(Color), Green = GetGValue(Color), Red = GetRValue(Color);
|
||||
|
||||
//(stringx,stringy) will refer to the top-left of the string in bottom-up coordinates
|
||||
int stringx, stringy;
|
||||
unsigned StringWidth, StringHeight;
|
||||
FindStringSize(String, &StringWidth, &StringHeight, font);
|
||||
FindStringSize(String, &StringWidth, &StringHeight, &stringx, &stringy, font);
|
||||
|
||||
//Horizontal alignment
|
||||
if(Alignment < 2) stringx = x; //Left
|
||||
|
|
@ -98,11 +99,11 @@ void DrawText(Image_t * Image, const wchar_t * String, int x, int y, unsigned wi
|
|||
|
||||
int originalcolor;
|
||||
originalcolor = *ptr;
|
||||
*ptr++ = (uint8_t) (originalcolor + (int)((Blue-originalcolor)*2*value+255)/510);
|
||||
*ptr++ = (uint8_t) (originalcolor + (int)((GetBValue(Color)-originalcolor)*2*value+255)/510);
|
||||
originalcolor = *ptr;
|
||||
*ptr++ = (uint8_t) (originalcolor + (int)((Green-originalcolor)*2*value+255)/510);
|
||||
*ptr++ = (uint8_t) (originalcolor + (int)((GetGValue(Color)-originalcolor)*2*value+255)/510);
|
||||
originalcolor = *ptr;
|
||||
*ptr++ = (uint8_t) (originalcolor + (int)((Red-originalcolor)*2*value+255)/510);
|
||||
*ptr++ = (uint8_t) (originalcolor + (int)((GetRValue(Color)-originalcolor)*2*value+255)/510);
|
||||
}
|
||||
}
|
||||
stringx -= FontFace->glyph->bitmap_left;
|
||||
|
|
@ -115,4 +116,61 @@ void DrawText(Image_t * Image, const wchar_t * String, int x, int y, unsigned wi
|
|||
}
|
||||
}
|
||||
|
||||
Image_t * StringImage(const wchar_t * String, int font, COLORREF Color){
|
||||
Image_t * Image = (Image_t*) malloc(sizeof(Image_t));
|
||||
if(Image == NULL) return NULL;
|
||||
|
||||
unsigned StringWidth, StringHeight;
|
||||
int stringx, stringy;
|
||||
FindStringSize(String, &StringWidth, &StringHeight, &stringx, &stringy, font);
|
||||
|
||||
Image->Data = (uint8_t*) malloc(4 * StringWidth * StringHeight);
|
||||
if(Image->Data == NULL){
|
||||
free(Image);
|
||||
return NULL;
|
||||
}
|
||||
for(unsigned i=0; i<4*StringWidth*StringHeight;){
|
||||
Image->Data[i++] = GetBValue(Color);
|
||||
Image->Data[i++] = GetGValue(Color);
|
||||
Image->Data[i++] = GetRValue(Color);
|
||||
Image->Data[i++] = 0;
|
||||
}
|
||||
|
||||
for(wchar_t letter=*String; letter!='\0'; letter=*(++String)){
|
||||
int error = FT_Load_Char(FontFace, letter, FT_LOAD_RENDER);
|
||||
if(error) continue;
|
||||
|
||||
int cWidth = FontFace->glyph->bitmap.width, cHeight = FontFace->glyph->bitmap.rows;
|
||||
if(cWidth && cHeight){
|
||||
uint8_t * cRender; /* Convert to Bottom-up */
|
||||
uint8_t * OriginalRender = FontFace->glyph->bitmap.buffer;
|
||||
if(FontFace->glyph->bitmap.pitch > 0){
|
||||
cRender = (uint8_t *) malloc(cWidth * cHeight);
|
||||
for(int i=0; i<cHeight; i++)
|
||||
memcpy(cRender + i*cWidth, OriginalRender + (cHeight-i-1)*cWidth, cWidth);
|
||||
}else cRender = OriginalRender;
|
||||
|
||||
stringx += FontFace->glyph->bitmap_left;
|
||||
stringy += FontFace->glyph->bitmap_top-cHeight;
|
||||
for(int i=0; i<cHeight; i++){
|
||||
for(int j=0; j<cWidth; j++){
|
||||
uint8_t *ptr = Image->Data + 4*((stringy+i)*StringWidth + (stringx+j));
|
||||
ptr[3] = cRender[i*cWidth + j];
|
||||
}
|
||||
}
|
||||
stringx -= FontFace->glyph->bitmap_left;
|
||||
stringy -= FontFace->glyph->bitmap_top-cHeight;
|
||||
|
||||
if(FontFace->glyph->bitmap.pitch > 0) free(cRender);
|
||||
}
|
||||
stringx += FontFace->glyph->advance.x >> 6;
|
||||
stringy += FontFace->glyph->advance.y >> 6;
|
||||
}
|
||||
|
||||
Image->Width = StringWidth;
|
||||
Image->Height = StringHeight;
|
||||
Image->Format = FIMG_BGRA32;
|
||||
return Image;
|
||||
}
|
||||
|
||||
}
|
||||
|
|
@ -42,4 +42,5 @@ namespace Graphics {
|
|||
extern FT_Face FontFace;
|
||||
void DrawText(Image_t * Image, const wchar_t * String, int x, int y, unsigned width, unsigned height,
|
||||
TextAlignment Alignment, int font, COLORREF Color);
|
||||
Image_t * StringImage(const wchar_t * String, int font, COLORREF Color);
|
||||
}
|
||||
|
|
@ -96,8 +96,9 @@ int InitGL(){
|
|||
glEnable(GL_CULL_FACE);
|
||||
glEnable(GL_RESCALE_NORMAL);
|
||||
glEnable(GL_TEXTURE_2D);
|
||||
glDisable(GL_BLEND);
|
||||
glEnable(GL_BLEND);
|
||||
glDepthFunc(GL_LEQUAL);
|
||||
glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);
|
||||
glHint(GL_PERSPECTIVE_CORRECTION_HINT, GL_NICEST);
|
||||
return 0;
|
||||
}
|
||||
|
|
|
|||
|
|
@ -53,27 +53,62 @@ class Scene {
|
|||
virtual ~Scene() {};
|
||||
};
|
||||
|
||||
static const wchar_t * const StatusStrings[] = {
|
||||
L"Extruding Terrain Web",
|
||||
L"Adjusting Emotional Weights",
|
||||
L"Calibrating Personality Matrix",
|
||||
|
||||
L"Calculating Domestic Coefficients",
|
||||
L"Readjusting Career Ladder",
|
||||
L"Accessing Money Supply",
|
||||
L"Hacking the Social Network",
|
||||
L"Tweaking Chaos Control",
|
||||
L"Downloading Reticulated Splines"
|
||||
};
|
||||
|
||||
enum {
|
||||
IMG_COPYRIGHT,
|
||||
IMG_STATUS, //value = 1..9
|
||||
IMG_COUNT = 10
|
||||
};
|
||||
|
||||
enum {
|
||||
TEX_EAGAMES,
|
||||
TEX_MAXIS,
|
||||
TEX_SETUP,
|
||||
TEX_COUNT
|
||||
TEX_COPYRIGHT,
|
||||
TEX_STATUS, //value = 4..12
|
||||
TEX_COUNT = 13
|
||||
};
|
||||
|
||||
static const char * const images[] = {"eagames.bmp", "maxis.png", "setup.bmp"};
|
||||
|
||||
enum {
|
||||
SND_LOADLOOP,
|
||||
SND_COUNT
|
||||
};
|
||||
static const char * const sounds[] = {"loadloop.wav"};
|
||||
|
||||
class LoginScreen : public Scene {
|
||||
enum { Screen_EAGames, Screen_Maxis, Screen_Setup } Screen;
|
||||
float Time;
|
||||
float ScrollPos;
|
||||
Image_t * image[IMG_COUNT];
|
||||
GLuint texture[TEX_COUNT];
|
||||
PlayableSound_t * sound[SND_COUNT];
|
||||
|
||||
public:
|
||||
LoginScreen() : Scene(1.0f/15){
|
||||
LoginScreen() : Scene(0){
|
||||
Screen = Screen_EAGames;
|
||||
Time = 0;
|
||||
ScrollPos = -1;
|
||||
memset(image, 0, IMG_COUNT * sizeof(Image_t *));
|
||||
memset(texture, 0, TEX_COUNT * sizeof(GLuint));
|
||||
memset(sound, 0, SND_COUNT * sizeof(PlayableSound_t *));
|
||||
|
||||
glMatrixMode(GL_TEXTURE);
|
||||
glGenTextures(TEX_COUNT, texture);
|
||||
|
||||
for(int i=0; i<TEX_COUNT; i++){
|
||||
for(int i=TEX_EAGAMES; i<=TEX_SETUP; i++){
|
||||
Image_t * Image = File::ReadImageFile(images[i]);
|
||||
if(!Image){
|
||||
const char * Message;
|
||||
|
|
@ -117,15 +152,100 @@ class LoginScreen : public Scene {
|
|||
free(Image->Data);
|
||||
free(Image);
|
||||
}
|
||||
|
||||
image[IMG_COPYRIGHT] = Graphics::StringImage(L"(c) 2002, 2003 Electronic Arts Inc. All rights reserved.",
|
||||
0, RGB(0xef, 0xe3, 0x8c));
|
||||
if(image[IMG_COPYRIGHT] == NULL){
|
||||
EXIT_SCENE();
|
||||
}
|
||||
glBindTexture(GL_TEXTURE_2D, texture[TEX_COPYRIGHT]);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
|
||||
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, image[IMG_COPYRIGHT]->Width, image[IMG_COPYRIGHT]->Height, 0, GL_BGRA,
|
||||
GL_UNSIGNED_BYTE, image[IMG_COPYRIGHT]->Data);
|
||||
free(image[IMG_COPYRIGHT]->Data);
|
||||
|
||||
for(int i=0; i<9; i++){
|
||||
image[IMG_STATUS+i] = Graphics::StringImage(StatusStrings[i], 0, RGB(0xef, 0xe3, 0x8c));
|
||||
if(image[IMG_STATUS+i] == NULL){
|
||||
EXIT_SCENE();
|
||||
}
|
||||
glBindTexture(GL_TEXTURE_2D, texture[TEX_STATUS+i]);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MIN_FILTER, GL_NEAREST);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_MAG_FILTER, GL_NEAREST);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_S, GL_CLAMP);
|
||||
glTexParameteri(GL_TEXTURE_2D, GL_TEXTURE_WRAP_T, GL_CLAMP);
|
||||
glTexImage2D(GL_TEXTURE_2D, 0, GL_RGBA8, image[IMG_STATUS+i]->Width, image[IMG_STATUS+i]->Height, 0, GL_BGRA,
|
||||
GL_UNSIGNED_BYTE, image[IMG_STATUS+i]->Data);
|
||||
free(image[IMG_STATUS+i]->Data);
|
||||
}
|
||||
|
||||
for(int i=0; i<SND_COUNT; i++){
|
||||
Sound_t * Sound = File::ReadSoundFile(sounds[i]);
|
||||
if(!Sound){
|
||||
const char * Message;
|
||||
switch(File::Error){
|
||||
case FERR_NOT_FOUND:
|
||||
Message = "%s does not exist.";
|
||||
break;
|
||||
case FERR_OPEN:
|
||||
Message = "%s could not be opened for reading.";
|
||||
break;
|
||||
case FERR_BLANK:
|
||||
case FERR_UNRECOGNIZED:
|
||||
case FERR_INVALIDDATA:
|
||||
Message = "%s is corrupt or invalid.";
|
||||
break;
|
||||
case FERR_MEMORY:
|
||||
Message = "Memory for %s could not be allocated.";
|
||||
break;
|
||||
default:
|
||||
Message = "%s could not be read.";
|
||||
}
|
||||
|
||||
char Buffer[1024];
|
||||
sprintf(Buffer, Message, sounds[i]);
|
||||
MessageBox(Window::hWnd, Buffer, NULL, MB_OK | MB_ICONERROR);
|
||||
EXIT_SCENE();
|
||||
}
|
||||
|
||||
sound[i] = Audio::LoadSound(Sound);
|
||||
free(Sound);
|
||||
if(!sound){
|
||||
MessageBox(Window::hWnd, "Sound could not be created", NULL, MB_OK | MB_ICONERROR);
|
||||
EXIT_SCENE();
|
||||
}
|
||||
Audio::PlaySound(sound[i]);
|
||||
}
|
||||
}
|
||||
|
||||
~LoginScreen(){
|
||||
for(int i=0; i<IMG_COUNT; i++){ if(image[i]) free(image[i]); }
|
||||
glDeleteTextures(TEX_COUNT, texture);
|
||||
|
||||
for(int i=0; i<SND_COUNT; i++){
|
||||
if(sound[i]){
|
||||
Audio::DeleteSound(sound[i]);
|
||||
free(sound[i]->Data);
|
||||
free(sound[i]);
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private:
|
||||
int Run(float TimeDelta){
|
||||
Time += TimeDelta;
|
||||
if(ScrollPos != 8){
|
||||
ScrollPos += TimeDelta*0.75;
|
||||
if(ScrollPos > 8) ScrollPos = 8;
|
||||
}
|
||||
|
||||
if(Screen != Screen_Setup && Time >= 4.0){
|
||||
Screen = (Screen==Screen_EAGames) ? Screen_Maxis : Screen_Setup;
|
||||
Time = 0;
|
||||
}
|
||||
|
||||
if(System::UserInput.CloseWindow){
|
||||
return SCENE_EXIT;
|
||||
|
|
@ -136,12 +256,34 @@ class LoginScreen : public Scene {
|
|||
public:
|
||||
void Render(){
|
||||
glMatrixMode(GL_TEXTURE);
|
||||
glBindTexture(GL_TEXTURE_2D, texture[(Time>=4) + (Time>=8)]);
|
||||
|
||||
//Background
|
||||
glBindTexture(GL_TEXTURE_2D, texture[Screen]);
|
||||
glBegin(GL_QUADS);
|
||||
glTexCoord2i(0,0); glVertex2i(0,0);
|
||||
glTexCoord2i(1,0); glVertex2i(800,0);
|
||||
glTexCoord2i(1,1); glVertex2i(800,600);
|
||||
glTexCoord2i(0,1); glVertex2i(0,600);
|
||||
glEnd();
|
||||
|
||||
if(Screen != Screen_Setup) return;
|
||||
|
||||
glBindTexture(GL_TEXTURE_2D, texture[TEX_COPYRIGHT]);
|
||||
glBegin(GL_QUADS);
|
||||
glTexCoord2i(0,0); glVertex2i((800-image[IMG_COPYRIGHT]->Width)/2,58);
|
||||
glTexCoord2i(1,0); glVertex2i((800-image[IMG_COPYRIGHT]->Width)/2 + image[IMG_COPYRIGHT]->Width,58);
|
||||
glTexCoord2i(1,1); glVertex2i((800-image[IMG_COPYRIGHT]->Width)/2 + image[IMG_COPYRIGHT]->Width,image[IMG_COPYRIGHT]->Height + 58);
|
||||
glTexCoord2i(0,1); glVertex2i((800-image[IMG_COPYRIGHT]->Width)/2,image[IMG_COPYRIGHT]->Height + 58);
|
||||
glEnd();
|
||||
|
||||
for(int i=0; i<9; i++){
|
||||
glBindTexture(GL_TEXTURE_2D, texture[TEX_STATUS+i]);
|
||||
glBegin(GL_QUADS);
|
||||
glTexCoord2i(0,0); glVertex2i(((float)i - ScrollPos)*800 + (800-image[IMG_STATUS+i]->Width)/2,20);
|
||||
glTexCoord2i(1,0); glVertex2i(((float)i - ScrollPos)*800 + (800-image[IMG_STATUS+i]->Width)/2 + image[IMG_STATUS+i]->Width,20);
|
||||
glTexCoord2i(1,1); glVertex2i(((float)i - ScrollPos)*800 + (800-image[IMG_STATUS+i]->Width)/2 + image[IMG_STATUS+i]->Width,image[IMG_STATUS+i]->Height + 20);
|
||||
glTexCoord2i(0,1); glVertex2i(((float)i - ScrollPos)*800 + (800-image[IMG_STATUS+i]->Width)/2,image[IMG_STATUS+i]->Height + 20);
|
||||
glEnd();
|
||||
}
|
||||
}
|
||||
};
|
||||
|
|
@ -17,11 +17,7 @@
|
|||
#include <stdint.h>
|
||||
#include <memory.h>
|
||||
#include <stdio.h>
|
||||
#include <setjmp.h> //Used by libpng
|
||||
#include "bmp/read_bmp.h"
|
||||
#include "libjpeg-turbo/jpeglib.h"
|
||||
#include "libpng/png.h"
|
||||
#define NOWINDOWS
|
||||
#include "wav/read_wav.h"
|
||||
#include "FileHandler.hpp"
|
||||
|
||||
namespace File {
|
||||
|
|
@ -34,10 +30,10 @@ enum SoundType {
|
|||
FSND_COUNT
|
||||
};
|
||||
|
||||
static uint8_t * ReadWAV(Image_t * Image, const uint8_t * InData, size_t FileSize);
|
||||
static uint8_t * ReadXA(Image_t * Image, const uint8_t * InData, size_t FileSize);
|
||||
static uint8_t * ReadUTK(Image_t * Image, const uint8_t * InData, size_t FileSize);
|
||||
static uint8_t * ReadMP3(Image_t * Image, const uint8_t * InData, size_t FileSize);
|
||||
static uint8_t * ReadWAV(Sound_t * Sound, const uint8_t * InData, size_t FileSize);
|
||||
static uint8_t * ReadXA(Sound_t * Sound, const uint8_t * InData, size_t FileSize);
|
||||
static uint8_t * ReadUTK(Sound_t * Sound, const uint8_t * InData, size_t FileSize);
|
||||
static uint8_t * ReadMP3(Sound_t * Sound, const uint8_t * InData, size_t FileSize);
|
||||
|
||||
static const uint8_t Signature[] = {
|
||||
'R', //WAV
|
||||
|
|
@ -45,14 +41,14 @@ static const uint8_t Signature[] = {
|
|||
'U', //UTK
|
||||
0xFF //MP3
|
||||
};
|
||||
static uint8_t* (* const ImageFunction[])(Image_t*, const uint8_t*, size_t) = {
|
||||
static uint8_t* (* const SoundFunction[])(Sound_t*, const uint8_t*, size_t) = {
|
||||
ReadWAV,
|
||||
ReadXA,
|
||||
ReadUTK,
|
||||
ReadMP3
|
||||
};
|
||||
|
||||
Image_t * ReadImageFile(const char * Filename){
|
||||
Sound_t * ReadSoundFile(const char * Filename){
|
||||
uint8_t * InData = File::ReadFile(Filename);
|
||||
if(InData == NULL) return NULL;
|
||||
|
||||
|
|
@ -62,23 +58,22 @@ Image_t * ReadImageFile(const char * Filename){
|
|||
return NULL;
|
||||
}
|
||||
|
||||
Image_t * Image = (Image_t*) malloc(sizeof(Image_t));
|
||||
if(Image == NULL){
|
||||
Sound_t * Sound = (Sound_t*) malloc(sizeof(Sound_t));
|
||||
if(Sound == NULL){
|
||||
free(InData);
|
||||
File::Error = FERR_MEMORY;
|
||||
return NULL;
|
||||
}
|
||||
|
||||
uint8_t * OutData = NULL;
|
||||
for(int i=0; i<FIMG_COUNT; i++){
|
||||
for(int i=0; i<FSND_COUNT; i++){
|
||||
if(InData[0] == Signature[i]){
|
||||
OutData = ImageFunction[i](Image, InData, File::FileSize);
|
||||
uint8_t * OutData = SoundFunction[i](Sound, InData, File::FileSize);
|
||||
free(InData);
|
||||
if(OutData == NULL){
|
||||
File::Error = FERR_INVALIDDATA;
|
||||
return NULL;
|
||||
}
|
||||
return Image;
|
||||
return Sound;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
@ -87,135 +82,29 @@ Image_t * ReadImageFile(const char * Filename){
|
|||
return NULL;
|
||||
}
|
||||
|
||||
static uint8_t * ReadBMP(Image_t * Image, const uint8_t * InData, size_t FileSize){
|
||||
bmpheader_t BMPHeader;
|
||||
if(!bmp_read_header(&BMPHeader, InData, FileSize)){
|
||||
static uint8_t * ReadWAV(Sound_t * Sound, const uint8_t * InData, size_t FileSize){
|
||||
wavheader_t WAVHeader;
|
||||
if(!wav_read_header(&WAVHeader, InData, FileSize)){
|
||||
return NULL;
|
||||
}
|
||||
|
||||
uint8_t * OutData = (uint8_t*) malloc(BMPHeader.DecompressedSize);
|
||||
uint8_t * OutData = (uint8_t*) malloc(WAVHeader.DataSize);
|
||||
if(OutData == NULL){
|
||||
return NULL;
|
||||
}
|
||||
if(!bmp_read_data(&BMPHeader, InData, OutData)){
|
||||
free(OutData);
|
||||
return NULL;
|
||||
}
|
||||
memcpy(OutData, InData+44, WAVHeader.DataSize);
|
||||
|
||||
Image->Width = BMPHeader.biWidth;
|
||||
Image->Height = BMPHeader.biHeight;
|
||||
Image->Format = FIMG_BGR24;
|
||||
Image->Data = OutData;
|
||||
Sound->Channels = WAVHeader.nChannels;
|
||||
Sound->SamplingRate = WAVHeader.nSamplesPerSec;
|
||||
Sound->BitDepth = WAVHeader.wBitsPerSample;
|
||||
Sound->Duration = WAVHeader.DataSize / WAVHeader.nBlockAlign;
|
||||
Sound->Data = OutData;
|
||||
return OutData;
|
||||
}
|
||||
|
||||
static uint8_t * ReadJPG(Image_t * Image, const uint8_t * InData, size_t FileSize){
|
||||
//Initialize
|
||||
jpeg_decompress_struct cinfo;
|
||||
jpeg_error_mgr jerr;
|
||||
cinfo.err = jpeg_std_error(&jerr);
|
||||
jpeg_create_decompress(&cinfo);
|
||||
jpeg_mem_src(&cinfo, (unsigned char*) InData, FileSize);
|
||||
if(jpeg_read_header(&cinfo, TRUE) != JPEG_HEADER_OK){
|
||||
jpeg_destroy_decompress(&cinfo);
|
||||
return NULL;
|
||||
}
|
||||
cinfo.out_color_space = JCS_EXT_BGR;
|
||||
if(!jpeg_start_decompress(&cinfo)){
|
||||
jpeg_destroy_decompress(&cinfo);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
//Read
|
||||
unsigned row_stride = cinfo.output_width * cinfo.output_components;
|
||||
uint8_t * OutData = (uint8_t*) malloc(cinfo.output_width * cinfo.output_height * cinfo.output_components);
|
||||
if(OutData == NULL){
|
||||
jpeg_finish_decompress(&cinfo);
|
||||
jpeg_destroy_decompress(&cinfo);
|
||||
return NULL;
|
||||
}
|
||||
for(unsigned i=cinfo.output_height; i; i--){
|
||||
//According to the libjpeg documentation,
|
||||
//jpeg_read_scanlines can only really read 1 scanline at a time.
|
||||
//We need to convert to bottom-up format anyway.
|
||||
uint8_t * Location = OutData + (i-1)*row_stride;
|
||||
if(!jpeg_read_scanlines(&cinfo, &Location, 1)){
|
||||
free(OutData);
|
||||
jpeg_finish_decompress(&cinfo);
|
||||
jpeg_destroy_decompress(&cinfo);
|
||||
return NULL;
|
||||
}
|
||||
}
|
||||
|
||||
//Close up
|
||||
jpeg_finish_decompress(&cinfo);
|
||||
jpeg_destroy_decompress(&cinfo);
|
||||
if(Image){
|
||||
Image->Width = cinfo.output_width;
|
||||
Image->Height = cinfo.output_height;
|
||||
Image->Format = FIMG_BGR24;
|
||||
Image->Data = OutData;
|
||||
}
|
||||
return OutData;
|
||||
}
|
||||
|
||||
struct pngdata_t {
|
||||
const uint8_t * buffer;
|
||||
size_t size;
|
||||
};
|
||||
static void user_read_data(png_structp png_ptr, png_bytep data, png_size_t length){
|
||||
pngdata_t *pngdata = (pngdata_t *) png_get_io_ptr(png_ptr);
|
||||
if(length > pngdata->size) png_error(png_ptr, "");
|
||||
memcpy(data, pngdata->buffer, length);
|
||||
pngdata->buffer += length;
|
||||
pngdata->size -= length;
|
||||
}
|
||||
static uint8_t * ReadPNG(Image_t * Image, const uint8_t * InData, size_t FileSize){
|
||||
pngdata_t pngdata;
|
||||
|
||||
png_structp png_ptr = png_create_read_struct(PNG_LIBPNG_VER_STRING, NULL, NULL, NULL);
|
||||
if(png_ptr == NULL) return 0;
|
||||
png_infop info_ptr = png_create_info_struct(png_ptr);
|
||||
if(info_ptr == NULL){
|
||||
png_destroy_read_struct(&png_ptr, NULL, NULL);
|
||||
return NULL;
|
||||
}
|
||||
if(setjmp(png_jmpbuf(png_ptr))){
|
||||
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
pngdata.buffer = InData;
|
||||
pngdata.size = FileSize;
|
||||
png_set_read_fn(png_ptr, &pngdata, user_read_data);
|
||||
png_set_user_limits(png_ptr, 4096, 4096);
|
||||
png_read_png(png_ptr, info_ptr,
|
||||
PNG_TRANSFORM_STRIP_16 | PNG_TRANSFORM_STRIP_ALPHA |
|
||||
PNG_TRANSFORM_PACKING | PNG_TRANSFORM_GRAY_TO_RGB | PNG_TRANSFORM_BGR, NULL);
|
||||
|
||||
//png_get_IHDR does not work in high-level mode.
|
||||
unsigned width = png_get_image_width(png_ptr, info_ptr);
|
||||
unsigned height = png_get_image_height(png_ptr, info_ptr);
|
||||
uint8_t * OutData = (uint8_t *) malloc(width*height*3);
|
||||
if(OutData == NULL){
|
||||
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
|
||||
return NULL;
|
||||
}
|
||||
|
||||
uint8_t **Scanlines = png_get_rows(png_ptr, info_ptr);
|
||||
for(unsigned i=0; i<height; i++)
|
||||
memcpy(OutData + i*width*3, Scanlines[height-i-1], width*3);
|
||||
|
||||
png_destroy_read_struct(&png_ptr, &info_ptr, NULL);
|
||||
Image->Width = width;
|
||||
Image->Height = height;
|
||||
Image->Format = FIMG_BGR24;
|
||||
Image->Data = OutData;
|
||||
return OutData;
|
||||
}
|
||||
|
||||
static uint8_t * ReadTGA(Image_t * Image, const uint8_t * InData, size_t FileSize){
|
||||
return NULL;
|
||||
}
|
||||
static uint8_t * ReadXA(Sound_t * Sound, const uint8_t * InData, size_t FileSize){};
|
||||
static uint8_t * ReadUTK(Sound_t * Sound, const uint8_t * InData, size_t FileSize){};
|
||||
static uint8_t * ReadMP3(Sound_t * Sound, const uint8_t * InData, size_t FileSize){};
|
||||
|
||||
}
|
||||
|
|
@ -16,12 +16,14 @@ set(FILEHANDLER_MAJOR 0)
|
|||
set(FILEHANDLER_MINOR 0)
|
||||
|
||||
set(FILEHANDLER_SOURCES
|
||||
Audio.cpp
|
||||
File.cpp
|
||||
Image.cpp
|
||||
bmp/read_bmp.c
|
||||
cst/cst.c
|
||||
iff/chunks.c
|
||||
iff/iff.c
|
||||
wav/read_wav.c
|
||||
)
|
||||
|
||||
include_directories(${CMAKE_SOURCE_DIR}/Libraries/FileHandler)
|
||||
|
|
|
|||
|
|
@ -42,7 +42,8 @@ enum FErr {
|
|||
};
|
||||
|
||||
enum ImageFormat_t {
|
||||
FIMG_BGR24
|
||||
FIMG_BGR24,
|
||||
FIMG_BGRA32
|
||||
};
|
||||
|
||||
struct Image_t {
|
||||
|
|
@ -51,7 +52,7 @@ struct Image_t {
|
|||
uint8_t * Data;
|
||||
};
|
||||
|
||||
struct Audio_t {
|
||||
struct Sound_t {
|
||||
unsigned Channels;
|
||||
unsigned SamplingRate;
|
||||
unsigned BitDepth;
|
||||
|
|
@ -66,7 +67,7 @@ extern size_t FileSize;
|
|||
|
||||
uint8_t * ReadFile(const char * Filename);
|
||||
Image_t * ReadImageFile(const char * Filename);
|
||||
Audio_t * ReadAudioFile(const char * Filename);
|
||||
Sound_t * ReadSoundFile(const char * Filename);
|
||||
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -69,10 +69,9 @@ Image_t * ReadImageFile(const char * Filename){
|
|||
return NULL;
|
||||
}
|
||||
|
||||
uint8_t * OutData = NULL;
|
||||
for(int i=0; i<FIMG_COUNT; i++){
|
||||
if(InData[0] == Signature[i]){
|
||||
OutData = ImageFunction[i](Image, InData, File::FileSize);
|
||||
uint8_t * OutData = ImageFunction[i](Image, InData, File::FileSize);
|
||||
free(InData);
|
||||
if(OutData == NULL){
|
||||
File::Error = FERR_INVALIDDATA;
|
||||
|
|
|
|||
|
|
@ -21,7 +21,7 @@
|
|||
#define BI_RGB 0
|
||||
#define BI_RLE8 1
|
||||
|
||||
#ifndef read_int32
|
||||
#ifndef read_uint32
|
||||
#define read_uint32(x) (unsigned)(((x)[0]<<(8*0)) | ((x)[1]<<(8*1)) | ((x)[2]<<(8*2)) | ((x)[3]<<(8*3)))
|
||||
#define read_uint16(x) (unsigned)(((x)[0]<<(8*0)) | ((x)[1]<<(8*1)))
|
||||
#endif
|
||||
|
|
@ -110,7 +110,7 @@ int bmp_read_data(bmpheader_t * BMPHeader, const uint8_t *__restrict InBuffer, u
|
|||
|
||||
if(command == 0){
|
||||
if(value == 0) continue; /* End of scanline reminder */
|
||||
if(value == 1) return 1; /* End of bitmap reminder */
|
||||
if(value == 1) return (InBuffer == srcend && OutBuffer == destend); /* End of bitmap reminder */
|
||||
if(value == 2) return 0; /* Delta, used for ICO/CUR masks; wrong kind of bitmap */
|
||||
|
||||
/* Absolute copy */
|
||||
|
|
|
|||
|
|
@ -0,0 +1,59 @@
|
|||
/*
|
||||
read_wav.c - Copyright (c) 2012 Fatbag <X-Fi6@phppoll.org>
|
||||
|
||||
Permission to use, copy, modify, and/or distribute this software for any
|
||||
purpose with or without fee is hereby granted, provided that the above
|
||||
copyright notice and this permission notice appear in all copies.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
#include <stdint.h>
|
||||
#include <string.h>
|
||||
#include "read_wav.h"
|
||||
|
||||
#define WAVE_FORMAT_PCM 1
|
||||
|
||||
#ifndef read_uint32
|
||||
#define read_uint32(x) (unsigned)(((x)[0]<<(8*0)) | ((x)[1]<<(8*1)) | ((x)[2]<<(8*2)) | ((x)[3]<<(8*3)))
|
||||
#define read_uint16(x) (unsigned)(((x)[0]<<(8*0)) | ((x)[1]<<(8*1)))
|
||||
#endif
|
||||
|
||||
#ifndef __restrict
|
||||
#define __restrict
|
||||
#endif
|
||||
|
||||
int wav_read_header(wavheader_t * WAVHeader, const uint8_t * Buffer, size_t FileSize){
|
||||
if(FileSize < 45) return 0;
|
||||
WAVHeader->sID = read_uint32(Buffer);
|
||||
WAVHeader->Size = read_uint32(Buffer+4);
|
||||
WAVHeader->DataType = read_uint32(Buffer+8);
|
||||
WAVHeader->FmtID = read_uint32(Buffer+12);
|
||||
WAVHeader->FmtSize = read_uint32(Buffer+16);
|
||||
WAVHeader->wFormatTag = read_uint16(Buffer+20);
|
||||
WAVHeader->nChannels = read_uint16(Buffer+22);
|
||||
WAVHeader->nSamplesPerSec = read_uint32(Buffer+24);
|
||||
WAVHeader->nAvgBytesPerSec = read_uint32(Buffer+28);
|
||||
WAVHeader->nBlockAlign = read_uint16(Buffer+32);
|
||||
WAVHeader->wBitsPerSample = read_uint16(Buffer+34);
|
||||
WAVHeader->DataID = read_uint32(Buffer+36);
|
||||
WAVHeader->DataSize = read_uint32(Buffer+40);
|
||||
|
||||
if(WAVHeader->sID != 0x46464952 || WAVHeader->Size != FileSize-8 || WAVHeader->DataType != 0x45564157 ||
|
||||
WAVHeader->FmtID != 0x20746D66 || WAVHeader->FmtSize != 16 || WAVHeader->wFormatTag != WAVE_FORMAT_PCM ||
|
||||
WAVHeader->nChannels < 1 || WAVHeader->nChannels > 2 || WAVHeader->nSamplesPerSec == 0 ||
|
||||
(WAVHeader->nSamplesPerSec%8000 != 0 && WAVHeader->nSamplesPerSec%11025 != 0) || WAVHeader->nSamplesPerSec > 48000 ||
|
||||
WAVHeader->nAvgBytesPerSec != WAVHeader->nSamplesPerSec * WAVHeader->nBlockAlign ||
|
||||
WAVHeader->nBlockAlign != WAVHeader->nChannels * WAVHeader->wBitsPerSample >> 3 ||
|
||||
(WAVHeader->wBitsPerSample != 8 && WAVHeader->wBitsPerSample != 16) || WAVHeader->DataID != 0x61746164 ||
|
||||
WAVHeader->DataSize != FileSize - 44 || WAVHeader->DataSize % WAVHeader->nBlockAlign != 0
|
||||
) return 0;
|
||||
|
||||
return 1;
|
||||
}
|
||||
|
|
@ -0,0 +1,42 @@
|
|||
/*
|
||||
read_wav.h - Copyright (c) 2012 Fatbag <X-Fi6@phppoll.org>
|
||||
|
||||
Permission to use, copy, modify, and/or distribute this software for any
|
||||
purpose with or without fee is hereby granted, provided that the above
|
||||
copyright notice and this permission notice appear in all copies.
|
||||
|
||||
THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
|
||||
WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
|
||||
MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
|
||||
ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
|
||||
WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
|
||||
ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
*/
|
||||
|
||||
typedef struct
|
||||
{
|
||||
uint32_t sID;
|
||||
uint32_t Size;
|
||||
uint32_t DataType;
|
||||
uint32_t FmtID;
|
||||
uint32_t FmtSize;
|
||||
uint16_t wFormatTag;
|
||||
uint16_t nChannels;
|
||||
uint32_t nSamplesPerSec;
|
||||
uint32_t nAvgBytesPerSec;
|
||||
uint16_t nBlockAlign;
|
||||
uint16_t wBitsPerSample;
|
||||
uint32_t DataID;
|
||||
uint32_t DataSize;
|
||||
} wavheader_t;
|
||||
|
||||
#ifdef __cplusplus
|
||||
extern "C" {
|
||||
#endif
|
||||
|
||||
int wav_read_header(wavheader_t * WAVHeader, const uint8_t * Buffer, size_t FileSize);
|
||||
|
||||
#ifdef __cplusplus
|
||||
}
|
||||
#endif
|
||||
Loading…
Add table
Reference in a new issue