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

@@ -63,17 +63,20 @@ offs_mat_col_diffuse equ 8
offs_mat_col_specular equ 12
bit_vertexes equ 0
bit_faces equ 1
bit_faces_fill equ 2
bit_faces equ 1 ;<EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
bit_faces_fill equ 2 ;<EFBFBD><EFBFBD> <EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
bit_light equ 3
bit_faces_mat equ 4
bit_faces_mat equ 4 ;<EFBFBD><EFBFBD> <EFBFBD> 梥⮬ <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
bit_smooth equ 5 ;<EFBFBD><EFBFBD> <EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
ini_name db 'info3ds.ini',0
ini_sec_w3d db 'Window 3d',0
key_dv db 'draw_vertices',0
key_df db 'draw_faces',0
key_dff db 'draw_faces_fill',0
key_dfm db 'draw_faces_material',0
key_dl db 'draw_light',0
key_ds db 'draw_smooth',0
key_ox db 'col_ox',0
key_oy db 'col_oy',0
key_oz db 'col_oz',0
@@ -346,6 +349,7 @@ endp
;description:
; <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD> 3-<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
; <EFBFBD> <EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
align 4
proc obj_set_normals, o_data:dword
locals
@@ -448,16 +452,153 @@ align 4
fmul dword[esi+24]
fsubp
fstp dword[eax+8] ;set normal.c
stdcall V3_Norm,eax
add edx,8 ;<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> = (3 <EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<EFBFBD><EFBFBD> 2<EFBFBD>) + <EFBFBD><EFBFBD> (2<EFBFBD>))
add eax,12
dec ebx
jnz @b
;<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
mov ebx,[o_data]
mov ecx,[ebx+offs_obj_poi_count]
mov [ebx+offs_obj_normals_poi_count],ecx
cmp ecx,0
je .end
imul ecx,12
stdcall mem.Alloc,ecx
mov [ebx+offs_obj_normals_poi_data],eax
mov edi,eax
mov eax,0.0
shr ecx,2
rep stosd ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD> 0-<EFBFBD><EFBFBD> float
mov edx,[ebx+offs_obj_tri_count]
mov edi,[ebx+offs_obj_tri_data]
mov eax,[ebx+offs_obj_normals_tri_data]
mov ecx,[ebx+offs_obj_poi_data]
mov ebx,[ebx+offs_obj_normals_poi_data]
align 4
.cycle_0: ;<EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>
movzx esi,word[edi] ;1-<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
imul esi,12
add esi,ecx
push esi
movzx esi,word[edi+2] ;2-<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
imul esi,12
add esi,ecx
push esi
movzx esi,word[edi+4] ;3-<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
imul esi,12
add esi,ecx
push esi
movzx esi,word[edi] ;1-<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
imul esi,12
add esi,ebx
push esi
movzx esi,word[edi+2] ;2-<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
imul esi,12
add esi,ebx
push esi
movzx esi,word[edi+4] ;3-<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
imul esi,12
add esi,ebx
push esi
stdcall poi_normal_add,eax
add edi,8
add eax,12
dec edx
jnz .cycle_0
.cycle_0_end:
.end:
popad
ret
endp
;input:
; norm_tr - <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD> <EFBFBD><EFBFBD>
; n1, n2, n3 - <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>
; c1, c2, c3 - <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>
align 4
proc poi_normal_add uses eax ebx,\
norm_tr:dword, n1:dword, n2:dword, n3:dword, c1:dword, c2:dword, c3:dword
mov ebx,[norm_tr]
mov eax,[n1]
fld dword[eax]
fadd dword[ebx]
fstp dword[eax]
fld dword[eax+4]
fadd dword[ebx+4]
fstp dword[eax+4]
fld dword[eax+8]
fadd dword[ebx+8]
fstp dword[eax+8]
mov eax,[n2]
fld dword[eax]
fadd dword[ebx]
fstp dword[eax]
fld dword[eax+4]
fadd dword[ebx+4]
fstp dword[eax+4]
fld dword[eax+8]
fadd dword[ebx+8]
fstp dword[eax+8]
mov eax,[n3]
fld dword[eax]
fadd dword[ebx]
fstp dword[eax]
fld dword[eax+4]
fadd dword[ebx+4]
fstp dword[eax+4]
fld dword[eax+8]
fadd dword[ebx+8]
fstp dword[eax+8]
ret
endp
;description:
; normalize vector
align 4
proc V3_Norm uses eax ebx, a:dword
mov ebx,[a]
fld dword[ebx]
fmul st0,st0
fld dword[ebx+4]
fmul st0,st0
faddp
fld dword[ebx+8]
fmul st0,st0
faddp
fsqrt ;st0 = sqrt(a.X^2 +a.Y^2 +a.Z^2)
ftst
fstsw ax
sahf
je .r1 ;if (sqrt(...)==0) return 1
fld dword[ebx] ;offs_X = 0
fdiv st0,st1
fstp dword[ebx] ;a.X/=sqrt(...)
fld dword[ebx+4]
fdiv st0,st1
fstp dword[ebx+4] ;a.Y/=sqrt(...)
fld dword[ebx+8]
fdiv st0,st1
fstp dword[ebx+8] ;a.Z/=sqrt(...)
.r1:
ffree st0
fincstp
ret
endp
;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 3d <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
align 4
proc obj_init, o_data:dword
@@ -678,14 +819,6 @@ endp
align 4
proc draw_3d uses eax ebx ecx edi, o_data:dword
mov edi,[o_data]
if 0 ;debug
stdcall [glClear], GL_COLOR_BUFFER_BIT + GL_DEPTH_BUFFER_BIT
mov eax,[edi+offs_obj_poi_data]
stdcall convert_int_to_str, txt_select_vert.count,16
stdcall [buf2d_draw_text], buf_ogl, buf_1,txt_select_vert,5,3,[color_select]
stdcall [kosglSwapBuffers]
jmp .end_f
end if
cmp dword[edi+offs_obj_poi_count],2
jl .end_f
stdcall [glClear], GL_COLOR_BUFFER_BIT + GL_DEPTH_BUFFER_BIT ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD> <EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -712,7 +845,7 @@ if version_edit eq 0
mov eax,[edi+offs_obj_mat1_data]
.b_found:
cmp eax,0
je .end_triangles
je .end_points
mov ebx,eax
stdcall get_mat_color, eax
stdcall draw_3d_faces_color, edi,ebx,eax
@@ -721,6 +854,93 @@ if version_edit eq 0
@@:
end if
;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD> 梥⮢ <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
bt dword[draw_mode],bit_faces
jnc .end_triangles
cmp dword[edi+offs_obj_tri_count],0
je .end_triangles
cmp dword[edi+offs_obj_poi_count],0
je .end_triangles
bt dword[draw_mode],bit_faces_fill
jc @f
push GL_LINE
jmp .end_0
@@:
push GL_FILL
.end_0:
stdcall [glPolygonMode], GL_FRONT_AND_BACK ;mode - <EFBFBD> <EFBFBD><EFBFBD>
stdcall [glColor3ub],[color_face+2],[color_face+1],[color_face]
bt dword[draw_mode],bit_smooth
jnc .triangles_flat
bt dword[draw_mode],bit_light
jnc .triangles_flat
;triangles smooth
stdcall [glBegin],GL_TRIANGLES
mov eax,[edi+offs_obj_tri_data]
mov ecx,[edi+offs_obj_tri_count]
mov edx,[edi+offs_obj_normals_tri_data]
align 4
@@:
movzx ebx,word[eax] ;1-<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
imul ebx,12
add ebx,[edi+offs_obj_normals_poi_data]
stdcall [glNormal3fv], ebx
sub ebx,[edi+offs_obj_normals_poi_data]
add ebx,[edi+offs_obj_poi_data]
stdcall [glVertex3f], [ebx],[ebx+4],[ebx+8]
movzx ebx,word[eax+2] ;2-<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
imul ebx,12
add ebx,[edi+offs_obj_normals_poi_data]
stdcall [glNormal3fv], ebx
sub ebx,[edi+offs_obj_normals_poi_data]
add ebx,[edi+offs_obj_poi_data]
stdcall [glVertex3f], [ebx],[ebx+4],[ebx+8]
movzx ebx,word[eax+4] ;3-<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
imul ebx,12
add ebx,[edi+offs_obj_normals_poi_data]
stdcall [glNormal3fv], ebx
sub ebx,[edi+offs_obj_normals_poi_data]
add ebx,[edi+offs_obj_poi_data]
stdcall [glVertex3f], [ebx],[ebx+4],[ebx+8]
add eax,8 ;<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> = (3 <EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<EFBFBD><EFBFBD> 2<EFBFBD>) + <EFBFBD><EFBFBD> (2<EFBFBD>))
dec ecx
jnz @b
stdcall [glEnd]
jmp .end_points
.triangles_flat:
stdcall [glBegin],GL_TRIANGLES
mov eax,[edi+offs_obj_tri_data]
mov ecx,[edi+offs_obj_tri_count]
mov edx,[edi+offs_obj_normals_tri_data]
align 4
@@:
;
bt dword[draw_mode],bit_light
jnc .norm1
stdcall [glNormal3fv], edx
add edx,12
.norm1:
movzx ebx,word[eax] ;1-<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
imul ebx,12
add ebx,[edi+offs_obj_poi_data]
stdcall [glVertex3f], [ebx],[ebx+4],[ebx+8]
movzx ebx,word[eax+2] ;2-<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
imul ebx,12
add ebx,[edi+offs_obj_poi_data]
stdcall [glVertex3f], [ebx],[ebx+4],[ebx+8]
movzx ebx,word[eax+4] ;3-<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
imul ebx,12
add ebx,[edi+offs_obj_poi_data]
stdcall [glVertex3f], [ebx],[ebx+4],[ebx+8]
add eax,8 ;<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> = (3 <EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<EFBFBD><EFBFBD> 2<EFBFBD>) + <EFBFBD><EFBFBD> (2<EFBFBD>))
dec ecx
jnz @b
stdcall [glEnd]
jmp .end_points
.end_triangles:
;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD>
bt dword[draw_mode],bit_vertexes
jnc .end_points
@@ -728,7 +948,14 @@ end if
stdcall [glBegin],GL_POINTS
mov eax,[edi+offs_obj_poi_data]
mov ebx,[edi+offs_obj_poi_count]
mov edx,[edi+offs_obj_normals_poi_data]
align 4
@@:
bt dword[draw_mode],bit_light
jnc .norm0
stdcall [glNormal3fv], edx
add edx,12
.norm0:
stdcall [glVertex3f], [eax],[eax+4],[eax+8]
add eax,12
dec ebx
@@ -769,6 +996,7 @@ if version_edit eq 1
mov ecx,dword[obj_poi_sel_c]
stdcall [glColor3ub],[color_select+2],[color_select+1],[color_select]
stdcall dword[tl_node_poi_get_info], tree3,0
align 4
@@:
cmp eax,0
je .end_select
@@ -789,52 +1017,6 @@ if version_edit eq 1
.end_select:
end if
;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>
bt dword[draw_mode],bit_faces
jnc .end_triangles
cmp dword[edi+offs_obj_tri_count],0
je .end_triangles
cmp dword[edi+offs_obj_poi_count],0
je .end_triangles
bt dword[draw_mode],bit_faces_fill
jc @f
push GL_LINE
jmp .end_0
@@:
push GL_FILL
.end_0:
stdcall [glPolygonMode], GL_FRONT_AND_BACK ;mode - <EFBFBD> <EFBFBD><EFBFBD>
stdcall [glColor3ub],[color_face+2],[color_face+1],[color_face]
stdcall [glBegin],GL_TRIANGLES
mov eax,[edi+offs_obj_tri_data]
mov ecx,[edi+offs_obj_tri_count]
mov edx,[edi+offs_obj_normals_tri_data]
@@:
;
bt dword[draw_mode],bit_light
jnc .norm
stdcall [glNormal3fv], edx
add edx,12
.norm:
;
movzx ebx,word[eax] ;1-<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
imul ebx,12
add ebx,[edi+offs_obj_poi_data]
stdcall [glVertex3f], [ebx],[ebx+4],[ebx+8]
movzx ebx,word[eax+2] ;2-<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
imul ebx,12
add ebx,[edi+offs_obj_poi_data]
stdcall [glVertex3f], [ebx],[ebx+4],[ebx+8]
movzx ebx,word[eax+4] ;3-<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
imul ebx,12
add ebx,[edi+offs_obj_poi_data]
stdcall [glVertex3f], [ebx],[ebx+4],[ebx+8]
add eax,8 ;<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> = (3 <EFBFBD><EFBFBD><EFBFBD><EFBFBD> (<EFBFBD><EFBFBD> 2<EFBFBD>) + <EFBFBD><EFBFBD> (2<EFBFBD>))
dec ecx
jnz @b
stdcall [glEnd]
.end_triangles:
stdcall [glPopMatrix]
if version_edit eq 1
cmp dword[obj_poi_sel_c],0
@@ -896,6 +1078,12 @@ mnu_light_on_off:
call update_obj
ret
align 4
mnu_smooth_on_off:
xor dword[draw_mode], 1 shl bit_smooth
call update_obj
ret
align 4
mnu_reset_settings:
mov dword[angle_x],0.0
@@ -1013,6 +1201,49 @@ pushad
jne @b
movzx ecx,word[esi] ;ecx - <EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
mov edx,[edi+offs_obj_poi_data]
bt dword[draw_mode],bit_smooth
jnc @f
bt dword[draw_mode],bit_light
jnc @f
align 4
.cycle_0:
add esi,2
;word[esi] - <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
movzx ebx,word[esi]
shl ebx,3
add ebx,[edi+offs_obj_tri_data]
movzx eax,word[ebx] ;1-<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
imul eax,12 ;float(x,y,z)
add eax,[edi+offs_obj_normals_poi_data]
stdcall [glNormal3fv], eax
sub eax,[edi+offs_obj_normals_poi_data]
add eax,edx
stdcall [glVertex3f], [eax],[eax+4],[eax+8]
movzx eax,word[ebx+2] ;2-<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
imul eax,12 ;float(x,y,z)
add eax,[edi+offs_obj_normals_poi_data]
stdcall [glNormal3fv], eax
sub eax,[edi+offs_obj_normals_poi_data]
add eax,edx
stdcall [glVertex3f], [eax],[eax+4],[eax+8]
movzx eax,word[ebx+4] ;3-<EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
imul eax,12 ;float(x,y,z)
add eax,[edi+offs_obj_normals_poi_data]
stdcall [glNormal3fv], eax
sub eax,[edi+offs_obj_normals_poi_data]
add eax,edx
stdcall [glVertex3f], [eax],[eax+4],[eax+8]
dec ecx
jnz .cycle_0
stdcall [glEnd]
jmp .end_f
align 4
@@:
add esi,2