Khaganat-NeL/khanat-opennel-code
2
0
Fork 0
Code Issues 21 Pull requests Projects Releases 1 Packages Wiki Activity

Changed: #825 Remove all warning when compiling Ryzom

Browse source
This commit is contained in:
kervala 2010-06-21 09:39:58 +02:00
parent c29989ee2e
commit 531ff7dfff
4 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
code/nel/tools/3d/object_viewer/object_viewer.cpp
View file

@ -1729,7 +1729,7 @@ void CObjectViewer::serial (NLMISC::IStream& f)
ParticleWorkspaceFilename = ""; ParticleWorkspaceFilename = "";
} }
// First instance // First instance
uint firstInstance = _ListInstance.size(); uint firstInstance = (uint)_ListInstance.size();
// Read information // Read information
std::vector<CInstanceSave> readed; std::vector<CInstanceSave> readed;
@ -2211,7 +2211,7 @@ uint CObjectViewer::addMesh (NL3D::IShape* pMeshShape, const char* meshName, uin
} }
// Return the instance index // Return the instance index
return _ListInstance.size()-1; return (uint)_ListInstance.size()-1;
} }
else else
return 0xffffffff; return 0xffffffff;
@ -2291,13 +2291,13 @@ uint CObjectViewer::addCamera (const NL3D::CCameraInfo &cameraInfo, const char*
iInfo->Saved.CameraInfo = cameraInfo; iInfo->Saved.CameraInfo = cameraInfo;
iInfo->Saved.Camera = true; iInfo->Saved.Camera = true;
_ListInstance.push_back (iInfo); _ListInstance.push_back (iInfo);
_Cameras.push_back (_ListInstance.size()-1); _Cameras.push_back ((uint)_ListInstance.size()-1);
// Reinit camera // Reinit camera
initCamera (); initCamera ();
// Return the instance index // Return the instance index
return _ListInstance.size()-1; return (uint)_ListInstance.size()-1;
} }
// *************************************************************************** // ***************************************************************************
@ -2353,7 +2353,7 @@ uint CObjectViewer::addSkel (NL3D::IShape* pSkelShape, const char* skelName)
_SkeletonScaleDlg->setSkeletonToEdit(skelModel, skelName); _SkeletonScaleDlg->setSkeletonToEdit(skelModel, skelName);
// Return the instance // Return the instance
return _ListInstance.size()-1; return (uint)_ListInstance.size()-1;
} }
return 0xffffffff; return 0xffffffff;
} }
@ -2773,7 +2773,7 @@ void CObjectViewer::evalSoundTrack (float lastTime, float currentTime)
uint CObjectViewer::addInstanceGroup(NL3D::CInstanceGroup *ig) uint CObjectViewer::addInstanceGroup(NL3D::CInstanceGroup *ig)
{ {
// First instance // First instance
uint first = _ListInstance.size(); uint first = (uint)_ListInstance.size();
// Add all models to the scene // Add all models to the scene
ig->addToScene(*CNELU::Scene, CNELU::Driver); ig->addToScene(*CNELU::Scene, CNELU::Driver);
@ -3184,7 +3184,7 @@ bool CObjectViewer::createVegetableLandscape()
// progress // progress
dlgProgress.ProgressText.SetWindowText("Loading Zones..."); dlgProgress.ProgressText.SetWindowText("Loading Zones...");
dlgProgress.ProgressBar.SetPos(0); dlgProgress.ProgressBar.SetPos(0);
uint nbZones= _VegetableLandscapeZoneNames.size(); uint nbZones= (uint)_VegetableLandscapeZoneNames.size();
for(uint i=0; i<nbZones;i++) for(uint i=0; i<nbZones;i++)
{ {
// open the file // open the file
@ -3417,7 +3417,7 @@ CInstanceInfo *CObjectViewer::getInstance (uint instance)
// *************************************************************************** // ***************************************************************************
uint CObjectViewer::getNumInstance () const uint CObjectViewer::getNumInstance () const
{ {
return _ListInstance.size (); return (uint)_ListInstance.size ();
} }
// *************************************************************************** // ***************************************************************************
@ -3864,7 +3864,7 @@ uint CObjectViewer::getCameraInstance (uint cameraId) const
uint CObjectViewer::getNumCamera () const uint CObjectViewer::getNumCamera () const
{ {
return _Cameras.size (); return (uint)_Cameras.size ();
} }
int localizedMessageBox(HWND parentWindow, int messageStringID, int captionStringID, UINT nType) int localizedMessageBox(HWND parentWindow, int messageStringID, int captionStringID, UINT nType)

2
code/nel/tools/3d/object_viewer/particle_workspace.cpp
View file

@ -448,7 +448,7 @@ void CParticleWorkspace::serial(NLMISC::IStream &f) throw(NLMISC::EStream)
f.serialVersion(0); f.serialVersion(0);
f.xmlSerial(_Name, "NAME"); f.xmlSerial(_Name, "NAME");
f.xmlPush("PS_LIST"); f.xmlPush("PS_LIST");
uint32 numNodes = _Nodes.size(); uint32 numNodes = (uint32)_Nodes.size();
// TODO : avoid to store the number of nodes // TODO : avoid to store the number of nodes
f.xmlSerial(numNodes, "NUM_NODES"); f.xmlSerial(numNodes, "NUM_NODES");
if (f.isReading()) if (f.isReading())

2
code/nel/tools/3d/object_viewer/particle_workspace.h
View file

@ -168,7 +168,7 @@ public:
std::string getPath() const; std::string getPath() const;
std::string getFilename() const { return _Filename; } std::string getFilename() const { return _Filename; }
// Get Number of nodes in the workspace // Get Number of nodes in the workspace
uint getNumNode() const { return _Nodes.size(); } uint getNumNode() const { return (uint)_Nodes.size(); }
/** Get a node in workspace /** Get a node in workspace
* Can keep pointer safely as long as the node is not deleted * Can keep pointer safely as long as the node is not deleted
*/ */

4
code/nel/tools/3d/object_viewer/texture_anim_dlg.cpp
View file

@ -260,7 +260,7 @@ void CTextureAnimDlg::CGradientInterface::modifyGradient(TAction action, uint in
break; break;
} }
P->getTextureGroup()->setTextures(&textureList[0], textureList.size()); P->getTextureGroup()->setTextures(&textureList[0], (uint)textureList.size());
} }
void CTextureAnimDlg::CGradientInterface::displayValue(CDC *dc, uint index, sint x, sint y) void CTextureAnimDlg::CGradientInterface::displayValue(CDC *dc, uint index, sint x, sint y)
{ {
@ -350,7 +350,7 @@ void CTextureAnimDlg::CGradientInterface::CTextureWrapper::set(NL3D::ITexture *t
textureList[Index] = t; textureList[Index] = t;
P->getTextureGroup()->setTextures(&textureList[0], textureList.size()); P->getTextureGroup()->setTextures(&textureList[0], (uint)textureList.size());
Dlg->invalidateGrad(); Dlg->invalidateGrad();
} }