Menu
▾
▴
[Opde-commits] SF.net SVN: opde:[1023] trunk/src
|
From: <vo...@us...> - 2008-12-15 08:37:39
|
Revision: 1023
http://opde.svn.sourceforge.net/opde/?rev=1023&view=rev
Author: volca
Date: 2008-12-15 08:37:32 +0000 (Mon, 15 Dec 2008)
Log Message:
-----------
Warning fixes
Modified Paths:
--------------
trunk/src/base/dyntype/StructDataStorage.h
trunk/src/base/loaders/ManualBinFileLoader.cpp
trunk/src/bindings/RelationBinder.cpp
trunk/src/bindings/StringIteratorBinder.cpp
trunk/src/main/DTypeScriptCompiler.cpp
trunk/src/main/PLDefScriptCompiler.cpp
trunk/src/services/input/InputService.cpp
trunk/src/services/light/LightService.cpp
trunk/src/services/link/Relation.cpp
trunk/src/services/loop/LoopService.cpp
trunk/src/services/worldrep/LightmapAtlas.cpp
trunk/src/services/worldrep/WRCell.cpp
Modified: trunk/src/base/dyntype/StructDataStorage.h
===================================================================
--- trunk/src/base/dyntype/StructDataStorage.h 2008-12-15 07:36:38 UTC (rev 1022)
+++ trunk/src/base/dyntype/StructDataStorage.h 2008-12-15 08:37:32 UTC (rev 1023)
@@ -70,6 +70,8 @@
public:
TypeHelperBase(FieldGetter _getter, FieldSetter _setter) : mGetter(_getter), mSetter(_setter) {
};
+
+ virtual ~TypeHelperBase() {};
/// sets the struct's field with the given value
virtual void toField(T& data, const DVariant& val) = 0;
@@ -334,6 +336,7 @@
fd.label = name;
fd.size = sizeof(FT);
fd.enumerator = enumer;
+ fd.type = traits.getType();
mFieldDescList.push_back(fd);
Modified: trunk/src/base/loaders/ManualBinFileLoader.cpp
===================================================================
--- trunk/src/base/loaders/ManualBinFileLoader.cpp 2008-12-15 07:36:38 UTC (rev 1022)
+++ trunk/src/base/loaders/ManualBinFileLoader.cpp 2008-12-15 08:37:32 UTC (rev 1023)
@@ -151,7 +151,8 @@
// the really ROOT bone
// TODO: Map file for named joints (bones), as an optional addition
- Bone* root = mSkeleton->createBone(mTorsos[0].root);
+ // Bone* root =
+ mSkeleton->createBone(mTorsos[0].root);
for (int i = 0; i < mHeader.num_torsos; ++i) {
// get the torso's root bone to attach to:
@@ -1636,12 +1637,10 @@
for (uint8_t j = 0; j < mHeader.num_joints; ++j) {
// for every joint
// get the real joint id
- unsigned int mapper = mJoints[j].mapper_id;
+ // unsigned int mapper = mJoints[j].mapper_id;
+ // assert(mapper < mHeader.num_mappers);
+ // unsigned int joint = mMappers[mapper].joint;
- assert(mapper < mHeader.num_mappers);
-
- unsigned int joint = mMappers[mapper].joint;
-
for (short v = 0; v < mJoints[j].num_polys; ++v) {
AITriangle& tri = mTriangles[mJoints[j].start_poly + v];
Modified: trunk/src/bindings/RelationBinder.cpp
===================================================================
--- trunk/src/bindings/RelationBinder.cpp 2008-12-15 07:36:38 UTC (rev 1022)
+++ trunk/src/bindings/RelationBinder.cpp 2008-12-15 08:37:32 UTC (rev 1023)
@@ -42,19 +42,19 @@
0,
"Opde.Services.Relation", /* char *tp_name; */
sizeof(RelationBinder::Object), /* int tp_basicsize; */
- 0, /* int tp_itemsize; /* not used much */
+ 0, // int tp_itemsize; /* not used much */
RelationBinder::dealloc, /* destructor tp_dealloc; */
0, /* printfunc tp_print; */
- RelationBinder::getattr, /* getattrfunc tp_getattr; /* __getattr__ */
- 0, /* setattrfunc tp_setattr; /* __setattr__ */
- 0, /* cmpfunc tp_compare; /* __cmp__ */
- repr, /* reprfunc tp_repr; /* __repr__ */
+ RelationBinder::getattr, // getattrfunc tp_getattr; /* __getattr__ */
+ 0, // setattrfunc tp_setattr; /* __setattr__ */
+ 0, // cmpfunc tp_compare; /* __cmp__ */
+ repr, // reprfunc tp_repr; /* __repr__ */
0, /* PyNumberMethods *tp_as_number; */
0, /* PySequenceMethods *tp_as_sequence; */
0, /* PyMappingMethods *tp_as_mapping; */
- 0, /* hashfunc tp_hash; /* __hash__ */
- 0, /* ternaryfunc tp_call; /* __call__ */
- 0, /* reprfunc tp_str; /* __str__ */
+ 0, // hashfunc tp_hash; /* __hash__ */
+ 0, // ternaryfunc tp_call; /* __call__ */
+ 0, // reprfunc tp_str; /* __str__ */
0, /* getattrofunc tp_getattro; */
0, /* setattrofunc tp_setattro; */
0, /* PyBufferProcs *tp_as_buffer; */
Modified: trunk/src/bindings/StringIteratorBinder.cpp
===================================================================
--- trunk/src/bindings/StringIteratorBinder.cpp 2008-12-15 07:36:38 UTC (rev 1022)
+++ trunk/src/bindings/StringIteratorBinder.cpp 2008-12-15 08:37:32 UTC (rev 1023)
@@ -38,19 +38,19 @@
0,
"Opde.StringIterator", /* char *tp_name; */
sizeof(StringIteratorBinder::Object), /* int tp_basicsize; */
- 0, /* int tp_itemsize; /* not used much */
+ 0, // int tp_itemsize; /* not used much */
StringIteratorBinder::dealloc, /* destructor tp_dealloc; */
0, /* printfunc tp_print; */
- StringIteratorBinder::getattr, /* getattrfunc tp_getattr; /* __getattr__ */
- 0, /* setattrfunc tp_setattr; /* __setattr__ */
- 0, /* cmpfunc tp_compare; /* __cmp__ */
- repr, /* reprfunc tp_repr; /* __repr__ */
+ StringIteratorBinder::getattr, // getattrfunc tp_getattr; /* __getattr__ */
+ 0, // setattrfunc tp_setattr; /* __setattr__ */
+ 0, // cmpfunc tp_compare; /* __cmp__ */
+ repr, // reprfunc tp_repr; /* __repr__ */
0, /* PyNumberMethods *tp_as_number; */
0, /* PySequenceMethods *tp_as_sequence; */
0, /* PyMappingMethods *tp_as_mapping; */
- 0, /* hashfunc tp_hash; /* __hash__ */
- 0, /* ternaryfunc tp_call; /* __call__ */
- 0, /* reprfunc tp_str; /* __str__ */
+ 0, // hashfunc tp_hash; /* __hash__ */
+ 0, // ternaryfunc tp_call; /* __call__ */
+ 0, // reprfunc tp_str; /* __str__ */
0, /* getattrofunc tp_getattro; */
0, /* setattrofunc tp_setattro; */
0, /* PyBufferProcs *tp_as_buffer; */
Modified: trunk/src/main/DTypeScriptCompiler.cpp
===================================================================
--- trunk/src/main/DTypeScriptCompiler.cpp 2008-12-15 07:36:38 UTC (rev 1022)
+++ trunk/src/main/DTypeScriptCompiler.cpp 2008-12-15 08:37:32 UTC (rev 1023)
@@ -115,7 +115,6 @@
// default to global definition group
mGroupName = "";
- ServiceManager* svcmgr = ServiceManager::getSingletonPtr();
mBinaryService = GET_SERVICE(BinaryService);
mCurrentState.state = CS_UNKNOWN;
}
Modified: trunk/src/main/PLDefScriptCompiler.cpp
===================================================================
--- trunk/src/main/PLDefScriptCompiler.cpp 2008-12-15 07:36:38 UTC (rev 1022)
+++ trunk/src/main/PLDefScriptCompiler.cpp 2008-12-15 08:37:32 UTC (rev 1023)
@@ -99,8 +99,6 @@
//-----------------------------------------------------------------------
PLDefScriptCompiler::PLDefScriptCompiler(void) {
// default to global definition group
- ServiceManager* svcmgr = ServiceManager::getSingletonPtr();
-
mLinkService = GET_SERVICE(LinkService);
mBinaryService = GET_SERVICE(BinaryService);
mPropertyService = GET_SERVICE(PropertyService);
Modified: trunk/src/services/input/InputService.cpp
===================================================================
--- trunk/src/services/input/InputService.cpp 2008-12-15 07:36:38 UTC (rev 1022)
+++ trunk/src/services/input/InputService.cpp 2008-12-15 08:37:32 UTC (rev 1023)
@@ -42,10 +42,10 @@
/*-----------------------------------------------------*/
InputService::InputService(ServiceManager *manager, const std::string& name) :
Service(manager, name),
+ mInputMode(IM_MAPPED),
mDirectListener(NULL),
mMouse(NULL),
- mKeyboard(NULL),
- mInputMode(IM_MAPPED) {
+ mKeyboard(NULL) {
// Loop client definition
mLoopClientDef.id = LOOPCLIENT_ID_INPUT;
Modified: trunk/src/services/light/LightService.cpp
===================================================================
--- trunk/src/services/light/LightService.cpp 2008-12-15 07:36:38 UTC (rev 1022)
+++ trunk/src/services/light/LightService.cpp 2008-12-15 08:37:32 UTC (rev 1023)
@@ -209,8 +209,11 @@
/*----------------------------------------------------*/
LightsForCell::LightsForCell(const FilePtr& file, size_t num_anim_lights, size_t num_textured, size_t light_size,
wr_polygon_texturing_t* face_infos) :
- mAtlased(false), mLightSize(light_size), mNumTextured(num_textured), mNumAnimLights(num_anim_lights),
- mFaceInfos(face_infos) {
+ mLightSize(light_size),
+ mNumTextured(num_textured),
+ mNumAnimLights(num_anim_lights),
+ mFaceInfos(face_infos),
+ mAtlased(false) {
// load the light id's array
Modified: trunk/src/services/link/Relation.cpp
===================================================================
--- trunk/src/services/link/Relation.cpp 2008-12-15 07:36:38 UTC (rev 1022)
+++ trunk/src/services/link/Relation.cpp 2008-12-15 08:37:32 UTC (rev 1023)
@@ -36,10 +36,10 @@
// size of the link header (id, src, dest, flav)
static size_t LinkStructSize = 14;
- /*-----------------------------------------------------*/
+ /*-----------------------------------------------------*/
/*--------------------- LinkQueries -------------------*/
/*-----------------------------------------------------*/
- /// Single source link query (multiple targets), or in reverse
+ /// Single source link query (multiple targets), or in reverse
class Relation::MultiTargetLinkQueryResult : public LinkQueryResult {
public:
MultiTargetLinkQueryResult(const Relation::ObjectIDToLinks& linkmap,
@@ -76,12 +76,12 @@
/*----------------------- Relation --------------------*/
/*-----------------------------------------------------*/
Relation::Relation(const std::string& name, const DataStoragePtr& stor, bool isInverse, bool hidden) :
+ mSrcDstLinkMap(),
mID(-1),
mName(name),
mStorage(stor),
mHidden(hidden),
mLinkMap(),
- mSrcDstLinkMap(),
mInverse(NULL),
mIsInverse(isInverse) {
@@ -142,7 +142,7 @@
}
// link count (calculated)
- size_t link_count = flink->size() / 14; // sizeof(LinkStruct) - but that one is aligned!
+ size_t link_count = flink->size() / LinkStructSize;
LOG_VERBOSE("Relation::load : %s link count %d (tag size %d)", lchn.c_str(), link_count, flink->size());
@@ -150,7 +150,7 @@
// if the chunk LD exists, and contains at least the data size, load the data size, and set to load data as well
bool load_data = false;
- int dsize = 0;
+ size_t dsize = 0;
// TODO: Defer this to link data dedicated class
if (fldata->size() > sizeof(uint32_t)) {
Modified: trunk/src/services/loop/LoopService.cpp
===================================================================
--- trunk/src/services/loop/LoopService.cpp 2008-12-15 07:36:38 UTC (rev 1022)
+++ trunk/src/services/loop/LoopService.cpp 2008-12-15 08:37:32 UTC (rev 1023)
@@ -75,10 +75,10 @@
client->loopStep(deltaTime);
- unsigned long nowTime = mOwner->getCurrentTime();
+ unsigned long stepTime = mOwner->getCurrentTime() - stTime;
if (debugFrame) {
- LOG_DEBUG("LoopMode(%s) : Client %d (%s) : Used %ld ms", getLoopModeName().c_str(), corder, client->getLoopClientSpecification().name.c_str(), nowTime - stTime);
+ LOG_DEBUG("LoopMode(%s) : Client %d (%s) : Used %ld ms", getLoopModeName().c_str(), corder, client->getLoopClientSpecification().name.c_str(), stepTime);
}
corder++;
@@ -117,7 +117,7 @@
/*-------------------- LoopService -------------------*/
/*----------------------------------------------------*/
LoopService::LoopService(ServiceManager *manager, const std::string& name) : Service(manager, name),
- mTerminationRequested(false), mNewLoopMode(NULL), mLastFrameTime(0), mNewModeRequested(false),
+ mTerminationRequested(false), mNewLoopMode(NULL), mNewModeRequested(false), mLastFrameTime(0),
mDebugOneFrame(false) {
mActiveMode.setNull();
Modified: trunk/src/services/worldrep/LightmapAtlas.cpp
===================================================================
--- trunk/src/services/worldrep/LightmapAtlas.cpp 2008-12-15 07:36:38 UTC (rev 1022)
+++ trunk/src/services/worldrep/LightmapAtlas.cpp 2008-12-15 08:37:32 UTC (rev 1023)
@@ -520,7 +520,7 @@
else
mIntensities.insert(std::make_pair(light_id, 0.0f));
- uint32 Intens = intensity * 256;
+ uint32_t Intens = static_cast<uint32_t>(intensity * 256);
if (Intens > 0)
{
for (unsigned int i = 0; i < LightMapSize; i++)
Modified: trunk/src/services/worldrep/WRCell.cpp
===================================================================
--- trunk/src/services/worldrep/WRCell.cpp 2008-12-15 07:36:38 UTC (rev 1022)
+++ trunk/src/services/worldrep/WRCell.cpp 2008-12-15 08:37:32 UTC (rev 1023)
@@ -42,12 +42,16 @@
//------------------------------------------------------------------------------------
WRCell::WRCell(WorldRepService* owner, Ogre::DarkGeometry* targetGeom) :
- cellNum(-1), mLoaded(false), mPortalsDone(false), mOwner(owner), mLevelGeometry(targetGeom),
+ cellNum(-1),
vertices(NULL),
face_maps(NULL),
face_infos(NULL),
poly_indices(NULL),
planes(NULL),
+ mLoaded(false),
+ mPortalsDone(false),
+ mOwner(owner),
+ mLevelGeometry(targetGeom),
mLights(NULL) {
bspNode = NULL;
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|