WebSVN – Kolibri OS – Diff – /programs/develop/info3ds/info3ds.asm

 include 'lang.inc'
 debug equ 0
 @use_library_mem mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
-capt db 'info 3ds 17.08.11',0 ;¯®¤¯¨áì ®ª
+capt db 'info 3ds 18.08.11',0 ;¯®¤¯¨áì ®ª
 struct FileInfoBlock
 image_data_toolbar dd 0
+;
 TREE_ICON_SYS16_BMP_SIZE equ IMAGE_TOOLBAR_ICON_SIZE*11+54 ;à §¬¥à bmp ä ©«  á á¨áâ¥¬ë¬¨ ¨ª®ª ¬¨
 icon_tl_sys dd 0 ;ãª § â¥¥«ì   ¯ ¬ïâì ¤«ï åà ¥¨ï á¨áâ¥¬ëå ¨ª®®ª
 icon_toolbar dd 0 ;ãª § â¥¥«ì   ¯ ¬ïâì ¤«ï åà ¥¨ï ¨ª®®ª ®¡ê¥ªâ®¢
-TOOLBAR_ICON_BMP_SIZE equ 256*5 ;à §¬¥à bmp ä ©«  á ¨ª®ª ¬¨ ®¡ê¥ªâ®¢
+TOOLBAR_ICON_BMP_SIZE equ IMAGE_TOOLBAR_ICON_SIZE*6+54 ;à §¬¥à bmp ä ©«  á ¨ª®ª ¬¨ ®¡ê¥ªâ®¢
+;
 IMAGE_FILE1_SIZE equ 128*144*3 ;à §¬¥à ä ©«  á ¨§®¡à ¦¥¨¥¬ 640 x 480
 macro load_image_file path,buf,size { ;¬ ªà®á ¤«ï § £àã§ª¨ ¨§®¡à ¦¥¨©
+}
 CHUNK_MAIN                equ 0x4D4D ; [-] áæ¥
 CHUNK_color_1             equ 0x0011 ; [+] æ¢¥â rgb (byte format)
-CHUNK_ambient_color       equ 0x2100 ; [-] ambient color
-CHUNK_VERSIONF            equ 0x0002 ; [+] ¨ä®à¬ æ¨ï ® ¢¥àá¨¨ ä ©«
+CHUNK_ambient_color       equ 0x2100 ; [-] ambient color
   CHUNK_OBJMESH           equ 0x3D3D ; [-] ¢áïç¥áª¨¥ ®¡ê¥ªâë
     CHUNK_OBJBLOCK        equ 0x4000 ; [+] ®¡ê¥ªâ
       CHUNK_TRIMESH       equ 0x4100 ; [-] trimesh-®¡ê¥ªâ
         CHUNK_VERTLIST    equ 0x4110 ; [+] á¯¨á®ª ¢¥àè¨
 MAX_FILE_LEVEL equ 20 ;¬ ªá¨¬ «ìë© ãà®¢¥ì ¢«®¦¥®áâ¨ ¡«®ª®¢ ¤«ï   «¨§
 MAX_FILE_SIZE equ 150*0x400 ;¬ ªá¨¬ «ìë© à §¬¥à ä ©«  (50 Kb)
 level_stack dd 0
 offs_last_timer dd 0 ;¯®á«¥¤¨© á¤¢¨£ ¯®ª § ë© ¢ äãªæ¨¨ â ©¬¥à
