[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [58754] branches/soc-2013-bge: Code cleanup.

[Daniel Stokes]

Revision: 58754
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=58754
Author:   kupoman
Date:     2013-07-31 05:33:28 +0000 (Wed, 31 Jul 2013)
Log Message:
-----------
Code cleanup. Removing dead code, adding comments, improving code readability, etc.

Modified Paths:
--------------
    branches/soc-2013-bge/release/scripts/startup/bl_operators/object.py
    branches/soc-2013-bge/source/blender/blenkernel/intern/object.c
    branches/soc-2013-bge/source/blender/blenloader/intern/readfile.c
    branches/soc-2013-bge/source/blender/makesdna/DNA_object_types.h
    branches/soc-2013-bge/source/blender/makesrna/intern/rna_object.c
    branches/soc-2013-bge/source/gameengine/Converter/BL_BlenderDataConversion.cpp
    branches/soc-2013-bge/source/gameengine/Ketsji/KX_GameObject.cpp

Modified: branches/soc-2013-bge/release/scripts/startup/bl_operators/object.py
===================================================================
--- branches/soc-2013-bge/release/scripts/startup/bl_operators/object.py	2013-07-31 03:44:45 UTC (rev 58753)
+++ branches/soc-2013-bge/release/scripts/startup/bl_operators/object.py	2013-07-31 05:33:28 UTC (rev 58754)
@@ -777,7 +777,6 @@
         return {'FINISHED'}
 
 
-
 class LodByName(Operator):
     """Add levels of detail to this object based on object names"""
     bl_idname = "object.lod_by_name"
@@ -795,7 +794,6 @@
         prefix = ""
         suffix = ""
         name = ""
-        ob.name.lower()
         if ob.name.lower().startswith("lod0"):
             prefix = ob.name[:4]
             name = ob.name[4:]

Modified: branches/soc-2013-bge/source/blender/blenkernel/intern/object.c
===================================================================
--- branches/soc-2013-bge/source/blender/blenkernel/intern/object.c	2013-07-31 03:44:45 UTC (rev 58753)
+++ branches/soc-2013-bge/source/blender/blenkernel/intern/object.c	2013-07-31 05:33:28 UTC (rev 58754)
@@ -939,7 +939,7 @@
 	BKE_object_lod_add(ob);
 	base = BLI_findlink(&ob->lodlevels, 0);
 	base->distance = 0.0;
-	base->use_logic = base->use_mat = base->use_mesh = 1;
+	base->use_mat = base->use_mesh = 1;
 	base->source = ob;
 	ob->currentlod = base;
 
@@ -1288,7 +1288,7 @@
 	BKE_object_lod_add(obn);
 	nlod = obn->lodlevels.first;
 	nlod->distance = 0.0;
-	nlod->use_logic = nlod->use_mat =nlod->use_mesh = 1;
+	nlod->use_mat =nlod->use_mesh = 1;
 	nlod->source = obn;
 	obn->currentlod = nlod;
 
@@ -1299,7 +1299,6 @@
 
 		nlod->distance = lod->distance;
 		nlod->source = lod->source;
-		nlod->use_logic = lod->use_logic;
 		nlod->use_mat = lod->use_mat;
 		nlod->use_mesh = lod->use_mesh;
 	}

Modified: branches/soc-2013-bge/source/blender/blenloader/intern/readfile.c
===================================================================
--- branches/soc-2013-bge/source/blender/blenloader/intern/readfile.c	2013-07-31 03:44:45 UTC (rev 58753)
+++ branches/soc-2013-bge/source/blender/blenloader/intern/readfile.c	2013-07-31 05:33:28 UTC (rev 58754)
@@ -9558,7 +9558,7 @@
 				BKE_object_lod_add(ob);
 				base = BLI_findlink(&ob->lodlevels, 0);
 				base->distance = 0.0;
-				base->use_logic = base->use_mat = base->use_mesh = 1;
+				base->use_mat = base->use_mesh = 1;
 				base->source = ob;
 				ob->currentlod = base;
 			}

