Revision: 22100
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=22100
Author: campbellbarton
Date: 2009-08-01 01:42:22 +0200 (Sat, 01 Aug 2009)
Log Message:
-----------
svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r22075:22099
Modified Paths:
--------------
branches/blender2.5/blender/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
branches/blender2.5/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
branches/blender2.5/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
branches/blender2.5/blender/source/gameengine/Converter/BL_BlenderDataConversion.h
branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
branches/blender2.5/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
branches/blender2.5/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
branches/blender2.5/blender/source/gameengine/Converter/KX_ConvertSensors.h
branches/blender2.5/blender/source/gameengine/Expressions/Value.cpp
branches/blender2.5/blender/source/gameengine/GamePlayer/ActiveX/BlenderPlayerCtl.cpp
branches/blender2.5/blender/source/gameengine/GamePlayer/ghost/GPG_Application.cpp
branches/blender2.5/blender/source/gameengine/GamePlayer/netscape/src/ketsji/KXH_ketsji_hooks.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_BlenderMaterial.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_BlenderMaterial.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_ISceneConverter.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_KetsjiEngine.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_NearSensor.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_NearSensor.h
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PolygonMaterial.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_RadarSensor.cpp
branches/blender2.5/blender/source/gameengine/Ketsji/KX_RadarSensor.h
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.cpp
branches/blender2.5/blender/source/gameengine/Rasterizer/RAS_IPolygonMaterial.h
Modified:
branches/blender2.5/blender/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
===================================================================
---
branches/blender2.5/blender/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
2009-07-31 23:16:38 UTC (rev 22099)
+++
branches/blender2.5/blender/source/blender/nodes/intern/CMP_nodes/CMP_lummaMatte.c
2009-07-31 23:42:22 UTC (rev 22100)
@@ -53,7 +53,7 @@
if(in[0]>c->t1) {
alpha=1.0;
}
- else if(in[1]<c->t2){
+ else if(in[0]<c->t2){
alpha=0.0;
}
else {/*blend */
@@ -99,7 +99,7 @@
{
NodeChroma *c= MEM_callocN(sizeof(NodeChroma), "node chroma");
node->storage=c;
- c->t1= 0.0f;
+ c->t1= 1.0f;
c->t2= 0.0f;
};
Modified:
branches/blender2.5/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
===================================================================
---
branches/blender2.5/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
2009-07-31 23:16:38 UTC (rev 22099)
+++
branches/blender2.5/blender/source/gameengine/BlenderRoutines/BL_KetsjiEmbedStart.cpp
2009-07-31 23:42:22 UTC (rev 22100)
@@ -406,7 +406,6 @@
sceneconverter->ConvertScene(
startscene,
dictionaryobject,
- keyboarddevice,
rendertools,
canvas);
ketsjiengine->AddScene(startscene);
@@ -718,7 +717,6 @@
sceneconverter->ConvertScene(
startscene,
dictionaryobject,
- keyboarddevice,
rendertools,
canvas);
ketsjiengine->AddScene(startscene);
Modified:
branches/blender2.5/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
===================================================================
---
branches/blender2.5/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
2009-07-31 23:16:38 UTC (rev 22099)
+++
branches/blender2.5/blender/source/gameengine/Converter/BL_BlenderDataConversion.cpp
2009-07-31 23:42:22 UTC (rev 22100)
@@ -323,8 +323,7 @@
MTFace* tface,
const char *tfaceName,
MFace* mface,
- MCol* mmcol,
- int lightlayer,
+ MCol* mmcol,
MTF_localLayer *layers,
bool glslmat)
{
@@ -720,12 +719,12 @@
return true;
}
-
-RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj,
RAS_IRenderTools* rendertools, KX_Scene* scene, KX_BlenderSceneConverter
*converter)
+/* blenderobj can be NULL, make sure its checked for */
+RAS_MeshObject* BL_ConvertMesh(Mesh* mesh, Object* blenderobj, KX_Scene*
scene, KX_BlenderSceneConverter *converter)
{
RAS_MeshObject *meshobj;
bool skinMesh = false;
- int lightlayer = blenderobj->lay;
+ int lightlayer = blenderobj ? blenderobj->lay:(1<<20)-1; // all layers
if no object.
if ((meshobj = converter->FindGameMesh(mesh/*, ob->lay*/)) != NULL)
return meshobj;
@@ -748,7 +747,7 @@
}
// Determine if we need to make a skinned mesh
- if (mesh->dvert || mesh->key || ((blenderobj->gameflag & OB_SOFT_BODY)
!= 0) || BL_ModifierDeformer::HasCompatibleDeformer(blenderobj))
+ if (blenderobj && (mesh->dvert || mesh->key || ((blenderobj->gameflag &
OB_SOFT_BODY) != 0) || BL_ModifierDeformer::HasCompatibleDeformer(blenderobj)))
{
meshobj = new BL_SkinMeshObject(mesh);
skinMesh = true;
@@ -843,9 +842,8 @@
tan3 = tangent[f*4 + 3];
}
- /* get material */
- ma = give_current_material(blenderobj, mface->mat_nr+1);
-
+ ma = give_current_material(blenderobj, mface->mat_nr+1);
+
{
bool visible = true;
bool twoside = false;
@@ -859,7 +857,7 @@
if (!bl_mat)
bl_mat = new BL_Material();
ConvertMaterial(bl_mat, ma, tface, tfaceName,
mface, mcol,
- lightlayer, layers,
converter->GetGLSLMaterials());
+ layers, converter->GetGLSLMaterials());
visible = ((bl_mat->ras_mode & POLY_VIS)!=0);
collider = ((bl_mat->ras_mode & COLLIDER)!=0);
@@ -882,7 +880,7 @@
if (kx_blmat == NULL)
kx_blmat = new KX_BlenderMaterial();
- kx_blmat->Initialize(scene, bl_mat, skinMesh,
lightlayer);
+ kx_blmat->Initialize(scene, bl_mat, skinMesh);
polymat =
static_cast<RAS_IPolyMaterial*>(kx_blmat);
}
else {
@@ -1066,8 +1064,7 @@
-static PHY_MaterialProps *CreateMaterialFromBlenderObject(struct Object*
blenderobject,
-
KX_Scene *kxscene)
+static PHY_MaterialProps *CreateMaterialFromBlenderObject(struct Object*
blenderobject)
{
PHY_MaterialProps *materialProps = new PHY_MaterialProps;
@@ -1100,8 +1097,7 @@
return materialProps;
}
-static PHY_ShapeProps *CreateShapePropsFromBlenderObject(struct Object*
blenderobject,
-
KX_Scene *kxscene)
+static PHY_ShapeProps *CreateShapePropsFromBlenderObject(struct Object*
blenderobject)
{
PHY_ShapeProps *shapeProps = new PHY_ShapeProps;
@@ -1396,12 +1392,11 @@
PHY_ShapeProps* shapeprops =
- CreateShapePropsFromBlenderObject(blenderobject,
- kxscene);
+ CreateShapePropsFromBlenderObject(blenderobject);
PHY_MaterialProps* smmaterial =
- CreateMaterialFromBlenderObject(blenderobject, kxscene);
+ CreateMaterialFromBlenderObject(blenderobject);
KX_ObjectProperties objprop;
objprop.m_lockXaxis = (blenderobject->gameflag2 &
OB_LOCK_RIGID_BODY_X_AXIS) !=0;
@@ -1719,7 +1714,7 @@
Mesh* mesh = static_cast<Mesh*>(ob->data);
float center[3], extents[3];
float radius = my_boundbox_mesh((Mesh*) ob->data, center,
extents);
- RAS_MeshObject* meshobj =
BL_ConvertMesh(mesh,ob,rendertools,kxscene,converter);
+ RAS_MeshObject* meshobj =
BL_ConvertMesh(mesh,ob,kxscene,converter);
// needed for python scripting
kxscene->GetLogicManager()->RegisterMeshName(meshobj->GetName(),meshobj);
@@ -1902,7 +1897,6 @@
KX_KetsjiEngine*
ketsjiEngine,
e_PhysicsEngine
physics_engine,
PyObject*
pythondictionary,
- SCA_IInputDevice*
keydev,
RAS_IRenderTools*
rendertools,
RAS_ICanvas* canvas,
KX_BlenderSceneConverter* converter,
@@ -2671,7 +2665,7 @@
struct Object* blenderobj =
converter->FindBlenderObject(gameobj);
int layerMask = (groupobj.find(blenderobj) == groupobj.end()) ?
activeLayerBitInfo : 0;
bool isInActiveLayer = (blenderobj->lay & layerMask)!=0;
-
BL_ConvertSensors(blenderobj,gameobj,logicmgr,kxscene,ketsjiEngine,keydev,layerMask,isInActiveLayer,canvas,converter);
+
BL_ConvertSensors(blenderobj,gameobj,logicmgr,kxscene,ketsjiEngine,layerMask,isInActiveLayer,canvas,converter);
// set the init state to all objects
gameobj->SetInitState((blenderobj->init_state)?blenderobj->init_state:blenderobj->state);
}
@@ -2709,4 +2703,3 @@
RAS_BucketManager *bucketmanager = kxscene->GetBucketManager();
bucketmanager->OptimizeBuckets(distance);
}
-
Modified:
branches/blender2.5/blender/source/gameengine/Converter/BL_BlenderDataConversion.h
===================================================================
---
branches/blender2.5/blender/source/gameengine/Converter/BL_BlenderDataConversion.h
2009-07-31 23:16:38 UTC (rev 22099)
+++
branches/blender2.5/blender/source/gameengine/Converter/BL_BlenderDataConversion.h
2009-07-31 23:42:22 UTC (rev 22100)
@@ -34,14 +34,13 @@
#include "KX_Python.h"
#include "KX_PhysicsEngineEnums.h"
-class RAS_MeshObject* BL_ConvertMesh(struct Mesh* mesh,struct Object*
lightobj,class RAS_IRenderTools* rendertools,class KX_Scene* scene, class
KX_BlenderSceneConverter *converter);
+class RAS_MeshObject* BL_ConvertMesh(struct Mesh* mesh,struct Object*
lightobj,class KX_Scene* scene, class KX_BlenderSceneConverter *converter);
void BL_ConvertBlenderObjects(struct Main* maggie,
class KX_Scene*
kxscene,
class
KX_KetsjiEngine* ketsjiEngine,
e_PhysicsEngine
physics_engine,
PyObject*
pythondictionary,
- class
SCA_IInputDevice* keydev,
class
RAS_IRenderTools* rendertools,
class RAS_ICanvas*
canvas,
class
KX_BlenderSceneConverter* sceneconverter,
Modified:
branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
===================================================================
---
branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
2009-07-31 23:16:38 UTC (rev 22099)
+++
branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.cpp
2009-07-31 23:42:22 UTC (rev 22100)
@@ -244,7 +244,6 @@
void KX_BlenderSceneConverter::ConvertScene(class KX_Scene* destinationscene,
PyObject* dictobj,
-
class SCA_IInputDevice* keyinputdev,
class RAS_IRenderTools* rendertools,
class RAS_ICanvas* canvas)
{
@@ -334,7 +333,6 @@
m_ketsjiEngine,
physics_engine,
dictobj,
- keyinputdev,
rendertools,
canvas,
this,
Modified:
branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
===================================================================
---
branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
2009-07-31 23:16:38 UTC (rev 22099)
+++
branches/blender2.5/blender/source/gameengine/Converter/KX_BlenderSceneConverter.h
2009-07-31 23:42:22 UTC (rev 22100)
@@ -94,7 +94,6 @@
virtual void ConvertScene(
class KX_Scene*
destinationscene,
PyObject* dictobj,
- class SCA_IInputDevice*
keyinputdev,
class RAS_IRenderTools*
rendertools,
class RAS_ICanvas* canvas
);
@@ -149,6 +148,9 @@
virtual bool GetGLSLMaterials();
struct Scene* GetBlenderSceneForName(const STR_String& name);
+
+ struct Main* GetMain() { return m_maggie; };
+
};
#endif //__KX_BLENDERSCENECONVERTER_H
Modified:
branches/blender2.5/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
===================================================================
---
branches/blender2.5/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
2009-07-31 23:16:38 UTC (rev 22099)
+++
branches/blender2.5/blender/source/gameengine/Converter/KX_ConvertActuators.cpp
2009-07-31 23:42:22 UTC (rev 22100)
@@ -629,7 +629,6 @@
tmpmesh =
BL_ConvertMesh(
editobact->me,
blenderobject,
- rendertools,
scene,
converter
);
Modified:
branches/blender2.5/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
===================================================================
---
branches/blender2.5/blender/source/gameengine/Converter/KX_ConvertSensors.cpp
2009-07-31 23:16:38 UTC (rev 22099)
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
