cadcdev-svn-commits Mailing List for Cryptic Allusion DCDev (Page 64)

SourceForge Headquarters 1320 Columbia Street Suite 310 San Diego, CA 92101 +1 (858) 422-6466

Revision: 436
          http://cadcdev.svn.sourceforge.net/cadcdev/?rev=436&view=rev
Author:   atani
Date:     2007-08-09 15:51:20 -0700 (Thu, 09 Aug 2007)

Log Message:
-----------
astyle --style=kr -t -P -K -a

Modified Paths:
--------------
    tiki/examples/TikiTest/TikiTest_Prefix.pch
    tiki/examples/TikiTest/src/Controller.h
    tiki/examples/TikiTest/src/TikiTest.cpp
    tiki/examples/TikiTest/src/test.cpp
    tiki/examples/TikiTest/src/testobj.cpp
    tiki/examples/TikiTest/src/testobj.h
    tiki/examples/console/TikiSnake/TikiSnake_Prefix.pch
    tiki/examples/console/TikiSnake/src/Controller.h
    tiki/examples/console/TikiSnake/src/TikiSnake.cpp
    tiki/examples/console/TikiSnake/src/snake.cpp

Modified: tiki/examples/TikiTest/TikiTest_Prefix.pch
===================================================================

--- tiki/examples/TikiTest/TikiTest_Prefix.pch	2007-08-09 22:48:59 UTC (rev 435)
+++ tiki/examples/TikiTest/TikiTest_Prefix.pch	2007-08-09 22:51:20 UTC (rev 436)
@@ -3,5 +3,5 @@
 //
 
 #ifdef __OBJC__
-    #import <Cocoa/Cocoa.h>
+ #import <Cocoa/Cocoa.h>
 #endif

Modified: tiki/examples/TikiTest/src/Controller.h
===================================================================
--- tiki/examples/TikiTest/src/Controller.h	2007-08-09 22:48:59 UTC (rev 435)
+++ tiki/examples/TikiTest/src/Controller.h	2007-08-09 22:51:20 UTC (rev 436)
@@ -3,12 +3,11 @@
 #import <Cocoa/Cocoa.h>
 #import <Tiki/TikiMain.h>
 
