From 9364691375e08fdc480468dfe63501fe970bcfa2 Mon Sep 17 00:00:00 2001
From: "Kirill Lipatov (Leency)" <lipatov.kiril@gmail.com>
Date: Tue, 2 Feb 2016 14:03:00 +0000
Subject: [PATCH] nice toolbar icons

git-svn-id: svn://kolibrios.org@6129 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 .../TinyGL/asm_fork/examples/test_glu2.asm      |  14 +++++++-------
 .../TinyGL/asm_fork/examples/textures0.asm      |  10 +++++-----
 .../TinyGL/asm_fork/examples/toolb_1.png        | Bin 374 -> 737 bytes
 3 files changed, 12 insertions(+), 12 deletions(-)

diff --git a/programs/develop/libraries/TinyGL/asm_fork/examples/test_glu2.asm b/programs/develop/libraries/TinyGL/asm_fork/examples/test_glu2.asm
index ee235b4ca0..0092fbc425 100644
--- a/programs/develop/libraries/TinyGL/asm_fork/examples/test_glu2.asm
+++ b/programs/develop/libraries/TinyGL/asm_fork/examples/test_glu2.asm
@@ -28,7 +28,7 @@ ends
 image_data dd 0 ;указатель на временную память, нужен для преобразования изображения
 image_data_toolbar dd 0
 IMAGE_FILE1_SIZE equ 128*144*3+54 ;размер файла с изображением
