[Bf-blender-cvs] SVN commit: /data/svn/bf-blender [46980] branches/soc-2011-tomato: svn merge ^/trunk/blender -r46966:46979

Campbell Barton ideasman42 at gmail.com
Thu May 24 18:37:40 CEST 2012


Revision: 46980
          http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46980
Author:   campbellbarton
Date:     2012-05-24 16:37:40 +0000 (Thu, 24 May 2012)
Log Message:
-----------
svn merge ^/trunk/blender -r46966:46979

Revision Links:
--------------
    http://projects.blender.org/scm/viewvc.php?view=rev&root=bf-blender&revision=46966

Modified Paths:
--------------
    branches/soc-2011-tomato/intern/ghost/test/gears/GHOST_C-Test.c
    branches/soc-2011-tomato/intern/ghost/test/gears/GHOST_Test.cpp
    branches/soc-2011-tomato/intern/ghost/test/multitest/Basic.c
    branches/soc-2011-tomato/intern/ghost/test/multitest/MultiTest.c
    branches/soc-2011-tomato/intern/ghost/test/multitest/ScrollBar.c
    branches/soc-2011-tomato/intern/ghost/test/multitest/Util.c
    branches/soc-2011-tomato/intern/ghost/test/multitest/WindowData.c
    branches/soc-2011-tomato/release/plugins/sequence/blur.c
    branches/soc-2011-tomato/release/plugins/sequence/dnr.c
    branches/soc-2011-tomato/release/plugins/sequence/scatter.c
    branches/soc-2011-tomato/source/blender/blenkernel/BKE_fcurve.h
    branches/soc-2011-tomato/source/blender/blenkernel/intern/fcurve.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/particle_system.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/pointcache.c
    branches/soc-2011-tomato/source/blender/blenkernel/intern/softbody.c
    branches/soc-2011-tomato/source/blender/blenloader/intern/versioning_250.c
    branches/soc-2011-tomato/source/blender/collada/ExportSettings.h
    branches/soc-2011-tomato/source/blender/collada/SceneExporter.cpp
    branches/soc-2011-tomato/source/blender/collada/collada.cpp
    branches/soc-2011-tomato/source/blender/collada/collada.h
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColorToBWOperation.cpp
    branches/soc-2011-tomato/source/blender/compositor/operations/COM_ConvertColourToValueProg.cpp
    branches/soc-2011-tomato/source/blender/editors/physics/particle_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_clip/tracking_ops.c
    branches/soc-2011-tomato/source/blender/editors/space_graph/graph_edit.c
    branches/soc-2011-tomato/source/blender/editors/space_graph/graph_intern.h
    branches/soc-2011-tomato/source/blender/editors/space_graph/space_graph.c
    branches/soc-2011-tomato/source/blender/editors/space_node/node_templates.c
    branches/soc-2011-tomato/source/blender/editors/transform/transform_snap.c
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_codegen.c
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_draw.c
    branches/soc-2011-tomato/source/blender/gpu/intern/gpu_extensions.c
    branches/soc-2011-tomato/source/blender/imbuf/intern/cineon/logImageLib.c
    branches/soc-2011-tomato/source/blender/makesrna/intern/rna_scene_api.c
    branches/soc-2011-tomato/source/blender/modifiers/intern/MOD_skin.c
    branches/soc-2011-tomato/source/blender/render/intern/source/convertblender.c
    branches/soc-2011-tomato/source/blender/render/intern/source/rendercore.c
    branches/soc-2011-tomato/source/blender/windowmanager/intern/wm_operators.c

Property Changed:
----------------
    branches/soc-2011-tomato/
    branches/soc-2011-tomato/source/blender/editors/interface/interface.c
    branches/soc-2011-tomato/source/blender/editors/space_outliner/


Property changes on: branches/soc-2011-tomato
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-46966
   + /branches/ge_harmony:42255,42279-42282,42286,42302,42338,42349,42616,42620,42698-42699,42739,42753,42773-42774,42832,44568,44597-44598,44793-44794
/branches/soc-2011-cucumber:37517,38166-38167,38177,38179-38180,38187,38242,38384,38387,38403-38404,38407,38968,38970,38973,39045,40845,42997-42998,43439
/branches/vgroup_modifiers:38694-39989
/trunk/blender:36831-46979

Modified: branches/soc-2011-tomato/intern/ghost/test/gears/GHOST_C-Test.c
===================================================================
--- branches/soc-2011-tomato/intern/ghost/test/gears/GHOST_C-Test.c	2012-05-24 16:35:45 UTC (rev 46979)
+++ branches/soc-2011-tomato/intern/ghost/test/gears/GHOST_C-Test.c	2012-05-24 16:37:40 UTC (rev 46980)
@@ -46,22 +46,22 @@
 #include "GHOST_C-api.h"
 
 #if defined(WIN32) || defined(__APPLE__)
