WebSVN – Kolibri OS – Diff – /programs/media/voxel_editor/trunk/voxel_editor.asm

 use32
 	org 0x0
 	db 'MENUET01' ;¨¤¥â¨ä. ¨á¯®«ï¥¬®£® ä ©«  ¢á¥£¤  8 ¡ ©â
-	dd 0x1
-	dd start
-	dd i_end ;à §¬¥à ¯à¨«®¦¥¨ï
+	dd 1, start, i_end, mem, stacktop, 0, sys_path
-	dd mem
-	dd stacktop
-	dd 0
-	dd sys_path
 include '../../../../programs/macros.inc'
 include '../../../../programs/proc32.inc'
-include '../../../../programs/develop/libraries/box_lib/load_lib.mac'
+include '../../../../programs/KOSfuncs.inc'
-include '../../../dll.inc'
+include '../../../../programs/load_img.inc'
 include 'vox_draw.inc'
 include 'vox_rotate.inc'
 include 'str.inc'
-@use_library_mem mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
-caption db 'Voxel editor 02.02.15',0 ;¯®¤¯¨áì ®ª
-struct FileInfoBlock
-	Function dd ?
-	Position dd ?
-	Flags	 dd ?
-	Count	 dd ?
-	Buffer	 dd ?
-		db ?
-	FileName dd ?
-ends
-run_file_70 FileInfoBlock
+@use_library_mem mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
-image_data dd 0 ;ãª § â¥«ì   ¢à¥¬¥ãî ¯ ¬ïâì. ¤«ï ã¦¥ ¯à¥®¡à §®¢ ¨ï ¨§®¡à ¦¥¨ï
+caption db 'Voxel editor 18.02.16',0 ;¯®¤¯¨áì ®ª
 fn_toolbar db 'toolbar.png',0
-IMAGE_TOOLBAR_ICON_SIZE equ 16*16*3
+fn_toolbar db 'toolbar.png',0
-IMAGE_TOOLBAR_SIZE equ IMAGE_TOOLBAR_ICON_SIZE*27
-image_data_toolbar dd 0
+IMAGE_TOOLBAR_ICON_SIZE equ 16*16*3
-cursors_count equ 4
+image_data_toolbar dd 0
-IMAGE_CURSORS_SIZE equ 4096*cursors_count ;à §¬¥à ª àâ¨ª¨ á ªãàá®à ¬¨
+cursors_count equ 4
 key_s_zoom db 's_zoom',0
 key_t_size db 'tile_size',0
 key_f_size db 'file_size',0
 key_col_b db 'c_background',0
-macro load_image_file path,buf,size { ;¬ ªà®á ¤«ï § £àã§ª¨ ¨§®¡à ¦¥¨©
-	;path - ¬®¦¥â ¡ëâì ¯¥à¥¬¥®© ¨«¨ áâà®ª®¢ë¬ ¯ à ¬¥âà®¬
-	if path eqtype '' ;¯à®¢¥àï¥¬ § ¤  «¨ áâà®ª®© ¯ à ¬¥âà path
-		jmp @f
-			local .path_str
-			.path_str db path ;ä®à¬¨àã¥¬ «®ª «ìãî ¯¥à¥¬¥ãî
-			db 0
-		@@:
-		;32 - áâ ¤ àâë©  ¤à¥á ¯® ª®â®à®¬ã ¤®«¦¥ ¡ëâì ¡ãä¥à á á¨áâ¥¬ë¬ ¯ãâ¥¬
-		copy_path .path_str,[32],file_name,0x0
-	else
-		copy_path path,[32],file_name,0x0 ;ä®à¬¨àã¥¬ ¯®«ë© ¯ãâì ª ä ©«ã ¨§®¡à ¦¥¨ï, ¯®¤à §ã¬¥¢ ¥¬ çâ® ® ¢ ®¤®© ¯ ¯ª¥ á ¯à®£à ¬¬®©
-	end if
-	stdcall mem.Alloc, dword size ;¢ë¤¥«ï¥¬ ¯ ¬ïâì ¤«ï ¨§®¡à ¦¥¨ï
-	mov [buf],eax
-	mov eax,70 ;70-ï äãªæ¨ï à ¡®â  á ä ©« ¬¨
-	mov [run_file_70.Function], 0
-	mov [run_file_70.Position], 0
-	mov [run_file_70.Flags], 0
-	mov [run_file_70.Count], dword size
-	m2m [run_file_70.Buffer], [buf]
-	mov byte[run_file_70+20], 0
-	mov [run_file_70.FileName], file_name
-	mov ebx,run_file_70
-	int 0x40 ;§ £àã¦ ¥¬ ä ©« ¨§®¡à ¦¥¨ï
-	cmp ebx,0xffffffff
-	je @f
-		;®¯à¥¤¥«ï¥¬ ¢¨¤ ¨§®¡à ¦¥¨ï ¨ ¯¥à¥¢®¤¨¬ ¥£® ¢® ¢à¥¬¥ë© ¡ãä¥à image_data
-		stdcall dword[img_decode], dword[buf],ebx,0
-		mov dword[image_data],eax
-		;¯à¥®¡à §ã¥¬ ¨§®¡à ¦¥¨¥ ª ä®à¬ âã rgb
-		stdcall dword[img_to_rgb2], dword[image_data],dword[buf]
-		;ã¤ «ï¥¬ ¢à¥¬¥ë© ¡ãä¥à image_data
-		stdcall dword[img_destroy], dword[image_data]
-	@@:
-}
 OT_MAP_X  equ  0
 OT_MAP_Y  equ  0
 OT_CAPT_X_COLOR equ  5 ;®âáâã¯ ¤«ï ¯®¤¯¨á¨ æ¢¥â
 OT_CAPT_Y_COLOR equ 30
 PEN_MODE_NONE equ -1
 PEN_MODE_CLEAR equ 0 ;à¥¦¨¬ áâ¨à ¨ï
 PEN_MODE_SELECT_COLOR equ 2 ;à¥¦¨¬ ¢ë¡®à  æ¢¥â
