SuperTuxKart

Email Archive: supertuxkart-commit (read-only)

2007:	_Jan	_Feb	_Mar	_Apr	_May	_Jun	_Jul	_Aug (26)	_Sep (41)	_Oct (6)	_Nov (33)	_Dec (59)
2008:	_Jan (60)	_Feb (181)	_Mar (71)	_Apr (108)	_May (332)	_Jun (25)	_Jul (51)	_Aug (10)	_Sep (101)	_Oct (91)	_Nov (125)	_Dec (293)
2009:	_Jan (262)	_Feb (119)	_Mar (130)	_Apr (107)	_May (125)	_Jun (113)	_Jul (109)	_Aug (182)	_Sep (93)	_Oct (123)	_Nov (45)	_Dec (147)
2010:	_Jan (215)	_Feb (292)	_Mar (223)	_Apr (222)	_May (114)	_Jun (137)	_Jul (116)	_Aug (125)	_Sep (338)	_Oct (203)	_Nov (449)	_Dec (383)
2011:	_Jan (364)	_Feb (202)	_Mar (384)	_Apr (327)	_May (306)	_Jun (323)	_Jul (282)	_Aug (294)	_Sep (234)	_Oct (143)	_Nov (223)	_Dec (241)
2012:	_Jan (243)	_Feb (135)	_Mar (145)	_Apr (124)	_May (91)	_Jun (88)	_Jul (95)	_Aug (78)	_Sep (120)	_Oct (194)	_Nov (260)	_Dec (211)
2013:	_Jan (124)	_Feb (93)	_Mar (55)	_Apr (127)	_May (63)	_Jun	_Jul	_Aug	_Sep	_Oct	_Nov	_Dec

[Supertuxkart-commit] SF.net SVN: supertuxkart:[3791] main/branches/irrlicht/src/guiengine/ widgets/model_view_widget.cpp

From: <auria@us...> - 2009-08-02 18:04

Revision: 3791
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=3791&view=rev
Author:   auria
Date:     2009-08-02 18:03:58 +0000 (Sun, 02 Aug 2009)

Log Message:
-----------
Speeded up kart model rotation in menus due to popular request

Modified Paths:
--------------
    main/branches/irrlicht/src/guiengine/widgets/model_view_widget.cpp

Modified: main/branches/irrlicht/src/guiengine/widgets/model_view_widget.cpp
===================================================================
--- main/branches/irrlicht/src/guiengine/widgets/model_view_widget.cpp	2009-08-02 17:56:59 UTC (rev 3790)
+++ main/branches/irrlicht/src/guiengine/widgets/model_view_widget.cpp	2009-08-02 18:03:58 UTC (rev 3791)
@@ -80,7 +80,7 @@
 // -----------------------------------------------------------------------------
 void ModelViewWidget::update(float delta)
 {
-    angle += delta*10;
+    angle += delta*25;
     if(angle > 360) angle -= 360;
     
     irr_driver->renderToTexture(m_models, m_model_location, m_texture, angle);


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

[Supertuxkart-commit] SF.net SVN: supertuxkart:[4159] main/branches/irrlicht/src/guiengine/ widgets/model_view_widget.cpp

From: <auria@us...> - 2009-10-29 00:17

Revision: 4159
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=4159&view=rev
Author:   auria
Date:     2009-10-29 00:16:37 +0000 (Thu, 29 Oct 2009)

Log Message:
-----------
Fixed flicker that sometimes occured when stopping model rotation

Modified Paths:
--------------
    main/branches/irrlicht/src/guiengine/widgets/model_view_widget.cpp

Modified: main/branches/irrlicht/src/guiengine/widgets/model_view_widget.cpp
===================================================================
--- main/branches/irrlicht/src/guiengine/widgets/model_view_widget.cpp	2009-10-28 23:57:10 UTC (rev 4158)
+++ main/branches/irrlicht/src/guiengine/widgets/model_view_widget.cpp	2009-10-29 00:16:37 UTC (rev 4159)
@@ -108,6 +108,12 @@
             angle -= delta*m_rotation_speed;
         }
         
