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 18.08.11',0 ;¯®¤¯¨áì ®ª
+capt db 'info 3ds 20.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 IMAGE_TOOLBAR_ICON_SIZE*6+54 ;à §¬¥à bmp ä ©«  á ¨ª®ª ¬¨ ®¡ê¥ªâ®¢
+TOOLBAR_ICON_BMP_SIZE equ IMAGE_TOOLBAR_ICON_SIZE*7+54 ;à §¬¥à bmp ä ©«  á ¨ª®ª ¬¨ ®¡ê¥ªâ®¢
+;
-IMAGE_FILE1_SIZE equ 128*144*3 ;à §¬¥à ä ©«  á ¨§®¡à ¦¥¨¥¬ 640 x 480
+IMAGE_FILE1_SIZE equ 128*144*3+54 ;à §¬¥à ä ©«  á ¨§®¡à ¦¥¨¥¬
 macro load_image_file path,buf,size { ;¬ ªà®á ¤«ï § £àã§ª¨ ¨§®¡à ¦¥¨©
 	;path - ¬®¦¥â ¡ëâì ¯¥à¥¬¥®© ¨«¨ áâà®ª®¢ë¬ ¯ à ¬¥âà®¬
 	if path eqtype '' ;¯à®¢¥àï¥¬ § ¤  «¨ áâà®ª®© ¯ à ¬¥âà path
 		stdcall dword[img_destroy], dword[image_data]
 	@@:
+}
 ;--------------------------------------
-sizeof.block_3ds equ 5
+sizeof.block_3ds equ 9
-macro block_3ds id,icon,par
+macro block_3ds id,icon,par,caption
 {
-	dw id ;¨¤¥â¨ä¨ª â®à ¡«®ª  ¢ ä ©«¥ 3ds
+	dw id ;+0 ¨¤¥â¨ä¨ª â®à ¡«®ª  ¢ ä ©«¥ 3ds
+	dw icon ;+2 ®¬¥à ¨ª®ª¨ ¤«ï ¡«®ª
-	dw icon ;®¬¥à ¨ª®ª¨ ¤«ï ¡«®ª
+	db par ;+4 á®¤¥à¦¨â «¨ ¡«®ª ¯®¤¡«®ª¨ (0-¤  1-¥â)
-	db par ;á®¤¥à¦¨â «¨ ¡«®ª ¯®¤¡«®ª¨ (0-¤  1-¥â)
+	dd caption+0 ;+5 ®¯¨á ¨¥ ¡«®ª
+}
 FILE_ERROR_CHUNK_SIZE equ -3 ;®è¨¡ª  ¢ à §¬¥à¥ ¡«®ª
 align 4
 type_bloks:
-block_3ds 0x0002,5,1 ;¨ä®à¬ æ¨ï ® ¢¥àá¨¨ ä ©«
+block_3ds 0x0002,5,1,txt_0002
 block_3ds 0x3d3e,5,1 ;mesh version
 block_3ds 0xA010,4,0 ;material ambient color
 block_3ds 0xA020,4,0 ;material diffuse color
 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_OBJMESH,     3,0 ; [-] ¢áïç¥áª¨¥ ®¡ê¥ªâë
-block_3ds CHUNK_OBJBLOCK,    3,1 ; [+] ®¡ê¥ªâ
+block_3ds CHUNK_OBJBLOCK,    3,1,txt_4000
 block_3ds CHUNK_TRIMESH,     3,0 ; [-] trimesh-®¡ê¥ªâ
-block_3ds CHUNK_VERTLIST,    3,1 ; [+] á¯¨á®ª ¢¥àè¨
+block_3ds CHUNK_VERTLIST,    3,1,txt_4110
-block_3ds CHUNK_FACELIST,    3,1 ; [+] á¯¨á®ª £à ¥©
+block_3ds CHUNK_FACELIST,    3,1,txt_4120
 block_3ds CHUNK_FACEMAT,     3,1 ; [+] ¬ â¥à¨ «ë £à ¥©
 block_3ds CHUNK_MAPLIST,     3,1 ; [+] â¥ªáâãàë¥ ª®®à¤¨ âë