-	#ifdef WIN32
-		#include <windows.h>
-		#include <GL/gl.h>
-	#else /* WIN32 */
-		/* __APPLE__ is defined */
-		#include <AGL/gl.h>
-	#endif /* WIN32 */
+#  ifdef WIN32
+#    include <windows.h>
+#    include <GL/gl.h>
+#  else /* WIN32 */
+     /* __APPLE__ is defined */
+#    include <AGL/gl.h>
+#  endif /* WIN32 */
 #else /* defined(WIN32) || defined(__APPLE__) */
-	#include <GL/gl.h>
+#  include <GL/gl.h>
 #endif /* defined(WIN32) || defined(__APPLE__) */
 
 
 static void gearsTimerProc(GHOST_TimerTaskHandle task, GHOST_TUns64 time);
 int processEvent(GHOST_EventHandle hEvent, GHOST_TUserDataPtr userData);
 
-static GLfloat view_rotx=20.0, view_roty=30.0, view_rotz=0.0;
+static GLfloat view_rotx = 20.0, view_roty = 30.0, view_rotz = 0.0;
 static GLfloat fAngle = 0.0;
 static int sExitRequested = 0;
 static GHOST_SystemHandle shSystem = NULL;
@@ -87,34 +87,34 @@
 	const double pi = 3.14159264;
 	
 	r0 = inner_radius;
-	r1 = (float)(outer_radius - tooth_depth/2.0);
-	r2 = (float)(outer_radius + tooth_depth/2.0);
+	r1 = (float)(outer_radius - tooth_depth / 2.0);
+	r2 = (float)(outer_radius + tooth_depth / 2.0);
 	
-	da = (float)(2.0*pi / teeth / 4.0);
+	da = (float)(2.0 * pi / teeth / 4.0);
 	
 	glShadeModel(GL_FLAT);
 	glNormal3f(0.0, 0.0, 1.0);
 	
 	/* draw front face */
 	glBegin(GL_QUAD_STRIP);
