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

 include 'mem.inc'
 include 'dll.inc'
 include 'vox_draw.inc'
 @use_library_mem mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
-caption db 'Voxel editor 12.09.12',0 ;¯®¤¯¨áì ®ª
+caption db 'Voxel editor 01.10.12',0 ;¯®¤¯¨áì ®ª
 struct FileInfoBlock
 	Function dd ?
 run_file_70 FileInfoBlock
 image_data dd 0 ;ãª § â¥«ì   ¢à¥¬¥ãî ¯ ¬ïâì. ¤«ï ã¦¥ ¯à¥®¡à §®¢ ¨ï ¨§®¡à ¦¥¨ï
 fn_toolbar db 'toolbar.png',0
 IMAGE_TOOLBAR_ICON_SIZE equ 16*16*3
-IMAGE_TOOLBAR_SIZE equ IMAGE_TOOLBAR_ICON_SIZE*22
+IMAGE_TOOLBAR_SIZE equ IMAGE_TOOLBAR_ICON_SIZE*23
 image_data_toolbar dd 0
 cursors_count equ 4
 IMAGE_CURSORS_SIZE equ 4096*cursors_count ;à §¬¥à ª àâ¨ª¨ á ªãàá®à ¬¨
 	stdcall [buf2d_create], buf_0 ;á®§¤ ¨¥ ¡ãä¥à  ¨§®¡à ¦¥¨ï
 	stdcall [buf2d_create], buf_0z ;á®§¤ ¨¥ ¡ãä¥à  £«ã¡¨ë
 	stdcall [buf2d_create], buf_pl ;á®§¤ ¨¥ ¡ãä¥à  ¤«ï á¥ç¥¨ï
 	stdcall [buf2d_vox_brush_create], buf_vox_g3, vox_6_7_z
-	stdcall [buf2d_vox_brush_create], buf_vox, vox_6_7_z
+	stdcall [buf2d_vox_brush_create], buf_vox_g2, vox_6_4_z
 		jle @f
 		;à¥¦¨¬ ¬ áèâ ¡¨à®¢ ¨ï ¨§®¡à ¦¥¨ï
 		sub edx,[scaled_zoom]
 		sub ax,word[buf_0.t]
 		sub bx,word[buf_0.l]
-		stdcall get_mouse_ev_scale, buf_vox, ebx, eax, [scaled_zoom],edx
+		stdcall get_mouse_ev_scale, [buf_vox], ebx, eax, [scaled_zoom],edx
 		cmp eax,0
 		je @f
 			mov ebx,eax
 			and eax,0x3fffffff
 			rol ebx,2
 	mov edx,23
 	int 0x40
 	add ebx,25 shl 16
 	mov edx,24
 	int 0x40
+	add ebx,25 shl 16
+	mov edx,25
+	int 0x40
 	; *** à¨á®¢ ¨¥ ¨ª®®ª   ª®¯ª å ***
 	mov eax,7
 	mov ebx,[image_data_toolbar]
 	int 0x40
 	add ebx,IMAGE_TOOLBAR_ICON_SIZE
 	add edx,(25 shl 16) ;ã¬¥ìè. ¬ áèâ ¡
 	int 0x40
 	add ebx,IMAGE_TOOLBAR_ICON_SIZE
+	add edx,(25 shl 16) ;camera 3g 2g
+	int 0x40
+	add ebx,IMAGE_TOOLBAR_ICON_SIZE
 	add edx,(25 shl 16) ;¯®¢®à®â 1
 	int 0x40
 	add ebx,IMAGE_TOOLBAR_ICON_SIZE
 	add edx,(25 shl 16) ;¯®¢®à®â 2
 	int 0x40
 	jne @f
 		call but_zoom_m
 	@@:
 	cmp ah,8
 	jne @f
-		call but_3
+		call but_camera_3g_2g
 	@@:
 	cmp ah,9
 	jne @f