+PEN_MODE_BRUSH equ 3 ;à¥¦¨¬ à ¡®âë á ª¨áâìî
-PEN_MODE_BRUSH equ 3 ;à¥¦¨¬ à ¡®âë á ª¨áâìî
+run_file_70 FileInfoBlock
 align 4
 start:
 	load_libraries l_libs_start,l_libs_end
+	;¯à®¢¥àª    áª®«ìª® ã¤ ç® § £ã§¨«¨áì ¡¨¡«¨®â¥ª¨
-	;¯à®¢¥àª    áª®«ìª® ã¤ ç® § £ã§¨« áì ¡¨¡«¨®â¥ª
+	mov	ebp,lib_0
-	mov	ebp,lib_2
+	.test_lib_open:
 	cmp	dword [ebp+ll_struc_size-4],0
 	jz	@f
+		mcall SF_TERMINATE_PROCESS ;exit not correct
+	@@:
+	add ebp,ll_struc_size
-		mcall -1 ;exit not correct
+	cmp ebp,l_libs_end
-	@@:
+	jl .test_lib_open
-	mcall 48,3,sc,sizeof.system_colors
+	mcall SF_STYLE_SETTINGS,SSF_GET_COLORS,sc,sizeof.system_colors
-	mcall 40,0x27
+	mcall SF_SET_EVENTS_MASK,0xC0000027
 	stdcall [OpenDialog_Init],OpenDialog_data ;¯®¤£®â®¢ª  ¤¨ «®£
 	mov [buf_pl.w],eax
 	add eax,[tile_size]
 	mov [buf_pl.h],eax
 	;*** § £àã§ª  ªãàá®à®¢
-	load_image_file 'cursors_gr.png',image_data_toolbar,IMAGE_CURSORS_SIZE
+	load_image_file 'cursors_gr.png',image_data_toolbar
 	stdcall [buf2d_create_f_img], buf_curs_8,[image_data_toolbar] ;á®§¤ ¥¬ ¡ãä¥à
 	stdcall mem.Free,[image_data_toolbar] ;®á¢®¡®¦¤ ¥¬ ¯ ¬ïâì
-	load_image_file 'cursors.png',image_data_toolbar, IMAGE_CURSORS_SIZE
+	load_image_file 'cursors.png',image_data_toolbar
 	stdcall [buf2d_create_f_img], buf_curs,[image_data_toolbar] ;á®§¤ ¥¬ ¡ãä¥à
 	stdcall mem.Free,[image_data_toolbar] ;®á¢®¡®¦¤ ¥¬ ¯ ¬ïâì
 	stdcall [buf2d_create], buf_pl ;á®§¤ ¨¥ ¡ãä¥à  ¤«ï á¥ç¥¨ï
 	stdcall [buf2d_vox_brush_create], buf_vox_g3, vox_6_7_z
 	stdcall [buf2d_vox_brush_create], buf_vox_g2, vox_6_4_z
