random-mirrors/librw
1
0
Fork 0
mirror of https://github.com/aap/librw.git synced 2025-12-18 16:39:51 +00:00
Code Issues Packages Projects Releases Wiki Activity

fixed build for linux and ps2

Browse Source
This commit is contained in:
aap
2017-08-29 14:05:45 +02:00
parent d00ab2f526
commit 239a4eb4bc
17 changed files with 53 additions and 28 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/d3d/xboxskin.cpp
View File

@@ -134,13 +134,13 @@ skinInstanceCB(Geometry *geo, InstanceDataHeader *header)
int32 w[4];
int sum;
float *weights = skin->weights;
float32 *weights = skin->weights;
uint8 *p = vbuf;
int32 numVertices = header->numVertices;
while(numVertices--){
sum = 0;
for(int i = 1; i < skin->numWeights; i++){
w[i] = weights[i]*255.0f + 0.5f;
w[i] = (int32)(weights[i]*255.0f + 0.5f);
sum += w[i];
}
w[0] = 255 - sum;

2
src/geometry.cpp
View File

@@ -517,7 +517,7 @@ Geometry::buildMeshes(void)
// count indices per mesh
tri = this->triangles;
for(int32 i = 0; i < this->numTriangles; i++){
assert(tri->matId >= 0 && tri->matId < numMeshes);
assert(tri->matId < numMeshes);
numIndices[tri->matId] += 3;
tri++;
}

1
src/gl/gl3device.cpp
View File

@@ -628,3 +628,4 @@ Device renderdevice = {
}
#endif

1
src/gl/gl3matfx.cpp
View File

@@ -240,3 +240,4 @@ void initMatFX(void) { }
}
}

1
src/gl/gl3render.cpp
View File

@@ -115,3 +115,4 @@ defaultRenderCB(Atomic *atomic, InstanceDataHeader *header)
}
#endif

1
src/gl/gl3skin.cpp
View File

@@ -305,3 +305,4 @@ void initSkin(void) { }
}
}

3
src/ps2/ps2device.cpp
View File

@@ -32,6 +32,9 @@ Device renderdevice = {
null::setRenderState,
null::getRenderState,
null::im2DRenderIndexedPrimitive,
null::im3DTransform,
null::im3DRenderIndexed,
null::im3DEnd,
null::deviceSystem
};

3
src/render.cpp
View File

@@ -48,4 +48,5 @@ End(void)
}
}
}

2
src/rwobjects.h
View File

@@ -269,6 +269,8 @@ struct Texture
static Texture *(*findCB)(const char *name);
static Texture *(*readCB)(const char *name, const char *mask);
static void setLoadTextures(bool32);
static void setCreateDummies(bool32);
#ifndef RWPUBLIC
static void registerModule(void);

3
src/rwrender.h
View File

@@ -68,4 +68,5 @@ void End(void);
}
}
}

12
src/texture.cpp
View File

@@ -63,6 +63,18 @@ Texture::registerModule(void)
Engine::registerPlugin(sizeof(TextureGlobals), ID_TEXTUREMODULE, textureOpen, textureClose);
}
void
Texture::setLoadTextures(bool32 b)
{
TEXTUREGLOBAL(loadTextures) = b;
}
void
Texture::setCreateDummies(bool32 b)
{
TEXTUREGLOBAL(makeDummies) = b;
}
//
// TexDictionary
//

22
src/userdata.cpp
View File

@@ -284,33 +284,33 @@ remove(UserDataExtension *ext, int32 n)
#define ACCESSOR(TYPE, NAME) \
int32 \
UserDataArray::##NAME##Add(TYPE *t, const char *name, int32 datatype, int32 numElements) \
UserDataArray::NAME##Add(TYPE *t, const char *name, int32 datatype, int32 numElements) \
{ \
return add(PLUGINOFFSET(UserDataExtension, t, userDataGlobals.##NAME##Offset), \
return add(PLUGINOFFSET(UserDataExtension, t, userDataGlobals.NAME##Offset), \
name, datatype, numElements); \
} \
void \
UserDataArray::##NAME##Remove(TYPE *t, int32 n) \
UserDataArray::NAME##Remove(TYPE *t, int32 n) \
{ \
remove(PLUGINOFFSET(UserDataExtension, t, userDataGlobals.##NAME##Offset), n); \
remove(PLUGINOFFSET(UserDataExtension, t, userDataGlobals.NAME##Offset), n); \
} \
int32 \
UserDataArray::##NAME##GetCount(TYPE *t) \
UserDataArray::NAME##GetCount(TYPE *t) \
{ \
return PLUGINOFFSET(UserDataExtension, t, userDataGlobals.##NAME##Offset)->numArrays; \
return PLUGINOFFSET(UserDataExtension, t, userDataGlobals.NAME##Offset)->numArrays; \
} \
UserDataArray* \
UserDataArray::##NAME##Get(TYPE *t, int32 n) \
UserDataArray::NAME##Get(TYPE *t, int32 n) \
{ \
if(n >= PLUGINOFFSET(UserDataExtension, t, userDataGlobals.##NAME##Offset)->numArrays) \
if(n >= PLUGINOFFSET(UserDataExtension, t, userDataGlobals.NAME##Offset)->numArrays) \
return nil; \
return &PLUGINOFFSET(UserDataExtension, t, userDataGlobals.##NAME##Offset)->arrays[n]; \
return &PLUGINOFFSET(UserDataExtension, t, userDataGlobals.NAME##Offset)->arrays[n]; \
} \
int32 \
UserDataArray::##NAME##FindIndex(TYPE *t, const char *name) \
UserDataArray::NAME##FindIndex(TYPE *t, const char *name) \
{ \
int32 i; \
UserDataExtension *ext = PLUGINOFFSET(UserDataExtension, t, userDataGlobals.##NAME##Offset); \
UserDataExtension *ext = PLUGINOFFSET(UserDataExtension, t, userDataGlobals.NAME##Offset); \
for(i = 0; i < ext->numArrays; i++) \
if(strcmp(ext->arrays[i].name, name) == 0) \
return i; \