WebSVN – Kolibri OS – Diff – /programs/media/voxel_editor/utilites/vox_tgl.asm

 include '../../../../programs/develop/libraries/TinyGL/asm_fork/opengl_const.inc'
 include 'vox_3d.inc'
 include '../trunk/str.inc'
 @use_library_mem mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
-caption db 'Voxel viewer 29.01.15',0 ;¯®¤¯¨áì ®ª
+caption db 'Voxel viewer 11.02.15',0 ;¯®¤¯¨áì ®ª
 struct FileInfoBlock
 	Function dd ?
 run_file_70 FileInfoBlock
 image_data dd 0 ;ãª § â¥«ì   ¢à¥¬¥ãî ¯ ¬ïâì. ¤«ï ã¦¥ ¯à¥®¡à §®¢ ¨ï ¨§®¡à ¦¥¨ï
 IMAGE_TOOLBAR_ICON_SIZE equ 16*16*3
-IMAGE_TOOLBAR_SIZE equ IMAGE_TOOLBAR_ICON_SIZE*9
+IMAGE_TOOLBAR_SIZE equ IMAGE_TOOLBAR_ICON_SIZE*10
 image_data_toolbar dd 0
 	mcall 40,0x27
 	stdcall [OpenDialog_Init],OpenDialog_data ;¯®¤£®â®¢ª  ¤¨ «®£
 	stdcall [buf2d_create], buf_0 ;á®§¤ ¨¥ ¡ãä¥à
+	load_image_file 'toolbar_t.png', image_data_toolbar,IMAGE_TOOLBAR_SIZE*2 ;*2 for gray icons
+	mov eax,[image_data_toolbar]
 	add eax,IMAGE_TOOLBAR_SIZE
-	load_image_file 'toolbar_t.png', image_data_toolbar,IMAGE_TOOLBAR_SIZE
+	stdcall img_to_gray, [image_data_toolbar],eax,(IMAGE_TOOLBAR_SIZE)/3
 	int 0x40
 	add ebx,25 shl 16
 	mov edx,12
 	int 0x40
+	call draw_toolbar_i
+	stdcall [buf2d_draw], buf_0
+	stdcall [kosglSwapBuffers]
+	mcall 12,2
+popad
+	ret
+align 4
 draw_toolbar_i:
 	; *** à¨á®¢ ¨¥ ¨ª®®ª   ª®¯ª å ***
 	mov edx,(7 shl 16)+7 ;icon new
 	mcall 7,[image_data_toolbar],(16 shl 16)+16
 	add edx,(30 shl 16) ;zoom +
 	int 0x40
 	add ebx,IMAGE_TOOLBAR_ICON_SIZE
 	add edx,(25 shl 16) ;zoom -
 	int 0x40
 	add ebx,IMAGE_TOOLBAR_ICON_SIZE
+	cmp word[opt_light],0
+	jne @f
+		add ebx,IMAGE_TOOLBAR_SIZE ;make gray icon
+	@@:
 	add edx,(25 shl 16) ;light on/off
 	int 0x40
+	cmp word[opt_light],0
+	jne @f
+		sub ebx,IMAGE_TOOLBAR_SIZE
+	@@:
 	add ebx,IMAGE_TOOLBAR_ICON_SIZE
+	cmp word[opt_cube_box],0
+	jne @f
+		add ebx,IMAGE_TOOLBAR_SIZE ;make gray icon
+	@@:
 	add edx,(25 shl 16) ;box on/off
 	int 0x40
+	cmp word[opt_cube_box],0
+	jne @f
+		sub ebx,IMAGE_TOOLBAR_SIZE
+	@@:
 	add ebx,IMAGE_TOOLBAR_ICON_SIZE
+	cmp word[opt_auto_rotate],0
+	jne @f
+		add ebx,IMAGE_TOOLBAR_SIZE ;make gray icon
+	@@:
 	add edx,(25 shl 16) ;auto rotate on/off
 	int 0x40
+	cmp word[opt_auto_rotate],0
+	jne @f
+		sub ebx,IMAGE_TOOLBAR_SIZE
+	@@:
 	add ebx,IMAGE_TOOLBAR_ICON_SIZE
 	add edx,(25 shl 16) ;info voxels
 	int 0x40
 	add ebx,IMAGE_TOOLBAR_ICON_SIZE
 	add edx,(25 shl 16) ;refresh
 	int 0x40
-	stdcall [buf2d_draw], buf_0
-	stdcall [kosglSwapBuffers]
-	mcall 12,2
-popad
 	ret
 align 4
 key:
 	mcall 2
 	cmp ah,178 ;Up
 	jne @f
-		fld dword[angle_z]
+		fld dword[angle_x]
 		fadd dword[delt_size]
-		fstp dword[angle_z]
+		fstp dword[angle_x]
 		call draw_3d
 		stdcall [kosglSwapBuffers]
 	@@:
 	cmp ah,177 ;Down
 	jne @f
-		fld dword[angle_z]
+		fld dword[angle_x]
 		fsub dword[delt_size]
-		fstp dword[angle_z]
+		fstp dword[angle_x]
 		call draw_3d
 		stdcall [kosglSwapBuffers]
 	@@:
 	cmp ah,176 ;Left
 	jne @f
-		fld dword[angle_x]
+		fld dword[angle_y]
 		fadd dword[delt_size]
-		fstp dword[angle_x]
+		fstp dword[angle_y]
 		call draw_3d
 		stdcall [kosglSwapBuffers]
 	@@:
 	cmp ah,179 ;Right
 	jne @f
-		fld dword[angle_x]
+		fld dword[angle_y]
 		fsub dword[delt_size]
-		fstp dword[angle_x]
+		fstp dword[angle_y]
 		call draw_3d
 	jne @f
 		call but_6
 	@@:
 	cmp ah,12
 	jne @f
-		call but_7
+		call but_draw_cadr
 	@@:
 	cmp ah,1
 	jne still
 .exit:
 	stdcall [buf2d_delete],buf_0
 	mcall -1
 align 4
 but_new_file:
-	mov dword[angle_x], 0.0
+	mov dword[angle_x], 30.0
-	mov [angle_y], 0.0
+	mov dword[angle_y], 180.0
-	mov [angle_z], 180.0
+	mov dword[angle_z], 180.0
 	ret
 	stdcall [buf2d_draw], buf_0 ;®¡®¢«ï¥¬ ¡ãä¥à   íªà ¥
 	ret
 align 4
-rot_angles dd 0,45,90,135,180,225,270,315
+rot_angles dd 180,225,270,315,0,45,90,135
 align 4
     @@:
     ret
 endp
 align 4
-proc but_3 uses eax
+proc but_3 uses eax ebx ecx edx
 	xor word[opt_light],1
 	cmp word[opt_light],0
 	je @f
 		stdcall [glEnable], GL_LIGHTING
 		stdcall [glEnable], GL_LIGHT0
 		jmp .end_light
 	@@:
 		stdcall [glDisable], GL_LIGHTING
 		stdcall [glDisable], GL_LIGHT0
+	.end_light:
-	.end_light:
+	call draw_toolbar_i
 	call draw_3d
 	stdcall [kosglSwapBuffers]
 	ret
 endp
 align 4
+proc but_4 uses eax ebx ecx edx
-proc but_4 uses eax
+	xor word[opt_cube_box],1
-	xor word[opt_cube_box],1
+	call draw_toolbar_i
 	call draw_3d
 	stdcall [kosglSwapBuffers]
 	ret
 endp
+align 4
-align 4
+proc but_5 uses eax ebx ecx edx
-proc but_5 uses eax
+	xor word[opt_auto_rotate],1
-	xor word[opt_auto_rotate],1
+	call draw_toolbar_i
 	ret
 txt_stat_m2:
 	db 13,10,'â®¡à ¦ ¥¬ëå £à ¥©: '
 .v: rb 20
 align 4
+proc but_draw_cadr uses eax ebx ecx edx
+	mov ebx,[angle_x]
+	mov ecx,[angle_y]
-proc but_7 uses eax
+	mov edx,[angle_z]
+	call draw_cadr_8
+	mov [angle_x],ebx
+	mov [angle_y],ecx
+	mov [angle_z],edx
+	cmp word[opt_auto_rotate],0
+	jne @f
+		call draw_3d
+		;stdcall [kosglSwapBuffers]
-	call draw_cadr_8
+	@@:
 	ret
 endp
 	stdcall [glTranslatef], 0.0,0.0,0.5 ;ª®®à¤¨ âë ¯® ®á¨ z ¤®«¦ë ¡ëâì ¢ ¯à¥¤¥« å ®â 0.0 ¤® 1.0, ¨ ç¥ ¨§®¡à ¦¥¨¥ ¡ã¤¥â ®âá¥ª âìáï
 		;¢®ªá¥«ìë© ®¡ê¥ªâ ¨¬¥¥â ª®®à¤¨ âë ¯® ®áï¬ ®â -0.5 ¤® 0.5, ¯®â®¬ã ¥£® ¤¢¨£ ¥¬   +0.5
 		;® ¢á¥ ¦¥ ¯à¨ ¯®¢®à®â å ¡ã¤ãâ ®âá¥ª âáï ªà ï, ª®â®àë¥ ¢ë«¥§ãâ §  ¯à¥¤¥«ë ¯«®áª®áâ¥© ®âá¥ç¥¨ï
 		;¢ ¢¥àá¨¨ opengl ¯®¤ Win ª®®à¤¨ âë ¨¤ãâ ®â -1.0 ¤® 1.0 ¯®â®¬ã â ¬ íâ®£® ¤¥« âì ¥ ã¦®
 	stdcall [glScalef], [scale], [scale], [scale] ;ã¢¥«¨ç¨¢ ¥¬ ¢®ªá¥«ìë© ®¡ê¥ªâ, çâ®-¡ë ¥ ¡ë« ®ç¥ì ¬ «¥ìª¨¬
-	stdcall [glRotatef], [angle_y],0.0,1.0,0.0
 	stdcall [glRotatef], [angle_x],1.0,0.0,0.0
+	stdcall [glRotatef], [angle_y],0.0,1.0,0.0
 	stdcall [glRotatef], [angle_z],0.0,0.0,1.0
 	stdcall draw_voxels_3d,[open_file_ogl]
 	stdcall [glPopMatrix]
     ;;;stdcall [glLightModeli], GL_LIGHT_MODEL_TWO_SIDE, GL_TRUE
     ret
-endp
-;input:
-; buf - ãª § â¥«ì   áâà®ªã, ç¨á«® ¤®«¦® ¡ëâì ¢ 10 ¨«¨ 16 à¨ç®¬ ¢¨¤¥
-;output:
+endp
-; eax - ç¨á«®
-align 4
-proc conv_str_to_int, buf:dword
+align 4
-	xor eax,eax
+proc img_to_gray, buf_rgb:dword, buf_g24:dword, pixels:dword
-	push ebx ecx esi
+pushad
-	xor ebx,ebx
-	mov esi,[buf]
+	mov esi,[buf_rgb]
-	;®¯à¥¤¥«¥¨¥ ®âà¨æ â¥«ìëå ç¨á¥«
+	mov edi,[buf_g24]
-	xor ecx,ecx
-	inc ecx
-	cmp byte[esi],'-'
-	jne @f
+	mov ecx,[pixels]
-		dec ecx
+	mov ebx,3
-		inc esi
-	@@:
-	cmp word[esi],'0x'
-	je .load_digit_16
+align 4
-	.load_digit_10: ;áç¨âë¢ ¨¥ 10-â¨çëå æ¨äà
-		mov bl,byte[esi]
-		cmp bl,'0'
-		jl @f
-		cmp bl,'9'
-		jg @f
+	@@:
-			sub bl,'0'
+		movzx eax,byte[esi]
-			imul eax,10
-			add eax,ebx
-			inc esi
-			jmp .load_digit_10
-	jmp @f
-	.load_digit_16: ;áç¨âë¢ ¨¥ 16-à¨çëå æ¨äà
-		add esi,2
+		movzx edx,byte[esi+1]
-	.cycle_16:
+		add eax,edx
-		mov bl,byte[esi]
-		cmp bl,'0'
+		movzx edx,byte[esi+2]
-		jl @f
-		cmp bl,'f'
+		add eax,edx
-		jg @f
-		cmp bl,'9'
-		jle .us1
-			cmp bl,'A'
-			jl @f ;®âá¥¨¢ ¥¬ á¨¬¢®«ë >'9' ¨ <'A'
+		xor edx,edx
-		.us1: ;á®áâ ¢®¥ ãá«®¢¨¥
-		cmp bl,'F'
+		div ebx ;shr eax,2
-		jle .us2
-			cmp bl,'a'
-			jl @f ;®âá¥¨¢ ¥¬ á¨¬¢®«ë >'F' ¨ <'a'
-			sub bl,32 ;¯¥à¥¢®¤¨¬ á¨¬¢®«ë ¢ ¢¥àå¨© à¥£¨áâà, ¤«ï ã¯à®é¥¨ï ¨å ¯®á«¥¤ãé¥© ®¡à ¡®âª¨
-		.us2: ;á®áâ ¢®¥ ãá«®¢¨¥
+		mov ah,al
-			sub bl,'0'
-			cmp bl,9
-			jle .cor1
-				sub bl,7 ;convert 'A' to '10'
+		mov word[edi],ax
-			.cor1:
+		mov byte[edi+2],al
-			shl eax,4
-			add eax,ebx
-			inc esi
-			jmp .cycle_16
-	@@:
+		add esi,3
-	or ecx,ecx ;¥á«¨ ç¨á«® ®âà¨æ â¥«ì®¥
-	jnz @f
-		neg eax
+		add edi,3
-		inc eax
-	@@:
+		loop @b
-	pop esi ecx ebx
+popad
+	ret
-	ret
+endp
 endp
 ;¤ ë¥ ¤«ï ¤¨ «®£  ®âªàëâ¨ï ä ©«®¢
 align 4
 angle_z dd 0.0
 delt_size dd 3.0
 opt_light dw 0 ;®¯æ¨ï ¤«ï ¢ª«îç¥¨ï/¢ëª«îç¥¨ï á¢¥â
 opt_cube_box dw 1 ;®¯æ¨ï ¤«ï à¨á®¢ ¨ï à ¬ª¨ ¢®ªàã£ ®¡ê¥ªâ
-opt_auto_rotate dw 1 ;®¯æ¨ï ¤«ï  ¢â®¬ â¨ç¥áª®£® ¯®¢®à®â  ®¡ê¥ªâ
+opt_auto_rotate dw 0 ;®¯æ¨ï ¤«ï  ¢â®¬ â¨ç¥áª®£® ¯®¢®à®â  ®¡ê¥ªâ
 light_position dd 0.0, 0.0, 2.0, 1.0 ;  á¯®«®¦¥¨¥ ¨áâ®ç¨ª  [0][1][2]

Subversion Repositories Kolibri OS

(root)/programs/media/voxel_editor/utilites/vox_tgl.asm – Rev 5388 → 5393