From 0c26dc6459295bf98eb999a42e3b1d4ee3c5dd46 Mon Sep 17 00:00:00 2001
From: Yves Rizoud <yrizoud@gmail.com>
Date: Tue, 3 Feb 2009 21:58:25 +0000
Subject: [PATCH] Contourfill now uses a kind of 'additive XOR' lines : Pixels
 stay marked even if you pass over them several times.

git-svn-id: svn://pulkomandy.tk/GrafX2/trunk@588 416bcca6-2ee7-4201-b75f-2eb2f807beb1
---
 graph.c    | 22 ++++++++++++++++++++++
 graph.h    |  2 ++
 operatio.c | 12 ++++++++++--
 3 files changed, 34 insertions(+), 2 deletions(-)

diff --git a/graph.c b/graph.c
index 00496cb7..e08ffc6a 100644
--- a/graph.c
+++ b/graph.c
@@ -855,6 +855,18 @@ void Remplir(byte Couleur_de_remplissage)
       Pixel_Preview(Pos_X,Pos_Y,~Lit_pixel(Pos_X-Principal_Decalage_X,
                                            Pos_Y-Principal_Decalage_Y));
   }
+  
+  // Affichage d'un point pour une preview en xor additif
+  // (Il lit la couleur depuis la page backup)
+  void Pixel_figure_Preview_xorback(word Pos_X,word Pos_Y,__attribute__((unused)) byte Couleur)
+  {
+    if ( (Pos_X>=Limite_Gauche) &&
+         (Pos_X<=Limite_Droite) &&
+         (Pos_Y>=Limite_Haut)   &&
+         (Pos_Y<=Limite_Bas) )
+      Pixel_Preview(Pos_X,Pos_Y,~Ecran_backup[Pos_X+Pos_Y*Principal_Largeur_image]);
+  }
+  
 
   // Effacement d'un point de preview
   void Pixel_figure_Effacer_preview(word Pos_X,word Pos_Y,__attribute__((unused)) byte Couleur)
@@ -1294,6 +1306,16 @@ void Tracer_ligne_Preview_xor(short Debut_X,short Debut_Y,short Fin_X,short Fin_
   Mettre_Ecran_A_Jour((Debut_X<Fin_X)?Debut_X:Fin_X,(Debut_Y<Fin_Y)?Debut_Y:Fin_Y,abs(L)+1,abs(H)+1);
 }
 
+  // -- Tracer la preview d'une ligne en xor additif --
+
+void Tracer_ligne_Preview_xorback(short Debut_X,short Debut_Y,short Fin_X,short Fin_Y,byte Couleur)
+{
+  int L = Fin_X-Debut_X, H = Fin_Y - Debut_Y;
+  Pixel_figure=Pixel_figure_Preview_xorback;
+  Tracer_ligne_General(Debut_X,Debut_Y,Fin_X,Fin_Y,Couleur);
+  Mettre_Ecran_A_Jour((Debut_X<Fin_X)?Debut_X:Fin_X,(Debut_Y<Fin_Y)?Debut_Y:Fin_Y,abs(L)+1,abs(H)+1);
+}
+
   // -- Effacer la preview d'une ligne --
 
 void Effacer_ligne_Preview(short Debut_X,short Debut_Y,short Fin_X,short Fin_Y)
diff --git a/graph.h b/graph.h
index cf3aa98d..7e0029e2 100644
--- a/graph.h
+++ b/graph.h
@@ -52,6 +52,7 @@ void Remplacer(byte Nouvelle_couleur);
 void Pixel_figure_Preview    (word Pos_X,word Pos_Y,byte Couleur);
 void Pixel_figure_Preview_auto(word Pos_X,word Pos_Y);
 void Pixel_figure_Preview_xor(word Pos_X,word Pos_Y,byte Couleur);
+void Pixel_figure_Preview_xorback(word Pos_X,word Pos_Y,byte Couleur);
 void Pixel_figure_Dans_brosse(word Pos_X,word Pos_Y,byte Couleur);
 
 void Tracer_cercle_vide_Definitif(short Centre_X,short Centre_Y,short Rayon,byte Couleur);
@@ -69,6 +70,7 @@ void Tracer_ligne_General(short Debut_X,short Debut_Y,short Fin_X,short Fin_Y, b
 void Tracer_ligne_Definitif  (short Debut_X,short Debut_Y,short Fin_X,short Fin_Y,byte Couleur);
 void Tracer_ligne_Preview    (short Debut_X,short Debut_Y,short Fin_X,short Fin_Y,byte Couleur);
 void Tracer_ligne_Preview_xor(short Debut_X,short Debut_Y,short Fin_X,short Fin_Y,byte Couleur);
+void Tracer_ligne_Preview_xorback(short Debut_X,short Debut_Y,short Fin_X,short Fin_Y,byte Couleur);
 void Effacer_ligne_Preview   (short Debut_X,short Debut_Y,short Fin_X,short Fin_Y);
 
 void Tracer_rectangle_vide(short Debut_X,short Debut_Y,short Fin_X,short Fin_Y,byte Couleur);
diff --git a/operatio.c b/operatio.c
index a49b9f40..0b2fcf2b 100644
--- a/operatio.c
+++ b/operatio.c
@@ -2623,8 +2623,16 @@ void Filled_polyform_12_8(void)
       Print_coordonnees();
 
       // On le place à l'écran
-      Tracer_ligne_Preview_xor(Debut_X,Debut_Y,Fin_X,Fin_Y,0);
-      Tracer_ligne_Preview_xor(Debut_X,Debut_Y,Pinceau_X,Pinceau_Y,0);
+      if (Operation_en_cours==OPERATION_FILLED_CONTOUR)
+      {
+        Tracer_ligne_Preview_xorback(Debut_X,Debut_Y,Fin_X,Fin_Y,0);
+        Tracer_ligne_Preview_xorback(Debut_X,Debut_Y,Pinceau_X,Pinceau_Y,0);
+      }
+      else
+      {
+        Tracer_ligne_Preview_xor(Debut_X,Debut_Y,Fin_X,Fin_Y,0);
+        Tracer_ligne_Preview_xor(Debut_X,Debut_Y,Pinceau_X,Pinceau_Y,0);
+      }
 
       // On peut le rajouter au polygone