From: sparky4 <sparky4@4ch.maidlab.jp>
Date: Sun, 18 May 2014 22:33:46 +0000 (-0500)
Subject: 	modified:   16/DOS_GFX.EXE
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=97b8176cd0334c5d7eef117e670b9cfb94735bf7;p=16.git

	modified:   16/DOS_GFX.EXE
	modified:   16/Project 16.bfproject
	modified:   16/dos_gfx.cpp
---

diff --git a/16/DOS_GFX.EXE b/16/DOS_GFX.EXE
index d93fb11f..9c028e8d 100644
Binary files a/16/DOS_GFX.EXE and b/16/DOS_GFX.EXE differ
diff --git a/16/Project 16.bfproject b/16/Project 16.bfproject
index e6f1291f..8e850a59 100644
--- a/16/Project 16.bfproject	
+++ b/16/Project 16.bfproject	
@@ -1,16 +1,17 @@
 c2e.convert_special: 0
 e2c.convert_num: 0
-openfiles: /dos/z/16/16/dos_gfx.cpp:17003:16466:1:
-openfiles: /dos/z/16/16/dos_gfx.h:102:0:0:
-openfiles: /dos/z/16/16/dos_kb.c:0:0:0:
+openfiles: /dos/z/16/16/dos_gfx.cpp:19214:18374:1:
+openfiles: /dos/z/16/16/dos_gfx.h:380:0:0:
+openfiles: /dos/z/16/16/dos_kb.c:658:109:0:
 openfiles: /dos/z/16/16/dos_kb.h:60:0:0:
 openfiles: /dos/z/16/16/lib/lib_com.cpp:0:0:0:
 openfiles: /dos/z/16/16/lib/lib_com.h:0:0:0:
-openfiles: /dos/z/16/16/scroll.txt:0:0:0:
+openfiles: /dos/z/16/16/scroll.txt:5307:5103:0:
 openfiles: /dos/z/16/16/project16.txt:1675:0:0:
 openfiles: /dos/z/16/16/16.txt:0:0:0:
 openfiles: /dos/z/16/16/lib/x/MXSM.ASM:12781:12781:0:
-openfiles: /dos/z/16/16/lib/x/MODEX.H:1885:1601:0:
+openfiles: /dos/z/16/16/lib/x/MODEX.H:1768:1601:0:
+openfiles: /dos/z/16/16/lib/x/MXPN.ASM:1205:649:0:
 snr_recursion_level: 0
 convertcolumn_horizontally: 0
 adv_open_matchname: 0
@@ -25,7 +26,7 @@ c2e.convert_iso: 0
 opendir: file:///dos/z/16/16/lib/x
 wrap_text_default: 0
 bookmarks_filename_mode: 1
-ssearch_text: Visible
+ssearch_text: 3DA
 snr_casesens: 0
 view_blocks: 1
 name: project 16
@@ -60,17 +61,18 @@ recent_files: file:///dos/z/4x4_16/tile.h
 recent_files: file:///dos/z/16/16/lib_com.cpp
 recent_files: file:///dos/z/16/16/lib_com.h
 recent_files: file:///dos/z/16/16/PCGPE10/SCROLL.TXT
-recent_files: file:///dos/z/16/16/dos_kb.h
+recent_files: file:///dos/z/16/16/dos_gfx.cpp
 recent_files: file:///dos/z/16/16/dos_gfx.h
+recent_files: file:///dos/z/16/16/dos_kb.h
+recent_files: file:///dos/z/16/16/dos_kb.c
 recent_files: file:///dos/z/16/16/lib/lib_com.cpp
 recent_files: file:///dos/z/16/16/lib/lib_com.h
-recent_files: file:///dos/z/16/16/dos_kb.c
-recent_files: file:///dos/z/16/16/dos_gfx.cpp
 recent_files: file:///dos/z/16/16/project16.txt
 recent_files: file:///dos/z/16/16/16.txt
 recent_files: file:///dos/z/16/16/scroll.txt