-		call but_4
+		call but_3
 	@@:
 	cmp ah,10
 	jne @f
-		call but_plane_inc
+		call but_4
 	@@:
 	cmp ah,11
 	jne @f
-		call but_plane_dec
+		call but_plane_inc
 	@@:
 	cmp ah,12
 	jne @f
-		call but_mode_pen
+		call but_plane_dec
 	@@:
 	cmp ah,13
 	jne @f
-		call but_mode_brush
+		call but_mode_pen
 	@@:
 	cmp ah,14
 	jne @f
-		call but_mode_clear
+		call but_mode_brush
 	@@:
 	cmp ah,15
 	jne @f
+		call but_mode_clear
+	@@:
+	cmp ah,16
+	jne @f
 		stdcall set_pen_mode,PEN_MODE_SELECT_COLOR,3,((9 shl 8)+9) shl 16
 		call draw_palete
 	@@:
-	cmp ah,16
+	cmp ah,17
 	jne @f
 		call but_light
 	@@:
-	cmp ah,17
+	cmp ah,18
 	jne @f
 		call but_rend_2_2
 	@@:
-	cmp ah,18
+	cmp ah,19
 	jne @f
 		call but_brush_copy
 	@@:
-	cmp ah,19
+	cmp ah,20
 	jne @f
 		call but_brush_draw
 	@@:
-	cmp ah,20
+	cmp ah,21
 	jne @f
 		call but_brush_clear
 	@@:
-	cmp ah,21
+	cmp ah,22
 	jne @f
 		call but_bru_w_m
 	@@:
-	cmp ah,22
+	cmp ah,23
 	jne @f
 		call but_bru_w_p
 	@@:
-	cmp ah,23
+	cmp ah,24
 	jne @f
 		call but_bru_h_m
 	@@:
-	cmp ah,24
+	cmp ah,25
 	jne @f
 		call but_bru_h_p
 	@@:
 	cmp ah,1
 	jne still
 	cmp dword[buf_r_img],0
 	je @f
 		stdcall [buf2d_delete],buf_r_img
 		stdcall [buf2d_delete],buf_r_z
 	@@:
+	stdcall [buf2d_vox_brush_delete], buf_vox_g3
-	stdcall [buf2d_vox_brush_delete], buf_vox
+	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
 		.end_save_file:
 	popad
+	ret
+;á¬¥  ¢¨¤  ª ¬¥àë   ¯à®á¬®âà 3 ¨ 2 £à ¥©
+align 4
+but_camera_3g_2g:
+	cmp dword[buf_vox],buf_vox_g3
+	je @f
+		mov dword[buf_vox],buf_vox_g3
+		jmp .end_0
+	@@:
+		mov dword[buf_vox],buf_vox_g2
+	.end_0:
+	call draw_objects
 	ret
 ;ã¢¥«¨ç¥¨¥ ¬ áèâ ¡
 align 4
 but_zoom_p:
 		jle .end_scaled
 			;à¥¤¥à ã¢¥«¨ç¥®© ç áâ¨ ®¡ê¥ªâ
 			mov ebx,[scaled_zoom]
 			sub eax,ebx
 			inc ebx
-			stdcall [buf2d_vox_obj_draw_3g_scaled], buf_r_img, buf_r_z, buf_vox,\
+			stdcall [buf2d_vox_obj_draw_3g_scaled], buf_r_img, buf_r_z, [buf_vox],\
 				[open_file_vox], 0,0, 0, ebx, [cam_x],[cam_y],[cam_z],eax, [sc.work_graph]
 			bt dword[mode_light],0
 			jnc @f
-				stdcall [buf2d_vox_obj_draw_3g_shadows], buf_r_img, buf_r_z, buf_vox, 0,0, 0, ebx, 3
+				stdcall [buf2d_vox_obj_draw_3g_shadows], buf_r_img, buf_r_z, [buf_vox], 0,0, 0, ebx, 3
 			@@:
 			xor ebx,ebx
 			xor ecx,ecx
 			mov edi,buf_r_img
 			stdcall [buf2d_img_hdiv2], edi
 			shr buf2d_w,1
 			jmp .show
 		.end_scaled:
 		inc eax
