KolibriOS/kolibrios
13
14
Fork 12
Code Issues 113 Pull Requests 16 Actions Projects 1 Releases Wiki Activity

update 'info3ds', add new button

Browse Source 
git-svn-id: svn://kolibrios.org@6889 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
IgorA
2017-04-19 14:07:11 +00:00
parent c162817dfc
commit 11fcf4b4ff
7 changed files with 266 additions and 218 deletions
Download Patch File Download Diff File Expand all files Collapse all files

30
programs/develop/info3ds/info3ds_u.asm
View File

@@ -1,5 +1,5 @@
use32
org 0x0
org 0
db 'MENUET01' ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>. <20>ᯮ<EFBFBD><E1AFAE>塞<EFBFBD><EFA5AC><EFBFBD> 䠩<><E4A0A9> <20>ᥣ<EFBFBD><E1A5A3> 8 <20><><EFBFBD><EFBFBD>
dd 1, start, i_end, mem, stacktop, file_name, sys_path
@@ -8,6 +8,7 @@ version_edit equ 0
include '../../macros.inc'
include '../../proc32.inc'
include '../../KOSfuncs.inc'
include '../../develop/libraries/libs-dev/libimg/libimg.inc'
include '../../load_img.inc'
include '../../develop/libraries/box_lib/trunk/box_lib.mac'
include '../../develop/libraries/TinyGL/asm_fork/opengl_const.inc'
@@ -392,13 +393,13 @@ timer_funct:
cmp word[eax],CHUNK_OBJBLOCK
jne .end_oblo
cmp dword[edi+offs_obj_poi_count],2
cmp dword[edi+obj_3d.poi_count],2
jl .ini_oblo
stdcall draw_3d,edi
jmp .end_f
.ini_oblo:
stdcall obj_init,edi ;<3B><><EFBFBD><EFBFBD>⪠ <20><><EFBFBD><EFBFBD>ந<EFBFBD><E0AEA8> <20><>६<EFBFBD><E0A5AC><EFBFBD><EFBFBD><EFBFBD> <20><>ꥪ<EFBFBD><EAA5AA>
cmp dword[edi+offs_obj_poi_count],2
cmp dword[edi+obj_3d.poi_count],2
jl .end_f
call mnu_reset_settings ;<3B><><EFBFBD><EFBFBD><EFBFBD> 㣫<><E3A3AB> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20> ०<><E0A5A6><EFBFBD><EFBFBD> <20><>ᮢ<EFBFBD><E1AEA2><EFBFBD><EFBFBD>
jmp .end_f
@@ -406,13 +407,13 @@ timer_funct:
cmp word[eax],CHUNK_MATERIAL
jne .end_mblo
cmp dword[edi+offs_mat_name],0
cmp dword[edi+material.name],0
je .ini_mblo
stdcall draw_material,edi
jmp .end_f
.ini_mblo:
stdcall mat_init,edi,eax ;<3B><><EFBFBD><EFBFBD>⪠ <20><><EFBFBD><EFBFBD>ந<EFBFBD><E0AEA8> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>ਠ<EFBFBD><E0A8A0>
cmp dword[edi+offs_mat_name],0
cmp dword[edi+material.name],0
je .end_f
stdcall draw_material,edi
jmp .end_f
@@ -461,6 +462,7 @@ pushad
mcall ,((3d_wnd_l+100) shl 16)+20,,0x40000009 ;ᢥ<> <20><><EFBFBD>./<2F>몫.
mcall ,((3d_wnd_l+125) shl 16)+20,,0x4000000a ;ᣫ<><E1A3AB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
mcall ,((3d_wnd_l+150) shl 16)+20,,0x4000000b ;<3B><><EFBFBD><EFBFBD><EFBFBD>
mcall ,((3d_wnd_l+175) shl 16)+20,,0x4000000c ;<3B><>ਭ <20><> 3d <20><><EFBFBD><EFBFBD>
mcall SF_PUT_IMAGE,[image_data_toolbar],(21 shl 16)+21,(5 shl 16)+24 ;new
add ebx,IMAGE_TOOLBAR_ICON_SIZE
@@ -479,6 +481,8 @@ pushad
mcall ,,,((3d_wnd_l+75) shl 16)+24 ;<3B>࠭<EFBFBD> <20><> <20><><EFBFBD><EFBFBD>ਠ<EFBFBD><E0A8A0><EFBFBD> <20><><EFBFBD>.
add ebx,IMAGE_TOOLBAR_ICON_SIZE
mcall ,,,((3d_wnd_l+125) shl 16)+24 ;ᣫ<><E1A3AB><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
add ebx,IMAGE_TOOLBAR_ICON_SIZE
mcall ,,,((3d_wnd_l+175) shl 16)+24 ;<3B><>ਭ <20><> 3d <20><><EFBFBD><EFBFBD>
mov dword[w_scr_t1.all_redraw],1
stdcall [tl_draw], tree1
@@ -601,6 +605,11 @@ button:
call mnu_reset_settings
jmp still
@@:
cmp ah,12
jne @f
call mnu_make_scrshot
jmp still
@@:
cmp ah,1
jne still
@@ -1085,7 +1094,7 @@ Filter:
dd Filter.end - Filter.1
.1:
db '3DS',0
db 'TXT',0
db 'PNG',0
.end:
db 0
@@ -1101,7 +1110,7 @@ system_dir_3 db '/sys/lib/'
lib_name_3 db 'buf2d.obj',0
system_dir_4 db '/sys/lib/'
lib_name_4 db 'kmenu.obj',0
system_dir_5 db '/kolibrios/lib/'
system_dir_5 db '/sys/lib/'
lib_name_5 db 'tinygl.obj',0
system_dir_6 db '/sys/lib/'
lib_name_6 db 'libini.obj',0
@@ -1393,7 +1402,8 @@ align 4
buf_ogl:
dd 0 ;㪠<><E3AAA0>⥫<EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>ࠦ<EFBFBD><E0A0A6><EFBFBD><EFBFBD>
dw 3d_wnd_l,3d_wnd_t ;+4 left,top
dd 3d_wnd_w,3d_wnd_h ;+8 w,h
.w: dd 3d_wnd_w
.h: dd 3d_wnd_h
.color: dd 0xffffd0
dd 24 ;+16 color,bit in pixel
@@ -1429,9 +1439,9 @@ white_light dd 0.8, 0.8, 0.8, 1.0 ;
lmodel_ambient dd 0.3, 0.3, 0.3, 1.0 ; <20><>ࠬ<EFBFBD><E0A0AC><EFBFBD><EFBFBD> 䮭<><E4AEAD><EFBFBD><EFBFBD><EFBFBD> <20>ᢥ饭<E1A2A5><E9A5AD>
if lang eq ru
capt db 'info 3ds [user] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 05.09.16',0 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
capt db 'info 3ds [user] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 18.04.17',0 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
else
capt db 'info 3ds [user] version 05.09.16',0 ;window caption
capt db 'info 3ds [user] version 18.04.17',0 ;window caption
end if
align 16