-ID_ICON_CHUNK_MAIN equ 0
+ID_ICON_CHUNK_MAIN equ 0 ;¨ª®ª  £« ¢®£® ¡«®ª
+ID_ICON_CHUNK_NOT_FOUND equ 1 ;¨ª®ª  ¥ ¨§¢¥áâ®£® ¡«®ª
+ID_ICON_DATA equ 2 ;¨ª®ª  ¤«ï ¤ ëå ¡«®ª , ¥ ®¯à¥¤¥«¥®© áâàãªâãàë
-ID_ICON_CHUNK_NOT_FOUND equ 1
-ID_ICON_DATA equ 2
+FILE_ERROR_CHUNK_SIZE equ -3 ;®è¨¡ª  ¢ à §¬¥à¥ ¡«®ª
+align 4
+type_bloks:
+block_3ds 0x0002,5,1 ;¨ä®à¬ æ¨ï ® ¢¥àá¨¨ ä ©«
+block_3ds 0x3d3e,5,1 ;mesh version
+block_3ds 0xA010,4,0 ;material ambient color
-align 4
+block_3ds 0xA020,4,0 ;material diffuse color
-type_bloks:
+block_3ds 0xA030,4,0 ;material specular color
-block_3ds CHUNK_color_1,     4,1 ; [+] æ¢¥â rgb (byte format)
-block_3ds CHUNK_ambient_color,3,0 ; [-] ambient color
+block_3ds CHUNK_color_1,     4,1 ; [+] æ¢¥â rgb (byte format)
-block_3ds CHUNK_VERSIONF,    3,1 ; [+] ä®à¬ æ¨ï ® ¢¥àá¨¨ ä ©«
+block_3ds CHUNK_ambient_color,3,0 ; [-] ambient color
 block_3ds CHUNK_OBJMESH,     3,0 ; [-] ¢áïç¥áª¨¥ ®¡ê¥ªâë
 block_3ds CHUNK_OBJBLOCK,    3,1 ; [+] ®¡ê¥ªâ
 block_3ds CHUNK_TRIMESH,     3,0 ; [-] trimesh-®¡ê¥ªâ
 if lang eq ru
 txt_open_3ds db 'âªàëâ ä ©«:',0
 txt_no_3ds db 'âªàëâë© ä ©« ¥ ¢ ä®à¬ â¥ *.3ds',0
+txt_3ds_big_file db ' §¬¥à ä ©«  ¡®«ìè¥ MAX_FILE_SIZE',0
-txt_3ds_big_file db ' §¬¥à ä ©«  ¡®«ìè¥ MAX_FILE_SIZE',0
+txt_3ds_err_sizes db '®§¬®¦® ä ©« ¯®¢à¥¦¤¥',0
 txt_3ds_offs:
 	db '¬¥é¥¨¥: '
 	.dig: rb 8
 	db 0
 else
 txt_open_3ds db 'Open file:',0
 txt_no_3ds db 'âªàëâë© ä ©« ¥ ¢ ä®à¬ â¥ *.3ds',0
+txt_3ds_big_file db ' §¬¥à ä ©«  ¡®«ìè¥ MAX_FILE_SIZE',0
-txt_3ds_big_file db ' §¬¥à ä ©«  ¡®«ìè¥ MAX_FILE_SIZE',0
+txt_3ds_err_sizes db '®§¬®¦® ä ©« ¯®¢à¥¦¤¥',0
 txt_3ds_offs:
 	db 'Offset: '
 	.dig: rb 8
 	db 0
 align 4
 buf_draw_beg:
 	stdcall [buf2d_clear], buf_0, [buf_0.color] ;ç¨áâ¨¬ ¡ãä¥à
 	stdcall [buf2d_draw_text], buf_0, buf_1,txt_open_3ds,5,5,0xff
 	stdcall [buf2d_draw_text], buf_0, buf_1,openfile_path,5,15,0xff
+	cmp dword[level_stack],FILE_ERROR_CHUNK_SIZE ;¢®§¬®¦  ®è¨¡ª  ä ©«
+	jne @f
+		stdcall [buf2d_draw_text], buf_0, buf_1,txt_3ds_err_sizes,5,25,0xff0000
+	@@:
 	ret
 align 4
 proc buf_draw_hex_table, offs:dword, size_line:dword
 	pushad
 	locals
 		coord_y dd 45
 	endl
 		mov esi,dword[offs]
-		mov edi,dword[open_file_lif]
-		add edi,6
+		mov edi,dword[open_file_lif]
 		add edi,dword[file_3ds+4] ;edi - ãª § â¥«ì   ª®¥æ ä ©«  ¢ ¯ ¬ïâ¨
 		mov dword[txt_3ds_offs.dig],0
 		cld
 		.cycle_rows:
 align 4
 draw_window:
 pushad
 	mcall 12,1
 	xor eax,eax
