From: Michael Georgoulopoulos <mgeorgoulopoulos@gmail.com>
Date: Thu, 1 Sep 2016 00:29:55 +0000 (+0300)
Subject: Merge branch 'master' of mutantstargoat.com:/home/nuclear/git/dosdemo
X-Git-Url: http://git.mutantstargoat.com/user/nuclear/?p=dosdemo;a=commitdiff_plain;h=a0a89998cc3406ff2ac721530c0b6d9362dfe6ec;hp=d511df84eef5125b00881249d2864215ab188000

Merge branch 'master' of mutantstargoat.com:/home/nuclear/git/dosdemo
---

diff --git a/.gitignore b/.gitignore
index 8fd165c..27e5618 100644
--- a/.gitignore
+++ b/.gitignore
@@ -22,3 +22,5 @@ demo
 *.zip
 data
 *.a
+
+/SDL.dll
diff --git a/dosdemo.vcxproj b/dosdemo.vcxproj
index 0199594..d964fdb 100644
--- a/dosdemo.vcxproj
+++ b/dosdemo.vcxproj
@@ -87,6 +87,7 @@
     <ClCompile Include="src\demo.c" />
     <ClCompile Include="src\fract.c" />
     <ClCompile Include="src\gfxutil.c" />
+    <ClCompile Include="src\mike.c" />
     <ClCompile Include="src\screen.c" />
     <ClCompile Include="src\sdl\main.c" />
     <ClCompile Include="src\tunnel.c" />
diff --git a/dosdemo.vcxproj.filters b/dosdemo.vcxproj.filters
index 40e402e..a922489 100644
--- a/dosdemo.vcxproj.filters
+++ b/dosdemo.vcxproj.filters
@@ -28,6 +28,9 @@
     <ClCompile Include="src\gfxutil.c">
       <Filter>src</Filter>
     </ClCompile>
+    <ClCompile Include="src\mike.c">
+      <Filter>src</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
     <ClInclude Include="src\demo.h">
diff --git a/libs/imago/imago.vcxproj b/libs/imago/imago.vcxproj
index 444f813..124987b 100644
--- a/libs/imago/imago.vcxproj
+++ b/libs/imago/imago.vcxproj
@@ -73,12 +73,12 @@
     <ClCompile Include="libpng\pngwtran.c" />
     <ClCompile Include="libpng\pngwutil.c" />
     <ClCompile Include="src\conv.c" />
-    <ClCompile Include="src\file_jpeg.c" />
-    <ClCompile Include="src\file_png.c" />
-    <ClCompile Include="src\file_ppm.c" />
-    <ClCompile Include="src\file_rgbe.c" />
-    <ClCompile Include="src\file_tga.c" />
-    <ClCompile Include="src\ftype_module.c" />
+    <ClCompile Include="src\filejpeg.c" />
+    <ClCompile Include="src\filepng.c" />
+    <ClCompile Include="src\fileppm.c" />
+    <ClCompile Include="src\filergbe.c" />
+    <ClCompile Include="src\filetga.c" />
+    <ClCompile Include="src\ftmodule.c" />
     <ClCompile Include="src\imago2.c" />
     <ClCompile Include="src\imago_gl.c" />
     <ClCompile Include="src\modules.c" />
@@ -110,7 +110,7 @@
     <ClInclude Include="jpeglib\jversion.h" />
     <ClInclude Include="libpng\png.h" />
     <ClInclude Include="libpng\pngconf.h" />
-    <ClInclude Include="src\ftype_module.h" />
+    <ClInclude Include="src\ftmodule.h" />
     <ClInclude Include="src\imago2.h" />
     <ClInclude Include="zlib\crc32.h" />
     <ClInclude Include="zlib\deflate.h" />
diff --git a/libs/imago/imago.vcxproj.filters b/libs/imago/imago.vcxproj.filters
index e30dbd4..1de2222 100644
--- a/libs/imago/imago.vcxproj.filters
+++ b/libs/imago/imago.vcxproj.filters
@@ -19,24 +19,6 @@
     <ClCompile Include="src\conv.c">
       <Filter>src</Filter>
     </ClCompile>
-    <ClCompile Include="src\file_jpeg.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\file_png.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\file_ppm.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\file_rgbe.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\file_tga.c">
-      <Filter>src</Filter>
-    </ClCompile>
-    <ClCompile Include="src\ftype_module.c">
-      <Filter>src</Filter>
-    </ClCompile>
     <ClCompile Include="src\imago_gl.c">
       <Filter>src</Filter>
     </ClCompile>
@@ -265,11 +247,26 @@
     <ClCompile Include="libpng\pngwutil.c">
       <Filter>libpng</Filter>
     </ClCompile>
+    <ClCompile Include="src\filejpeg.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\filepng.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\fileppm.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\filergbe.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\filetga.c">
+      <Filter>src</Filter>
+    </ClCompile>
+    <ClCompile Include="src\ftmodule.c">
+      <Filter>src</Filter>
+    </ClCompile>
   </ItemGroup>
   <ItemGroup>
-    <ClInclude Include="src\ftype_module.h">
-      <Filter>src</Filter>
-    </ClInclude>
     <ClInclude Include="src\imago2.h">
       <Filter>src</Filter>
     </ClInclude>
@@ -345,5 +342,8 @@
     <ClInclude Include="libpng\pngconf.h">
       <Filter>libpng</Filter>
     </ClInclude>
+    <ClInclude Include="src\ftmodule.h">
+      <Filter>src</Filter>
+    </ClInclude>
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/src/mike.c b/src/mike.c
new file mode 100644
index 0000000..f985886
--- /dev/null
+++ b/src/mike.c
@@ -0,0 +1,66 @@
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <math.h>
+#include <assert.h>
+#include "imago2.h"
+#include "demo.h"
+#include "screen.h"
+
+static int init(void);
+static void destroy(void);
+static void start(long trans_time);
+static void stop(long trans_time);
+static void draw(void);
+
+static struct screen scr = {
+	"mike",
+	init,
+	destroy,
+	start,
+	stop,
+	draw
+};
+
+struct screen *mike_screen(void)
+{
+	return &scr;
+}
+
+
+static int init(void)
+{
+	return 0;
+}
+
+static void destroy(void)
+{
+}
+
+static void start(long trans_time)
+{
+	if(trans_time) {
+		
+	}
+}
+
+static void stop(long trans_time)
+{
+	if(trans_time) {
+
+	}
+}
+
+static void draw(void)
+{	
+	unsigned short *pixels = fb_pixels;
+
+	int j, i;
+	for (j = 0; j < fb_height; j++) {
+		for (i = 0; i < fb_width; i++) {
+			*pixels++ = 0xF800;
+		}
+	}
+}
+
+
diff --git a/src/screen.c b/src/screen.c
index 2387d52..178cf7d 100644
--- a/src/screen.c
+++ b/src/screen.c
@@ -7,6 +7,7 @@
 
 struct screen *tunnel_screen(void);
 struct screen *fract_screen(void);
+struct screen *mike_screen(void);
 
 #define NUM_SCR	32
 static struct screen *scr[NUM_SCR];
@@ -25,6 +26,9 @@ int scr_init(void)
 	if(!(scr[idx++] = fract_screen())) {
 		return -1;
 	}
+	if (!(scr[idx++] = mike_screen())) {
+		return -1;
+	}
 	num_screens = idx;
 
 	assert(num_screens <= NUM_SCR);