-@interface Controller : NSObject
-{
+@interface Controller : NSObject {
     IBOutlet NSView *mainView;
     IBOutlet NSWindow *mainWindow;
-    
+
     TikiMain * tm;
-		NSString * openFileName;
+    NSString * openFileName;
 }
 @end

Modified: tiki/examples/TikiTest/src/TikiTest.cpp
===================================================================
--- tiki/examples/TikiTest/src/TikiTest.cpp	2007-08-09 22:48:59 UTC (rev 435)
+++ tiki/examples/TikiTest/src/TikiTest.cpp	2007-08-09 22:51:20 UTC (rev 436)
@@ -1,10 +1,10 @@
 /*
- *  TikiTest.cpp
- *  TikiTest
- *
- *  Copyright 2005 Cryptic Allusion, LLC. All rights reserved.
- *
- */
+*  TikiTest.cpp
+*  TikiTest
+*
+*  Copyright 2005 Cryptic Allusion, LLC. All rights reserved.
+*
+*/
 
 #include <Tiki/tiki.h>
 #include <pch.h>
@@ -13,15 +13,16 @@
 #include <windows.h>
 
 static char szAppName[] = "TikiTest";
-int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
+int APIENTRY WinMain( HINSTANCE hInst, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow )
 #else
-extern "C" int tiki_main(int argc, char *argv[]);
-int main(int argc, char *argv[])
+extern "C" int tiki_main( int argc, char *argv[] );
+int main( int argc, char *argv[] )
 #endif
 {
 #if TIKI_PLAT != TIKI_WIN32
-	return tiki_main(argc, argv);
+	return tiki_main( argc, argv );
 #else
-	return Tiki::DoMain(szAppName, hInst, hPrevInstance, lpCmdLine, nCmdShow);
+
+	return Tiki::DoMain( szAppName, hInst, hPrevInstance, lpCmdLine, nCmdShow );
 #endif
 }

Modified: tiki/examples/TikiTest/src/test.cpp
===================================================================
--- tiki/examples/TikiTest/src/test.cpp	2007-08-09 22:48:59 UTC (rev 435)
+++ tiki/examples/TikiTest/src/test.cpp	2007-08-09 22:51:20 UTC (rev 436)
@@ -1,11 +1,11 @@
 /*
- *  test.cpp
- *  TikiTest
- *
- *  Created by Dan Potter on 1/11/05.
- *  Copyright 2005 Cryptic Allusion, LLC. All rights reserved.
- *
- */
+*  test.cpp
+*  TikiTest
+*
+*  Created by Dan Potter on 1/11/05.
+*  Copyright 2005 Cryptic Allusion, LLC. All rights reserved.
+*
+*/
 
 #include <Tiki/tiki.h>
 #include <Tiki/plxcompat.h>
@@ -22,10 +22,10 @@
 using namespace Tiki::Audio::OggVorbis;
 
 /*
-
+ 
 This is a Parallax version of the "bubbles" KGL demo. The speed is about
 the same, but it uses the Parallax functions instead of KGL.
-
+ 
 */
 
 struct mouse_pos_t {
@@ -34,56 +34,56 @@
 	int valid;
 };
 
-volatile mouse_pos_t mp[4]; //Woah, 4 mice!
+volatile mouse_pos_t mp[ 4 ]; //Woah, 4 mice!
 
 //Draw the mouse pointer, parallax-style!
-void draw_mouse(volatile mouse_pos_t *pos) {
+void draw_mouse( volatile mouse_pos_t *pos ) {
 	plx_vertex_t vert;
 
 	plx_mat3d_identity();
 
-	vert.argb = Color(0, 0, 0);
+	vert.argb = Color( 0, 0, 0 );
 	vert.z = 0.3f;
 
 	vert.flags = PLX_VERT;
-	vert.x = static_cast<float>(pos->x - 2);
-	vert.y = static_cast<float>(pos->y - 4);
-	plx_prim(&vert, sizeof(vert));
+	vert.x = static_cast<float>( pos->x - 2 );
+	vert.y = static_cast<float>( pos->y - 4 );
+	plx_prim( &vert, sizeof( vert ) );
 
 	vert.flags = PLX_VERT;
-	vert.x = static_cast<float>(pos->x + 18);
-	vert.y = static_cast<float>(pos->y + 16);
-	plx_prim(&vert, sizeof(vert));
+	vert.x = static_cast<float>( pos->x + 18 );
+	vert.y = static_cast<float>( pos->y + 16 );
+	plx_prim( &vert, sizeof( vert ) );
 
 	vert.flags = PLX_VERT_EOS;
-	vert.x = static_cast<float>(pos->x - 2);
-	vert.y = static_cast<float>(pos->y + 24);
-	plx_prim(&vert, sizeof(vert));
+	vert.x = static_cast<float>( pos->x - 2 );
+	vert.y = static_cast<float>( pos->y + 24 );
+	plx_prim( &vert, sizeof( vert ) );
 
-  vert.argb = Color(0.8f, 0.2f, 0.1f);
+	vert.argb = Color( 0.8f, 0.2f, 0.1f );
 	vert.z = 0.31f;
 
 	vert.flags = PLX_VERT;
-	vert.x = static_cast<float>(pos->x);
-	vert.y = static_cast<float>(pos->y);
-	plx_prim(&vert, sizeof(vert));
+	vert.x = static_cast<float>( pos->x );
+	vert.y = static_cast<float>( pos->y );
+	plx_prim( &vert, sizeof( vert ) );
 
 	vert.flags = PLX_VERT;
-	vert.x = static_cast<float>(pos->x + 15);
-	vert.y = static_cast<float>(pos->y + 15);
-	plx_prim(&vert, sizeof(vert));
+	vert.x = static_cast<float>( pos->x + 15 );
+	vert.y = static_cast<float>( pos->y + 15 );
+	plx_prim( &vert, sizeof( vert ) );
 
 	vert.flags = PLX_VERT_EOS;
-	vert.x = static_cast<float>(pos->x);
-	vert.y = static_cast<float>(pos->y + 21);
-	plx_prim(&vert, sizeof(vert));
+	vert.x = static_cast<float>( pos->x );
+	vert.y = static_cast<float>( pos->y + 21 );
+	plx_prim( &vert, sizeof( vert ) );
 }
 
 /* Draws a sphere out of GL_QUADS according to the syntax of glutSolidSphere
-
+ 
    This now uses triangle strips and PVR Direct Rendering for the best
    possible performance.
-
+ 
    Based very loosely on a routine from James Susinno.
 */
 static float phase = 0.0f;
@@ -98,51 +98,51 @@
 
 	/* Initialize xmtrx with the values from KGL */
 	plx_mat_identity();
-	plx_mat3d_apply(PLX_MAT_SCREENVIEW);
-	plx_mat3d_apply(PLX_MAT_PROJECTION);
-	plx_mat3d_apply(PLX_MAT_MODELVIEW);
+	plx_mat3d_apply( PLX_MAT_SCREENVIEW );
+	plx_mat3d_apply( PLX_MAT_PROJECTION );
+	plx_mat3d_apply( PLX_MAT_MODELVIEW );
 
 	/* Put our own polygon header */
 	// pvr_prim(&hdr, sizeof(hdr));
 
 	/* Iterate over stacks */
-	for ( i=0; i<stacks; i++ ) {
-		pitch = static_cast<float>(2*M_PI * ( (float)i/(float)stacks ));
-		pitch2 = static_cast<float>(2*M_PI * ( (float)(i+1)/(float)stacks ));
+	for ( i = 0; i < stacks; i++ ) {
+		pitch = static_cast<float>( 2 * M_PI * ( ( float ) i / ( float ) stacks ) );
+		pitch2 = static_cast<float>( 2 * M_PI * ( ( float ) ( i + 1 ) / ( float ) stacks ) );
 
 		/* Iterate over slices: each entire stack will be one
 		   long triangle strip. */
-		for ( j=0; j<=slices/2; j++ ) {
-			yaw = static_cast<float>(2*M_PI * ( (float)j/(float)slices ));
-			yaw2 = static_cast<float>(2*M_PI * ( (float)(j+1)/(float)slices ));
+		for ( j = 0; j <= slices / 2; j++ ) {
+			yaw = static_cast<float>( 2 * M_PI * ( ( float ) j / ( float ) slices ) );
+			yaw2 = static_cast<float>( 2 * M_PI * ( ( float ) ( j + 1 ) / ( float ) slices ) );
 
 			/* x, y+1 */
 			x = radius * fcos( yaw ) * fcos( pitch2 );
 			y = radius * fsin( pitch2 );
 			z = radius * fsin( yaw ) * fcos( pitch2 );
-			plx_mat_tfip_3d(x, y, z);			/* Use ftrv to transform */
-			g = fcos( yaw*2 ) / 2.0f + 0.5f;
+			plx_mat_tfip_3d( x, y, z );			/* Use ftrv to transform */
+			g = fcos( yaw * 2 ) / 2.0f + 0.5f;
 			b = fsin( phase + pitch2 ) / 2.0f + 0.5f;
-			plx_vert_fnd(&dr_state, PLX_VERT,
-				x, y, z, 1.0f,
-				0.0f, g, b);
+			plx_vert_fnd( &dr_state, PLX_VERT,
+			              x, y, z, 1.0f,
+			              0.0f, g, b );
 
 			/* x, y */
 			x = radius * fcos( yaw ) * fcos( pitch );
 			y = radius * fsin( pitch );
 			z = radius * fsin( yaw ) * fcos( pitch );
-			plx_mat_tfip_3d(x, y, z);
-			g = fcos( yaw*2 ) / 2.0f + 0.5f;
+			plx_mat_tfip_3d( x, y, z );
+			g = fcos( yaw * 2 ) / 2.0f + 0.5f;
 			b = fsin( phase + pitch ) / 2.0f + 0.5f;
 
-			if (j == (slices/2)) {
-				plx_vert_fnd(&dr_state, PLX_VERT_EOS,
-					x, y, z, 1.0f,
-					0.0f, g, b);
+			if ( j == ( slices / 2 ) ) {
+				plx_vert_fnd( &dr_state, PLX_VERT_EOS,
+				              x, y, z, 1.0f,
+				              0.0f, g, b );
 			} else {
-				plx_vert_fnd(&dr_state, PLX_VERT,
-					x, y, z, 1.0f,
-					0.0f, g, b);
+				plx_vert_fnd( &dr_state, PLX_VERT,
+				              x, y, z, 1.0f,
+				              0.0f, g, b );
 			}
 		}
 	}
@@ -154,116 +154,115 @@
 static void sphere_frame_opaque() {
 	int i;
 
-//	vid_border_color(255, 0, 0);
+	//	vid_border_color(255, 0, 0);
 	Frame::begin();
-//	vid_border_color(0, 255, 0);
+	//	vid_border_color(0, 255, 0);
 
 	//Draw the mice
 
-	for (i=0; i<4; i++) {
-		if(mp[i].valid) {
-			draw_mouse(&mp[i]);
+	for ( i = 0; i < 4; i++ ) {
+		if ( mp[ i ].valid ) {
+			draw_mouse( &mp[ i ] );
 		}
 	}
 
 	plx_mat3d_identity();
-	plx_mat3d_translate(0.0f, 0.0f, -12.0f);
-	plx_mat3d_rotate(r * 2, 0.75f, 1.0f, 0.5f);
+	plx_mat3d_translate( 0.0f, 0.0f, -12.0f );
+	plx_mat3d_rotate( r * 2, 0.75f, 1.0f, 0.5f );
 	plx_mat3d_push();
 
-	for (i=0; i<SPHERE_CNT; i++) {
-		plx_mat3d_translate(6.0f * fcos(static_cast<float>(i * 2*M_PI / SPHERE_CNT)), 0.0f, 6.0f * fsin(static_cast<float>(i * 2*M_PI / SPHERE_CNT)));
-		plx_mat3d_rotate(r, 1.0f, 1.0f, 1.0f);
-		sphere(1.2f, 20, 20);
-		if (i < (SPHERE_CNT-1))
+	for ( i = 0; i < SPHERE_CNT; i++ ) {
+		plx_mat3d_translate( 6.0f * fcos( static_cast<float>( i * 2 * M_PI / SPHERE_CNT ) ), 0.0f, 6.0f * fsin( static_cast<float>( i * 2 * M_PI / SPHERE_CNT ) ) );
+		plx_mat3d_rotate( r, 1.0f, 1.0f, 1.0f );
+		sphere( 1.2f, 20, 20 );
+		if ( i < ( SPHERE_CNT - 1 ) )
 			plx_mat3d_peek();
 	}
 	plx_mat3d_pop();
 
 	plx_mat3d_identity();
-	plx_mat3d_translate(0.0f, 0.0f, -12.0f);
-	plx_mat3d_rotate(-r * 2, 0.75f, 1.0f, 0.5f);
+	plx_mat3d_translate( 0.0f, 0.0f, -12.0f );
+	plx_mat3d_rotate( -r * 2, 0.75f, 1.0f, 0.5f );
 	plx_mat3d_push();
 
-	for (i=0; i<SPHERE_CNT; i++) {
-		plx_mat3d_translate(3.0f * fcos(static_cast<float>(i * 2*M_PI / SPHERE_CNT)), 0.0f, 3.0f * fsin(static_cast<float>(i * 2*M_PI / SPHERE_CNT)));
-		plx_mat3d_rotate(r, 1.0f, 1.0f, 1.0f);
-		sphere(0.8f, 20, 20);
-		if (i < (SPHERE_CNT-1))
+	for ( i = 0; i < SPHERE_CNT; i++ ) {
+		plx_mat3d_translate( 3.0f * fcos( static_cast<float>( i * 2 * M_PI / SPHERE_CNT ) ), 0.0f, 3.0f * fsin( static_cast<float>( i * 2 * M_PI / SPHERE_CNT ) ) );
+		plx_mat3d_rotate( r, 1.0f, 1.0f, 1.0f );
+		sphere( 0.8f, 20, 20 );
+		if ( i < ( SPHERE_CNT - 1 ) )
 			plx_mat3d_peek();
 	}
 	plx_mat3d_pop();
 
-//	vid_border_color(0, 0, 255);
+	//	vid_border_color(0, 0, 255);
 	Frame::finish();
 
-	r+=dir;
-	phase += static_cast<float>(2*M_PI / 240);
+	r += dir;
+	phase += static_cast<float>( 2 * M_PI / 240 );
 }
 
 volatile bool quitting = false;
-void tkCallback(const Hid::Event & evt, void * data) {
-	if (evt.type == Hid::Event::EvtQuit) {
+void tkCallback( const Hid::Event & evt, void * data ) {
+	if ( evt.type == Hid::Event::EvtQuit ) {
 		quitting = true;
-	} else if (evt.type == Event::EvtKeypress || (evt.type == Event::EvtBtnRelease && evt.btn == Event::MouseLeftBtn)) {
+	} else if ( evt.type == Event::EvtKeypress || ( evt.type == Event::EvtBtnRelease && evt.btn == Event::MouseLeftBtn ) ) {
 		dir = -dir;
 	}
 	int port = evt.port;
-	if(evt.port < 0 && evt.port > 4) {
+	if ( evt.port < 0 && evt.port > 4 ) {
 		port = 0;
 	}
-	if (evt.type == Event::EvtAttach) {
-		printf("Device attached: %s\n",evt.dev->getName().c_str());
-		if(evt.dev->getType() == Device::TypeMouse) {
-			mp[port].valid=1;
-			mp[port].x=320;
-			mp[port].y=240;
+	if ( evt.type == Event::EvtAttach ) {
+		printf( "Device attached: %s\n", evt.dev->getName().c_str() );
+		if ( evt.dev->getType() == Device::TypeMouse ) {
+			mp[ port ].valid = 1;
+			mp[ port ].x = 320;
+			mp[ port ].y = 240;
 		}
 	}
-	if (evt.type == Event::EvtDetach) {
-		printf("Device detached: %s\n",evt.dev->getName().c_str());
-		mp[port].valid=0;
+	if ( evt.type == Event::EvtDetach ) {
+		printf( "Device detached: %s\n", evt.dev->getName().c_str() );
+		mp[ port ].valid = 0;
 	}
-	if (evt.type == Event::EvtMouseMove) {
-		mp[port].x=evt.x;
-		mp[port].y=evt.y;
+	if ( evt.type == Event::EvtMouseMove ) {
+		mp[ port ].x = evt.x;
+		mp[ port ].y = evt.y;
 	}
 }
 
-extern "C" int tiki_main(int argc, char **argv) {
+extern "C" int tiki_main( int argc, char **argv ) {
 	// Init Tiki
-	if(!Tiki::init(argc, argv))
-	{
-		exit(-1);
+	if ( !Tiki::init( argc, argv ) ) {
+		exit( -1 );
 	}
-	Tiki::setName("TikiTest", NULL);
-	Tiki::GL::showCursor(false);
-	Hid::callbackReg(tkCallback, NULL);
+	Tiki::setName( "TikiTest", NULL );
+	Tiki::GL::showCursor( false );
+	Hid::callbackReg( tkCallback, NULL );
 
-	Debug::printf("argc: %i\n", argc);
-	for(int i=0; i<argc; i++) {
-		Debug::printf("argv[%i]: %s\n",i,argv[i]);
+	Debug::printf( "argc: %i\n", argc );
+	for ( int i = 0; i < argc; i++ ) {
+		Debug::printf( "argv[%i]: %s\n", i, argv[ i ] );
 	}
-	
+
 #if TIKI_PLAT != TIKI_DC
 	//Attach events happen before we start :(
-	mp[0].valid=1;
-	mp[0].x=320;
-	mp[0].y=240;
+	mp[ 0 ].valid = 1;
+	mp[ 0 ].x = 320;
+	mp[ 0 ].y = 240;
 #endif
 
-	RefPtr<TestObject> test = new TestObject("1");
-	RefPtr<TestObject> test2 = new TestObject("2");
-	test->connect("testevent", test2);
-	test->perform("testmessage", NULL, NULL);
-	test->perform("anothermessage", NULL, NULL);
+	RefPtr<TestObject> test = new TestObject( "1" );
+	RefPtr<TestObject> test2 = new TestObject( "2" );
+	test->connect( "testevent", test2 );
+	test->perform( "testmessage", NULL, NULL );
+	test->perform( "anothermessage", NULL, NULL );
 
-	plx_mat3d_mode(PLX_MAT_PROJECTION);
+	plx_mat3d_mode( PLX_MAT_PROJECTION );
 	plx_mat3d_identity();
-	plx_mat3d_perspective(45.0f, 640.0f / 480.0f, 0.1f, 100.0f);
-	plx_mat3d_mode(PLX_MAT_MODELVIEW);
+	plx_mat3d_perspective( 45.0f, 640.0f / 480.0f, 0.1f, 100.0f );
+	plx_mat3d_mode( PLX_MAT_MODELVIEW );
 
-	while (!quitting)
+	while ( !quitting )
 		sphere_frame_opaque();
 
 	// Shut down Tiki

Modified: tiki/examples/TikiTest/src/testobj.cpp
===================================================================
--- tiki/examples/TikiTest/src/testobj.cpp	2007-08-09 22:48:59 UTC (rev 435)
+++ tiki/examples/TikiTest/src/testobj.cpp	2007-08-09 22:51:20 UTC (rev 436)
@@ -1,9 +1,9 @@
 /*
-   Tiki
+  Tiki
 
-   object.cpp
+  object.cpp
 
-   Copyright (C)2005 Cryptic Allusion, LLC
+  Copyright (C)2005 Cryptic Allusion, LLC
 */
 
 #include <Tiki/tiki.h>
@@ -14,35 +14,34 @@
 using namespace Tiki;
 using std::string;
 
-TIKI_OBJECT_NAME(TestObject)
-TIKI_OBJECT_BEGIN(Object, TestObject)
-	TIKI_OBJECT_RECEIVER("testmessage", TestObject::testMessage)
-	TIKI_OBJECT_RECEIVER("anothermessage", TestObject::anotherMessage)
-	TIKI_OBJECT_RECEIVER("testevent", TestObject::testEvent)
-	TIKI_OBJECT_OUTLET("testevent")
-TIKI_OBJECT_END(TestObject)
+TIKI_OBJECT_NAME( TestObject )
+TIKI_OBJECT_BEGIN( Object, TestObject )
+TIKI_OBJECT_RECEIVER( "testmessage", TestObject::testMessage )
+TIKI_OBJECT_RECEIVER( "anothermessage", TestObject::anotherMessage )
+TIKI_OBJECT_RECEIVER( "testevent", TestObject::testEvent )
+TIKI_OBJECT_OUTLET( "testevent" )
+TIKI_OBJECT_END( TestObject )
 
 
-TestObject::TestObject(string name) {
-	Debug::printf("TestObject::TestObject(%s)\n", name.c_str());
+TestObject::TestObject( string name ) {
+	Debug::printf( "TestObject::TestObject(%s)\n", name.c_str() );
 	m_name = name;
 }
-	
-TestObject::~TestObject() {
-}
-	
-int TestObject::testMessage(Object * sender, Object * arg) {
-	Debug::printf("TestObject(%s)::testMessage(%p, %p)\n", m_name.c_str(), sender, arg);
+
+TestObject::~TestObject() {}
+
+int TestObject::testMessage( Object * sender, Object * arg ) {
+	Debug::printf( "TestObject(%s)::testMessage(%p, %p)\n", m_name.c_str(), sender, arg );
 	return 0;
 }
 
-int TestObject::anotherMessage(Object * sender, Object * arg) {
-	Debug::printf("TestObject(%s)::anotherMessage(%p, %p)\n", m_name.c_str(), sender, arg);
-	return emit("testevent", arg);
+int TestObject::anotherMessage( Object * sender, Object * arg ) {
+	Debug::printf( "TestObject(%s)::anotherMessage(%p, %p)\n", m_name.c_str(), sender, arg );
+	return emit( "testevent", arg );
 }
-	
-int TestObject::testEvent(Object * sender, Object * arg) {
-	Debug::printf("TestObject(%s)::testEvent(%p, %p)\n", m_name.c_str(), sender, arg);
+
+int TestObject::testEvent( Object * sender, Object * arg ) {
+	Debug::printf( "TestObject(%s)::testEvent(%p, %p)\n", m_name.c_str(), sender, arg );
 	return 0;
 }
 

Modified: tiki/examples/TikiTest/src/testobj.h
===================================================================
--- tiki/examples/TikiTest/src/testobj.h	2007-08-09 22:48:59 UTC (rev 435)
+++ tiki/examples/TikiTest/src/testobj.h	2007-08-09 22:51:20 UTC (rev 436)
@@ -6,15 +6,15 @@
 
 class TestObject : public Tiki::Object {
 public:
-	TestObject(std::string name);
+	TestObject( std::string name );
 	virtual ~TestObject();
-	int testMessage(Object * sender, Object * arg);
-	int anotherMessage(Object * sender, Object * arg);
-	int testEvent(Object * sender, Object * arg);
+	int testMessage( Object * sender, Object * arg );
+	int anotherMessage( Object * sender, Object * arg );
+	int testEvent( Object * sender, Object * arg );
 
 protected:
-	TIKI_OBJECT_DECLS(TestObject)
-	
+	TIKI_OBJECT_DECLS( TestObject )
+
 	std::string	m_name;
 };
 

Modified: tiki/examples/console/TikiSnake/TikiSnake_Prefix.pch
===================================================================
--- tiki/examples/console/TikiSnake/TikiSnake_Prefix.pch	2007-08-09 22:48:59 UTC (rev 435)
+++ tiki/examples/console/TikiSnake/TikiSnake_Prefix.pch	2007-08-09 22:51:20 UTC (rev 436)
@@ -3,5 +3,5 @@
 //
 
 #ifdef __OBJC__
-    #import <Cocoa/Cocoa.h>
+ #import <Cocoa/Cocoa.h>
 #endif

Modified: tiki/examples/console/TikiSnake/src/Controller.h
===================================================================
--- tiki/examples/console/TikiSnake/src/Controller.h	2007-08-09 22:48:59 UTC (rev 435)
+++ tiki/examples/console/TikiSnake/src/Controller.h	2007-08-09 22:51:20 UTC (rev 436)
@@ -3,11 +3,10 @@
 #import <Cocoa/Cocoa.h>
 #import <Tiki/TikiMain.h>
 
-@interface Controller : NSObject
-{
+@interface Controller : NSObject {
     IBOutlet NSView *mainView;
     IBOutlet NSWindow *mainWindow;
-    
+
     TikiMain * tm;
 }
 @end

Modified: tiki/examples/console/TikiSnake/src/TikiSnake.cpp
===================================================================
--- tiki/examples/console/TikiSnake/src/TikiSnake.cpp	2007-08-09 22:48:59 UTC (rev 435)
+++ tiki/examples/console/TikiSnake/src/TikiSnake.cpp	2007-08-09 22:51:20 UTC (rev 436)
@@ -1,10 +1,10 @@
 /*
- *  TikiSnake.cpp
- *  TikiSnake
- *
- *  Copyright 2006 Sam Steele. All rights reserved.
- *
- */
+*  TikiSnake.cpp
+*  TikiSnake
+*
+*  Copyright 2006 Sam Steele. All rights reserved.
+*
+*/
 
 #include <Tiki/tiki.h>
 
@@ -13,15 +13,16 @@
 #include "pch.h"
 
 static char szAppName[] = "TikiSnake";
-int APIENTRY WinMain(HINSTANCE hInst, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow)
+int APIENTRY WinMain( HINSTANCE hInst, HINSTANCE hPrevInstance, LPSTR lpCmdLine, int nCmdShow )
 #else
-extern "C" int tiki_main(int argc, char *argv[]);
-int main(int argc, char *argv[])
+extern "C" int tiki_main( int argc, char *argv[] );
+int main( int argc, char *argv[] )
 #endif
 {
 #if TIKI_PLAT != TIKI_WIN32
-	return tiki_main(argc, argv);
+	return tiki_main( argc, argv );
 #else
-	return Tiki::DoMain(szAppName, hInst, hPrevInstance, lpCmdLine, nCmdShow);
+
+	return Tiki::DoMain( szAppName, hInst, hPrevInstance, lpCmdLine, nCmdShow );
 #endif
 }

Modified: tiki/examples/console/TikiSnake/src/snake.cpp
===================================================================
--- tiki/examples/console/TikiSnake/src/snake.cpp	2007-08-09 22:48:59 UTC (rev 435)
+++ tiki/examples/console/TikiSnake/src/snake.cpp	2007-08-09 22:51:20 UTC (rev 436)
@@ -1,10 +1,10 @@
 /*
- *  snake.cpp
- *  TikiSnake - a Tiki version of the classic snake game
- *
- *  Copyright (C)2006 Sam Steele
- *
- */
+*  snake.cpp
+*  TikiSnake - a Tiki version of the classic snake game
+*
+*  Copyright (C)2006 Sam Steele
+*
+*/
 
 #include <Tiki/tiki.h>
 #include <Tiki/plxcompat.h>
@@ -20,182 +20,192 @@
 #define BOARD_X 77
 #define BOARD_Y 20
 
-int board[BOARD_X][BOARD_Y];
+int board[ BOARD_X ][ BOARD_Y ];
 
-int sx=3,sy=3,sdx=1,sdy=0,ssize=3;
-int sscore=0,slives=3;
+int sx = 3, sy = 3, sdx = 1, sdy = 0, ssize = 3;
+int sscore = 0, slives = 3;
 
 volatile bool quitting = false;
-void tkCallback(const Hid::Event & evt, void * data) {
-	if (evt.type == Hid::Event::EvtQuit) {
+void tkCallback( const Hid::Event & evt, void * data ) {
+	if ( evt.type == Hid::Event::EvtQuit ) {
 		quitting = true;
-	} else if (evt.type == Hid::Event::EvtKeypress) {
-		switch(evt.key) {
+	} else if ( evt.type == Hid::Event::EvtKeypress ) {
+		switch ( evt.key ) {
 			case 27:
-				quitting = true;
-				break;
+			quitting = true;
+			break;
 			case Event::KeyUp:
-				sdx = 0;
-				sdy = -1;
-				break;
+			sdx = 0;
+			sdy = -1;
+			break;
 			case Event::KeyDown:
-				sdx = 0;
-				sdy = 1;
-				break;
+			sdx = 0;
+			sdy = 1;
+			break;
 			case Event::KeyLeft:
-				sdx = -1;
-				sdy = 0;
-				break;
+			sdx = -1;
+			sdy = 0;
+			break;
 			case Event::KeyRight:
-				sdx = 1;
-				sdy = 0;
-				break;
+			sdx = 1;
+			sdy = 0;
+			break;
 		}
 	}
 }
 
-extern "C" int tiki_main(int argc, char **argv) {
-	int x,y;
-	bool go=1;
-	bool dead=0;
-	
+extern "C" int tiki_main( int argc, char **argv ) {
+	int x, y;
+	bool go = 1;
+	bool dead = 0;
+
 	//srand(time(NULL));
-		
+
 	// Init Tiki
-	if(!Tiki::init(argc, argv))
-	{
-		exit(-1);
+	if ( !Tiki::init( argc, argv ) ) {
+		exit( -1 );
 	}
-	Tiki::setName("SnakeyGame", NULL);
-	Hid::callbackReg(tkCallback, NULL);
+	Tiki::setName( "SnakeyGame", NULL );
+	Hid::callbackReg( tkCallback, NULL );
 
-	//initialize the screen		
-	ConsoleText *ct = new ConsoleText(80,25,new Texture("pc-ascii.png", true));
-	
-	ct->setSize(640,480);
-	ct->translate(Vector(320,240,0));
-	ct->setAutoScroll(0);
-	ct->setAutoWrap(0);
+	//initialize the screen
+	ConsoleText *ct = new ConsoleText( 80, 25, new Texture( "pc-ascii.png", true ) );
 
+	ct->setSize( 640, 480 );
+	ct->translate( Vector( 320, 240, 0 ) );
+	ct->setAutoScroll( 0 );
+	ct->setAutoWrap( 0 );
+
 	//initialize the board
-	for(x=0;x<BOARD_X;x++) {
-		for(y=0;y<BOARD_Y;y++) {
-			board[x][y]=0;
+	for ( x = 0;x < BOARD_X;x++ ) {
+		for ( y = 0;y < BOARD_Y;y++ ) {
+			board[ x ][ y ] = 0;
 		}
 	}
-	
+
 	//place an item
 	do {
-		x=rand()%BOARD_X; y=rand()%BOARD_Y;
-	} while(board[x][y]!=0);
-	board[x][y]=999;
-	
-	while(!quitting) {
+		x = rand() % BOARD_X;
+		y = rand() % BOARD_Y;
+	} while ( board[ x ][ y ] != 0 );
+	board[ x ][ y ] = 999;
+
+	while ( !quitting ) {
 		//move head
-		if(!dead) {
-			sx+=sdx;
-			sy+=sdy;
+		if ( !dead ) {
+			sx += sdx;
+			sy += sdy;
 		}
 		//check bounds
-		if(sx>=BOARD_X || sx<0 || sy>=BOARD_Y || sy<0) { 
-			slives--; 
-			ssize=3; 
-			for(x=0;x<BOARD_X;x++) {
-				for(y=0;y<BOARD_Y;y++) {
-					board[x][y]=0;
+		if ( sx >= BOARD_X || sx < 0 || sy >= BOARD_Y || sy < 0 ) {
+			slives--;
+			ssize = 3;
+			for ( x = 0;x < BOARD_X;x++ ) {
+				for ( y = 0;y < BOARD_Y;y++ ) {
+					board[ x ][ y ] = 0;
 				}
 			}
-			sx=rand()%BOARD_X;
-			sy=rand()%BOARD_Y;
+			sx = rand() % BOARD_X;
+			sy = rand() % BOARD_Y;
 			do { //place a new item in an empty spot
-				x=rand()%BOARD_X; y=rand()%BOARD_Y;
-			} while(board[x][y]!=0);
-			board[x][y]=999;
+				x = rand() % BOARD_X;
+				y = rand() % BOARD_Y;
+			} while ( board[ x ][ y ] != 0 );
+			board[ x ][ y ] = 999;
 		}
-		
+
 		//check collisions
-		if(board[sx][sy]>0) {
-			if(board[sx][sy]==999) { //item
-				ssize+=2; //increment snake size
+		if ( board[ sx ][ sy ] > 0 ) {
+			if ( board[ sx ][ sy ] == 999 ) { //item
+				ssize += 2; //increment snake size
 				sscore++; //and score
 				do { //place a new item in an empty spot
-					x=rand()%BOARD_X; y=rand()%BOARD_Y;
-				} while(board[x][y]!=0);
-				board[x][y]=999;
+					x = rand() % BOARD_X;
+					y = rand() % BOARD_Y;
+				} while ( board[ x ][ y ] != 0 );
+				board[ x ][ y ] = 999;
 				//make the stretch work correctly
-				for(x=0;x<BOARD_X;x++) {
-					for(y=0;y<BOARD_Y;y++) {
-						if(board[x][y]>0&&board[x][y]!=999) board[x][y]+=2;
+				for ( x = 0;x < BOARD_X;x++ ) {
+					for ( y = 0;y < BOARD_Y;y++ ) {
+						if ( board[ x ][ y ] > 0 && board[ x ][ y ] != 999 )
+							board[ x ][ y ] += 2;
 					}
 				}
 			} else { //snake
-				slives--; 
-				ssize=3; 
-				for(x=0;x<BOARD_X;x++) {
-					for(y=0;y<BOARD_Y;y++) {
-						board[x][y]=0;
+				slives--;
+				ssize = 3;
+				for ( x = 0;x < BOARD_X;x++ ) {
+					for ( y = 0;y < BOARD_Y;y++ ) {
+						board[ x ][ y ] = 0;
 					}
 				}
-				sx=rand()%BOARD_X;
-				sy=rand()%BOARD_Y;
+				sx = rand() % BOARD_X;
+				sy = rand() % BOARD_Y;
 			}
 		}
-		if(slives<=0) dead=1;
-		board[sx][sy]=ssize+1;
-		
+		if ( slives <= 0 )
+			dead = 1;
+		board[ sx ][ sy ] = ssize + 1;
+
 		//decrement the array (simulates motion)
-		for(x=0;x<BOARD_X;x++) {
-			for(y=0;y<BOARD_Y;y++) {
-				if(board[x][y]>0&&board[x][y]!=999) board[x][y]--;
+		for ( x = 0;x < BOARD_X;x++ ) {
+			for ( y = 0;y < BOARD_Y;y++ ) {
+				if ( board[ x ][ y ] > 0 && board[ x ][ y ] != 999 )
+					board[ x ][ y ] --;
 			}
 		}
-		
+
 		//render the screen
-		ct->locate(0,0);
-		ct->color(GREY | HIGH_INTENSITY, BLACK);
+		ct->locate( 0, 0 );
+		ct->color( GREY | HIGH_INTENSITY, BLACK );
 		*ct << "Score: " << sscore << endl;
-		ct->locate(70,0);
-		if(dead==0) *ct << "Lives: " << slives << endl; 
-		ct->color(YELLOW | HIGH_INTENSITY, BLACK);
-		*ct << (char)218;
-		for(x=0;x<BOARD_X;x++)
-			*ct << (char)196;
-			*ct << (char)191 << endl;
-			for(y=0;y<BOARD_Y;y++) {
-				ct->color(YELLOW | HIGH_INTENSITY, BLACK);
-				*ct << (char)179;
-				for(x=0;x<BOARD_X;x++) {
-					ct->color(GREY | HIGH_INTENSITY, BLACK);
-					if(board[x][y]==999 && dead==0) { //draw an item
-						ct->color(5,0);
-						*ct << (char)4;
-					} else if(board[x][y]>0&&dead==0) *ct << "*"; //draw a snake piece
-					else *ct << " "; //draw a space
-				}
-				ct->color(YELLOW | HIGH_INTENSITY, BLACK);
-				*ct << (char)179 << endl;
+		ct->locate( 70, 0 );
+		if ( dead == 0 )
+			* ct << "Lives: " << slives << endl;
+		ct->color( YELLOW | HIGH_INTENSITY, BLACK );
+		*ct << ( char ) 218;
+		for ( x = 0;x < BOARD_X;x++ )
+			*ct << ( char ) 196;
+		*ct << ( char ) 191 << endl;
+		for ( y = 0;y < BOARD_Y;y++ ) {
+			ct->color( YELLOW | HIGH_INTENSITY, BLACK );
+			*ct << ( char ) 179;
+			for ( x = 0;x < BOARD_X;x++ ) {
+				ct->color( GREY | HIGH_INTENSITY, BLACK );
+				if ( board[ x ][ y ] == 999 && dead == 0 ) { //draw an item
+					ct->color( 5, 0 );
+					*ct << ( char ) 4;
+				} else if ( board[ x ][ y ] > 0 && dead == 0 )
+					* ct << "*"; //draw a snake piece
+				else
+					*ct << " "; //draw a space
 			}
-			*ct << (char)192;
-			for(x=0;x<BOARD_X;x++)
-				*ct << (char)196;
-			*ct << (char)217<<endl;
-			ct->color(GREY | HIGH_INTENSITY, BLACK);
-			*ct << "TikiSnake                                                  (C) 2006 Sam Steele";
-			if(dead) {
-				ct->color(RED, BLACK);
-				ct->locate(36,11); *ct << "You Died!";
-				ct->locate(36,12); *ct << "Press ESC";
-			}
-			
-			Frame::begin();
-			ct->draw(Drawable::Opaque);
-			Frame::transEnable();
-			ct->draw(Drawable::Trans);
-			Frame::finish();
-			
-			Time::sleep(80000);
-	}	
-	
+			ct->color( YELLOW | HIGH_INTENSITY, BLACK );
+			*ct << ( char ) 179 << endl;
+		}
+		*ct << ( char ) 192;
+		for ( x = 0;x < BOARD_X;x++ )
+			*ct << ( char ) 196;
+		*ct << ( char ) 217 << endl;
+		ct->color( GREY | HIGH_INTENSITY, BLACK );
+		*ct << "TikiSnake                                                  (C) 2006 Sam Steele";
+		if ( dead ) {
+			ct->color( RED, BLACK );
+			ct->locate( 36, 11 );
+			*ct << "You Died!";
+			ct->locate( 36, 12 );
+			*ct << "Press ESC";
+		}
+
+		Frame::begin();
+		ct->draw( Drawable::Opaque );
+		Frame::transEnable();
+		ct->draw( Drawable::Trans );
+		Frame::finish();
+
+		Time::sleep( 80000 );
+	}
+
 	Tiki::shutdown();
 
 	return 0;


This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.




2003	Jan	Feb	Mar	Apr	May	Jun	Jul	Aug	Sep	Oct	Nov (35)	Dec (2)
2004	Jan (37)	Feb (10)	Mar	Apr (2)	May (17)	Jun (1)	Jul (14)	Aug (14)	Sep (4)	Oct	Nov (14)	Dec (4)
2005	Jan (6)	Feb	Mar	Apr (6)	May	Jun	Jul	Aug	Sep (1)	Oct	Nov (92)	Dec (12)
2006	Jan (3)	Feb (4)	Mar	Apr (5)	May (3)	Jun (15)	Jul (3)	Aug (1)	Sep (29)	Oct (1)	Nov (6)	Dec (5)
2007	Jan (2)	Feb (2)	Mar	Apr (3)	May (14)	Jun (2)	Jul (16)	Aug (73)	Sep (12)	Oct (9)	Nov (27)	Dec (3)
2008	Jan (4)	Feb (4)	Mar (3)	Apr (8)	May (23)	Jun (4)	Jul (1)	Aug (3)	Sep (7)	Oct (5)	Nov (1)	Dec (1)
2009	Jan	Feb (10)	Mar	Apr (4)	May (4)	Jun (10)	Jul	Aug (1)	Sep	Oct (7)	Nov	Dec (1)
2010	Jan	Feb (1)	Mar	Apr (6)	May	Jun (3)	Jul (11)	Aug (1)	Sep	Oct (15)	Nov (1)	Dec (5)
2011	Jan (4)	Feb (1)	Mar (6)	Apr	May (22)	Jun	Jul (8)	Aug (2)	Sep	Oct	Nov	Dec (2)
2012	Jan	Feb (10)	Mar (1)	Apr (6)	May (27)	Jun (48)	Jul (30)	Aug (4)	Sep	Oct (3)	Nov (1)	Dec (11)
2013	Jan (4)	Feb (7)	Mar (6)	Apr (18)	May (28)	Jun (20)	Jul	Aug (4)	Sep (1)	Oct (1)	Nov (2)	Dec (7)
2014	Jan (3)	Feb (2)	Mar (4)	Apr (9)	May (11)	Jun (10)	Jul	Aug (18)	Sep (12)	Oct (17)	Nov (10)	Dec (16)
2015	Jan (5)	Feb (1)	Mar (5)	Apr (4)	May (28)	Jun (2)	Jul	Aug	Sep (6)	Oct	Nov (2)	Dec (1)
2016	Jan (14)	Feb	Mar (3)	Apr	May	Jun (3)	Jul (4)	Aug (4)	Sep (1)	Oct (1)	Nov	Dec (1)
2017	Jan (11)	Feb	Mar (21)	Apr	May (1)	Jun	Jul	Aug	Sep	Oct	Nov	Dec (1)
2018	Jan	Feb	Mar (1)	Apr	May (1)	Jun	Jul	Aug (2)	Sep (4)	Oct (4)	Nov	Dec (1)
2019	Jan (1)	Feb	Mar	Apr (1)	May	Jun	Jul	Aug (13)	Sep (4)	Oct	Nov	Dec
2020	Jan (10)	Feb (9)	Mar (5)	Apr (4)	May (3)	Jun (18)	Jul (4)	Aug (2)	Sep (20)	Oct (2)	Nov	Dec
2021	Jan	Feb	Mar	Apr (2)	May (1)	Jun (2)	Jul (1)	Aug (2)	Sep	Oct	Nov	Dec (2)
2022	Jan (1)	Feb (2)	Mar (2)	Apr (1)	May	Jun	Jul	Aug (5)	Sep	Oct (1)	Nov	Dec (1)
2023	Jan (10)	Feb (7)	Mar (29)	Apr (31)	May (29)	Jun (34)	Jul (3)	Aug (24)	Sep (22)	Oct (10)	Nov (38)	Dec (27)
2024	Jan (15)	Feb (8)	Mar (4)	Apr (20)	May (33)	Jun (18)	Jul (15)	Aug (23)	Sep (26)	Oct (32)	Nov (6)	Dec (4)
2025	Jan (7)	Feb (1)	Mar (1)	Apr (4)	May (46)	Jun (19)	Jul (26)	Aug (48)	Sep (30)	Oct (8)	Nov (9)	Dec

cadcdev-svn-commits Mailing List for Cryptic Allusion DCDev (Page 64)

cadcdev-svn-commits — Source Code Repository Updates