Subversion Repositories Kolibri OS

Rev

Rev 2759 | Rev 2815 | Go to most recent revision | Show entire file | Regard whitespace | Details | Blame | Last modification | View Log | RSS feed

Rev 2759 Rev 2808
Line 15... Line 15...
15
include 'mem.inc'
15
include 'mem.inc'
16
include 'dll.inc'
16
include 'dll.inc'
17
include 'vox_draw.inc'
17
include 'vox_draw.inc'
Line 18... Line 18...
18
 
18
 
19
@use_library_mem mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
19
@use_library_mem mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
Line 20... Line 20...
20
caption db 'Voxel editor 12.06.12',0 ;¯®¤¯¨áì ®ª­ 
20
caption db 'Voxel editor 19.06.12',0 ;¯®¤¯¨áì ®ª­ 
21
 
21
 
22
struct FileInfoBlock
22
struct FileInfoBlock
23
	Function dd ?
23
	Function dd ?
Line 472... Line 472...
472
	mov esi,[sc.work_button_text]
472
	mov esi,[sc.work_button_text]
473
	or  esi,(1 shl 30)
473
	or  esi,(1 shl 30)
474
	mov edi,[sc.work_button]
474
	mov edi,[sc.work_button]
475
	int 0x40 ;¬ áèâ ¡
475
	int 0x40 ;¬ áèâ ¡
476
	mov ecx,[v_cur_x]
476
	mov ecx,[v_cur_x]
477
	add edx,(6*2)*65536+9
477
	add edx,9
478
	int 0x40 ;
478
	int 0x40 ;ªãàá®à x
479
	mov ecx,[v_cur_y]
479
	mov ecx,[v_cur_y]
480
	add edx,(6*0)*65536+9
480
	add edx,9
481
	int 0x40 ;
481
	int 0x40 ;ªãàá®à y
482
	mov ecx,[n_plane]
482
	mov ecx,[n_plane]
483
	add edx,(6*0)*65536+9
483
	add edx,9
484
	int 0x40 ;­®¬¥à á¥ç¥­¨ï
484
	int 0x40 ;­®¬¥à á¥ç¥­¨ï
Line 485... Line 485...
485
 
485
 
486
	mov eax,4 ;à¨á®¢ ­¨¥ ⥪áâ 
486
	mov eax,4 ;à¨á®¢ ­¨¥ ⥪áâ 
487
	mov ebx,(OT_CAPT_X_COLOR shl 16)+OT_CAPT_Y_COLOR+2
487
	mov ebx,(OT_CAPT_X_COLOR shl 16)+OT_CAPT_Y_COLOR+2
Line 912... Line 912...
912
		jle .end_scaled
912
		jle .end_scaled
913
			;७¤¥à 㢥«¨ç¥­­®© ç á⨠®¡ê¥ªâ 
913
			;७¤¥à 㢥«¨ç¥­­®© ç á⨠®¡ê¥ªâ 
914
			mov ebx,[scaled_zoom]
914
			mov ebx,[scaled_zoom]
915
			sub eax,ebx
915
			sub eax,ebx
916
			inc ebx
916
			inc ebx
917
			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, 0xd080d0
917
			stdcall [buf2d_vox_obj_draw_3g_scaled], buf_r_img, buf_r_z, buf_vox,\
-
 
918
				[open_file_vox], 0,0, 0, ebx, [cam_x],[cam_y],[cam_z],eax, [sc.work_graph]
918
			bt dword[mode_light],0
919
			bt dword[mode_light],0
919
			jnc @f
920
			jnc @f
920
				stdcall [buf2d_vox_obj_draw_3g_shadows], buf_r_img, buf_r_z, buf_vox, 0,0, 0, ebx, 3
921
				stdcall [buf2d_vox_obj_draw_3g_shadows], buf_r_img, buf_r_z, buf_vox, 0,0, 0, ebx, 3
921
			@@:
922
			@@:
922
			xor ebx,ebx
923
			xor ebx,ebx
Line 1036... Line 1037...
1036
		bt dword[mode_light],0
1037
		bt dword[mode_light],0
1037
		jnc .end_2
1038
		jnc .end_2
1038
			stdcall [buf2d_vox_obj_draw_3g_shadows], buf_0, buf_0z, buf_vox, 0,0, 0, [scaled_zoom], 3
