From: sparky4 <sparky4@cock.li>
Date: Fri, 2 Sep 2016 18:40:29 +0000 (-0500)
Subject: ca_t added and vgacamm for sparky4
X-Git-Url: http://4ch.mooo.com/gitweb/?a=commitdiff_plain;h=535b17da01f06d48795d82c2c7aab5428a0825ee;p=16.git

ca_t added and vgacamm for sparky4
---

diff --git a/makefile b/makefile
index 9cac033a..d9a1228d 100755
--- a/makefile
+++ b/makefile
@@ -168,7 +168,8 @@ TESTEXEC = &
     inputest.exe &
     palettel.exe &
     exmmtest.exe &
-    vrstest.exe
+    vrstest.exe &
+    vgacamm.exe
 EXEC = &
     16.exe &
     bakapi.exe &
@@ -203,6 +204,7 @@ inputest.exe:     inputest.$(OBJ) $(16LIB) $(DOSLIBLIBS)
 #sountest.exe:    sountest.$(OBJ) $(16LIB)
 pcxtest.exe:      pcxtest.$(OBJ) gfx.lib $(DOSLIBLIBS)
 vrstest.exe:      vrstest.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
+vgacamm.exe:      vgacamm.$(OBJ) $(16LIB) gfx.lib $(DOSLIBLIBS)
 palettec.exe:     palettec.$(OBJ) gfx.lib $(DOSLIBLIBS)
 palettel.exe:     palettel.$(OBJ) gfx.lib $(DOSLIBLIBS)
 pcxtest2.exe:     pcxtest2.$(OBJ) gfx.lib $(DOSLIBLIBS)
@@ -222,6 +224,7 @@ test.$(OBJ):      $(SRC)/test.c $(SRCLIB)/modex16.h
 test0.$(OBJ):     $(SRC)/test0.c
 pcxtest.$(OBJ):   $(SRC)/pcxtest.c $(SRCLIB)/modex16.h
 vrstest.$(OBJ):   $(SRC)/vrstest.c $(SRCLIB)/modex16.h
+vgacamm.$(OBJ):   $(SRC)/vgacamm.c $(SRCLIB)/modex16.h
 #planrpcx.$(OBJ): $(SRC)/planrpcx.c $(SRCLIB)/modex16.h
 pcxtest2.$(OBJ):  $(SRC)/pcxtest2.c $(SRCLIB)/modex16.h
 palettec.$(OBJ):  $(SRC)/palettec.c
