Merge 1. Pull in cpp files in the performance enhanced Khronos RI OVG files which are newly added. I've ignored platform-specific cpp files for linux, macosx, and null operating systems because this local solution has its own platform glue (i.e. facility to target Bitmaps but no full windowing support). I've ignored sfEGLInterface.cpp because this is used as a bridge to go from EGL to Nokia's Platsim which offers an EGL service. That's not relevant to this implementation because this is ARM side code, not Intel side. I just left a comment to sfEGLInterface.cpp in case we need to pick up this later on. The current code compiles on winscw. Prior to this fix, the code works on winscw, and can launch the SVG tiger (tiger.exe). That takes about 20 seconds to render. I hope to always be able to show this icon on each commit, and the plan is for the render time to reduce with this series of submissions. On this commit, the tiger renders ok in 20 seconds.
(object Petal
version 35)
(object Design "<Top Level>"
is_unit TRUE
file_name "d:\wserv\des\client2.mdl"
is_loaded TRUE
defaults (object defaults
rightMargin 0.25
leftMargin 0.25
topMargin 0.25
bottomMargin 0.5
pageOverlap 0.25
clipIconLabels TRUE
autoResize FALSE
snapToGrid TRUE
gridX 0
gridY 0
defaultFont (object Font
size 10
face "Arial"
bold FALSE
italics FALSE
underline FALSE
strike FALSE
color 0
default_color TRUE)
showMessageNum 3)
root_category (object Class_Category "<Top Level>"
exportControl "Public"
global TRUE
subsystem "<Top Level>"
logical_models (list unit_reference_list
(object Class_Category "W32"
exportControl "Public"
logical_models (list unit_reference_list
(object Class "RWs"
fields (list has_relationship_list
(object Has_Relationship
supplier "RGroupWindow"
supplier_cardinality (value cardinality "0..n")
client_cardinality (value cardinality "1"))
(object Has_Relationship
supplier "RWindow"
supplier_cardinality (value cardinality "0..n")
client_cardinality (value cardinality "1"))
(object Has_Relationship
supplier "RWsGc"
supplier_cardinality (value cardinality "0..n")
client_cardinality (value cardinality "1"))
(object Has_Relationship
supplier "RPalette"
supplier_cardinality (value cardinality "0..n")
client_cardinality (value cardinality "1"))))
(object Class "RGroupWindow"
superclasses (list inheritance_relationship_list
(object Inheritance_Relationship
supplier "RWindowBase")))
(object Class "RWindow"
superclasses (list inheritance_relationship_list
(object Inheritance_Relationship
supplier "RWindowBase")
(object Inheritance_Relationship
supplier "RDrawBase")))
(object Class "RWsGc"
superclasses (list inheritance_relationship_list
(object Inheritance_Relationship
supplier "RGdi")))
(object Class "RWindowBase")
(object Class "RPalette"
superclasses (list inheritance_relationship_list
(object Inheritance_Relationship
supplier "RPaletteBase"))))
logical_presentations (list unit_reference_list
(object ClassDiagram "Main"
title "Main"
zoom 100
max_height 28350
max_width 21600
origin_x 0
origin_y 0
items (list diagram_item_list
(object ClassView "Class" "RWs" @1
location (1403, 1017)
label (object ItemLabel
location (1299, 933)
nlines 2
max_width 240
justify 0
label "RWs")
annotation 8)
(object ClassView "Class" "RWindow" @2
location (622, 892)
label (object ItemLabel
location (518, 808)
nlines 2
max_width 240
justify 0
label "RWindow")
annotation 8)
(object ClassView "Class" "RWsGc" @3
location (2072, 903)
label (object ItemLabel
location (1968, 819)
nlines 2
max_width 240
justify 0
label "RWsGc")
annotation 8)
(object ClassView "Class" "RWindowBase" @4
location (659, 395)
label (object ItemLabel
location (555, 311)
nlines 2
max_width 240
justify 0
label "RWindowBase")
annotation 8)
(object ClassView "Class" "RGroupWindow" @5
location (1021, 795)
label (object ItemLabel
location (917, 711)
nlines 2
max_width 240
justify 0
label "RGroupWindow")
annotation 8)
(object ClassView "Class" "RDrawBase" @6
location (269, 168)
label (object ItemLabel
location (165, 84)
nlines 2
max_width 240
justify 0
label "RDrawBase")
annotation 8)
(object InheritView ""
client @5
supplier @4)
(object HasView ""
client @1
supplier @5)
(object HasView ""
client @1
supplier @2)
(object HasView ""
client @1
supplier @3)
(object ClassView "Class" "RGdi" @7
location (2072, 392)
label (object ItemLabel
location (1968, 308)
nlines 2
max_width 240
justify 0
label "RGdi")
annotation 8)
(object InheritView ""
client @3
supplier @7)
(object ClassView "Class" "RPalette" @8
location (2378, 1512)
label (object ItemLabel
location (2274, 1428)
nlines 2
max_width 240
justify 0
label "RPalette")
annotation 8)
(object ClassView "Class" "RPaletteBase" @9
location (2425, 1106)
label (object ItemLabel
location (2321, 1022)
nlines 2
max_width 240
justify 0
label "RPaletteBase")
annotation 8)
(object InheritView ""
client @8
supplier @9)
(object HasView ""
client @1
supplier @8)
(object InheritView ""
client @2
supplier @6)
(object InheritView ""
client @2
supplier @4)))))
(object Class_Category "GdiBase"
exportControl "Public"
logical_models (list unit_reference_list
(object Class "RPaletteBase")
(object Class "RDrawBase")
(object Class "RGdi"))
logical_presentations (list unit_reference_list
(object ClassDiagram "Main"
title "Main"
zoom 100
max_height 28350
max_width 21600
origin_x 0
origin_y 0
items (list diagram_item_list
(object ClassView "Class" "RPaletteBase" @10
location (1012, 248)
label (object ItemLabel
location (908, 164)
nlines 2
max_width 240
justify 0
label "RPaletteBase")
annotation 8)
(object ClassView "Class" "RDrawBase" @11
location (494, 675)
label (object ItemLabel
location (390, 591)
nlines 2
max_width 240
justify 0
label "RDrawBase")
annotation 8)
(object ClassView "Class" "RGdi" @12
location (1015, 661)
label (object ItemLabel
location (911, 577)
nlines 2
max_width 240
justify 0
label "RGdi")
annotation 8))))))
logical_presentations (list unit_reference_list
(object ClassDiagram "Main"
title "Main"
zoom 100
max_height 28350
max_width 21600
origin_x 0
origin_y 0
items (list diagram_item_list
(object CategoryView "W32" @13
location (778, 431)
label (object ItemLabel
location (634, 347)
nlines 2
max_width 288
justify 0
label "W32")
width 300
height 180)
(object CategoryView "GdiBase" @14
location (1494, 434)
label (object ItemLabel
location (1350, 350)
nlines 2
max_width 288
justify 0
label "GdiBase")
width 300
height 180)))))
root_subsystem (object SubSystem "<Top Level>"
physical_models (list unit_reference_list)
physical_presentations (list unit_reference_list
(object Module_Diagram "Main"
title "Main"
zoom 100
max_height 28350
max_width 21600
origin_x 0
origin_y 0
items (list diagram_item_list))))
process_structure (object Processes
ProcsNDevs (list
(object Process_Diagram ""
title ""
zoom 100
max_height 28350
max_width 21600
origin_x 0
origin_y 0
items (list diagram_item_list))))
properties (object Properties))