Backups/librw
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

made most things build on linux again

Browse Source
This commit is contained in:
aap
2016-01-10 20:10:53 +01:00
parent 79c89ebbba
commit 0aadf8c3c9
19 changed files with 148 additions and 179 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
tools/dumprwtree/Makefile Normal file
View File

@ -0,0 +1,16 @@
# null, opengl
BUILD=null
# e.g. null -> -DRW_NULL
BUILDDEF:=$(shell echo $(BUILD) | tr a-z A-Z | sed 's/^/-DRW_/')
SRC := dumprwtree.cpp
OUT := dumprwtree
INC := -I/usr/local/include -I../..
CFLAGS=-Wall -Wextra -g $(BUILDDEF) -Wno-parentheses -Wno-write-strings #-Wconversion
LIB=../../librw-$(BUILD).a
$(OUT): $(SRC) $(LIB)
$(CXX) $(CFLAGS) $(INC) $(SRC) $(LIB) -o $(OUT)
clean:
rm -f $(OUT)

16
tools/insttest/Makefile Normal file
View File

@ -0,0 +1,16 @@
# null, opengl
BUILD=null
# e.g. null -> -DRW_NULL
BUILDDEF:=$(shell echo $(BUILD) | tr a-z A-Z | sed 's/^/-DRW_/')
SRC := insttest.cpp
OUT := insttest
INC := -I/usr/local/include -I../..
CFLAGS=-Wall -Wextra -g $(BUILDDEF) -Wno-parentheses -Wno-write-strings #-Wconversion
LIB=../../librw-$(BUILD).a
$(OUT): $(SRC) $(LIB)
$(CXX) $(CFLAGS) $(INC) $(SRC) $(LIB) -o $(OUT)
clean:
rm -f $(OUT)

2
tools/insttest/insttest.cpp
View File

