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

List:       kde-commits
Subject:    branches/work/soc-stepgame/step/step
From:       Aliona Kuznetsova <aliona.kuz () gmail ! com>
Date:       2008-08-11 8:05:15
Message-ID: 1218441915.809450.6218.nullmailer () svn ! kde ! org
[Download RAW message or body]

SVN commit 845062 by alionakuz:

Baloon element

 A             gameitems/baloon.cc   [License: GPL (v2+)]
 A             gameitems/baloon.h   [License: GPL (v2+)]
 M  +1 -1      gameitems/fork.cc  
 M  +20 -2     themes/default.svg  
 M  +1 -1      worldfactory.cc  
 M  +2 -0      worldgraphics.cc  


--- branches/work/soc-stepgame/step/step/gameitems/fork.cc #845061:845062
@@ -177,5 +177,5 @@
     }
 
     return false;
-} //not to forget c file and fabric;
+} 
 
--- branches/work/soc-stepgame/step/step/themes/default.svg #845061:845062
@@ -37,8 +37,8 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1.7963714"
-     inkscape:cx="97.072272"
-     inkscape:cy="541.42731"
+     inkscape:cx="-1.1813519"
+     inkscape:cy="185.15355"
      inkscape:document-units="px"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -887,5 +887,23 @@
          d="M 194.83721,280.06298 C 196.82141,277.58273 195.95057,286.35023 \
195.95057,289.5265 C 195.95057,292.11053 194.83721,295.59041 194.83721,299.5467 C \
194.83721,302.18512 195.95057,303.39226 195.95057,305.11347"  \
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:2.3;stroke-linecap:butt \
;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> \
</g> +    <g
+       id="Baloon">
+      <path
+         transform="translate(250.92856,426.1479)"
+         d="M 334.00666,668.62402 A 16.978672,15.586977 0 1 1 300.04931,668.62402 A \
16.978672,15.586977 0 1 1 334.00666,668.62402 z" +         sodipodi:ry="15.586977"
+         sodipodi:rx="16.978672"
+         sodipodi:cy="668.62402"
+         sodipodi:cx="317.02798"
+         id="path2554"
+         style="fill:#ffffff;fill-opacity:1;fill-rule:nonzero;stroke:#000000;stroke-w \
idth:1;stroke-linecap:square;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1"
 +         sodipodi:type="arc" />
+      <path
+         transform="translate(250.92856,426.1479)"
+         id="path2562"
+         d="M 315.63629,683.65435 C 317.05563,684.22209 307.68891,690.89116 \
313.40958,690.89116 C 316.62996,690.89116 322.54273,689.08898 317.30632,686.99442 C \
316.15058,686.53212 316.19297,684.7677 315.63629,683.65435 z" +         \
style="fill:none;fill-rule:evenodd;stroke:#000000;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" \
/> +    </g>
   </g>
 </svg>
--- branches/work/soc-stepgame/step/step/worldfactory.cc #845061:845062
@@ -127,7 +127,7 @@
     __REGISTER_EXT_E(ChargedParticle, ItemCreator, ParticleGraphicsItem, \
ItemMenuHandler);  
     __REGISTER_EXT(Disk, DiskCreator, DiskGraphicsItem, ItemMenuHandler);
-    __REGISTER_EXT(Baloon, DiskCreator, DiskGraphicsItem, ItemMenuHandler);
+    __REGISTER_EXT(Baloon, DiskCreator, BaloonGraphicsItem, ItemMenuHandler);
     __REGISTER_EXT(Box, BoxCreator, BoxGraphicsItem, ItemMenuHandler);
     __REGISTER_EXT(Polygon, PolygonCreator, PolygonGraphicsItem, ItemMenuHandler);
 
--- branches/work/soc-stepgame/step/step/worldgraphics.cc #845061:845062
@@ -720,6 +720,7 @@
             StepCore::Vector2d v = p.property->readVariant ( _item \
                ).value<StepCore::Vector2d>();
             double L1 = std::sqrt ( StepCore::square ( v.norm() * \
                _worldScene->viewScale() + p.headSize.width() / 2 )
                                     + StepCore::square ( qMax ( p.headSize.height(), \
p.bodyHeight ) / 2 ) ); +        if(L1 > 500) continue;
 
             if ( L1 > L ) L = L1;
         } else if ( p.property->userTypeId() == qMetaTypeId<double>() ) {
@@ -770,6 +771,7 @@
         if ( p.property->userTypeId() == qMetaTypeId<StepCore::Vector2d>() ) {
             StepCore::Vector2d r = p.property->readVariant ( _item \
).value<StepCore::Vector2d>();  double rnorm = r.norm() * _worldScene->viewScale();
+            if(rnorm > 500) continue;
 
             QPainter painter;
             painter.begin ( pixmap );


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