+block_3ds CHUNK_TRMATRIX,    3,1 ; [+] ¬ âà¨æ  ¯¥à¥¢®¤
-block_3ds CHUNK_TRMATRIX,    3,1 ; [+] ¬ âà¨æ  ¯¥à¥¢®¤
+block_3ds CHUNK_CAMERA,      3,1 ; [+] ®¡ê¥ªâ-ª ¬¥à
-block_3ds CHUNK_CAMERA,      3,1 ; [+] ®¡ê¥ªâ-ª ¬¥à
+block_3ds 0x4600,3,1,txt_4600
-block_3ds CHUNK_MATERIAL,    3,0 ; [-] ¬ â¥à¨ «
+block_3ds CHUNK_MATERIAL,    3,0,txt_afff
-block_3ds CHUNK_MATNAME,     3,1 ; [+]  §¢ ¨¥ ¬ â¥à¨ «
+block_3ds CHUNK_MATNAME,     3,1,txt_a000
-block_3ds CHUNK_TEXTURE,     3,0 ; [-] â¥ªáâãà  ¬ â¥à¨ «
+block_3ds CHUNK_TEXTURE,     3,0,txt_a200
-block_3ds CHUNK_MAPFILE,     3,1 ; [+] ¨¬ï ä ©«  â¥ªáâãàë
+block_3ds CHUNK_MAPFILE,     6,1,txt_a300
-block_3ds CHUNK_KEYFRAMER,   3,0 ; [-] ¨ä®à¬ æ¨ï ®¡  ¨¬ æ¨¨
+block_3ds CHUNK_KEYFRAMER,   3,0,txt_b000
-block_3ds CHUNK_TRACKINFO,   3,0 ; [-] ¯®¢¥¤¥¨¥ ®¡ê¥ªâ
+block_3ds CHUNK_TRACKINFO,   3,0,txt_b002
-block_3ds CHUNK_TRACKOBJNAME,3,1 ; [+]  §¢ ¨¥ íâ®£® ®¡ê¥ªâ
+block_3ds CHUNK_TRACKOBJNAME,3,1,txt_b010
-block_3ds CHUNK_TRACKPIVOT,  3,1 ; [+] æ¥âà ¢à é¥¨ï ®¡ê¥ªâ
+block_3ds CHUNK_TRACKPIVOT,  3,1,txt_b013
 block_3ds CHUNK_TRACKPOS,    3,1 ; [+] âà ¥ªâ®à¨ï ®¡ê¥ªâ
 block_3ds CHUNK_TRACKROTATE, 3,1 ; [+] âà ¥ªâ®à¨ï ¢à é¥¨ï ®¡ê¥ªâ
 block_3ds CHUNK_TRACKCAMERA, 3,0 ; [-] ¯®¢¥¤¥¨¥ ª ¬¥àë
 block_3ds CHUNK_TRACKFOV,    3,1 ; [+] ¯®¢¥¤¥¨¥ FOV ª ¬¥àë
 block_3ds CHUNK_TRACKROLL,   3,1 ; [+] ¯®¢¥¤¥¨¥ roll ª ¬¥àë
+block_3ds CHUNK_TRACKCAMTGT, 3,0 ; [-] ¯®¢¥¤¥¨¥ "æ¥«¨" ª ¬¥àë
+.end:
+if lang eq ru
+txt_0002 db '3ds ¢¥àá¨ï',0
+txt_4000 db '¡ê¥ªâ (á ¨¬¥¥¬)',0
+txt_4110 db '¯¨á®ª ¢¥àè¨',0
+txt_4120 db '¯¨á®ª £à ¥©',0
+txt_4600 db '¢¥â',0
+txt_a000 db ' §¢ ¨¥ ¬ â¥à¨ « ',0
+txt_a200 db '¥ªáâãà  ¬ â¥à¨ «  1',0
+txt_a300 db '¬ï ä ©«  â¥ªáâãàë',0
+txt_afff db ' â¥à¨ «',0
+txt_b000 db 'ä®à¬ æ¨ï ®¡  ¨¬ æ¨¨',0
+txt_b002 db '®¢¥¤¥¨¥ ®¡ê¥ªâ ',0
+txt_b010 db ' §¢ ¨¥ ®¡ê¥ªâ ',0
+txt_b013 db '¥âà ¢à é¥¨ï ®¡ê¥ªâ ',0
+else
+txt_0002 db '3ds version',0
+txt_4000 db 'Object (with name)',0
+txt_4110 db 'Vertices list',0
+txt_4120 db 'Faces description',0
+txt_4600 db 'Light',0
+txt_a000 db 'Material name',0
+txt_a200 db 'Texture map 1',0
+txt_a300 db 'Mapping filename',0
+txt_afff db 'Meterial',0
+txt_b000 db 'Keyframer',0
+txt_b002 db 'Mesh information',0
+txt_b010 db 'Object name',0
-block_3ds CHUNK_TRACKCAMTGT, 3,0 ; [-] ¯®¢¥¤¥¨¥ "æ¥«¨" ª ¬¥àë
+txt_b013 db 'Object pivot point',0
-.end:
+end if
 align 4
 file_3ds:
 .offs: dd 0 ;+0 ãª § â¥«ì    ç «® ¡«®ª
+.size: dd 0 ;+4 à §¬¥à ¡«®ª  (¤«ï 1-£® ¯ à ¬¥âà  = à §¬¥à ä ©«  3ds)
-.size: dd 0 ;+4 à §¬¥à ¡«®ª  (¤«ï 1-£® ¯ à ¬¥âà  = à §¬¥à ä ©«  3ds)
+rb 8*MAX_FILE_LEVEL
 rb 8*MAX_FILE_LEVEL+4
 size_one_list equ 40
-size_one_list equ 14
+list_offs_text equ 12 ;á¤¢¨£  ç «  â¥ªáâ  ¢ «¨áâ¥
 	ret
 align 4
 timer_funct:
+	pushad
+if debug
+	mov eax,4
+	mov ebx,(5 shl 16)+8
+	mov ecx,0xff+0x80000000
+	mov edx,txt_0002
+	int 0x40
-	pushad
+end if
 	mcall 26,9
 	mov [last_time],eax
 		add eax,dword[open_file_lif] ;¯®«ãç ¥¬ § ç¥¨¥ á¤¢¨£  ¢ ¯ ¬ïâ¨
 		cmp dword[offs_last_timer],eax
 		je @f
 			mov dword[offs_last_timer],eax
 			call buf_draw_beg
-			stdcall [buf2d_draw_text], buf_0, buf_1,txt_3ds_offs,5,35,0xd000
+			stdcall [buf2d_draw_text], buf_0, buf_1,txt_3ds_offs,5,35,0xb000
+			mov edx,dword[ebx+8]
+			cmp edx,0 ;á¬®âà¨¬ ¥áâì «¨ ®¯¨á ¨¥ ¡«®ª
+			je .no_info
+				stdcall [buf2d_draw_text], buf_0, buf_1,edx,5,45,0xb000
+			.no_info:
 			add ecx,eax ;¯®«ãç ¥¬ à §¬¥à ¡«®ª
 			stdcall buf_draw_hex_table,eax,ecx ;¤®¡ ¢«¥¨¥ 16-à¨çëå ¤ ëå
 			stdcall [buf2d_draw], buf_0 ;®¡®¢«ï¥¬ ¡ãä¥à   íªà ¥
 	@@:
 	popad
 align 4
 proc buf_draw_hex_table, offs:dword, size_line:dword
 	pushad
 	locals
