Changeset 9

Timestamp:

03/23/08 11:23:24 (10 months ago)

Author:

jpv

Message:

Lecture et ecriture de fichier .dat
Ecriture de fichiers .obj

Files:

• trunk/pst-solides3d.tex (modified) (4 diffs)
• trunk/solides.pro (modified) (4 diffs)
• trunk/tests/index.txt (added)
• trunk/tests/test_04.ps (modified) (25 diffs)
• trunk/tests/test_04.tex (modified) (2 diffs)
• trunk/tests/test_08.ps (added)
• trunk/tests/test_08.tex (added)
• trunk/tests/test_09.pdf (added)
• trunk/tests/test_09.tex (added)

trunk/pst-solides3d.tex

@@ -11 +11 @@
-\ifx\MultidoLoaded\endinput\else\input multido.tex \fi
-% JPV & ML & AS
-2
-1/15
+5
+3/23
-\message{`PSTSOLIDESIIID' v\fileversion, \filedate}
-%
@@ -196 +196 @@
-}}
-% type de dessin
-
+,writeobj,writesolid
-%% Reservation de macros correspondants aux actions
-\pst@solides@reservednames{action}
@@ -216 +216 @@
-grille,prisme,anneau,parallelepiped,prismecreux,ruban,calottesphere,face,%
-surface,calottespherecreuse,polygoneregulier,fusion,new,chemin,courbeR2,courbe,%
-
+,datfile
-%% Reservation de macros correspondants aux objects
-\pst@solides@reservednames{object}
@@ -375 +375 @@
-/solidname /\pst@solides@name\space def
-\fi
+\ifx\pst@solides@file\@empty
+    \else
+/solidfilename (\pst@solides@file) def
+\fi
-%
-\ifx\pst@solides@fcol\@empty

trunk/solides.pro

@@ -5955 +5955 @@
-} def
-
+%%%%% ### readsolidfile ###
+%% syntaxe : str readsolidfile -> solid
+/readsolidfile {
+1 dict begin
+   /str exch def
+   [str (-sommets.dat) append run] 
+   [str (-faces.dat) append run]
+   generesolid
+   dup [str (-couleurs.dat) append run] solidputfcolors
+   dup [str (-io.dat) append run] solidputinouttable
+end
+} def
+
+%%%%% ### writesolidfile ###
+%% syntaxe : solid str writesolidfile -> -
+/writesolidfile {
+10 dict begin
+   /str exch def
+   /solid exch def
+   solid issolid not {
+      (Error : mauvais type d argument dans writesolidfile) ==
+      quit
+   } if
+   str (-sommets.dat) append (w) file /lefichiersommets exch def
+   str (-faces.dat) append (w) file /lefichierfaces exch def
+   str (-couleurs.dat) append (w) file /lefichiercouleurs exch def
+   str (-io.dat) append (w) file /lefichierio exch def
+
+   /S solid solidgetsommets def
+   0 1 S length 3 idiv 1 sub {
+      /i exch def
+      solid i solidgetsommet
+      /z exch def
+      /y exch def
+      /x exch def
+      lefichiersommets x chaine cvs writestring
+      lefichiersommets 32 write %% espace
+      lefichiersommets y chaine cvs writestring
+      lefichiersommets 32 write %% espace
+      lefichiersommets z chaine cvs writestring
+      lefichiersommets 10 write %% CR
+   } for
+   lefichiersommets closefile
+
+   /F solid solidgetfaces def
+   0 1 F length 1 sub {
+      /i exch def
+      /Fi solid i solidgetface def
+      lefichierfaces 91 write %% [
+      0 1 Fi length 1 sub {
+         /j exch def
+         lefichierfaces Fi j get chaine cvs writestring
+         lefichierfaces 32 write %% espace
+      } for
+      lefichierfaces 93 write %% ]
+      lefichierfaces 10 write %% CR
+   } for
+   lefichierfaces closefile
+
+   /C solid solidgetfcolors def
+   0 1 C length 1 sub {
+      /i exch def
+      lefichiercouleurs 40 write %% (
+      lefichiercouleurs C i get writestring
+      lefichiercouleurs 41 write %% )
+      lefichiercouleurs 10 write %% CR
+   } for
+   lefichiercouleurs closefile
+
+   /IO solid solidgetinouttable def
+   0 1 3 {
+      /i exch def
+      lefichierio IO i get chaine cvs writestring
+      lefichierio 32 write %% space
+   } for
+   lefichierio closefile
+end
+} def
+
-%%%%% ### writeobjfile ###
-%% syntaxe : solid str writeobjfile -> -
-/writeobjfile {
-10 dict begin
-
+(.obj) append 
-   /solid exch def
-   solid issolid not {
@@ -6000 +6079 @@
-/newobjfile {
-3 dict begin
-
+(.obj) append 
-   /v {} def
-   /ok true def
@@ -6210 +6289 @@
-/draw* {drawsolid*} def
-/draw** {drawsolid**} def
+/writeobj {solidfilename writeobjfile} def
+/writesolid {solidfilename writesolidfile} def
-/none {pop} def
-
@@ -6675 +6756 @@
-%%       dup videsolid
-%%    } if
+   gere_pstricks_opt
+} def
+
+/pst-datfile {
+   solidfilename readsolidfile
+   /activationgestioncouleurs false def
-   gere_pstricks_opt
-} def

trunk/tests/test_04.ps

@@ -2 +2 @@
-%%Creator: dvips(k) 5.96.1 Copyright 2007 Radical Eye Software
-%%Title: test_04.dvi
-Thu Feb 14 21:01:49
-1
+Sun Mar 23 09:43:20
+2
-%%PageOrder: Ascend
-%%BoundingBox: 0 0 596 842
@@ -11 +11 @@
-%DVIPSCommandLine: dvips test_04
-%DVIPSParameters: dpi=600
-2.14:2101
+3.23:0943
-%%BeginProcSet: tex.pro 0 0
-%!
@@ -1680 +1680 @@
-%!
-% PostScript prologue for pst-solides3d.tex.
-2, 2008/01/17
+5, 2008/03/21
-%
-%% COPYRIGHT 2008 by Jean-Paul Vignault, Manuel Luque
@@ -1982 +1982 @@
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
-
+%%%%% ### AAAopacity ###
+%% les parametres pour la gestion de la transparence
+/setstrokeopacity {
+   /strokeopacity exch def
+} def
+/setfillopacity {
+  /fillopacity exch def
+} def
+%% d apres un code de Jean-Michel Sarlat
+%% http://melusine.eu.org/syracuse/swf/pdf2swf/setdash/
+%% Mise en reserve de la procedure stroke originelle.
+/sysstroke {systemdict /stroke get exec} def
+/sysfill {systemdict /fill get exec} def
+% Mise en place de la nouvelle procedure
+/stroke {
+   /strokeopacity where {
+      /strokeopacity get
+   } {
+      1
+   } ifelse
+   .setopacityalpha sysstroke
+} def
+/fill {
+   /fillopacity where {
+      /fillopacity get
+   } {
+      1
+   } ifelse
+   .setopacityalpha sysfill
+} def
+
-%%%%% ### AAAscale ###
-%%%%%%%%%%%%%%%% les deplacements a l echelle %%%%%%%%%%%%%%%%%%%
@@ -3657 +3688 @@
-   /u defpoint3d
-   /norme u norme3d def
-
-
-
+
+
+
+
-   } ifelse
-end
@@ -5781 +5813 @@
-
-      %% on marque les aretes
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
-   } if
-end
@@ -5809 +5843 @@
-} def
-
-
+
+
-/drawsolid {
-
+
+
+
+
-   /solid exch def
-   solid issolid not {
@@ -5825 +5863 @@
-      %% tableau des aretes
-      /A [
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-      0 1 F length 1 sub {
@@ -5914 +5956 @@
-%%%%     operations sur des solides particuliers        %%%%
-%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%%
+
+%%%%% ### dualpolyedre ###
+%% syntaxe : solid dualpolyedreregulier --> solid
+%% syntaxe : solid r dualpolyedreregulier --> solid
+%% si le nombre r est present, projette les nouveaux sommets sur la sphere de centre O , de rayon r
+/dualpolyedreregulier {
+20 dict begin
+   dup isnum {
+      /r exch def
+      /projection true def
+   } {
+      /projection false def
+   } ifelse
+   /solid exch def
+   solid dupsolid /result exch def pop
+   /n solid solidnombrefaces def
+   /N solid solidnombresommets def
+   /facesaenlever [] def
+   %% pour chacun des sommets
+   0 1 N 1 sub {
+      %% sommet d indice i
+      /i exch def
+      %% indicesfacesadj = liste des indices des faces ou on trouve le sommet i
+      /indicesfacesadj solid i solidfacesadjsommet def
+      %% on recupere les centres des faces concernees
+      /nouveauxsommets [
+         0 1 indicesfacesadj length 1 sub {
+            /k exch def 
+            solid indicesfacesadj k get solidgetsommetsface isobarycentre3d
+         } for
+      ] def
+      %% et on pose G = barycentre de ces points
+      nouveauxsommets isobarycentre3d /G defpoint3d
+      %% il faut ordonner ces sommets
+      nouveauxsommets 0 getp3d /ptref defpoint3d
+      G solid i solidgetsommet vecteur3d /vecteurnormal defpoint3d
+      nouveauxsommets duparray exch pop
+      {1 dict begin
+         /M defpoint3d
+         G ptref vecteur3d
+         G M vecteur3d
+         vecteurnormal angle3doriente
+      end} papply3d
+      doublebubblesort pop
+      %% nos sommets sont tries
+      /indicesommetstries exch def
+      projection {
+         %% on projette les sommets sur la sphere
+         /nouveauxsommets [ nouveauxsommets {normalize3d r mulv3d} papply3d aload pop ] store
+      } if
+      %% puis on les rajoute au solide
+      /nouveauxindices [
+         0 1 nouveauxsommets length 3 idiv 1 sub {
+            /k exch def
+            result nouveauxsommets k getp3d solidaddsommet
+         } for
+      ] def
+      %% ainsi que la face concernee
+      result [
+         0 1 indicesommetstries length 1 sub {
+            /k exch def
+         nouveauxindices indicesommetstries k get get
+         } for 
+      ] solidaddface
+      /facesaenlever [ facesaenlever aload pop indicesfacesadj aload pop ] store
+   } for
+   result [0 1 n 1 sub {} for] solidrmfaces
+   [N 1 sub -1 0 {} for] {result exch solidrmsommet} apply
+   result
+end
+} def
-
-%%%%% ### solidchampfreine ###
@@ -6240 +6353 @@
-%% syntaxe : N r newdualgeode --> solid
-/newdualgeode {
-true
-hedre
+1
+edreregulier
-} def
-
@@ -7521 +7634 @@
-} def
-
+%%%%% ### writesolidfile ###
+%% syntaxe : solid str writesolidfile -> -
+/writesolidfile {
+10 dict begin
+   /str exch def
+   /solid exch def
+   solid issolid not {
+      (Error : mauvais type d argument dans writesolidfile) ==
+      quit
+   } if
+   str (-sommets.dat) append (w) file /lefichiersommets exch def
+   str (-faces.dat) append (w) file /lefichierfaces exch def
+   str (-couleurs.dat) append (w) file /lefichiercouleurs exch def
+   str (-io.dat) append (w) file /lefichierio exch def
+
+   /S solid solidgetsommets def
+   0 1 S length 3 idiv 1 sub {
+      /i exch def
+      solid i solidgetsommet
+      /z exch def
+      /y exch def
+      /x exch def
+      lefichiersommets x chaine cvs writestring
+      lefichiersommets 32 write %% espace
+      lefichiersommets y chaine cvs writestring
+      lefichiersommets 32 write %% espace
+      lefichiersommets z chaine cvs writestring
+      lefichiersommets 10 write %% CR
+   } for
+   lefichiersommets closefile
+
+   /F solid solidgetfaces def
+   0 1 F length 1 sub {
+      /i exch def
+      /Fi solid i solidgetface def
+      lefichierfaces 91 write %% [
+      0 1 Fi length 1 sub {
+         /j exch def
+         lefichierfaces Fi j get chaine cvs writestring
+         lefichierfaces 32 write %% espace
+      } for
+      lefichierfaces 93 write %% ]
+      lefichierfaces 10 write %% CR
+   } for
+   lefichierfaces closefile
+
+   /C solid solidgetfcolors def
+   0 1 C length 1 sub {
+      /i exch def
+      lefichiercouleurs 40 write %% (
+      lefichiercouleurs C i get writestring
+      lefichiercouleurs 41 write %% )
+      lefichiercouleurs 10 write %% CR
+   } for
+   lefichiercouleurs closefile
+
+   /IO solid solidgetinouttable def
+   0 1 3 {
+      /i exch def
+      lefichierio IO i get chaine cvs writestring
+      lefichierio 32 write %% space
+   } for
+   lefichierio closefile
+end
+} def
+
-%%%%% ### writeobjfile ###
-%% syntaxe : solid str writeobjfile -> -
-/writeobjfile {
-10 dict begin
-
+(.obj) append 
-   /solid exch def
-   solid issolid not {
@@ -7593 +7772 @@
-
-%%%%% ### newtube ###
+ /tub@dernierk1 [1 0 0] def
+ /tub@dernierk2 [0 1 0] def
+ /tub@dernierk3 [0 0 1] def
+
+/inittube {
+2 dict begin
+   normalize3d /vect3 defpoint3d
+   normalize3d /vect2 defpoint3d
+   normalize3d /vect1 defpoint3d
+   vect1 norme3d 0 eq {
+      vect2 vect3 vectprod3d /vect1 defpoint3d
+   } if
+   vect2 norme3d 0 eq {
+      vect3 vect1 vectprod3d /vect2 defpoint3d
+   } if
+   vect3 norme3d 0 eq {
+      vect1 vect2 vectprod3d /vect3 defpoint3d
+   } if
+   /tub@dernierk1 [vect1] store
+   /tub@dernierk2 [vect2] store
+   /tub@dernierk3 [vect3] store
+end
+} def
+ 
-%% syntaxe : tmin tmax (f) array r newtube -> solid
-%% array = [K N]
@@ -7615 +7818 @@
-   
-      %% definition du repere de Frenet (k1, k2, k3) au point f(a)
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-      /@n 360 N div def %% le pas angulaire
-      0 @n 360 @n sub {
-
+@
-         M
-
-
+@
+@
-      } for
-   } for
@@ -7736 +7955 @@
-/draw* {drawsolid*} def
-/draw** {drawsolid**} def
+/writeobj {solidfilename writeobjfile} def
-/none {pop} def
-
@@ -8149 +8369 @@
-/pst-courbe {
-   solidlinewidth setlinewidth
-
+
+
+
+
+
+
-} def
-
@@ -8161 +8386 @@
-      } if
-   } ifelse
-
+cvx exec 
-   dup videsolid
-   gere_pstricks_opt
@@ -8233 +8458 @@
-   newpath
-      linecolor
-
+cvx exec 
-      gere_pstricks_proj_opt
-} def
@@ -8241 +8466 @@
-   newpath
-      linecolor
-
+cvx exec 
-      gere_pstricks_proj_opt
-} def
@@ -8382 +8607 @@
-TeXDict begin 39158280 55380996 1000 600 600 (test_04.dvi)
-@start
-1
-1 50
+2
+2 51
-C000001FC000001FC000001FC000001FC000001FC000001FC000001FC000001FC000001F
-C000001FC000001FC000001FC000001FC000001FC000001FC000001FC000001FC000001F
@@ -8389 +8614 @@
-C000001FC000001FC000001FC000001FC000001FC000001FC000001FC000001FC000001F
-C000001FC000001FC000001FC000001FC000001FC000001FC000001FC000003FE0007FFF
-
+
+
+
+
+
+
+
+
+
-%EndDVIPSBitmapFont
-16
-16
+23
+23
-07FFFFFFF8000000003FFFC00FFC00000000FFFC0001FE00000001FFF000007F00000007
-FFC00003FF0000000FFF800007FF8000001FFF00000FFF8000003FFF00000FFF8000003F
@@ -8426 +8659 @@
-FE000000007FFE000000007FFE000000007FFE000000007FFE000000007FFE000000007F
-FE000000007FFE000000007FFE000000007FFE00007FFFFFFFFFFC7FFFFFFFFFFC7FFFFF
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-000000000000007FFF00000000000000007FFF00000000000000007FFF00000000000000
-007FFF00000000000000007FFF00000000000000007FFF00000000000000007FFF000000
@@ -8447 +8736 @@
-0000007FFF00000000000000007FFF00000000000000007FFF00000000000000007FFF00
-000000000000007FFF00000000000000007FFF00000000000000007FFF00000000000000
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-00FFFFFF80000003FFFFFFE000000FFF003FF800003FFC0007FC00007FF8000FFE0000FF
-F0001FFE0001FFE0003FFF0003FFC0003FFF0007FF80003FFF0007FF80003FFF000FFF00
@@ -8559 +8862 @@
-FFF8078000FFF81FE000FFF83FF000FFF87FF800FFF8FFFC00FFF0FFFC01FFF0FFFC01FF
-F0FFFC01FFE0FFFC01FFE0FFFC03FFC07FF803FF807FF807FF003FF00FFE001FF03FFC00
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-0000007FFC000000007FFC000000007FFC000000007FFC000000007FFC000000007FFC00
-0000007FFC000000007FFC000000007FFC000000007FFC000000007FFC000000007FFC00
-0000007FFC000000007FFC000000007FFC000000007FFC000000007FFC000000007FFC00
-
-
+
-0F80007FFC000F80007FFC000F80007FFC000F80007FFC000F80007FFC000F80007FFC00
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-%EndDVIPSBitmapFont
-3
-3 122
+0
+0 115
-E000C000C000C001C0018003800300070006000E001C003800700060000B1D78891B>44
-D<0000FF00000007FFE000001F81F800003E007C0000FC003F0001F8001F8001F0000F80
@@ -8648 +9001 @@
-800001FE3F800001FC3F800001FC3F800001FC1F800001F81F800001F80FC00003F00FC0
-0003F00FC00003F007E00007E003E00007C003F0000FC001F8001F8000FC003F00003E00
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-