+        // slow down when getting close
+        if (fabsf(angle - m_rotation_target) < m_rotation_speed*5.0f)
+        {
+            m_rotation_speed = std::max(m_rotation_speed*0.9f, fabsf(angle - m_rotation_target));
+        }
+        
         // stop rotating when target reached
         if (fabsf(angle - m_rotation_target) < 2.0f) m_rotation_mode = ROTATE_OFF;
     }


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

[Supertuxkart-commit] SF.net SVN: supertuxkart:[4175] main/branches/irrlicht/src/guiengine/ widgets/model_view_widget.cpp

From: <auria@us...> - 2009-10-31 00:43

Revision: 4175
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=4175&view=rev
Author:   auria
Date:     2009-10-31 00:43:05 +0000 (Sat, 31 Oct 2009)

Log Message:
-----------
Improved rotation animation

Modified Paths:
--------------
    main/branches/irrlicht/src/guiengine/widgets/model_view_widget.cpp

Modified: main/branches/irrlicht/src/guiengine/widgets/model_view_widget.cpp
===================================================================
--- main/branches/irrlicht/src/guiengine/widgets/model_view_widget.cpp	2009-10-31 00:32:18 UTC (rev 4174)
+++ main/branches/irrlicht/src/guiengine/widgets/model_view_widget.cpp	2009-10-31 00:43:05 UTC (rev 4175)
@@ -109,9 +109,9 @@
         }
         
         // slow down when getting close
-        if (fabsf(angle - m_rotation_target) < m_rotation_speed*5.0f)
+        if (fabsf(angle - m_rotation_target) < m_rotation_speed*7.0f && fabsf(angle - m_rotation_target) > m_rotation_speed*2.0f)
         {
-            m_rotation_speed = std::max(m_rotation_speed*0.9f, fabsf(angle - m_rotation_target));
+            m_rotation_speed = std::max(m_rotation_speed*0.9f, 25.0f);
         }
         
         // stop rotating when target reached


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

[Supertuxkart-commit] SF.net SVN: supertuxkart:[4202] main/branches/irrlicht/src/guiengine/ widgets/model_view_widget.cpp

From: <auria@us...> - 2009-11-03 20:23

Revision: 4202
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=4202&view=rev
Author:   auria
Date:     2009-11-03 20:23:32 +0000 (Tue, 03 Nov 2009)

Log Message:
-----------
Improved kart rotation to target algorithm (fixing a FIXME)

Modified Paths:
--------------
    main/branches/irrlicht/src/guiengine/widgets/model_view_widget.cpp

