add smooth, update ini file

git-svn-id: svn://kolibrios.org@6513 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
IgorA
2016-09-05 20:55:35 +00:00
parent af09dcd4b0
commit 259e8f219c
7 changed files with 357 additions and 86 deletions

View File

@@ -3,6 +3,8 @@ use32
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
version_edit equ 0
include '../../macros.inc'
include '../../proc32.inc'
include '../../KOSfuncs.inc'
@@ -14,8 +16,6 @@ include 'info_fun_float.inc'
include 'info_menu.inc'
include 'data.inc'
version_edit equ 0
3d_wnd_l equ 205 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> tinygl <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><><E1ABA5>
3d_wnd_t equ 47 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> tinygl <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><><E1A2A5><EFBFBD>
3d_wnd_w equ 344
@@ -107,17 +107,23 @@ start:
stdcall [ksubmenu_new]
mov [main_menu_view], eax
stdcall [kmenuitem_new], KMENUITEM_NORMAL, sz_main_menu_Veiw_Vertexes, 10
stdcall [kmenuitem_new], KMENUITEM_NORMAL, sz_main_menu_Veiw_Vertexes, 5
stdcall [ksubmenu_add], [main_menu_view], eax
stdcall [kmenuitem_new], KMENUITEM_NORMAL, sz_main_menu_Veiw_Faces, 6
stdcall [ksubmenu_add], [main_menu_view], eax
stdcall [kmenuitem_new], KMENUITEM_NORMAL, sz_main_menu_Veiw_Faces_Fill, 7
stdcall [ksubmenu_add], [main_menu_view], eax
stdcall [kmenuitem_new], KMENUITEM_NORMAL, sz_main_menu_Veiw_Light, 9
stdcall [kmenuitem_new], KMENUITEM_NORMAL, sz_main_menu_Veiw_Faces_Mat, 8
stdcall [ksubmenu_add], [main_menu_view], eax
stdcall [kmenuitem_new], KMENUITEM_SEPARATOR, 0, 0
stdcall [ksubmenu_add], [main_menu_view], eax
stdcall [kmenuitem_new], KMENUITEM_NORMAL, sz_main_menu_Veiw_Reset, 10
stdcall [kmenuitem_new], KMENUITEM_NORMAL, sz_main_menu_Veiw_Light, 9
stdcall [ksubmenu_add], [main_menu_view], eax
stdcall [kmenuitem_new], KMENUITEM_NORMAL, sz_main_menu_Veiw_Smooth, 10
stdcall [ksubmenu_add], [main_menu_view], eax
stdcall [kmenuitem_new], KMENUITEM_SEPARATOR, 0, 0
stdcall [ksubmenu_add], [main_menu_view], eax
stdcall [kmenuitem_new], KMENUITEM_NORMAL, sz_main_menu_Veiw_Reset, 11
stdcall [ksubmenu_add], [main_menu_view], eax
stdcall [kmenuitem_new], KMENUITEM_SUBMENU, sz_main_menu_View, [main_menu_view]
stdcall [ksubmenu_add], [main_menu], eax
@@ -161,11 +167,21 @@ start:
jz @f
or dword[def_dr_mode], 1 shl bit_faces_fill
@@:
stdcall dword[ini_get_int],file_name,ini_sec_w3d,key_dfm,1
or eax,eax
jz @f
or dword[def_dr_mode], 1 shl bit_faces_mat
@@:
stdcall dword[ini_get_int],file_name,ini_sec_w3d,key_dl,1
or eax,eax
jz @f
or dword[def_dr_mode], 1 shl bit_light
@@:
stdcall dword[ini_get_int],file_name,ini_sec_w3d,key_ds,1
or eax,eax
jz @f
or dword[def_dr_mode], 1 shl bit_smooth
@@:
stdcall dword[ini_get_color],file_name,ini_sec_w3d,key_ox,0x0000ff
mov [color_ox],eax
stdcall dword[ini_get_color],file_name,ini_sec_w3d,key_oy,0xff0000
@@ -443,7 +459,8 @@ pushad
mcall ,((3d_wnd_l+50) shl 16)+20,,0x40000007 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><EFBFBD><E0A0AD> <20><><EFBFBD>.
mcall ,((3d_wnd_l+75) shl 16)+20,,0x40000008 ;<3B><EFBFBD> <20><> <20><><EFBFBD><EFBFBD><EFBFBD><E0A8A0><EFBFBD> <20><><EFBFBD>.
mcall ,((3d_wnd_l+100) shl 16)+20,,0x40000009 ;ᢥ<> <20><><EFBFBD>./<2F>몫.
mcall ,((3d_wnd_l+125) shl 16)+20,,0x4000000a ;<3B><><EFBFBD><EFBFBD><EFBFBD>
mcall ,((3d_wnd_l+125) shl 16)+20,,0x4000000a ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
mcall ,((3d_wnd_l+150) shl 16)+20,,0x4000000b ;<3B><><EFBFBD><EFBFBD><EFBFBD>
mcall SF_PUT_IMAGE,[image_data_toolbar],(21 shl 16)+21,(5 shl 16)+24 ;new
add ebx,IMAGE_TOOLBAR_ICON_SIZE
@@ -457,9 +474,11 @@ pushad
add ebx,IMAGE_TOOLBAR_ICON_SIZE
mcall ,,,((3d_wnd_l+100) shl 16)+24 ;ᢥ<> <20><><EFBFBD>./<2F>몫.
add ebx,IMAGE_TOOLBAR_ICON_SIZE
mcall ,,,((3d_wnd_l+125) shl 16)+24 ;<3B><><EFBFBD><EFBFBD><EFBFBD>
mcall ,,,((3d_wnd_l+150) shl 16)+24 ;<3B><><EFBFBD><EFBFBD><EFBFBD>
add ebx,IMAGE_TOOLBAR_ICON_SIZE
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>
mov dword[w_scr_t1.all_redraw],1
stdcall [tl_draw], tree1
@@ -573,6 +592,11 @@ button:
jmp still
@@:
cmp ah,10
jne @f
call mnu_smooth_on_off
jmp still
@@:
cmp ah,11
jne @f
call mnu_reset_settings
jmp still
@@ -1405,9 +1429,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> 02.09.16',0 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
capt db 'info 3ds [user] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 05.09.16',0 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
else
capt db 'info 3ds [user] version 02.09.16',0 ;window caption
capt db 'info 3ds [user] version 05.09.16',0 ;window caption
end if
align 16