[prev in list] [next in list] [prev in thread] [next in thread] 

List:       kde-commits
Subject:    KDE/kdeedu/kturtle/src
From:       Jeff Shipley <jshipley () jshipley ! homelinux ! net>
Date:       2007-10-04 15:25:52
Message-ID: 1191511552.116523.13579.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 721098 by shipley:

undo revision 720721

 M  +6 -6      canvas.cpp  
 M  +2 -2      canvas.h  
 M  +6 -6      sprite.cpp  
 M  +1 -1      turtle.cpp  


--- trunk/KDE/kdeedu/kturtle/src/canvas.cpp #721097:721098
@@ -79,7 +79,7 @@
 // 	int width  = qMin(qMax(settings.value("canvasWidth",  400).toInt(), 20), 10000);
 // 	int height = qMin(qMax(settings.value("canvasHeight", 300).toInt(), 20), 10000);
 	turtle->setPos(0, 0);
-	turtle->setAngle(90);
+	turtle->setAngle(0);
 	scene->setBackgroundBrush(QBrush(Qt::white));
 	pen->setColor(Qt::black);
 	pen->setWidth(1);
@@ -120,16 +120,16 @@
 
 void Canvas::slotForward(double x)
 {
-	double x2 = turtle->pos().x() + (x * cos(turtle->angle() * DegToRad));
-	double y2 = turtle->pos().y() - (x * sin(turtle->angle() * DegToRad));
+	double x2 = turtle->pos().x() + (x * sin(turtle->angle() * DegToRad));
+	double y2 = turtle->pos().y() - (x * cos(turtle->angle() * DegToRad));
 	//drawLine(turtle->pos().x(), turtle->pos().y(), x2, y2);
 	slotGo(x2, y2);
 }
 
 void Canvas::slotBackward(double x)
 {
-	double x2 = turtle->pos().x() - ( x * cos(turtle->angle() * DegToRad) );
-	double y2 = turtle->pos().y() + ( x * sin(turtle->angle() * DegToRad) );
+	double x2 = turtle->pos().x() - ( x * sin(turtle->angle() * DegToRad) );
+	double y2 = turtle->pos().y() + ( x * cos(turtle->angle() * DegToRad) );
 	//drawLine(turtle->pos().x(), turtle->pos().y(), x2, y2);
 	slotGo(x2, y2);
 }
@@ -174,8 +174,8 @@
 	QGraphicsTextItem *ti = new QGraphicsTextItem(text, 0, scene);
 // 	ti->setDefaultTextColor(textColor);
 	ti->setFont(textFont);
+	ti->rotate(turtle->angle());
 	ti->setPos(turtle->pos().x(), turtle->pos().y());
-	ti->rotate(90-turtle->angle());
 }
 
 void Canvas::slotFontType(const QString& family, const QString& extra)
--- trunk/KDE/kdeedu/kturtle/src/canvas.h #721097:721098
@@ -46,8 +46,8 @@
 		void slotForward(double x);
 		void slotBackward(double x);
 		void slotDirection(double deg) { turtle->setAngle(deg); }
-		void slotTurnLeft(double deg)  { turtle->setAngle(turtle->angle() + deg); }
-		void slotTurnRight(double deg) { turtle->setAngle(turtle->angle() - deg); }
+		void slotTurnLeft(double deg)  { turtle->setAngle(turtle->angle() - deg); }
+		void slotTurnRight(double deg) { turtle->setAngle(turtle->angle() + deg); }
 		void slotCenter();
 		void slotPenWidth(double width);
 		void slotPenUp()   { pen->setStyle(Qt::NoPen); }
--- trunk/KDE/kdeedu/kturtle/src/sprite.cpp #721097:721098
@@ -18,7 +18,7 @@
 
 #include "sprite.h"
 
-#include <cmath>
+#include <math.h>
 
 #include <QSvgRenderer>
 
@@ -28,10 +28,10 @@
 Sprite::Sprite()
 	: QGraphicsSvgItem(":turtle.svg")
 {
-	_angle = 90;	
+	_angle = 0;	
 	_speed = 0;
 
-	setAngle(90);
+	setAngle(0);
 }
 
 void Sprite::setSpriteSize(int size_in_pixels)
@@ -55,10 +55,10 @@
 	// but we want to the rotation to be around the SVG's center...
 	// This is why this "translation" is needed before the actual rotation.
 	translate(
-		renderer()->defaultSize().width()  * cos((-deg-45) * M_PI/180) * sqrt(2)/2,
-		renderer()->defaultSize().height() * sin((-deg-45) * M_PI/180) * sqrt(2)/2
+		renderer()->defaultSize().width()  * cos((deg-135) * M_PI/180) * sqrt(2)/2,
+		renderer()->defaultSize().height() * sin((deg-135) * M_PI/180) * sqrt(2)/2
 	);
-	rotate(90-deg);
+	rotate(deg);
 	_angle = deg;
 }
 
--- trunk/KDE/kdeedu/kturtle/src/turtle.cpp #721097:721098
@@ -40,7 +40,7 @@
 
 Turtle::Turtle()
 {
-	_angle = 90;
+	_angle = 0;
 	_speed = 0;
 // 	startTimer(1000 / 33);
 }
[prev in list] [next in list] [prev in thread] [next in thread]