diff --git a/src/vgacamm.c b/src/vgacamm.c
new file mode 100755
index 00000000..de14c24d
--- /dev/null
+++ b/src/vgacamm.c
@@ -0,0 +1,173 @@
+/* Project 16 Source Code~
+ * Copyright (C) 2012-2016 sparky4 & pngwen & andrius4669 & joncampbell123 & yakui-lover
+ *
+ * This file is part of Project 16.
+ *
+ * Project 16 is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 3 of the License, or
+ * (at your option) any later version.
+ *
+ * Project 16 is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program.  If not, see <http://www.gnu.org/licenses/>, or
+ * write to the Free Software Foundation, Inc., 51 Franklin Street,
+ * Fifth Floor, Boston, MA 02110-1301 USA.
+ *
+ */
+
+#include "src/lib/modex16.h"
+#include "src/lib/16_sprit.h"
+#include "src/lib/16_ca.h"
+#include "src/lib/16_mm.h"
+
+global_game_variables_t gvar;
+
+void main() {
+	mminfo_t mm; mminfotype mmi;
+	__segment sega;
+	void __based(sega)* bigbuffer;
+	int i;
+	word start;
+	int plane;
+	float t1, t2;
+	boolean baka;
+	byte *pal;
+	int size, size1;
+// 	struct sprite spri;
+// 	vrl1_vgax_offset_t * off, *off1;
+// 	struct vrs_container vrs;
+// 	vrl1_vgax_offset_t **vrl_line_offsets;
+// 	uint32_t huge *vrl_headers_offsets;
+// 	uint16_t huge *vrl_id_iter;
+// 	uint32_t vrl_size;
+// 	int num_of_vrl;
+// 	struct vrl1_vgax_header huge *curr_vrl;
+// 	struct vrl_container *vrl;
+	word w=0;
+
+
+
+	// DOSLIB: check our environment
+	probe_dos();
+
+	// DOSLIB: what CPU are we using?
+	// NTS: I can see from the makefile Sparky4 intends this to run on 8088 by the -0 switch in CFLAGS.
+	//      So this code by itself shouldn't care too much what CPU it's running on. Except that other
+	//      parts of this project (DOSLIB itself) rely on CPU detection to know what is appropriate for
+	//      the CPU to carry out tasks. --J.C.
+	cpu_probe();
+
+	// DOSLIB: check for VGA
+	if (!probe_vga()) {
+		printf("VGA probe failed\n");
+		return;
+	}
+	// hardware must be VGA or higher!
+	if (!(vga_state.vga_flags & VGA_IS_VGA)) {
+		printf("This program requires VGA or higher graphics hardware\n");
+		return;
+	}
+
+	//bmp = bitmapLoadPcx("data/chikyuu.pcx");
+	gvar.video.page[0]=modexDefaultPage(&gvar.video.page[0]);
+
+	mm.mmstarted=0;
+	MM_Startup(&mm, &mmi);
+	CA_Startup(&gvar);
+	// What should be done by read_vrs:
+	//if(CA_LoadFile("data/spri/chikyuu.vrs", &bigbuffer, &mm, &mmi)) baka=1; else baka=0;
+
+// 	// Insert sanity cheks later
+// 	vrs.buffer = bigbuffer;
+// 	vrs.data_size = size - sizeof(struct vrl1_vgax_header);
+// 	num_of_vrl = 0;
+// 	vrl_id_iter = (uint16_t huge *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST]);
+// 	while(vrl_id_iter[num_of_vrl]){
+// 		num_of_vrl++;
+// 	}
+//
+// 	// Allocate memory for vrl line offsets table
+// 	vrl_line_offsets = malloc(sizeof(vrl1_vgax_offset_t *)*num_of_vrl);
+//
+// 	vrl_headers_offsets = (uint32_t huge *)(vrs.buffer + vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_VRS_LIST]);
+// 	// Calculate line offsets for each vrl
+// 	for(i = 0; i < num_of_vrl; i++){
+// 		curr_vrl = (struct vrl1_vgax_header huge *)(vrs.buffer + vrl_headers_offsets[i]);
+//
+// 		// Calc. vrl size as (next_offset - curr_offset)
+// 		if (i != num_of_vrl - 1){
+// 			vrl_size = vrl_headers_offsets[i+1] - vrl_headers_offsets[i] - sizeof(struct vrl1_vgax_header);
+// 		}
+// 		// If it's the last vrl, size is (next_vrs_struct_offset - curr_offset)
+// 		else{
+// 			vrl_size = vrs.vrs_hdr->offset_table[VRS_HEADER_OFFSET_SPRITE_ID_LIST] - vrl_headers_offsets[i] - sizeof(struct vrl1_vgax_header);
+// 		}
+// 		vrl_line_offsets[i] = vrl1_vgax_genlineoffsets(curr_vrl, (byte *)curr_vrl + sizeof(struct vrl1_vgax_header), vrl_size);
+// 	}
+// 	vrs.vrl_line_offsets = vrl_line_offsets;
+
+
+	//read_vrs(&gvar, "data/spri/chikyuu.vrs", &vrs);
+// 	spri.spritesheet = &vrs;
+// 	spri.sprite_vrl_cont = malloc(sizeof(struct vrl_container));
+// 	i = set_anim_by_id(&spri, 11);
+// 	if (i == -1)
+// 	{
+// 		return;
+// 	}
+// 	spri.x = 5;
+// 	spri.y = 100;
+
+//	Uncomment to see broken sprites
+/*	sega = mm.bufferseg;
+	if(CA_LoadFile("data/spri/CHUBACW1.vrl", &bigbuffer, &mm, &mmi)) baka=1; else baka=0;*/
+
+	/* clear and draw one sprite and one bitmap */
+	VGAmodeX(1, 1, &gvar);
+	modexClearRegion(&gvar.video.page[0], 0, 0, gvar.video.page[0].sw, gvar.video.page[0].sh, 1);
+
+	/* non sprite comparison */
+	start = *clockw;
+	modexCopyPageRegion(&gvar.video.page[0], &gvar.video.page[0], 0, 0, 0, 0, 320, 240);
+	t1 = (*clockw-start) /18.2;
+
+	start = *clockw;
+
+	t2 = (*clockw-start)/18.2;
+
+	//for (i = 0; i < 5; i++){
+	//spri.delay = 1; animate_spri(&spri); spri.x += 20; sleep(2); }
+
+	while(!kbhit())
+	{
+		switch(w)
+		{
+			case 1024:
+				modexPalUpdate0(pal);
+				w=0;
+			default:
+				w++;
+			break;
+		}
+	}
+	VGAmodeX(0, 1, &gvar);
+	//free(spri.sprite_vrl_cont);
+	MM_FreePtr(&bigbuffer, &mm);
+	//MM_FreePtr(&((void __based(sega)*)spri.spritesheet->buffer), &mm);
+	MM_Shutdown(&mm);
+	CA_Shutdown(&gvar);
+	//printf("CPU to VGA: %f\n", t1);
+	//printf("VGA to VGA: %f\n", t2);
+	printf("t1: %f\n", t1);
+	printf("t2: %f\n", t2);
+	printf("gvar.video.page[0].width: %u\n", gvar.video.page[0].width);
+	printf("gvar.video.page[0].height: %u\n", gvar.video.page[0].height);
+// 	printf("Num %d", num_of_vrl);
+	if(baka) printf("\nyay!\n");
+	else printf("\npoo!\n");
+}
diff --git a/src/vrstest.c b/src/vrstest.c
index fe532b84..6ffdab39 100755
--- a/src/vrstest.c
+++ b/src/vrstest.c
@@ -40,7 +40,7 @@ void main() {
 	float t1, t2;
 	boolean baka;
 	byte *pal;
-	int fd, size, size1;
+	int size, size1;
 	struct sprite spri;
 	vrl1_vgax_offset_t * off, *off1;
 	struct vrs_container vrs;
@@ -51,7 +51,6 @@ void main() {
 	int num_of_vrl;
 	struct vrl1_vgax_header huge *curr_vrl;
 	struct vrl_container *vrl;
-	int success;
 	word w=0;
 
 
@@ -86,10 +85,7 @@ void main() {
 	// What should be done by read_vrs:
 	//sega = (mm.bufferseg);
 	if(CA_LoadFile("data/spri/chikyuu.vrs", &bigbuffer, &mm, &mmi)) baka=1; else baka=0;
-	fd = open("data/spri/chikyuu.vrs", O_RDONLY|O_BINARY);
-	size = lseek(fd, 0, SEEK_END);
-	lseek(fd, 0, SEEK_SET);
-	close(fd);
+
 	// Insert sanity cheks later
 	vrs.buffer = bigbuffer;
 	vrs.data_size = size - sizeof(struct vrl1_vgax_header);