-IMAGE_TOOLBAR_ICON_SIZE equ 256*3
+IMAGE_TOOLBAR_ICON_SIZE equ 21*21*3
 IMAGE_TOOLBAR_SIZE equ IMAGE_TOOLBAR_ICON_SIZE*3+54
 
 macro load_image_file path,buf,size { ;макрос для загрузки изображений
@@ -130,15 +130,15 @@ draw_window:
 	mcall SF_CREATE_WINDOW,(50 shl 16)+420,(30 shl 16)+410,0x33ffffff,,caption
 
 	mov esi,[sc.work_button]
-	mcall SF_DEFINE_BUTTON,(5 shl 16)+20,(5 shl 16)+20,3 ;вершины вкл.
-	mcall ,(30 shl 16)+20,,4 ;каркасные грани вкл.
-	mcall ,(55 shl 16)+20,,5 ;сплошные грани вкл.
+	mcall SF_DEFINE_BUTTON,(6 shl 16)+19,(6 shl 16)+19,3+0x40000000 ;вершины вкл.
+	mcall ,(36 shl 16)+19,,4+0x40000000 ;каркасные грани вкл.
+	mcall ,(66 shl 16)+19,,5+0x40000000 ;сплошные грани вкл.
 
-	mcall SF_PUT_IMAGE,[image_data_toolbar],(16 shl 16)+16,(7 shl 16)+7 ;вершины вкл.
+	mcall SF_PUT_IMAGE,[image_data_toolbar],(21 shl 16)+21,(5 shl 16)+5 ;вершины вкл.
 	add ebx,IMAGE_TOOLBAR_ICON_SIZE
-	mcall ,,,(32 shl 16)+7 ;каркасные грани вкл.
+	mcall ,,,(35 shl 16)+5 ;каркасные грани вкл.
 	add ebx,IMAGE_TOOLBAR_ICON_SIZE
-	mcall ,,,(57 shl 16)+7 ;сплошные грани вкл.
+	mcall ,,,(65 shl 16)+5 ;сплошные грани вкл.
 
 	stdcall [kosglSwapBuffers]
 	mcall SF_REDRAW,SSF_END_DRAW
diff --git a/programs/develop/libraries/TinyGL/asm_fork/examples/textures0.asm b/programs/develop/libraries/TinyGL/asm_fork/examples/textures0.asm
index c939c2af00..00562e8818 100644
--- a/programs/develop/libraries/TinyGL/asm_fork/examples/textures0.asm
+++ b/programs/develop/libraries/TinyGL/asm_fork/examples/textures0.asm
@@ -28,7 +28,7 @@ ends
 image_data dd 0 ;указатель на временную память, нужен для преобразования изображения
 image_data_toolbar dd 0
 IMAGE_FILE1_SIZE equ 128*144*3+54 ;размер файла с изображением
-IMAGE_TOOLBAR_ICON_SIZE equ 256*3
+IMAGE_TOOLBAR_ICON_SIZE equ 21*21*3
 IMAGE_TOOLBAR_SIZE equ IMAGE_TOOLBAR_ICON_SIZE*3+54
 
 macro load_image_file path,buf,size { ;макрос для загрузки изображений
@@ -150,12 +150,12 @@ draw_window:
 	mcall SF_CREATE_WINDOW,(50 shl 16)+420,(30 shl 16)+410,0x33ffffff,,caption
 
 	mov esi,[sc.work_button]
-	mcall SF_DEFINE_BUTTON,(5 shl 16)+20,(5 shl 16)+20,3 ;сферы
-	mcall ,(30 shl 16)+20,,4 ;куб
+	mcall SF_DEFINE_BUTTON,(6 shl 16)+19,(6 shl 16)+19,3+0x40000000 ;сферы
+	mcall ,(36 shl 16)+19,,4+0x40000000 ;куб
 
-	mcall SF_PUT_IMAGE,[image_data_toolbar],(16 shl 16)+16,(7 shl 16)+7 ;сферы
+	mcall SF_PUT_IMAGE,[image_data_toolbar],(21 shl 16)+21,(5 shl 16)+5 ;сферы
 	add ebx,2*IMAGE_TOOLBAR_ICON_SIZE
-	mcall ,,,(32 shl 16)+7 ;куб
+	mcall ,,,(35 shl 16)+5 ;куб
 
 	stdcall [kosglSwapBuffers]
 	mcall SF_REDRAW,SSF_END_DRAW
diff --git a/programs/develop/libraries/TinyGL/asm_fork/examples/toolb_1.png b/programs/develop/libraries/TinyGL/asm_fork/examples/toolb_1.png
index d290fc0ceb0fb92845463a102a11a624df71b3b7..585acb14596725e7356aa1e38fed3557dca75990 100644
GIT binary patch
literal 737
zcmV<70v`Q|P)<h;3K|Lk000e1NJLTq000#L002J-0ssI2fI<|J00006bW%=J00000
z009}HHwOR!0+vZcK~#90?UX%e+dve@U-W^5F@Xqc2s8mhWKZ#Ix|x87f(xBWptKNL
z44qus)syLx#h!v8LrChOltLkdY-z?2G9?WKS&0K4L|X^ry5f)!G9Avn$|uS4M<FTX
zKi%oQ-@T`I@7_#4pNA>L0YJ4{oea)oG8|s1sycc6a3`+sW?2@?vg7d_$KCt%1^^hN
z(^#!KjspPX6lN5dF*<@g!~eLRU(4FI?RKDf?vHRBEIvL5r{4fzw%ydUx^3IU%26<t
zD#vkx{v8^>0HD{@z1cDpOj1=|-?wesFbp-n)obc-c+UKUkEIWEzSN$i%3QWJt*$5u
z(=@-l{j6zq?4T$Kp65yZ26)EkK;ycfYE0^%$n%0AEH9@3z%<Rk_?BfgR;%-C+1YlJ
zfxoE=g0T4RIbMH#R0-r+mUSHGYGc=(YBU<fFdv_TV=eyj;nl|O(EsOoMM;n~RTO-G
z*a4SdfTwyBZ~3kT#~Os*pBux%MN#ux-P0}{o->#2@cZ+g<t<9!{RPRlD5LVeMHz$l
z#Rm9HCNttG{(Lf-oQl86`57|5LN!qTNF+km2qDUqSluQ%zPP`=kX;n_w<8`AQ($}m
zkSj%qNph_WwX#pTF-fiz^>j`YMSs3kD9N>Q>&dH&)Cy%<Iy;bS<yN8O{y307LdbmZ
z3;-@tE0RaV6v&S#lKh1HwDE5(kDCMlmd*}*`v;rc$e8^DAna_KA^lS+whATR{t<RI
zt*0*n<0FLH>74#P2LO`mlCku34$?X5BOPD#V8c!S;{D&v&&d@yKZnRYKk55lC_fIN
zPt>FJJxP-MdF(L+@AjhZ?X7zMcl>|Hd;0H0r8;a39wBtJzBg5T@-Rl!P0!EYNnj8C
T3S?xz00000NkvXXu0mjf24P<w

literal 374
zcmeAS@N?(olHy`uVBq!ia0vp^0zhoQ!2~3y+vWmE29|V3Uq=Rpjs4tz5?O(K&H|6f
zVg?4jLm<p3s^QfD6qG1&jVKAuPb(=;EJ|f4NX*PD(aTFMQ83Xn(6h`juJZ$``Qqu~
z7~<i5b+R|tAp?On+XnW+r;C;gU6HO}>R;q8u&1$FcU^1;_gxQBuRqz3RNg)@bQIv0
zPn_{2S#D`_?#fLY4t?Har^DUQFiA%H!OL88HV%!Got*b(ZJZ|XdDg~-n_FGHo%RXr
z;VoFxu)M~_&&Px3?0P}COr7S6lT#L`EZ2R*-nQYIsLz{>Jh>mNlNEh6GJdI>q*pK0
zY&83Pv8kzhbtg;j#d`rpY85}T559BxXMg4R!^b8}UzJvDWwF`2%5udy)=b`o`o2!#
z!d$bmu4*%8AN^WuJeg|;gRHK`jtOi{*-u|INqHS((VywGGS0Wd%*SWu7G9wL89ZJ6
KT-G@yGywq4H;i`x