@ -11,7 +11,7 @@
using namespace std;
using namespace rw;
struct {
static struct {
char *str;
uint32 val;
} platforms[] = {

16
tools/rsltest/Makefile Normal file
View File

@ -0,0 +1,16 @@
# null, opengl
BUILD=null
# e.g. null -> -DRW_NULL
BUILDDEF:=$(shell echo $(BUILD) | tr a-z A-Z | sed 's/^/-DRW_/')
SRC := rsl.cpp rsltest.cpp
OUT := rsltest
INC := -I/usr/local/include -I../..
CFLAGS=-Wall -Wextra -g $(BUILDDEF) -Wno-parentheses -Wno-write-strings #-Wconversion
LIB=../../librw-$(BUILD).a
$(OUT): $(SRC) $(LIB)
$(CXX) $(CFLAGS) $(INC) $(SRC) $(LIB) -o $(OUT)
clean:
rm -f $(OUT)

16
tools/rsltest/rsl.cpp
View File

@ -3,6 +3,7 @@
#include <cstring>
#include <cassert>
#include <new>
#include <stddef.h>
#include <args.h>
#include <rw.h>
@ -12,9 +13,8 @@ using namespace std;
using namespace rw;
#include "rsl.h"
void rslMaterialListStreamRead(Stream *stream, RslMaterialList *matlist);
void hanimRead(Stream *stream, RslFrame *f);
void matfxRead(Stream *stream, RslMaterial *mat);
static void matfxRead(Stream *stream, RslMaterial *mat);
static void hanimRead(Stream *stream, RslFrame *f);
void
RslMatrixSetIdentity(RslMatrix *matrix)
@ -315,6 +315,8 @@ RslSkinStreamRead(Stream *stream, RslGeometry *g)
skin->numUsedBones = info;
skin->invMatrices = new float[skin->numBones*16];
stream->read(skin->invMatrices, skin->numBones*16*4);
// TODO: allocate...if we'd really care
(void)g;
return skin;
}
@ -440,7 +442,10 @@ RslMaterialCreate(void)
{
RslMaterial *mat = new RslMaterial;
mat->texture = NULL;
mat->color = RslRGBA{255, 255, 255, 255};
mat->color.red = 255;
mat->color.green = 255;
mat->color.blue = 255;
mat->color.alpha = 255;
mat->refCount = 1;
mat->matfx = NULL;
return mat;
@ -489,7 +494,7 @@ RslMatFXMaterialSetEffects(RslMaterial *mat, int32 effect)
}
}
void
static void
matfxRead(Stream *stream, RslMaterial *mat)
{
int32 effect = stream->readI32();
@ -506,6 +511,7 @@ matfxRead(Stream *stream, RslMaterial *mat)
case MatFX::ENVMAP:
coef = stream->readF32();
fbalpha = stream->readI32();
(void)fbalpha;
mfx->env.frame = NULL;
mfx->env.texture = RslTextureStreamRead(stream);
mfx->env.intensity = coef;

4
tools/rsltest/rsl.h
View File

@ -257,6 +257,8 @@ struct RslMaterialList {
int32 space;
};
void rslMaterialListStreamRead(Stream *stream, RslMaterialList *matlist);
struct RslGeometry {
RslObject object;
int16 refCount;
@ -467,4 +469,4 @@ struct World {
uint32 numTextures;
RslStreamHeader *textures; // stream headers
};
};

29
tools/rsltest/rsltest.cpp
View File

@ -17,7 +17,7 @@ char *argv0;
void
RslStream::relocate(void)
{
uint32 off = (uint32)this->data;
uint32 off = (uint32)(uintptr)this->data;
off -= 0x20;
*(uint32*)&this->reloc += off;
*(uint32*)&this->hashTab += off;
@ -44,7 +44,7 @@ RslMaterial *dumpMaterialCB(RslMaterial *material, void*)
material->texname, material->refCount);
if(material->matfx){
RslMatFX *fx = material->matfx;
printf(" matfx: ", fx->effectType);
printf(" matfx: %d", fx->effectType);
if(fx->effectType == 2)
printf("env[%s %f] ", fx->env.texname, fx->env.intensity);
printf("\n");
@ -176,18 +176,9 @@ convertMesh(Geometry *rwg, RslGeometry *g, int32 ii)
mask |= 0x10;
if(rwg->geoflags & Geometry::PRELIT)
mask |= 0x100;
float32 *verts = &rwg->morphTargets[0].vertices[rwg->numVertices*3];
float32 *norms = &rwg->morphTargets[0].normals[rwg->numVertices*3];
uint8 *cols = &rwg->colors[rwg->numVertices*4];
float32 *texCoords = &rwg->texCoords[0][rwg->numVertices*2];
uint8 *indices = NULL;
float32 *weights = NULL;
Skin *skin = *PLUGINOFFSET(Skin*, rwg, skinGlobals.offset);
if(skin){
indices = &skin->indices[rwg->numVertices*4];
weights = &skin->weights[rwg->numVertices*4];
if(skin)
mask |= 0x10000;
}
int16 *vuVerts = NULL;
int8 *vuNorms = NULL;
@ -198,7 +189,6 @@ convertMesh(Geometry *rwg, RslGeometry *g, int32 ii)
uint32 *w = (uint32*)p;
uint32 *end = (uint32*)(p + ((w[0] & 0xFFFF) + 1)*0x10);
w += 4;
int flags = 0;
int32 nvert;
bool first = 1;
while(w < end){
@ -613,7 +603,7 @@ convertTo32(uint8 *out, uint8 *pal, uint8 *tex,
}
}
RslTexture *dumpTextureCB(RslTexture *texture, void *pData)
RslTexture *dumpTextureCB(RslTexture *texture, void*)
{
uint32 f = texture->raster->ps2.flags;
uint32 w = 1 << (f & 0x3F);
@ -651,7 +641,7 @@ convertTexturePS2(RslTexture *texture, void *pData)
uint32 w = 1 << (f & 0x3F);
uint32 h = 1 << (f>>6 & 0x3F);
uint32 d = f>>12 & 0xFF;
uint32 mip = f>>20 & 0xF;
//uint32 mip = f>>20 & 0xF;
uint32 swizmask = f>>24;
uint8 *palette = getPalettePS2(texture->raster);
uint8 *texels = getTexelPS2(texture->raster, 0);
@ -824,14 +814,16 @@ main(int argc, char *argv[])
goto writeDff;
}
RslStream *rslstr = new RslStream;
RslStream *rslstr;
rslstr = new RslStream;
stream.read(rslstr, 0x20);
rslstr->data = new uint8[rslstr->fileSize-0x20];
stream.read(rslstr->data, rslstr->fileSize-0x20);
stream.close();
rslstr->relocate();
int largefile = rslstr->dataSize > 0x100000;
bool32 largefile;
largefile = rslstr->dataSize > 0x100000;
if(rslstr->ident == WRLD_IDENT && largefile){ // hack
world = (World*)rslstr->data;
@ -893,7 +885,8 @@ main(int argc, char *argv[])
printf(" %d, %d, %f %f %f\n", p->id &0x7FFF, p->resId, p->matrix[12], p->matrix[13], p->matrix[14]);
}
}else if(rslstr->ident == MDL_IDENT){
uint8 *p = *rslstr->hashTab;
uint8 *p;
p = *rslstr->hashTab;
p -= 0x24;
atomic = (RslAtomic*)p;
clump = atomic->clump;