Modified: branches/soc-2013-bge/source/blender/makesdna/DNA_object_types.h
===================================================================
--- branches/soc-2013-bge/source/blender/makesdna/DNA_object_types.h	2013-07-31 03:44:45 UTC (rev 58753)
+++ branches/soc-2013-bge/source/blender/makesdna/DNA_object_types.h	2013-07-31 05:33:28 UTC (rev 58754)
@@ -105,7 +105,7 @@
 typedef struct LodLevel {
 	struct LodLevel *next, *prev;
 	struct Object *source;
-	char use_mesh, use_mat, use_logic, pad;
+	char use_mesh, use_mat, pad[2];
 	float distance;
 } LodLevel;
 

Modified: branches/soc-2013-bge/source/blender/makesrna/intern/rna_object.c
===================================================================
--- branches/soc-2013-bge/source/blender/makesrna/intern/rna_object.c	2013-07-31 03:44:45 UTC (rev 58753)
+++ branches/soc-2013-bge/source/blender/makesrna/intern/rna_object.c	2013-07-31 05:33:28 UTC (rev 58754)
@@ -2049,12 +2049,6 @@
 	RNA_def_property_ui_text(prop, "Use Material", "Use the material from this object at this level of detail");
 	RNA_def_property_ui_icon(prop, ICON_MATERIAL, 0);
 	RNA_def_property_update(prop, NC_LOD, NULL);
-
-	prop = RNA_def_property(srna, "use_logic", PROP_BOOLEAN, PROP_NONE);
-	RNA_def_property_boolean_sdna(prop, NULL, "use_logic", 0);
-	RNA_def_property_ui_text(prop, "Use Logic", "Use the logic from this object at this level of detail");
-	RNA_def_property_ui_icon(prop, ICON_LOGIC, 0);
-	RNA_def_property_update(prop, NC_LOD, NULL);
 }
 
 

Modified: branches/soc-2013-bge/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
--- branches/soc-2013-bge/source/gameengine/Converter/BL_BlenderDataConversion.cpp	2013-07-31 03:44:45 UTC (rev 58753)
+++ branches/soc-2013-bge/source/gameengine/Converter/BL_BlenderDataConversion.cpp	2013-07-31 05:33:28 UTC (rev 58754)
@@ -1077,12 +1077,15 @@
 	RAS_MeshObject *meshobj;
 	int lightlayer = blenderobj ? blenderobj->lay:(1<<20)-1; // all layers if no object.
 
+	// Without checking names, we get some reuse we don't want that can cause
+	// problems with material LoDs.
 	if ((meshobj = converter->FindGameMesh(mesh/*, ob->lay*/)) != NULL) {
 		STR_String bge_name = meshobj->GetName();
 		STR_String blender_name = ((Mesh*)blenderobj->data)->id.name+2;
 		if (bge_name == blender_name)
 			return meshobj;
 	}
+
 	// Get DerivedMesh data
 	DerivedMesh *dm = CDDM_from_mesh(mesh, blenderobj);
 	DM_ensure_tessface(dm);
@@ -1995,6 +1998,7 @@
 		// set transformation
 		gameobj->AddMesh(meshobj);
 
+		// gather levels of detail
 		if (BLI_countlist(&ob->lodlevels) > 1) {
 			LodLevel *lod = ((LodLevel*)ob->lodlevels.first)->next;
 			Mesh* lodmesh = mesh;

Modified: branches/soc-2013-bge/source/gameengine/Ketsji/KX_GameObject.cpp
===================================================================
--- branches/soc-2013-bge/source/gameengine/Ketsji/KX_GameObject.cpp	2013-07-31 03:44:45 UTC (rev 58753)
+++ branches/soc-2013-bge/source/gameengine/Ketsji/KX_GameObject.cpp	2013-07-31 05:33:28 UTC (rev 58754)
@@ -720,6 +720,7 @@
 
 void KX_GameObject::UpdateLod(MT_Vector3 &cam_pos)
 {
+	// Handle dupligroups
 	if (this->m_pInstanceObjects) {
 		KX_GameObject * instob;
 		int count = this->m_pInstanceObjects->GetCount();
@@ -732,7 +733,7 @@
 	if (this->m_lodmeshes.empty()) return;
 
 	MT_Vector3 delta = this->NodeGetWorldPosition() - cam_pos;
-	float distance2 = delta.dot(delta);
+	float distance2 = delta.length2();
 
 	int level = 0;
 	Object *bob = this->GetBlenderObject();