Merge remote branch 'origin/native-image-loader' into my-gtk

db4
Philipp Brüschweiler 2010-08-01 11:09:39 +02:00
commit b58c93ddbd
34 changed files with 21 additions and 14 deletions

View File

@ -0,0 +1 @@
windows

View File

@ -3,7 +3,7 @@
USING: images tools.test kernel accessors ;
IN: images.tests
[ B{ 57 57 57 255 } ] [ 1 1 T{ image f { 2 3 } RGBA ubyte-components f B{
[ B{ 57 57 57 255 } ] [ 1 1 T{ image f { 2 3 } RGBA ubyte-components f f B{
0 0 0 0
0 0 0 0
0 0 0 0
@ -19,7 +19,7 @@ IN: images.tests
57 57 57 255
0 0 0 0
0 0 0 0
} ] [ B{ 57 57 57 255 } 1 1 T{ image f { 2 3 } RGBA ubyte-components f B{
} ] [ B{ 57 57 57 255 } 1 1 T{ image f { 2 3 } RGBA ubyte-components f f B{
0 0 0 0
0 0 0 0
0 0 0 0

View File

@ -10,12 +10,12 @@ IN: images.tesselation
[
{
{
T{ image f { 2 2 } L ubyte-components f B{ 1 2 5 6 } }
T{ image f { 2 2 } L ubyte-components f B{ 3 4 7 8 } }
T{ image f { 2 2 } L ubyte-components f f B{ 1 2 5 6 } }
T{ image f { 2 2 } L ubyte-components f f B{ 3 4 7 8 } }
}
{
T{ image f { 2 2 } L ubyte-components f B{ 9 10 13 14 } }
T{ image f { 2 2 } L ubyte-components f B{ 11 12 15 16 } }
T{ image f { 2 2 } L ubyte-components f f B{ 9 10 13 14 } }
T{ image f { 2 2 } L ubyte-components f f B{ 11 12 15 16 } }
}
}
] [
@ -30,12 +30,12 @@ IN: images.tesselation
[
{
{
T{ image f { 2 2 } L ubyte-components f B{ 1 2 4 5 } }
T{ image f { 1 2 } L ubyte-components f B{ 3 6 } }
T{ image f { 2 2 } L ubyte-components f f B{ 1 2 4 5 } }
T{ image f { 1 2 } L ubyte-components f f B{ 3 6 } }
}
{
T{ image f { 2 1 } L ubyte-components f B{ 7 8 } }
T{ image f { 1 1 } L ubyte-components f B{ 9 } }
T{ image f { 2 1 } L ubyte-components f f B{ 7 8 } }
T{ image f { 1 1 } L ubyte-components f f B{ 9 } }
}
}
] [

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

Binary file not shown.

View File

@ -88,12 +88,18 @@ TUPLE: vbo
index-buffer index-count vertex-format texture bump ka ;
: white-image ( -- image )
{ 1 1 } BGR ubyte-components f
B{ 255 255 255 } image boa ;
<image>
{ 1 1 } >>dim
BGR >>component-order
ubyte-components >>component-type
B{ 255 255 255 } >>bitmap ;
: up-image ( -- image )
{ 1 1 } BGR ubyte-components f
B{ 0 0 0 } image boa ;
<image>
{ 1 1 } >>dim
BGR >>component-order
ubyte-components >>component-type
B{ 0 0 0 } >>bitmap ;
: make-texture ( pathname alt -- texture )
swap [ nip load-image ] [ ] if*