mirror of
https://port.numenaute.org/aleajactaest/khanat-opennel-code.git
synced 2024-12-20 16:08:44 +00:00
Changed: #825 Remove all warning when compiling Ryzom
This commit is contained in:
parent
a51e1516ec
commit
1f3793e523
7 changed files with 12 additions and 6 deletions
|
@ -56,12 +56,13 @@ public:
|
|||
class CMeshMultiLodBuild
|
||||
{
|
||||
public:
|
||||
CMeshMultiLodBuild() : StaticLod(false) { }
|
||||
|
||||
/// A slot of mesh for the build
|
||||
class CBuildSlot
|
||||
{
|
||||
public:
|
||||
CBuildSlot() : MeshGeom(NULL) { }
|
||||
CBuildSlot() : MeshGeom(NULL), DistMax(0.0f), BlendLength(0.0f), Flags(0) { }
|
||||
/**
|
||||
* Flags for the build of a slot
|
||||
*
|
||||
|
|
|
@ -349,6 +349,7 @@ void CInstanceLighter::light (const CInstanceGroup &igIn, CInstanceGroup &igOut,
|
|||
CSurfaceLightGrid::CCellCorner defaultCellCorner;
|
||||
defaultCellCorner.SunContribution= 0;
|
||||
defaultCellCorner.Light[0]= 0xFF;
|
||||
defaultCellCorner.Light[1]= 0xFF;
|
||||
defaultCellCorner.LocalAmbientId= 0xFF;
|
||||
|
||||
// Init the grid.
|
||||
|
|
|
@ -373,7 +373,6 @@ bool CLodCharacterManager::addRenderCharacterKey(CLodCharacterInstance &instan
|
|||
float a00, a01, a02;
|
||||
float a10, a11, a12;
|
||||
float a20, a21, a22;
|
||||
sint f8;
|
||||
uint64 blank= 0;
|
||||
CRGBA ambient= paramAmbient;
|
||||
CRGBA diffuse= paramDiffuse;
|
||||
|
@ -502,6 +501,8 @@ bool CLodCharacterManager::addRenderCharacterKey(CLodCharacterInstance &instan
|
|||
|
||||
if(numVertices)
|
||||
{
|
||||
sint f8;
|
||||
|
||||
/* NB: order is important for AGP filling optimisation in dstPtr
|
||||
|
||||
Pentium2+ optimisation notes:
|
||||
|
|
|
@ -83,7 +83,7 @@ bool CPackedWorld::raytrace(const NLMISC::CVector &start, const NLMISC::CVector
|
|||
if (_ZoneGrid.empty()) return false;
|
||||
++_RaytraceCounter;
|
||||
float bestDist = FLT_MAX;
|
||||
NLMISC::CVector bestNormal;
|
||||
CVector bestNormal(CVector::Null);
|
||||
CVector currEnd = end;
|
||||
CVector currInter;
|
||||
if (_RaytraceCounter == (uint32) ~0)
|
||||
|
|
|
@ -1525,6 +1525,7 @@ void CPatch::resetTileLightInfluences()
|
|||
{
|
||||
// Disable all light influence on this point.
|
||||
TileLightInfluences[i].Light[0]= 0xFF;
|
||||
TileLightInfluences[i].Light[1]= 0xFF;
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
@ -1421,7 +1421,9 @@ extern "C" void NL3D_expandLightmap (const NL3D_CExpandLightmap* pLightmap)
|
|||
// Compute current color
|
||||
CRGBA color0;
|
||||
CRGBA color1;
|
||||
color0.A = 255;
|
||||
color0.set565 (colorTilePtr[srcIndex].Color565);
|
||||
color1.A = 255;
|
||||
color1.set565 (colorTilePtr[srcIndex+1].Color565);
|
||||
expandedUserColorLinePtr[u].blendFromui (color0, color1, srcIndexPixel&0xff);
|
||||
// Compute current TLI color
|
||||
|
|
|
@ -67,9 +67,9 @@ void *nlGetSymbolAddress(NL_LIB_HANDLE libHandle, const std::string &procName)
|
|||
#ifdef NL_OS_WINDOWS
|
||||
const string nlLibPrefix; // empty
|
||||
const string nlLibExt(".dll");
|
||||
#elif defined(NL_OS_MAC)
|
||||
const string nlLibPrefix("lib");
|
||||
const string nlLibExt(".dylib");
|
||||
#elif defined(NL_OS_MAC)
|
||||
const string nlLibPrefix("lib");
|
||||
const string nlLibExt(".dylib");
|
||||
#elif defined(NL_OS_UNIX)
|
||||
const string nlLibPrefix("lib");
|
||||
const string nlLibExt(".so");
|
||||
|
|
Loading…
Reference in a new issue