ci: add retention-days to artifact

Floppy images: 1 year ISO images: 1 month Raw: 1 week
2025-04-04 18:20:29 +03:00
21 changed files with 399 additions and 272 deletions
--- a/.gitea/workflows/build.yaml
+++ b/.gitea/workflows/build.yaml
@@ -149,18 +149,21 @@ jobs:
        with:
          name: kolibrios-en_US-${{ steps.vars.outputs.sha_short }}.img
          path: build-en_US/data/kolibri.img
+          retention-days: 365

      - name: (en_US) Upload CD image
        uses: actions/upload-artifact@v3
        with:
          name: kolibrios-en_US-${{ steps.vars.outputs.sha_short }}.iso
          path: build-en_US/data/kolibri.iso
+          retention-days: 30

      - name: (en_US) Upload raw image
        uses: actions/upload-artifact@v3
        with:
          name: kolibrios-en_US-${{ steps.vars.outputs.sha_short }}.raw
          path: build-en_US/data/kolibri.raw
+          retention-days: 7

      # -------------------------- Build ru_RU ------------------------- #
      - name: (ru_RU) Build KolibriOS
@@ -174,18 +177,21 @@ jobs:
        with:
          name: kolibrios-ru_RU-${{ steps.vars.outputs.sha_short }}.img
          path: build-ru_RU/data/kolibri.img
+          retention-days: 365

      - name: (ru_RU) Upload CD image
        uses: actions/upload-artifact@v3
        with:
          name: kolibrios-ru_RU-${{ steps.vars.outputs.sha_short }}.iso
          path: build-ru_RU/data/kolibri.iso
+          retention-days: 30

      - name: (ru_RU) Upload raw image
        uses: actions/upload-artifact@v3
        with:
          name: kolibrios-ru_RU-${{ steps.vars.outputs.sha_short }}.raw
          path: build-ru_RU/data/kolibri.raw
+          retention-days: 7

      # -------------------------- Build es_ES ------------------------- #
      - name: (es_ES) Build KolibriOS
@@ -199,15 +205,18 @@ jobs:
        with:
          name: kolibrios-es_ES-${{ steps.vars.outputs.sha_short }}.img
          path: build-es_ES/data/kolibri.img
+          retention-days: 365

      - name: (es_ES) Upload CD image
        uses: actions/upload-artifact@v3
        with:
          name: kolibrios-es_ES-${{ steps.vars.outputs.sha_short }}.iso
          path: build-es_ES/data/kolibri.iso
+          retention-days: 30

      - name: (es_ES) Upload raw image
        uses: actions/upload-artifact@v3
        with:
          name: kolibrios-es_ES-${{ steps.vars.outputs.sha_short }}.raw
          path: build-es_ES/data/kolibri.raw
+          retention-days: 7
--- a/programs/develop/info3ds/info3ds.asm
+++ b/programs/develop/info3ds/info3ds.asm
@@ -1082,7 +1082,7 @@ l_libs_start:
 	lib_2 l_libs lib_name_2, file_name, system_dir_2, import_box_lib
 	lib_3 l_libs lib_name_3, file_name, system_dir_3, import_buf2d
 	lib_4 l_libs lib_name_4, file_name, system_dir_4, import_libkmenu
-	lib_5 l_libs lib_name_5, file_name, system_dir_5, import_tinygl
+	lib_5 l_libs lib_name_5, file_name, system_dir_5, import_lib_tinygl
 	lib_6 l_libs lib_name_6, file_name, system_dir_6, import_libini
 l_libs_end:

@@ -1287,7 +1287,7 @@ dd 0,0
 	akmenuitem_draw 		db 'kmenuitem_draw',0

 align 4
