From 51319c1e7e529225c3edb26f157c2d72fd849ad7 Mon Sep 17 00:00:00 2001 From: badlogic Date: Fri, 12 Apr 2013 22:46:08 +0200 Subject: [PATCH] added invader rotation and lights --- .../src/com/badlogic/gdxinvaders/GdxInvadersDesktop.java | 2 +- .../gdx-invaders/src/com/badlogic/gdxinvaders/Renderer.java | 9 +++++++-- .../src/com/badlogic/gdxinvaders/simulation/Invader.java | 2 ++ .../src/com/badlogic/gdxinvaders/simulation/Simulation.java | 2 ++ 4 files changed, 12 insertions(+), 3 deletions(-) diff --git a/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/GdxInvadersDesktop.java b/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/GdxInvadersDesktop.java index 742301d82..918c06124 100644 --- a/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/GdxInvadersDesktop.java +++ b/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/GdxInvadersDesktop.java @@ -23,7 +23,7 @@ public class GdxInvadersDesktop { LwjglApplicationConfiguration config = new LwjglApplicationConfiguration(); config.title = "Gdx Invaders"; config.vSyncEnabled = true; - config.useGL20 = true; + config.useGL20 = false; new LwjglApplication(new GdxInvaders(), config); } } diff --git a/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/Renderer.java b/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/Renderer.java index 13d1883e3..9ac74b9dc 100644 --- a/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/Renderer.java +++ b/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/Renderer.java @@ -29,6 +29,7 @@ import com.badlogic.gdx.graphics.VertexAttribute; import com.badlogic.gdx.graphics.VertexAttributes.Usage; import com.badlogic.gdx.graphics.g2d.BitmapFont; import com.badlogic.gdx.graphics.g2d.SpriteBatch; +import com.badlogic.gdx.graphics.g3d.Light; import com.badlogic.gdx.graphics.g3d.ModelBatch; import com.badlogic.gdx.graphics.g3d.RenderableProvider; import com.badlogic.gdx.graphics.g3d.shaders.DefaultShader; @@ -71,6 +72,10 @@ public class Renderer { /** perspective camera **/ private PerspectiveCamera camera; + /** the directional light **/ + Light[] lights = { new Light(Color.WHITE, new Vector3(-1, -0.5f, 0).nor()) }; + + ModelBatch modelBatch; final Vector3 tmpV = new Vector3(); @@ -104,8 +109,8 @@ public class Renderer { modelBatch.begin(camera); modelBatch.render(simulation.explosions); if (!simulation.ship.isExploding) - modelBatch.render(simulation.ship); - modelBatch.render(simulation.invaders); + modelBatch.render(simulation.ship, lights); + modelBatch.render(simulation.invaders, lights); modelBatch.render(simulation.blocks); modelBatch.render(simulation.shots); modelBatch.end(); diff --git a/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/simulation/Invader.java b/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/simulation/Invader.java index a88762d15..d2c0c0b99 100644 --- a/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/simulation/Invader.java +++ b/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/simulation/Invader.java @@ -18,6 +18,7 @@ import com.badlogic.gdx.graphics.g3d.ModelInstance; import com.badlogic.gdx.math.Vector3; public class Invader extends ModelInstance { + public static float INVADER_ROTATION = 45f; public static float INVADER_RADIUS = 0.75f; public static float INVADER_VELOCITY = 1; public static int INVADER_POINTS = 40; @@ -61,5 +62,6 @@ public class Invader extends ModelInstance { movedDistance = 0; } } + transform.rotate(0, 1, 0, INVADER_ROTATION * delta); } } diff --git a/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/simulation/Simulation.java b/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/simulation/Simulation.java index a191e9014..4727c6cbf 100644 --- a/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/simulation/Simulation.java +++ b/demos/invaders/gdx-invaders/src/com/badlogic/gdxinvaders/simulation/Simulation.java @@ -16,6 +16,7 @@ package com.badlogic.gdxinvaders.simulation; import java.util.ArrayList; import com.badlogic.gdx.Gdx; +import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.GL10; import com.badlogic.gdx.graphics.Mesh; import com.badlogic.gdx.graphics.Texture; @@ -23,6 +24,7 @@ import com.badlogic.gdx.graphics.VertexAttribute; import com.badlogic.gdx.graphics.Pixmap.Format; import com.badlogic.gdx.graphics.Texture.TextureFilter; import com.badlogic.gdx.graphics.VertexAttributes.Usage; +import com.badlogic.gdx.graphics.g3d.Light; import com.badlogic.gdx.graphics.g3d.Model; import com.badlogic.gdx.graphics.g3d.loader.ObjLoader; import com.badlogic.gdx.graphics.g3d.materials.BlendingAttribute; -- 2.11.0