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

add the calculation of normals for better lighting

Browse Source 
git-svn-id: svn://kolibrios.org@6022 a494cfbc-eb01-0410-851d-a64ba20cac60
This commit is contained in:
IgorA
2016-01-01 18:08:10 +00:00
parent 94617c0888
commit 45a7eeea24
2 changed files with 156 additions and 2 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
programs/develop/info3ds/info3ds.asm
View File

@@ -1542,9 +1542,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 <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 02.12.15',0 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
capt db 'info 3ds <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 01.01.16',0 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
else
capt db 'info 3ds version 02.12.15',0 ;window caption
capt db 'info 3ds version 01.01.16',0 ;window caption
end if
align 16

154
programs/develop/info3ds/info_wnd_coords.inc
View File

@@ -213,6 +213,7 @@ pushad
stdcall dword[tl_cur_beg], tree3
.no_object:
call obj_set_sizes
call obj_set_normals
edit_boxes_set_sys_color edit1,editboxes_end,sc ;<EFBFBD><EFBFBD>⠭<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>⥬<EFBFBD><EFBFBD><EFBFBD> 梥⮢
stdcall [edit_box_set_text], edit1, txt_q
stdcall [edit_box_set_text], edit2, txt_q
@@ -333,6 +334,12 @@ prop_wnd_clear_param:
mov dword[obj_poi_sel_c],0
mov dword[obj_tri_data],0
mov dword[obj_tri_count],0
mov dword[obj_normals_tri_count],0
mov dword[obj_normals_poi_count],0
stdcall mem.Free,[obj_normals_tri_data]
stdcall mem.Free,[obj_normals_poi_data]
mov dword[obj_normals_tri_data],0
mov dword[obj_normals_poi_data],0
ret
;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
@@ -543,6 +550,134 @@ align 4
ret
endp
;<EFBFBD><EFBFBD>⠭<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD>ଠ<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD>࠭<EFBFBD><EFBFBD>
align 4
proc obj_set_normals
locals
tbl1 rd 9 ;ebp-72
tbl2 rd 9 ;ebp-36
endl
pushad
cmp dword[obj_poi_count],0
je .end
finit
mov ecx,[obj_tri_count]
mov [obj_normals_tri_count],ecx ;<EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD>㣮<EFBFBD>쭨<EFBFBD> 1 <EFBFBD><EFBFBD>ଠ<EFBFBD><EFBFBD>
cmp ecx,0
je .end
imul ecx,12
stdcall mem.Alloc, ecx
mov [obj_normals_tri_data],eax
mov edx,[obj_tri_data]
mov ebx,[obj_tri_count]
align 4
@@:
mov edi,ebp
sub edi,36 ;tbl2
movzx esi,word[edx] ;1-<EFBFBD> <EFBFBD><EFBFBD><EFBFBD>設<EFBFBD>
imul esi,12
add esi,[obj_poi_data]
mov ecx,3
rep movsd
movzx esi,word[edx+2] ;2-<EFBFBD> <EFBFBD><EFBFBD><EFBFBD>設<EFBFBD>
imul esi,12
add esi,[obj_poi_data]
mov ecx,3
rep movsd
movzx esi,word[edx+4] ;3-<EFBFBD> <EFBFBD><EFBFBD><EFBFBD>設<EFBFBD>
imul esi,12
add esi,[obj_poi_data]
mov ecx,3
rep movsd
mov esi,ebp
sub esi,72 ;tbl1
sub edi,36 ;tbl2
;v1 <-> v2
fld dword[edi+12]
fsub dword[edi]
fstp dword[esi] ;(x1-x2)
fld dword[edi+16]
fsub dword[edi+4]
fstp dword[esi+4] ;(y1-y2)
fld dword[edi+20]
fsub dword[edi+8]
fstp dword[esi+8] ;(z1-z2)
;v2 <-> v3
fld dword[edi+24]
fsub dword[edi+12]
fstp dword[esi+12] ;(x2-x3)
fld dword[edi+28]
fsub dword[edi+16]
fstp dword[esi+16] ;(y2-y3)
fld dword[edi+32]
fsub dword[edi+20]
fstp dword[esi+20] ;(z2-z3)
;v3 <-> v1
fld dword[edi]
fsub dword[edi+24]
fstp dword[esi+24] ;(x3-x1)
fld dword[edi+4]
fsub dword[edi+28]
fstp dword[esi+28] ;(y3-y1)
fld dword[edi+8]
fsub dword[edi+32]
fstp dword[esi+32] ;(z3-z1)
;a1,a2,a3
fld dword[esi+4]
fmul dword[esi+8]
fstp dword[edi] ;a1=(y1-y2)*(z1-z2)
fld dword[esi+16]
fmul dword[esi+20]
fstp dword[edi+4] ;a2=(y2-y3)*(z2-z3)
fld dword[esi+28]
fmul dword[esi+32]
fstp dword[edi+8] ;a3=(y3-y1)*(z3-z1)
;b1,b2,b3
fld dword[esi]
fmul dword[esi+8]
fstp dword[edi] ;b1=(x1-x2)*(z1-z2)
fld dword[esi+12]
fmul dword[esi+20]
fstp dword[edi+4] ;b2=(x2-x3)*(z2-z3)
fld dword[esi+24]
fmul dword[esi+32]
fstp dword[edi+8] ;b3=(x3-x1)*(z3-z1)
;c1,<EFBFBD>2,<EFBFBD>3
fld dword[esi]
fmul dword[esi+4]
fstp dword[edi] ;c1=(x1-x2)*(y1-y2)
fld dword[esi+12]
fmul dword[esi+16]
fstp dword[edi+4] ;c2=(x2-x3)*(y2-y3)
fld dword[esi+24]
fmul dword[esi+28]
fstp dword[edi+8] ;c3=(x3-x1)*(y3-y1)
fld dword[edi]
fadd dword[edi+4]
fadd dword[edi+8]
fstp dword[eax] ;set normal.a
fld dword[edi+12]
fadd dword[edi+16]
fadd dword[edi+20]
fstp dword[eax+4] ;set normal.b
fld dword[edi+24]
fadd dword[edi+28]
fadd dword[edi+32]
fstp dword[eax+8] ;set normal.c
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
.end:
popad
ret
endp
;<EFBFBD><EFBFBD>ᮢ<EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD>祪 <EFBFBD> 3d
align 4
draw_3d:
@@ -650,7 +785,16 @@ draw_3d:
stdcall [glBegin],GL_TRIANGLES
mov eax,[obj_tri_data]
mov ecx,[obj_tri_count]
mov edx,[obj_normals_tri_data]
@@:
;
bt dword[draw_mode],bit_light
jnc .norm
;[obj_normals_tri_count]
stdcall [glNormal3fv], edx
add edx,12
.norm:
;
movzx ebx,word[eax] ;1-<EFBFBD> <EFBFBD><EFBFBD><EFBFBD>設<EFBFBD>
imul ebx,12
add ebx,[obj_poi_data]
@@ -976,6 +1120,10 @@ prop_button:
mov dword[tree3.data_img],0 ;<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><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>
mov dword[tree3.data_img_sys],0 ;<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>
stdcall dword[tl_data_clear], tree3
stdcall mem.Free,[obj_normals_tri_data]
stdcall mem.Free,[obj_normals_poi_data]
mov dword[obj_normals_tri_data],0
mov dword[obj_normals_poi_data],0
mov byte[prop_wnd_run],0 ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>塞 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>稪 <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
mcall -1 ;<EFBFBD><EFBFBD>室 <EFBFBD><EFBFBD> <EFBFBD>ணࠬ<EFBFBD><EFBFBD>
@@ -1296,6 +1444,12 @@ obj_tri_data dd 0 ;㪠
obj_tri_count dd 0 ;<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD>⢮ <EFBFBD><EFBFBD><EFBFBD>㣮<EFBFBD>쭨<EFBFBD><EFBFBD><EFBFBD>
cursor_last_draw dd 0 ;<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><EFBFBD> 3d <EFBFBD><EFBFBD><EFBFBD><EFBFBD>
sph_radius dd 0 ;ࠤ<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD><EFBFBD> <EFBFBD>뤥<EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD>⨢<EFBFBD><EFBFBD><EFBFBD> <EFBFBD><EFBFBD>窨
obj_normals_poi_data dd 0
obj_normals_poi_count dd 0
obj_normals_tri_data dd 0
obj_normals_tri_count dd 0
obj_x_max dd 0
obj_x_min dd 0
obj_x_centr dd 0