-		coord_y dd 45
+		coord_y dd 55 ;ª®®à¤¨ â  y ¤«ï  ç «  ¢ë¢®¤  â ¡«¨æë
 	endl
 		mov esi,dword[offs]
 		mov edi,dword[open_file_lif]
-		add edi,dword[file_3ds+4] ;edi - ãª § â¥«ì   ª®¥æ ä ©«  ¢ ¯ ¬ïâ¨
+		add edi,dword[file_3ds.size] ;edi - ãª § â¥«ì   ª®¥æ ä ©«  ¢ ¯ ¬ïâ¨
 		mov dword[txt_3ds_offs.dig],0
 		cld
 		.cycle_rows:
 			mov ebx,5 ;®âáâã¯ á«¥¢  ¤«ï æ¨äà
 	;--- ®¡à ¡®âª  ®âªàëâ®£® *.3ds ä ©«
 	mov eax,file_3ds
 	mov dword[level_stack],0 ;®¡ã«ï¥¬ ãà®¢¥ì áâ¥ª
 	mov dword[offs_last_timer],0
 	;--- ¤®¡ ¢«¥¨¥ £« ¢®£® ¡«®ª  ¢ á¯¨á®ª
-	stdcall add_3ds_object, ID_ICON_CHUNK_MAIN,0,dword[esi+2]
+	stdcall add_3ds_object, ID_ICON_CHUNK_MAIN,0,dword[esi+2],0
 	call block_children ;¢å®¤ ¢ ¤®ç¥à¨© ¡«®ª
 	mov edi,dword[file_3ds.offs]
 	add edi,dword[file_3ds.size]
 		jle .end_cycle
 		cmp esi,edi ;¥á«¨ ª®¥æ ä ©«
-		jge .end_cycle
 		jge .end_cycle
-		call block_analiz
 		mov edx,dword[esi+2] ;à §¬¥à ¡«®ª
 		call block_analiz
-		cmp dword[eax],0
+		cmp dword[bl_found],0
 		jne @f
 			;®¡ê¥ªâ ¥ ¨§¢¥áâ®£® ¢¨¤
-			stdcall add_3ds_object, ID_ICON_CHUNK_NOT_FOUND,dword[level_stack],edx
+			stdcall add_3ds_object, ID_ICON_CHUNK_NOT_FOUND,dword[level_stack],edx,0
 			call block_next
 			jmp .cycle_main
 		@@:
 			;®¡ê¥ªâ ¨§¢¥áâ®£® ¢¨¤
-			mov ecx,dword[eax]
+			mov ecx,dword[bl_found]
 			mov bx,word[ecx+2] ;®¬¥à ¨ª®ª¨ ¤«ï ®¡ê¥ªâ
-			stdcall add_3ds_object, ebx,dword[level_stack],edx
+			stdcall add_3ds_object, ebx,dword[level_stack],edx,dword[ecx+5]
 			cmp byte[ecx+4],1
 			je .bl_data
 				;¡«®ª á®¤¥à¦¨â ¤®ç¥à¨¥ ¡«®ª¨
 				call block_children ;¢å®¤ ¢ ¤®ç¥à¨© ¡«®ª
 				jmp .cycle_main
 			.bl_data:
-				;¡«®ª á®¤¥à¦¨â ¤ ë¥
-				call block_analiz_data
+				;¡«®ª á®¤¥à¦¨â ¤ ë¥
-				call block_next
+				call block_analiz_data
 				jmp .cycle_main
 	.end_cycle:
 		stdcall [tl_cur_beg], tree1
 	ret
 ;  «¨§ ¤ ëå ¡«®ª
 ;input:
+; esi - memory pointer
+;output:
+; eax - new stack pointer
-; esi - memory pointer
+; esi - new memory pointer
 align 4
 block_analiz_data:
-	pushad
+	push ebx ecx edx edi
-		mov ax,word[esi]
+		mov dx,word[esi]
 		mov ecx,dword[esi+2]
 		sub ecx,6 ;à §¬¥à ¤ ëå ¢ ¡«®ª¥
 		add esi,6
 		mov ebx,dword[level_stack]
+		inc ebx
-		inc ebx
+		; ***   «¨§ ¡«®ª®¢ á à §ë¬¨ ¤ ë¬¨ ¨ ¢ë¤¥«¥¨¥¬ ¯®¤¡«®ª®¢
-		;cmp ax,CHUNK_color_1
+		cmp dx,CHUNK_OBJBLOCK ;®¡ê¥ªâ
-		;jne @f
+		jne @f
+			.cycle_0:
+				push ax
-		;	.cycle_0:
+					cld
-		;		stdcall add_3ds_object, ID_ICON_DATA,ebx,3
+					xor al,al
-		;		add esi,3
+					mov edi,esi
-		;		sub ecx,3
+					repne scasb
+				pop ax
+				sub edi,esi ;edi - strlen
+				stdcall add_3ds_object, ID_ICON_DATA,ebx,edi,0 ; §¢ ¨¥ ®¡ê¥ªâ
-		;		cmp ecx,0
+				add esi,edi
-		;		jg .cycle_0
+				sub ecx,edi
-		;	jmp .end_f
+			jmp .next_bl
+		@@:
-		;@@:
+		; ***   «¨§ ¡«®ª  á ¤ ë¬¨ ¯® ã¬®«ç ¨î (¡¥§ ¢ë¤¥«¥¨ï ¯®¤¡«®ª®¢)
+			stdcall add_3ds_object, ID_ICON_DATA,ebx,ecx,0
+			sub esi,6 ;¢®ááâ ®¢«¥¨¥ esi
+			call block_next
+			jmp .end_f
+		.next_bl:
+		; ***  áâà®©ª¨ ¤«ï   «¨§  ®áâ ¢è¨åáï ¯®¤¡«®ª®¢
+			mov dword[eax],esi ;ãª § â¥«ì    ç «® ¡«®ª
+			mov ebx,dword[esi+2]
+			mov dword[eax+4],ebx ;à §¬¥à ¡«®ª
+			inc dword[level_stack]
-			stdcall add_3ds_object, ID_ICON_DATA,ebx,ecx
+			add eax,8
 		.end_f:
-	popad
+	pop edi edx ecx ebx
 	ret
 ;¢å®¤ ¢ 1-© ¤®ç¥à¨© ¡«®ª
 block_next:
 push ebx
 	add esi,dword[esi+2] ;¯à®¯ãáª ¥¬ ¤ ë¥ ¡«®ª
+	;¯à®¢¥àª  à §¬¥à®¢ à®¤¨â¥«ìáª®£® ¡«®ª , ¤«ï ¢®§¬®¦®£® ¢ëå®¤    ¢¥àå¨© ãà®¢¥ì ¥á«¨ ª®¥æ ¡«®ª
-	;¯à®¢¥àª  à §¬¥à®¢ à®¤¨â¥«ìáª®£® ¡«®ª , ¤«ï ¢®§¬®¦®£® ¢ëå®¤    ¢¥àå¨© ãà®¢¥ì ¥á«¨ ª®¥æ ¡«®ª
+	@@:
 	mov ebx,dword[eax-8]
 	add ebx,dword[eax-4]
 	cmp esi,ebx
 	jl @f
 		dec dword[level_stack]
+		sub eax,8
+		cmp dword[level_stack],0
-		sub eax,8
+		jg @b
 	@@:
 pop ebx
+	ret
 	ret
-;input:
+;äãªæ¨ï ¯®¨áª  áâàãªâãàë ®¯¨áë¢ îé¥© ¡«®ª
-;eax - pointer to stack
+;input:
 ;esi - memory pointer
 ;output:
+;dword[bl_found] - pointer to chunk struct (= 0 if not found)
-;dword[eax] - pointer to chunk struct (= 0 if not found)
+align 4
-align 4
+bl_found dd 0
 block_analiz:
 pushad