-		stdcall [buf2d_vox_obj_draw_3g], buf_r_img, buf_r_z, buf_vox, [open_file_vox], 0,0, 0, eax
+		stdcall [buf2d_vox_obj_draw_3g], buf_r_img, buf_r_z, [buf_vox], [open_file_vox], 0,0, 0, eax
 		stdcall [buf2d_vox_obj_draw_1g], buf_r_img, buf_r_z, [open_file_vox], 0,0, eax
 		bt dword[mode_light],0
 		jnc @f
-			stdcall [buf2d_vox_obj_draw_3g_shadows], buf_r_img, buf_r_z, buf_vox, 0,0, 0, eax, 3
+			stdcall [buf2d_vox_obj_draw_3g_shadows], buf_r_img, buf_r_z, [buf_vox], 0,0, 0, eax, 3
 		@@:
 		mov edi,buf_r_img
 		stdcall [buf2d_img_hdiv2], edi
 		shr buf2d_h,1
 		stdcall [buf2d_img_wdiv2], edi
 		shr buf2d_w,1
-		stdcall [buf2d_vox_obj_get_img_w_3g], buf_vox,[v_zoom]
+		stdcall [buf2d_vox_obj_get_img_w_3g], [buf_vox],[v_zoom]
 		mov ebx,[buf_0.w]
 		sub ebx,eax
 		shr ebx,1 ;ebx - ¤«ï æ¥âà®¢ª¨ ¬ «¥ìª¨å ¨§®¡à ¦¥¨© ¯® £®à¨§®â «¨
-		stdcall [buf2d_vox_obj_get_img_h_3g], buf_vox,[v_zoom]
+		stdcall [buf2d_vox_obj_get_img_h_3g], [buf_vox],[v_zoom]
 		cmp eax,[buf_0.h]
 		jg @f
 	jne @f
 		call draw_palete
 		jmp .end_f
 	@@:
 	push eax ebx ecx
-	stdcall [buf2d_vox_obj_get_img_w_3g], buf_vox,[v_zoom]
+	stdcall [buf2d_vox_obj_get_img_w_3g], [buf_vox],[v_zoom]
 	mov ebx,[buf_0.w]
 	sub ebx,eax
 	shr ebx,1 ;ebx - ¤«ï æ¥âà®¢ª¨ ¬ «¥ìª¨å ¨§®¡à ¦¥¨© ¯® £®à¨§®â «¨
 	xor ecx,ecx
-	stdcall [buf2d_vox_obj_get_img_h_3g], buf_vox,[v_zoom]
+	stdcall [buf2d_vox_obj_get_img_h_3g], [buf_vox],[v_zoom]
 	cmp eax,[buf_0.h]
 	jg @f
 		mov ecx,[buf_0.h]
 		sub ecx,eax
-		shr ecx,1 ;ecx - ¤«ï æ¥âà®¢ª¨ ¬ «¥ìª¨å ¨§®¡à ¦¥¨© ¯®
+		shr ecx,1 ;ecx - ¤«ï æ¥âà®¢ª¨ ¬ «¥ìª¨å ¨§®¡à ¦¥¨© ¯® ¢¥àâ¨ª «¨
 	@@:
 	mov eax,[v_zoom]
 	cmp eax,[scaled_zoom]
 	jg @f
 		;®¡ëçë© à¥¦¨¬ ¨§®¡à ¦¥¨ï
