Revision: 15401
http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=15401
Author: bdiego
Date: 2008-07-02 02:23:02 +0200 (Wed, 02 Jul 2008)
Log Message:
-----------
branches/blender-2.47
Merge from trunk:
Revision: 15383
Revision: 15390
Revision: 15391
Revision: 15392
Revision: 15398
Modified Paths:
--------------
branches/blender-2.47/source/blender/python/api2_2x/Lamp.c
branches/blender-2.47/source/blender/src/view.c
branches/blender-2.47/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
branches/blender-2.47/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
branches/blender-2.47/source/gameengine/Ketsji/KX_Camera.cpp
branches/blender-2.47/source/gameengine/Ketsji/KX_GameObject.cpp
branches/blender-2.47/source/gameengine/Ketsji/KX_MeshProxy.cpp
branches/blender-2.47/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
branches/blender-2.47/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
branches/blender-2.47/source/gameengine/Ketsji/KX_PythonInit.cpp
branches/blender-2.47/source/gameengine/Ketsji/KX_VehicleWrapper.cpp
Modified: branches/blender-2.47/source/blender/python/api2_2x/Lamp.c
===================================================================
--- branches/blender-2.47/source/blender/python/api2_2x/Lamp.c 2008-07-02
00:17:08 UTC (rev 15400)
+++ branches/blender-2.47/source/blender/python/api2_2x/Lamp.c 2008-07-02
00:23:02 UTC (rev 15401)
@@ -1520,12 +1520,11 @@
char *type = PyString_AsString(value);
PyObject *arg, *error;
- /* parse string argument */
-
- if( !value )
- return ( EXPP_ReturnPyObjError( PyExc_TypeError,
- "expected string argument" ) );
-
+ /* parse string argument */
+ if( !type )
+ return EXPP_ReturnPyObjError ( PyExc_TypeError,
+ "expected string argument" );
+
/* check for valid arguments, set type accordingly */
if( !strcmp( type, "Lamp" ) )
@@ -1546,7 +1545,7 @@
/* build tuple, call wrapper */
- arg = Py_BuildValue( "(i)", type );
+ arg = Py_BuildValue( "(i)", self->lamp->type );
error = EXPP_setterWrapper ( (void *)self, arg, (setter)Lamp_setType );
Py_DECREF ( arg );
return error;
Modified: branches/blender-2.47/source/blender/src/view.c
===================================================================
--- branches/blender-2.47/source/blender/src/view.c 2008-07-02 00:17:08 UTC
(rev 15400)
+++ branches/blender-2.47/source/blender/src/view.c 2008-07-02 00:23:02 UTC
(rev 15401)
@@ -647,10 +647,6 @@
if (G.vd->ndoffilter)
filterNDOFvalues(fval);
-// for(i=0;i<7;i++) printf("%f ",dval[i]);
-// printf("\n");
-
-
// Scale input values
// if(dval[6] == 0) return; // guard against divide by zero
@@ -659,12 +655,6 @@
// user scaling
dval[i] = dval[i] * ndof_axis_scale[i];
-
- // non-linear scaling
- if(dval[i]<0.0f)
- dval[i] = -1.0f * dval[i] * dval[i];
- else
- dval[i] = dval[i] * dval[i];
}
@@ -1174,18 +1164,16 @@
// prevTime = now;
// sbadjust *= 60 * frametime; /* normalize ndof device
adjustments to 100Hz for framerate independence */
- /* fetch the current state of the ndof device */
+ /* fetch the current state of the ndof device & enforce dominant mode if
selected */
getndof(fval);
- // printf(" motion command %f %f %f %f %f %f %f \n", fval[0],
fval[1], fval[2],
- // fval[3],
fval[4], fval[5], fval[6]);
- if (G.vd->ndoffilter)
- filterNDOFvalues(fval);
+ if (G.vd->ndoffilter)
+ filterNDOFvalues(fval);
// put scaling back here, was previously in ghostwinlay
- fval[0] = fval[0] * (1.0f/1200.0f);
- fval[1] = fval[1] * (1.0f/1200.0f);
- fval[2] = fval[2] * (1.0f/1200.0f);
+ fval[0] = fval[0] * (1.0f/600.0f);
+ fval[1] = fval[1] * (1.0f/600.0f);
+ fval[2] = fval[2] * (1.0f/1100.0f);
fval[3] = fval[3] * 0.00005f;
fval[4] =-fval[4] * 0.00005f;
fval[5] = fval[5] * 0.00005f;
@@ -1213,14 +1201,16 @@
VECCOPY(obofs, G.vd->ofs);
}
- /* calc an adjustment based on distance from camera */
- if (ob) {
+ /* calc an adjustment based on distance from camera
+ disabled per patch 14402 */
+ d = 1.0f;
+
+/* if (ob) {
VecSubf(diff, obofs, G.vd->ofs);
d = VecLength(diff);
}
- else {
- d = 1.0f;
- }
+*/
+
reverse = (G.vd->persmat[2][1] < 0.0f) ? -1.0f : 1.0f;
/*----------------------------------------------------
Modified:
branches/blender-2.47/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
===================================================================
---
branches/blender-2.47/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
2008-07-02 00:17:08 UTC (rev 15400)
+++
branches/blender-2.47/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageActuator.cpp
2008-07-02 00:23:02 UTC (rev 15401)
@@ -158,6 +158,9 @@
if (PyArg_ParseTuple(args, "s", &ToPropName)) {
m_toPropName = ToPropName;
}
+ else {
+ return NULL;
+ }
Py_Return;
}
@@ -173,7 +176,10 @@
if (PyArg_ParseTuple(args, "s", &Subject)) {
m_subject = Subject;
}
-
+ else {
+ return NULL;
+ }
+
Py_Return;
}
@@ -188,6 +194,9 @@
if (PyArg_ParseTuple(args, "i", &BodyType)) {
m_bodyType = BodyType;
}
+ else {
+ return NULL;
+ }
Py_Return;
}
@@ -203,6 +212,9 @@
if (PyArg_ParseTuple(args, "s", &Body)) {
m_body = Body;
}
+ else {
+ return NULL;
+ }
Py_Return;
}
Modified:
branches/blender-2.47/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
===================================================================
---
branches/blender-2.47/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
2008-07-02 00:17:08 UTC (rev 15400)
+++
branches/blender-2.47/source/gameengine/Ketsji/KXNetwork/KX_NetworkMessageSensor.cpp
2008-07-02 00:23:02 UTC (rev 15401)
@@ -228,6 +228,9 @@
{
m_subject = Subject;
}
+ else {
+ return NULL;
+ }
Py_Return;
}
Modified: branches/blender-2.47/source/gameengine/Ketsji/KX_Camera.cpp
===================================================================
--- branches/blender-2.47/source/gameengine/Ketsji/KX_Camera.cpp
2008-07-02 00:17:08 UTC (rev 15400)
+++ branches/blender-2.47/source/gameengine/Ketsji/KX_Camera.cpp
2008-07-02 00:23:02 UTC (rev 15401)
@@ -588,7 +588,7 @@
PyErr_SetString(PyExc_TypeError, "sphereInsideFrustum: Expected
arguments: (center, radius)");
- Py_Return;
+ return NULL;
}
KX_PYMETHODDEF_DOC(KX_Camera, boxInsideFrustum,
@@ -766,6 +766,10 @@
else
EnableViewport(false);
}
+ else {
+ return NULL;
+ }
+
Py_Return;
}
@@ -777,6 +781,8 @@
if (PyArg_ParseTuple(args,"iiii",&left, &bottom, &right, &top))
{
SetViewport(left, bottom, right, top);
+ } else {
+ return NULL;
}
Py_Return;
}
Modified: branches/blender-2.47/source/gameengine/Ketsji/KX_GameObject.cpp
===================================================================
--- branches/blender-2.47/source/gameengine/Ketsji/KX_GameObject.cpp
2008-07-02 00:17:08 UTC (rev 15400)
+++ branches/blender-2.47/source/gameengine/Ketsji/KX_GameObject.cpp
2008-07-02 00:23:02 UTC (rev 15401)
@@ -1008,6 +1008,9 @@
if (pypos)
PyVecTo(pypos, point);
}
+ else {
+ return NULL;
+ }
if (m_pPhysicsController1)
{
@@ -1096,6 +1099,10 @@
this->SetParent(scene, obj);
}
+ else {
+ return NULL;
+ }
+
Py_Return;
}
@@ -1122,7 +1129,7 @@
return meshproxy;
}
}
- Py_Return;
+ return NULL;
}
Modified: branches/blender-2.47/source/gameengine/Ketsji/KX_MeshProxy.cpp
===================================================================
--- branches/blender-2.47/source/gameengine/Ketsji/KX_MeshProxy.cpp
2008-07-02 00:17:08 UTC (rev 15400)
+++ branches/blender-2.47/source/gameengine/Ketsji/KX_MeshProxy.cpp
2008-07-02 00:23:02 UTC (rev 15401)
@@ -157,6 +157,9 @@
{
matname = m_meshobj->GetMaterialName(matid);
}
+ else {
+ return NULL;
+ }
return PyString_FromString(matname.Ptr());
@@ -174,6 +177,9 @@
{
matname = m_meshobj->GetTextureName(matid);
}
+ else {
+ return NULL;
+ }
return PyString_FromString(matname.Ptr());
@@ -195,6 +201,9 @@
length = m_meshobj->GetVertexArrayLength(mat);
}
}
+ else {
+ return NULL;
+ }
return PyInt_FromLong(length);
@@ -217,6 +226,9 @@
vertexob = new KX_VertexProxy(this, vertex);
}
}
+ else {
+ return NULL;
+ }
return vertexob;
Modified:
branches/blender-2.47/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
===================================================================
--- branches/blender-2.47/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
2008-07-02 00:17:08 UTC (rev 15400)
+++ branches/blender-2.47/source/gameengine/Ketsji/KX_PhysicsObjectWrapper.cpp
2008-07-02 00:23:02 UTC (rev 15401)
@@ -58,6 +58,9 @@
{
m_ctrl->setPosition(x,y,z);
}
+ else {
+ return NULL;
+ }
Py_INCREF(Py_None); return Py_None;
}
@@ -72,6 +75,9 @@
{
m_ctrl->SetLinearVelocity(x,y,z,local != 0);
}
+ else {
+ return NULL;
+ }
Py_INCREF(Py_None); return Py_None;
}
@@ -85,6 +91,9 @@
{
m_ctrl->SetAngularVelocity(x,y,z,local != 0);
}
+ else {
+ return NULL;
+ }
Py_INCREF(Py_None); return Py_None;
}
@@ -97,6 +106,9 @@
{
m_ctrl->SetActive(active!=0);
}
+ else {
+ return NULL;
+ }
Py_INCREF(Py_None); return Py_None;
}
Modified:
branches/blender-2.47/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
===================================================================
--- branches/blender-2.47/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
2008-07-02 00:17:08 UTC (rev 15400)
+++ branches/blender-2.47/source/gameengine/Ketsji/KX_PyConstraintBinding.cpp
2008-07-02 00:23:02 UTC (rev 15401)
@@ -82,12 +82,15 @@
PyObject* kwds)
{
float x,y,z;
- int len = PyTuple_Size(args);
- if ((len == 3) && PyArg_ParseTuple(args,"fff",&x,&y,&z))
+ if (PyArg_ParseTuple(args,"fff",&x,&y,&z))
{
if (PHY_GetActiveEnvironment())
PHY_GetActiveEnvironment()->setGravity(x,y,z);
}
+ else {
+ return NULL;
+ }
+
Py_INCREF(Py_None); return Py_None;
}
@@ -105,6 +108,10 @@
}
}
+ else {
+ return NULL;
+ }
+
Py_INCREF(Py_None); return Py_None;
}
@@ -122,6 +129,9 @@
PHY_GetActiveEnvironment()->setNumTimeSubSteps(substep);
}
}
+ else {
+ return NULL;
+ }
Py_INCREF(Py_None); return Py_None;
}
@@ -138,6 +148,9 @@
PHY_GetActiveEnvironment()->setNumIterations(iter);
}
}
+ else {
+ return NULL;
+ }
Py_INCREF(Py_None); return Py_None;
}
@@ -155,6 +168,9 @@
PHY_GetActiveEnvironment()->setDeactivationTime(deactive_time);
}
}
+ else {
+ return NULL;
+ }
Py_INCREF(Py_None); return Py_None;
}
@@ -171,6 +187,9 @@
PHY_GetActiveEnvironment()->setDeactivationLinearTreshold(
linearDeactivationTreshold);
}
}
+ else {
+ return NULL;
+ }
Py_INCREF(Py_None); return Py_None;
}
@@ -187,6 +206,9 @@
PHY_GetActiveEnvironment()->setDeactivationAngularTreshold(
angularDeactivationTreshold);
}
}
+ else {
+ return NULL;
+ }
Py_INCREF(Py_None); return Py_None;
}
@@ -202,6 +224,9 @@
PHY_GetActiveEnvironment()->setContactBreakingTreshold(
contactBreakingTreshold);
}
}
+ else {
+ return NULL;
+ }
Py_INCREF(Py_None); return Py_None;
}
@@ -218,6 +243,9 @@
PHY_GetActiveEnvironment()->setCcdMode( ccdMode);
}
}
+ else {
+ return NULL;
+ }
Py_INCREF(Py_None); return Py_None;
}
@@ -233,6 +261,9 @@
PHY_GetActiveEnvironment()->setSolverSorConstant( sor);
}
}
+ else {
+ return NULL;
+ }
Py_INCREF(Py_None); return Py_None;
}
@@ -248,6 +279,9 @@
PHY_GetActiveEnvironment()->setSolverTau( tau);
}
}
+ else {
+ return NULL;
+ }
Py_INCREF(Py_None); return Py_None;
}
@@ -264,6 +298,9 @@
@@ Diff output truncated at 10240 characters. @@
_______________________________________________
Bf-blender-cvs mailing list
[email protected]
http://lists.blender.org/mailman/listinfo/bf-blender-cvs
