From 91e75c2404f1887c985123bd2fc05f6d7fc49fad Mon Sep 17 00:00:00 2001 From: cxl Date: Thu, 12 Feb 2009 16:30:42 +0000 Subject: [PATCH] Painter1.0 to archive git-svn-id: svn://ultimatepp.org/upp/trunk@855 f0d560ea-af0d-0410-9eb7-867de7ffcac7 --- {uppsrc => archive}/Painter/Arc.cpp | 0 {uppsrc => archive}/Painter/BufferPainter.cpp | 0 {uppsrc => archive}/Painter/BufferPainter.h | 0 {uppsrc => archive}/Painter/Clip.cpp | 0 {uppsrc => archive}/Painter/Context.cpp | 0 {uppsrc => archive}/Painter/Fill.cpp | 0 {uppsrc => archive}/Painter/FontWin32.cpp | 0 {uppsrc => archive}/Painter/FontX11.cpp | 0 {uppsrc => archive}/Painter/Gradient.cpp | 0 {uppsrc => archive}/Painter/Mask.cpp | 0 {uppsrc => archive}/Painter/Matrix2D.cpp | 0 {uppsrc => archive}/Painter/PaintPainting.icpp | 0 {uppsrc => archive}/Painter/Painter.cpp | 0 {uppsrc => archive}/Painter/Painter.h | 0 {uppsrc => archive}/Painter/Painter.hpp | 0 {uppsrc => archive}/Painter/Painter.upp | 0 {uppsrc => archive}/Painter/Painting.cpp | 0 {uppsrc => archive}/Painter/Painting.h | 0 {uppsrc => archive}/Painter/Path.cpp | 0 {uppsrc => archive}/Painter/PixFmt.cpp | 0 {uppsrc => archive}/Painter/RadialGradient.cpp | 0 {uppsrc => archive}/Painter/Stroke.cpp | 0 {uppsrc => archive}/Painter/Text.cpp | 0 {uppsrc => archive}/Painter/agg_alpha_mask_u8.h | 0 {uppsrc => archive}/Painter/agg_array.h | 0 {uppsrc => archive}/Painter/agg_basics.h | 0 {uppsrc => archive}/Painter/agg_clip_liang_barsky.h | 0 {uppsrc => archive}/Painter/agg_config.h | 0 {uppsrc => archive}/Painter/agg_conv_adaptor_vcgen.h | 0 {uppsrc => archive}/Painter/agg_conv_curve.h | 0 {uppsrc => archive}/Painter/agg_conv_dash.h | 0 {uppsrc => archive}/Painter/agg_conv_stroke.h | 0 {uppsrc => archive}/Painter/agg_conv_transform.h | 0 {uppsrc => archive}/Painter/agg_curves.cpp | 0 {uppsrc => archive}/Painter/agg_curves.h | 0 {uppsrc => archive}/Painter/agg_dda_line.h | 0 {uppsrc => archive}/Painter/agg_gamma_functions.h | 0 {uppsrc => archive}/Painter/agg_math.h | 0 {uppsrc => archive}/Painter/agg_math_stroke.h | 0 {uppsrc => archive}/Painter/agg_path_storage.h | 0 {uppsrc => archive}/Painter/agg_rasterizer_cells_aa.h | 0 .../Painter/agg_rasterizer_scanline_aa.h | 0 {uppsrc => archive}/Painter/agg_rasterizer_sl_clip.h | 0 {uppsrc => archive}/Painter/agg_renderer_base.h | 0 {uppsrc => archive}/Painter/agg_renderer_scanline.h | 0 {uppsrc => archive}/Painter/agg_rendering_buffer.h | 0 {uppsrc => archive}/Painter/agg_scanline_p.h | 0 {uppsrc => archive}/Painter/agg_scanline_u.h | 0 {uppsrc => archive}/Painter/agg_shorten_path.h | 0 {uppsrc => archive}/Painter/agg_span_allocator.h | 0 .../Painter/agg_span_interpolator_linear.h | 0 {uppsrc => archive}/Painter/agg_trans_affine.cpp | 0 {uppsrc => archive}/Painter/agg_trans_affine.h | 0 {uppsrc => archive}/Painter/agg_vcgen_dash.cpp | 0 {uppsrc => archive}/Painter/agg_vcgen_dash.h | 0 {uppsrc => archive}/Painter/agg_vcgen_stroke.cpp | 0 {uppsrc => archive}/Painter/agg_vcgen_stroke.h | 0 {uppsrc => archive}/Painter/agg_vertex_sequence.h | 0 {uppsrc => archive}/Painter/init | 0 examples/PainterExamples/Curves.cpp | 2 +- examples/PainterExamples/ThinLine.cpp | 11 ----------- examples/PainterExamples/main.cpp | 2 +- 62 files changed, 2 insertions(+), 13 deletions(-) rename {uppsrc => archive}/Painter/Arc.cpp (100%) rename {uppsrc => archive}/Painter/BufferPainter.cpp (100%) rename {uppsrc => archive}/Painter/BufferPainter.h (100%) rename {uppsrc => archive}/Painter/Clip.cpp (100%) rename {uppsrc => archive}/Painter/Context.cpp (100%) rename {uppsrc => archive}/Painter/Fill.cpp (100%) rename {uppsrc => archive}/Painter/FontWin32.cpp (100%) rename {uppsrc => archive}/Painter/FontX11.cpp (100%) rename {uppsrc => archive}/Painter/Gradient.cpp (100%) rename {uppsrc => archive}/Painter/Mask.cpp (100%) rename {uppsrc => archive}/Painter/Matrix2D.cpp (100%) rename {uppsrc => archive}/Painter/PaintPainting.icpp (100%) rename {uppsrc => archive}/Painter/Painter.cpp (100%) rename {uppsrc => archive}/Painter/Painter.h (100%) rename {uppsrc => archive}/Painter/Painter.hpp (100%) rename {uppsrc => archive}/Painter/Painter.upp (100%) rename {uppsrc => archive}/Painter/Painting.cpp (100%) rename {uppsrc => archive}/Painter/Painting.h (100%) rename {uppsrc => archive}/Painter/Path.cpp (100%) rename {uppsrc => archive}/Painter/PixFmt.cpp (100%) rename {uppsrc => archive}/Painter/RadialGradient.cpp (100%) rename {uppsrc => archive}/Painter/Stroke.cpp (100%) rename {uppsrc => archive}/Painter/Text.cpp (100%) rename {uppsrc => archive}/Painter/agg_alpha_mask_u8.h (100%) rename {uppsrc => archive}/Painter/agg_array.h (100%) rename {uppsrc => archive}/Painter/agg_basics.h (100%) rename {uppsrc => archive}/Painter/agg_clip_liang_barsky.h (100%) rename {uppsrc => archive}/Painter/agg_config.h (100%) rename {uppsrc => archive}/Painter/agg_conv_adaptor_vcgen.h (100%) rename {uppsrc => archive}/Painter/agg_conv_curve.h (100%) rename {uppsrc => archive}/Painter/agg_conv_dash.h (100%) rename {uppsrc => archive}/Painter/agg_conv_stroke.h (100%) rename {uppsrc => archive}/Painter/agg_conv_transform.h (100%) rename {uppsrc => archive}/Painter/agg_curves.cpp (100%) rename {uppsrc => archive}/Painter/agg_curves.h (100%) rename {uppsrc => archive}/Painter/agg_dda_line.h (100%) rename {uppsrc => archive}/Painter/agg_gamma_functions.h (100%) rename {uppsrc => archive}/Painter/agg_math.h (100%) rename {uppsrc => archive}/Painter/agg_math_stroke.h (100%) rename {uppsrc => archive}/Painter/agg_path_storage.h (100%) rename {uppsrc => archive}/Painter/agg_rasterizer_cells_aa.h (100%) rename {uppsrc => archive}/Painter/agg_rasterizer_scanline_aa.h (100%) rename {uppsrc => archive}/Painter/agg_rasterizer_sl_clip.h (100%) rename {uppsrc => archive}/Painter/agg_renderer_base.h (100%) rename {uppsrc => archive}/Painter/agg_renderer_scanline.h (100%) rename {uppsrc => archive}/Painter/agg_rendering_buffer.h (100%) rename {uppsrc => archive}/Painter/agg_scanline_p.h (100%) rename {uppsrc => archive}/Painter/agg_scanline_u.h (100%) rename {uppsrc => archive}/Painter/agg_shorten_path.h (100%) rename {uppsrc => archive}/Painter/agg_span_allocator.h (100%) rename {uppsrc => archive}/Painter/agg_span_interpolator_linear.h (100%) rename {uppsrc => archive}/Painter/agg_trans_affine.cpp (100%) rename {uppsrc => archive}/Painter/agg_trans_affine.h (100%) rename {uppsrc => archive}/Painter/agg_vcgen_dash.cpp (100%) rename {uppsrc => archive}/Painter/agg_vcgen_dash.h (100%) rename {uppsrc => archive}/Painter/agg_vcgen_stroke.cpp (100%) rename {uppsrc => archive}/Painter/agg_vcgen_stroke.h (100%) rename {uppsrc => archive}/Painter/agg_vertex_sequence.h (100%) rename {uppsrc => archive}/Painter/init (100%) diff --git a/uppsrc/Painter/Arc.cpp b/archive/Painter/Arc.cpp similarity index 100% rename from uppsrc/Painter/Arc.cpp rename to archive/Painter/Arc.cpp diff --git a/uppsrc/Painter/BufferPainter.cpp b/archive/Painter/BufferPainter.cpp similarity index 100% rename from uppsrc/Painter/BufferPainter.cpp rename to archive/Painter/BufferPainter.cpp diff --git a/uppsrc/Painter/BufferPainter.h b/archive/Painter/BufferPainter.h similarity index 100% rename from uppsrc/Painter/BufferPainter.h rename to archive/Painter/BufferPainter.h diff --git a/uppsrc/Painter/Clip.cpp b/archive/Painter/Clip.cpp similarity index 100% rename from uppsrc/Painter/Clip.cpp rename to archive/Painter/Clip.cpp diff --git a/uppsrc/Painter/Context.cpp b/archive/Painter/Context.cpp similarity index 100% rename from uppsrc/Painter/Context.cpp rename to archive/Painter/Context.cpp diff --git a/uppsrc/Painter/Fill.cpp b/archive/Painter/Fill.cpp similarity index 100% rename from uppsrc/Painter/Fill.cpp rename to archive/Painter/Fill.cpp diff --git a/uppsrc/Painter/FontWin32.cpp b/archive/Painter/FontWin32.cpp similarity index 100% rename from uppsrc/Painter/FontWin32.cpp rename to archive/Painter/FontWin32.cpp diff --git a/uppsrc/Painter/FontX11.cpp b/archive/Painter/FontX11.cpp similarity index 100% rename from uppsrc/Painter/FontX11.cpp rename to archive/Painter/FontX11.cpp diff --git a/uppsrc/Painter/Gradient.cpp b/archive/Painter/Gradient.cpp similarity index 100% rename from uppsrc/Painter/Gradient.cpp rename to archive/Painter/Gradient.cpp diff --git a/uppsrc/Painter/Mask.cpp b/archive/Painter/Mask.cpp similarity index 100% rename from uppsrc/Painter/Mask.cpp rename to archive/Painter/Mask.cpp diff --git a/uppsrc/Painter/Matrix2D.cpp b/archive/Painter/Matrix2D.cpp similarity index 100% rename from uppsrc/Painter/Matrix2D.cpp rename to archive/Painter/Matrix2D.cpp diff --git a/uppsrc/Painter/PaintPainting.icpp b/archive/Painter/PaintPainting.icpp similarity index 100% rename from uppsrc/Painter/PaintPainting.icpp rename to archive/Painter/PaintPainting.icpp diff --git a/uppsrc/Painter/Painter.cpp b/archive/Painter/Painter.cpp similarity index 100% rename from uppsrc/Painter/Painter.cpp rename to archive/Painter/Painter.cpp diff --git a/uppsrc/Painter/Painter.h b/archive/Painter/Painter.h similarity index 100% rename from uppsrc/Painter/Painter.h rename to archive/Painter/Painter.h diff --git a/uppsrc/Painter/Painter.hpp b/archive/Painter/Painter.hpp similarity index 100% rename from uppsrc/Painter/Painter.hpp rename to archive/Painter/Painter.hpp diff --git a/uppsrc/Painter/Painter.upp b/archive/Painter/Painter.upp similarity index 100% rename from uppsrc/Painter/Painter.upp rename to archive/Painter/Painter.upp diff --git a/uppsrc/Painter/Painting.cpp b/archive/Painter/Painting.cpp similarity index 100% rename from uppsrc/Painter/Painting.cpp rename to archive/Painter/Painting.cpp diff --git a/uppsrc/Painter/Painting.h b/archive/Painter/Painting.h similarity index 100% rename from uppsrc/Painter/Painting.h rename to archive/Painter/Painting.h diff --git a/uppsrc/Painter/Path.cpp b/archive/Painter/Path.cpp similarity index 100% rename from uppsrc/Painter/Path.cpp rename to archive/Painter/Path.cpp diff --git a/uppsrc/Painter/PixFmt.cpp b/archive/Painter/PixFmt.cpp similarity index 100% rename from uppsrc/Painter/PixFmt.cpp rename to archive/Painter/PixFmt.cpp diff --git a/uppsrc/Painter/RadialGradient.cpp b/archive/Painter/RadialGradient.cpp similarity index 100% rename from uppsrc/Painter/RadialGradient.cpp rename to archive/Painter/RadialGradient.cpp diff --git a/uppsrc/Painter/Stroke.cpp b/archive/Painter/Stroke.cpp similarity index 100% rename from uppsrc/Painter/Stroke.cpp rename to archive/Painter/Stroke.cpp diff --git a/uppsrc/Painter/Text.cpp b/archive/Painter/Text.cpp similarity index 100% rename from uppsrc/Painter/Text.cpp rename to archive/Painter/Text.cpp diff --git a/uppsrc/Painter/agg_alpha_mask_u8.h b/archive/Painter/agg_alpha_mask_u8.h similarity index 100% rename from uppsrc/Painter/agg_alpha_mask_u8.h rename to archive/Painter/agg_alpha_mask_u8.h diff --git a/uppsrc/Painter/agg_array.h b/archive/Painter/agg_array.h similarity index 100% rename from uppsrc/Painter/agg_array.h rename to archive/Painter/agg_array.h diff --git a/uppsrc/Painter/agg_basics.h b/archive/Painter/agg_basics.h similarity index 100% rename from uppsrc/Painter/agg_basics.h rename to archive/Painter/agg_basics.h diff --git a/uppsrc/Painter/agg_clip_liang_barsky.h b/archive/Painter/agg_clip_liang_barsky.h similarity index 100% rename from uppsrc/Painter/agg_clip_liang_barsky.h rename to archive/Painter/agg_clip_liang_barsky.h diff --git a/uppsrc/Painter/agg_config.h b/archive/Painter/agg_config.h similarity index 100% rename from uppsrc/Painter/agg_config.h rename to archive/Painter/agg_config.h diff --git a/uppsrc/Painter/agg_conv_adaptor_vcgen.h b/archive/Painter/agg_conv_adaptor_vcgen.h similarity index 100% rename from uppsrc/Painter/agg_conv_adaptor_vcgen.h rename to archive/Painter/agg_conv_adaptor_vcgen.h diff --git a/uppsrc/Painter/agg_conv_curve.h b/archive/Painter/agg_conv_curve.h similarity index 100% rename from uppsrc/Painter/agg_conv_curve.h rename to archive/Painter/agg_conv_curve.h diff --git a/uppsrc/Painter/agg_conv_dash.h b/archive/Painter/agg_conv_dash.h similarity index 100% rename from uppsrc/Painter/agg_conv_dash.h rename to archive/Painter/agg_conv_dash.h diff --git a/uppsrc/Painter/agg_conv_stroke.h b/archive/Painter/agg_conv_stroke.h similarity index 100% rename from uppsrc/Painter/agg_conv_stroke.h rename to archive/Painter/agg_conv_stroke.h diff --git a/uppsrc/Painter/agg_conv_transform.h b/archive/Painter/agg_conv_transform.h similarity index 100% rename from uppsrc/Painter/agg_conv_transform.h rename to archive/Painter/agg_conv_transform.h diff --git a/uppsrc/Painter/agg_curves.cpp b/archive/Painter/agg_curves.cpp similarity index 100% rename from uppsrc/Painter/agg_curves.cpp rename to archive/Painter/agg_curves.cpp diff --git a/uppsrc/Painter/agg_curves.h b/archive/Painter/agg_curves.h similarity index 100% rename from uppsrc/Painter/agg_curves.h rename to archive/Painter/agg_curves.h diff --git a/uppsrc/Painter/agg_dda_line.h b/archive/Painter/agg_dda_line.h similarity index 100% rename from uppsrc/Painter/agg_dda_line.h rename to archive/Painter/agg_dda_line.h diff --git a/uppsrc/Painter/agg_gamma_functions.h b/archive/Painter/agg_gamma_functions.h similarity index 100% rename from uppsrc/Painter/agg_gamma_functions.h rename to archive/Painter/agg_gamma_functions.h diff --git a/uppsrc/Painter/agg_math.h b/archive/Painter/agg_math.h similarity index 100% rename from uppsrc/Painter/agg_math.h rename to archive/Painter/agg_math.h diff --git a/uppsrc/Painter/agg_math_stroke.h b/archive/Painter/agg_math_stroke.h similarity index 100% rename from uppsrc/Painter/agg_math_stroke.h rename to archive/Painter/agg_math_stroke.h diff --git a/uppsrc/Painter/agg_path_storage.h b/archive/Painter/agg_path_storage.h similarity index 100% rename from uppsrc/Painter/agg_path_storage.h rename to archive/Painter/agg_path_storage.h diff --git a/uppsrc/Painter/agg_rasterizer_cells_aa.h b/archive/Painter/agg_rasterizer_cells_aa.h similarity index 100% rename from uppsrc/Painter/agg_rasterizer_cells_aa.h rename to archive/Painter/agg_rasterizer_cells_aa.h diff --git a/uppsrc/Painter/agg_rasterizer_scanline_aa.h b/archive/Painter/agg_rasterizer_scanline_aa.h similarity index 100% rename from uppsrc/Painter/agg_rasterizer_scanline_aa.h rename to archive/Painter/agg_rasterizer_scanline_aa.h diff --git a/uppsrc/Painter/agg_rasterizer_sl_clip.h b/archive/Painter/agg_rasterizer_sl_clip.h similarity index 100% rename from uppsrc/Painter/agg_rasterizer_sl_clip.h rename to archive/Painter/agg_rasterizer_sl_clip.h diff --git a/uppsrc/Painter/agg_renderer_base.h b/archive/Painter/agg_renderer_base.h similarity index 100% rename from uppsrc/Painter/agg_renderer_base.h rename to archive/Painter/agg_renderer_base.h diff --git a/uppsrc/Painter/agg_renderer_scanline.h b/archive/Painter/agg_renderer_scanline.h similarity index 100% rename from uppsrc/Painter/agg_renderer_scanline.h rename to archive/Painter/agg_renderer_scanline.h diff --git a/uppsrc/Painter/agg_rendering_buffer.h b/archive/Painter/agg_rendering_buffer.h similarity index 100% rename from uppsrc/Painter/agg_rendering_buffer.h rename to archive/Painter/agg_rendering_buffer.h diff --git a/uppsrc/Painter/agg_scanline_p.h b/archive/Painter/agg_scanline_p.h similarity index 100% rename from uppsrc/Painter/agg_scanline_p.h rename to archive/Painter/agg_scanline_p.h diff --git a/uppsrc/Painter/agg_scanline_u.h b/archive/Painter/agg_scanline_u.h similarity index 100% rename from uppsrc/Painter/agg_scanline_u.h rename to archive/Painter/agg_scanline_u.h diff --git a/uppsrc/Painter/agg_shorten_path.h b/archive/Painter/agg_shorten_path.h similarity index 100% rename from uppsrc/Painter/agg_shorten_path.h rename to archive/Painter/agg_shorten_path.h diff --git a/uppsrc/Painter/agg_span_allocator.h b/archive/Painter/agg_span_allocator.h similarity index 100% rename from uppsrc/Painter/agg_span_allocator.h rename to archive/Painter/agg_span_allocator.h diff --git a/uppsrc/Painter/agg_span_interpolator_linear.h b/archive/Painter/agg_span_interpolator_linear.h similarity index 100% rename from uppsrc/Painter/agg_span_interpolator_linear.h rename to archive/Painter/agg_span_interpolator_linear.h diff --git a/uppsrc/Painter/agg_trans_affine.cpp b/archive/Painter/agg_trans_affine.cpp similarity index 100% rename from uppsrc/Painter/agg_trans_affine.cpp rename to archive/Painter/agg_trans_affine.cpp diff --git a/uppsrc/Painter/agg_trans_affine.h b/archive/Painter/agg_trans_affine.h similarity index 100% rename from uppsrc/Painter/agg_trans_affine.h rename to archive/Painter/agg_trans_affine.h diff --git a/uppsrc/Painter/agg_vcgen_dash.cpp b/archive/Painter/agg_vcgen_dash.cpp similarity index 100% rename from uppsrc/Painter/agg_vcgen_dash.cpp rename to archive/Painter/agg_vcgen_dash.cpp diff --git a/uppsrc/Painter/agg_vcgen_dash.h b/archive/Painter/agg_vcgen_dash.h similarity index 100% rename from uppsrc/Painter/agg_vcgen_dash.h rename to archive/Painter/agg_vcgen_dash.h diff --git a/uppsrc/Painter/agg_vcgen_stroke.cpp b/archive/Painter/agg_vcgen_stroke.cpp similarity index 100% rename from uppsrc/Painter/agg_vcgen_stroke.cpp rename to archive/Painter/agg_vcgen_stroke.cpp diff --git a/uppsrc/Painter/agg_vcgen_stroke.h b/archive/Painter/agg_vcgen_stroke.h similarity index 100% rename from uppsrc/Painter/agg_vcgen_stroke.h rename to archive/Painter/agg_vcgen_stroke.h diff --git a/uppsrc/Painter/agg_vertex_sequence.h b/archive/Painter/agg_vertex_sequence.h similarity index 100% rename from uppsrc/Painter/agg_vertex_sequence.h rename to archive/Painter/agg_vertex_sequence.h diff --git a/uppsrc/Painter/init b/archive/Painter/init similarity index 100% rename from uppsrc/Painter/init rename to archive/Painter/init diff --git a/examples/PainterExamples/Curves.cpp b/examples/PainterExamples/Curves.cpp index ee452bf78..d220a6d1e 100644 --- a/examples/PainterExamples/Curves.cpp +++ b/examples/PainterExamples/Curves.cpp @@ -35,7 +35,7 @@ void Cubics(Painter& sw) void Quadratic(Painter& sw) { - sw.Move(200, 300).Quadratic(400, 50, 600, 300).Quadratic(1000, 300).Stroke(1, Blue()); + sw.Move(200, 300).Quadratic(400, 50, 600, 300).Quadratic(1000, 300).Stroke(10, Blue()); } INITBLOCK { diff --git a/examples/PainterExamples/ThinLine.cpp b/examples/PainterExamples/ThinLine.cpp index 2fc3a2d14..f7795344d 100644 --- a/examples/PainterExamples/ThinLine.cpp +++ b/examples/PainterExamples/ThinLine.cpp @@ -10,17 +10,6 @@ void ThinPolygon(Painter& sw) sw.Line(429.000000, 148.000000); sw.Line(36.000000, 142.000000); sw.Fill(Black()); -/* - sw.Rectangle(20, 20, 60, 60); - - - sw.Move(0, 0); - sw.Cubic(99, 0, 50, 50, 99, 99); - sw.Cubic(0, 99, 50, 50, 0, 0); - sw.EvenOdd(i).Fill(Green()); - sw.Stroke(1, Black()); - sw.Translate(120, 0); -*/ } } diff --git a/examples/PainterExamples/main.cpp b/examples/PainterExamples/main.cpp index 821ceb525..58e5a9eb8 100644 --- a/examples/PainterExamples/main.cpp +++ b/examples/PainterExamples/main.cpp @@ -31,7 +31,7 @@ void App::DoPaint0(Painter& sw) sw.LineCap(~ctrl.linecap); sw.LineJoin(~ctrl.linejoin); { PAINTER_TIMING("FILL"); - sw.Clear(White()); + sw.Clear(White()); } PAINTER_TIMING("Paint"); if(list.IsCursor())