-	mov ebx,(20 shl 16)+510
+	mov ebx,(20 shl 16)+560
 	mov ecx,(20 shl 16)+315
 	mov edx,[sc.work]
 	or  edx,(3 shl 24)+0x10000000+0x20000000
 	mov edi,capt
 	int 0x40
 	mov ebx,(30 shl 16)+20
 	mov ecx,(5 shl 16)+20
 	mov edx,4
 	int 0x40
-	mov ebx,(55 shl 16)+20
+	;mov ebx,(55 shl 16)+20
-	mov ecx,(5 shl 16)+20
+	;mov ecx,(5 shl 16)+20
-	mov edx,5
+	;mov edx,5
-	int 0x40
+	;int 0x40
 	add ebx,IMAGE_TOOLBAR_ICON_SIZE
 	mov edx,(32 shl 16)+7 ;open
 	int 0x40
-	add ebx,IMAGE_TOOLBAR_ICON_SIZE
+	;add ebx,IMAGE_TOOLBAR_ICON_SIZE
-	mov edx,(57 shl 16)+7 ;open
+	;mov edx,(57 shl 16)+7 ;save
-	int 0x40
+	;int 0x40
 	mov dword[offs_last_timer],0
 	;--- ¤®¡ ¢«¥¨¥ £« ¢®£® ¡«®ª  ¢ á¯¨á®ª
 	stdcall add_3ds_object, ID_ICON_CHUNK_MAIN,0,dword[esi+2]
 	call block_children ;¢å®¤ ¢ ¤®ç¥à¨© ¡«®ª
+	mov edi,dword[file_3ds.offs]
 	add edi,dword[file_3ds.size]
 	.cycle_main:
 		cmp dword[level_stack],0
+		jle .end_cycle
+		cmp esi,edi ;¥á«¨ ª®¥æ ä ©«
-		je .end_cycle
+		jge .end_cycle
-		call block_analiz
-		mov edx,dword[esi+2] ;à §¬¥à ¡«®ª  ¡¥§ § £®«®¢ª
+		call block_analiz
-		add edx,6 ;à §¬¥à ¡«®ª  ¢¬¥áâ¥ á § £®«®¢ª®¬
+		mov edx,dword[esi+2] ;à §¬¥à ¡«®ª
 		cmp dword[eax],0
 ; esi - memory pointer
 align 4
 block_analiz_data:
 	pushad
 		mov ax,word[esi]
+		mov ecx,dword[esi+2]
-		mov ecx,dword[esi+2] ;à §¬¥à ¡«®ª
+		sub ecx,6 ;à §¬¥à ¤ ëå ¢ ¡«®ª¥
 		add esi,6
 		mov ebx,dword[level_stack]
 		inc ebx
 		;cmp ax,CHUNK_color_1
 		;jne @f
 			stdcall add_3ds_object, ID_ICON_DATA,ebx,ecx
 		.end_f:
 	popad
 	ret
+;¢å®¤ ¢ 1-© ¤®ç¥à¨© ¡«®ª
+;output:
-;¢å®¤ ¢ ¤®ç¥à¨© ¡«®ª
+; edx - destroy
 align 4