-	load_image_file fn_toolbar, image_data_toolbar,IMAGE_TOOLBAR_SIZE
+	load_image_file fn_toolbar, image_data_toolbar
 red_win:
 	call draw_window
 align 4
 still:
-	mcall 10
+	mcall SF_WAIT_EVENT
 	cmp al,1
 	jz red_win
 	cmp al,2
 	jz key
 	cmp al,3
 	jz button
 	cmp al,6
 	jne @f
-		mcall 9,procinfo,-1
+		mcall SF_THREAD_INFO,procinfo,-1
 		cmp ax,word[procinfo+4]
 		jne @f ;®ª® ¥  ªâ¨¢®
 		call mouse
 	@@:
 	jmp still
 align 4
 mouse:
 	pushad
-	mcall 37,2
+	mcall SF_MOUSE_GET,SSF_BUTTON
 	bt eax,1 ;right button
 	jnc @f
-		mcall 37,1 ;get mouse coords
+		mcall SF_MOUSE_GET,SSF_WINDOW_POSITION
 		mov ebx,eax
 		shr ebx,16
 		and eax,0xffff
 		stdcall get_buf_color, buf_0
 		stdcall get_buf_color, buf_pl
 		jmp .end_f
 	@@:
 	bt eax,0 ;left button
 	jnc .end_f
-		mcall 37,1 ;get mouse coords
+		mcall SF_MOUSE_GET,SSF_WINDOW_POSITION
 		mov ebx,eax
 				@@:
 				mov ecx,dword[v_zoom]
 				mov edi,eax
 				mov esi,ebx
-				mcall 66,3
+				mcall SF_KEYBOARD,SSF_GET_CONTROL_KEYS
 				and eax,3 ;3 -> ¡¨â 0 «¥¢ë© Shift  ¦ â, ¡¨â 1 ¯à ¢ë© Shift  ¦ â
                 jz .shift_end
                     ;¥á«¨  ¦ â Shift, â® à¥¤ ªâ¨àã¥¬   ¢¥àå¥¬ ãà®¢¥
                     ;¤«ï íâ®£® ¢á¥ ª®®à¤¨ âë ¤¥«¨¬   2   ®â ¬ áâ ¡  ®â¨¬ ¥¬ 1
 	ret
 align 4
 draw_window:
 pushad
-	mcall 12,1
+	mcall SF_REDRAW,SSF_BEGIN_DRAW
 	; *** à¨á®¢ ¨¥ £« ¢®£® ®ª  (¢ë¯®«ï¥âáï 1 à § ¯à¨ § ¯ãáª¥) ***
 	mov edx,[sc.work]
 	or  edx,(3 shl 24)+0x30000000
 	mov edi,caption
-	mcall 0,dword[wnd_s_pos],dword[wnd_s_pos+4]
-	; *** á®§¤ ¨¥ ª®¯®ª   ¯ ¥«ì ***
-	mov eax,8
-	mov ebx,(5 shl 16)+20
+	mcall SF_CREATE_WINDOW,dword[wnd_s_pos],dword[wnd_s_pos+4]
-	mov ecx,(5 shl 16)+20
 	mov edx,3
-	mov esi,[sc.work_button]
+	; *** á®§¤ ¨¥ ª®¯®ª   ¯ ¥«ì ***
-	int 0x40
+	mcall SF_DEFINE_BUTTON,(5 shl 16)+20,(5 shl 16)+20,3,[sc.work_button]
 	add ebx,25 shl 16
 	inc edx
 	int 0x40
-	; *** à¨á®¢ ¨¥ ¨ª®®ª   ª®¯ª å ***
-	mov eax,7
-	mov ebx,[image_data_toolbar]
-	mov ecx,(16 shl 16)+16
+	; *** à¨á®¢ ¨¥ ¨ª®®ª   ª®¯ª å ***
-	mov edx,(7 shl 16)+7 ;icon new
-	int 0x40
+	mcall SF_PUT_IMAGE,[image_data_toolbar],(16 shl 16)+16,(7 shl 16)+7 ;icon new
 	add ebx,IMAGE_TOOLBAR_ICON_SIZE
 	add edx,(25 shl 16) ;icon open
 	; *** à¨á®¢ ¨¥ ¡ãä¥à®¢ ***
 	call draw_objects
 	call draw_pok
