implement instanced drawing

This commit is contained in:
2017-03-27 22:29:47 +01:00
parent b9277f94e8
commit e8cabebe66
8 changed files with 206 additions and 36 deletions

View File

@@ -120,7 +120,7 @@
<border dir="col" align="center" grow="1" width="1">
<node height="20" pad="1" width="100%"><slider-h id="tip-size" value=".5"/></node>
<node height="20" pad="1" width="100%"><slider-h id="tip-flow" value=".25"/></node>
<node height="20" pad="1" width="100%"><slider-h id="tip-spacing"/></node>
<node height="20" pad="1" width="100%"><slider-h id="tip-spacing" value=".25"/></node>
<node height="20" pad="1" width="100%"><slider-h id="tip-angle"/></node>
<node height="20" pad="1" width="100%"><slider-h id="tip-mix"/></node>
</border>
@@ -319,9 +319,12 @@
<button-custom id="menu-layers" height="100%" margin="0 0 0 0" justify="center" align="center" pad="8" color=".1">
<text text="Layers" font-face="arial" font-size="11"/>
</button-custom>
<node height="100%" color="1" grow="1" justify="center" align="flex-end">
<text text="PanoPainter 0.1.2 alpha" font-face="arial" font-size="11" margin="0 10 0 0" color=".2 .5 1 1"/>
</node>
</border>
<!-- toolbar -->
<border id="toolbar" height="50" width="100%" pad="5" dir="row" color=".2">
<!--<border id="toolbar" height="50" width="100%" pad="5" dir="row" color=".2">
<button id="btn-close" width="50" height="100%" margin="0 5 0 0" text="Clear"/>
<button id="btn-popup" width="50" height="100%" margin="0 5 0 0" text="Popup"/>
<ref id="multi-button"/>
@@ -333,21 +336,21 @@
<button-custom width="50" margin="0 5 0 0" color=".3" thickness="1" border-color=".5" justify="center" align="center"><text text="green" font-face="arial" font-size="11" color="0 1 0 1"/></button-custom>
<button-custom width="50" margin="0 5 0 0" color=".2" thickness="1" border-color=".5" justify="center" align="center"><text text="blue" font-face="arial" font-size="11" color=".4 .4 1 1"/></button-custom>
<separator width="10"/>
<!--button with image-->
--><!--button with image--><!--
<button-custom width="50" margin="0 5 0 0" thickness="1" border-color=".0" pad="8">
<image path="data/icons.png" region="30 30 90 90" width="100%" height="100%" align="center" justify="flex-end">
<!--<text text="Groups" font-face="arial" font-size="11" color=".1"/>-->
--><!--<text text="Groups" font-face="arial" font-size="11" color=".1"/>--><!--
</image>
</button-custom>
<button-custom id="btn-settings" width="50" margin="0 5 0 0" thickness="1" border-color=".0" pad="8">
<image path="data/icons.png" region="143 155 203 215" width="100%" height="100%" align="center" justify="flex-end">
<!--<text text="Settings" font-face="arial" font-size="11"/>-->
--><!--<text text="Settings" font-face="arial" font-size="11"/>--><!--
</image>
</button-custom>
<button-custom width="50" margin="0 15 0 0" thickness="1" border-color=".0" pad="8" align="center" justify="center">
<icon width="100%" height="100%" icon="accept"/>
</button-custom>
</border>
</border>-->
<!-- central row -->
<node grow="1" dir="row" wrap="1" height="0">
<border width="60" color=".2 .2 .2 .6" margin="0 0 0 0" dir="col" pad="4" flood-events="1">
@@ -365,6 +368,9 @@
<icon width="100%" height="100%" icon="disk"/>
</button-custom>-->
<button id="btn-switch" width="50" height="50" margin="0 0 5 0" text="Switch"/>
<button id="btn-close" width="50" height="50" margin="0 0 5 0" text="Clear"/>
<!--panel togglers-->
<button-custom id="btn-stroke" width="50" height="50" margin="0 0 5 0" thickness="1" border-color=".1" pad="2">
<image path="data/ui/stroke.png" width="100%" height="100%" align="center" justify="flex-end"/>
@@ -393,16 +399,16 @@
</border>
</node>
<!-- content panel -->
<node grow="1" color=".1" pad="10">
<node grow="1" color=".1" pad="0">
<canvas id="paint-canvas" grow="1"/>
</node>
</node>
<!-- status bar -->
<border height="30" width="100%" color=".15" border-color=".3" dir="row" pad="0 0 0 10" align="center">
<!--<text-input width="100" height="100%" color=".3"/>-->
<!--<border height="30" width="100%" color=".15" border-color=".3" dir="row" pad="0 0 0 10" align="center">
--><!--<text-input width="100" height="100%" color=".3"/>--><!--
<text text="Status Bar: nothing to show here." font-face="arial" font-size="11"/>
<text text="#opengl #fromscratch #c++" font-face="arial" font-size="11" margin="0 0 0 10" color=".2 .5 1 1"/>
</border>
</border>-->
</node>
<!--<ref id="settings"/>-->
<!--<ref id="popup-menu"/>-->