+block_children:
+	push ecx
+		;¯à®¢¥àª  ¯à ¢¨«ì®áâ¨ à §¬¥à®¢ ¤®ç¥à¥£® ¡«®ª
+		mov ebx,esi ;á¬¥é¥¨¥  ç «  à®¤¨â¥«ìáª®£® ¡«®ª
+		add ebx,6 ;¯¥à¥å®¤    ç «® ¤®ç¥à¥£® ¡«®ª
+		add ebx,dword[ebx+2] ;¤®¡ ¢«ï¥¬ à §¬¥à ¤®ç¥à¥£® ¡«®ª
+		mov ecx,esi ;á¬¥é¥¨¥  ç «  à®¤¨â¥«ìáª®£® ¡«®ª
+		add ecx,dword[esi+2] ;¤®¡ ¢«ï¥¬ à §¬¥à à®¤¨â¥«ìáª®£® ¡«®ª
+		cmp ebx,ecx ;ãç¨âë¢ âì § £®«®¢ª¨ ¥ ã¦®, â. ª. áà ¢¨¢ îâáï â®«ìª® ¤ ë¥ ¡«®ª®¢
+		jle @f
+			;¤¨ £®áâ¨à®¢ «¨ ®è¨¡ªã ä ©« , ¤®ç¥à¨© ¡«®ª ¢ëå®¤¨â §  ¯à¥¤¥«ë à®¤¨â¥«ìáª®£®
+			mov dword[level_stack],FILE_ERROR_CHUNK_SIZE
+			jmp .end_f
-block_children:
+		@@:
-	mov dword[eax],esi ;ãª § â¥«ì    ç «® ¡«®ª
+		mov dword[eax],esi ;ãª § â¥«ì    ç «® ¡«®ª
-	mov ebx,dword[esi+2]
+		mov ebx,dword[esi+2]
-	mov dword[eax+4],ebx ;à §¬¥à ¡«®ª
+		mov dword[eax+4],ebx ;à §¬¥à ¡«®ª
-	add esi,6 ;¯¥à¥å®¤¨¬ ª ¤ ë¬ ¡«®ª
+		add esi,6 ;¯¥à¥å®¤¨¬ ª ¤ ë¬ ¡«®ª
-	inc dword[level_stack]
+		inc dword[level_stack]
+		add eax,8
+	.end_f:
-	add eax,8
+	pop ecx
 	ret
 ;¯¥à¥å®¤ ª á«¥¤ãé¥¬ã ¡«®ªã â¥ªãé¥£® ãà®¢ï
 align 4
 block_next:
-push ebx
-	add esi,dword[esi+2] ;¯à®¯ãáª ¥¬ ¤ ë¥ ¡«®ª
+push ebx
-	add esi,6
+	add esi,dword[esi+2] ;¯à®¯ãáª ¥¬ ¤ ë¥ ¡«®ª
-	;¯à®¢¥àª  à §¬¥à®¢ à®¤¨â¥«ìáª®£® ¡«®ª , ¤«ï ¢®§¬®¦®£® ¢ëå®¤    ¢¥àå¨© ãà®¢¥ì ¥á«¨ ª®¥æ ¡«®ª
-	mov ebx,dword[eax-8]
+	;¯à®¢¥àª  à §¬¥à®¢ à®¤¨â¥«ìáª®£® ¡«®ª , ¤«ï ¢®§¬®¦®£® ¢ëå®¤    ¢¥àå¨© ãà®¢¥ì ¥á«¨ ª®¥æ ¡«®ª
-	add ebx,dword[eax-4]
+	mov ebx,dword[eax-8]
-	add ebx,6
+	add ebx,dword[eax-4]
 	cmp esi,ebx
 	jl @f
 align 16
 procinfo process_information
 align 4
 buf_0: dd 0 ;ãª § â¥«ì   ¡ãä¥à ¨§®¡à ¦¥¨ï
-	dw 155 ;+4 left
+	dw 205 ;+4 left
 	dw 35 ;+6 top
 .w: dd 340 ;+8 w
 .h: dd 250 ;+12 h
 .color: dd 0xffffd0 ;+16 color
 	dd 0 ;+16 color
 	db 24 ;+20 bit in pixel
 el_focus dd tree1
 tree1 tree_list size_one_list,100+2, tl_key_no_edit+tl_draw_par_line,\
-,16, 0xffffff,0xb0d0ff,0xd000ff, 5,35,145-16,250, 0,8,0, el_focus,\
+,16, 0xffffff,0xb0d0ff,0xd000ff, 5,35,195-16,250, 0,8,0, el_focus,\
 	w_scr_t1,0
 align 4

Subversion Repositories Kolibri OS

(root)/programs/develop/info3ds/info3ds.asm – Rev 2051 → 2052