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

List:       kde-commits
Subject:    kdegraphics/kpovmodeler
From:       Leon Pennington <leon () leonscape ! co ! uk>
Date:       2004-12-15 0:17:20
Message-ID: 20041215001720.20C4A1BB7F () office ! kde ! org
[Download RAW message or body]

CVS commit by leonp: 

Bugfix for exporting, with the new detail settings.


  M +1 -0      pmpovray31format.cpp   1.4
  M +4 -0      pmpovray31serialization.cpp   1.7
  M +1 -0      pmpovray31serialization.h   1.3
  M +6 -6      pmsphere.cpp   1.17


--- kdegraphics/kpovmodeler/pmpovray31format.cpp  #1.3:1.4
@@ -101,4 +101,5 @@ PMPovray31Format::PMPovray31Format( )
    registerMethod( "Triangle", PMPov31SerTriangle );
    registerMethod( "Warp", PMPov31SerWarp );
+   registerMethod( "DetailObject", PMPov31SerDetailObject );
 }
 

--- kdegraphics/kpovmodeler/pmpovray31serialization.cpp  #1.6:1.7
@@ -2194,2 +2194,6 @@ void PMPov31SerWarp( const PMObject* obj
 }
 
+void PMPov31SerDetailObject( const PMObject* object, const PMMetaObject* metaObject, \
PMOutputDevice* dev ) +{
+        dev->callSerialization( object, metaObject->superClass( ) );
+}

--- kdegraphics/kpovmodeler/pmpovray31serialization.h  #1.2:1.3
@@ -99,4 +99,5 @@ void PMPov31SerTranslate( const PMObject
 void PMPov31SerTriangle( const PMObject* object, const PMMetaObject* metaObject, \
PMOutputDevice* dev );  void PMPov31SerWarp( const PMObject* object, const \
PMMetaObject* metaObject, PMOutputDevice* dev ); +void PMPov31SerDetailObject( const \
PMObject* object, const PMMetaObject* metaObject, PMOutputDevice* dev );  
 #endif

--- kdegraphics/kpovmodeler/pmsphere.cpp  #1.16:1.17
@@ -257,10 +257,10 @@ void PMSphere::createFaces( PMFaceArray&
    for( v = 0; v < vStep - 1; ++v )
    {
-      faces[v] = PMFace( 0, v + 1, v + 2 );
-      faces[ offsetFace + v ] = PMFace( offsetPt1, v + offsetPt2 + 1, v + offsetPt2 \
); +      faces[v] = PMFace( 0, v + 2, v + 1 );
+      faces[ offsetFace + v ] = PMFace( offsetPt1, v + offsetPt2, v + offsetPt2 + 1 \
);  }
 
-   faces[ vStep - 1 ] = PMFace( 0, vStep, 1 );
-   faces[ offsetFace + vStep - 1 ] = PMFace( offsetPt1, offsetPt2, vStep + offsetPt2 \
- 1 ); +   faces[ vStep - 1 ] = PMFace( 0, 1, vStep );
+   faces[ offsetFace + vStep - 1 ] = PMFace( offsetPt1, vStep + offsetPt2 - 1, \
offsetPt2 );  
    offsetFace = vStep;
@@ -270,6 +270,6 @@ void PMSphere::createFaces( PMFaceArray&
       offsetPt2 = ( ( u + 1 ) * vStep ) + 1;
       for( v = 0; v < ( vStep - 1 ); ++v )
-         faces[ offsetFace + v ] = PMFace( v + offsetPt1, v + offsetPt2, v + \
                offsetPt2 + 1, v + offsetPt1 + 1 );
-      faces[ offsetFace + vStep - 1 ] = PMFace( offsetPt1 + vStep - 1, offsetPt2 + \
vStep - 1, offsetPt2, offsetPt1 ); +         faces[ offsetFace + v ] = PMFace( v + \
offsetPt1, v + offsetPt1 + 1, v + offsetPt2 + 1, v + offsetPt2 ); +      faces[ \
offsetFace + vStep - 1 ] = PMFace( offsetPt1 + vStep - 1, offsetPt1, offsetPt2, \
offsetPt2 + vStep - 1 );  offsetFace += vStep;
    }


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