[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [43001] trunk/blender/source/gameengine: formatting edits, missed these last commit.
Campbell Barton
ideasman42 at gmail.com
Fri Dec 30 12:50:04 CET 2011
Revision: 43001
http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=43001
Author: campbellbarton
Date: 2011-12-30 11:49:58 +0000 (Fri, 30 Dec 2011)
Log Message:
-----------
formatting edits, missed these last commit.
Modified Paths:
--------------
trunk/blender/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
trunk/blender/source/gameengine/Ketsji/BL_Material.cpp
trunk/blender/source/gameengine/Ketsji/BL_Texture.cpp
trunk/blender/source/gameengine/Ketsji/KX_Dome.cpp
trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp
Modified: trunk/blender/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c
===================================================================
--- trunk/blender/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c 2011-12-30 11:37:54 UTC (rev 43000)
+++ trunk/blender/source/gameengine/GamePlayer/xembed/blenderplayer-wrapper.c 2011-12-30 11:49:58 UTC (rev 43001)
@@ -48,8 +48,8 @@
-void print_id(){
-
+void print_id()
+{
uid_t ruid, euid, suid;
getresuid(&ruid, &euid, &suid);
@@ -61,7 +61,8 @@
This function is used to catch SIGTERM signal (raised by web plugin when the plugin should shut down
and raise a SIGKILL signal to the blenderplayer in order to kill it.
*/
-void sigterm_handler(int signum) {
+void sigterm_handler(int signum)
+{
printf("Signal!!!\n");
if (blenderplayer_id != 0) {
kill(blenderplayer_id, SIGKILL);
Modified: trunk/blender/source/gameengine/Ketsji/BL_Material.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/BL_Material.cpp 2011-12-30 11:37:54 UTC (rev 43000)
+++ trunk/blender/source/gameengine/Ketsji/BL_Material.cpp 2011-12-30 11:49:58 UTC (rev 43001)
@@ -98,21 +98,24 @@
}
}
-void BL_Material::SetConversionRGB(unsigned int *nrgb) {
+void BL_Material::SetConversionRGB(unsigned int *nrgb)
+{
rgb[0]=*nrgb++;
rgb[1]=*nrgb++;
rgb[2]=*nrgb++;
rgb[3]=*nrgb;
}
-void BL_Material::GetConversionRGB(unsigned int *nrgb) {
+void BL_Material::GetConversionRGB(unsigned int *nrgb)
+{
*nrgb++ = rgb[0];
*nrgb++ = rgb[1];
*nrgb++ = rgb[2];
*nrgb = rgb[3];
}
-void BL_Material::SetConversionUV(const STR_String& name, MT_Point2 *nuv) {
+void BL_Material::SetConversionUV(const STR_String& name, MT_Point2 *nuv)
+{
uvName = name;
uv[0] = *nuv++;
uv[1] = *nuv++;
@@ -120,13 +123,15 @@
uv[3] = *nuv;
}
-void BL_Material::GetConversionUV(MT_Point2 *nuv){
+void BL_Material::GetConversionUV(MT_Point2 *nuv)
+{
*nuv++ = uv[0];
*nuv++ = uv[1];
*nuv++ = uv[2];
*nuv = uv[3];
}
-void BL_Material::SetConversionUV2(const STR_String& name, MT_Point2 *nuv) {
+void BL_Material::SetConversionUV2(const STR_String& name, MT_Point2 *nuv)
+{
uv2Name = name;
uv2[0] = *nuv++;
uv2[1] = *nuv++;
@@ -134,7 +139,8 @@
uv2[3] = *nuv;
}
-void BL_Material::GetConversionUV2(MT_Point2 *nuv){
+void BL_Material::GetConversionUV2(MT_Point2 *nuv)
+{
*nuv++ = uv2[0];
*nuv++ = uv2[1];
*nuv++ = uv2[2];
Modified: trunk/blender/source/gameengine/Ketsji/BL_Texture.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/BL_Texture.cpp 2011-12-30 11:37:54 UTC (rev 43000)
+++ trunk/blender/source/gameengine/Ketsji/BL_Texture.cpp 2011-12-30 11:49:58 UTC (rev 43001)
@@ -38,10 +38,12 @@
}
// (n&(n-1)) zeros the least significant bit of n
-static int is_power_of_2_i(int num) {
+static int is_power_of_2_i(int num)
+{
return ((num)&(num-1))==0;
}
-static int power_of_2_min_i(int num) {
+static int power_of_2_min_i(int num)
+{
while (!is_power_of_2_i(num))
num= num&(num-1);
return num;
Modified: trunk/blender/source/gameengine/Ketsji/KX_Dome.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_Dome.cpp 2011-12-30 11:37:54 UTC (rev 43000)
+++ trunk/blender/source/gameengine/Ketsji/KX_Dome.cpp 2011-12-30 11:49:58 UTC (rev 43001)
@@ -255,7 +255,8 @@
}
}
-bool KX_Dome::CreateDL(){
+bool KX_Dome::CreateDL()
+{
dlistId = glGenLists((GLsizei) m_numimages);
if (dlistId != 0) {
if(m_mode == DOME_FISHEYE || m_mode == DOME_TRUNCATED_FRONT || m_mode == DOME_TRUNCATED_REAR){
Modified: trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp
===================================================================
--- trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp 2011-12-30 11:37:54 UTC (rev 43000)
+++ trunk/blender/source/gameengine/Ketsji/KX_MeshProxy.cpp 2011-12-30 11:49:58 UTC (rev 43001)
@@ -247,12 +247,14 @@
return materials;
}
-PyObject * KX_MeshProxy::pyattr_get_numMaterials(void * selfv, const KX_PYATTRIBUTE_DEF * attrdef) {
+PyObject * KX_MeshProxy::pyattr_get_numMaterials(void * selfv, const KX_PYATTRIBUTE_DEF * attrdef)
+{
KX_MeshProxy * self = static_cast<KX_MeshProxy *> (selfv);
return PyLong_FromSsize_t(self->m_meshobj->NumMaterials());
}
-PyObject * KX_MeshProxy::pyattr_get_numPolygons(void * selfv, const KX_PYATTRIBUTE_DEF * attrdef) {
+PyObject * KX_MeshProxy::pyattr_get_numPolygons(void * selfv, const KX_PYATTRIBUTE_DEF * attrdef)
+{
KX_MeshProxy * self = static_cast<KX_MeshProxy *> (selfv);
return PyLong_FromSsize_t(self->m_meshobj->NumPolygons());
}
More information about the Bf-blender-cvs
mailing list