-	mov dword[eax],0
+	mov dword[bl_found],0
 	mov ecx,type_bloks
 	@@:
 		mov bx,word[ecx]
 		cmp word[esi],bx
 		je .found
 		add ecx,sizeof.block_3ds
 		cmp ecx,type_bloks.end
 		jl @b
 	jmp .no_found
 	.found:
-		mov dword[eax],ecx
+		mov dword[bl_found],ecx
 	.no_found:
 popad
 	ret
 ;input:
 ; esi - ãª § â¥«ì     «¨§¨àã¥¬ë¥ ¤ ë¥
 align 4
-proc add_3ds_object, icon:dword,level:dword,size_bl:dword
+proc add_3ds_object, icon:dword,level:dword,size_bl:dword,info_bl:dword
 	pushad
 		mov bx,word[icon]
 		shl ebx,16
 		mov bx,word[level]
 		mov eax,esi
+		sub eax,dword[open_file_lif]
+		mov dword[buffer],eax ;á¬¥é¥¨¥ ¡«®ª
-		sub eax,dword[open_file_lif]
+		mov ecx,dword[size_bl]
-		mov dword[buffer],eax ;á¬¥é¥¨¥ ¡«®ª
+		mov dword[buffer+4],ecx ;à §¬¥à ¡«®ª  (¨á¯®«ì§ã¥âáï ¢ äãªæ¨¨ buf_draw_hex_table ¤«ï à¨á®¢ ¨ï «¨¨¨)
+		mov ecx,dword[info_bl]
+		mov dword[buffer+8],ecx
+		stdcall hex_in_str, buffer+list_offs_text,dword[esi+1],2
+		stdcall hex_in_str, buffer+list_offs_text+2,dword[esi],2 ;ª®¤ 3ds ¡«®ª
+		cmp ecx,0
-		mov ecx,dword[size_bl]
+		jne @f
+			mov byte[buffer+list_offs_text+4],0 ;0 - á¨¬¢®« ª®¥æ  áâà®ª¨
+			jmp .no_capt
+		@@:
+			mov byte[buffer+list_offs_text+4],' '
+			mov esi,ecx
+			mov edi,buffer+list_offs_text+5
+			mov ecx,size_one_list-(list_offs_text+5)
-		mov dword[buffer+4],ecx ;à §¬¥à ¡«®ª  (¨á¯®«ì§ã¥âáï ¢ äãªæ¨¨ buf_draw_hex_table ¤«ï à¨á®¢ ¨ï «¨¨¨)
+			cld
-		stdcall hex_in_str, buffer+8,dword[esi+1],2
+			rep movsb
-		stdcall hex_in_str, buffer+10,dword[esi],2 ;ª®¤ 3ds ¡«®ª
+			mov byte[buffer+size_one_list-1],0 ;0 - á¨¬¢®« ª®¥æ  áâà®ª¨
-		mov byte[buffer+12],0
+		.no_capt:
 		stdcall [tl_node_add], buffer, ebx, tree1
 		stdcall [tl_cur_next], tree1
 		if debug
-			stdcall print_err,sz_add_3ds_object,buffer+8
+			stdcall print_err,sz_add_3ds_object,buffer+list_offs_text
 	dd 144 ;+12 h
 	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,\
+tree1 tree_list size_one_list,200+2, tl_key_no_edit+tl_draw_par_line,\
-,16, 0xffffff,0xb0d0ff,0xd000ff, 5,35,195-16,250, 0,8,0, el_focus,\
+,16, 0xffffff,0xb0d0ff,0xd000ff, 5,35,195-16,250, 16,list_offs_text,0, el_focus,\
 	w_scr_t1,0
 align 4

Subversion Repositories Kolibri OS

(root)/programs/develop/info3ds/info3ds.asm @ 2107 – Rev 2052 → 2080