igarden-commit Mailing List for GardenSketch (Page 81)
Status: Beta
Brought to you by:
jlbedell
Menu
▾
▴
igarden-commit — CVS Commits for GardenSketch
You can subscribe to this list here.
| 2006 |
Jan
|
Feb
|
Mar
|
Apr
|
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
(24) |
Nov
(77) |
Dec
(122) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2007 |
Jan
(103) |
Feb
(278) |
Mar
(130) |
Apr
(66) |
May
(56) |
Jun
(31) |
Jul
(94) |
Aug
(73) |
Sep
(22) |
Oct
(306) |
Nov
(52) |
Dec
|
| 2008 |
Jan
(27) |
Feb
(90) |
Mar
(218) |
Apr
(145) |
May
(114) |
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: Jeffrey B. <jlb...@us...> - 2006-11-01 03:03:01
|
Update of /cvsroot/igarden/Garden/source/resources/2DSymbols In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27966 Modified Files: Tag: Release_branch_v1 Bluestone.svg Log Message: Add coloring to images Index: Bluestone.svg =================================================================== RCS file: /cvsroot/igarden/Garden/source/resources/2DSymbols/Attic/Bluestone.svg,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Bluestone.svg 29 Oct 2006 03:15:57 -0000 1.1.2.1 --- Bluestone.svg 1 Nov 2006 03:03:00 -0000 1.1.2.2 *************** *** 12,15 **** --- 12,21 ---- height="1052.3622047" id="svg2" + rgminx="5ft" + rgminy="80in" + rgmaxx="0" + rgmaxy="0" + startxsize="5ft" + startysize="80in `" sodipodi:version="0.32" inkscape:version="0.44" *************** *** 54,58 **** </metadata> <g ! inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1"> --- 60,64 ---- </metadata> <g ! inkscape:label="REPXY" inkscape:groupmode="layer" id="layer1"> |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-01 03:02:50
|
Update of /cvsroot/igarden/Garden/source/resources/2DSymbols In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27945 Modified Files: Tag: Release_branch_v1 Walk.svg Walk3.svg Log Message: Add coloring to images Index: Walk3.svg =================================================================== RCS file: /cvsroot/igarden/Garden/source/resources/2DSymbols/Walk3.svg,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Walk3.svg 29 Oct 2006 03:31:41 -0000 1.1.2.1 --- Walk3.svg 1 Nov 2006 03:02:47 -0000 1.1.2.2 *************** *** 28,32 **** xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" ! xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="744.09448819" --- 28,32 ---- xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" ! xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="744.09448819" *************** *** 40,46 **** startysize="22in" sodipodi:version="0.32" ! inkscape:version="0.42" ! sodipodi:docbase="/Volumes/KEYCHAIN" ! sodipodi:docname="Picket.svg"> <defs id="defs4" /> --- 40,46 ---- startysize="22in" sodipodi:version="0.32" ! inkscape:version="0.44.1" ! sodipodi:docbase="/Volumes/Bedell/GardenSketch.app/Contents/Resources" ! sodipodi:docname="Walk3.svg"> <defs id="defs4" /> *************** *** 52,62 **** inkscape:pageopacity="0.0" inkscape:pageshadow="2" ! inkscape:zoom="0.35000000" ! inkscape:cx="375.00000" ! inkscape:cy="520.00000" inkscape:document-units="px" ! inkscape:current-layer="layer1" ! inkscape:window-width="701" ! inkscape:window-height="507" inkscape:window-x="0" inkscape:window-y="22" /> --- 52,62 ---- inkscape:pageopacity="0.0" inkscape:pageshadow="2" ! inkscape:zoom="0.35" ! inkscape:cx="375" ! inkscape:cy="520" inkscape:document-units="px" ! inkscape:current-layer="g1992" ! inkscape:window-width="823" ! inkscape:window-height="577" inkscape:window-x="0" inkscape:window-y="22" /> *************** *** 77,119 **** id="layer1"> <path ! style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 20,0 L 120,0 L 120,60 L 20,60 L 20,0" id="path1306" /> ! </g> <g inkscape:label="Top" inkscape:groupmode="layer" ! id="layer1"> <path ! style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 140,0 L 270,0 L 270,60 L 140,60 L 140,0" ! id="path1306" /> <path ! style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 290,0 L 420,0 L 420,60 L 290,60 L 290,0" id="path1310" /> ! </g> <g inkscape:label="TopRight" inkscape:groupmode="layer" ! id="layer1"> <path ! style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 440,0 L 540,0 L 540,60 L 440,60 L 440,0" ! id="path1306" /> ! </g> <g inkscape:label="LEFT" inkscape:groupmode="layer" ! id="layer1"> <path ! style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 20,80 L 120,80 L 120,200 L 20,200 L 20,80" id="path1313" /> <path ! style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 130,220 L 20,220 L 20,340 L 130,340 " ! id="path1313" /> ! </g> <g inkscape:label="REPXY" --- 77,119 ---- id="layer1"> <path ! style="fill:#a45555;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 20,0 L 120,0 L 120,60 L 20,60 L 20,0" id="path1306" /> ! </g> <g inkscape:label="Top" inkscape:groupmode="layer" ! id="g1958"> <path ! style="fill:#a45555;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 140,0 L 270,0 L 270,60 L 140,60 L 140,0" ! id="path1960" /> <path ! style="fill:#a45555;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 290,0 L 420,0 L 420,60 L 290,60 L 290,0" id="path1310" /> ! </g> <g inkscape:label="TopRight" inkscape:groupmode="layer" ! id="g1963"> <path ! style="fill:#a45555;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 440,0 L 540,0 L 540,60 L 440,60 L 440,0" ! id="path1965" /> ! </g> <g inkscape:label="LEFT" inkscape:groupmode="layer" ! id="g1967"> <path ! style="fill:#a45555;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 20,80 L 120,80 L 120,200 L 20,200 L 20,80" id="path1313" /> <path ! style="fill:#a45555;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 130,220 L 20,220 L 20,340 L 130,340 " ! id="path1970" /> ! </g> <g inkscape:label="REPXY" *************** *** 122,134 **** style="display:inline"> <path ! style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 140,80 L 420,80 L 420,200 L 140,200 L 140,80" id="path1307" /> <path ! style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 130,220 L 270,220 L 270,340 L 130,340" ! id="path1313" /> <path ! style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 430,220 L 290,220 L 290,340 L 430,340 " id="path1314" /> --- 122,134 ---- style="display:inline"> <path ! style="fill:#a45555;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 140,80 L 420,80 L 420,200 L 140,200 L 140,80" id="path1307" /> <path ! style="fill:#a45555;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 130,220 L 270,220 L 270,340 L 130,340" ! id="path1974" /> <path ! style="fill:#a45555;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 430,220 L 290,220 L 290,340 L 430,340 " id="path1314" /> *************** *** 136,163 **** style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#FFFFFF;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 130,340 L 430,340 L 430,360 L 130,360 L 130,340" ! id="path1314" /> </g> <g inkscape:label="RIGHT" inkscape:groupmode="layer" ! id="layer1"> <path ! style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 440,80 L 540,80 L 540,200 L 440,200 L 440,80" ! id="path1313" /> <path ! style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 430,220 L 540,220 L 540,340 L 430,340 " ! id="path1313" /> ! </g> <g inkscape:label="BottomLEFT" inkscape:groupmode="layer" ! id="layer1"> <path ! style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 20,360 L 120,360 L 120,420 L 20,420 L 20,360" ! id="path1306" /> ! </g> <g inkscape:label="BOTTOM" --- 136,163 ---- style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#FFFFFF;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 130,340 L 430,340 L 430,360 L 130,360 L 130,340" ! id="path1977" /> </g> <g inkscape:label="RIGHT" inkscape:groupmode="layer" ! id="g1979"> <path ! style="fill:#a45555;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 440,80 L 540,80 L 540,200 L 440,200 L 440,80" ! id="path1981" /> <path ! style="fill:#a45555;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 430,220 L 540,220 L 540,340 L 430,340 " ! id="path1983" /> ! </g> <g inkscape:label="BottomLEFT" inkscape:groupmode="layer" ! id="g1985"> <path ! style="fill:#a45555;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 20,360 L 120,360 L 120,420 L 20,420 L 20,360" ! id="path1987" /> ! </g> <g inkscape:label="BOTTOM" *************** *** 165,173 **** id="g12"> <path ! style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 140,360 L 270,360 L 270,420 L 140,420 L 140,360" id="path1308" /> <path ! style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 290,360 L 420,360 L 420,420 L 290,420 L 290,360" id="path1309" /> --- 165,173 ---- id="g12"> <path ! style="fill:#a45555;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 140,360 L 270,360 L 270,420 L 140,420 L 140,360" id="path1308" /> <path ! style="fill:#a45555;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 290,360 L 420,360 L 420,420 L 290,420 L 290,360" id="path1309" /> *************** *** 176,184 **** inkscape:label="BottomRight" inkscape:groupmode="layer" ! id="layer1"> <path ! style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 440,360 L 540,360 L 540,420 L 440,420 L 440,360" ! id="path1306" /> ! </g> </svg> --- 176,184 ---- inkscape:label="BottomRight" inkscape:groupmode="layer" ! id="g1992"> <path ! style="fill:#a45555;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 440,360 L 540,360 L 540,420 L 440,420 L 440,360" ! id="path1994" /> ! </g> </svg> Index: Walk.svg =================================================================== RCS file: /cvsroot/igarden/Garden/source/resources/2DSymbols/Walk.svg,v retrieving revision 1.4 retrieving revision 1.4.2.1 diff -C2 -d -r1.4 -r1.4.2.1 *** Walk.svg 8 Sep 2005 00:28:32 -0000 1.4 --- Walk.svg 1 Nov 2006 03:02:47 -0000 1.4.2.1 *************** *** 28,32 **** xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" ! xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="744.09448819" --- 28,32 ---- xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" ! xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="744.09448819" *************** *** 40,46 **** startysize="22in" sodipodi:version="0.32" ! inkscape:version="0.42" ! sodipodi:docbase="/Volumes/KEYCHAIN" ! sodipodi:docname="Picket.svg"> <defs id="defs4" /> --- 40,46 ---- startysize="22in" sodipodi:version="0.32" ! inkscape:version="0.44.1" ! sodipodi:docbase="/Volumes/Bedell/GardenSketch.app/Contents/Resources" ! sodipodi:docname="Walk.svg"> <defs id="defs4" /> *************** *** 52,62 **** inkscape:pageopacity="0.0" inkscape:pageshadow="2" ! inkscape:zoom="0.35000000" ! inkscape:cx="375.00000" ! inkscape:cy="520.00000" inkscape:document-units="px" inkscape:current-layer="layer1" ! inkscape:window-width="701" ! inkscape:window-height="507" inkscape:window-x="0" inkscape:window-y="22" /> --- 52,62 ---- inkscape:pageopacity="0.0" inkscape:pageshadow="2" ! inkscape:zoom="0.7" ! inkscape:cx="375" ! inkscape:cy="853.2471" inkscape:document-units="px" inkscape:current-layer="layer1" ! inkscape:window-width="823" ! inkscape:window-height="577" inkscape:window-x="0" inkscape:window-y="22" /> *************** *** 77,92 **** id="layer1"> <path ! style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 0,0 L 120,0 L 120,60 L 0,60 L 0,0" id="path1306" /> <path ! style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 140,0 L 280,0 L 280,60 L 140,60 L 140,0" id="path1310" /> ! <path ! style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#FFFFFF;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 280,0 L 300,0 L 300,60 L 280,60 280,0" id="path1311" /> ! </g> <g inkscape:label="REPXY" --- 77,92 ---- id="layer1"> <path ! style="fill:#a45555;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 0,0 L 120,0 L 120,60 L 0,60 L 0,0" id="path1306" /> <path ! style="fill:#a45555;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 140,0 L 280,0 L 280,60 L 140,60 L 140,0" id="path1310" /> ! <path ! style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#FFFFFF;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 280,0 L 300,0 L 300,60 L 280,60 280,0" id="path1311" /> ! </g> <g inkscape:label="REPXY" *************** *** 95,107 **** style="display:inline"> <path ! style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 0,80 L 280,80 L 280,200 L 0,200 L 0,80" id="path1307" /> <path ! style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#FFFFFF;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 0,200 L 280,220 L 280,220 L 0,220 L 0,200" ! id="path1307" /> <path ! style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#FFFFFF;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 280,80 L 300,80 L 300,220 L 280,220 L 280,80" id="path1312" /> --- 95,107 ---- style="display:inline"> <path ! style="fill:#a45555;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 0,80 L 280,80 L 280,200 L 0,200 L 0,80" id="path1307" /> <path ! style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#FFFFFF;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 0,200 L 280,220 L 280,220 L 0,220 L 0,200" ! id="path2141" /> <path ! style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#FFFFFF;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 280,80 L 300,80 L 300,220 L 280,220 L 280,80" id="path1312" /> *************** *** 112,124 **** id="g12"> <path ! style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 0,220 L 120,220 L 120,280 L 0,280 L 0,220" id="path1308" /> <path ! style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 140,220 L 280,220 L 280,280 L 140,280 L 140,220" id="path1309" /> <path ! style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#FFFFFF;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 280,220 L 300,220 L 300,280 L 280,280 L 280,220" id="path1313" /> --- 112,124 ---- id="g12"> <path ! style="fill:#a45555;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 0,220 L 120,220 L 120,280 L 0,280 L 0,220" id="path1308" /> <path ! style="fill:#a45555;fill-opacity:1;fill-rule:evenodd;stroke:#000000;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 140,220 L 280,220 L 280,280 L 140,280 L 140,220" id="path1309" /> <path ! style="fill:white;fill-opacity:1;fill-rule:evenodd;stroke:#FFFFFF;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" d="M 280,220 L 300,220 L 300,280 L 280,280 L 280,220" id="path1313" /> |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-01 03:02:40
|
Update of /cvsroot/igarden/Garden/source/resources/2DSymbols In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27932 Modified Files: Tag: Release_branch_v1 Pergola.svg Log Message: Add coloring to images Index: Pergola.svg =================================================================== RCS file: /cvsroot/igarden/Garden/source/resources/2DSymbols/Pergola.svg,v retrieving revision 1.5 retrieving revision 1.5.2.1 diff -C2 -d -r1.5 -r1.5.2.1 *** Pergola.svg 8 Sep 2005 11:09:34 -0000 1.5 --- Pergola.svg 1 Nov 2006 03:02:34 -0000 1.5.2.1 *************** *** 29,33 **** xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" ! xmlns:sodipodi="http://inkscape.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="744.09448px" --- 29,33 ---- xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" ! xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="744.09448px" *************** *** 40,45 **** id="svg2" sodipodi:version="0.32" ! inkscape:version="0.42" ! sodipodi:docbase="/Development/iGarden/Garden/source/resources/2DSymbols" sodipodi:docname="Pergola.svg"> <defs --- 40,45 ---- id="svg2" sodipodi:version="0.32" ! inkscape:version="0.44.1" ! sodipodi:docbase="/Volumes/Bedell/GardenSketch.app/Contents/Resources" sodipodi:docname="Pergola.svg"> <defs *************** *** 53,62 **** inkscape:pageshadow="2" inkscape:zoom="1.2187708" ! inkscape:cx="375.00000" ! inkscape:cy="520.00000" inkscape:document-units="px" ! inkscape:current-layer="layer1" ! inkscape:window-width="901" ! inkscape:window-height="655" inkscape:window-x="0" inkscape:window-y="22" /> --- 53,62 ---- inkscape:pageshadow="2" inkscape:zoom="1.2187708" ! inkscape:cx="375" ! inkscape:cy="371.57176" inkscape:document-units="px" ! inkscape:current-layer="g18" ! inkscape:window-width="907" ! inkscape:window-height="782" inkscape:window-x="0" inkscape:window-y="22" /> *************** *** 81,93 **** id="layer1"> <polyline ! style="fill:none;stroke:#000000;stroke-width:1.0000000" id="LeftBeamLeftEdge" points="112,20 100,20 100,920 112,920" /> <polyline ! style="fill:none;stroke:#000000;stroke-width:1.0000000" id="topBeamCap" points="100,170 75,170 75,195 100,195" /> <polyline ! style="fill:none;stroke:#000000;stroke-width:1.0000000" id="bottomBeamCap" points="100,671 75,671 75,695 100,695" /> --- 81,93 ---- id="layer1"> <polyline ! style="fill:#7a6b33;stroke:black;stroke-width:1.0000000;fill-opacity:1" id="LeftBeamLeftEdge" points="112,20 100,20 100,920 112,920" /> <polyline ! style="fill:#7a6b34;stroke:black;stroke-width:1.0000000;fill-opacity:1" id="topBeamCap" points="100,170 75,170 75,195 100,195" /> <polyline ! style="fill:#7a6b34;stroke:black;stroke-width:1.0000000;fill-opacity:1" id="bottomBeamCap" points="100,671 75,671 75,695 100,695" /> *************** *** 98,122 **** id="g10"> <polyline ! style="fill:none;stroke:#000000;stroke-width:1.0000000" id="LeftBeamRightEdge" points="112,20 125,20 125,920 112,920" /> <polyline ! style="fill:none;stroke:#000000;stroke-width:1.0000000" ! id="topBeamTop" ! points="125,170 275,170" /> ! <polyline ! style="fill:none;stroke:#000000;stroke-width:1.0000000" ! id="topBeamBottom" ! points="125,195 275,195" /> ! <polyline ! style="fill:none;stroke:#000000;stroke-width:1.0000000" ! id="BottomBeamTop" ! points="125,671 275,671" /> <polyline ! style="fill:none;stroke:#000000;stroke-width:1.0000000" ! id="BottomBeamBottom" ! points="125,695 275,695" /> <polyline ! style="fill:none;stroke:#000000;stroke-width:1.0000000" id="RightBeamLeftEdge" points="287,20 275,20 275,920 287,920" /> --- 98,114 ---- id="g10"> <polyline ! style="fill:#7a6b34;stroke:black;stroke-width:1.0000000;fill-opacity:1" id="LeftBeamRightEdge" points="112,20 125,20 125,920 112,920" /> <polyline ! style="fill:#7a6b34;stroke:black;stroke-width:1.0000000;fill-opacity:1" ! id="topBeam" ! points="125,170 275,170 275,195 125,195 125,170" /> <polyline ! style="fill:#7a6b34;stroke:black;stroke-width:1.0000000;fill-opacity:1" ! id="BottomBeam" ! points="125,671 275,671 275,695 125,695 125,671" /> <polyline ! style="fill:#7a6b34;stroke:black;stroke-width:1.0000000;fill-opacity:1" id="RightBeamLeftEdge" points="287,20 275,20 275,920 287,920" /> *************** *** 127,139 **** id="g18"> <polyline ! style="fill:none;stroke:#000000;stroke-width:1.0000000" id="RightBeamRightEdge" points="287,20 299,20 299,920 287,920" /> <polyline ! style="fill:none;stroke:#000000;stroke-width:1.0000000" id="polyline21" points="299,170 324,170 324,195 299,195" /> <polyline ! style="fill:none;stroke:#000000;stroke-width:1.0000000" id="polyline23" points="299,671 324,671 324,695 299,695" /> --- 119,131 ---- id="g18"> <polyline ! style="fill:#7a6b34;stroke:black;stroke-width:1.0000000;fill-opacity:1" id="RightBeamRightEdge" points="287,20 299,20 299,920 287,920" /> <polyline ! style="fill:#7a6b34;stroke:black;stroke-width:1.0000000;fill-opacity:1" id="polyline21" points="299,170 324,170 324,195 299,195" /> <polyline ! style="fill:#7a6b34;stroke:black;stroke-width:1.0000000;fill-opacity:1" id="polyline23" points="299,671 324,671 324,695 299,695" /> |
|
From: Jeffrey B. <jlb...@us...> - 2006-11-01 03:02:21
|
Update of /cvsroot/igarden/Garden/source/resources/2DSymbols In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv27890 Modified Files: Tag: Release_branch_v1 Bench1.svg Log Message: Add coloring to images Index: Bench1.svg =================================================================== RCS file: /cvsroot/igarden/Garden/source/resources/2DSymbols/Attic/Bench1.svg,v retrieving revision 1.1.2.1 retrieving revision 1.1.2.2 diff -C2 -d -r1.1.2.1 -r1.1.2.2 *** Bench1.svg 29 Oct 2006 03:15:57 -0000 1.1.2.1 --- Bench1.svg 1 Nov 2006 03:02:19 -0000 1.1.2.2 *************** *** 67,71 **** id="layer1"> <rect ! style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:1.29275596;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect13414" width="458.70724" --- 67,71 ---- id="layer1"> <rect ! style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:1.29275596;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0" id="rect13414" width="458.70724" *************** *** 79,85 **** width="458.70724" id="rect15188" ! style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:1.29275596;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect ! style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:1.29275596;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect15190" width="458.70724" --- 79,85 ---- width="458.70724" id="rect15188" ! style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:1.29275596;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0" /> <rect ! style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:1.29275596;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0" id="rect15190" width="458.70724" *************** *** 93,99 **** width="458.70724" id="rect15192" ! style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:1.29275596;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect ! style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:1.29275596;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect15194" width="458.70724" --- 93,99 ---- width="458.70724" id="rect15192" ! style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:1.29275596;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0" /> <rect ! style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:1.29275596;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0" id="rect15194" width="458.70724" *************** *** 107,113 **** width="458.70724" id="rect15196" ! style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:1.29275596;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect ! style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:1.29275596;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect15198" width="458.70724" --- 107,113 ---- width="458.70724" id="rect15196" ! style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:1.29275596;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0" /> <rect ! style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:1.29275596;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0" id="rect15198" width="458.70724" *************** *** 116,120 **** y="193.00858" /> <rect ! style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:0.97712946;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect15200" width="38.265701" --- 116,120 ---- y="193.00858" /> <rect ! style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:0.97712946;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0" id="rect15200" width="38.265701" *************** *** 128,134 **** width="38.265701" id="rect15202" ! style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:0.97712946;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect ! style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:1.18030524;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect15204" width="538.8197" --- 128,134 ---- width="38.265701" id="rect15202" ! style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:0.97712946;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0" /> <rect ! style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:1.18030524;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0" id="rect15204" width="538.8197" |
|
From: Jeffrey B. <jlb...@us...> - 2006-10-29 03:34:28
|
Update of /cvsroot/igarden/Garden/source/Document In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15598 Modified Files: Tag: Release_branch_v1 PictureCell.cpp Log Message: Fix spurious stop signs in the list view Index: PictureCell.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/PictureCell.cpp,v retrieving revision 1.10 retrieving revision 1.10.2.1 diff -C2 -d -r1.10 -r1.10.2.1 *** PictureCell.cpp 14 Jun 2006 11:14:31 -0000 1.10 --- PictureCell.cpp 29 Oct 2006 03:34:24 -0000 1.10.2.1 *************** *** 39,42 **** --- 39,43 ---- _defaultPicture = NULL; _mat = NULL; + _iconID = 0; } *************** *** 50,53 **** --- 51,55 ---- _defaultPicture = cell._defaultPicture; // External source responsible for delete _mat = cell._mat; // External source responsible for delete + _iconID = cell._iconID; } *************** *** 66,69 **** --- 68,72 ---- _defaultPicture = src->_defaultPicture; // External source responsible for delete _mat = src->_mat; // External source responsible for delete + _iconID = src->_iconID; } } *************** *** 121,125 **** long test, xOffset, yOffset; ! back = r; if(isPrinter) InsetRect(&back, 1, 1); --- 124,128 ---- long test, xOffset, yOffset; ! back = r; if(isPrinter) InsetRect(&back, 1, 1); *************** *** 141,145 **** xOffset = back.left + (_myCol->width - _iconSize.h)/2; yOffset = back.top + (_myRow->height - _iconSize.v)/2; ! draw.DrawIcon(_iconID, xOffset, yOffset, true); if (f) { --- 144,150 ---- xOffset = back.left + (_myCol->width - _iconSize.h)/2; yOffset = back.top + (_myRow->height - _iconSize.v)/2; ! ! if(_iconID != 0) ! draw.DrawIcon(_iconID, xOffset, yOffset, true); if (f) { |
|
From: Jeffrey B. <jlb...@us...> - 2006-10-29 03:33:42
|
Update of /cvsroot/igarden/Garden/Macintosh In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv15201 Modified Files: Tag: Release_branch_v1 Info.plist Log Message: New revision Index: Info.plist =================================================================== RCS file: /cvsroot/igarden/Garden/Macintosh/Info.plist,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -d -r1.9 -r1.9.2.1 *** Info.plist 23 Sep 2006 17:07:57 -0000 1.9 --- Info.plist 29 Oct 2006 03:33:39 -0000 1.9.2.1 *************** *** 77,81 **** <string>RSGB</string> <key>CFBundleVersion</key> ! <string>1.0d101</string> <key>CSResourcesFileMapped</key> <true/> --- 77,81 ---- <string>RSGB</string> <key>CFBundleVersion</key> ! <string>1.0d501</string> <key>CSResourcesFileMapped</key> <true/> |
|
From: Jeffrey B. <jlb...@us...> - 2006-10-29 03:32:28
|
Update of /cvsroot/igarden/Garden/Macintosh/Garden.xcodeproj In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14764 Modified Files: Tag: Release_branch_v1 project.pbxproj Log Message: Add color, rectangles, and depth to the rendering. Add three new materials which make use of these features. Index: project.pbxproj =================================================================== RCS file: /cvsroot/igarden/Garden/Macintosh/Garden.xcodeproj/project.pbxproj,v retrieving revision 1.58 retrieving revision 1.58.2.1 diff -C2 -d -r1.58 -r1.58.2.1 *** project.pbxproj 23 Sep 2006 15:47:44 -0000 1.58 --- project.pbxproj 29 Oct 2006 03:32:26 -0000 1.58.2.1 *************** *** 21,24 **** --- 21,26 ---- 4904C76307AEF76E00F7D273 /* TitleBox.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4904C76107AEF76E00F7D273 /* TitleBox.cpp */; }; 4904C76407AEF76E00F7D273 /* TitleBox.h in Headers */ = {isa = PBXBuildFile; fileRef = 4904C76207AEF76E00F7D273 /* TitleBox.h */; }; + 49057B640AF3F3E0009FEF70 /* Bench1.svg in Resources */ = {isa = PBXBuildFile; fileRef = 49057B630AF3F3E0009FEF70 /* Bench1.svg */; }; + 49057D820AF438E5009FEF70 /* Bluestone.svg in Resources */ = {isa = PBXBuildFile; fileRef = 49057D810AF438E5009FEF70 /* Bluestone.svg */; }; 4905E3CC0808B3DF003D2573 /* ArcTool.h in Headers */ = {isa = PBXBuildFile; fileRef = 49CD8B0807EDC13D0012F7B6 /* ArcTool.h */; }; 4905E3CD0808B3DF003D2573 /* ArcTool.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49CD8B0707EDC13D0012F7B6 /* ArcTool.cpp */; }; *************** *** 154,157 **** --- 156,160 ---- 4940802109D5ADEE006F7F71 /* AgingWindow.h in Headers */ = {isa = PBXBuildFile; fileRef = 4940801F09D5ADEE006F7F71 /* AgingWindow.h */; }; 4941E45307A721BA00EFF558 /* OverlayPlugin.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 490749B606488E1100C334E8 /* OverlayPlugin.cpp */; }; + 4948C94B0AF2EF5E009D80F4 /* Decking.svg in Resources */ = {isa = PBXBuildFile; fileRef = 4948C94A0AF2EF5E009D80F4 /* Decking.svg */; }; 494EE60C078E111100EF9213 /* NotAvailable.gif in Resources */ = {isa = PBXBuildFile; fileRef = 494EE60B078E111000EF9213 /* NotAvailable.gif */; }; 4950A95E0AAFA8250048DAF9 /* ImportPlugin.h in Headers */ = {isa = PBXBuildFile; fileRef = 4950A95D0AAFA8250048DAF9 /* ImportPlugin.h */; }; *************** *** 668,671 **** --- 671,676 ---- 4904C76107AEF76E00F7D273 /* TitleBox.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = TitleBox.cpp; sourceTree = "<group>"; }; 4904C76207AEF76E00F7D273 /* TitleBox.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = TitleBox.h; sourceTree = "<group>"; }; + 49057B630AF3F3E0009FEF70 /* Bench1.svg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = Bench1.svg; path = ../source/resources/2DSymbols/Bench1.svg; sourceTree = SOURCE_ROOT; }; + 49057D810AF438E5009FEF70 /* Bluestone.svg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = Bluestone.svg; path = ../source/resources/2DSymbols/Bluestone.svg; sourceTree = SOURCE_ROOT; }; 4907499D06488DDE00C334E8 /* PlanMoveAction.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; lineEnding = 0; name = PlanMoveAction.h; path = PlanTool/PlanMoveAction.h; sourceTree = "<group>"; }; 4907499E06488DDE00C334E8 /* PlanPasteAction.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; lineEnding = 0; name = PlanPasteAction.cpp; path = PlanTool/PlanPasteAction.cpp; sourceTree = "<group>"; }; *************** *** 803,806 **** --- 808,812 ---- 4940801E09D5ADEE006F7F71 /* AgingWindow.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = AgingWindow.cpp; path = Document/AgingWindow.cpp; sourceTree = "<group>"; }; 4940801F09D5ADEE006F7F71 /* AgingWindow.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = AgingWindow.h; path = Document/AgingWindow.h; sourceTree = "<group>"; }; + 4948C94A0AF2EF5E009D80F4 /* Decking.svg */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = Decking.svg; path = ../source/resources/2DSymbols/Decking.svg; sourceTree = SOURCE_ROOT; }; 494EE60B078E111000EF9213 /* NotAvailable.gif */ = {isa = PBXFileReference; lastKnownFileType = image.gif; name = NotAvailable.gif; path = ../source/resources/NotAvailable.gif; sourceTree = "<group>"; }; 4950A95D0AAFA8250048DAF9 /* ImportPlugin.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; name = ImportPlugin.h; path = Plugins/ImportPlugin.h; sourceTree = "<group>"; }; *************** *** 1475,1478 **** --- 1481,1487 ---- isa = PBXGroup; children = ( + 49057D810AF438E5009FEF70 /* Bluestone.svg */, + 49057B630AF3F3E0009FEF70 /* Bench1.svg */, + 4948C94A0AF2EF5E009D80F4 /* Decking.svg */, 496A7BDA0A58C1EC0083CA5D /* Fountain.svg */, 49155BB608EF5BB70014234D /* Stair1.svg */, *************** *** 2435,2438 **** --- 2444,2450 ---- 4956A08E0A632CF50034352D /* PlantPictureLocations.xml in Resources */, 4956A11C0A633A570034352D /* GardenSketch Help in Resources */, + 4948C94B0AF2EF5E009D80F4 /* Decking.svg in Resources */, + 49057B640AF3F3E0009FEF70 /* Bench1.svg in Resources */, + 49057D820AF438E5009FEF70 /* Bluestone.svg in Resources */, ); runOnlyForDeploymentPostprocessing = 0; *************** *** 3346,3358 **** isa = XCBuildConfiguration; buildSettings = { ! ARCHS = ( ! ppc, ! i386, ! ); DEBUG_INFORMATION_FORMAT = dwarf; GCC_ENABLE_SYMBOL_SEPARATION = NO; GCC_MODEL_TUNING = G4; PREBINDING = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Development; --- 3358,3366 ---- isa = XCBuildConfiguration; buildSettings = { ! ARCHS = ppc; DEBUG_INFORMATION_FORMAT = dwarf; GCC_ENABLE_SYMBOL_SEPARATION = NO; GCC_MODEL_TUNING = G4; PREBINDING = NO; }; name = Development; *************** *** 3362,3366 **** buildSettings = { GCC_GENERATE_DEBUGGING_SYMBOLS = NO; - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Deployment; --- 3370,3373 ---- *************** *** 3369,3373 **** isa = XCBuildConfiguration; buildSettings = { - SDKROOT = /Developer/SDKs/MacOSX10.4u.sdk; }; name = Default; --- 3376,3379 ---- |
|
From: Jeffrey B. <jlb...@us...> - 2006-10-29 03:32:15
|
Update of /cvsroot/igarden/Garden/source/resources In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14558 Modified Files: Tag: Release_branch_v1 SourceMaterialsStart.xml Log Message: Add color, rectangles, and depth to the rendering. Add three new materials which make use of these features. Index: SourceMaterialsStart.xml =================================================================== RCS file: /cvsroot/igarden/Garden/source/resources/SourceMaterialsStart.xml,v retrieving revision 1.24 retrieving revision 1.24.2.1 diff -C2 -d -r1.24 -r1.24.2.1 *** SourceMaterialsStart.xml 7 Jul 2006 20:32:37 -0000 1.24 --- SourceMaterialsStart.xml 29 Oct 2006 03:32:13 -0000 1.24.2.1 *************** *** 1279,1285 **** <Variant UID="EC575F22-32D6-11DA-AB89-C467FD397B7A" variantName="Narrow Tread 2" PlanDrawing="Stair7.svg"/> </Material> - <!-- <Material UID="B64F6AE5-2852-4986-A2E6-E8ED75CD5466" CommonName="Fountain" materialType="Structure" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="Fountain.svg" MaterialLength="5ft" MaterialWidth="5ft"/> ! --> <Material UID="01234683-0000-E73E-0000-0A00000065F1" CommonName="Turf" materialType="Background" MaterialLength="20.30cm" MaterialWidth="20.30cm" Picture="turf.png"/> <Material UID="01234684-0000-E73E-0000-0A00000065F1" CommonName="Asphalt" materialType="Background" MaterialLength="20.30cm" MaterialWidth="20.30cm" Picture="blacktop.png"/> --- 1279,1286 ---- <Variant UID="EC575F22-32D6-11DA-AB89-C467FD397B7A" variantName="Narrow Tread 2" PlanDrawing="Stair7.svg"/> </Material> <Material UID="B64F6AE5-2852-4986-A2E6-E8ED75CD5466" CommonName="Fountain" materialType="Structure" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="Fountain.svg" MaterialLength="5ft" MaterialWidth="5ft"/> ! <Material UID="18075690-6F13-4F0D-8E4F-36C362F795F2" CommonName="Decking" materialType="Structure" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="Decking.svg"/> ! <Material UID="60495A35-20A1-460C-841E-AF2C5CC2FC1C" CommonName="Bench" materialType="Structure" Height="3ft" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="Bench1.svg"/> ! <Material UID="4D1274EC-E63B-4158-B9F8-3653FCDC4BA8" CommonName="Bluestone" materialType="Structure" suppliers="0000B7EB-0000-0AF1-0000-00030000E122" PlanDrawing="Bluestone.svg"/> <Material UID="01234683-0000-E73E-0000-0A00000065F1" CommonName="Turf" materialType="Background" MaterialLength="20.30cm" MaterialWidth="20.30cm" Picture="turf.png"/> <Material UID="01234684-0000-E73E-0000-0A00000065F1" CommonName="Asphalt" materialType="Background" MaterialLength="20.30cm" MaterialWidth="20.30cm" Picture="blacktop.png"/> |
|
From: Jeffrey B. <jlb...@us...> - 2006-10-29 03:32:00
|
Update of /cvsroot/igarden/CommonSource/YAAFExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14378 Modified Files: Tag: Release_branch_v1 RGGLSVGDraw.cpp RGHypertext.cpp Log Message: Add color, rectangles, and depth to the rendering. Add three new materials which make use of these features. Index: RGGLSVGDraw.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGGLSVGDraw.cpp,v retrieving revision 1.26 retrieving revision 1.26.2.1 diff -C2 -d -r1.26 -r1.26.2.1 *** RGGLSVGDraw.cpp 4 Nov 2005 02:09:05 -0000 1.26 --- RGGLSVGDraw.cpp 29 Oct 2006 03:31:56 -0000 1.26.2.1 *************** *** 56,60 **** void GetGrowConstraints(glSize_t &minSize, glSize_t &incrSize, glSize_t &maxSize); void FindDrawingSize(XGXMLData *data, glSize_t size, glRectangle_t &bounds); ! void ParseDrawingTags(XGXMLData *data, double xOffset, double yOffset, double xSize, double ySize, double scaleX, double scaleY); const char *ParseOnePoint(const char *val, bool doTranslate, double xSize, double ySize, double top, double left, double &x, double &y); double StringToLength(const char* text); --- 56,60 ---- void GetGrowConstraints(glSize_t &minSize, glSize_t &incrSize, glSize_t &maxSize); void FindDrawingSize(XGXMLData *data, glSize_t size, glRectangle_t &bounds); ! void ParseDrawingTags(XGXMLData *data, double xOffset, double yOffset, double zOffset, double xSize, double ySize, double scaleX, double scaleY); const char *ParseOnePoint(const char *val, bool doTranslate, double xSize, double ySize, double top, double left, double &x, double &y); double StringToLength(const char* text); *************** *** 63,66 **** --- 63,72 ---- void GetInitialSize(double &width, double &length); void GetRepeatCounts(double width, double length, long &widthCount, long &lengthCount); + const char *GetArcParameters(const char *val, glPoint_t start, bool doTranslate, glSize_t mySize, glPoint_t &end, glPoint_t ¢er, double &rx, double &ry, bool &sweep, bool &large, bool &isClosed); + void EnumeratePathVertices(const char *val, double xOffset, double yOffset, double zOffset, double xSize, double ySize, double scaleX, double scaleY, double translateX, double translateY); + bool IsStrokeStyleVisible(XGXMLData *data); + void SetStrokeStyle(XGXMLData *data, double xScale, double yScale); + bool IsFillStyleVisible(XGXMLData *data); + void SetFillStyle(XGXMLData *data); XGFileSpecifier _spec; *************** *** 296,300 **** /// off in a routine of their own. // ! void SVGCacheEntry::ParseDrawingTags(XGXMLData *data, double xOffset, double yOffset, double xSize, double ySize, double scaleX, double scaleY) { XGXMLObject *sub2; --- 302,306 ---- /// off in a routine of their own. // ! void SVGCacheEntry::ParseDrawingTags(XGXMLData *data, double xOffset, double yOffset, double zOffset, double xSize, double ySize, double scaleX, double scaleY) { XGXMLObject *sub2; *************** *** 302,309 **** const char *val; double xPos, yPos, offsetShiftX, offsetShiftY, midXPlan, midYPlan; titleTag_t tag, tag2; bool forX, forY, xGrows, yGrows; long xReps, yReps, xIndex, yIndex; ! const char *nextCh, *tmp, *widthStr; if(strcmp(data->GetTag(), "g") == 0) --- 308,316 ---- const char *val; double xPos, yPos, offsetShiftX, offsetShiftY, midXPlan, midYPlan; + double zPos = -0.1; titleTag_t tag, tag2; bool forX, forY, xGrows, yGrows; long xReps, yReps, xIndex, yIndex; ! const char *nextCh, *tmp; if(strcmp(data->GetTag(), "g") == 0) *************** *** 499,509 **** for(xIndex = 0, xNew = xOffset; xIndex < xReps; xIndex++, xNew += _midXSize*_fixScale) { ! ParseDrawingTags(subData, xNew, yNew, xSize, ySize, scaleX, scaleY); } } } else ! ParseDrawingTags(subData, xOffset, yOffset, xSize, ySize, scaleX, scaleY); sub2 = sub2->GetSibling(); } --- 506,517 ---- for(xIndex = 0, xNew = xOffset; xIndex < xReps; xIndex++, xNew += _midXSize*_fixScale) { ! ParseDrawingTags(subData, xNew, yNew, zPos, xSize, ySize, scaleX, scaleY); } } } else ! ParseDrawingTags(subData, xOffset, yOffset, zPos, xSize, ySize, scaleX, scaleY); + zPos += 0.001; sub2 = sub2->GetSibling(); } *************** *** 520,628 **** glEnd(); } else if(strcmp(data->GetTag(), "path") == 0) { ! val = data->GetArgValue("style"); ! if(CIstrstr(val, "stroke:#FFFFFF") == NULL) { ! widthStr = CIstrstr(val, "stroke-width:"); ! if(widthStr != NULL) { ! char *temp; ! widthStr += strlen("stroke-width:"); ! glLineWidth(strtod(widthStr, &temp)+0.5); } ! else ! glLineWidth(1.5); ! val = data->GetArgValue("d"); ! glPushAttrib(GL_DEPTH_BUFFER_BIT); ! glDisable(GL_LINE_STIPPLE); ! glDisable(GL_DEPTH_TEST); ! glEnable(GL_LINE_SMOOTH); ! glColor3f (0.0, 0.0, 0.0); ! glEnable(GL_MAP1_VERTEX_3); ! ! while(*val != '\0') { while(*val == ' ' || *val == '\t') val++; ! if(*val == 'C') { ! GLfloat ctrlpoints[4][3]; ! int i; ! val++; ! ctrlpoints[0][0] = (xPos * scaleX) + xOffset; ! ctrlpoints[0][1] = (yPos * scaleY) + yOffset; ! ctrlpoints[0][2] = 0.0; ! ! val = ParseOnePoint(val, true, xSize, ySize, _bounds.top, _bounds.left, xPos, yPos); ! ctrlpoints[1][0] = (xPos * scaleX) + xOffset; ! ctrlpoints[1][1] = (yPos * scaleY) + yOffset; ! ctrlpoints[1][2] = 0.0; ! val = ParseOnePoint(val, true, xSize, ySize, _bounds.top, _bounds.left, xPos, yPos); ! ctrlpoints[2][0] = (xPos * scaleX) + xOffset; ! ctrlpoints[2][1] = (yPos * scaleY) + yOffset; ! ctrlpoints[2][2] = 0.0; ! val = ParseOnePoint(val, true, xSize, ySize, _bounds.top, _bounds.left, xPos, yPos); ! ctrlpoints[3][0] = (xPos * scaleX) + xOffset; ! ctrlpoints[3][1] = (yPos * scaleY) + yOffset; ! ctrlpoints[3][2] = 0.0; ! glMap1f(GL_MAP1_VERTEX_3, 0.0, 1.0, 3, 4, &ctrlpoints[0][0]); ! ! glBegin(GL_LINE_STRIP); ! for(i= 0; i <= 30; i++) { ! glEvalCoord1f(((GLfloat)i)/30.0); } - glEnd(); } else { ! if(*val == 'M') ! { val++; ! while(*val == ' ' || *val == '\t') ! val++; ! val = ParseOnePoint(val, true, xSize, ySize, _bounds.top, _bounds.left, xPos, yPos); ! } ! else if(*val == 'L') ! { val++; ! while(*val == ' ' || *val == '\t') ! val++; ! glBegin(GL_LINE_STRIP); ! glVertex3f((xPos * scaleX) + xOffset, (yPos * scaleY) + yOffset, 0.0); // Z axis taken care of on glTranslate ! val = ParseOnePoint(val, true, xSize, ySize, _bounds.top, _bounds.left, xPos, yPos); ! glVertex3f((xPos * scaleX) + xOffset, (yPos * scaleY) + yOffset, 0.0); // Z axis taken care of on glTranslate ! glEnd(); ! } ! else { ! if(*val == 'A') ! val++; ! if(*val == 'z') ! val++; ! while(*val == ' ' || *val == '\t') ! val++; ! if(*val != '\0') ! { ! glBegin(GL_LINE_STRIP); ! glVertex3f((xPos * scaleX) + xOffset, (yPos * scaleY) + yOffset, 0.0); // Z axis taken care of on glTranslate ! val = ParseOnePoint(val, true, xSize, ySize, _bounds.top, _bounds.left, xPos, yPos); ! glVertex3f((xPos * scaleX) + xOffset, (yPos * scaleY) + yOffset, 0.0); // Z axis taken care of on glTranslate ! glEnd(); ! } } } } - glPopAttrib(); } } } // --------------------------------------------------------------------------- /// FindDrawingSize PRIVATE --- 528,877 ---- glEnd(); } + else if(strcmp(data->GetTag(), "rect") == 0) + { + double height, width; + char *junk; + + val = data->GetArgValue("width"); + width = strtod(val, &junk); + val = data->GetArgValue("height"); + height = strtod(val, &junk); + val = data->GetArgValue("x"); + xPos = strtod(val, &junk); + val = data->GetArgValue("y"); + yPos = strtod(val, &junk); + + xPos -= _bounds.left; + yPos -= _bounds.top; + // Translate the coordinates to centered around zero + xPos = (xPos - (xSize/2)); + // In addition, the SVG Y coordinate needs to be translated to an OpenGL coordinate + yPos = ((ySize-yPos) - (ySize/2)); + + if(IsStrokeStyleVisible(data)) + { + glBegin(GL_LINE_STRIP); + SetStrokeStyle(data, scaleX, scaleY); + + glVertex3f((xPos * scaleX) + xOffset, (yPos * scaleY) + yOffset, 0.0); + xPos += width; + glVertex3f((xPos * scaleX) + xOffset, (yPos * scaleY) + yOffset, 0.0); + yPos -= height; + glVertex3f((xPos * scaleX) + xOffset, (yPos * scaleY) + yOffset, 0.0); + xPos -= width; + glVertex3f((xPos * scaleX) + xOffset, (yPos * scaleY) + yOffset, 0.0); + yPos += height; + glVertex3f((xPos * scaleX) + xOffset, (yPos * scaleY) + yOffset, 0.0); + glEnd(); + } + + if(IsFillStyleVisible(data)) + { + glBegin(GL_POLYGON); + SetFillStyle(data); + + glVertex3f((xPos * scaleX) + xOffset, (yPos * scaleY) + yOffset, zOffset); + xPos += width; + glVertex3f((xPos * scaleX) + xOffset, (yPos * scaleY) + yOffset, zOffset); + yPos -= height; + glVertex3f((xPos * scaleX) + xOffset, (yPos * scaleY) + yOffset, zOffset); + xPos -= width; + glVertex3f((xPos * scaleX) + xOffset, (yPos * scaleY) + yOffset, zOffset); + yPos += height; + glVertex3f((xPos * scaleX) + xOffset, (yPos * scaleY) + yOffset, zOffset); + glEnd(); + } + } else if(strcmp(data->GetTag(), "path") == 0) { ! double translateX = 0.0, translateY = 0.0; ! const char *transform, *dval; ! ! transform = data->GetArgValue("transform"); ! if(transform != NULL) { ! if(strncmp(transform, "translate(",10) == 0) { ! (void)ParseOnePoint(transform+10, false, 0.0, 0.0, 0.0, 0.0, translateX, translateY); ! } ! else if(strncmp(transform, "matrix(",7) == 0) ! { ! float a, b, c, d, e, f; ! long numValid; ! numValid = sscanf(transform, "matrix(%f,%f,%f,%f,%f,%f", &a, &b, &c, &d, &e, &f); ! if(b == 0.0 && c == 0.0) ! { ! // scaleX *= a; ! // scaleY *= d; ! translateX = (-1*e)*a; ! translateY = (-1*f)*d; ! } ! else ! printf("Transform not implemented\n"); } ! } ! ! dval = data->GetArgValue("d"); ! ! glPushAttrib(GL_DEPTH_BUFFER_BIT); ! glDisable(GL_LINE_STIPPLE); ! glDisable(GL_DEPTH_TEST); ! glEnable(GL_LINE_SMOOTH); ! glColor3f (0.0, 0.0, 0.0); ! glEnable(GL_MAP1_VERTEX_3); ! ! if(IsStrokeStyleVisible(data)) ! { ! glBegin(GL_LINE_STRIP); ! SetStrokeStyle(data, scaleX, scaleY); ! EnumeratePathVertices(dval, xOffset, yOffset, 0.0, xSize, ySize, scaleX, scaleY, translateX, translateY); ! glEnd(); ! } ! ! if(IsFillStyleVisible(data)) ! { ! dval = data->GetArgValue("d"); ! glBegin(GL_POLYGON); ! SetFillStyle(data); ! EnumeratePathVertices(dval, xOffset, yOffset, zOffset, xSize, ySize, scaleX, scaleY, translateX, translateY); ! glEnd(); ! } ! ! glPopAttrib(); ! ! } ! } ! ! void SVGCacheEntry::EnumeratePathVertices(const char *val, double xOffset, double yOffset, double zOffset, double xSize, double ySize, double scaleX, double scaleY, double translateX, double translateY) ! { ! double xPos, yPos, xPosSVG, yPosSVG, startXPos, startYPos, span; ! bool startPosSet = false; ! ! while(*val != '\0') ! { ! while(*val == ' ' || *val == '\t') ! val++; ! if(*val == 'C') ! { ! GLfloat ctrlpoints[4][3]; ! int i; ! val++; ! ctrlpoints[0][0] = (xPos * scaleX) + xOffset; ! ctrlpoints[0][1] = (yPos * scaleY) + yOffset; ! ctrlpoints[0][2] = 0.0; ! val = ParseOnePoint(val, true, xSize, ySize, _bounds.top, _bounds.left, xPos, yPos); ! ctrlpoints[1][0] = (xPos * scaleX) + xOffset; ! ctrlpoints[1][1] = (yPos * scaleY) + yOffset; ! ctrlpoints[1][2] = 0.0; ! val = ParseOnePoint(val, true, xSize, ySize, _bounds.top, _bounds.left, xPos, yPos); ! ctrlpoints[2][0] = (xPos * scaleX) + xOffset; ! ctrlpoints[2][1] = (yPos * scaleY) + yOffset; ! ctrlpoints[2][2] = 0.0; ! val = ParseOnePoint(val, true, xSize, ySize, _bounds.top, _bounds.left, xPos, yPos); ! ctrlpoints[3][0] = (xPos * scaleX) + xOffset; ! ctrlpoints[3][1] = (yPos * scaleY) + yOffset; ! ctrlpoints[3][2] = 0.0; ! ! glMap1f(GL_MAP1_VERTEX_3, 0.0, 1.0, 3, 4, &ctrlpoints[0][0]); ! ! for(i= 0; i <= 30; i++) ! { ! glEvalCoord1f(((GLfloat)i)/30.0); ! } ! glEnd(); ! } ! else ! { ! if(*val == 'M') { + val++; while(*val == ' ' || *val == '\t') val++; ! ParseOnePoint(val, false, xSize, ySize, _bounds.top, _bounds.left, xPosSVG, yPosSVG); ! val = ParseOnePoint(val, true, xSize, ySize, _bounds.top, _bounds.left, xPos, yPos); ! } ! else if(*val == 'L') ! { ! val++; ! while(*val == ' ' || *val == '\t') ! val++; ! glVertex3f((xPos * scaleX) + xOffset, (yPos * scaleY) + yOffset, zOffset); // Z axis taken care of on glTranslate ! val = ParseOnePoint(val, true, xSize, ySize, _bounds.top, _bounds.left, xPos, yPos); ! glVertex3f((xPos * scaleX) + xOffset, (yPos * scaleY) + yOffset, zOffset); // Z axis taken care of on glTranslate ! } ! else ! { ! if(*val == 'A') { ! glPoint_t start, end, center; ! double rx, ry; ! double startA, endA, delta; ! long count; ! bool sweep, large, isClosed; ! glSize_t mySize; ! start.x = xPosSVG; ! start.y = yPosSVG; ! mySize.x = xSize; ! mySize.y = ySize; ! val = GetArcParameters(val, start, false, mySize, end, center, rx, ry, sweep, large, isClosed); ! start.x += translateX; ! start.y += translateY; ! end.x += translateX; ! end.y += translateY; ! center.x += translateX; ! center.y += translateY; ! ! if(start.x != end.x || start.y != end.y) { ! delta = (3.0/360.0)*2*3.14; ! startA = atan2(start.y-center.y,start.x-center.x); //*(360/(2*3.14)); ! endA = atan2(end.y-center.y,end.x-center.x); //*(360/(2*3.14)); ! span = endA-startA; ! if(span < 0) ! span *= -1.0; ! if((span < 3.14) && large) ! span = (2*3.14) - span; ! count = span/delta; ! ! double t, x, y; ! long n; ! ! x = start.x; //- center.x; ! y = start.y; //- center.y; ! if(!sweep) ! delta *= -1.0; ! ! // printf("Count = %ld center = %f,%f, startAnd %f endAng %f\n", count, center.x, center.y, startA, startA+(count*delta)); ! if(startA != NAN && endA != NAN) ! { ! if(!startPosSet) ! { ! startXPos = (cos(startA) * rx*cos(startA) - sin(startA)*ry*sin(startA)); //+ (center.x - (xSize/2)); ! startYPos = (sin(startA) * rx*cos(startA) + cos(startA)*ry*sin(startA)); //+ (center.y - (ySize/2)); ! startPosSet = true; ! } ! ! for(t = startA, n = 0; n < count; n++, t += delta) ! { ! x = (cos(t) * rx*cos(t) - sin(t)*ry*sin(t)); //+ (center.x - (xSize/2)); ! y = (sin(t) * rx*cos(t) + cos(t)*ry*sin(t)); //+ (center.y - (ySize/2)); ! glVertex3f((x * scaleX) + xOffset, (y * scaleY) + yOffset, 0.0); // Z axis taken care of on glTranslate ! } ! ! x = (cos(endA) * rx*cos(endA) - sin(endA)*ry*sin(endA)); //+ (center.x - (xSize/2)); ! y = (sin(endA) * rx*cos(endA) + cos(endA)*ry*sin(endA)); //+ (center.y - (ySize/2)); ! glVertex3f((x * scaleX) + xOffset, (y * scaleY) + yOffset, 0.0); // Z axis taken care of on glTranslate ! } ! if(isClosed && startPosSet) ! { ! // glBegin(GL_LINES); ! // glVertex3f((x * scaleX) + xOffset, (y * scaleY) + yOffset, 0.0); // Z axis taken care of on glTranslate ! // glVertex3f((startXPos * scaleX) + xOffset, (startYPos * scaleY) + yOffset, 0.0); // Z axis taken care of on glTranslate ! // glEnd(); ! } ! xPosSVG = end.x; ! yPosSVG = end.y; } } else { ! if(*val == 'z') val++; ! while(*val == ' ' || *val == '\t') val++; ! if(*val != '\0') { ! glVertex3f((xPos * scaleX) + xOffset, (yPos * scaleY) + yOffset, zOffset); // Z axis taken care of on glTranslate ! val = ParseOnePoint(val, true, xSize, ySize, _bounds.top, _bounds.left, xPos, yPos); ! glVertex3f((xPos * scaleX) + xOffset, (yPos * scaleY) + yOffset, zOffset); // Z axis taken care of on glTranslate } } } } } } + const char *SVGCacheEntry::GetArcParameters(const char *val, glPoint_t start, bool doTranslate, glSize_t mySize, + glPoint_t &end, glPoint_t ¢er, double &rx, double &ry, bool &isSweep, bool &isLarge, bool &isClosed) + { + double rot, x1, y1, x2, y2, scalar, scalarSq; + double x1p, y1p, cxp, cyp; + long largeArc, sweep; + char *next; + + isClosed = false; + val++; + rx = strtod(val, &next); + val = next; + ry = strtod(val, &next); + val = next; + rot = strtod(val, &next); + val = next; + largeArc = strtol(val, &next, 10); + val = next; + sweep = strtol(val, &next, 10); + val = next; + x1 = start.x; + y1 = start.y; + val = ParseOnePoint(val, doTranslate, mySize.x, mySize.y, 0.0, 0.0, x2, y2); + if(*val == 'z') + { + isClosed = true; + val++; + } + + if(rx < 0) + rx *= -1.0; + if(ry < 0) + ry *= -1.0; + rot *= (2*3.14/360); // To radians + + // Formula F.6.5.1 + x1p = (cos(rot) * (x1-x2) / 2.0) + (sin(rot) * (y1-y2)/2.0); + y1p = (-sin(rot) * (x1-x2) / 2.0) + (cos(rot) * (y1-y2)/2.0); + + // Formula F.6.5.2 + scalarSq = ((rx*rx*ry*ry) - (rx*rx*y1p*y1p) - (ry*ry*x1p*x1p))/((rx*rx*y1p*y1p)+(ry*ry*x1p*x1p)); + if(scalarSq < 0) + scalarSq *= -1.0; + scalar = sqrt(scalarSq); + if(largeArc == sweep) + scalar *= -1; + + cxp = scalar*rx*y1p/ry; + cyp = scalar* -ry *x1p/rx; + + end.x = x2; + end.y = y2; + // Formula F.6.5.3 + center.x = cos(rot)*cxp - sin(rot)*cyp + ((x1+x2)/2.0); + center.y = sin(rot)*cxp + cos(rot)*cyp + ((y1+y2)/2.0); + isSweep = sweep; + isLarge = largeArc; + + #if 0 + if(start.x != end.x || start.y != end.y) + { + printf("ARC: doTranslate = %s\n", doTranslate ? "True" : "False"); + printf(" Start Point = %f,%f End Point = %f,%f\n", x1, y1, x2, y2); + printf(" rx = %f, ry = %f\n", rx, ry); + printf(" x1' = %f, y1' = %f\n", x1p, y1p); + printf(" cx' = %f, cy' = %f\n", cxp, cyp); + printf(" scalar = %f\n", scalar); + printf(" scalar^2Num = %f\n", (rx*rx*ry*ry) - (rx*rx*y1p*y1p) - (ry*ry*x1p*x1p)); + printf(" scalar^2Den = %f\n", ((rx*rx*y1p*y1p)+(ry*ry*x1p*x1p))); + printf(" Center = %f,%f\n", center.x, center.y); + } + #endif + + return val; + } + + // --------------------------------------------------------------------------- /// FindDrawingSize PRIVATE *************** *** 634,638 **** XGXMLObject *sub2; XGXMLData *subData; ! const char *val; double xPos, yPos, localXSize, localYSize; glRectangle_t localBounds; --- 883,887 ---- XGXMLObject *sub2; XGXMLData *subData; ! const char *val, *transform; double xPos, yPos, localXSize, localYSize; glRectangle_t localBounds; *************** *** 798,804 **** --- 1047,1101 ---- } } + else if(strcmp(data->GetTag(), "rect") == 0) + { + double height, width; + char *junk; + + val = data->GetArgValue("width"); + width = strtod(val, &junk); + val = data->GetArgValue("height"); + height = strtod(val, &junk); + val = data->GetArgValue("x"); + xPos = strtod(val, &junk); + val = data->GetArgValue("y"); + yPos = strtod(val, &junk); + + if(xPos < bounds.left) + bounds.left = xPos; + if(xPos+width > bounds.right) + bounds.right = xPos+width; + if(yPos < bounds.top) + bounds.top = yPos; + if(yPos+height > bounds.bottom) + bounds.bottom = yPos+height; + } else if(strcmp(data->GetTag(), "path") == 0) { + double translateX = 0.0, translateY = 0.0; + double scaleX = 1.0, scaleY = 1.0; + val = data->GetArgValue("d"); + transform = data->GetArgValue("transform"); + if(transform != NULL) + { + if(strncmp(transform, "translate(",10) == 0) + { + (void)ParseOnePoint(transform+10, false, 0.0, 0.0, 0.0, 0.0, translateX, translateY); + } + else if(strncmp(transform, "matrix(",10) == 0) + { + double a, b, c, d, e, f; + + (void)ParseOnePoint(transform+10, false, 0.0, 0.0, 0.0, 0.0, translateX, translateY); + sscanf(transform, "matrix(%lf,%lf,%lf,%lf,%lf,%lf", &a, &b, &c, &d, &e, &f); + if(b == 0.0 && c == 0.0 && e == 0.0 && f == 0.0) + { + scaleX = a; + scaleY = d; + } + else + printf("Transform not implemented\n"); + } + } while(*val != '\0') { *************** *** 806,810 **** val++; if(*val == 'M' || *val == 'C' || *val == 'L' || *val == 'A') ! val++; if(*val == 'z') val++; --- 1103,1176 ---- val++; if(*val == 'M' || *val == 'C' || *val == 'L' || *val == 'A') ! { ! if(*val == 'A') ! { ! glPoint_t start, end, center; ! glSize_t mySize; ! double rx, ry; ! bool sweep, large, isClosed; ! double startA, endA, delta; ! long count; ! ! start.x = xPos; ! start.y = yPos; ! mySize.x = 0.0; ! mySize.y = 0.0; ! val = GetArcParameters(val, start, false, mySize, end, center, rx, ry, sweep, large, isClosed); ! ! if(start.x != end.x || start.y != end.y) ! { ! delta = (3.0/360.0)*2*3.14; ! startA = atan2(start.y-center.y,start.x-center.x); //*(360/(2*3.14)); ! if(isClosed) ! { ! count = 120; ! endA = startA; ! } ! else ! { ! double span; ! endA = atan2(end.y-center.y,end.x-center.x); //*(360/(2*3.14)); ! span = endA-startA; ! if(span < 0) ! span *= -1.0; ! if((span < 3.14) && large) ! span = (2*3.14) - span; ! count = span/delta; ! } ! ! if(startA != NAN && endA != NAN) ! { ! double t, x, y; ! long n; ! ! x = start.x; //- center.x; ! y = start.y; //- center.y; ! if(!sweep) ! delta += -1.0; ! ! for(t = startA, n = 0; n < count; n++, t += delta) ! { ! x = cos(t) * rx*cos(t) - sin(t)*ry*sin(t) + center.x + translateX; ! y = sin(t) * rx*cos(t) + cos(t)*ry*sin(t) + center.y + translateY; ! if(x < bounds.left) ! bounds.left = x; ! if(x > bounds.right) ! bounds.right = x; ! if(y < bounds.top) ! bounds.top = y; ! if(y > bounds.bottom) ! bounds.bottom = y; ! } ! } ! xPos = end.x; ! yPos = end.y; ! continue; ! } ! } ! else ! val++; ! } ! if(*val == 'z') val++; *************** *** 814,825 **** { val = ParseOnePoint(val, false, 0.0, 0.0, 0.0, 0.0, xPos, yPos); ! if(xPos < bounds.left) ! bounds.left = xPos; ! if(xPos > bounds.right) ! bounds.right = xPos; ! if(yPos < bounds.top) ! bounds.top = yPos; ! if(yPos > bounds.bottom) ! bounds.bottom = yPos; } } --- 1180,1191 ---- { val = ParseOnePoint(val, false, 0.0, 0.0, 0.0, 0.0, xPos, yPos); ! if(xPos+translateX < bounds.left) ! bounds.left = xPos+translateX; ! if(xPos+translateX > bounds.right) ! bounds.right = xPos+translateX; ! if(yPos+translateY < bounds.top) ! bounds.top = yPos+translateY; ! if(yPos+translateY > bounds.bottom) ! bounds.bottom = yPos+translateY; } } *************** *** 1164,1168 **** drawingHeight = _bounds.bottom - _bounds.top; drawingWidth = _bounds.right - _bounds.left; ! ParseDrawingTags(data, 0.0, 0.0, drawingWidth, drawingHeight, _growScaleX, _growScaleY); parseTree = data->GetSibling(); --- 1530,1534 ---- drawingHeight = _bounds.bottom - _bounds.top; drawingWidth = _bounds.right - _bounds.left; ! ParseDrawingTags(data, 0.0, 0.0, 0.0, drawingWidth, drawingHeight, _growScaleX, _growScaleY); parseTree = data->GetSibling(); *************** *** 1264,1267 **** --- 1630,1723 ---- } + bool SVGCacheEntry::IsStrokeStyleVisible(XGXMLData *data) + { + const char *val; + val = data->GetArgValue("style"); + if(CIstrstr(val, "stroke:white") || CIstrstr(val, "stroke:#FFFFFF") || CIstrstr(val, "stroke:none") || CIstrstr(val, "stroke-opacity:0")) + return false; + else + return true; + } + + void SVGCacheEntry::SetStrokeStyle(XGXMLData *data, double xScale, double yScale) + { + char *fill; + char *junk; + const char *val, *widthStr; + + val = data->GetArgValue("style"); + widthStr = CIstrstr(val, "stroke-width:"); + if(widthStr != NULL) + { + char *temp; + + widthStr += strlen("stroke-width:"); + glLineWidth((strtod(widthStr, &temp)* xScale)+0.5); + } + else + glLineWidth(1.5 * xScale); + + fill = strstr(val, "stroke:"); + if(fill != NULL) + { + fill += 7; + if(strncmp(fill, "none", 4) != 0) + { + long color; + double red, green, blue; + + if(CIstrncmp(fill, "black", 5) == 0) + color = 0; + else if(*fill == '#') + { + fill++; + color = strtol(fill, &junk, 16); + } + else + color = 0xffffff; + red = ((color >> 16L) & 0xFF)/255.0; + green = ((color >> 8L) & 0xFF)/255.0; + blue = (color & 0xFF)/255.0; + glColor4f (red, green, blue, 1.0); + } + } + } + + bool SVGCacheEntry::IsFillStyleVisible(XGXMLData *data) + { + const char *val; + val = data->GetArgValue("style"); + if(CIstrstr(val, "fill:white") || CIstrstr(val, "fill:#FFFFFF") || CIstrstr(val, "fill:none") || CIstrstr(val, "fill-opacity:0")) + return false; + else + return true; + } + + void SVGCacheEntry::SetFillStyle(XGXMLData *data) + { + char *junk, *fill; + const char *val; + + val = data->GetArgValue("style"); + fill = strstr(val, "fill:"); + if(fill != NULL) + { + fill += 5; + if(strncmp(fill, "none", 4) != 0) + { + long color; + double red, green, blue; + + fill++; + color = strtol(fill, &junk, 16); + red = ((color >> 16L) & 0xFF)/255.0; + green = ((color >> 8L) & 0xFF)/255.0; + blue = (color & 0xFF)/255.0; + glColor4f (red, green, blue, 1.0); + } + } + } + + #if 0 double _leftSize; double _midXSize; *************** *** 1272,1274 **** double _midYSize; double _bottomSize; ! --- 1728,1730 ---- double _midYSize; double _bottomSize; ! #endif Index: RGHypertext.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGHypertext.cpp,v retrieving revision 1.24 retrieving revision 1.24.2.1 diff -C2 -d -r1.24 -r1.24.2.1 *** RGHypertext.cpp 2 Feb 2006 00:10:02 -0000 1.24 --- RGHypertext.cpp 29 Oct 2006 03:31:56 -0000 1.24.2.1 *************** *** 38,42 **** --- 38,44 ---- #include <XDrawSupport.h> #include <ctype.h> + #if OPT_MACOS #include <quickdraw.h> + #endif #include "MyAssert.h" #include "PluginUtils.h" |
|
From: Jeffrey B. <jlb...@us...> - 2006-10-29 03:31:50
|
Update of /cvsroot/igarden/Garden/source/Plugins In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14353 Modified Files: Tag: Release_branch_v1 MaterialDrawPlugin.h RenderPlugin.cpp MaterialDrawSetup.h DefaultRenderPlugin.cpp MaterialDrawSetup.cpp Log Message: Add color, rectangles, and depth to the rendering. Add three new materials which make use of these features. Index: DefaultRenderPlugin.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Plugins/DefaultRenderPlugin.cpp,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -C2 -d -r1.13 -r1.13.2.1 *** DefaultRenderPlugin.cpp 17 Apr 2006 01:58:57 -0000 1.13 --- DefaultRenderPlugin.cpp 29 Oct 2006 03:31:48 -0000 1.13.2.1 *************** *** 619,626 **** Color yaafColor; ! upperLeft.xOffset = center.xOffset - (_width/2); ! upperLeft.yOffset = center.yOffset - (_height/2); ! lowerRight.xOffset = center.xOffset + (_width/2); ! lowerRight.yOffset = center.yOffset + (_height/2); /**/ --- 619,626 ---- Color yaafColor; ! upperLeft.xOffset = center.xOffset - (_xSize/2); ! upperLeft.yOffset = center.yOffset - (_ySize/2); ! lowerRight.xOffset = center.xOffset + (_xSize/2); ! lowerRight.yOffset = center.yOffset + (_ySize/2); /**/ *************** *** 646,650 **** } ! PRECONDITION(_width == _height); numColors = _otherColor.Length(); if(numColors != 0) --- 646,650 ---- } ! PRECONDITION(_xSize == _ySize); numColors = _otherColor.Length(); if(numColors != 0) *************** *** 659,663 **** glColor4f (red, green, blue, 0.5); ! gluPartialDisk(quad, 0, _height/4, 64, 16, n * sliceDegrees, sliceDegrees); } yaafColor = _foliageColor; --- 659,663 ---- glColor4f (red, green, blue, 0.5); ! gluPartialDisk(quad, 0, _ySize/4, 64, 16, n * sliceDegrees, sliceDegrees); } yaafColor = _foliageColor; *************** *** 667,671 **** glColor4f (red, green, blue, 0.5); ! gluDisk(quad, _height/4, _height/2, 64, 16); } else --- 667,671 ---- glColor4f (red, green, blue, 0.5); ! gluDisk(quad, _ySize/4, _ySize/2, 64, 16); } else *************** *** 677,681 **** glColor4f (red, green, blue, 0.5); ! gluDisk(quad, 0, _height/2, 64, 16); } --- 677,681 ---- glColor4f (red, green, blue, 0.5); ! gluDisk(quad, 0, _ySize/2, 64, 16); } *************** *** 687,691 **** gluDeleteQuadric(quad); ! if(_fullSpread > _height) { if(_year == kItemPrimaryYear) --- 687,691 ---- gluDeleteQuadric(quad); ! if(_fullSpread > _ySize) { if(_year == kItemPrimaryYear) *************** *** 705,719 **** pt.xOffset = center.xOffset + (cos(angle) * _fullSpread/2); pt.yOffset = center.yOffset + (sin(angle) * _fullSpread/2); ! glVertex3f (pt.xOffset, pt.yOffset, kGraphicsZ); endAngle = angle + (deltaAngle/2.0); pt.xOffset = center.xOffset + (cos(endAngle) * _fullSpread/2); pt.yOffset = center.yOffset + (sin(endAngle) * _fullSpread/2); ! glVertex3f (pt.xOffset, pt.yOffset, kGraphicsZ); glEnd(); } } ! if(_height > 32*_scale) { planLength_t top, left; --- 705,719 ---- pt.xOffset = center.xOffset + (cos(angle) * _fullSpread/2); pt.yOffset = center.yOffset + (sin(angle) * _fullSpread/2); ! glVertex3f (pt.xOffset, pt.yOffset, _zSize); endAngle = angle + (deltaAngle/2.0); pt.xOffset = center.xOffset + (cos(endAngle) * _fullSpread/2); pt.yOffset = center.yOffset + (sin(endAngle) * _fullSpread/2); ! glVertex3f (pt.xOffset, pt.yOffset, _zSize); glEnd(); } } ! if(_ySize > 32*_scale) { planLength_t top, left; *************** *** 731,735 **** glEnd(); _picture->CopyImage(_view, left, top, ! kPlantImageZ, _pictureWidth, _pictureHeight, 1.0, _scale); } } --- 731,735 ---- glEnd(); _picture->CopyImage(_view, left, top, ! _zSize+kPlantImageZ, _pictureWidth, _pictureHeight, 1.0, _scale); } } *************** *** 739,744 **** RGGLSVGDraw draw; ! /*!!!ec =*/ draw.Draw(spec, center.xOffset, center.yOffset, kGraphicsZ, ! _width, _height, _rotate, kMiddleFixed, _forcePastBounds); } glPopAttrib(); --- 739,744 ---- RGGLSVGDraw draw; ! /*!!!ec =*/ draw.Draw(spec, center.xOffset, center.yOffset, _zSize, ! _xSize, _ySize, _rotate, kMiddleFixed, _forcePastBounds); } glPopAttrib(); Index: MaterialDrawSetup.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/Plugins/MaterialDrawSetup.h,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** MaterialDrawSetup.h 1 Sep 2005 11:07:38 -0000 1.3 --- MaterialDrawSetup.h 29 Oct 2006 03:31:48 -0000 1.3.2.1 *************** *** 28,34 **** virtual void StartItemDraw(XGView *view, planScale_t scale, planScale_t defaultScale); virtual void EndItemDraw(); ! virtual void SetSize(double height, double width, bool forcePastBounds); virtual void SetName(String &name, RGGLBitmapFont *bitmapFont); ! virtual void SetPlantSize(double height, double width, double fullSpread); virtual void SetColors(Color foliageColor, XGSDynArray<Color> &otherColor, unsigned char* halftone); virtual void SetPicture(CGWorld *picture, UInt32 pictureHeight, UInt32 pictureWidth); --- 28,34 ---- virtual void StartItemDraw(XGView *view, planScale_t scale, planScale_t defaultScale); virtual void EndItemDraw(); ! virtual void SetSize(double xSize, double ySize, double zSize, bool forcePastBounds); virtual void SetName(String &name, RGGLBitmapFont *bitmapFont); ! virtual void SetPlantSize(double xSize, double ySize, double zSize, double fullSpread); virtual void SetColors(Color foliageColor, XGSDynArray<Color> &otherColor, unsigned char* halftone); virtual void SetPicture(CGWorld *picture, UInt32 pictureHeight, UInt32 pictureWidth); *************** *** 39,44 **** protected: XGView *_view; ! double _height; ! double _width; bool _forcePastBounds; CGWorld *_picture; --- 39,46 ---- protected: XGView *_view; ! double _ySize; ! double _xSize; ! double _zSize; ! // double _width; bool _forcePastBounds; CGWorld *_picture; Index: MaterialDrawPlugin.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/Plugins/MaterialDrawPlugin.h,v retrieving revision 1.9 retrieving revision 1.9.2.1 diff -C2 -d -r1.9 -r1.9.2.1 *** MaterialDrawPlugin.h 3 Oct 2005 02:21:24 -0000 1.9 --- MaterialDrawPlugin.h 29 Oct 2006 03:31:48 -0000 1.9.2.1 *************** *** 52,58 **** virtual void StartItemDraw(XGView *view, planScale_t scale, planScale_t defaultScale) = 0; virtual void EndItemDraw() = 0; ! virtual void SetSize(double height, double width, bool forcePastBounds) = 0; virtual void SetName(String &name, RGGLBitmapFont *bitmapFont) = 0; ! virtual void SetPlantSize(double height, double width, double fullSpread) = 0; virtual void SetColors(Color foliageColor, XGSDynArray<Color> &otherColor, unsigned char* halftone) = 0; virtual void SetPicture(CGWorld *picture, UInt32 pictureHeight, UInt32 pictureWidth) = 0; --- 52,58 ---- virtual void StartItemDraw(XGView *view, planScale_t scale, planScale_t defaultScale) = 0; virtual void EndItemDraw() = 0; ! virtual void SetSize(double xSize, double ySize, double zSize, bool forcePastBounds) = 0; virtual void SetName(String &name, RGGLBitmapFont *bitmapFont) = 0; ! virtual void SetPlantSize(double xSize, double ySize, double zSize, double fullSpread) = 0; virtual void SetColors(Color foliageColor, XGSDynArray<Color> &otherColor, unsigned char* halftone) = 0; virtual void SetPicture(CGWorld *picture, UInt32 pictureHeight, UInt32 pictureWidth) = 0; Index: RenderPlugin.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Plugins/RenderPlugin.cpp,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -C2 -d -r1.13 -r1.13.2.1 *** RenderPlugin.cpp 11 Feb 2006 16:54:31 -0000 1.13 --- RenderPlugin.cpp 29 Oct 2006 03:31:48 -0000 1.13.2.1 *************** *** 494,498 **** ErrorCode ec; ! ec = draw.Draw(spec, centerParm.xOffset, centerParm.yOffset, kGraphicsZ, _width, _height, 0.0, kMiddleFixed, _forcePastBounds); return (ec == yaaf::KYAAFNoError) ? kCanvasOK : kCanvasNotHandled; } --- 494,498 ---- ErrorCode ec; ! ec = draw.Draw(spec, centerParm.xOffset, centerParm.yOffset, kGraphicsZ, _xSize, _ySize, _zSize, kMiddleFixed, _forcePastBounds); return (ec == yaaf::KYAAFNoError) ? kCanvasOK : kCanvasNotHandled; } *************** *** 696,700 **** ErrorCode ec; ! ec = draw.Draw(spec, center.xOffset, center.yOffset, kGraphicsZ, _width, _height, 0.0, kMiddleFixed, _forcePastBounds); return (ec == yaaf::KYAAFNoError) ? kCanvasOK : kCanvasNotHandled; } --- 696,700 ---- ErrorCode ec; ! ec = draw.Draw(spec, center.xOffset, center.yOffset, kGraphicsZ, _xSize, _ySize, _zSize, kMiddleFixed, _forcePastBounds); return (ec == yaaf::KYAAFNoError) ? kCanvasOK : kCanvasNotHandled; } *************** *** 757,761 **** { ec = draw.Draw(spec, center.xOffset, center.yOffset, kGraphicsZ, ! _width, _height, 0.0, kMiddleFixed, _forcePastBounds); } } --- 757,761 ---- { ec = draw.Draw(spec, center.xOffset, center.yOffset, kGraphicsZ, ! _xSize, _ySize, _zSize, kMiddleFixed, _forcePastBounds); } } Index: MaterialDrawSetup.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Plugins/MaterialDrawSetup.cpp,v retrieving revision 1.3 retrieving revision 1.3.2.1 diff -C2 -d -r1.3 -r1.3.2.1 *** MaterialDrawSetup.cpp 1 Sep 2005 11:07:38 -0000 1.3 --- MaterialDrawSetup.cpp 29 Oct 2006 03:31:48 -0000 1.3.2.1 *************** *** 26,31 **** { _view = view; ! _height = 0.0; ! _width = 0.0; _picture = NULL; _pictureHeight = 0; --- 26,32 ---- { _view = view; ! _ySize = 0.0; ! _xSize = 0.0; ! _zSize = 0.0; _picture = NULL; _pictureHeight = 0; *************** *** 60,67 **** /// SetSize // ! void MaterialDrawSetup::SetSize(double height, double width, bool forcePastBounds) { ! _height = height; ! _width = width; _fullSpread = 0; _forcePastBounds = forcePastBounds; --- 61,69 ---- /// SetSize // ! void MaterialDrawSetup::SetSize(double xSize, double ySize, double zSize, bool forcePastBounds) { ! _ySize = ySize; ! _xSize = xSize; ! _zSize = zSize; _fullSpread = 0; _forcePastBounds = forcePastBounds; *************** *** 80,87 **** /// SetPlantSize // ! void MaterialDrawSetup::SetPlantSize(double height, double width, double fullSpread) { ! _height = height; ! _width = width; _fullSpread = fullSpread; } --- 82,90 ---- /// SetPlantSize // ! void MaterialDrawSetup::SetPlantSize(double xSize, double ySize, double zSize, double fullSpread) { ! _ySize = ySize; ! _xSize = xSize; ! _zSize = zSize; _fullSpread = fullSpread; } |
|
From: Jeffrey B. <jlb...@us...> - 2006-10-29 03:31:43
|
Update of /cvsroot/igarden/Garden/source/resources/2DSymbols In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14337 Modified Files: Tag: Release_branch_v1 Fountain.svg Walk3.svg Log Message: Add color, rectangles, and depth to the rendering. Add three new materials which make use of these features. Index: Fountain.svg =================================================================== RCS file: /cvsroot/igarden/Garden/source/resources/2DSymbols/Fountain.svg,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** Fountain.svg 7 Jul 2006 20:30:27 -0000 1.1 --- Fountain.svg 29 Oct 2006 03:31:41 -0000 1.1.2.1 *************** *** 20,24 **** sodipodi:version="0.32" inkscape:version="0.44" ! sodipodi:docbase="/Development/GardenSketch/iGarden/Garden/source/resources/2DSymbols" sodipodi:docname="Fountain.svg"> <defs --- 20,24 ---- sodipodi:version="0.32" inkscape:version="0.44" ! sodipodi:docbase="/Development/GardenSketch/GardenSketch_Release1.0/iGarden/Garden/source/resources/2DSymbols" sodipodi:docname="Fountain.svg"> <defs *************** *** 34,38 **** inkscape:pageopacity="0.0" inkscape:pageshadow="2" ! inkscape:zoom="0.35" inkscape:cx="375" inkscape:cy="520" --- 34,38 ---- inkscape:pageopacity="0.0" inkscape:pageshadow="2" ! inkscape:zoom="0.2652504" inkscape:cx="375" inkscape:cy="520" *************** *** 42,46 **** inkscape:window-height="786" inkscape:window-x="32" ! inkscape:window-y="42" /> <metadata id="metadata1943"> --- 42,48 ---- inkscape:window-height="786" inkscape:window-x="32" ! inkscape:window-y="42" ! showguides="true" ! inkscape:guide-bbox="true" /> <metadata id="metadata1943"> *************** *** 88,158 **** transform="translate(225.7143,-268.5714)" /> <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.26845825px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 396.93045,478.2107 C 442.89623,533.93136 442.89623,533.93136 442.89623,533.93136" ! id="path2843" /> <path ! id="path2845" ! d="M 402.98599,478.20532 C 462.0945,520.80476 462.0945,520.80476 462.0945,520.80476" ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.25770175px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> <path style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.11799192px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 400.89583,456.51711 C 448.40053,418.71489 451.36957,415.27833 451.36957,415.27833" ! id="path2851" /> <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 371.42857,452.36218 C 311.42857,418.07647 311.42857,418.07647 311.42857,418.07647" ! id="path2853" /> <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.17993629px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 374.54237,474.64577 C 314.86589,520.35343 314.86589,520.35343 314.86589,520.35343" ! id="path2855" /> <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 405.71429,469.50504 C 454.28571,466.6479 454.28571,466.6479 454.28571,466.6479" ! id="path2857" /> <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.22361839px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 385.60248,481.04542 C 375.23436,548.2395 375.23436,548.2395 375.23436,548.2395" ! id="path2859" /> <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.07476699px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 372.04427,466.6479 C 282.9347,466.6479 282.9347,466.6479 282.9347,466.6479" ! id="path2861" /> <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 388.57143,446.6479 C 380,369.50504 380,369.50504 380,369.50504" ! id="path2863" /> <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.22716475px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 395.06282,449.24788 C 422.74356,378.19005 422.74356,378.19005 422.74356,378.19005" ! id="path2865" /> <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.84394312px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 408.82009,458.00112 C 470.68971,435.12134 470.68971,435.12134 470.68971,435.12134" ! id="path2867" /> <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.64146078px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 404.67824,474.35659 C 466.26013,489.35763 466.26013,489.35763 466.26013,489.35763" ! id="path2869" /> <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.3069365px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 393.42903,480.74045 C 413.46873,546.84105 413.46873,546.84105 413.46873,546.84105" ! id="path2871" /> <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:0.95633328px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 377.1647,483.76891 C 337.29433,539.94529 337.29433,539.94529 337.29433,539.94529" ! id="path2873" /> <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.01834035px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 374.9698,460.75113 C 294.29488,438.08564 294.29488,438.08564 294.29488,438.08564" ! id="path2875" /> <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.04925668px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 379.97537,453.69434 C 342.88177,378.1011 342.88177,378.1011 342.88177,378.1011" ! id="path2877" /> <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.80674791px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 370.91136,470.57194 C 294.16914,493.14228 294.16914,493.14228 294.16914,493.14228" ! id="path2879" /> </g> </svg> --- 90,164 ---- transform="translate(225.7143,-268.5714)" /> <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.11799192px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 400.31565,459.41801 C 447.82035,421.61579 450.78939,418.17923 450.78939,418.17923" ! id="path2851" /> <path ! id="path2902" ! d="M 394.38536,455.20242 C 426.09605,403.43239 427.71066,399.1876 427.71066,399.1876" ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.11799192px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> <path style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.11799192px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 389.30448,453.99071 C 401.39639,394.4971 401.46182,389.95607 401.46182,389.95607" ! id="path2904" /> <path ! id="path2906" ! d="M 383.79641,455.29922 C 374.81107,395.25783 373.31943,390.96828 373.31943,390.96828" ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.11799192px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.11799192px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 379.39706,458.52991 C 350.41824,405.18262 347.54944,401.66193 347.54944,401.66193" ! id="path2908" /> <path ! id="path2910" ! d="M 374.80265,465.4294 C 318.31261,443.19022 313.85193,442.33724 313.85193,442.33724" ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.11799192px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.11799192px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 376.55811,461.23194 C 331.08108,421.01322 327.18115,418.68604 327.18115,418.68604" ! id="path2912" /> <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.11799192px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 374.01285,468.8144 C 313.32333,467.23714 308.83993,467.96124 308.83993,467.96124" ! id="path2914" /> <path ! id="path2916" ! d="M 374.54265,471.56278 C 316.9737,490.83767 313.00834,493.05152 313.00834,493.05152" ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.11799192px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.11799192px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 376.55472,474.45173 C 329.05001,512.25394 326.08097,515.69051 326.08097,515.69051" ! id="path2918" /> <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.13678837px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 345.65961,534.09754 C 378.45655,482.34488 380.12647,478.10152 380.12647,478.10152" ! id="path2920" /> <path ! id="path2922" ! d="M 373.05943,545.6592 C 385.15134,486.16559 385.21677,481.62456 385.21677,481.62456" ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.11799192px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.11799192px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 401.20182,545.22716 C 392.21648,485.18577 390.72484,480.89622 390.72484,480.89622" ! id="path2924" /> <path ! id="path2926" ! d="M 428.71238,535.1137 C 399.73356,481.76641 396.86476,478.24572 396.86476,478.24572" ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.11799192px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> <path ! id="path2928" ! d="M 449.08065,518.66979 C 403.60362,478.45107 399.70369,476.12389 399.70369,476.12389" ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.11799192px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.11799192px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 461.24952,496.75913 C 404.75948,474.51995 400.2988,473.66697 400.2988,473.66697" ! id="path2932" /> <path ! id="path2936" ! d="M 468.00206,469.97476 C 407.31254,468.3975 402.82914,469.1216 402.82914,469.1216" ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.11799192px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> ! <path ! style="fill:none;fill-opacity:0.75;fill-rule:evenodd;stroke:black;stroke-width:1.11799192px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" ! d="M 463.89041,443.13395 C 406.32146,462.40884 402.3561,464.62269 402.3561,464.62269" ! id="path2938" /> </g> </svg> Index: Walk3.svg =================================================================== RCS file: /cvsroot/igarden/Garden/source/resources/2DSymbols/Walk3.svg,v retrieving revision 1.1 retrieving revision 1.1.2.1 diff -C2 -d -r1.1 -r1.1.2.1 *** Walk3.svg 9 Sep 2005 22:12:24 -0000 1.1 --- Walk3.svg 29 Oct 2006 03:31:41 -0000 1.1.2.1 *************** *** 133,136 **** --- 133,140 ---- d="M 430,220 L 290,220 L 290,340 L 430,340 " id="path1314" /> + <path + style="fill:none;fill-opacity:0.75000000;fill-rule:evenodd;stroke:#FFFFFF;stroke-width:1.0000000px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1.0000000" + d="M 130,340 L 430,340 L 430,360 L 130,360 L 130,340" + id="path1314" /> </g> <g |
|
From: Jeffrey B. <jlb...@us...> - 2006-10-29 03:31:38
|
Update of /cvsroot/igarden/Garden/source/LayoutDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14320 Modified Files: Tag: Release_branch_v1 MaterialRef.cpp Log Message: Add color, rectangles, and depth to the rendering. Add three new materials which make use of these features. Index: MaterialRef.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/LayoutDB/MaterialRef.cpp,v retrieving revision 1.119 retrieving revision 1.119.2.1 diff -C2 -d -r1.119 -r1.119.2.1 *** MaterialRef.cpp 2 Jul 2006 02:52:50 -0000 1.119 --- MaterialRef.cpp 29 Oct 2006 03:31:35 -0000 1.119.2.1 *************** *** 1493,1497 **** #endif ! view->SetItemSize(length, width, true); view->SetItemRotation(_rotation, point); view->DrawItem(mtype, point, spec); --- 1493,1509 ---- #endif ! landscapeHeight_t height; ! planLength_t spread; ! if((GetMaterialType() & kMajorMaterialType) == kMaterialTypePlant) ! { ! short minYear, maxYear, primaryYear; ! ! view->GetYearsDisplayed(minYear, maxYear, primaryYear); ! GetPlantDimensions(&height, &spread, primaryYear); ! } ! else ! GetLatestPlantDimensions(&height, &spread); ! ! view->SetItemSize(width, length, height, true); view->SetItemRotation(_rotation, point); view->DrawItem(mtype, point, spec); *************** *** 1594,1597 **** --- 1606,1613 ---- if((GetMaterialType() & kMajorMaterialType) == kMaterialTypePlant) { + landscapeHeight_t height; + planLength_t spread; + GetPlantDimensions(&height, &spread, primaryYear); + if(state->GetBoolPref(kPlanFullSize)) { *************** *** 1600,1609 **** else { - landscapeHeight_t height; - planLength_t spread; - GetPlantDimensions(&height, &spread, primaryYear); actualSize = spread; } ! view->SetItemPlantSize(actualSize, actualSize, recommendedSize); } } --- 1616,1622 ---- else { actualSize = spread; } ! view->SetItemPlantSize(actualSize, actualSize, height, recommendedSize); } } |
|
From: Jeffrey B. <jlb...@us...> - 2006-10-29 03:31:27
|
Update of /cvsroot/igarden/Garden/source/PlanTool In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv14302 Modified Files: Tag: Release_branch_v1 PlanCanvasView.h PlanCanvasView.cpp Log Message: Add color, rectangles, and depth to the rendering. Add three new materials which make use of these features. Index: PlanCanvasView.h =================================================================== RCS file: /cvsroot/igarden/Garden/source/PlanTool/PlanCanvasView.h,v retrieving revision 1.11 retrieving revision 1.11.2.1 diff -C2 -d -r1.11 -r1.11.2.1 *** PlanCanvasView.h 22 Jun 2006 01:26:33 -0000 1.11 --- PlanCanvasView.h 29 Oct 2006 03:31:24 -0000 1.11.2.1 *************** *** 70,76 **** void StartItemDraw(XGView *view, planScale_t scale, planScale_t defaultScale); void EndItemDraw(); ! void SetItemSize(double height, double width, bool forcePastBounds = false); void SetItemName(String &name, RGGLBitmapFont *bitmapFont); ! void SetItemPlantSize(double height, double width, double fullSpread); void SetItemColors(Color foliageColor, XGSDynArray<Color> &otherColor, unsigned char* halftone); void SetItemPicture(CGWorld *picture, UInt32 pictureHeight, UInt32 pictureWidth); --- 70,76 ---- void StartItemDraw(XGView *view, planScale_t scale, planScale_t defaultScale); void EndItemDraw(); ! void SetItemSize(double xSize, double ySize, double zSize, bool forcePastBounds/* = false*/); void SetItemName(String &name, RGGLBitmapFont *bitmapFont); ! void SetItemPlantSize(double xSize, double ySize, double zSize, double fullSpread); void SetItemColors(Color foliageColor, XGSDynArray<Color> &otherColor, unsigned char* halftone); void SetItemPicture(CGWorld *picture, UInt32 pictureHeight, UInt32 pictureWidth); Index: PlanCanvasView.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/PlanTool/PlanCanvasView.cpp,v retrieving revision 1.13 retrieving revision 1.13.2.1 diff -C2 -d -r1.13 -r1.13.2.1 *** PlanCanvasView.cpp 18 Sep 2005 12:41:51 -0000 1.13 --- PlanCanvasView.cpp 29 Oct 2006 03:31:24 -0000 1.13.2.1 *************** *** 549,555 **** /// SetItemSize // ! void PlanCanvasView::SetItemSize(double height, double width, bool forcePastBounds) { ! _curMD->SetSize(height, width, forcePastBounds); } --- 549,555 ---- /// SetItemSize // ! void PlanCanvasView::SetItemSize(double xSize, double ySize, double zSize, bool forcePastBounds) { ! _curMD->SetSize(xSize, ySize, zSize, forcePastBounds); } *************** *** 565,571 **** /// SetPlantSize // ! void PlanCanvasView::SetItemPlantSize(double height, double width, double fullSpread) { ! _curMD->SetPlantSize(height, width, fullSpread); } --- 565,571 ---- /// SetPlantSize // ! void PlanCanvasView::SetItemPlantSize(double xSize, double ySize, double zSize, double fullSpread) { ! _curMD->SetPlantSize(xSize, ySize, zSize, fullSpread); } |
|
From: Jeffrey B. <jlb...@us...> - 2006-10-29 03:16:03
|
Update of /cvsroot/igarden/Garden/source/resources/2DSymbols In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv7679 Added Files: Tag: Release_branch_v1 Bench1.svg Bluestone.svg Decking.svg Log Message: Initial checkin --- NEW FILE: Bluestone.svg --- <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="744.09448819" height="1052.3622047" id="svg2" sodipodi:version="0.32" inkscape:version="0.44" sodipodi:docbase="/Development/GardenSketch/GardenSketch_Release1.0/iGarden/Garden/source/resources/2DSymbols" sodipodi:docname="Bluestone.svg"> <defs id="defs4" /> <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" gridtolerance="10000" guidetolerance="10" objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.86180109" inkscape:cx="375" inkscape:cy="528.05494" inkscape:document-units="px" inkscape:current-layer="layer1" showgrid="true" gridspacingx="0.02in" gridspacingy="0.02in" grid_units="in" inkscape:grid-points="true" inkscape:window-width="1138" inkscape:window-height="964" inkscape:window-x="0" inkscape:window-y="22" /> <metadata id="metadata7"> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> </cc:Work> </rdf:RDF> </metadata> <g inkscape:label="Layer 1" inkscape:groupmode="layer" id="layer1"> <rect style="fill:#d4cfc0;fill-opacity:1;stroke:black;stroke-width:1.09099996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect1872" width="109.61084" height="53.290119" x="54" y="891.07208" /> <rect style="fill:#d4cfc0;fill-opacity:1;stroke:black;stroke-width:1.09099996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect2760" width="55.073895" height="108.70988" x="54" y="782.36218" /> <rect style="fill:#d4cfc0;fill-opacity:1;stroke:black;stroke-width:1.09099996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect2762" width="54" height="54" x="108" y="836.36218" /> <rect style="fill:#d4cfc0;fill-opacity:1;stroke:black;stroke-width:1.09099996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect2764" width="90" height="54" x="108" y="782.36218" /> <rect style="fill:#d4cfc0;fill-opacity:1;stroke:black;stroke-width:1.09099996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect2766" width="36" height="72" x="162" y="836.36218" /> <rect style="fill:#d4cfc0;fill-opacity:1;stroke:black;stroke-width:1.09099996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect2768" width="108" height="36" x="162" y="908.36218" /> <rect style="fill:#d4cfc0;fill-opacity:1;stroke:black;stroke-width:1.09099996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect2770" width="72" height="36" x="270" y="908.36218" /> <rect style="fill:#d4cfc0;fill-opacity:1;stroke:black;stroke-width:1.09099996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect2772" width="144" height="54" x="198" y="854.36218" /> <rect style="fill:#d4cfc0;fill-opacity:1;stroke:black;stroke-width:1.09099996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect2774" width="36" height="108" x="306" y="746.36218" /> <rect style="fill:#d4cfc0;fill-opacity:1;stroke:black;stroke-width:1.09099996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect2776" width="108" height="54" x="198" y="800.36218" /> <rect style="fill:#d4cfc0;fill-opacity:1;stroke:black;stroke-width:1.09099996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect2778" width="36" height="54" x="270" y="746.36218" /> <rect style="fill:#d4cfc0;fill-opacity:1;stroke:black;stroke-width:1.09099996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect2780" width="72" height="54" x="198" y="746.36218" /> <rect style="fill:#d4cfc0;fill-opacity:1;stroke:black;stroke-width:1.09099996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect2782" width="90" height="72" x="54" y="710.36218" /> <rect style="fill:#d4cfc0;fill-opacity:1;stroke:black;stroke-width:1.09099996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect2784" width="54" height="72" x="144" y="710.36218" /> <rect style="fill:#d4cfc0;fill-opacity:1;stroke:black;stroke-width:1.09099996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect2786" width="144" height="72" x="198" y="674.36218" /> <rect style="fill:#d4cfc0;fill-opacity:1;stroke:black;stroke-width:1.09099996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect2788" width="72" height="72" x="126" y="638.36218" /> <rect style="fill:#d4cfc0;fill-opacity:1;stroke:black;stroke-width:1.09099996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect2790" width="72" height="126" x="54" y="584.36218" /> <rect style="fill:#d4cfc0;fill-opacity:1;stroke:black;stroke-width:0.86110967;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect2792" width="89.479179" height="90.229889" x="252.09026" y="584.24725" /> <rect style="fill:#d4cfc0;fill-opacity:1;stroke:black;stroke-width:1.09099996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect2794" width="72" height="54" x="126" y="584.36218" /> <rect style="fill:#d4cfc0;fill-opacity:1;stroke:black;stroke-width:1.09099996;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect2796" width="54" height="90" x="198" y="584.36218" /> </g> </svg> --- NEW FILE: Decking.svg --- <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="744.09448819" height="1052.3622047" id="svg2" rgminx="6ft" rgminy="1ft" rgmaxx="0" rgmaxy="0" startxsize="6ft" startysize="1ft" sodipodi:version="0.32" inkscape:version="0.44" sodipodi:docbase="/Development/GardenSketch/GardenSketch_Release1.0/iGarden/Garden/source/resources/2DSymbols" sodipodi:docname="Decking.svg"> <metadata id="metadata9"> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> </cc:Work> </rdf:RDF> </metadata> <defs id="defs7" /> <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" gridtolerance="10000" guidetolerance="10" objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.98994949" inkscape:cx="91.956333" inkscape:cy="1064.0185" inkscape:document-units="px" inkscape:current-layer="layer1" inkscape:window-width="1310" inkscape:window-height="1097" inkscape:window-x="0" inkscape:window-y="22" /> <g inkscape:label="GROWXREPY" inkscape:groupmode="layer" id="layer1"> <rect style="fill:#ab8578;fill-opacity:1;stroke:black;stroke-width:2.09100008;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0" id="rect1872" width="611.42859" height="51.42857" x="60" y="55.219326" /> <rect style="fill-opacity:1;stroke:black;stroke-width:2.09100008;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0;fill:#ab8578" id="rect1874" width="611.42859" height="51.42857" x="59.999992" y="115.21933" /> <rect style="fill:none;fill-opacity:0;stroke:white;stroke-width:2.09100008;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0" id="rect1873" width="611.14227" height="8.0812206" x="59.598999" y="105.84924" /> <rect style="fill:none;fill-opacity:0;stroke:white;stroke-width:2.09100008;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:0" id="rect1875" width="611.14227" height="8.0812206" x="60.104095" y="168.4787" /> </g> </svg> --- NEW FILE: Bench1.svg --- <?xml version="1.0" encoding="UTF-8" standalone="no"?> <!-- Created with Inkscape (http://www.inkscape.org/) --> <svg xmlns:dc="http://purl.org/dc/elements/1.1/" xmlns:cc="http://web.resource.org/cc/" xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" xmlns:svg="http://www.w3.org/2000/svg" xmlns="http://www.w3.org/2000/svg" xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" width="744.09448" height="1052.3622" id="svg12499" rgminx="4ft" rgminy="20in" rgmaxx="4ft" rgmaxy="20in" startxsize="4ft" startysize="20in `" sodipodi:version="0.32" inkscape:version="0.44" version="1.0" sodipodi:docbase="/Development/GardenSketch/iGarden/Garden/source/resources/2DSymbols" sodipodi:docname="Bench1.svg"> <defs id="defs12501" /> <sodipodi:namedview id="base" pagecolor="#ffffff" bordercolor="#666666" borderopacity="1.0" gridtolerance="10000" guidetolerance="10" objecttolerance="10" inkscape:pageopacity="0.0" inkscape:pageshadow="2" inkscape:zoom="0.75024142" inkscape:cx="375" inkscape:cy="520" inkscape:document-units="px" inkscape:current-layer="layer1" width="8.2677165in" height="11.692913in" units="in" showgrid="true" gridspacingx="0.011111111in" gridspacingy="0.011111111in" grid_units="in" inkscape:window-width="1298" inkscape:window-height="1032" inkscape:window-x="20" inkscape:window-y="42" /> <metadata id="metadata12504"> <rdf:RDF> <cc:Work rdf:about=""> <dc:format>image/svg+xml</dc:format> <dc:type rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> </cc:Work> </rdf:RDF> </metadata> <g inkscape:label="GROWX" inkscape:groupmode="layer" id="layer1"> <rect style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:1.29275596;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect13414" width="458.70724" height="16.941099" x="120.64638" y="74.774712" /> <rect y="93.008568" x="120.64637" height="16.941099" width="458.70724" id="rect15188" style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:1.29275596;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:1.29275596;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect15190" width="458.70724" height="16.941099" x="120.64637" y="113.00857" /> <rect y="133.00858" x="120.64637" height="16.941099" width="458.70724" id="rect15192" style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:1.29275596;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:1.29275596;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect15194" width="458.70724" height="16.941099" x="120.64637" y="153.00858" /> <rect y="173.00858" x="120.64637" height="16.941099" width="458.70724" id="rect15196" style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:1.29275596;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:1.29275596;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect15198" width="458.70724" height="16.941099" x="120.64637" y="193.00858" /> <rect style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:0.97712946;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect15200" width="38.265701" height="159.30699" x="80.488564" y="52.566628" /> <rect y="52.566635" x="580.48859" height="159.30699" width="38.265701" id="rect15202" style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:0.97712946;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" /> <rect style="fill:#b0a787;fill-opacity:1;stroke:black;stroke-width:1.18030524;stroke-miterlimit:4;stroke-dasharray:none;stroke-opacity:1" id="rect15204" width="538.8197" height="37.462837" x="80.590141" y="212.95235" /> </g> </svg> |
|
From: Jeffrey B. <jlb...@us...> - 2006-10-18 02:26:24
|
Update of /cvsroot/igarden/Garden/source/PlanTool In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6698 Modified Files: PlanView.cpp PlanTool.cpp Log Message: Change #error to #warning and other portability cleanup Index: PlanTool.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/PlanTool/PlanTool.cpp,v retrieving revision 1.25 retrieving revision 1.26 diff -C2 -d -r1.25 -r1.26 *** PlanTool.cpp 15 Oct 2006 00:58:13 -0000 1.25 --- PlanTool.cpp 18 Oct 2006 02:26:21 -0000 1.26 *************** *** 57,61 **** _toolCursor(NULL), #else ! #error TO_BE_PORTED #endif _contentDown(false), _clickCount(0), _currentAction(NULL) --- 57,61 ---- _toolCursor(NULL), #else ! #warning ***Won't support Tool Cursors #endif _contentDown(false), _clickCount(0), _currentAction(NULL) Index: PlanView.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/PlanTool/PlanView.cpp,v retrieving revision 1.52 retrieving revision 1.53 diff -C2 -d -r1.52 -r1.53 *** PlanView.cpp 15 Oct 2006 01:39:53 -0000 1.52 --- PlanView.cpp 18 Oct 2006 02:26:21 -0000 1.53 *************** *** 505,509 **** aglReportError (); #else ! #error TO_BE_PORTED #endif } --- 505,509 ---- aglReportError (); #else ! #warning ***Won't support OpenGL on PlanView #endif } |
|
From: Jeffrey B. <jlb...@us...> - 2006-10-18 02:26:16
|
Update of /cvsroot/igarden/Garden/source/SourceMaterialDB In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6647 Modified Files: PlantSelection.cpp QueryDialog.cpp Log Message: Change #error to #warning and other portability cleanup Index: PlantSelection.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/PlantSelection.cpp,v retrieving revision 1.30 retrieving revision 1.31 diff -C2 -d -r1.30 -r1.31 *** PlantSelection.cpp 15 Oct 2006 01:15:26 -0000 1.30 --- PlantSelection.cpp 18 Oct 2006 02:26:12 -0000 1.31 *************** *** 200,203 **** --- 200,208 ---- + static void findImage(XGFileSpecifier &spec, String &path) + { + CalcPathPictureSpec(spec, path.c_str(), '/' ); + } + // --------------------------------------------------------------------------- /// BuildLowerPane *************** *** 207,210 **** --- 212,216 ---- RGHypertextView *descript = dynamic_cast<RGHypertextView*>(_window->FindViewByID(kLowerDescription)); AssertValidView(descript); + descript->SetImageFinder(findImage); descript->HideView(); } Index: QueryDialog.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/SourceMaterialDB/QueryDialog.cpp,v retrieving revision 1.29 retrieving revision 1.30 diff -C2 -d -r1.29 -r1.30 *** QueryDialog.cpp 15 Oct 2006 01:17:21 -0000 1.29 --- QueryDialog.cpp 18 Oct 2006 02:26:12 -0000 1.30 *************** *** 1637,1641 **** } #else ! #error TO_BE_PORTED #endif } --- 1637,1641 ---- } #else ! #warning ***Won't support Query Adverts #endif } |
|
From: Jeffrey B. <jlb...@us...> - 2006-10-18 02:26:04
|
Update of /cvsroot/igarden/Garden/source/Plugins In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6315 Modified Files: DefaultRenderPlugin.cpp PluginUtils.cpp PluginManager.cpp Log Message: Change #error to #warning and other portability cleanup Index: DefaultRenderPlugin.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Plugins/DefaultRenderPlugin.cpp,v retrieving revision 1.18 retrieving revision 1.19 diff -C2 -d -r1.18 -r1.19 *** DefaultRenderPlugin.cpp 15 Oct 2006 01:05:13 -0000 1.18 --- DefaultRenderPlugin.cpp 18 Oct 2006 02:26:02 -0000 1.19 *************** *** 71,75 **** } #else ! #error TO_BE_PORTED #endif --- 71,75 ---- } #else ! #warning ***Won't support DefaultRenderPlugin #endif *************** *** 95,99 **** } #else ! #error TO_BE_PORTED #endif } --- 95,99 ---- } #else ! #warning ***Won't support DefaultRenderPlugin #endif } Index: PluginUtils.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Plugins/PluginUtils.cpp,v retrieving revision 1.22 retrieving revision 1.23 diff -C2 -d -r1.22 -r1.23 *** PluginUtils.cpp 15 Oct 2006 01:06:21 -0000 1.22 --- PluginUtils.cpp 18 Oct 2006 02:26:02 -0000 1.23 *************** *** 67,71 **** spec = macSpec; #else ! #error TO_BE_PORTED #endif } --- 67,71 ---- spec = macSpec; #else ! #warning ***Won't support CalcPictureSpec #endif } *************** *** 268,272 **** } #else ! #error TO_BE_PORTED #endif --- 268,272 ---- } #else ! #warning ***Won't support OptCreateFileFromPICTResource #endif Index: PluginManager.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Plugins/PluginManager.cpp,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** PluginManager.cpp 15 Oct 2006 01:01:50 -0000 1.12 --- PluginManager.cpp 18 Oct 2006 02:26:02 -0000 1.13 *************** *** 152,157 **** AddOnePlugin(kSearchPlugin, false, new SearchTestingPlugin()); #endif #else ! #error TO_BE_PORTED #endif } --- 152,158 ---- AddOnePlugin(kSearchPlugin, false, new SearchTestingPlugin()); #endif + #else ! #warning ***Won't support Plugins #endif } *************** *** 219,223 **** } #else ! #error TO_BE_PORTED #endif } --- 220,224 ---- } #else ! #warning ***Won't support Plugins #endif } *************** *** 286,291 **** --- 287,296 ---- { _plugins[n] = new XGSDynArray<pluginData_t>(); + #if OPT_MACOS _pluginTypes[n] = NULL; MyAssert(_plugins[n] != NULL); + #else + memset(&(_pluginTypes[n]), 0, sizeof(CFUUIDRef)); + #endif } |
|
From: Jeffrey B. <jlb...@us...> - 2006-10-18 02:25:56
|
Update of /cvsroot/igarden/Garden/source/Document In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv6302 Modified Files: FlexCountCell.cpp MaterialPictSelectDialog.cpp CGardenForm.cp Log Message: Change #error to #warning and other portability cleanup Index: FlexCountCell.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/FlexCountCell.cpp,v retrieving revision 1.6 retrieving revision 1.7 diff -C2 -d -r1.6 -r1.7 *** FlexCountCell.cpp 11 Oct 2006 01:36:11 -0000 1.6 --- FlexCountCell.cpp 18 Oct 2006 02:25:53 -0000 1.7 *************** *** 376,380 **** } #else ! #error TO_BE_PORTED #endif --- 376,380 ---- } #else ! #warning ***Won't support FlexCountCell #endif *************** *** 440,444 **** _parent->Update(); #else ! #error TO_BE_PORTED #endif } --- 440,444 ---- _parent->Update(); #else ! #warning ***Won't support FlexCountCell #endif } Index: MaterialPictSelectDialog.cpp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/MaterialPictSelectDialog.cpp,v retrieving revision 1.20 retrieving revision 1.21 diff -C2 -d -r1.20 -r1.21 *** MaterialPictSelectDialog.cpp 8 Oct 2006 00:43:11 -0000 1.20 --- MaterialPictSelectDialog.cpp 18 Oct 2006 02:25:53 -0000 1.21 *************** *** 298,302 **** if(urlLen == 0) { ! clip->FromClipboard(hdl, kScrapFlavorTypeText); urlLen = hdl.GetSize(); } --- 298,302 ---- if(urlLen == 0) { ! clip->FromClipboard(hdl, kClipText); urlLen = hdl.GetSize(); } Index: CGardenForm.cp =================================================================== RCS file: /cvsroot/igarden/Garden/source/Document/CGardenForm.cp,v retrieving revision 1.39 retrieving revision 1.40 diff -C2 -d -r1.39 -r1.40 *** CGardenForm.cp 15 Oct 2006 00:52:01 -0000 1.39 --- CGardenForm.cp 18 Oct 2006 02:25:53 -0000 1.40 *************** *** 807,812 **** return -1; else - #else - #error TO_BE_PORTED #endif return 0; --- 807,810 ---- |
|
From: Jeffrey B. <jlb...@us...> - 2006-10-18 02:17:40
|
Update of /cvsroot/igarden/CommonSource/YAAFExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv2969 Modified Files: RGCompression.cpp Log Message: Fix a #if Index: RGCompression.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGCompression.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RGCompression.cpp 18 Oct 2006 01:16:11 -0000 1.5 --- RGCompression.cpp 18 Oct 2006 02:17:37 -0000 1.6 *************** *** 28,32 **** #undef __AVAILABILITYMACROS__ ! #if MAC_OS #include <AvailabilityMacros.h> #include "RedstartGarden.h" --- 28,32 ---- #undef __AVAILABILITYMACROS__ ! #if OPT_MACOS #include <AvailabilityMacros.h> #include "RedstartGarden.h" |
|
From: Jeffrey B. <jlb...@us...> - 2006-10-18 02:17:22
|
Update of /cvsroot/igarden/CommonSource/YAAFExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv2926 Modified Files: RGGLView.h RGGLView.cpp RGGLBitmapFont.h Log Message: Clean up include order Index: RGGLView.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGGLView.cpp,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** RGGLView.cpp 9 Oct 2006 12:23:59 -0000 1.14 --- RGGLView.cpp 18 Oct 2006 02:17:14 -0000 1.15 *************** *** 32,35 **** --- 32,36 ---- #include "RGGLView.h" + #include "RGGLBitmapFont.h" #include "CGWorld.h" #include "MyAssert.h" Index: RGGLBitmapFont.h =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGGLBitmapFont.h,v retrieving revision 1.10 retrieving revision 1.11 diff -C2 -d -r1.10 -r1.11 *** RGGLBitmapFont.h 15 Oct 2006 01:20:43 -0000 1.10 --- RGGLBitmapFont.h 18 Oct 2006 02:17:18 -0000 1.11 *************** *** 41,44 **** --- 41,45 ---- #include <XGDynArray.h> #include <XGFont.h> + #include "RGGLView.h" using namespace yaaf; Index: RGGLView.h =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGGLView.h,v retrieving revision 1.12 retrieving revision 1.13 diff -C2 -d -r1.12 -r1.13 *** RGGLView.h 15 Oct 2006 01:20:43 -0000 1.12 --- RGGLView.h 18 Oct 2006 02:17:14 -0000 1.13 *************** *** 131,135 **** void EndTesselation(); ! RGGLBitmapFont* CreateBitmapFont(XGFont *fontPtr); private: --- 131,135 ---- void EndTesselation(); ! class RGGLBitmapFont* CreateBitmapFont(XGFont *fontPtr); private: *************** *** 154,158 **** bool _active; static GLUtesselator *_tessObj; ! XGDynArray<RGGLBitmapFont *> _allFonts; }; --- 154,158 ---- bool _active; static GLUtesselator *_tessObj; ! XGDynArray<class RGGLBitmapFont *> _allFonts; }; |
|
From: Jeffrey B. <jlb...@us...> - 2006-10-18 01:18:09
|
Update of /cvsroot/igarden/CommonSource/YAAFExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12309 Modified Files: RGSlideControl.h RGSlideControl.cpp Log Message: Move non-Mac scroll calls to RGSlideContro Index: RGSlideControl.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGSlideControl.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RGSlideControl.cpp 8 Oct 2006 00:08:08 -0000 1.4 --- RGSlideControl.cpp 18 Oct 2006 01:18:07 -0000 1.5 *************** *** 752,754 **** --- 752,1178 ---- } + /************************************************************************/ + /* */ + /* Windows Event Implementation */ + /* */ + /************************************************************************/ + + #if OPT_WINOS + + BEGINDISPATCH(XGScrollBar,XGView) + DISPATCHTABLE(KXGWInternal,XGScrollBar::DoWInternal) + ENDDISPATCH + + /* XGScrollBar::DoWInternal + * + * This is where messages that are received from my + * control is sent + */ + + long XGSlideControl::DoWInternal(long,void *ptr) + { + XGSWInternalRecord *r; + + r = (XGSWInternalRecord *)ptr; + + /* + * How to handle this + */ + + if ((r->msg == WM_HSCROLL) || (r->msg == WM_VSCROLL)) { + /* + * I've been clicked on. Scroll. This does this cheap. + */ + + switch (LOWORD(r->wp)) { + case SB_LEFT: + SetValue(fMinValue); + break; + case SB_RIGHT: + SetValue(fMaxValue); + break; + case SB_LINELEFT: + SetValue(GetValue() - GetStepSize()); + break; + case SB_LINERIGHT: + SetValue(GetValue() + GetStepSize()); + break; + case SB_PAGELEFT: + SetValue(GetValue() - GetPageSize()); + break; + case SB_PAGERIGHT: + SetValue(GetValue() + GetPageSize()); + break; + case SB_THUMBPOSITION: + case SB_THUMBTRACK: + SetValue(HIWORD(r->wp) * fScale); + break; + } + return 0; + } + return -1; + } + + #endif + + /************************************************************************/ + /* */ + /* X scollbar support */ + /* */ + /************************************************************************/ + + #if OPT_XWIN + + /*$ ScaleToPixel + * + * Given a minimum and maximum pixel value and a long integer + * value and maximum, this returns the pixel value that represents + * the specified position along the scale + */ + + static short ScaleToPixel(short minpix, short maxpix, long val, long max) + { + long scale; + + /* + * Scale down to guarentee the (maxpix - minpix)*val + * operation doesn't overflow. The disadvantage is that + * for scrollbars that are 10,000 pixels tall, this can + * be less than smooth. But then, a 10,000 pixel screen + * at 100 pixels/inch would be 8 feet call--and who is + * going to have an 8 foot monitor? + */ + + scale = (16383 + max) / 16384; + if (scale <= 0) return minpix; // ??? + val /= scale; + max /= scale; + return (short)(minpix + + (((maxpix - minpix) * val) / max)); + } + + /*$ XGScrollBar::ThumbWidth + * + * Get the width of the thumb + */ + + short XGSlideControl::ThumbWidth() + { + Rect r; + short widthx,widthy; + short width; + long value; + Rect thumb; + + r = GetContentRect(); + widthx = r.right - r.left; + widthy = r.bottom - r.top; + + if (widthx > widthy) { + widthx -= widthy*2; + width = ScaleToPixel(0,widthx,fPage,fPage + fMaxValue - fMinValue); + } else { + widthy -= widthx*2; + width = ScaleToPixel(0,widthy,fPage,fPage + fMaxValue - fMinValue); + } + + if (width < 8) width = 8; + return width; + } + + /*$ XGScrollBar::CalcScrollRect + * + * Calculate the scrollbar rectangle borders + */ + + Rect XGSlideControl::CalcScrollRect(short index) + { + Rect r = GetContentRect(); + short width,tmp; + short ttop,tbottom; + short thumb = ThumbWidth(); + + width = r.right - r.left; + tmp = r.bottom - r.top; + if (tmp < width) { + width = tmp; + + /* + * Bar is on it's side + */ + + switch (index) { + case 0: // left arrow + r.right = r.left + width; + break; + + case 1: // Left margin + r.right = ScaleToPixel(r.left + width, + r.right - width - thumb, + fValue - fMinValue, + fMaxValue - fMinValue); + r.left += width; + break; + + case 2: // thumb + tmp = r.left; + r.left = ScaleToPixel(r.left + width, + r.right - width - thumb, + fValue - fMinValue, + fMaxValue - fMinValue); + r.right = r.left + thumb; + break; + + case 3: // right margin + r.left = thumb + + ScaleToPixel(r.left + width, + r.right - width - thumb, + fValue - fMinValue, + fMaxValue - fMinValue); + r.right -= width; + break; + + case 4: // right arrow + r.left = r.right - width; + break; + } + } else { + /* + * Bar is upright + */ + + switch (index) { + case 0: // top arrow + r.bottom = r.top + width; + break; + + case 1: // Left margin + r.bottom = ScaleToPixel(r.top + width, + r.bottom - width - thumb, + fValue - fMinValue, + fMaxValue - fMinValue); + r.top += width; + break; + + case 2: // thumb + tmp = r.top; + r.top = ScaleToPixel(r.top + width, + r.bottom - width - thumb, + fValue - fMinValue, + fMaxValue - fMinValue); + r.bottom = r.top + thumb; + break; + + case 3: // bottom margin + r.top = thumb + + ScaleToPixel(r.top + width, + r.bottom - width - thumb, + fValue - fMinValue, + fMaxValue - fMinValue); + r.bottom -= width; + break; + + case 4: // bottom arrow + r.top = r.bottom - width; + break; + } + } + + return r; + } + + /*$ XGScrollBar::DrawScrollBar + * + * Draw the scrollbar itself. This also hilites the specified + * part. + */ + + void XGSlideControl::DrawScrollBar(short part) + { + Rect r; + XGDraw draw(this); + int x,y; + bool width; + + r = GetContentRect(); + width = (r.right - r.left > r.bottom - r.top); + + /* + * If this thing is empty, this draws an empty rectangle. + */ + + if (fMaxValue <= fMinValue) { + draw.Draw3DRect(r,KXGEFrame); + InsetRect(&r,1,1); + draw.Draw3DRect(r,KXGEBackground); + return; + } + + /* + * Draw the top arrow + */ + + r = CalcScrollRect(0); + draw.Draw3DRect(r,KXGEBackground); + if (part == 0) { + draw.Draw3DRect(r,KXGEInButton); + yaaf::OffsetRect(&r,1,1); + } else { + draw.Draw3DRect(r,KXGEButton); + } + + if (width) { + draw.MoveTo((r.left*2+r.right)/3,(r.top+r.bottom)/2); + draw.LineTo((r.left+2*r.right)/3,(r.top*2+r.bottom)/3); + draw.LineTo((r.left+2*r.right)/3,(r.top+2*r.bottom)/3); + draw.LineTo((r.left*2+r.right)/3,(r.top+r.bottom)/2); + } else { + draw.MoveTo((r.left+r.right)/2,(r.top*2+r.bottom)/3); + draw.LineTo((r.left*2+r.right)/3,(r.top+2*r.bottom)/3); + draw.LineTo((r.left+2*r.right)/3,(r.top+2*r.bottom)/3); + draw.LineTo((r.left+r.right)/2,(r.top*2+r.bottom)/3); + } + + /* + * Draw the bottom arrow + */ + + r = CalcScrollRect(4); + draw.Draw3DRect(r,KXGEBackground); + if (part == 4) { + draw.Draw3DRect(r,KXGEInButton); + yaaf::OffsetRect(&r,1,1); + } else { + draw.Draw3DRect(r,KXGEButton); + } + + if (width) { + draw.MoveTo((r.left+2*r.right)/3,(r.top+r.bottom)/2); + draw.LineTo((r.left*2+r.right)/3,(r.top*2+r.bottom)/3); + draw.LineTo((r.left*2+r.right)/3,(r.top+2*r.bottom)/3); + draw.LineTo((r.left+2*r.right)/3,(r.top+r.bottom)/2); + } else { + draw.MoveTo((r.left+r.right)/2,(r.top+2*r.bottom)/3); + draw.LineTo((r.left*2+r.right)/3,(r.top*2+r.bottom)/3); + draw.LineTo((r.left+2*r.right)/3,(r.top*2+r.bottom)/3); + draw.LineTo((r.left+r.right)/2,(r.top+2*r.bottom)/3); + } + + /* + * Draw the top border + */ + + r = CalcScrollRect(1); + if (width) InsetRect(&r,-1,0); + else InsetRect(&r,0,-1); + draw.Draw3DRect(r,KXGEFrame); + InsetRect(&r,1,1); + draw.Draw3DRect(r,KXGEBackground); + if (part == 1) { + draw.Draw3DRect(r,KXGEInset); + } + + /* + * Draw the bottom border + */ + + r = CalcScrollRect(3); + if (width) InsetRect(&r,-1,0); + else InsetRect(&r,0,-1); + draw.Draw3DRect(r,KXGEFrame); + InsetRect(&r,1,1); + draw.Draw3DRect(r,KXGEBackground); + if (part == 3) { + draw.Draw3DRect(r,KXGEInset); + } + + /* + * Draw the thumb + */ + + r = CalcScrollRect(2); + draw.Draw3DRect(r,KXGEBackground); + if (part == 2) { + draw.Draw3DRect(r,KXGEInButton); + } else { + draw.Draw3DRect(r,KXGEButton); + } + } + + /*$ XGScrollBar::UpdateTrackValue + * + * Update the trackbar's value based on the position of the mouse. + * + * NOTE: I gotta figure out how to deal with very large values. + * Right now, (fMaxValue - fMinValue) * pixel size cannot exceed + * the largest signed long integer value. + */ + + void XGSlideControl::UpdateTrackValue(Point where) + { + XGSValue v; + Rect r; + short widthx,widthy; + long value; + short thumb; + + r = GetContentRect(); + widthx = r.right - r.left; + widthy = r.bottom - r.top; + thumb = ThumbWidth(); + + /* + * Calculate value if thumb was in middle + */ + + if (widthx > widthy) { + InsetRect(&r,widthy,0); + InsetRect(&r,thumb/2,0); + if (r.right <= r.left) value = fMinValue; + else { + value = fMinValue + + (((fMaxValue - fMinValue) * (where.h - r.left))/(r.right-r.left)); + } + } else { + InsetRect(&r,0,widthx); + InsetRect(&r,0,thumb/2); + if (r.bottom <= r.top) value = fMinValue; + else { + value = fMinValue + + (((fMaxValue - fMinValue) * (where.v - r.top))/(r.bottom-r.top)); + } + } + + /* + * Peg + */ + + if (value > fMaxValue) value = fMaxValue; + if (value < fMinValue) value = fMinValue; + + /* + * Make sure the value is set correctly + */ + + if (value < fMinValue) value = fMinValue; + if (value > fMaxValue) value = fMaxValue; + + /* + * And send the messages indicating the value changed + */ + + if (value != fValue) { + DoDispatch(KXGSliderStart,GetViewID(),NULL); + v.slider = this; + v.oldVal = fValue; + v.newVal = value; + fValue = value; + DrawScrollBar(2); // draw the scroll bar in new pos + DoDispatch(KXGSliderValue,GetViewID(),(void *)&v); + } + } + + #endif + + } // namespace yaaf Index: RGSlideControl.h =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGSlideControl.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RGSlideControl.h 29 Jun 2005 01:50:09 -0000 1.3 --- RGSlideControl.h 18 Oct 2006 01:18:07 -0000 1.4 *************** *** 124,127 **** --- 124,145 ---- ControlHandle fControl; #endif + + #if OPT_WINOS + void AdjustScale(); + void LoadControl(); + + long fScale; + HWND fControl; + #endif + + #if OPT_XWIN + void DrawScrollBar(short part = -1); + Rect CalcScrollRect(short); + void UpdateTrackValue(Point); + short ThumbWidth(); + + bool fDown; + short fTrack; // what am I down on? + #endif }; |
|
From: Jeffrey B. <jlb...@us...> - 2006-10-18 01:17:17
|
Update of /cvsroot/igarden/CommonSource/yaaf/Libraries/yaaf_gui/sources In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv12186 Modified Files: AppMain.cpp Added Files: XGGlobals.cpp Log Message: Move globals from AppMain to XGGlobals Index: AppMain.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/yaaf/Libraries/yaaf_gui/sources/AppMain.cpp,v retrieving revision 1.2 retrieving revision 1.3 diff -C2 -d -r1.2 -r1.3 *** AppMain.cpp 9 Oct 2006 00:40:14 -0000 1.2 --- AppMain.cpp 18 Oct 2006 01:17:14 -0000 1.3 *************** *** 44,101 **** /************************************************************************/ /* */ - /* Internal globals */ - /* */ - /************************************************************************/ - - namespace yaaf { - - #if OPT_WINOS == 1 - - HINSTANCE _GInstance; - HINSTANCE _GPrevInstance; - LPSTR _GArgString; - int _GArgShow; - - char _GDDEAppName[256]; - char _GDDETopicName[256]; - - HWND _GMainWindow; - HWND _GMDIWindow; - HWND _GToolWindow; - - XGWindow *_GWindow; - XGView *_GView; - - char _GPopClass[32]; - char _GWindowClass[32]; - char _GToolClass[32]; - char _GMainClass[32]; - char _GFrameClass[32]; - char _GControlClass[32]; - char _GDlogClass[32]; - char _GCopyrightClass[32]; - XGView *_GToolView; - - #endif - - #if OPT_XWIN == 1 - - int _GArgC; - char **_GArgV; - Display *_GDisplay; - bool _GDialogFlag = false; - - #endif - - #if OPT_MACOS - - extern bool _GAppFrontmost; // frontmost application global - - #endif - - } // namespace yaaf - - /************************************************************************/ - /* */ /* Main entry point */ /* */ --- 44,47 ---- --- NEW FILE: XGGlobals.cpp --- /********************************************************************** YAAF is Copyright 1997-1999 by William Woody. Redistribution and use in source and binary forms, with or without modification, are permitted provided that the following conditions are met: Redistributions of source code must retain the above copyright notice, this list of conditions and the following disclaimer. Neither the name of the copyright holder or other contributors may be used to promote products derived from this software without specific written prior permission. THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE. Contact: wo...@al... Web page: http://www.pandawave.com/yaaf/ **********************************************************************/ #include <XConfig.h> // must be first to optimize compile on MSVC++ #include <XGAppCore.h> #if OPT_XWIN #include <stdio.h> #endif /************************************************************************/ /* */ /* Internal globals */ /* */ /************************************************************************/ namespace yaaf { #if OPT_WINOS == 1 HINSTANCE _GInstance; HINSTANCE _GPrevInstance; LPSTR _GArgString; int _GArgShow; char _GDDEAppName[256]; char _GDDETopicName[256]; HWND _GMainWindow; HWND _GMDIWindow; HWND _GToolWindow; XGWindow *_GWindow; XGView *_GView; char _GPopClass[32]; char _GWindowClass[32]; char _GToolClass[32]; char _GMainClass[32]; char _GFrameClass[32]; char _GControlClass[32]; char _GDlogClass[32]; char _GCopyrightClass[32]; XGView *_GToolView; #endif #if OPT_XWIN == 1 int _GArgC; char **_GArgV; Display *_GDisplay; bool _GDialogFlag = false; #endif #if OPT_MACOS extern bool _GAppFrontmost; // frontmost application global #endif } // namespace yaaf |
|
From: Jeffrey B. <jlb...@us...> - 2006-10-18 01:16:17
|
Update of /cvsroot/igarden/CommonSource/YAAFExtensions In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11778 Modified Files: RGClipboard.h PictureSelectDialog.cpp RGPanelSet.cpp RGTableCell.cpp RGCompression.cpp RGBackdropView.cpp RGClipboard.cpp RGHypertext.cpp RGPictPattern.cpp RGImageImportPane.cpp RGDateTime.cpp RGHypertext.h Log Message: Change #error to #warning to ease porting Index: PictureSelectDialog.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/PictureSelectDialog.cpp,v retrieving revision 1.16 retrieving revision 1.17 diff -C2 -d -r1.16 -r1.17 *** PictureSelectDialog.cpp 15 Oct 2006 01:16:03 -0000 1.16 --- PictureSelectDialog.cpp 18 Oct 2006 01:16:10 -0000 1.17 *************** *** 27,31 **** --- 27,33 ---- **********************************************************************/ + #if OPT_MACOS #include "RedstartGarden.h" + #endif #include "PictureSelectDialog.h" #include "CalendarView.h" *************** *** 223,226 **** --- 225,229 ---- #pragma mark RGDialog_Overrides + //******************************************* /// Setup Index: RGImageImportPane.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGImageImportPane.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RGImageImportPane.cpp 7 Oct 2006 23:59:27 -0000 1.4 --- RGImageImportPane.cpp 18 Oct 2006 01:16:11 -0000 1.5 *************** *** 171,175 **** } #else ! #error TO_BE_PORTED #endif InvalView(); --- 171,175 ---- } #else ! #warning ***Won't support ImageImportPane #endif InvalView(); *************** *** 259,263 **** --- 259,267 ---- PRECONDITION(SourceSpecified()); scaledRect = GetScaledRect(); + #if OPT_MACOS (void)GetNaturalSize(naturalSize); + #else + #warning ***Won't support ImageImportPane + #endif xScale = (double)(naturalSize.right - naturalSize.left) / (double)(scaledRect.right - scaledRect.left); yScale = (double)(naturalSize.bottom - naturalSize.top) / (double)(scaledRect.bottom - scaledRect.top); *************** *** 283,287 **** --- 287,295 ---- if(!GetSourceRect(naturalSize)) { + #if OPT_MACOS (void)GetNaturalSize(naturalSize); + #else + #warning ***Won't support ImageImportPane + #endif } xScale = (double)(naturalSize.right - naturalSize.left) / (double)(scaledRect.right - scaledRect.left); Index: RGBackdropView.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGBackdropView.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RGBackdropView.cpp 7 Oct 2006 23:50:14 -0000 1.3 --- RGBackdropView.cpp 18 Oct 2006 01:16:11 -0000 1.4 *************** *** 67,72 **** #if OPT_MACOS ::SetThemeBackground(rec.theme, draw.PixelDepth(), draw.IsColor()); - #else - #error TO_BE_PORTED #endif --- 67,70 ---- Index: RGDateTime.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGDateTime.cpp,v retrieving revision 1.15 retrieving revision 1.16 diff -C2 -d -r1.15 -r1.16 *** RGDateTime.cpp 7 Oct 2006 23:42:58 -0000 1.15 --- RGDateTime.cpp 18 Oct 2006 01:16:11 -0000 1.16 *************** *** 208,212 **** outString = tmp; #else ! #error TO_BE_PORTED #endif } --- 208,212 ---- outString = tmp; #else ! #warning ***Won't support DateStrings #endif } Index: RGTableCell.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGTableCell.cpp,v retrieving revision 1.48 retrieving revision 1.49 diff -C2 -d -r1.48 -r1.49 *** RGTableCell.cpp 7 Oct 2006 23:41:41 -0000 1.48 --- RGTableCell.cpp 18 Oct 2006 01:16:11 -0000 1.49 *************** *** 1279,1283 **** } #else ! #error TO_BE_PORTED #endif } --- 1279,1283 ---- } #else ! #warning ***Won't support inline close #endif } Index: RGClipboard.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGClipboard.cpp,v retrieving revision 1.8 retrieving revision 1.9 diff -C2 -d -r1.8 -r1.9 *** RGClipboard.cpp 7 Oct 2006 23:53:50 -0000 1.8 --- RGClipboard.cpp 18 Oct 2006 01:16:11 -0000 1.9 *************** *** 43,46 **** --- 43,50 ---- RGClipboard* RGClipboard::sClipboard = NULL; + #if OPT_XWIN + static XGHandle GClipboard; // defined in YAAF libraries + #endif + void RGClipboard::ToClipboard(XGHandle &data, long dataType) { *************** *** 213,217 **** return gw; #else ! #error TO_BE_PORTED #endif } --- 217,221 ---- return gw; #else ! #warning ***Won't support PICTFromClipboard #endif } *************** *** 335,339 **** return result; #else ! #error TO_BE_PORTED #endif } --- 339,343 ---- return result; #else ! #warning ***Won't support PictureKind on Clipboard #endif } Index: RGCompression.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGCompression.cpp,v retrieving revision 1.4 retrieving revision 1.5 diff -C2 -d -r1.4 -r1.5 *** RGCompression.cpp 9 Oct 2006 12:11:38 -0000 1.4 --- RGCompression.cpp 18 Oct 2006 01:16:11 -0000 1.5 *************** *** 30,36 **** #if MAC_OS #include <AvailabilityMacros.h> #endif #include "RGCompression.h" - #include "RedstartGarden.h" #include "CGWorld.h" #include <XGFileSpecifier.h> --- 30,36 ---- #if MAC_OS #include <AvailabilityMacros.h> + #include "RedstartGarden.h" #endif #include "RGCompression.h" #include "CGWorld.h" #include <XGFileSpecifier.h> *************** *** 70,74 **** delete [] compressPtr; #else ! #error TO_BE_PORTED #endif } --- 70,74 ---- delete [] compressPtr; #else ! #warning ***Won't support CompressFileJPEG #endif } *************** *** 135,139 **** return result; #else ! #error TO_BE_PORTED #endif } --- 135,139 ---- return result; #else ! #warning ***Won't support DecompressFile #endif } Index: RGHypertext.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGHypertext.cpp,v retrieving revision 1.28 retrieving revision 1.29 diff -C2 -d -r1.28 -r1.29 *** RGHypertext.cpp 15 Oct 2006 00:45:10 -0000 1.28 --- RGHypertext.cpp 18 Oct 2006 01:16:11 -0000 1.29 *************** *** 41,47 **** #if OPT_MACOS #include <quickdraw.h> #endif #include "MyAssert.h" - #include "PluginUtils.h" #include "CGWorld.h" #include "RGCompression.h" --- 41,47 ---- #if OPT_MACOS #include <quickdraw.h> + #include "PluginUtils.h" #endif #include "MyAssert.h" #include "CGWorld.h" #include "RGCompression.h" *************** *** 73,76 **** --- 73,82 ---- _scaleByPercent = 100; _lineHeight = 0; + _findImageFP = NULL; + } + + void RGHypertext::SetImageFinder(findImageFP proc) + { + _findImageFP = proc; } *************** *** 310,313 **** --- 316,321 ---- LineTo(_startX+pwidth-_scrollX, yPos-_scrollY); } + #elif OPT_XWIN + #warning ***Won't support Lines on hypertext #else #error TO_BE_PORTED *************** *** 768,773 **** } } ! else ! CalcPathPictureSpec(info.spec, filename.c_str(), '/'); info.top = static_cast<long>(_y); --- 776,782 ---- } } ! else if(_findImageFP != NULL) ! (*_findImageFP)(info.spec, filename); ! // CalcPathPictureSpec(info.spec, filename.c_str(), '/'); info.top = static_cast<long>(_y); Index: RGHypertext.h =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGHypertext.h,v retrieving revision 1.14 retrieving revision 1.15 diff -C2 -d -r1.14 -r1.15 *** RGHypertext.h 9 Oct 2006 12:17:56 -0000 1.14 --- RGHypertext.h 18 Oct 2006 01:16:11 -0000 1.15 *************** *** 164,167 **** --- 164,169 ---- } lineEntry_t; + typedef void (*findImageFP) (XGFileSpecifier &spec, String &path); + /************************************************************************/ /* */ *************** *** 177,183 **** class RGHypertext : public RGHypertextParser { ! public: RGHypertext(); virtual ~RGHypertext(); private: RGHypertext& RGHypertext::operator=(const RGHypertext& p); --- 179,186 ---- class RGHypertext : public RGHypertextParser { ! public: RGHypertext(); virtual ~RGHypertext(); + void SetImageFinder(findImageFP proc); private: RGHypertext& RGHypertext::operator=(const RGHypertext& p); *************** *** 286,289 **** --- 289,293 ---- short _scaleByPercent; XGDynArray<lineEntry_t> _entries; + findImageFP _findImageFP; }; Index: RGPanelSet.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGPanelSet.cpp,v retrieving revision 1.5 retrieving revision 1.6 diff -C2 -d -r1.5 -r1.6 *** RGPanelSet.cpp 8 Oct 2006 00:00:39 -0000 1.5 --- RGPanelSet.cpp 18 Oct 2006 01:16:11 -0000 1.6 *************** *** 93,97 **** return result; #else ! #error TO_BE_PORTED #endif } --- 93,97 ---- return result; #else ! #warning ***Won't support PanelSets #endif } *************** *** 113,117 **** return result; #else ! #error TO_BE_PORTED #endif } --- 113,117 ---- return result; #else ! #warning ***Won't support PanelSets #endif } Index: RGPictPattern.cpp =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGPictPattern.cpp,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RGPictPattern.cpp 8 Oct 2006 00:02:08 -0000 1.3 --- RGPictPattern.cpp 18 Oct 2006 01:16:11 -0000 1.4 *************** *** 92,98 **** r = (**p).picFrame; #else ! #error TO_BE_PORTED #endif ! height = r.bottom - r.top; width = r.right - r.left; --- 92,98 ---- r = (**p).picFrame; #else ! #warning ***Won't support XGPictPattern #endif ! height = r.bottom - r.top; width = r.right - r.left; Index: RGClipboard.h =================================================================== RCS file: /cvsroot/igarden/CommonSource/YAAFExtensions/RGClipboard.h,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** RGClipboard.h 5 Jun 2005 10:57:13 -0000 1.3 --- RGClipboard.h 18 Oct 2006 01:16:10 -0000 1.4 *************** *** 44,47 **** --- 44,57 ---- } pictureKind_t; + enum + { + #if OPT_MACOS + kClipText = kScrapFlavorTypeText + #elif OPT_XWIN + kClipText = 0 + #else + #error TO_BE_PORTED + #endif + }; /************************************************************************/ |
|
From: Jeffrey B. <jlb...@us...> - 2006-10-18 01:16:02
|
Update of /cvsroot/igarden/CommonSource/yaaf/YAAF.xcodeproj In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11442 Modified Files: project.pbxproj Log Message: Change #error to #warning to ease porting Index: project.pbxproj =================================================================== RCS file: /cvsroot/igarden/CommonSource/yaaf/YAAF.xcodeproj/project.pbxproj,v retrieving revision 1.3 retrieving revision 1.4 diff -C2 -d -r1.3 -r1.4 *** project.pbxproj 15 Oct 2006 01:21:35 -0000 1.3 --- project.pbxproj 18 Oct 2006 01:15:59 -0000 1.4 *************** *** 582,585 **** --- 582,590 ---- 49A357710AE12AA7000EEF84 /* XGBrowserControl.h in Headers */ = {isa = PBXBuildFile; fileRef = 49A3576D0AE12AA7000EEF84 /* XGBrowserControl.h */; }; 49A357720AE12AA7000EEF84 /* XGBrowserControl.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49A3576E0AE12AA7000EEF84 /* XGBrowserControl.cpp */; }; + 49AB0F9D0AE3BB8D00133EBA /* CGWorld.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 4931AEB50AC9E5BE0045D6B5 /* CGWorld.cpp */; }; + 49AB12180AE5A92500133EBA /* XGGlobals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49AB12170AE5A92500133EBA /* XGGlobals.cpp */; }; + 49AB12190AE5A92500133EBA /* XGGlobals.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49AB12170AE5A92500133EBA /* XGGlobals.cpp */; }; + 49AB122E0AE5AA0100133EBA /* CalendarView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49AB122D0AE5AA0100133EBA /* CalendarView.cpp */; }; + 49AB122F0AE5AA0100133EBA /* CalendarView.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49AB122D0AE5AA0100133EBA /* CalendarView.cpp */; }; 49CA160308B0C93D00FBA1F9 /* YAAF_FW-Info.plist in Resources */ = {isa = PBXBuildFile; fileRef = 49CA160208B0C93D00FBA1F9 /* YAAF_FW-Info.plist */; }; 49CA16FE08B179AD00FBA1F9 /* LibMain.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 49CA16D608B154C900FBA1F9 /* LibMain.cpp */; }; *************** *** 1091,1094 **** --- 1096,1101 ---- 49A3576D0AE12AA7000EEF84 /* XGBrowserControl.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; name = XGBrowserControl.h; path = ../YAAFExtensions/XGBrowserControl.h; sourceTree = SOURCE_ROOT; }; 49A3576E0AE12AA7000EEF84 /* XGBrowserControl.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = XGBrowserControl.cpp; path = ../YAAFExtensions/XGBrowserControl.cpp; sourceTree = SOURCE_ROOT; }; + 49AB12170AE5A92500133EBA /* XGGlobals.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; name = XGGlobals.cpp; path = Libraries/yaaf_gui/sources/XGGlobals.cpp; sourceTree = "<group>"; }; + 49AB122D0AE5AA0100133EBA /* CalendarView.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; name = CalendarView.cpp; path = ../CalendarView/CalendarView.cpp; sourceTree = SOURCE_ROOT; }; 49CA160208B0C93D00FBA1F9 /* YAAF_FW-Info.plist */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.xml; name = "YAAF_FW-Info.plist"; path = "Libraries/YAAF_FW-Info.plist"; sourceTree = "<group>"; }; 49CA16D608B154C900FBA1F9 /* LibMain.cpp */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.cpp.cpp; path = LibMain.cpp; sourceTree = "<group>"; }; *************** *** 1258,1261 **** --- 1265,1269 ---- 490E29950AD821D8005CE459 /* libGL.a */, 490E27EB0AD7D7EA005CE459 /* YAAF XWindows.dylib */, + 49AB12170AE5A92500133EBA /* XGGlobals.cpp */, ); sourceTree = "<group>"; *************** *** 1292,1295 **** --- 1300,1304 ---- 4931AEBB0AC9E5BE0045D6B5 /* CInternetConfig.h */, 4931AEBC0AC9E5BE0045D6B5 /* CalendarView.h */, + 49AB122D0AE5AA0100133EBA /* CalendarView.cpp */, 4931AEBD0AC9E5BE0045D6B5 /* DateSelectDialog.cpp */, 4931AEBE0AC9E5BE0045D6B5 /* DateSelectDialog.h */, *************** *** 2479,2482 **** --- 2488,2494 ---- 490E2A3D0AD82724005CE459 /* RGAreaFill.cpp in Sources */, 49A357700AE12AA7000EEF84 /* XGBrowserControl.cpp in Sources */, + 49AB0F9D0AE3BB8D00133EBA /* CGWorld.cpp in Sources */, + 49AB12190AE5A92500133EBA /* XGGlobals.cpp in Sources */, + 49AB122F0AE5AA0100133EBA /* CalendarView.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; *************** *** 2682,2685 **** --- 2694,2699 ---- 497426660ACA9C280093B1B3 /* CInternetConfig.cpp in Sources */, 49A357720AE12AA7000EEF84 /* XGBrowserControl.cpp in Sources */, + 49AB12180AE5A92500133EBA /* XGGlobals.cpp in Sources */, + 49AB122E0AE5AA0100133EBA /* CalendarView.cpp in Sources */, ); runOnlyForDeploymentPostprocessing = 0; *************** *** 2706,2709 **** --- 2720,2724 ---- OPT_XWIN, __powerc, + YAAF_MACHO, "PM_USE_SESSION_APIS=0", ); |
|
From: Jeffrey B. <jlb...@us...> - 2006-10-18 01:15:50
|
Update of /cvsroot/igarden/CommonSource/CColor In directory sc8-pr-cvs2.sourceforge.net:/tmp/cvs-serv11429 Modified Files: CColor.cp Log Message: Change #error to #warning to ease porting Index: CColor.cp =================================================================== RCS file: /cvsroot/igarden/CommonSource/CColor/CColor.cp,v retrieving revision 1.7 retrieving revision 1.8 diff -C2 -d -r1.7 -r1.8 *** CColor.cp 7 Oct 2006 23:49:35 -0000 1.7 --- CColor.cp 18 Oct 2006 01:15:44 -0000 1.8 *************** *** 63,67 **** - #if OPT_MACOS // ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ --- 63,66 ---- *************** *** 72,76 **** --- 71,79 ---- void CColor::operator =(const CMYColor &inColor) { + #if OPT_MACOS ::CMY2RGB(&inColor, &mColor); + #else + #warning ***Won't support CColor + #endif CalcHexCode(); *************** *** 85,89 **** --- 88,96 ---- void CColor::operator =(const HSLColor &inColor) { + #if OPT_MACOS ::HSL2RGB(&inColor, &mColor); + #else + #warning ***Won't support CColor + #endif CalcHexCode(); *************** *** 98,102 **** --- 105,113 ---- void CColor::operator =(const HSVColor &inColor) { + #if OPT_MACOS ::HSV2RGB(&inColor, &mColor); + #else + #warning ***Won't support CColor + #endif CalcHexCode(); *************** *** 205,209 **** bool CColor::operator ==(const unsigned char* inText) const { ! return ::EqualString(inText, mHexCode, false, true); } --- 216,223 ---- bool CColor::operator ==(const unsigned char* inText) const { ! if(inText[0] == mHexCode[0]) ! return memcmp(inText, mHexCode, inText[0]) == 0; ! else ! return false; } *************** *** 222,226 **** --- 236,244 ---- CMYColor theColor; + #if OPT_MACOS ::RGB2CMY(&mColor, &theColor); + #else + #warning ***Won't support CColor + #endif return theColor; *************** *** 237,241 **** --- 255,263 ---- HSLColor theColor; + #if OPT_MACOS ::RGB2HSL(&mColor, &theColor); + #else + #warning ***Won't support CColor + #endif return theColor; *************** *** 252,256 **** --- 274,282 ---- HSVColor theColor; + #if OPT_MACOS ::RGB2HSV(&mColor, &theColor); + #else + #warning ***Won't support CColor + #endif return theColor; *************** *** 307,311 **** } - // ÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑÑ // ¥ NumToHex --- 333,336 ---- *************** *** 319,323 **** if (inHighBitsFlag) { ! inValue = ::BitShift(inValue, -4); } --- 344,348 ---- if (inHighBitsFlag) { ! inValue = inValue >> 4; } *************** *** 366,370 **** } - #else - #error TO_BE_PORTED - #endif --- 391,392 ---- |