-	for (i=0;i<=teeth;i++) {
-		angle = (float)(i * 2.0*pi / teeth);
-		glVertex3f((float)(r0*cos(angle)), (float)(r0*sin(angle)), (float)(width*0.5));
-		glVertex3f((float)(r1*cos(angle)), (float)(r1*sin(angle)), (float)(width*0.5));
-		glVertex3f((float)(r0*cos(angle)), (float)(r0*sin(angle)), (float)(width*0.5));
-		glVertex3f((float)(r1*cos(angle+3*da)), (float)(r1*sin(angle+3*da)), (float)(width*0.5));
+	for (i = 0; i <= teeth; i++) {
+		angle = (float)(i * 2.0 * pi / teeth);
+		glVertex3f((float)(r0 * cos(angle)), (float)(r0 * sin(angle)), (float)(width * 0.5));
+		glVertex3f((float)(r1 * cos(angle)), (float)(r1 * sin(angle)), (float)(width * 0.5));
+		glVertex3f((float)(r0 * cos(angle)), (float)(r0 * sin(angle)), (float)(width * 0.5));
+		glVertex3f((float)(r1 * cos(angle + 3 * da)), (float)(r1 * sin(angle + 3 * da)), (float)(width * 0.5));
 	}
 	glEnd();
 	
 	/* draw front sides of teeth */
 	glBegin(GL_QUADS);
-	da = (float)(2.0*pi / teeth / 4.0);
-	for (i=0;i<teeth;i++) {
-		angle = (float)(i * 2.0*pi / teeth);
-		glVertex3f((float)(r1*cos(angle)), (float)(r1*sin(angle)), (float)(width*0.5));
-		glVertex3f((float)(r2*cos(angle+da)), (float)(r2*sin(angle+da)), (float)(width*0.5));
-		glVertex3f((float)(r2*cos(angle+2*da)), (float)(r2*sin(angle+2*da)), (float)(width*0.5));
-		glVertex3f((float)(r1*cos(angle+3*da)), (float)(r1*sin(angle+3*da)), (float)(width*0.5));
+	da = (float)(2.0 * pi / teeth / 4.0);
+	for (i = 0; i < teeth; i++) {
+		angle = (float)(i * 2.0 * pi / teeth);
+		glVertex3f((float)(r1 * cos(angle)), (float)(r1 * sin(angle)), (float)(width * 0.5));
+		glVertex3f((float)(r2 * cos(angle + da)), (float)(r2 * sin(angle + da)), (float)(width * 0.5));
+		glVertex3f((float)(r2 * cos(angle + 2 * da)), (float)(r2 * sin(angle + 2 * da)), (float)(width * 0.5));
+		glVertex3f((float)(r1 * cos(angle + 3 * da)), (float)(r1 * sin(angle + 3 * da)), (float)(width * 0.5));
 	}
 	glEnd();
 	
@@ -122,64 +122,64 @@
 	
 	/* draw back face */
 	glBegin(GL_QUAD_STRIP);
-	for (i=0;i<=teeth;i++) {
-		angle = (float)(i * 2.0*pi / teeth);
-		glVertex3f((float)(r1*cos(angle)), (float)(r1*sin(angle)), (float)(-width*0.5));
-		glVertex3f((float)(r0*cos(angle)), (float)(r0*sin(angle)), (float)(-width*0.5));
-		glVertex3f((float)(r1*cos(angle+3*da)), (float)(r1*sin(angle+3*da)), (float)(-width*0.5));
-		glVertex3f((float)(r0*cos(angle)), (float)(r0*sin(angle)), (float)(-width*0.5));
+	for (i = 0; i <= teeth; i++) {
+		angle = (float)(i * 2.0 * pi / teeth);
+		glVertex3f((float)(r1 * cos(angle)), (float)(r1 * sin(angle)), (float)(-width * 0.5));
+		glVertex3f((float)(r0 * cos(angle)), (float)(r0 * sin(angle)), (float)(-width * 0.5));
+		glVertex3f((float)(r1 * cos(angle + 3 * da)), (float)(r1 * sin(angle + 3 * da)), (float)(-width * 0.5));
+		glVertex3f((float)(r0 * cos(angle)), (float)(r0 * sin(angle)), (float)(-width * 0.5));
 	}
 	glEnd();
 	
 	/* draw back sides of teeth */
 	glBegin(GL_QUADS);
-	da = (float)(2.0*pi / teeth / 4.0);
-	for (i=0;i<teeth;i++) {
-		angle = (float)(i * 2.0*pi / teeth);
-		glVertex3f((float)(r1*cos(angle+3*da)), (float)(r1*sin(angle+3*da)), (float)(-width*0.5));
-		glVertex3f((float)(r2*cos(angle+2*da)), (float)(r2*sin(angle+2*da)), (float)(-width*0.5));
-		glVertex3f((float)(r2*cos(angle+da)), (float)(r2*sin(angle+da)), (float)(-width*0.5));
-		glVertex3f((float)(r1*cos(angle)), (float)(r1*sin(angle)), (float)(-width*0.5));
+	da = (float)(2.0 * pi / teeth / 4.0);
+	for (i = 0; i < teeth; i++) {
+		angle = (float)(i * 2.0 * pi / teeth);
+		glVertex3f((float)(r1 * cos(angle + 3 * da)), (float)(r1 * sin(angle + 3 * da)), (float)(-width * 0.5));
+		glVertex3f((float)(r2 * cos(angle + 2 * da)), (float)(r2 * sin(angle + 2 * da)), (float)(-width * 0.5));
+		glVertex3f((float)(r2 * cos(angle + da)), (float)(r2 * sin(angle + da)), (float)(-width * 0.5));
+		glVertex3f((float)(r1 * cos(angle)), (float)(r1 * sin(angle)), (float)(-width * 0.5));
 	}
 	glEnd();
 	
 	/* draw outward faces of teeth */
 	glBegin(GL_QUAD_STRIP);
-	for (i=0;i<teeth;i++) {
-		angle = (float)(i * 2.0*pi / teeth);
-		glVertex3f((float)(r1*cos(angle)), (float)(r1*sin(angle)), (float)(width*0.5));
-		glVertex3f((float)(r1*cos(angle)), (float)(r1*sin(angle)), (float)(-width*0.5));
-		u = (float)(r2*cos(angle+da) - r1*cos(angle));
-		v = (float)(r2*sin(angle+da) - r1*sin(angle));
-		len = (float)(sqrt(u*u + v*v));
+	for (i = 0; i < teeth; i++) {
+		angle = (float)(i * 2.0 * pi / teeth);
+		glVertex3f((float)(r1 * cos(angle)), (float)(r1 * sin(angle)), (float)(width * 0.5));
+		glVertex3f((float)(r1 * cos(angle)), (float)(r1 * sin(angle)), (float)(-width * 0.5));
+		u = (float)(r2 * cos(angle + da) - r1 * cos(angle));
+		v = (float)(r2 * sin(angle + da) - r1 * sin(angle));
+		len = (float)(sqrt(u * u + v * v));
 		u /= len;
 		v /= len;
 		glNormal3f(v, -u, 0.0);
-		glVertex3f((float)(r2*cos(angle+da)), (float)(r2*sin(angle+da)), (float)(width*0.5));
-		glVertex3f((float)(r2*cos(angle+da)), (float)(r2*sin(angle+da)), (float)(-width*0.5));
+		glVertex3f((float)(r2 * cos(angle + da)), (float)(r2 * sin(angle + da)), (float)(width * 0.5));
+		glVertex3f((float)(r2 * cos(angle + da)), (float)(r2 * sin(angle + da)), (float)(-width * 0.5));
 		glNormal3f((float)(cos(angle)), (float)(sin(angle)), 0.0);
-		glVertex3f((float)(r2*cos(angle+2*da)), (float)(r2*sin(angle+2*da)), (float)(width*0.5));
-		glVertex3f((float)(r2*cos(angle+2*da)), (float)(r2*sin(angle+2*da)), (float)(-width*0.5));
-		u = (float)(r1*cos(angle+3*da) - r2*cos(angle+2*da));
-		v = (float)(r1*sin(angle+3*da) - r2*sin(angle+2*da));
+		glVertex3f((float)(r2 * cos(angle + 2 * da)), (float)(r2 * sin(angle + 2 * da)), (float)(width * 0.5));
+		glVertex3f((float)(r2 * cos(angle + 2 * da)), (float)(r2 * sin(angle + 2 * da)), (float)(-width * 0.5));
+		u = (float)(r1 * cos(angle + 3 * da) - r2 * cos(angle + 2 * da));
+		v = (float)(r1 * sin(angle + 3 * da) - r2 * sin(angle + 2 * da));
 		glNormal3f(v, -u, 0.0);
-		glVertex3f((float)(r1*cos(angle+3*da)), (float)(r1*sin(angle+3*da)), (float)(width*0.5));
-		glVertex3f((float)(r1*cos(angle+3*da)), (float)(r1*sin(angle+3*da)), (float)(-width*0.5));
+		glVertex3f((float)(r1 * cos(angle + 3 * da)), (float)(r1 * sin(angle + 3 * da)), (float)(width * 0.5));
+		glVertex3f((float)(r1 * cos(angle + 3 * da)), (float)(r1 * sin(angle + 3 * da)), (float)(-width * 0.5));
 		glNormal3f((float)(cos(angle)), (float)(sin(angle)), 0.0);
 	}
-	glVertex3f((float)(r1*cos(0.0)), (float)(r1*sin(0.0)), (float)(width*0.5));
-	glVertex3f((float)(r1*cos(0.0)), (float)(r1*sin(0.0)), (float)(-width*0.5));
+	glVertex3f((float)(r1 * cos(0.0)), (float)(r1 * sin(0.0)), (float)(width * 0.5));
+	glVertex3f((float)(r1 * cos(0.0)), (float)(r1 * sin(0.0)), (float)(-width * 0.5));
 	glEnd();
 	
 	glShadeModel(GL_SMOOTH);
 	
 	/* draw inside radius cylinder */
 	glBegin(GL_QUAD_STRIP);
-	for (i=0;i<=teeth;i++) {
-		angle = (float)(i * 2.0*pi / teeth);
+	for (i = 0; i <= teeth; i++) {
+		angle = (float)(i * 2.0 * pi / teeth);
 		glNormal3f((float)(-cos(angle)), (float)(-sin(angle)), 0.0);
-		glVertex3f((float)(r0*cos(angle)), (float)(r0*sin(angle)), (float)(-width*0.5));
-		glVertex3f((float)(r0*cos(angle)), (float)(r0*sin(angle)), (float)(width*0.5));
+		glVertex3f((float)(r0 * cos(angle)), (float)(r0 * sin(angle)), (float)(-width * 0.5));
+		glVertex3f((float)(r0 * cos(angle)), (float)(r0 * sin(angle)), (float)(width * 0.5));
 	}
 	glEnd();
 }
@@ -201,20 +201,20 @@
 	
 	switch (id)
 	{
-	case 1:
-		glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, ared);
-		gearGL(1.0f, 4.0f, 1.0f, 20, 0.7f);
-		break;
-	case 2:
-		glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, agreen);
-		gearGL(0.5f, 2.0f, 2.0f, 10, 0.7f);
-		break;
-	case 3:
-		glMaterialfv(GL_FRONT, GL_AMBIENT_AND_DIFFUSE, ablue);
-		gearGL(1.3f, 2.0f, 0.5f, 10, 0.7f);

@@ Diff output truncated at 10240 characters. @@



More information about the Bf-blender-cvs mailing list