Added several updates

- Updated HTML5 build
- Updated SDL2 version
- Added controller support
- Updated libGDX version

.gitignore

@@ -47,3 +47,13 @@ monogame_space_invaders-master/Desktop/Content/
 wii-space-invaders-master/
 
 wii_space_invaders_master/source/\.vscode/
+
+unity3d-space-invaders/Library/webgl_cache/
+
+unity3d-space-invaders/HTML5/
+
+unity3d-space-invaders/obj/
+
+unity3d-space-invaders/Win64/
+
+unity3d-space-invaders/Library/

libgdx_space_invaders-master/core/src/com/libgdx/space_invaders/libgdx_space_invaders.java

@@ -20,6 +20,8 @@ public class libgdx_space_invaders extends ApplicationAdapter {
     SpriteBatch batch;
     Texture background_sprite;
     Texture fmg_logo;
+    Texture gameover_ui;
+    Texture win_ui;
     BitmapFont score_font;
 
     int score = 0;
@@ -28,6 +30,7 @@ public class libgdx_space_invaders extends ApplicationAdapter {
 
     float timer;
     boolean game_start = false;
+    boolean gameover = false;
 
     Music music;
     Sound snd_blaster;
@@ -40,6 +43,38 @@ public class libgdx_space_invaders extends ApplicationAdapter {
     ArrayList<Enemy> enemies = new ArrayList<Enemy>();
     ArrayList<Explosion> explode_fx = new ArrayList<Explosion>();
 
+    void restart()
+    {
+        player.dead  = false;
+        player.pos = new Vector2(640/2 - player.sprite.getDepth()/2,10);
+        laser.clear();;
+        enemies.clear();
+        pusher.clear();
+        explode_fx.clear();
+        itemCount = 0;
+        rowCount = 0;
+        score = 0;
+        gameover = false;
+        spawnEnemies();
+    }
+
+    void spawnEnemies()
+    {
+        // create enemies
+        for (int i = 0; i < 40; i++) {
+            if (i % 10 == 0) {
+                itemCount = 0;
+                rowCount++;
+            }
+
+            itemCount++;
+
+            Random r = new Random();
+            int ran = r.nextInt(30 - 3) + 1;
+            enemies.add(new Enemy(new Vector2(itemCount * 40, 40 * rowCount + 200), itemCount, ran));
+        }
+    }
+
     @Override
     public void create() {
 
@@ -52,22 +87,12 @@ public void create() {
         batch = new SpriteBatch();
         background_sprite = new Texture("space3.png");
         fmg_logo = new Texture("fmg_splash.png");
+        gameover_ui = new Texture("gameover_ui.psd");
+        win_ui = new Texture("win_ui.psd");
 
         player.Create();
 
-        // create enemies
-        for (int i = 0; i < 40; i++) {
-            if (i % 10 == 0) {
-                itemCount = 0;
-                rowCount++;
-            }
-
-            itemCount++;
-
-            Random r = new Random();
-            int ran = r.nextInt(30 - 3) + 1;
-            enemies.add(new Enemy(new Vector2(itemCount * 40, 40 * rowCount + 200), itemCount, ran));
-        }
+        spawnEnemies();
 
         music = Gdx.audio.newMusic(Gdx.files.internal("bodenstaendig.ogg"));
         music.setLooping(true);
@@ -93,6 +118,14 @@ void Update() {
                 snd_blaster.play();
             }
 
+            if (Gdx.input.isKeyJustPressed(Input.Keys.ENTER) && gameover) {
+                restart();
+            }
+
+            if (Gdx.input.isKeyJustPressed(Input.Keys.ESCAPE)) {
+                Gdx.app.exit();
+            }
+
             for (int e = enemies.size() - 1; e >= 0; e--) {
                 enemies.get(e).Update();
 
@@ -171,11 +204,15 @@ public void render() {
             score_font.draw(batch, "SCORE: " + String.format("%04d", score), 640 - 190, 480 - 10);
 
             if (score >= 4000) {
-                score_font.draw(batch, "YOU WIN!", 640 / 2 - 35, 480 / 2 - 10);
+                //score_font.draw(batch, "YOU WIN!", 640 / 2 - 35, 480 / 2 - 10);
+                batch.draw(win_ui, 0, 0);
+                gameover = true;
             }
 
             if (player.dead) {
-                score_font.draw(batch, "GAME OVER!", 640 / 2 - 70, 480 / 2 - 10);
+                //score_font.draw(batch, "GAME OVER!", 640 / 2 - 70, 480 / 2 - 10);
+                batch.draw(gameover_ui, 0, 0);
+                gameover = true;
             }
         } else {
             batch.draw(fmg_logo, 0, 0);

monogame_space_invaders-fsharp-master/Bullet.fs

@@ -25,9 +25,9 @@ type Bullet (pos: Vector2, isEnemy: bool, con: ContentManager) = class
     member val position = pos with get, set
     member val enemyBullet = _enemyBullet with get, set
     member this.TileBoundingBox = _TileBoundingBox
+    member val dispose = false with get, set
 
-
-
+    //functions
     member this.update(gameTime: GameTime) =
         if this.enemyBullet = false 
             then 

monogame_space_invaders-fsharp-master/Game1.fs

@@ -119,7 +119,8 @@ type Game1 () as this =
                 snd_blasterInstance <- snd_blaster.CreateInstance()
                 snd_blasterInstance.Play() |> ignore
 
-            if Keyboard.GetState().IsKeyDown(Keys.Enter) && player.dead = true || Keyboard.GetState().IsKeyDown(Keys.Enter) && stageClear = true
+            if Keyboard.GetState().IsKeyDown(Keys.Enter) && player.dead = true || Keyboard.GetState().IsKeyDown(Keys.Enter) && stageClear = true 
+                || GamePad.GetState(PlayerIndex.One).IsButtonDown(Buttons.Start) && player.dead = true  || GamePad.GetState(PlayerIndex.One).IsButtonDown(Buttons.Start) && stageClear = true
                 then 
                     restart()
 
@@ -142,7 +143,8 @@ type Game1 () as this =
                             enemies.Item(i).dead <- true //enemies.RemoveAt(i) //don't know how to fix this. could not find something like break or workaround
                             snd_exploInstance <- snd_explo.CreateInstance()
                             snd_exploInstance.Play() |> ignore
-
+
+            for i in enemies.Count-1 .. -1 .. 0 do
                 if enemies.Item(i).dead
                     then enemies.RemoveAt(i)
 
@@ -164,6 +166,10 @@ type Game1 () as this =
                         snd_exploInstance.Play() |> ignore
 
                 if enemyLasers.Item(i).position.Y >= 480.0f
+                    then enemyLasers.Item(i).dispose <- true
+
+            for i in enemyLasers.Count-1 .. -1 .. 0 do 
+                if enemyLasers.Item(i).dispose = true
                     then enemyLasers.RemoveAt(i);
 
             for i in explosions.Count-1 .. -1 .. 0 do 

monogame_space_invaders-fsharp-master/Player.fs

@@ -11,17 +11,20 @@ type Player (pos: Vector2) = class
     let mutable _TileBoundingBox: Rectangle = Rectangle(0, 0, 0, 0)
     let mutable _sprite: Texture2D = null
     let mutable keyState = KeyboardState()
+
+    let mutable cbuttonState = GamePadState() 
+    let mutable lastcbuttonState = GamePadState()
+    let mutable cpadState = GamePadState()
 
+    let move_speed: float32 = 350.0f
+
     //public variables
     member val dead = false with get, set
     member val shoot = false with get, set
     member val position = pos with get, set
     member this.TileBoundingBox = _TileBoundingBox
 
-    //functions
-    member this.test = //test function
-        printf "Hello World"
-
+    //functions    
     member this.loadResources(con: ContentManager) =
         _sprite <- con.Load<Texture2D>("player");
         this.position <- Vector2(640.0f / 2.0f - (float32) _sprite.Bounds.Width / 2.0f, this.position.Y)
@@ -31,17 +34,24 @@ type Player (pos: Vector2) = class
 
         if this.dead = false 
             then
-                if Keyboard.GetState().IsKeyDown(Keys.Space) && keyState.IsKeyDown(Keys.Space) = false
+
+                cpadState <- GamePad.GetState(PlayerIndex.One)         
+                lastcbuttonState <-  cbuttonState
+
+                if Keyboard.GetState().IsKeyDown(Keys.Space) && keyState.IsKeyDown(Keys.Space) = false 
+                    || GamePad.GetState(PlayerIndex.One).IsButtonDown(Buttons.A) && lastcbuttonState.IsButtonUp(Buttons.A)
                     then
                         this.shoot <- true
                     else
                         this.shoot <- false
 
-                if Keyboard.GetState().IsKeyDown(Keys.A) || Keyboard.GetState().IsKeyDown(Keys.Left)
-                    then this.position <- Vector2(this.position.X - 250.0f * (float32) gameTime.ElapsedGameTime.TotalSeconds, this.position.Y)
+                cbuttonState <- cpadState
+
+                if Keyboard.GetState().IsKeyDown(Keys.A) || Keyboard.GetState().IsKeyDown(Keys.Left) || cpadState.ThumbSticks.Left.X <= -0.5f
+                    then this.position <- Vector2(this.position.X - move_speed * (float32) gameTime.ElapsedGameTime.TotalSeconds, this.position.Y)
 
-                if Keyboard.GetState().IsKeyDown(Keys.D) || Keyboard.GetState().IsKeyDown(Keys.Right)
-                    then this.position <- Vector2(this.position.X + 250.0f * (float32) gameTime.ElapsedGameTime.TotalSeconds, this.position.Y)
+                if Keyboard.GetState().IsKeyDown(Keys.D) || Keyboard.GetState().IsKeyDown(Keys.Right) || cpadState.ThumbSticks.Left.X >= 0.5f
+                    then this.position <- Vector2(this.position.X + move_speed * (float32) gameTime.ElapsedGameTime.TotalSeconds, this.position.Y)
 
                 keyState <- Keyboard.GetState()
 

sdl2-space-invaders-master/Debug/DC_SDL_Game.log

@@ -0,0 +1,19 @@
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Microsoft\VC\v160\Microsoft.CppBuild.targets(411,5): warning MSB8028: The intermediate directory (Debug\) contains files shared from another project (DC_SDL_Game.vcxproj).  This can lead to incorrect clean and rebuild behavior.
+  main.cpp
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(138): warning C4244: '=': conversion from 'float' to 'int', possible loss of data
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(139): warning C4244: '=': conversion from 'float' to 'int', possible loss of data
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(217): warning C4244: '=': conversion from 'int' to 'float', possible loss of data
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(302): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(404): warning C4244: '=': conversion from 'float' to 'int', possible loss of data
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(405): warning C4244: '=': conversion from 'float' to 'int', possible loss of data
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(464): warning C4244: '=': conversion from 'float' to 'int', possible loss of data
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(465): warning C4244: '=': conversion from 'float' to 'int', possible loss of data
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(538): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(558): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(574): warning C4244: '=': conversion from 'float' to 'int', possible loss of data
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(663): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(625): warning C4996: 'sprintf': This function or variable may be unsafe. Consider using sprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+  C:\Program Files (x86)\Windows Kits\10\Include\10.0.17763.0\ucrt\stdio.h(1774): note: see declaration of 'sprintf'
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(721): warning C4996: 'sprintf': This function or variable may be unsafe. Consider using sprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+  C:\Program Files (x86)\Windows Kits\10\Include\10.0.17763.0\ucrt\stdio.h(1774): note: see declaration of 'sprintf'
+  DC_SDL_Game.vcxproj -> D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\Debug\sdl2_space_invaders.exe

sdl2-space-invaders-master/Debug/DC_SDL_Game.tlog/DC_SDL_Game.lastbuildstate

@@ -0,0 +1,2 @@
+#TargetFrameworkVersion=v4.0:PlatformToolSet=v120_xp:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit
+Debug|Win32|D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\|

sdl2-space-invaders-master/Debug/sdl2_spa.28AAB1A6.tlog/sdl2_space_invaders.lastbuildstate

@@ -0,0 +1,2 @@
+#TargetFrameworkVersion=v4.0:PlatformToolSet=v142:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=10.0
+Debug|Win32|D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\|

sdl2-space-invaders-master/Debug/sdl2_spa.33559090.tlog/sdl2_space_invaders.lastbuildstate

@@ -0,0 +1,2 @@
+#TargetFrameworkVersion=v4.0:PlatformToolSet=v142:EnableManagedIncrementalBuild=false:VCToolArchitecture=Native32Bit:WindowsTargetPlatformVersion=10.0
+Debug|Win32|D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\|

sdl2-space-invaders-master/Debug/sdl2_space_invaders.Build.CppClean.log

@@ -0,0 +1,21 @@
+d:\sourcetree\space_invaders_project\sdl2-space-invaders-master\debug\vc142.pdb
+d:\sourcetree\space_invaders_project\sdl2-space-invaders-master\debug\vc142.idb
+d:\sourcetree\space_invaders_project\sdl2-space-invaders-master\debug\stdafx.obj
+d:\sourcetree\space_invaders_project\sdl2-space-invaders-master\debug\main.obj
+d:\sourcetree\space_invaders_project\sdl2-space-invaders-master\debug\sdl2_space_invaders.exe
+d:\sourcetree\space_invaders_project\sdl2-space-invaders-master\debug\sdl2_space_invaders.ilk
+d:\sourcetree\space_invaders_project\sdl2-space-invaders-master\debug\sdl2_space_invaders.pdb
+d:\sourcetree\space_invaders_project\sdl2-space-invaders-master\debug\resource.res
+d:\sourcetree\space_invaders_project\sdl2-space-invaders-master\debug\dc_sdl_game.ilk
+d:\sourcetree\space_invaders_project\sdl2-space-invaders-master\debug\vc120.idb
+d:\sourcetree\space_invaders_project\sdl2-space-invaders-master\debug\dc_sdl_game.pdb
+d:\sourcetree\space_invaders_project\sdl2-space-invaders-master\debug\vc120.pdb
+d:\sourcetree\space_invaders_project\sdl2-space-invaders-master\debug\sdl2_spa.28aab1a6.tlog\cl.command.1.tlog
+d:\sourcetree\space_invaders_project\sdl2-space-invaders-master\debug\sdl2_spa.28aab1a6.tlog\cl.read.1.tlog
+d:\sourcetree\space_invaders_project\sdl2-space-invaders-master\debug\sdl2_spa.28aab1a6.tlog\cl.write.1.tlog
+d:\sourcetree\space_invaders_project\sdl2-space-invaders-master\debug\sdl2_spa.28aab1a6.tlog\link.command.1.tlog
+d:\sourcetree\space_invaders_project\sdl2-space-invaders-master\debug\sdl2_spa.28aab1a6.tlog\link.read.1.tlog
+d:\sourcetree\space_invaders_project\sdl2-space-invaders-master\debug\sdl2_spa.28aab1a6.tlog\link.write.1.tlog
+d:\sourcetree\space_invaders_project\sdl2-space-invaders-master\debug\sdl2_spa.28aab1a6.tlog\rc.command.1.tlog
+d:\sourcetree\space_invaders_project\sdl2-space-invaders-master\debug\sdl2_spa.28aab1a6.tlog\rc.read.1.tlog
+d:\sourcetree\space_invaders_project\sdl2-space-invaders-master\debug\sdl2_spa.28aab1a6.tlog\rc.write.1.tlog

sdl2-space-invaders-master/Debug/sdl2_space_invaders.log

@@ -0,0 +1,20 @@
+C:\Program Files (x86)\Microsoft Visual Studio\2019\Community\MSBuild\Microsoft\VC\v160\Microsoft.CppBuild.targets(411,5): warning MSB8028: The intermediate directory (Debug\) contains files shared from another project (DC_SDL_Game.vcxproj, sdl2_space_invaders.vcxproj).  This can lead to incorrect clean and rebuild behavior.
+  main.cpp
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(140): warning C4244: '=': conversion from 'float' to 'int', possible loss of data
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(141): warning C4244: '=': conversion from 'float' to 'int', possible loss of data
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(217): warning C4244: '=': conversion from 'int' to 'float', possible loss of data
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(302): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(403): warning C4244: '=': conversion from 'float' to 'int', possible loss of data
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(404): warning C4244: '=': conversion from 'float' to 'int', possible loss of data
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(463): warning C4244: '=': conversion from 'float' to 'int', possible loss of data
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(464): warning C4244: '=': conversion from 'float' to 'int', possible loss of data
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(537): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(557): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(573): warning C4244: '=': conversion from 'float' to 'int', possible loss of data
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(679): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(698): warning C4244: 'argument': conversion from 'int' to 'float', possible loss of data
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(641): warning C4996: 'sprintf': This function or variable may be unsafe. Consider using sprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+  C:\Program Files (x86)\Windows Kits\10\Include\10.0.17763.0\ucrt\stdio.h(1774): note: see declaration of 'sprintf'
+D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\main.cpp(803): warning C4996: 'sprintf': This function or variable may be unsafe. Consider using sprintf_s instead. To disable deprecation, use _CRT_SECURE_NO_WARNINGS. See online help for details.
+  C:\Program Files (x86)\Windows Kits\10\Include\10.0.17763.0\ucrt\stdio.h(1774): note: see declaration of 'sprintf'
+  sdl2_space_invaders.vcxproj -> D:\SourceTree\space_invaders_project\sdl2-space-invaders-master\Debug\sdl2_space_invaders.exe