-import_tinygl:
+import_lib_tinygl:
 macro E_LIB n
 {
 	n dd sz_#n
@@ -1343,7 +1343,7 @@ buf_1:
 align 4
 el_focus dd tree1
 tree1 tree_list size_one_list,300+2, tl_key_no_edit+tl_draw_par_line,\
-	16,16, 0xffffff,0xb0d0ff,0x10400040, 5,35,195-16,250, 16,list_offs_text,0,\
+	16,16, 0xffffff,0xb0d0ff,0x400040, 5,35,195-16,250, 16,list_offs_text,0,\
 	el_focus,w_scr_t1,0

 align 4
@@ -1362,9 +1362,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_RU
-capt db 'info 3ds <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 14.04.25',0 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
+capt db 'info 3ds <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 29.09.20',0 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
 else ; Default to en_US
-capt db 'info 3ds version 14.04.25',0 ;window caption
+capt db 'info 3ds version 29.09.20',0 ;window caption
 end if

 align 16
--- a/programs/develop/info3ds/info3ds_u.asm
+++ b/programs/develop/info3ds/info3ds_u.asm
@@ -1408,7 +1408,7 @@ buf_1:
 align 4
 el_focus dd tree1
 tree1 tree_list size_one_list,300+2, tl_key_no_edit+tl_draw_par_line,\
-	16,16, 0xffffff,0xb0d0ff,0x10400040, 5,47,195-16,250, 16,list_offs_text,0, el_focus,\
+	16,16, 0xffffff,0xb0d0ff,0x400040, 5,47,195-16,250, 16,list_offs_text,0, el_focus,\
 	w_scr_t1,0

 align 4
@@ -1427,9 +1427,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_RU
-capt db 'info 3ds [user] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 14.04.25',0 ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
+capt db 'info 3ds [user] <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> 29.09.20',0 ; <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
 else ; Default to en_US
-capt db 'info 3ds [user] version 14.04.25',0 ; Window caption
+capt db 'info 3ds [user] version 29.09.20',0 ; Window caption
 end if

 align 16
--- a/programs/develop/info3ds/info_o3d.inc
+++ b/programs/develop/info3ds/info_o3d.inc
@@ -812,8 +812,9 @@ proc draw_3d uses eax ebx ecx edi, o_data:dword
 	@@:
 		stdcall [glDisable],GL_LIGHTING
 	.end_l:
+	stdcall [glTranslatef], 0.0,0.0,0.5 ;correct for z
 	stdcall [glScalef], [edi+obj_3d.x_scale],[edi+obj_3d.y_scale],[edi+obj_3d.z_scale]
-	stdcall [glScalef], 1.0,1.0,1.4 ;correct for z
+	stdcall [glScalef], 1.0,1.0,0.7 ;correct for z
 	stdcall [glRotatef], [angle_z],0.0,0.0,1.0
 	stdcall [glRotatef], [angle_y],0.0,1.0,0.0
 	stdcall [glRotatef], [angle_x],1.0,0.0,0.0
--- a/programs/develop/libraries/TinyGL/asm_fork/api.asm
+++ b/programs/develop/libraries/TinyGL/asm_fork/api.asm
@@ -951,12 +951,13 @@ endl
 endp

 align 4
-proc glClearDepth uses eax, depth:qword
+proc glClearDepth uses eax, depth:dword
 locals
 	p rd 2
 endl
 	mov dword[p],OP_ClearDepth
-	fld qword[depth]
+	mov eax,[depth]
+	fld qword[eax]
 	fstp dword[p+4]

 	lea eax,[ebp-8] ;=sizeof(dd)*2
--- a/programs/develop/libraries/TinyGL/asm_fork/arrays.asm
+++ b/programs/develop/libraries/TinyGL/asm_fork/arrays.asm
@@ -23,7 +23,8 @@ endl
 		imul ecx,ebx
 		shl ecx,2
 		add ecx,[eax+GLContext.color_array] ;ecx = &context.color_array[i]
-		lea ebx,[ebp-20] ;=sizeof(dd)*5
+		mov ebx,ebp
+		sub ebx,20 ;=sizeof(dd)*5
 		mov edx,[ecx]
 		mov [ebx+4],edx
 		mov edx,[ecx+4]
@@ -47,7 +48,8 @@ endl
 		imul esi,ebx
 		shl esi,2
 		add esi,[eax+GLContext.normal_array] ;esi = &normal_array[ebx * (3 + c->normal_array_stride)]
-		lea edi,[eax+GLContext.current_normal]
+		mov edi,eax
+		add edi,GLContext.current_normal
 		mov ecx,3
 		rep movsd
 		mov dword[edi],0.0
@@ -90,7 +92,8 @@ endl
 		imul ecx,ebx
 		shl ecx,2
 		add ecx,[eax+GLContext.vertex_array] ;ecx = &context.vertex_array[i]
-		lea ebx,[ebp-20] ;=sizeof(dd)*5
+		mov ebx,ebp
+		sub ebx,20 ;=sizeof(dd)*5
 		mov edx,[ecx]
 		mov [ebx+4],edx
 		mov edx,[ecx+4]
@@ -127,7 +130,8 @@ endl
 	mov eax,[i]
 	mov dword[p+4],eax

-	lea eax,[ebp-8] ;=sizeof(dd)*2
+	mov eax,ebp
+	sub eax,8 ;=sizeof(dd)*2
 	stdcall gl_add_op,eax
 	ret
 endp
@@ -135,9 +139,10 @@ endp
 align 4
 proc glopDrawArrays, context:dword, param:dword
 locals
+	vi dd ?
 	idx dd ?
 	states dd ?
-	a_size dd ?
+	size dd ?
 	p rd 8 ;функция glopColor требует 8 параметров, другие функции требуют меньше, берем по максимуму что-бы не портить стек
 endl
 pushad
@@ -150,19 +155,132 @@ pushad
 	mov [idx],eax ;param[2].i
 	mov eax,[ebx+4]
 	mov [p+4],eax ;p[1].i = param[1].i
-	lea eax,[ebp-32] ;=sizeof(dd)*8
+	mov eax,ebp
+	sub eax,32 ;=sizeof(dd)*8
 	stdcall glopBegin, edx,eax

-	cmp ecx,1
-	jl @f
+	mov dword[vi],0
 align 4
 	.cycle_0: ;for (int vi=0; vi<count; vi++)
-		call CopyArrayElementByIndex
+	cmp dword[vi],ecx
+	jge .cycle_0_end
+		bt dword[states],1 ;2^1=COLOR_ARRAY
+		jnc @f
+			mov esi,[edx+GLContext.color_array_size]
+			mov [size],esi
+			add esi,[edx+GLContext.color_array_stride]
+			imul esi,[idx] ;esi = i
+			shl esi,2
+			add esi,[edx+GLContext.color_array] ;esi = &context.color_array[i]
+			mov edi,ebp
+			sub edi,28 ;edi = &p[1]
+			mov ebx,[esi+8]
+			mov [edi],ebx   ;p[1].f = context.color_array[i+2]
+			mov ebx,[esi+4]
+			mov [edi+4],ebx ;p[2].f = context.color_array[i+1]
+			mov ebx,[esi]
+			mov [edi+8],ebx ;p[3].f = context.color_array[i]
+			add edi,12
+			cmp dword[size],3
+			jle .e1
+				add esi,12
+				movsd
+				jmp .e2
+			.e1:
+				mov dword[edi],1.0 ;если задано 3 параметра, то 4-й ставим по умолчанию 1.0
+			.e2:
+			mov edi,ebp
+			sub edi,32 ;edi = &p[0]
+			mov ebx,ebp
+			sub ebx,12 ;ebp-12 = &p[5]
+			push ebx
+			add ebx,4 ;ebp-8 = &p[6]
+			push ebx
+			add ebx,4 ;ebp-4 = &p[7]
+			push ebx
+			stdcall RGBFtoRGBI,[edi+12],[edi+8],[edi+4] ;call: r,g,b,&p[7],&p[6],&p[5]
+			stdcall glopColor, edx,edi ;(context, p(op,rf,gf,bf,af,ri,gi,bi))
+		@@:
+		bt dword[states],2 ;2^2=NORMAL_ARRAY
+		jnc @f
+			mov esi,[edx+GLContext.normal_array_stride]
+			add esi,3
+			imul esi,[idx]
+			shl esi,2
+			add esi,[edx+GLContext.normal_array] ;esi = &context.normal_array[ idx * (3 + context.normal_array_stride) ]
+			mov edi,edx
+			add edi,GLContext.current_normal
+			movsd ;context.current_normal.X = context.normal_array[i]
+			movsd
+			movsd
+			mov dword[edi],0.0 ;context.current_normal.W = 0.0f
+		@@:
+		bt dword[states],3 ;2^3=TEXCOORD_ARRAY
+		jnc @f
+			mov esi,[edx+GLContext.texcoord_array_size]
+			mov [size],esi
+			add esi,[edx+GLContext.texcoord_array_stride]
+			imul esi,[idx] ;esi = i
+			shl esi,2
+			add esi,[edx+GLContext.texcoord_array] ;esi = &context.texcoord_array[i]
+			mov edi,edx
+			add edi,GLContext.current_tex_coord
+			movsd ;context.current_tex_coord.X = ccontext.texcoord_array[i]
+			movsd
+			cmp dword[size],2
+			jle .e3
+				movsd
+				jmp .e4
+			.e3:
+				mov dword[edi],0.0 ;если задано 2 параметра, то 3-й ставим по умолчанию 0.0
+				add edi,4
+			.e4:
+			cmp dword[size],3
+			jle .e5
+				movsd
+				jmp @f
+			.e5:
+				mov dword[edi],1.0 ;если задано 3 параметра, то 4-й ставим по умолчанию 1.0
+		@@:
+		bt dword[states],0 ;2^0=VERTEX_ARRAY
+		jnc @f
+			mov esi,[edx+GLContext.vertex_array_size]
+			mov [size],esi
+			add esi,[edx+GLContext.vertex_array_stride]
+			imul esi,[idx] ;esi = i
+			shl esi,2
+			add esi,[edx+GLContext.vertex_array] ;esi = &context.vertex_array[i]
+			mov edi,ebp
+			sub edi,28 ;edi = &p[1]
+			movsd ;p[1].f = context.vertex_array[i]
+			movsd
+			cmp dword[size],2
+			jle .e6
+				movsd
+				jmp .e7
+			.e6:
+				mov dword[edi],0.0 ;если задано 2 параметра, то 3-й ставим по умолчанию 0.0
+				add edi,4
+				jmp .e8 ;и 4-й тоже ставим по умолчанию
+			.e7:
+			cmp dword[size],3
+			jle .e8
+				movsd
+				sub edi,20 ;edi=&p[0]
+				jmp .e9
+			.e8:
+				mov dword[edi],1.0 ;если задано 3 параметра, то 4-й ставим по умолчанию 1.0
+				sub edi,16 ;edi=&p[0]
+			.e9:
+			stdcall glopVertex, edx,edi
+		@@:
 		inc dword[idx]
-		loop .cycle_0
-	@@:
+	inc dword[vi]
+	jmp .cycle_0
+	.cycle_0_end:

-	lea eax,[ebp-32] ;=sizeof(dd)*8
+	;mov eax,ebp
+	;sub eax,32 ;=sizeof(dd)*8
 	stdcall glopEnd, edx,eax
 popad
 	ret
@@ -181,7 +299,8 @@ endl
 	mov eax,[count]
 	mov dword[p+12],eax

-	lea eax,[ebp-16] ;=sizeof(dd)*4
+	mov eax,ebp
+	sub eax,16 ;=sizeof(dd)*4
 	stdcall gl_add_op,eax
 	ret
 endp
@@ -189,12 +308,12 @@ endp
 align 4
 proc glopDrawElements, context:dword, param:dword
 locals
-	type dd ?
-	indices dd ? ;указатель на 16 или 32 битные индексы
 	ii dd ?
 	idx dd ?
 	states dd ?
-	a_size dd ?
+	type dd ?
+	size dd ?
+	indices dd ? ;указатель на 16 или 32 битные индексы
 	p rd 8
 endl
 pushad
@@ -209,7 +328,8 @@ pushad
 	mov [type],eax ;type = param[3].i
 	mov eax,[ebx+16]
 	mov [indices],eax ;*indices = param[4].p
-	lea eax,[ebp-32] ;=sizeof(dd)*8
+	mov eax,ebp
+	sub eax,32 ;=sizeof(dd)*8
 	stdcall glopBegin, edx,eax

 	mov dword[ii],0
@@ -231,133 +351,127 @@ align 4
 		.end_0:
 		mov [idx],esi

-		call CopyArrayElementByIndex
+		bt dword[states],1 ;2^1=COLOR_ARRAY
+		jnc @f
+			mov esi,[edx+GLContext.color_array_size]
+			mov [size],esi
+			add esi,[edx+GLContext.color_array_stride]
+			imul esi,[idx] ;esi = i
+			shl esi,2
+			add esi,[edx+GLContext.color_array] ;esi = &context.color_array[i]
+			mov edi,ebp
+			sub edi,28 ;edi = &p[1]
+			mov ebx,[esi+8]
+			mov [edi],ebx   ;p[1].f = context.color_array[i+2]
+			mov ebx,[esi+4]
+			mov [edi+4],ebx ;p[2].f = context.color_array[i+1]
+			mov ebx,[esi]
+			mov [edi+8],ebx ;p[3].f = context.color_array[i]
+			add edi,12
+			cmp dword[size],3
+			jle .e1
+				add esi,12
+				movsd
+				jmp .e2
+			.e1:
+				mov dword[edi],1.0 ;если задано 3 параметра, то 4-й ставим по умолчанию 1.0
+			.e2:
+			mov edi,ebp
+			sub edi,32 ;edi = &p[0]
+			mov ebx,ebp
+			sub ebx,12 ;ebp-12 = &p[5]
+			push ebx
+			add ebx,4 ;ebp-8 = &p[6]
+			push ebx
+			add ebx,4 ;ebp-4 = &p[7]
+			push ebx
+			stdcall RGBFtoRGBI,[edi+12],[edi+8],[edi+4] ;call: r,g,b,&p[7],&p[6],&p[5]
+			stdcall glopColor, edx,edi ;(context, p(op,rf,gf,bf,af,ri,gi,bi)) 
+		@@:
+		bt dword[states],2 ;2^2=NORMAL_ARRAY
+		jnc @f
+			mov esi,[edx+GLContext.normal_array_stride]
+			add esi,3
+			imul esi,[idx] ;esi = idx * (3 + context.normal_array_stride)
+			shl esi,2
+			add esi,[edx+GLContext.normal_array]
+			mov edi,edx
+			add edi,GLContext.current_normal
+			movsd ;context.current_normal.X = context.normal_array[i]
+			movsd
+			movsd
+			mov dword[edi],0.0 ;context.current_normal.W = 0.0f
+		@@:
+		bt dword[states],3 ;2^3=TEXCOORD_ARRAY
+		jnc @f
+			mov esi,[edx+GLContext.texcoord_array_size]
+			mov [size],esi
+			add esi,[edx+GLContext.texcoord_array_stride]
+			imul esi,[idx] ;esi = i
+			shl esi,2
+			add esi,[edx+GLContext.texcoord_array] ;esi = &context.texcoord_array[i]
+			mov edi,edx
+			add edi,GLContext.current_tex_coord
+			movsd ;context.current_tex_coord.X = ccontext.texcoord_array[i]
+			movsd
+			cmp dword[size],2
+			jle .e3
+				movsd
+				jmp .e4
+			.e3:
+				mov dword[edi],0.0 ;если задано 2 параметра, то 3-й ставим по умолчанию 0.0
+				add edi,4
+			.e4:
+			cmp dword[size],3
+			jle .e5
+				movsd
+				jmp @f
+			.e5:
+				mov dword[edi],1.0 ;если задано 3 параметра, то 4-й ставим по умолчанию 1.0
+		@@:
+		bt dword[states],0 ;2^0=VERTEX_ARRAY
+		jnc @f
+			mov esi,[edx+GLContext.vertex_array_size]
+			mov [size],esi
+			add esi,[edx+GLContext.vertex_array_stride]
+			imul esi,[idx] ;esi = i
+			shl esi,2
+			add esi,[edx+GLContext.vertex_array] ;esi = &context.vertex_array[i]
+			mov edi,ebp
+			sub edi,28 ;edi = &p[1]
+			movsd ;p[1].f = context.vertex_array[i]
+			movsd
+			cmp dword[size],2
+			jle .e6
+				movsd
+				jmp .e7
+			.e6:
+				mov dword[edi],0.0 ;если задано 2 параметра, то 3-й ставим по умолчанию 0.0
+				add edi,4
+				jmp .e8 ;и 4-й тоже ставим по умолчанию
+			.e7:
+			cmp dword[size],3
+			jle .e8
+				movsd
+				sub edi,20 ;edi=&p[0]
+				jmp .e9
+			.e8:
+				mov dword[edi],1.0 ;если задано 3 параметра, то 4-й ставим по умолчанию 1.0
+				sub edi,16 ;edi=&p[0]
+			.e9:
+			stdcall glopVertex, edx,edi
+		@@:
 	inc dword[ii]
 	jmp .cycle_0
 	.cycle_0_end:

-	lea eax,[ebp-32] ;=sizeof(dd)*8
+	mov eax,ebp
+	sub eax,32 ;=sizeof(dd)*8
 	stdcall glopEnd, edx,eax
 popad
 	ret
 endp

-;input:
-; edx - GLContext
-idx    equ ebp-44
-states equ ebp-40
-a_size equ ebp-36
-align 4
-CopyArrayElementByIndex:
-	bt dword[states],1 ;2^1=COLOR_ARRAY
-	jnc @f
-		mov esi,[edx+GLContext.color_array_size]
-		mov [a_size],esi
-		add esi,[edx+GLContext.color_array_stride]
-		imul esi,[idx] ;esi = i
-		shl esi,2
-		add esi,[edx+GLContext.color_array] ;esi = &context.color_array[i]
-		lea edi,[ebp-28] ;edi = &p[1]
-		mov ebx,[esi+8]
-		mov [edi],ebx   ;p[1].f = context.color_array[i+2]
-		mov ebx,[esi+4]
-		mov [edi+4],ebx ;p[2].f = context.color_array[i+1]
-		mov ebx,[esi]
-		mov [edi+8],ebx ;p[3].f = context.color_array[i]
-		add edi,12
-		cmp dword[a_size],3
-		jle .e1
-			add esi,12
-			movsd
-			jmp .e2
-		.e1:
-			mov dword[edi],1.0 ;если задано 3 параметра, то 4-й ставим по умолчанию 1.0
-		.e2:
-		lea edi,[ebp-32] ;edi = &p[0]
-		lea ebx,[ebp-12] ;ebp-12 = &p[5]
-		push ebx
-		add ebx,4 ;ebp-8 = &p[6]
-		push ebx
-		add ebx,4 ;ebp-4 = &p[7]
-		push ebx
-		stdcall RGBFtoRGBI,[edi+12],[edi+8],[edi+4] ;call: r,g,b,&p[7],&p[6],&p[5]
-		stdcall glopColor, edx,edi ;(context, p(op,rf,gf,bf,af,ri,gi,bi)) 
-	@@:
-	bt dword[states],2 ;2^2=NORMAL_ARRAY
-	jnc @f
-		mov esi,[edx+GLContext.normal_array_stride]
-		add esi,3
-		imul esi,[idx] ;esi = idx * (3 + context.normal_array_stride)
-		shl esi,2
-		add esi,[edx+GLContext.normal_array] ;esi = &context.normal_array[ idx * (3 + context.normal_array_stride) ]
-		lea edi,[edx+GLContext.current_normal]
-		movsd ;context.current_normal.X = context.normal_array[i]
-		movsd
-		movsd
-		mov dword[edi],0.0 ;context.current_normal.W = 0.0f
-	@@:
-	bt dword[states],3 ;2^3=TEXCOORD_ARRAY
-	jnc @f
-		mov esi,[edx+GLContext.texcoord_array_size]
-		mov [a_size],esi
-		add esi,[edx+GLContext.texcoord_array_stride]
-		imul esi,[idx] ;esi = i
-		shl esi,2
-		add esi,[edx+GLContext.texcoord_array] ;esi = &context.texcoord_array[i]
-		lea edi,[edx+GLContext.current_tex_coord]
-		movsd ;context.current_tex_coord.X = ccontext.texcoord_array[i]
-		movsd
-		cmp dword[a_size],2
-		jle .e3
-			movsd
-			jmp .e4
-		.e3:
-			mov dword[edi],0.0 ;если задано 2 параметра, то 3-й ставим по умолчанию 0.0
-			add edi,4
-		.e4:
-		cmp dword[a_size],3
-		jle .e5
-			movsd
-			jmp @f
-		.e5:
-			mov dword[edi],1.0 ;если задано 3 параметра, то 4-й ставим по умолчанию 1.0
-	@@:
-	bt dword[states],0 ;2^0=VERTEX_ARRAY
-	jnc @f
-		mov esi,[edx+GLContext.vertex_array_size]
-		mov [a_size],esi
-		add esi,[edx+GLContext.vertex_array_stride]
-		imul esi,[idx] ;esi = i
-		shl esi,2
-		add esi,[edx+GLContext.vertex_array] ;esi = &context.vertex_array[i]
-		lea edi,[ebp-28] ;edi = &p[1]
-		movsd ;p[1].f = context.vertex_array[i]
-		movsd
-		cmp dword[a_size],2
-		jle .e6
-			movsd
-			jmp .e7
-		.e6:
-			mov dword[edi],0.0 ;если задано 2 параметра, то 3-й ставим по умолчанию 0.0
-			add edi,4
-			jmp .e8 ;и 4-й тоже ставим по умолчанию
-		.e7:
-		cmp dword[a_size],3
-		jle .e8
-			movsd
-			sub edi,20 ;edi=&p[0]
-			jmp .e9
-		.e8:
-			mov dword[edi],1.0 ;если задано 3 параметра, то 4-й ставим по умолчанию 1.0
-			sub edi,16 ;edi=&p[0]
-		.e9:
-		stdcall glopVertex, edx,edi
-	@@:
-	ret
-purge idx
-purge states
-purge a_size
-
 align 4
 proc glDrawElements uses eax, mode:dword, count:dword, type:dword, indices:dword
 locals
@@ -374,7 +488,8 @@ endl
 	mov eax,[indices]
 	mov dword[p+16],eax

-	lea eax,[ebp-20] ;=sizeof(dd)*5
+	mov eax,ebp
+	sub eax,20 ;=sizeof(dd)*5
 	stdcall gl_add_op,eax
 	ret
 endp
@@ -418,7 +533,8 @@ endl
 		;assert(0);
 	.end_f:

-	lea eax,[ebp-8] ;=sizeof(dd)*2
+	mov eax,ebp
+	sub eax,8 ;=sizeof(dd)*2
 	stdcall gl_add_op,eax
 	ret
 endp
@@ -462,7 +578,8 @@ endl
 		;assert(0);
 	.end_f:

-	lea eax,[ebp-8] ;=sizeof(dd)*2
+	mov eax,ebp
+	sub eax,8 ;=sizeof(dd)*2
 	stdcall gl_add_op,eax
 	ret
 endp
@@ -495,7 +612,8 @@ endl
 	mov eax,[pointer]
 	mov dword[p+12],eax

-	lea eax,[ebp-16] ;=sizeof(dd)*4
+	mov eax,ebp
+	sub eax,16 ;=sizeof(dd)*4
 	stdcall gl_add_op,eax
 	ret
 endp
@@ -528,7 +646,8 @@ endl
 	mov eax,[pointer]
 	mov dword[p+12],eax

-	lea eax,[ebp-16] ;=sizeof(dd)*4
+	mov eax,ebp
+	sub eax,16 ;=sizeof(dd)*4
 	stdcall gl_add_op,eax
 	ret
 endp
@@ -557,7 +676,8 @@ endl
 	mov eax,[pointer]
 	mov dword[p+8],eax

-	lea eax,[ebp-12] ;=sizeof(dd)*3
+	mov eax,ebp
+	sub eax,12 ;=sizeof(dd)*3
 	stdcall gl_add_op,eax
 	ret
 endp
@@ -590,7 +710,8 @@ endl
 	mov eax,[pointer]
 	mov dword[p+12],eax

-	lea eax,[ebp-16] ;=sizeof(dd)*4
+	mov eax,ebp
+	sub eax,16 ;=sizeof(dd)*4
 	stdcall gl_add_op,eax
 	ret
 endp
--- a/programs/develop/libraries/TinyGL/asm_fork/examples/test_array1.asm
+++ b/programs/develop/libraries/TinyGL/asm_fork/examples/test_array1.asm
@@ -12,15 +12,6 @@ include '../opengl_const.inc'

@use_library

-;Constants describing the house.3ds file (obtained using the info_3ds program)
-VERTICES_OFFSET =  0x33 ;offset along which the coordinates of the vertices go
-FACES_COUNT	= 0x162 ;number of faces
-FACES_OFFSET	= 0x96b ;offset along which information about the edges goes
-
-HOUSE_FILE_SIZE = 5297
-txt_error_file_size db '"House.3ds file size does not match" -tE',0
-
-
 align 4
 start:
 	load_library name_tgl, library_path, system_path, import_tinygl
@@ -29,20 +20,20 @@ start:

 	mcall SF_SET_EVENTS_MASK,0x27

-	;we fill the array of indices from the house.3ds file (which is embedded inside this program)
+	;заполняем массив индексов из файла house.3ds (который вшит внутрь данной программы)
 	mov esi,house_3ds
-	add esi,FACES_OFFSET
+	add esi,0x1798 ;смещение по которому идет информация о гранях в файле 3ds (получено с использованием программы info_3ds)
 	mov edi,Indices
-	mov eax,FACES_COUNT
+	mov eax,0x1a6 ;число граней в файле 3ds (получено с использованием программы info_3ds)
 	@@:
 		movsd
 		movsw
-		add esi,2 ;skip face properties
+		add esi,2 ;пропускаем свойства грани
 		dec eax
 		or eax,eax
 	jnz @b

-	;tinygl initial context settings
+	;первоначальные настройки контекста tinygl
 	stdcall [kosglMakeCurrent], 10,10,400,350,ctx1
 	stdcall [glEnable], GL_DEPTH_TEST
 	stdcall [glClearColor], 0.0,0.0,0.0,0.0
@@ -57,13 +48,13 @@ red_win:
 align 4
 still:
 	mcall SF_WAIT_EVENT
-	cmp   al,EV_REDRAW
-	jz    red_win
-	cmp   al,EV_KEY
-	jz    key
-	cmp   al,EV_BUTTON
-	jz    button
-	jmp   still
+	cmp al,1
+	jz red_win
+	cmp al,2
+	jz key
+	cmp al,3
+	jz button
+	jmp still

 align 4
 draw_window:
@@ -149,34 +140,29 @@ caption db 'Test opengl 1.1 arrays, [Esc] - exit, [<-],[->],[Up],[Down] - rotate

 align 4
 draw_3d:
-stdcall [glClear], GL_COLOR_BUFFER_BIT + GL_DEPTH_BUFFER_BIT ;clear the color and depth buffer
-mov eax,house_3ds.end-house_3ds
-cmp eax,HOUSE_FILE_SIZE
-je @f
-	notify_window_run txt_error_file_size
-	ret
-@@:
+stdcall [glClear], GL_COLOR_BUFFER_BIT + GL_DEPTH_BUFFER_BIT ;очистим буфер цвета и глубины
 call [glPushMatrix]

-	;scale and rotations
+	;масштаб и повороты
+	stdcall [glTranslatef], 0.0,0.0,0.5
 	stdcall [glScalef], [scale], [scale], [scale]
 	stdcall [glRotatef], [angle_z],0.0,0.0,1.0
 	stdcall [glRotatef], [angle_y],0.0,1.0,0.0
 	stdcall [glRotatef], [angle_x],1.0,0.0,0.0

-	;drawing via index array
-	mov eax,house_3ds ;start of embedded 3ds file
-	add eax,VERTICES_OFFSET
-	stdcall [glVertexPointer], 3, GL_FLOAT, 0, eax ;we set an array for the vertices, 3 is the number of coordinates for one vertex
-	stdcall [glEnableClientState], GL_VERTEX_ARRAY ;turn on the vertex drawing mode
-	stdcall [glDrawElements], GL_TRIANGLES, FACES_COUNT*3, GL_UNSIGNED_SHORT, Indices ;mode, count, type, *indices
-	stdcall [glDisableClientState], GL_VERTEX_ARRAY ;disable vertex drawing mode
+	;рисование через индексный массив
+	mov eax,house_3ds ;начало внедренного файла 3ds
+	add eax,0xeb ;смещение по которому идут координаты вершин (получено с использованием программы info_3ds)
+	stdcall [glVertexPointer], 3, GL_FLOAT, 0, eax ;задаем массив для вершин, 3 - число координат для одной вершины
+	stdcall [glEnableClientState], GL_VERTEX_ARRAY ;включаем режим рисования вершин
+	stdcall [glDrawElements], GL_TRIANGLES, 0x1a6*3, GL_UNSIGNED_SHORT, Indices ;mode, count, type, *indices
+	stdcall [glDisableClientState], GL_VERTEX_ARRAY ;отключаем режим рисования вершин

 call [glPopMatrix]
 ret

 align 4
-scale dd 0.07 ;initial scale (ideally should be calculated)
+scale dd 0.0065 ;начальный масштаб (в идеальном случае должен вычислятся, но для даного примера подобран в ручную на глаз)
 delt_sc dd 0.0005
 angle_z dd 90.0
 angle_y dd 90.0
@@ -184,11 +170,10 @@ angle_x dd 0.0
 delt_size dd 3.0

 align 4
-house_3ds: ;we embed the file inside the program (ideally it should open through a dialog box)
+house_3ds: ;внедряем файл внутрь программы (в идеальном случае должен открыватся через окно диалога, но для облегчения примера вшит внутрь)
 file '../../../../../demos/view3ds/3ds_objects/House.3ds'
-.end:
 align 4
-Indices rb FACES_COUNT*6 ;3 points per edge, point index 2 bytes
+Indices rb 0x1a6*6 ;0x1a6 - число граней, на каждую грань по 3 точки, индекс точки 2 байта

 ;--------------------------------------------------
 align 4
--- a/programs/develop/libraries/TinyGL/asm_fork/examples/test_glu0.asm
+++ b/programs/develop/libraries/TinyGL/asm_fork/examples/test_glu0.asm
@@ -36,13 +36,13 @@ red_win:
 align 16
 still:
 	mcall SF_WAIT_EVENT
-	cmp   al,EV_REDRAW
-	jz    red_win
-	cmp   al,EV_KEY
-	jz    key
-	cmp   al,EV_BUTTON
-	jz    button
-	jmp   still
+	cmp al,1
+	jz red_win
+	cmp al,2
+	jz key
+	cmp al,3
+	jz button
+	jmp still

 align 4
 draw_window:
@@ -141,6 +141,7 @@ stdcall [glClear], GL_COLOR_BUFFER_BIT + GL_DEPTH_BUFFER_BIT ;очистим б
 stdcall [glColor3f], 1.0, 1.0, 0.0

 call [glPushMatrix]
+	stdcall [glTranslatef], 0.0,0.0,0.5
 	stdcall [glScalef], [scale], [scale], [scale]

 	stdcall [glRotatef], [angle_z],0.0,0.0,1.0
--- a/programs/develop/libraries/TinyGL/asm_fork/examples/test_glu1.asm
+++ b/programs/develop/libraries/TinyGL/asm_fork/examples/test_glu1.asm
@@ -60,7 +60,6 @@ load_libraries l_libs_start,l_libs_end
 	stdcall [buf2d_convert_text_matrix], buf_1

 	load_image_file 'toolb_1.png', image_data_toolbar
-	call SetLight
 	call draw_3d

 align 4
@@ -70,13 +69,13 @@ red_win:
 align 4
 still:
 	mcall SF_WAIT_EVENT
-	cmp   al,EV_REDRAW
-	jz    red_win
-	cmp   al,EV_KEY
-	jz    key
-	cmp   al,EV_BUTTON
-	jz    button
-	jmp   still
+	cmp al,1
+	jz red_win
+	cmp al,2
+	jz key
+	cmp al,3
+	jz button
+	jmp still

 align 4
 draw_window:
@@ -304,7 +303,11 @@ draw_3d:
 stdcall [glClear], GL_COLOR_BUFFER_BIT + GL_DEPTH_BUFFER_BIT ;очистим буфер цвета и глубины

 call [glPushMatrix]
+	call SetLight
+
+	stdcall [glTranslatef], 0.0,0.0,0.5
 	stdcall [glScalef], [scale], [scale], [scale]
+	stdcall [glScalef], 1.0, 1.0, 0.5

 	stdcall [glColor3f], 1.0, 1.0, 0.0
 	stdcall [glRotatef], [angle_z],0.0,0.0,1.0
--- a/programs/develop/libraries/TinyGL/asm_fork/examples/test_glu2.asm
+++ b/programs/develop/libraries/TinyGL/asm_fork/examples/test_glu2.asm
@@ -60,7 +60,6 @@ load_libraries l_libs_start,l_libs_end
 	stdcall [buf2d_convert_text_matrix], buf_1

 	load_image_file 'toolb_1.png', image_data_toolbar
-	call SetLight
 	call draw_3d

 align 4
@@ -70,13 +69,13 @@ red_win:
 align 4
 still:
 	mcall SF_WAIT_EVENT
-	cmp   al,EV_REDRAW
-	jz    red_win
-	cmp   al,EV_KEY
-	jz    key
-	cmp   al,EV_BUTTON
-	jz    button
-	jmp   still
+	cmp al,1
+	jz red_win
+	cmp al,2
+	jz key
+	cmp al,3
+	jz button
+	jmp still

 align 4
 draw_window:
@@ -297,6 +296,9 @@ draw_3d:
 stdcall [glClear], GL_COLOR_BUFFER_BIT + GL_DEPTH_BUFFER_BIT ;очистим буфер цвета и глубины

 call [glPushMatrix]
+	call SetLight
+
+	stdcall [glTranslatef], 0.0,0.0,0.5
 	stdcall [glScalef], [scale], [scale], [scale]

 	stdcall [glColor3f], 1.0, 1.0, 0.0
--- a/programs/develop/libraries/TinyGL/asm_fork/examples/textures0.asm
+++ b/programs/develop/libraries/TinyGL/asm_fork/examples/textures0.asm
@@ -88,13 +88,13 @@ red_win:
 align 4
 still:
 	mcall SF_WAIT_EVENT
-	cmp   al,EV_REDRAW
-	jz    red_win
-	cmp   al,EV_KEY
-	jz    key
-	cmp   al,EV_BUTTON
-	jz    button
-	jmp   still
+	cmp al,1
+	jz red_win
+	cmp al,2
+	jz key
+	cmp al,3
+	jz button
+	jmp still

 align 4
 draw_window:
@@ -295,6 +295,7 @@ draw_3d:
 stdcall [glClear], GL_COLOR_BUFFER_BIT + GL_DEPTH_BUFFER_BIT ;очистим буфер цвета и глубины

 call [glPushMatrix]
+	stdcall [glTranslatef], 0.0,0.0,0.5
 	stdcall [glScalef], [scale], [scale], [scale]
 	stdcall [glRotatef], [angle_z],0.0,0.0,1.0
 	stdcall [glRotatef], [angle_y],0.0,1.0,0.0
--- a/programs/develop/libraries/TinyGL/asm_fork/examples/textures1.asm
+++ b/programs/develop/libraries/TinyGL/asm_fork/examples/textures1.asm
@@ -88,13 +88,13 @@ red_win:
 align 4
 still:
 	mcall SF_WAIT_EVENT
-	cmp   al,EV_REDRAW
-	jz    red_win
-	cmp   al,EV_KEY
-	jz    key
-	cmp   al,EV_BUTTON
-	jz    button
-	jmp   still
+	cmp al,1
+	jz red_win
+	cmp al,2
+	jz key
+	cmp al,3
+	jz button
+	jmp still

 align 4
 draw_window:
@@ -297,8 +297,9 @@ draw_3d:
 stdcall [glClear], GL_COLOR_BUFFER_BIT + GL_DEPTH_BUFFER_BIT ;очистим буфер цвета и глубины

 call [glPushMatrix]
+	stdcall [glTranslatef], 0.0,0.0,0.5
 	stdcall [glScalef], [scale], [scale], [scale]
-	stdcall [glScalef], 1.0, 1.0, 0.2 ;прижимаем сферу, что-бы сразу не вылазила при увеличении
+	stdcall [glScalef], 1.0, 1.0, 0.1 ;прижимаем сферу, что-бы сразу не вылазила при увеличении
 	stdcall [glRotatef], [angle_y],0.0,1.0,0.0
 	stdcall [glRotatef], [angle_x],1.0,0.0,0.0

--- a/programs/develop/libraries/TinyGL/asm_fork/examples/textures2.asm
+++ b/programs/develop/libraries/TinyGL/asm_fork/examples/textures2.asm
@@ -89,13 +89,13 @@ red_win:
 align 4
 still:
 	mcall SF_WAIT_EVENT
-	cmp   al,EV_REDRAW
-	jz    red_win
-	cmp   al,EV_KEY
-	jz    key
-	cmp   al,EV_BUTTON
-	jz    button
-	jmp   still
+	cmp al,1
+	jz red_win
+	cmp al,2
+	jz key
+	cmp al,3
+	jz button
+	jmp still

 align 4
 draw_window:
@@ -268,9 +268,8 @@ draw_3d:
 stdcall [glClear], GL_COLOR_BUFFER_BIT + GL_DEPTH_BUFFER_BIT ;очистим буфер цвета и глубины

 call [glPushMatrix]
-	stdcall [glTranslatef], 0.0,0.0,-1.0 ;двигаем сферу на себя, что-бы отсечь переднюю часть
 	stdcall [glScalef], [scale], [scale], [scale]
-	stdcall [glScalef], 1.0, 1.0, 0.2 ;прижимаем сферу, что-бы сразу не вылазила при увеличении
+	stdcall [glScalef], 1.0, 1.0, 0.1 ;прижимаем сферу, что-бы сразу не вылазила при увеличении
 	stdcall [glRotatef], [angle_y],0.0,1.0,0.0
 	stdcall [glRotatef], [angle_x],1.0,0.0,0.0

--- a/programs/develop/libraries/TinyGL/asm_fork/light.asm
+++ b/programs/develop/libraries/TinyGL/asm_fork/light.asm
@@ -185,7 +185,7 @@ align 4
 	cmp ecx,GL_SPOT_EXPONENT
 	jne @f
 		mov ecx,[ebx+12]
-		mov [edx+GLLight.spot_exponent],ecx ;l.spot_exponent=p[3]
+		mov [edi+GLLight.spot_exponent],ecx ;l.spot_exponent=p[3]
 		jmp .end_f
 align 4
 	@@:
@@ -193,7 +193,7 @@ align 4
 	jne .end_spot_c
 		fld dword[ebp+12] ;float a=v.v[0]
 ;      assert(a == 180 || (a>=0 && a<=90));
-		fst dword[edx+GLLight.spot_cutoff] ;l.spot_cutoff=a
+		fst dword[edi+GLLight.spot_cutoff] ;l.spot_cutoff=a
 		fcom dword[an180f] ;if (a != 180)
 		fstsw ax
 		sahf
@@ -202,7 +202,7 @@ align 4
 			fmulp
 			fdiv dword[an180f]
 			fcos
-			fstp dword[edx+GLLight.cos_spot_cutoff] ;l.cos_spot_cutoff=cos(a * M_PI / 180.0)
+			fstp dword[edi+GLLight.cos_spot_cutoff] ;l.cos_spot_cutoff=cos(a * M_PI / 180.0)
 			jmp .end_f
 		@@:
 		ffree st0
@@ -213,21 +213,21 @@ align 4
 	cmp ecx,GL_CONSTANT_ATTENUATION
 	jne @f
 		mov ecx,[ebx+12]
-		mov [edx+GLLight.attenuation],ecx ;l->attenuation[0]=p[3]
+		mov [edi+GLLight.attenuation],ecx ;l->attenuation[0]=p[3]
 		jmp .end_f
 align 4
 	@@:
 	cmp ecx,GL_LINEAR_ATTENUATION
 	jne @f
 		mov ecx,[ebx+12]
-		mov [edx+GLLight.attenuation+4],ecx ;l->attenuation[1]=p[3]
+		mov [edi+GLLight.attenuation+4],ecx ;l->attenuation[1]=p[3]
 		jmp .end_f
 align 4
 	@@:
 	cmp ecx,GL_QUADRATIC_ATTENUATION
 	jne @f
 		mov ecx,[ebx+12]
-		mov [edx+GLLight.attenuation+8],ecx ;l->attenuation[2]=p[3]
+		mov [edi+GLLight.attenuation+8],ecx ;l->attenuation[2]=p[3]
 		jmp .end_f
 align 4
 	@@: ;default:
@@ -363,14 +363,15 @@ fl_1e_3 dd 1.0e-3
 align 16
 proc gl_shade_vertex, context:dword, v:dword
 locals
-	R dd ? ;float ebp-92
-	G dd ? ;float ebp-88
-	B dd ? ;float ebp-84
-	A dd ? ;float ebp-80
-	s V3 ;ebp-76
-	d V3 ;ebp-64
-	tmp dd ? ;float ebp-52
-	att dd ? ;float ebp-48
+	R dd ? ;float ebp-96
+	G dd ? ;float ebp-92
+	B dd ? ;float ebp-88
+	A dd ? ;float ebp-84
+	s V3 ;ebp-80
+	d V3 ;ebp-68
+	tmp dd ? ;float ebp-56
+	att dd ? ;float ebp-52
+	dot_spot dd ? ;float ebp-48
 	lR dd ? ;float ebp-44
 	lB dd ? ;float ebp-40
 	lG dd ? ;float ebp-36
@@ -562,6 +563,7 @@ align 4
 				fmul dword[d+offs_Z]
 				faddp
 				fchs
+				fst dword[dot_spot]
 				cmp dword[twoside],0 ;if (twoside && dot_spot < 0)
 				je @f
 				ftst ;if (dot_spot<0)
--- a/programs/develop/libraries/TinyGL/asm_fork/list.asm
+++ b/programs/develop/libraries/TinyGL/asm_fork/list.asm
@@ -197,24 +197,21 @@ push edi esi
 			add ebx,4
 			inc esi

-			cmp byte[esi],'f' ;float
+			cmp byte[esi],'f'
 			jne @f
 				fld dword[ebx]
 				fstp qword[Data_Double]
 				call DoubleFloat_to_String
 				stdcall str_cat, edi,Data_String
 			@@:
-			cmp byte[esi],'C' ;const
-			je @f
-			cmp byte[esi],'d' ;integer
-			je @f
-			jmp .no_param
-			@@:
+			cmp byte[esi],'d'
+			jne @f
 				stdcall str_len,edi
 				add edi,eax
 				sub ecx,eax
 				mov eax,dword[ebx]
 				stdcall convert_int_to_str,ecx
+			@@:
 		.no_param:
 		inc esi
 		cmp byte[esi],0
--- a/programs/develop/libraries/TinyGL/asm_fork/vertex.asm
+++ b/programs/develop/libraries/TinyGL/asm_fork/vertex.asm
@@ -134,7 +134,7 @@ endl

 	cmp dword[edx+GLContext.lighting_enabled],0 ;if(context.lighting_enabled)
 	jne .if_0
-	cmp dword[edx+GLContext.texture_2d_enabled],0
+	cmp dword[eax+GLContext.texture_2d_enabled],0
 	jne .if_0
 		jmp @f
 align 4
--- a/programs/develop/libraries/TinyGL/asm_fork/zline.asm
+++ b/programs/develop/libraries/TinyGL/asm_fork/zline.asm
@@ -17,7 +17,7 @@ proc ZB_plot uses eax ebx ecx edx edi, zb:dword, p:dword
 	mov edi,[ebx+ZBufferPoint.z]
 	shr edi,ZB_POINT_Z_FRAC_BITS
 	cmp di,word[ecx]
-	jb .end_f
+	jl .end_f
 if TGL_FEATURE_RENDER_BITS eq 24
 	mov eax,[ebx+ZBufferPoint.r]
 	mov byte[edx],ah
--- a/programs/develop/libraries/TinyGL/asm_fork/zline.inc
+++ b/programs/develop/libraries/TinyGL/asm_fork/zline.inc
@@ -101,7 +101,7 @@ local .end_0
 	mov [zz],eax
 	mov ebx,[pz]
 	cmp ax,word[ebx]
-	jb .end_0
+	jl .end_0
 		RGBPIXEL
 		mov eax,dword[zz]
 		mov ebx,[pz]
--- a/programs/develop/libraries/TinyGL/asm_fork/zline_r.inc
+++ b/programs/develop/libraries/TinyGL/asm_fork/zline_r.inc
@@ -102,7 +102,7 @@ local .end_0
 	mov [zz],eax
 	mov ebx,[pz]
 	cmp ax,word[ebx]
-	jb .end_0
+	jl .end_0
 		RGBPIXEL
 		mov eax,dword[zz]
 		mov ebx,[pz]
--- a/programs/develop/libraries/TinyGL/asm_fork/ztriangle.asm
+++ b/programs/develop/libraries/TinyGL/asm_fork/ztriangle.asm
@@ -58,7 +58,7 @@ end if
 	mov eax,[z]
 	shr eax,ZB_POINT_Z_FRAC_BITS
 	cmp ax,word[esi+2*_a] ;if (zz >= pz[_a])
-	jb .end_0
+	jl .end_0
 		;edi = pp
 		mov word[esi+2*_a],ax ;пишем в буфер глубины новое значение
 if TGL_FEATURE_RENDER_BITS eq 24
@@ -103,7 +103,7 @@ local .end_0
 	mov eax,[z]
 	shr eax,ZB_POINT_Z_FRAC_BITS
 	cmp ax,word[esi+2*_a] ;if (zz >= pz[_a])
-	jb .end_0
+	jl .end_0
 		;edi = pp
 		mov word[esi+2*_a],ax ;пишем в буфер глубины новое значение
 if TGL_FEATURE_RENDER_BITS eq 24
@@ -171,7 +171,7 @@ local .end_0
 	mov eax,[z]
 	shr eax,ZB_POINT_Z_FRAC_BITS
 	cmp ax,word[esi+2*_a] ;if (zz >= pz[_a])
-	jb .end_0
+	jl .end_0
 		;edi = pp
 		mov word[esi+2*_a],ax ;пишем в буфер глубины новое значение
 if TGL_FEATURE_RENDER_BITS eq 24
@@ -251,7 +251,7 @@ local .end_0
 	mov eax,[z]
 	shr eax,ZB_POINT_Z_FRAC_BITS
 	cmp ax,word[esi+2*_a] ;if (zz >= pz[_a])
-	jb .end_0
+	jl .end_0
 		;edi = pp
 		mov word[esi+2*_a],ax ;пишем в буфер глубины новое значение
 if TGL_FEATURE_RENDER_BITS eq 24
--- a/programs/media/voxel_editor/utilites/vox_tgl.asm
+++ b/programs/media/voxel_editor/utilites/vox_tgl.asm
@@ -16,9 +16,9 @@ include 'lang.inc' ; Language support for locales: ru_RU (CP866), en_US.

@use_library mem.Alloc,mem.Free,mem.ReAlloc,dll.Load
 if lang eq ru_RU
-caption db '<27><><EFBFBD>ᬮ<EFBFBD><E1ACAE> <20><><EFBFBD>ᥫ<EFBFBD><E1A5AB> 14.04.25',0 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
+caption db '<27><><EFBFBD>ᬮ<EFBFBD><E1ACAE> <20><><EFBFBD>ᥫ<EFBFBD><E1A5AB> 11.11.20',0 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>
 else ; Default to en_US
-caption db 'Voxel viewer 14.04.25',0
+caption db 'Voxel viewer 11.11.20',0
 end if

 3d_wnd_l equ   5 ;<3B><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD> tinygl <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> ᫥<><E1ABA5>
@@ -750,8 +750,12 @@ draw_3d:
 	je @f
 		call SetLight
 	@@:
+	stdcall [glTranslatef], 0.0,0.0,0.5 ;<3B><><EFBFBD>न<EFBFBD><E0A4A8><EFBFBD><EFBFBD> <20><> <20><><EFBFBD> z <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20> <20>।<EFBFBD><E0A5A4><EFBFBD><EFBFBD> <20><> 0.0 <20><> 1.0, <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>ࠦ<EFBFBD><E0A0A6><EFBFBD><EFBFBD> <20>㤥<EFBFBD> <20><>ᥪ<EFBFBD><E1A5AA><EFBFBD><EFBFBD><EFBFBD>
+		;<3B><><EFBFBD>ᥫ<EFBFBD><E1A5AB><EFBFBD><EFBFBD> <20><>ꥪ<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD>न<EFBFBD><E0A4A8><EFBFBD><EFBFBD> <20><> <20><><EFBFBD><EFBFBD> <20><> -0.5 <20><> 0.5, <20><>⮬<EFBFBD> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> +0.5
+		;<3B><> <20><><EFBFBD> <20><> <20><><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD> <20><>ᥪ<EFBFBD><E1A5AA><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD>, <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20>뫥<EFBFBD><EBABA5><EFBFBD> <20><> <20>।<EFBFBD><E0A5A4><EFBFBD> <20><><EFBFBD>᪮<EFBFBD>⥩ <20><><EFBFBD><EFBFBD>祭<EFBFBD><E7A5AD>
+		;<3B> <20><><EFBFBD>ᨨ opengl <20><><EFBFBD> Win <20><><EFBFBD>न<EFBFBD><E0A4A8><EFBFBD><EFBFBD> <20><><EFBFBD><EFBFBD> <20><> -1.0 <20><> 1.0 <20><>⮬<EFBFBD> ⠬ <20>⮣<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD><EFBFBD> <20><> <20>㦭<EFBFBD>
 	stdcall [glScalef], [scale], [scale], [scale] ;㢥<><E3A2A5>稢<EFBFBD><E7A8A2><EFBFBD> <20><><EFBFBD>ᥫ<EFBFBD><E1A5AB><EFBFBD><EFBFBD> <20><>ꥪ<EFBFBD>, <20><><EFBFBD>-<2D><> <20><> <20><><EFBFBD> <20>祭<EFBFBD> <20><><EFBFBD><EFBFBD><EFBFBD>쪨<EFBFBD>
-	stdcall [glScalef], 1.0, 1.0, 0.5 ;<3B><><EFBFBD>-<2D><> <20><><EFBFBD><EFBFBD> <20><>ꥪ<EFBFBD><EAA5AA> <20><> <20>뫠<EFBFBD><EBABA0><EFBFBD><EFBFBD> <20><> <20>࠭<EFBFBD> <20><><EFBFBD><EFBFBD>祭<EFBFBD><E7A5AD>
+	stdcall [glScalef], 1.0, 1.0, 0.25 ;<3B><><EFBFBD>-<2D><> <20><><EFBFBD><EFBFBD> <20><>ꥪ<EFBFBD><EAA5AA> <20><> <20>뫠<EFBFBD><EBABA0><EFBFBD><EFBFBD> <20><> <20>࠭<EFBFBD> <20><><EFBFBD><EFBFBD>祭<EFBFBD><E7A5AD>
 	stdcall [glRotatef], [angle_x],1.0,0.0,0.0
 	stdcall [glRotatef], [angle_y],0.0,1.0,0.0
 	stdcall [glRotatef], [angle_z],0.0,0.0,1.0