[Bf-blender-cvs] [9f8a60a] temp-bge-cleanup: BGE: Cleanup KX_BlenderSceneConverter.cpp iterators, checks, indentations and spaces with uncrusify
Porteries Tristan
noreply at git.blender.org
Mon May 4 19:15:34 CEST 2015
Commit: 9f8a60adf1024ebbd875a342989b824ab3c7f0ef
Author: Porteries Tristan
Date: Mon May 4 17:41:08 2015 +0200
Branches: temp-bge-cleanup
https://developer.blender.org/rB9f8a60adf1024ebbd875a342989b824ab3c7f0ef
BGE: Cleanup KX_BlenderSceneConverter.cpp iterators, checks, indentations and spaces with uncrusify
"(*it).second" become "it->second" same as "first"
"!(it == list.end())" become "it != list.end()"
"if (ptr == NULL)" become "if (!ptr)"
And a run of uncrusify on this file to fix indentation and spaces.
===================================================================
M release/datafiles/locale
M release/scripts/addons
M release/scripts/addons_contrib
M source/gameengine/Converter/KX_BlenderSceneConverter.cpp
===================================================================
diff --git a/release/datafiles/locale b/release/datafiles/locale
index c651e63..0ee592a 160000
--- a/release/datafiles/locale
+++ b/release/datafiles/locale
@@ -1 +1 @@
-Subproject commit c651e63a9a537624f639950f3127a1dee29205d0
+Subproject commit 0ee592a4baa9fdfa4423f3863a3326315f36d5a7
diff --git a/release/scripts/addons b/release/scripts/addons
index 3fc5b82..2182a3d 160000
--- a/release/scripts/addons
+++ b/release/scripts/addons
@@ -1 +1 @@
-Subproject commit 3fc5b82c6bdba2f9c954fbf497621b9bb794a1bc
+Subproject commit 2182a3db54a0699ead0ed2c8e4f529a367bbf351
diff --git a/release/scripts/addons_contrib b/release/scripts/addons_contrib
index cf842d8..f295035 160000
--- a/release/scripts/addons_contrib
+++ b/release/scripts/addons_contrib
@@ -1 +1 @@
-Subproject commit cf842d8bb7b0033ca4fa99f7ebedcbd3810fd274
+Subproject commit f295035413682845f959d45a7a6256bf31624f8b
diff --git a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
index 1a489c3..7819339 100644
--- a/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
+++ b/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
@@ -112,19 +112,19 @@ extern "C" {
/* This is used to avoid including pthread.h in KX_BlenderSceneConverter.h */
typedef struct ThreadInfo {
- vector<pthread_t> threads;
- pthread_mutex_t merge_lock;
+ vector<pthread_t> threads;
+ pthread_mutex_t merge_lock;
} ThreadInfo;
KX_BlenderSceneConverter::KX_BlenderSceneConverter(
- Main *maggie,
- KX_KetsjiEngine *engine)
- :m_maggie(maggie),
- m_ketsjiEngine(engine),
- m_alwaysUseExpandFraming(false),
- m_usemat(false),
- m_useglslmat(false),
- m_use_mat_cache(true)
+ Main *maggie,
+ KX_KetsjiEngine *engine)
+ : m_maggie(maggie),
+ m_ketsjiEngine(engine),
+ m_alwaysUseExpandFraming(false),
+ m_usemat(false),
+ m_useglslmat(false),
+ m_use_mat_cache(true)
{
BKE_main_id_tag_all(maggie, false); /* avoid re-tagging later on */
m_newfilename = "";
@@ -157,29 +157,29 @@ KX_BlenderSceneConverter::~KX_BlenderSceneConverter()
vector<pair<KX_Scene *, KX_WorldInfo *> >::iterator itw = m_worldinfos.begin();
while (itw != m_worldinfos.end()) {
- delete (*itw).second;
+ delete itw->second;
itw++;
}
m_worldinfos.clear();
- vector<pair<KX_Scene *,RAS_IPolyMaterial *> >::iterator itp = m_polymaterials.begin();
+ vector<pair<KX_Scene *, RAS_IPolyMaterial *> >::iterator itp = m_polymaterials.begin();
while (itp != m_polymaterials.end()) {
- delete (*itp).second;
+ delete itp->second;
itp++;
}
m_polymaterials.clear();
// delete after RAS_IPolyMaterial
- vector<pair<KX_Scene *,BL_Material *> >::iterator itmat = m_materials.begin();
+ vector<pair<KX_Scene *, BL_Material *> >::iterator itmat = m_materials.begin();
while (itmat != m_materials.end()) {
- delete (*itmat).second;
+ delete itmat->second;
itmat++;
}
m_materials.clear();
- vector<pair<KX_Scene *,RAS_MeshObject *> >::iterator itm = m_meshobjects.begin();
+ vector<pair<KX_Scene *, RAS_MeshObject *> >::iterator itm = m_meshobjects.begin();
while (itm != m_meshobjects.end()) {
- delete (*itm).second;
+ delete itm->second;
itm++;
}
m_meshobjects.clear();
@@ -214,10 +214,10 @@ Scene *KX_BlenderSceneConverter::GetBlenderSceneForName(const STR_String &name)
if ((sce = (Scene *)BLI_findstring(&m_maggie->scene, name.ReadPtr(), offsetof(ID, name) + 2)))
return sce;
- for (vector<Main *>::iterator it=m_DynamicMaggie.begin(); !(it == m_DynamicMaggie.end()); it++) {
+ for (vector<Main *>::iterator it = m_DynamicMaggie.begin(); it != m_DynamicMaggie.end(); it++) {
Main *main = *it;
- if ((sce= (Scene *)BLI_findstring(&main->scene, name.ReadPtr(), offsetof(ID, name) + 2)))
+ if ((sce = (Scene *)BLI_findstring(&main->scene, name.ReadPtr(), offsetof(ID, name) + 2)))
return sce;
}
@@ -225,7 +225,7 @@ Scene *KX_BlenderSceneConverter::GetBlenderSceneForName(const STR_String &name)
}
void KX_BlenderSceneConverter::ConvertScene(KX_Scene *destinationscene, RAS_IRasterizer *rendertools,
- RAS_ICanvas *canvas, bool libloading)
+ RAS_ICanvas *canvas, bool libloading)
{
//find out which physics engine
Scene *blenderscene = destinationscene->GetBlenderScene();
@@ -243,7 +243,7 @@ void KX_BlenderSceneConverter::ConvertScene(KX_Scene *destinationscene, RAS_IRas
switch (blenderscene->gm.physicsEngine) {
#ifdef WITH_BULLET
- case WOPHY_BULLET:
+ case WOPHY_BULLET:
{
SYS_SystemHandle syshandle = SYS_GetSystem(); /*unused*/
int visualizePhysics = SYS_GetCommandLineInt(syshandle, "show_physics", 0);
@@ -253,8 +253,8 @@ void KX_BlenderSceneConverter::ConvertScene(KX_Scene *destinationscene, RAS_IRas
break;
}
#endif
- default:
- case WOPHY_NONE:
+ default:
+ case WOPHY_NONE:
{
// We should probably use some sort of factory here
phy_env = new DummyPhysicsEnvironment();
@@ -266,15 +266,15 @@ void KX_BlenderSceneConverter::ConvertScene(KX_Scene *destinationscene, RAS_IRas
destinationscene->SetPhysicsEnvironment(phy_env);
BL_ConvertBlenderObjects(
- m_maggie,
- destinationscene,
- m_ketsjiEngine,
- physics_engine,
- rendertools,
- canvas,
- this,
- m_alwaysUseExpandFraming,
- libloading);
+ m_maggie,
+ destinationscene,
+ m_ketsjiEngine,
+ physics_engine,
+ rendertools,
+ canvas,
+ this,
+ m_alwaysUseExpandFraming,
+ libloading);
//These lookup are not needed during game
m_map_blender_to_gameactuator.clear();
@@ -303,12 +303,12 @@ void KX_BlenderSceneConverter::RemoveScene(KX_Scene *scene)
vector<pair<KX_Scene *, KX_WorldInfo *> >::iterator worldit;
size = m_worldinfos.size();
for (i = 0, worldit = m_worldinfos.begin(); i < size; ) {
- if ((*worldit).first == scene) {
- delete (*worldit).second;
+ if (worldit->first == scene) {
+ delete worldit->second;
*worldit = m_worldinfos.back();
m_worldinfos.pop_back();
size--;
- }
+ }
else {
i++;
worldit++;
@@ -318,13 +318,13 @@ void KX_BlenderSceneConverter::RemoveScene(KX_Scene *scene)
vector<pair<KX_Scene *, RAS_IPolyMaterial *> >::iterator polymit;
size = m_polymaterials.size();
for (i = 0, polymit = m_polymaterials.begin(); i < size; ) {
- if ((*polymit).first == scene) {
- m_polymat_cache[scene].erase((*polymit).second->GetBlenderMaterial());
- delete (*polymit).second;
+ if (polymit->first == scene) {
+ m_polymat_cache[scene].erase(polymit->second->GetBlenderMaterial());
+ delete polymit->second;
*polymit = m_polymaterials.back();
m_polymaterials.pop_back();
size--;
- }
+ }
else {
i++;
polymit++;
@@ -336,13 +336,13 @@ void KX_BlenderSceneConverter::RemoveScene(KX_Scene *scene)
vector<pair<KX_Scene *, BL_Material *> >::iterator matit;
size = m_materials.size();
for (i = 0, matit = m_materials.begin(); i < size; ) {
- if ((*matit).first == scene) {
- m_mat_cache[scene].erase((*matit).second->material);
- delete (*matit).second;
+ if (matit->first == scene) {
+ m_mat_cache[scene].erase(matit->second->material);
+ delete matit->second;
*matit = m_materials.back();
m_materials.pop_back();
size--;
- }
+ }
else {
i++;
matit++;
@@ -354,12 +354,12 @@ void KX_BlenderSceneConverter::RemoveScene(KX_Scene *scene)
vector<pair<KX_Scene *, RAS_MeshObject *> >::iterator meshit;
size = m_meshobjects.size();
for (i = 0, meshit = m_meshobjects.begin(); i < size; ) {
- if ((*meshit).first == scene) {
- delete (*meshit).second;
+ if (meshit->first == scene) {
+ delete meshit->second;
*meshit = m_meshobjects.back();
m_meshobjects.pop_back();
size--;
- }
+ }
else {
i++;
meshit++;
@@ -413,10 +413,10 @@ void KX_BlenderSceneConverter::RegisterBlenderMaterial(BL_Material *mat)
void KX_BlenderSceneConverter::SetAlwaysUseExpandFraming(bool to_what)
{
- m_alwaysUseExpandFraming= to_what;
+ m_alwaysUseExpandFraming = to_what;
}
-void KX_BlenderSceneConverter::RegisterGameObject(KX_GameObject *gameobject, Object *for_blenderobject)
+void KX_BlenderSceneConverter::RegisterGameObject(KX_GameObject *gameobject, Object *for_blenderobject)
{
/* only maintained while converting, freed during game runtime */
m_map_blender_to_gameobject.insert(CHashedPtr(for_blenderobject), gameobject);
@@ -424,7 +424,7 @@ void KX_BlenderSceneConverter::RegisterGameObject(KX_GameObject *gameobject, Obj
/* only need to run this during conversion since
* m_map_blender_to_gameobject is freed after conversion */
-void KX_BlenderSceneConverter::UnregisterGameObject(KX_GameObject *gameobject)
+void KX_BlenderSceneConverter::UnregisterGameObject(KX_GameObject *gameobject)
{
Object *bobp = gameobject->GetBlenderObject();
if (bobp) {
@@ -438,7 +438,7 @@ void KX_BlenderSceneConverter::UnregisterGameObject(KX_GameObject *gameobject)
}
}
-KX_GameObject *KX_BlenderSceneConverter::FindGameObject(Object *for_blenderobject)
+KX_GameObject *KX_BlenderSceneConverter::FindGameObject(Object *for_blenderobject)
{
KX_GameObject **obp = m_map_blender_to_gameobject[CHashedPtr(for_blenderobject)];
@@ -448,9 +448,9 @@ KX_GameObject *KX_BlenderSceneConverter::FindGameObject(Object *for_blenderobjec
void KX_BlenderSceneConverter::RegisterGameMesh(RAS_MeshObject *gamemesh, Mesh *for_blendermesh)
{
if (for_blendermesh) { /* dynamically loaded meshes we don't want to keep lookups for */
- m_map_mesh_to_gamemesh.insert(CHashedPtr(for_blendermesh),gamemesh);
+ m_map_mesh_to_gamemesh.insert(CHashedPtr(for_blendermesh), gamemesh);
}
- m_meshobjects.push_back(pair<KX_Scene *, RAS_MeshObject *> (m_currentScene,gamemesh));
+ m_meshobjects.push_back(pair<KX_Scene *, RAS_MeshObject *> (m_currentScene, gamemesh));
}
RAS_MeshObject *KX_BlenderSceneConverter::FindGameMesh(Mesh *for_blendermesh)
@@ -459,7 +459,7 @@ RAS_MeshObject *KX_BlenderSceneConverter::FindGameMesh(Mesh *for_blendermesh)
if (meshp) {
return *meshp;
- }
+ }
else {
return NULL;
}
@@ -555,33 +555,33 @@ void KX_BlenderSceneConverter::ResetPhysicsObjectsAnimationIpo(bool clearIpo)
if (blenderObject) {
#if 0
//erase exi
@@ Diff output truncated at 10240 characters. @@
More information about the Bf-blender-cvs
mailing list