From 24d344231ccb16374d9e47328195788994f0617e Mon Sep 17 00:00:00 2001
From: IgorA <IgorA@kolibrios.org>
Date: Wed, 8 Aug 2012 18:25:25 +0000
Subject: [PATCH] 'vox_creator': small update, add lost file toolbar.png

git-svn-id: svn://kolibrios.org@2915 a494cfbc-eb01-0410-851d-a64ba20cac60
---
 .../media/voxel_editor/utilites/toolbar.png   | Bin 0 -> 2171 bytes
 .../voxel_editor/utilites/vox_creator.asm     |  74 ++++++++++++++++--
 2 files changed, 69 insertions(+), 5 deletions(-)
 create mode 100644 programs/media/voxel_editor/utilites/toolbar.png

diff --git a/programs/media/voxel_editor/utilites/toolbar.png b/programs/media/voxel_editor/utilites/toolbar.png
new file mode 100644
index 0000000000000000000000000000000000000000..c2c9f8b4796f680f0af19c41efb36654050a7b4a
GIT binary patch
literal 2171
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

literal 0
HcmV?d00001

diff --git a/programs/media/voxel_editor/utilites/vox_creator.asm b/programs/media/voxel_editor/utilites/vox_creator.asm
index 928705b3fc..5feec3fb24 100644
--- a/programs/media/voxel_editor/utilites/vox_creator.asm
+++ b/programs/media/voxel_editor/utilites/vox_creator.asm
@@ -16,7 +16,7 @@ include '../trunk/mem.inc'
 include '../trunk/dll.inc'
 
 @use_library_mem mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
-caption db 'Voxel creator 1.08.12',0 ;подпись окна
+caption db 'Voxel creator 8.08.12',0 ;подпись окна
 
 struct FileInfoBlock
 	Function dd ?
@@ -44,6 +44,10 @@ vox_offs_data equ 12
 run_file_70 FileInfoBlock
 image_data dd 0 ;указатель на временную память. для нужен преобразования изображения
 vox_obj_size dd 0 ;размер воксельного объекта (для ускорения вставки)
+txt_space db ' ',0
+txt_pref db ' б ',0,' Кб',0,' Мб',0,' Гб',0 ;приставки: кило, мега, гига
+txt_f_size: db 'Размер: '
+.size: rb 16
 
 fn_toolbar db 'toolbar.png',0
 IMAGE_TOOLBAR_ICON_SIZE equ 16*16*3
@@ -217,6 +221,7 @@ timer_funct:
 
 	stdcall [buf2d_draw], buf_npl
 	inc dword[n_plane] ;перемещаем плоскость сечения
+	call draw_pok
 	.end_f:
 	popad
 	jmp still
@@ -499,6 +504,7 @@ pushad
 	int 0x40
 
 	call draw_buffers
+	call draw_pok
 
 	mcall 12,2
 popad
@@ -513,6 +519,34 @@ draw_buffers:
 	stdcall [buf2d_draw], buf_i2
 	ret
 
+align 4
+draw_pok:
+	;обновление подписи размера файла
+	mov edi,txt_f_size.size
+	mov dword[edi],0
+	mov eax,dword[vox_obj_size]
+	mov ebx,txt_pref
+	.cycle:
+		cmp eax,1024
+		jl @f
+		shr eax,10
+		add ebx,4
+		jmp .cycle
+	@@:
+	call convert_int_to_str
+	stdcall str_cat, edi,ebx
+	stdcall str_cat, edi,txt_space ;завершающий пробел
+
+	mov eax,4 ;рисование текста
+	mov ebx,(275 shl 16)+7
+	mov ecx,[sc.work_text]
+	or  ecx,0x80000000 or (1 shl 30)
+	mov edx,txt_f_size
+	mov edi,[sc.work] ;цвет фона окна
+	int 0x40
+
+	ret
+
 align 4
 key:
 	mcall 2
@@ -1293,6 +1327,35 @@ proc conv_str_to_int, buf:dword
 	ret
 endp
 
+align 4
+proc str_cat uses eax ecx edi esi, str1:dword, str2:dword
+	mov esi,dword[str2]
+	stdcall str_len,esi
+	mov ecx,eax
+	inc ecx
+	mov edi,dword[str1]
+	stdcall str_len,edi
+	add edi,eax
+	cld
+	repne movsb
+	ret
+endp
+
+;output:
+; eax = strlen
+align 4
+proc str_len, str1:dword
+	mov eax,[str1]
+	@@:
+		cmp byte[eax],0
+		je @f
+		inc eax
+		jmp @b
+	@@:
+	sub eax,[str1]
+	ret
+endp
+
 msgbox_0:
 	db 1,0
 	db 'Внимание',0
@@ -1646,15 +1709,16 @@ buf_vox:
 
 
 
-;этот код не мой, он преобразует число в строку
 ;input:
 ; eax = value
 ; edi = string buffer
 ;output:
 align 4
-tl_convert_to_str:
+convert_int_to_str:
 	pushad
+		cld
 		mov dword[edi+1],0
+		mov word[edi+5],0
 		call .str
 	popad
 	ret
@@ -1677,9 +1741,9 @@ align 4
 	ret	      ;вернуться чень интересный ход т.к. пока в стеке храниться кол-во вызовов то столько раз мы и будем вызываться
 
 i_end:
-		rb 1024
+		rb 2048
 	thread:
-		rb 1024
+		rb 2048
 stacktop:
 	sys_path rb 1024
 	file_name: