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

implemented cameras for streaming

Browse Source
This commit is contained in:
aap
2016-01-13 08:58:15 +01:00
parent 02c809625a
commit da0417571d
7 changed files with 342 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
tools/rsltest/rsl.cpp
View File

@ -420,7 +420,7 @@ RslGeometryForAllMaterials(RslGeometry *geometry, RslMaterialCallBack fpCallBack
struct RslMaterialChunkInfo
{
int32 flags;
RslRGBA color; // used
RGBA color; // used
int32 unused;
bool32 textured; // used
SurfaceProperties surfaceProps;

10
tools/rsltest/rsl.h
View File

@ -42,14 +42,6 @@ typedef RslAtomic *(*RslAtomicCallBack)(RslAtomic *atomic, void *data);
typedef RslMaterial *(*RslMaterialCallBack)(RslMaterial *material, void *data);
typedef RslTexture *(*RslTextureCallBack)(RslTexture *texture, void *pData);
struct RslRGBA
{
uint8 red;
uint8 green;
uint8 blue;
uint8 alpha;
};
struct RslV3d
{
float32 x, y, z;
@ -311,7 +303,7 @@ struct RslMaterial {
char *texname;
RslTexture *texture;
};
RslRGBA color;
RGBA color;
uint32 refCount;
RslMatFX *matfx;
};

5
tools/rsltest/rsltest.cpp
View File

@ -125,10 +125,7 @@ convertMaterial(RslMaterial *m)
Material *rwm;
rwm = Material::create();
rwm->color[0] = m->color.red;
rwm->color[1] = m->color.green;
rwm->color[2] = m->color.blue;
rwm->color[3] = m->color.alpha;
rwm->color = m->color;
if(m->texture)
rwm->texture = convertTexture(m->texture);