-		stdcall [buf2d_vox_obj_draw_3g], buf_0, buf_0z, buf_vox,\
+		stdcall [buf2d_vox_obj_draw_3g], buf_0, buf_0z, [buf_vox],\
 			[open_file_vox], ebx,ecx, 0, eax
 		stdcall [buf2d_vox_obj_draw_pl], buf_pl, [open_file_vox],\
 			OT_MAP_X,OT_MAP_Y,[tile_size], eax, [n_plane], [sc.work_graph]
 		stdcall [buf2d_vox_obj_draw_1g], buf_0, buf_0z,\
 			[open_file_vox], 0,0, eax
 		bt dword[mode_light],0
 		jnc .end_1
-			stdcall [buf2d_vox_obj_draw_3g_shadows], buf_0, buf_0z, buf_vox, ebx,ecx, 0, eax, 3
+			stdcall [buf2d_vox_obj_draw_3g_shadows], buf_0, buf_0z, [buf_vox], ebx,ecx, 0, eax, 3
 		.end_1:
 		jmp .end_0
 	@@:
 		;à¥¦¨¬ ¬ áèâ ¡¨à®¢ ¨ï ¨§®¡à ¦¥¨ï
 		sub eax,[scaled_zoom]
-		stdcall [buf2d_vox_obj_draw_3g_scaled], buf_0, buf_0z, buf_vox,\
+		stdcall [buf2d_vox_obj_draw_3g_scaled], buf_0, buf_0z, [buf_vox],\
 			[open_file_vox], 0,0, 0, [scaled_zoom], [cam_x],[cam_y],[cam_z],eax, [sc.work_graph] ;scroll -> 2^eax
 		stdcall [buf2d_vox_obj_draw_pl_scaled], buf_pl, [open_file_vox],\
 			OT_MAP_X,OT_MAP_Y,[tile_size], [scaled_zoom], [n_plane], [sc.work_graph],[cam_x],[cam_y],[cam_z],eax
 		bt dword[mode_light],0
 		jnc .end_2
-			stdcall [buf2d_vox_obj_draw_3g_shadows], buf_0, buf_0z, buf_vox, 0,0, 0, [scaled_zoom], 3
+			stdcall [buf2d_vox_obj_draw_3g_shadows], buf_0, buf_0z, [buf_vox], 0,0, 0, [scaled_zoom], 3
 		.end_2:
 	.end_0:
 	dd 0 ;+16 color
 	db 24 ;+20 bit in pixel
 ;¤ ë¥ ¤«ï á®§¤ ¨ï ¬¨¨¬ «ì®£® ¥¤¨¨ç®£® ¢®ªá¥«ï
 align 4
-vox_6_7_z:
+vox_6_7_z: ;¢®ªá¥«ì £¤¥ ¢¨¤® 3 £à ¨
 dd 0,0,1,1,0,0,\
 ,2,2,2,2,0,\
 ,2,2,2,2,2,\
 ,3,2,2,3,2,\
 ,3,3,3,3,2,\
 ,3,3,3,3,0,\
 ,0,3,3,0,0
+align 4
+vox_6_4_z: ;¢®ªá¥«ì, £¤¥ ¢¨¤® 2 ¡®ª®¢ë¥ £à ¨   ¢¥àå¥© £à ¨ ¥ ¢¨¤®
+dd 1,2,3,3,2,1,\
+,2,3,3,2,1,\
+,2,3,3,2,1,\
+,2,3,3,2,1
+align 4
+buf_vox dd buf_vox_g3
 align 4
-buf_vox:
+buf_vox_g3:
+	db 6,7,4,3 ;w,h,h_osn,n
+	rb BUF_STRUCT_SIZE*(3+1)
+align 4
+buf_vox_g2:
-	db 6,7,4,3 ;w,h,h_osn,n
+	db 6,4,0,3 ;w,h,h_osn,n
 	rb BUF_STRUCT_SIZE*(3+1)
 i_end:
 	wnd_s_pos: ;¬¥áâ® ¤«ï  áâà®¥ª áâ àâ®¢®© ¯®§¨æ¨¨ ®ª

Subversion Repositories Kolibri OS

(root)/programs/media/voxel_editor/trunk/voxel_editor.asm – Rev 2974 → 2975