-recent_files: file:///dos/z/16/16/lib/x/MXSM.ASM
 recent_files: file:///dos/z/16/16/lib/x/MODEX.H
+recent_files: file:///dos/z/16/16/lib/x/MXSM.ASM
+recent_files: file:///dos/z/16/16/lib/x/MXPN.ASM
 snr_replacetype: 0
 savedir: file:///dos/z/16/16
 spell_check_default: 1
@@ -82,10 +84,6 @@ snr_escape_chars: 0
 htmlbar_view: 0
 spell_lang: en
 ssearch_dotmatchall: 0
-searchlist: fill_plane
-searchlist: red
-searchlist: rext
-searchlist: rect`-
 searchlist: fill_plane(
 searchlist: fmemset
 searchlist: se
@@ -97,6 +95,10 @@ searchlist: 386
 searchlist: CRTC_INDEX
 searchlist: setVisiblePage
 searchlist: VisiblePage
+searchlist: lib/x/MXPN.ASM
+searchlist: 3c0
+searchlist: ABS
+searchlist: 3DAH
 autocomplete: 1
 outputb_show_all_output: 0
 bookmarks_show_mode: 0
diff --git a/16/dos_gfx.cpp b/16/dos_gfx.cpp
index 360137ed..a561569a 100644
--- a/16/dos_gfx.cpp
+++ b/16/dos_gfx.cpp
@@ -145,48 +145,48 @@ void set320x200x256_X(void)
 
 		/* By default we want screen refreshing and drawing operations
 		   to be based at offset 0 in the video segment. */
-		actStart = visStart = 0;
-
-		/*
---------------------
-HORIZONTAL SCROLLING
---------------------
-Horizontal scrolling is essentially the same as vertical scrolling, all
-you do is increment or decrement the VGA offset register by 1 instead of
-80 as with vertical scrolling.
-
-However, horizontal scrolling is complicated by two things
-
-  1. Incrementing the offset register by one actually scrolls by FOUR
-     pixels (and there are FOUR planes on the VGA, what a coincidence)
-
-  2. You can't draw the image off the screen and then scroll it on
-     because of the way the VGA wraps to the next row every 80 bytes
-     (80 bytes * 4 planes = 320 pixels), if you tried it, you would
-     actually be drawing to the other side of the screen (which is
-     entirely visible)
-
-I'll solve these problems one at a time.
-
-Firstly, to get the VGA to scroll by only one pixel you use the horizontal
-pixel panning (HPP) register. This register resides at
-
-  PORT:     3C0H
-  INDEX:    13h
-
-and in real life, you use it like this
-
------------------ Pixel Panning ---------------
-IN PORT 3DAH (this clears an internal
-  flip-flop of the VGA)
-OUT 13H TO PORT 3C0H
-OUT value TO PORT 3C0H (where "value" is the
-  number of pixels to offset)
------------------------------------------------
-*/
-		inp(0x3DA)
-		outpw(0x3C0, 0x13);
-		outpw(0x3C0, 0x58);
+		actStart = visStart = 0;
+
+		/*
+--------------------
+HORIZONTAL SCROLLING
+--------------------
+Horizontal scrolling is essentially the same as vertical scrolling, all
+you do is increment or decrement the VGA offset register by 1 instead of
+80 as with vertical scrolling.
+
+However, horizontal scrolling is complicated by two things
+
+  1. Incrementing the offset register by one actually scrolls by FOUR
+     pixels (and there are FOUR planes on the VGA, what a coincidence)
+
+  2. You can't draw the image off the screen and then scroll it on
+     because of the way the VGA wraps to the next row every 80 bytes
+     (80 bytes * 4 planes = 320 pixels), if you tried it, you would
+     actually be drawing to the other side of the screen (which is
+     entirely visible)
+
+I'll solve these problems one at a time.
+
+Firstly, to get the VGA to scroll by only one pixel you use the horizontal
+pixel panning (HPP) register. This register resides at
+
+  PORT:     3C0H
+  INDEX:    13h
+
+and in real life, you use it like this
+
+----------------- Pixel Panning ---------------
+IN PORT 3DAH (this clears an internal
+  flip-flop of the VGA)
+OUT 13H TO PORT 3C0H
+OUT value TO PORT 3C0H (where "value" is the
+  number of pixels to offset)
+-----------------------------------------------
+*/
+		inp(0x3DA);
+		outpw(0x3C0, 0x13);
+		outpw(0x3C0, 0x58);
 
 		}
 
@@ -278,8 +278,8 @@ void set320x240x256_X(void)
 		outpw(0x3D4, 0xAC11);		   /* vertical retrace end AND wr.prot */
 		outpw(0x3D4, 0xDF12);		   /* vertical display enable end */
 		outpw(0x3D4, 0xE715);		   /* start vertical blanking */
-		outpw(0x3D4, 0x0616);		   /* end vertical blanking */
-
+		outpw(0x3D4, 0x0616);		   /* end vertical blanking */
+
 		/* Update mode info, so future operations are aware of the
 		   resolution */
 		height = 240;
@@ -309,117 +309,116 @@ void vScroll(int rows)
 	// Scrolling = current start + (rows * bytes in a row)
 	setVisibleStart(visStart + (rows * width));
 }
-
+
 void scrolly(int bong)
-{
+{
 	int boing=0;
-	if(bong<0)
-		boing=-1;
-	else if(bong>0)
-		boing=1;
-	else break;
-
-	for(int i=0;i<TILEWH;i++)
-		vScroll(boing)
-}
-
-/*
-
-
-To implement smooth horizontal scrolling, you would do the following:
-
--------------- Horizontal Scrolling ------------
-FOR X = 0 TO 319 DO
-  SET HPP TO ( X MOD 4 )
-  SET VGA OFFSET TO ( X/4 )
-END FOR
-------------------------------------------------
-
-Okay, no problem at all (although I think you might have to fiddle
-around with the HPP a bit to get it right...try different values and
-see what works :).
-
-So, the next problem is with drawing the images off the screen where
-they aren't visible and then scrolling them on!!! As it turns out,
-there's yet ANOTHER register to accomplish this. This one's called the
-offset register (no, not the one I was talking about before, that one
-was actually the "start address" register) and it's at
-
-  PORT:     3D4H/3D5H
-  OFFSET:   13H
-
-and here's how to use it
-
--------------- Offset Register ---------------
-OUT 13H TO PORT 3D4H
-OUT value TO PORT 3D5H
-----------------------------------------------
-
-Now, what my VGA reference says is that this register holds the number
-of bytes (not pixels) difference between the start address of each row.
-So, in X-mode it normally contains the value 80 (as we remember,
-80 bytes * 4 planes = 320 pixels). This register does not affect the
-VISIBLE width of the display, only the difference between addresses on
-each row.
-
-When we scroll horizontally, we need a little bit of extra working space
-so we can draw off the edge of the screen.
-
-Perhaps a little diagram will clarify it. The following picture is of a
-standard X-mode addressing scheme with the OFFSET register set to 80.
-
-      ROW    OFFSET
-      0         0 ========================
-      1        80 [                      ]
-      2       160 [                      ]
-      ..       .. [       VISIBLE        ]
-                  [        SCREEN        ]
-                  [                      ]
-                  [                      ]
-      ..       .. [                      ]
-      199   15920 ========================
-
-and the next diagram is of a modified addressing scheme with the OFFSET
-register set to 82 (to give us 4 extra pixels on each side of the screen)
-
-ROW    OFFSET
-0         0 ------========================------
-1        82 |   V [                      ]   V |
-2       164 |   I [                      ]   I |
-..       .. | N S [      VISIBLE         ] N S |
-            | O I [       SCREEN         ] O I |
-            | T B [                      ] T B |
-            |   L [                      ]   L |
-..       .. |   E [                      ]   E |
-199   16318 ------========================------
-
-Beautiful!!!
-
-As with vertical scrolling, however, you still have the problem of when
-you reach the bottom of page 4...and it's fixed in the same manner.
-
-I haven't actually managed to get infinite horizontal scrolling working,
-but the method I have just stated will give you a horizontal scrolling
-range of over 200 screens!!!! So if you need more (which is extremely
-unlikely), figure it out yourself.
-
-
-------------------
-COMBINED SCROLLING
-------------------
-To do both horizontal and vertical scrolling, all you have to do is combine
-the two methods with a few little extras (it's always the way isn't it).
-
-You have to start off with the original screen on the current page and the
-next page as well. When you scroll horizontally, you have to draw the edge
-that's coming in to the screen to BOTH pages (that means you'll be drawing
-the incoming edge twice, once for each page). You do this so that when you
-have scrolled vertically down through a complete page, you can jump back
-to the first page and it will (hopefully) have an identical copy, and you
-can then continue scrolling again.
-
-I'm sorry about this being so confusing but it's a bit difficult to explain.
-
+	if(bong<0)
+		boing=-1;
+	else if(bong>0)
+		boing=1;
+
+	for(int ti=0;ti<TILEWH;ti++)
+		vScroll(boing);
+}
+
+/*
+
+
+To implement smooth horizontal scrolling, you would do the following:
+
+-------------- Horizontal Scrolling ------------
+FOR X = 0 TO 319 DO
+  SET HPP TO ( X MOD 4 )
+  SET VGA OFFSET TO ( X/4 )
+END FOR
+------------------------------------------------
+
+Okay, no problem at all (although I think you might have to fiddle
+around with the HPP a bit to get it right...try different values and
+see what works :).
+
+So, the next problem is with drawing the images off the screen where
+they aren't visible and then scrolling them on!!! As it turns out,
+there's yet ANOTHER register to accomplish this. This one's called the
+offset register (no, not the one I was talking about before, that one
+was actually the "start address" register) and it's at
+
+  PORT:     3D4H/3D5H
+  OFFSET:   13H
+
+and here's how to use it
+
+-------------- Offset Register ---------------
+OUT 13H TO PORT 3D4H
+OUT value TO PORT 3D5H
+----------------------------------------------
+
+Now, what my VGA reference says is that this register holds the number
+of bytes (not pixels) difference between the start address of each row.
+So, in X-mode it normally contains the value 80 (as we remember,
+80 bytes * 4 planes = 320 pixels). This register does not affect the
+VISIBLE width of the display, only the difference between addresses on
+each row.
+
+When we scroll horizontally, we need a little bit of extra working space
+so we can draw off the edge of the screen.
+
+Perhaps a little diagram will clarify it. The following picture is of a
+standard X-mode addressing scheme with the OFFSET register set to 80.
+
+      ROW    OFFSET
+      0         0 ========================
+      1        80 [                      ]
+      2       160 [                      ]
+      ..       .. [       VISIBLE        ]
+                  [        SCREEN        ]
+                  [                      ]
+                  [                      ]
+      ..       .. [                      ]
+      199   15920 ========================
+
+and the next diagram is of a modified addressing scheme with the OFFSET
+register set to 82 (to give us 4 extra pixels on each side of the screen)
+
+ROW    OFFSET
+0         0 ------========================------
+1        82 |   V [                      ]   V |
+2       164 |   I [                      ]   I |
+..       .. | N S [      VISIBLE         ] N S |
+            | O I [       SCREEN         ] O I |
+            | T B [                      ] T B |
+            |   L [                      ]   L |
+..       .. |   E [                      ]   E |
+199   16318 ------========================------
+
+Beautiful!!!
+
+As with vertical scrolling, however, you still have the problem of when
+you reach the bottom of page 4...and it's fixed in the same manner.
+
+I haven't actually managed to get infinite horizontal scrolling working,
+but the method I have just stated will give you a horizontal scrolling
+range of over 200 screens!!!! So if you need more (which is extremely
+unlikely), figure it out yourself.
+
+
+------------------
+COMBINED SCROLLING
+------------------
+To do both horizontal and vertical scrolling, all you have to do is combine
+the two methods with a few little extras (it's always the way isn't it).
+
+You have to start off with the original screen on the current page and the
+next page as well. When you scroll horizontally, you have to draw the edge
+that's coming in to the screen to BOTH pages (that means you'll be drawing
+the incoming edge twice, once for each page). You do this so that when you
+have scrolled vertically down through a complete page, you can jump back
+to the first page and it will (hopefully) have an identical copy, and you
+can then continue scrolling again.
+
+I'm sorry about this being so confusing but it's a bit difficult to explain.
+
 
 */
 //---------------------------------------------------
@@ -554,10 +553,10 @@ void ssd(int svq){
 /*-----------ding-------------*/
 int ding(int q){
 
-	if(yy<height){
+//	if(yy<height){
 		setActivePage(0);
 		setVisiblePage(0);
-	}
+/*	}
 	if((height)<yy<(height*2)){
 		setActivePage(1);
 		setVisiblePage(1);
@@ -565,7 +564,7 @@ int ding(int q){
 	if((height*2)<yy<(height*3)){
 		setActivePage(2);
 		setVisiblePage(2);
-	}
+	}*/
 		int d3y;
 
 //++++  if(q <= 4 && q!=2 && gq == BONK-1) coor = rand()%HGQ;
@@ -645,23 +644,27 @@ int ding(int q){
 								}
 						}else{
 								if(!bakax){
-										xx-=TILEWH;
+//										xx-=TILEWH;
+										xx--;
 								}else if(bakax>1){
-										xx+=TILEWH;
+//										xx+=TILEWH;
+										xx++;
 								}
 								if(!bakay){
-										yy-=TILEWH;
+//										yy-=TILEWH;
+										yy--;
 								}else if(bakay>1){
-										yy+=TILEWH;
+//										yy+=TILEWH;
+										yy++;
 								}
 						}
 				}
 				// fixer
 //				if(q!=16){
 //if(q!=16)
-						if(xx<0) xx=width;
+						if(xx<(0/*-TILEWH*/)) xx=(width/*+TILEWH*/);
 						if(yy<0) yy=(height*3);
-						if(xx>width) xx=0;
+						if(xx>(width/*+TILEWH*/)) xx=(0/*-TILEWH*/);
 						if(yy>(height*3)) yy=0;
 //				}
 
@@ -678,16 +681,19 @@ int ding(int q){
 				// plot the pixel
 //----		  ppf(xx, yy, coor, vga);
 				}else /*if(xx>=0 && xx<width && yy>=0 && yy<(height*3))*/{
-					putColorBox_X(xx, yy, TILEWH, TILEWH, coor);
-//++++0000					putPixel_X(xx, yy, coor);
+//					putColorBox_X(xx, yy, TILEWH, TILEWH, coor);
+//++++0000
+					putPixel_X(xx, yy, coor);
 				} 
 
 //----		  if(q==2) ppf(rand()%, rand()%height, 0, vga);
-				if(q==2) putColorBox_X(rand()%width, rand()%(height*3), TILEWH, TILEWH, 0);
+//				if(q==2) putColorBox_X(rand()%width, rand()%(height*3), TILEWH, TILEWH, 0);
+//++++0000
+				if(q==2) putPixel_X(rand()%width, rand()%(height*3), 0);
 				if(q==16) putPixel_X(rand()%width, rand()%(height*3), 0);
 				if(q==2||q==4||q==16){ bakax = rand()%3; bakay = rand()%3; }
 				gq++;
-//if(xx<0||xx>320||yy<0||yy>240)
+//if(xx<0||xx>320||yy<0||yy>(height*3))
 //	  printf("%d %d %d %d %d %d\n", xx, yy, coor, bakax, bakay, getPixel_X(xx,yy));
 //	  printf("%d\n", getPixel_X(xx,yy));
 //0000