Modified: main/branches/irrlicht/src/guiengine/widgets/model_view_widget.cpp
===================================================================
--- main/branches/irrlicht/src/guiengine/widgets/model_view_widget.cpp	2009-11-03 19:58:26 UTC (rev 4201)
+++ main/branches/irrlicht/src/guiengine/widgets/model_view_widget.cpp	2009-11-03 20:23:32 UTC (rev 4202)
@@ -103,9 +103,27 @@
     }
     else if (m_rotation_mode == ROTATE_TO)
     {
-        // TODO : doesn't handle warp-arounds, which may be faster (e.g. we're at 300 and target is 10, better use warp-around)
-        if (angle < m_rotation_target) 
+        // check if we should rotate clockwise or counter-clockwise to reach the target faster
+        // (taking warp-arounds into account)
+        const int angle_distance_from_end = 360 - angle;
+        const int target_distance_from_end = 360 - angle;
+
+        int distance_with_positive_rotation;
+        int distance_with_negative_rotation;
+        
+        if (angle < m_rotation_target)
         {
+            distance_with_positive_rotation = m_rotation_target - angle;
+            distance_with_negative_rotation = angle + target_distance_from_end;
+        }
+        else
+        {
+            distance_with_positive_rotation = angle_distance_from_end + m_rotation_target;
+            distance_with_negative_rotation = angle - m_rotation_target;
+        }
+        
+        if (distance_with_positive_rotation < distance_with_negative_rotation) 
+        {
             angle += delta*m_rotation_speed;
         }
         else


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

[Supertuxkart-commit] SF.net SVN: supertuxkart:[4208] main/branches/irrlicht/src/guiengine/ widgets/model_view_widget.cpp

From: <hikerstk@us...> - 2009-11-04 12:22

Revision: 4208
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=4208&view=rev
Author:   hikerstk
Date:     2009-11-04 12:22:22 +0000 (Wed, 04 Nov 2009)

Log Message:
-----------
Removed compiler warnings.

Modified Paths:
--------------
    main/branches/irrlicht/src/guiengine/widgets/model_view_widget.cpp

Modified: main/branches/irrlicht/src/guiengine/widgets/model_view_widget.cpp
===================================================================
--- main/branches/irrlicht/src/guiengine/widgets/model_view_widget.cpp	2009-11-03 23:53:00 UTC (rev 4207)
+++ main/branches/irrlicht/src/guiengine/widgets/model_view_widget.cpp	2009-11-04 12:22:22 UTC (rev 4208)
@@ -105,21 +105,21 @@
     {
         // check if we should rotate clockwise or counter-clockwise to reach the target faster
         // (taking warp-arounds into account)
-        const int angle_distance_from_end = 360 - angle;
-        const int target_distance_from_end = 360 - angle;
+        const int angle_distance_from_end  = (int)(360 - angle);
+        const int target_distance_from_end = (int)(360 - angle);
 
         int distance_with_positive_rotation;
         int distance_with_negative_rotation;
         
         if (angle < m_rotation_target)
         {
-            distance_with_positive_rotation = m_rotation_target - angle;
-            distance_with_negative_rotation = angle + target_distance_from_end;
+            distance_with_positive_rotation = (int)(m_rotation_target - angle);
+            distance_with_negative_rotation = (int)(angle + target_distance_from_end);
         }
         else
         {
-            distance_with_positive_rotation = angle_distance_from_end + m_rotation_target;
-            distance_with_negative_rotation = angle - m_rotation_target;
+            distance_with_positive_rotation = (int)(angle_distance_from_end + m_rotation_target);
+            distance_with_negative_rotation = (int)(angle - m_rotation_target);
         }
         
         if (distance_with_positive_rotation < distance_with_negative_rotation) 


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

[Supertuxkart-commit] SF.net SVN: supertuxkart:[4262] main/branches/irrlicht/src/guiengine/ widgets/model_view_widget.cpp

From: <auria@us...> - 2009-12-06 18:48

Revision: 4262
          http://supertuxkart.svn.sourceforge.net/supertuxkart/?rev=4262&view=rev
Author:   auria
Date:     2009-12-06 18:47:56 +0000 (Sun, 06 Dec 2009)

Log Message:
-----------
Fixed glitch when selecting kart

Modified Paths:
--------------
    main/branches/irrlicht/src/guiengine/widgets/model_view_widget.cpp

Modified: main/branches/irrlicht/src/guiengine/widgets/model_view_widget.cpp
===================================================================
--- main/branches/irrlicht/src/guiengine/widgets/model_view_widget.cpp	2009-12-06 18:35:58 UTC (rev 4261)
+++ main/branches/irrlicht/src/guiengine/widgets/model_view_widget.cpp	2009-12-06 18:47:56 UTC (rev 4262)
@@ -122,21 +122,20 @@
             distance_with_negative_rotation = (int)(angle - m_rotation_target);
         }
         
+        //std::cout << "distance_with_positive_rotation=" << distance_with_positive_rotation <<
+        //" distance_with_negative_rotation=" << distance_with_negative_rotation << " angle="<< angle  <<std::endl;
+        
         if (distance_with_positive_rotation < distance_with_negative_rotation) 
         {
-            angle += delta*m_rotation_speed;
+            angle += delta*(3.0f + std::min(distance_with_positive_rotation, distance_with_negative_rotation)*2.0f);
         }
         else
         {
-            angle -= delta*m_rotation_speed;
+            angle -= delta*(3.0f + std::min(distance_with_positive_rotation, distance_with_negative_rotation)*2.0f);
         }
-        
-        // slow down when getting close
-        if (fabsf(angle - m_rotation_target) < m_rotation_speed*7.0f && fabsf(angle - m_rotation_target) > m_rotation_speed*2.0f)
-        {
-            m_rotation_speed = std::max(m_rotation_speed*0.9f, 25.0f);
-        }
-        
+        if (angle > 360) angle -= 360;
+        if (angle < 0) angle += 360;
+
         // stop rotating when target reached
         if (fabsf(angle - m_rotation_target) < 2.0f) m_rotation_mode = ROTATE_OFF;
     }


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