| 1,7 → 1,7 |
|---|
| use32 |
| org 0x0 |
| org 0 |
| db 'MENUET01' ;¨¤¥â¨ä. ¨á¯®«ï¥¬®£® ä ©« ¢á¥£¤ 8 ¡ ©â |
| dd 1, start, i_end, mem, stacktop, 0, sys_path |
| dd 1, start, i_end, mem, stacktop, openfile_path, sys_path |
| |
| include '../../../../programs/macros.inc' |
| include '../../../../programs/proc32.inc' |
| 12,7 → 12,7 |
|---|
| include '../trunk/str.inc' |
| |
| @use_library_mem mem.Alloc,mem.Free,mem.ReAlloc,dll.Load |
| caption db 'Voxel viewer 18.04.17',0 ;¯®¤¯¨áì ®ª |
| caption db 'Voxel viewer 22.03.18',0 ;¯®¤¯¨áì ®ª |
| |
| 3d_wnd_l equ 5 ;®âáâ㯠¤«ï tinygl ¡ãä¥à á«¥¢ |
| 3d_wnd_t equ 30 ;®âáâ㯠¤«ï tinygl ¡ãä¥à ᢥàåã |
| 40,7 → 40,7 |
|---|
| |
| stdcall [buf2d_create], buf_0 ;ᮧ¤ ¨¥ ¡ãä¥à |
| |
| load_image_file 'toolbar_t.png', image_data_toolbar,,,6 ;6 - for gray icons |
| include_image_file 'toolbar_t.png', image_data_toolbar,,,6 ;6 - for gray icons |
| mov eax,[image_data_toolbar] |
| add eax,IMAGE_TOOLBAR_SIZE |
| stdcall img_to_gray, [image_data_toolbar],eax,(IMAGE_TOOLBAR_SIZE)/3 |
| 55,8 → 55,12 |
|---|
| stdcall [glShadeModel], GL_SMOOTH |
| |
| call but_new_file |
| ;¯à®¢¥àª ª®¬ ¤®© áâப¨ |
| cmp dword[openfile_path],0 |
| je @f |
| call but_open_file_cmd_lin |
| @@: |
| |
| |
| align 4 |
| red_win: |
| call draw_window |
| 418,9 → 422,16 |
|---|
| mov [OpenDialog_data.type],0 |
| stdcall [OpenDialog_Start],OpenDialog_data |
| cmp [OpenDialog_data.status],2 |
| je .end_open_file |
| je @f |
| ;ª®¤ ¯à¨ 㤠箬 ®âªàë⨨ ¤¨ «®£ |
| call but_open_file_cmd_lin |
| @@: |
| popad |
| ret |
| |
| align 4 |
| but_open_file_cmd_lin: |
| pushad |
| mov [run_file_70.Function], SSF_GET_INFO |
| mov [run_file_70.Position], 0 |
| mov [run_file_70.Flags], 0 |
| 430,11 → 441,6 |
|---|
| mov dword[run_file_70.FileName], openfile_path |
| mcall SF_FILE,run_file_70 |
| |
| ;mov eax,dword[open_b+32] |
| ;mov edi,txt_buf |
| ;call conv_int_to_str |
| ;notify_window_run txt_buf |
| |
| mov ecx,dword[open_b+32] ;+32 qword: à §¬¥à ä ©« ¢ ¡ ©â å |
| stdcall mem.ReAlloc,[open_file_data],ecx |
| mov [open_file_data],eax |