-	mcall 12,2
+	mcall SF_REDRAW,SSF_END_DRAW
 popad
 	ret
 	mov edi,txt_buf
 	stdcall convert_int_to_str,16
 	stdcall str_cat, txt_brush.size,edi
 	stdcall str_cat, txt_brush.size,txt_space ;§ ¢¥àè îé¨© ¯à®¡¥«
-	mov eax,4 ;à¨á®¢ ¨¥ â¥ªáâ
 	mov ebx,(OT_CAPT_X_COLOR shl 16)+OT_CAPT_Y_COLOR+2
 	mov ecx,[sc.work_text]
 	or  ecx,0x80000000 ;or (1 shl 30)
-	mov edx,txt_color
+	mov edx,txt_color
-	int 0x40
+	mcall SF_DRAW_TEXT,(OT_CAPT_X_COLOR shl 16)+OT_CAPT_Y_COLOR+2
 	mov edx,txt_curor
 	add ebx,115 shl 16
 	ret
 align 4
 on_change_color:
 pushad
-	mov ebx,((OT_CAPT_X_COLOR+35) shl 16)+16 ;¯® ®á¨ x
-	mov ecx,(OT_CAPT_Y_COLOR shl 16)+12 ;¯® ®á¨ y
-	mov edx,[v_color]
-	mcall 13
 	mcall SF_DRAW_RECT,((OT_CAPT_X_COLOR+35) shl 16)+16,(OT_CAPT_Y_COLOR shl 16)+12,[v_color]
 	mov ebx,(1 shl 8)+(6 shl 16)
 	mov ecx,edx
 	mov edx,((OT_CAPT_X_COLOR+55) shl 16)+OT_CAPT_Y_COLOR+2
 	mov esi,[sc.work_text]
 	add esi,(1 shl 30)
 	mov edi,[sc.work]
-	mcall 47
+	mcall SF_DRAW_NUMBER,(1 shl 8)+(6 shl 16)
 popad
 	ret
 align 4
 key:
-	mcall 2
+	mcall SF_GET_KEY
 	jmp still
 align 4
 button:
-	mcall 17
+	mcall SF_GET_BUTTON
 	stdcall [buf2d_vox_brush_delete], buf_vox_g2
 	stdcall [buf2d_delete],buf_curs
 	stdcall [buf2d_delete],buf_curs_8
 	stdcall mem.Free,[image_data_toolbar]
 	stdcall mem.Free,[open_file_vox]
-	mcall -1
+	mcall SF_TERMINATE_PROCESS
 ;¤ ë¥ ¤«ï ¨¨æ¨ «¨§ æ¨¨ ¢®ªá¥«ì®£® ®¡ê¥ªâ
 align 4
 vox_new_data:
 	ret
 endp
 align 4
-open_file_vox dd 0 ;ãª § â¥«ì   ®¡« áâì ¤«ï ®âªàëâ¨ï ä ©«®¢
-open_b rb 560
+open_file_vox dd 0 ;ãª § â¥«ì   ®¡« áâì ¤«ï ®âªàëâ¨ï ä ©«®¢
 align 4
 but_open_file:
 	stdcall [OpenDialog_Start],OpenDialog_data
 	cmp [OpenDialog_data.status],2
 	je .end_open_file
 	;ª®¤ ¯à¨ ã¤ ç®¬ ®âªàëâ¨¨ ¤¨ «®£
-	mov eax,70 ;70-ï äãªæ¨ï à ¡®â  á ä ©« ¬¨
-	mov [run_file_70.Function], 5
+	mov [run_file_70.Function], SSF_GET_INFO
 	mov [run_file_70.Position], 0
 	mov [run_file_70.Flags], 0
 	mov dword[run_file_70.Count], 0
 	mov dword[run_file_70.Buffer], open_b
 	mov byte[run_file_70+20], 0
 	mov dword[run_file_70.FileName], openfile_path
-	mov ebx,run_file_70
-	int 0x40
+	mcall SF_FILE,run_file_70
 	mov ecx,dword[open_b+32] ;+32 qword: à §¬¥à ä ©«  ¢ ¡ ©â å
 	cmp ecx,[max_open_file_size] ;¯à®¢¥àï¥¬ à §¬¥à ¢ë¤¥«¥®© ¯ ¬ïâ¨
 	jle @f
 		mov [max_open_file_size],ecx
 		stdcall mem.ReAlloc,[open_file_vox],ecx
 		mov [open_file_vox],eax