1039
			stdcall [buf2d_vox_obj_draw_3g_shadows], buf_0, buf_0z, buf_vox, 0,0, 0, [scaled_zoom], 3
1039
		.end_2:
1040
		.end_2:
1040
	.end_0:
1041
	.end_0:
1041
 
-
 
1042
	pop ecx ebx eax
1042
	pop ecx ebx eax
Line -... Line 1043...
-
 
1043
 
1043
 
1044
	call draw_vox_cursor
1044
	stdcall [buf2d_draw], buf_0 ;®¡­®¢«ï¥¬ ¡ãä¥à ­  íªà ­¥
1045
	stdcall [buf2d_draw], buf_0 ;®¡­®¢«ï¥¬ ¡ãä¥à ­  íªà ­¥
1045
	stdcall [buf2d_draw], buf_pl ;®¡­®¢«ï¥¬ ¡ãä¥à ­  íªà ­¥
1046
	stdcall [buf2d_draw], buf_pl ;®¡­®¢«ï¥¬ ¡ãä¥à ­  íªà ­¥
1046
	.end_f:
1047
	.end_f:
Line -... Line 1048...
-
 
1048
	ret
-
 
1049
 
-
 
1050
;à¨á®¢ ­¨¥ ªãàá®à 
-
 
1051
align 4
-
 
1052
draw_vox_cursor:
-
 
1053
pushad
-
 
1054
	mov ecx,[v_zoom]
-
 
1055
	cmp ecx,[scaled_zoom]
-
 
1056
	jle @f
-
 
1057
		mov ecx,[scaled_zoom]
-
 
1058
	@@:
-
 
1059
	xor edx,edx
-
 
1060
	inc edx
-
 
1061
	shl edx,cl
-
 
1062
 
-
 
1063
	mov eax,[v_cur_x]
-
 
1064
	cmp eax,edx
-
 
1065
	jge .end_f ;ªãàá®à §  ¯à¥¤¥« ¬¨ ¯®«ï
-
 
1066
	mov edi,TILE_SIZE
-
 
1067
	imul eax,edi
-
 
1068
	add eax,OT_MAP_X
-
 
1069
	mov ebx,edx
-
 
1070
	dec ebx
-
 
1071
	sub ebx,[v_cur_y]
-
 
1072
	imul ebx,edi
-
 
1073
	add ebx,OT_MAP_Y
-
 
1074
	inc eax
-
 
1075
	inc ebx
-
 
1076
	sub edi,2
-
 
1077
	stdcall [buf2d_rect_by_size], buf_pl, eax,ebx, edi,edi,[sc.work_graph]
-
 
1078
	dec ebx
-
 
1079
	add edi,2
-
 
1080
 
-
 
1081
	;£®à¨§®­â «ì­ë¥ «¨­¨¨
-
 
1082
	sub eax,2
-
 
1083
	mov ecx,edi
-
 
1084
	imul edi,edx
-
 
1085
	shr ecx,1
-
 
1086
	add ebx,ecx ;業â஢ª  ¯® á¥à¥¤¨­¥ ª«¥âª¨
-
 
1087
	mov ecx,OT_MAP_X
-
 
1088
	add edi,ecx
-
 
1089
	stdcall [buf2d_line], buf_pl, ecx,ebx, eax,ebx,[sc.work_graph]
-
 
1090
	add eax,TILE_SIZE
-
 
1091
	inc eax
-
 
1092
	cmp eax,edi
-
 
1093
	jge @f ;¥á«¨ ªãàá®à ­  ªà î ¯®«ï
-
 
1094
		dec edi
-
 
1095
		stdcall [buf2d_line], buf_pl, eax,ebx, edi,ebx,[sc.work_graph]
-
 
1096
	@@:
-
 
1097
 
-
 
1098
	.end_f:
-
 
1099
popad
1047
	ret
1100
	ret
1048
 
1101
 
1049
if 0
1102
if 0
1050
;input:
1103
;input:
1051
; buf - 㪠§ â¥«ì ­  áâபã, ç¨á«® ¤®«¦­® ¡ëâì ¢ 10 ¨«¨ 16 à¨ç­®¬ ¢¨¤¥
1104
; buf - 㪠§ â¥«ì ­  áâபã, ç¨á«® ¤®«¦­® ¡ëâì ¢ 10 ¨«¨ 16 à¨ç­®¬ ¢¨¤¥