diff options
| author | Jason Barron <jbarron@trolltech.com> | 2009-08-20 15:37:39 (GMT) |
|---|---|---|
| committer | Jason Barron <jbarron@trolltech.com> | 2009-08-20 15:37:39 (GMT) |
| commit | e93ffdbb6fde611defc34fd27aec25c40da5a60e (patch) | |
| tree | e02d3f92596bb72e355a47e37dc19113320e775c /examples/opengl/pbuffers2 | |
| parent | 851a858fcd28c35dff2ffbeffdb40f7ee69f45b4 (diff) | |
| download | Qt-e93ffdbb6fde611defc34fd27aec25c40da5a60e.zip Qt-e93ffdbb6fde611defc34fd27aec25c40da5a60e.tar.gz Qt-e93ffdbb6fde611defc34fd27aec25c40da5a60e.tar.bz2 | |
Fix opengl examples after bad merge.
Not sure when it happened, but these files were changed as a result of
a merge conflict and at this point there should be no difference in
these examples between the Qt/S60 and Qt master branches.
Diffstat (limited to 'examples/opengl/pbuffers2')
| -rw-r--r-- | examples/opengl/pbuffers2/bubbles.svg | 13 |
1 files changed, 13 insertions, 0 deletions
diff --git a/examples/opengl/pbuffers2/bubbles.svg b/examples/opengl/pbuffers2/bubbles.svg index 3d7971d..65867da 100644 --- a/examples/opengl/pbuffers2/bubbles.svg +++ b/examples/opengl/pbuffers2/bubbles.svg @@ -78,6 +78,10 @@ <!-- Define a shadow for each sphere. --> <circle id="shadow" fill="url(#shadowGrad)" cx="0" cy="0" r="100" /> <g id="bubble"> + <circle fill="black" cx="0" cy="0" r="50" /> + <circle fill="#a6ce39" cx="0" cy="0" r="33" /> + <path fill="black" d="M 37,50 L 50,37 L 12,-1 L 22,-11 L 10,-24 L -24,10 + L -11,22 L -1,12 Z" /> <circle cx="0" cy="0" r="100" /> </g> </defs> @@ -176,6 +180,15 @@ </g> </g> <g transform="translate(200,0)" > + <g transform="translate(200,490) scale(2.0,1.0) rotate(45)" > + <rect fill="#a6ce39" x="-69" y="-69" width="138" height="138" /> + <circle fill="black" cx="0" cy="0" r="50" /> + <circle fill="#a6ce39" cx="0" cy="0" r="33" /> + <path fill="black" d="M 37,50 L 50,37 L 12,-1 L 22,-11 L 10,-24 L -24,10 + L -11,22 L -1,12 Z" /> + <animateTransform attributeName="transform" type="rotate" values="0; 360" + begin="0s" dur="10s" fill="freeze" repeatCount="indefinite" /> + </g> <g transform="translate(200,375)"> <use xlink:href="#shadow" transform="translate(25,55) scale(1.0,0.5)" /> <circle fill="url(#blueSphere)" cx="0" cy="0" r="100" /> |