-		notify_window_run txt_need_memory
-	@@:
+		notify_window_run txt_need_memory
 	@@:
 	mov eax,70 ;70-ï äãªæ¨ï à ¡®â  á ä ©« ¬¨
-	mov [run_file_70.Function], 0
+	mov [run_file_70.Function], SSF_READ_FILE
 	mov [run_file_70.Position], 0
 	mov [run_file_70.Flags], 0
 	mov dword[run_file_70.Count], ecx
 	m2m dword[run_file_70.Buffer], dword[open_file_vox]
-	mov byte[run_file_70+20], 0
-	mov dword[run_file_70.FileName], openfile_path
+	mov byte[run_file_70+20], 0
-	mov ebx,run_file_70
+	mov dword[run_file_70.FileName], openfile_path
-	int 0x40 ;§ £àã¦ ¥¬ ä ©« ¨§®¡à ¦¥¨ï
+	mcall SF_FILE,run_file_70
 	cmp ebx,0xffffffff
-	je .end_open_file
 	je .end_open_file
 	mcall 71,1,openfile_path
 	mcall SF_SET_CAPTION,1,openfile_path
 	;---
 	;---
 		mov ebx,[open_file_vox]
 		mov byte[ebx],al
 		stdcall buf2d_vox_obj_get_size, ebx
 		mov dword[run_file_70.Count], eax ;à §¬¥à ä ©«
-		mov [run_file_70.Function], 2
+		mov [run_file_70.Function], SSF_CREATE_FILE
 		mov [run_file_70.Position], 0
 		mov [run_file_70.Flags], 0
 		mov ebx, dword[open_file_vox]
 		mov [run_file_70.Buffer], ebx
 		mov byte[run_file_70+20], 0
 		mov dword[run_file_70.FileName], openfile_path
-		mcall 70,run_file_70 ;§ £àã¦ ¥¬ ä ©« ¨§®¡à ¦¥¨ï
+		mcall SF_FILE,run_file_70 ;§ £àã¦ ¥¬ ä ©« ¨§®¡à ¦¥¨ï
 		cmp ebx,0xffffffff
 		je .end_save_file
 		mov edx,[hot_p]
 		mov dx,2 ;LOAD_INDIRECT
 		mov ecx,[icon]
 		shl ecx,12 ;ã¬®¦ ¥¬   4 ª¡
 		add ecx,[buf_curs.data]
-		mcall 37,4
+		mcall SF_MOUSE_GET,SSF_LOAD_CURSOR
 		cmp eax,0
 		je @f
 			mov [cursor_pointer],eax
-			mcall 37,5,[cursor_pointer]
+			mcall SF_MOUSE_GET,SSF_SET_CURSOR,[cursor_pointer]
 	@@:
 	ret
 endp
 lib_name_3 db 'libini.obj',0
 err_msg_found_lib_3 db '¥  ©¤¥  ¡¨¡«¨®â¥ª  ',39,'libini.obj',39,0
 err_msg_import_3 db 'è¨¡ª  ¯à¨ ¨¬¯®àâ¥ ¡¨¡«¨®â¥ª¨ ',39,'libini',39,0
 l_libs_start:
-	lib0 l_libs lib_name_0, sys_path, file_name, system_dir_0,\
+	lib_0 l_libs lib_name_0, sys_path, file_name, system_dir_0,\
 		err_message_found_lib_0, head_f_l, proclib_import,err_message_import_0, head_f_i
-	lib1 l_libs lib_name_1, sys_path, file_name, system_dir_1,\
+	lib_1 l_libs lib_name_1, sys_path, file_name, system_dir_1,\
 		err_message_found_lib_1, head_f_l, import_libimg, err_message_import_1, head_f_i
 	lib_2 l_libs lib_name_2, sys_path, library_path, system_dir_2,\
 		err_msg_found_lib_2,head_f_l,import_buf2d,err_msg_import_2,head_f_i
 	lib_3 l_libs lib_name_3, sys_path, library_path, system_dir_3,\
 align 16
 i_end:
 	wnd_s_pos: ;¬¥áâ® ¤«ï  áâà®¥ª áâ àâ®¢®© ¯®§¨æ¨¨ ®ª
 		rq 0
+	rb 4096
-	rb 4096 ;2048
+align 16
 stacktop:
 	sys_path rb 1024
 	file_name:
 		rb 1024 ;4096

Subversion Repositories Kolibri OS

(root)/programs/media/voxel_editor/trunk/voxel_editor.asm – Rev 5390 → 6247