A 3D light source.
- */ -public class LightSource{ - private Vector3 position; - private Color ambientColor; - private Color diffuseColor; - private Color specularColor; - private float shinyness; - - /** - *Creates a default white light source positioned at (0,0,0).
- */ - public LightSource(){ - position = new Vector3(0.0f, 0.0f, 0.0f); - ambientColor = new Color(0.15f, 0.15f, 0.15f, 1.0f); - diffuseColor = new Color(1.0f, 1.0f, 1.0f, 1.0f); - specularColor = new Color(1.0f, 1.0f, 1.0f, 1.0f); - ambientColor = new Color(1.0f, 1.0f, 1.0f, 1.0f); - shinyness = 10.0f; - } - - /** - *Creates a white light source at the specified position.
- * - * @param position The location of the light source. - */ - public LightSource(Vector3 position){ - this.position = new Vector3(); - - this.position.set(position); - ambientColor = new Color(0.15f, 0.15f, 0.15f, 1.0f); - diffuseColor = new Color(1.0f, 1.0f, 1.0f, 1.0f); - specularColor = new Color(1.0f, 1.0f, 1.0f, 1.0f); - ambientColor = new Color(1.0f, 1.0f, 1.0f, 1.0f); - shinyness = 10.0f; - } - - /** - *Creates a custom light source.
- * - * @param position The location of the light source. - * @param ambientColor - * @param diffuseColor - * @param specularColor - * @param shinyness The shinyness component. Must be between (0.0, 128.0]. - * @throws IllegalArgumentException When shinyness is outside the valid range. - */ - public LightSource(Vector3 position, Color ambientColor, Color diffuseColor, Color specularColor, float shinyness) throws IllegalArgumentException { - if(shinyness <= 0.0 || shinyness > 128.0) - throw new IllegalArgumentException("Shinyness must be between (0.0, 128.0]."); - - this.position = new Vector3(); - this.ambientColor = new Color(); - this.diffuseColor = new Color(); - this.ambientColor = new Color(); - this.specularColor = new Color(); - - this.position.set(position); - this.ambientColor.set(ambientColor); - this.diffuseColor.set(diffuseColor); - this.specularColor.set(specularColor); - this.shinyness = shinyness; - } - - public LightSource(LightSource light){ - this.position = new Vector3(); - this.ambientColor = new Color(); - this.diffuseColor = new Color(); - this.ambientColor = new Color(); - this.specularColor = new Color(); - - set(light); - } - - public void set(LightSource light){ - this.position.set(light.getPosition()); - this.ambientColor.set(light.getAmbientColor()); - this.diffuseColor.set(light.getDiffuseColor()); - this.specularColor.set(light.getSpecularColor()); - this.shinyness = light.shinyness; - } - - public void setPosition(float x, float y, float z){ - position.set(x, y, z); - } - - public void setPosition(Vector3 position){ - this.position.set(position); - } - - public void setAmbientColor(float r, float g, float b, float a){ - ambientColor.set(r, g, b, a); - } - - public void setAmbientColor(Color ambientColor){ - this.ambientColor.set(ambientColor); - } - - public void setDiffuseColor(float r, float g, float b, float a){ - diffuseColor.set(r, g, b, a); - } - - public void setdiffuseColor(Color diffuseColor){ - this.diffuseColor.set(diffuseColor); - } - - public void setSpecularColor(float r, float g, float b, float a){ - specularColor.set(r, g, b, a); - } - - public void setSpecularColor(Color specularColor){ - this.specularColor.set(specularColor); - } - - public void setShinyness(float shinyness) throws IllegalArgumentException { - if(shinyness <= 0.0 || shinyness > 128.0) - throw new IllegalArgumentException("Shinyness must be between (0.0, 128.0]."); - - this.shinyness = shinyness; - } - - public Vector3 getPosition(){ - return position; - } - - public Color getAmbientColor(){ - return ambientColor; - } - - public Color getDiffuseColor(){ - return diffuseColor; - } - - public Color getSpecularColor(){ - return specularColor; - } - - public float getShinyness(){ - return shinyness; - } -} diff --git a/src/ve/ucv/ciens/ccg/nxtar/graphics/RenderParameters.java b/src/ve/ucv/ciens/ccg/nxtar/graphics/RenderParameters.java deleted file mode 100644 index 12fd477..0000000 --- a/src/ve/ucv/ciens/ccg/nxtar/graphics/RenderParameters.java +++ /dev/null @@ -1,75 +0,0 @@ -/* - * Copyright (C) 2014 Miguel Angel Astor Romero - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package ve.ucv.ciens.ccg.nxtar.graphics; - -import com.badlogic.gdx.math.Matrix4; -import com.badlogic.gdx.math.Vector3; - -public abstract class RenderParameters { - private static Matrix4 modelViewProjection; - private static Matrix4 geometricTransformation; - private static Vector3 eyePosition; - private static LightSource lightSource1; - private static LightSource lightSource2; - - static{ - modelViewProjection = new Matrix4(); - geometricTransformation = new Matrix4(); - eyePosition = new Vector3(0.0f, 0.0f, 1.4142f); - lightSource1 = new LightSource(); - lightSource2 = new LightSource(); - } - - public static synchronized void setModelViewProjectionMatrix(Matrix4 modelViewMatrix){ - modelViewProjection.set(modelViewMatrix); - } - - public static synchronized void setTransformationMatrix(Matrix4 transformationMatrix){ - geometricTransformation.set(transformationMatrix); - } - - public static synchronized void setEyePosition(Vector3 newEyePostition){ - eyePosition.set(newEyePostition); - } - - public static synchronized void setLightSource1(LightSource newLightSource1){ - lightSource1.set(newLightSource1); - } - - public static synchronized void setLightSource2(LightSource newLightSource2){ - lightSource2.set(newLightSource2); - } - - public static synchronized Matrix4 getModelViewProjectionMatrix(){ - return modelViewProjection; - } - - public static synchronized Matrix4 getTransformationMatrix(){ - return geometricTransformation; - } - - public static synchronized Vector3 getEyePosition(){ - return eyePosition; - } - - public static synchronized LightSource getLightSource1(){ - return lightSource1; - } - - public static synchronized LightSource getLightSource2(){ - return lightSource2; - } -} diff --git a/src/ve/ucv/ciens/ccg/nxtar/graphics/shaders/SingleLightPerPixelShader.java b/src/ve/ucv/ciens/ccg/nxtar/graphics/shaders/DirectionalLightPerPixelShader.java similarity index 96% rename from src/ve/ucv/ciens/ccg/nxtar/graphics/shaders/SingleLightPerPixelShader.java rename to src/ve/ucv/ciens/ccg/nxtar/graphics/shaders/DirectionalLightPerPixelShader.java index b123837..a210d02 100644 --- a/src/ve/ucv/ciens/ccg/nxtar/graphics/shaders/SingleLightPerPixelShader.java +++ b/src/ve/ucv/ciens/ccg/nxtar/graphics/shaders/DirectionalLightPerPixelShader.java @@ -30,7 +30,7 @@ import com.badlogic.gdx.math.Matrix4; import com.badlogic.gdx.math.Vector3; import com.badlogic.gdx.utils.GdxRuntimeException; -public class SingleLightPerPixelShader implements Shader{ +public class DirectionalLightPerPixelShader implements Shader{ private static final int MAX_NUM_BONES = 4; private static final Matrix4 IDENTITY = new Matrix4(); private static final String VERTEX_SHADER_PATH = "shaders/directionalPerPixelSingleLight/directionalPerPixel_vert.glsl"; @@ -56,7 +56,7 @@ public class SingleLightPerPixelShader implements Shader{ private int[] u_normalMatrix; private int[] u_bones; - public SingleLightPerPixelShader(){ + public DirectionalLightPerPixelShader(){ skinningProgram = null; baseProgram = null; camera = null; @@ -79,7 +79,7 @@ public class SingleLightPerPixelShader implements Shader{ throw new GdxRuntimeException(skinningProgram.getLog()); if(!baseProgram.isCompiled()) - throw new GdxRuntimeException(skinningProgram.getLog()); + throw new GdxRuntimeException(baseProgram.getLog()); // Create uniform locations. u_projTrans = new int[2]; @@ -198,7 +198,7 @@ public class SingleLightPerPixelShader implements Shader{ // Set model dependant uniforms. program.setUniformMatrix(u_geomTrans[index], renderable.worldTransform); - program.setUniformMatrix(u_normalMatrix[index], normalMatrix.idt().mul(renderable.worldTransform).inv().tra()); + program.setUniformMatrix(u_normalMatrix[index], normalMatrix.set(renderable.worldTransform).toNormalMatrix()); program.setUniformf(u_lightPos[index], lightPosition); program.setUniformf(u_lightDiffuse[index], diffuseLightColor); program.setUniformf(u_materialDiffuse[index], diffuseColor); diff --git a/src/ve/ucv/ciens/ccg/nxtar/graphics/shaders/SingleLightPhongShader.java b/src/ve/ucv/ciens/ccg/nxtar/graphics/shaders/SingleLightPhongShader.java deleted file mode 100644 index 66dcd54..0000000 --- a/src/ve/ucv/ciens/ccg/nxtar/graphics/shaders/SingleLightPhongShader.java +++ /dev/null @@ -1,58 +0,0 @@ -/* - * Copyright (C) 2014 Miguel Angel Astor Romero - * - * Licensed under the Apache License, Version 2.0 (the "License"); - * you may not use this file except in compliance with the License. - * You may obtain a copy of the License at - * - * http://www.apache.org/licenses/LICENSE-2.0 - * - * Unless required by applicable law or agreed to in writing, software - * distributed under the License is distributed on an "AS IS" BASIS, - * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. - * See the License for the specific language governing permissions and - * limitations under the License. - */ -package ve.ucv.ciens.ccg.nxtar.graphics.shaders; - -import ve.ucv.ciens.ccg.nxtar.exceptions.ShaderFailedToLoadException; -import ve.ucv.ciens.ccg.nxtar.graphics.LightSource; -import ve.ucv.ciens.ccg.nxtar.graphics.RenderParameters; - -import com.badlogic.gdx.Gdx; -import com.badlogic.gdx.graphics.glutils.ShaderProgram; - -public class SingleLightPhongShader extends CustomShaderBase{ - private static String VERTEX_SHADER_PATH = "shaders/singleDiffuseLight/singleDiffuseLight_vert.glsl"; - private static String FRAGMENT_SHADER_PATH = "shaders/singleDiffuseLight/singleDiffuseLight_frag.glsl"; - - @Override - public SingleLightPhongShader loadShader() throws ShaderFailedToLoadException{ - shaderProgram = new ShaderProgram(Gdx.files.internal(VERTEX_SHADER_PATH), Gdx.files.internal(FRAGMENT_SHADER_PATH)); - - if(!shaderProgram.isCompiled()){ - throw new ShaderFailedToLoadException("SingleLightPerPixelPhongShader failed to load.\n" + shaderProgram.getLog()); - } - - return this; - } - - @Override - public void setUniforms(){ - LightSource light = RenderParameters.getLightSource1(); - float[] diffuseColor = {light.getDiffuseColor().r, light.getDiffuseColor().g, light.getDiffuseColor().b, light.getDiffuseColor().a}; - float[] ambientColor = {light.getAmbientColor().r, light.getAmbientColor().g, light.getAmbientColor().b, light.getAmbientColor().a}; - float[] specularColor = {light.getSpecularColor().r, light.getSpecularColor().g, light.getSpecularColor().b, light.getSpecularColor().a}; - float[] position = {light.getPosition().x, light.getPosition().y, light.getPosition().z, 0.0f}; - float[] shinyness = {light.getShinyness()}; - - shaderProgram.setUniformMatrix("u_projTrans", RenderParameters.getModelViewProjectionMatrix()); - shaderProgram.setUniformMatrix("u_geomTrans", RenderParameters.getTransformationMatrix()); - shaderProgram.setUniform4fv("u_lightPos", position, 0, 4); - shaderProgram.setUniform4fv("u_lightDiffuse", diffuseColor, 0, 4); - shaderProgram.setUniform4fv("u_specular", specularColor, 0, 4); - shaderProgram.setUniform4fv("u_ambient", ambientColor, 0, 4); - shaderProgram.setUniform1fv("u_shiny", shinyness, 0, 1); - shaderProgram.setUniformf("u_cameraPos", RenderParameters.getEyePosition()); - } -} diff --git a/src/ve/ucv/ciens/ccg/nxtar/states/InGameState.java b/src/ve/ucv/ciens/ccg/nxtar/states/InGameState.java index 1c55957..bbdcfae 100644 --- a/src/ve/ucv/ciens/ccg/nxtar/states/InGameState.java +++ b/src/ve/ucv/ciens/ccg/nxtar/states/InGameState.java @@ -19,11 +19,7 @@ import ve.ucv.ciens.ccg.networkdata.MotorEvent; import ve.ucv.ciens.ccg.networkdata.MotorEvent.motor_t; import ve.ucv.ciens.ccg.nxtar.NxtARCore; import ve.ucv.ciens.ccg.nxtar.NxtARCore.game_states_t; -import ve.ucv.ciens.ccg.nxtar.entities.EntityCreatorBase; -import ve.ucv.ciens.ccg.nxtar.entities.MarkerTestEntityCreator; import ve.ucv.ciens.ccg.nxtar.graphics.CustomPerspectiveCamera; -import ve.ucv.ciens.ccg.nxtar.graphics.LightSource; -import ve.ucv.ciens.ccg.nxtar.graphics.RenderParameters; import ve.ucv.ciens.ccg.nxtar.interfaces.ImageProcessor.MarkerData; import ve.ucv.ciens.ccg.nxtar.network.monitors.MotorEventQueue; import ve.ucv.ciens.ccg.nxtar.network.monitors.VideoFrameMonitor; @@ -31,6 +27,7 @@ import ve.ucv.ciens.ccg.nxtar.systems.AnimationSystem; import ve.ucv.ciens.ccg.nxtar.systems.MarkerPositioningSystem; import ve.ucv.ciens.ccg.nxtar.systems.MarkerRenderingSystem; import ve.ucv.ciens.ccg.nxtar.systems.ObjectRenderingSystem; +import ve.ucv.ciens.ccg.nxtar.utils.GameSettings; import ve.ucv.ciens.ccg.nxtar.utils.ProjectConstants; import com.artemis.World; @@ -38,7 +35,6 @@ import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Input; import com.badlogic.gdx.controllers.Controller; import com.badlogic.gdx.controllers.mappings.Ouya; -import com.badlogic.gdx.graphics.Color; import com.badlogic.gdx.graphics.GL20; import com.badlogic.gdx.graphics.OrthographicCamera; import com.badlogic.gdx.graphics.Pixmap; @@ -63,11 +59,6 @@ public class InGameState extends BaseState{ private static final float FAR = 100.0f; private static final float FAR_PLUS_NEAR = FAR + NEAR; private static final float FAR_LESS_NEAR = FAR - NEAR; - private static final Vector3 LIGHT_POSITION = new Vector3(2.0f, 2.0f, 4.0f); - private static final Color AMBIENT_COLOR = new Color(0.0f, 0.1f, 0.3f, 1.0f); - private static final Color DIFFUSE_COLOR = new Color(1.0f, 1.0f, 1.0f, 1.0f); - private static final Color SPECULAR_COLOR = new Color(1.0f, 0.8f, 0.0f, 1.0f); - private static final float SHINYNESS = 50.0f; // Background related fields. private float uScaling[]; @@ -83,7 +74,6 @@ public class InGameState extends BaseState{ // Game world objects. private World gameWorld; - private EntityCreatorBase entityCreator; private MarkerRenderingSystem markerRenderingSystem; private ObjectRenderingSystem objectRenderingSystem; @@ -188,17 +178,18 @@ public class InGameState extends BaseState{ frameBuffer = null; perspectiveCamera = null; frameBufferSprite = null; - RenderParameters.setLightSource1(new LightSource(LIGHT_POSITION, AMBIENT_COLOR, DIFFUSE_COLOR, SPECULAR_COLOR, SHINYNESS)); // Set up the game world. gameWorld = new World(); - entityCreator = new MarkerTestEntityCreator(); - entityCreator.setWorld(gameWorld); - entityCreator.createAllEntities(); + GameSettings.initGameSettings(); + GameSettings.entityCreator.setWorld(gameWorld); + GameSettings.entityCreator.createAllEntities(); gameWorld.setSystem(new MarkerPositioningSystem()); gameWorld.setSystem(new AnimationSystem()); + // TODO: Add collision system. + //gameWorld.setSystem(GameSettings.gameLogicSystem); markerRenderingSystem = new MarkerRenderingSystem(modelBatch); objectRenderingSystem = new ObjectRenderingSystem(modelBatch); @@ -313,8 +304,6 @@ public class InGameState extends BaseState{ // Set rendering parameters. perspectiveCamera.update(projectionMatrix, true); - RenderParameters.setModelViewProjectionMatrix(perspectiveCamera.combined); - RenderParameters.setEyePosition(perspectiveCamera.position); // Call rendering systems. markerRenderingSystem.begin(perspectiveCamera, data); @@ -395,8 +384,8 @@ public class InGameState extends BaseState{ if(modelBatch != null) modelBatch.dispose(); - if(entityCreator != null) - entityCreator.dispose(); + if(GameSettings.entityCreator != null) + GameSettings.entityCreator.dispose(); if(videoFrameTexture != null) videoFrameTexture.dispose(); diff --git a/src/ve/ucv/ciens/ccg/nxtar/components/MeshComponent.java b/src/ve/ucv/ciens/ccg/nxtar/systems/BombGameLogicSystem.java similarity index 66% rename from src/ve/ucv/ciens/ccg/nxtar/components/MeshComponent.java rename to src/ve/ucv/ciens/ccg/nxtar/systems/BombGameLogicSystem.java index b96db52..c987bec 100644 --- a/src/ve/ucv/ciens/ccg/nxtar/components/MeshComponent.java +++ b/src/ve/ucv/ciens/ccg/nxtar/systems/BombGameLogicSystem.java @@ -13,15 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package ve.ucv.ciens.ccg.nxtar.components; +package ve.ucv.ciens.ccg.nxtar.systems; -import com.artemis.Component; -import com.badlogic.gdx.graphics.Mesh; +import com.artemis.Aspect; +import com.artemis.Entity; -public class MeshComponent extends Component { - public Mesh model; - - public MeshComponent(Mesh model){ - this.model = model; +public class BombGameLogicSystem extends GameLogicSystemBase { + + @SuppressWarnings("unchecked") + public BombGameLogicSystem(){ + super(Aspect.getAspectForAll(null)); + } + + @Override + protected void process(Entity e){ } } diff --git a/src/ve/ucv/ciens/ccg/nxtar/components/CustomShaderComponent.java b/src/ve/ucv/ciens/ccg/nxtar/systems/GameLogicSystemBase.java similarity index 59% rename from src/ve/ucv/ciens/ccg/nxtar/components/CustomShaderComponent.java rename to src/ve/ucv/ciens/ccg/nxtar/systems/GameLogicSystemBase.java index e66e879..74adcea 100644 --- a/src/ve/ucv/ciens/ccg/nxtar/components/CustomShaderComponent.java +++ b/src/ve/ucv/ciens/ccg/nxtar/systems/GameLogicSystemBase.java @@ -13,19 +13,18 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package ve.ucv.ciens.ccg.nxtar.components; +package ve.ucv.ciens.ccg.nxtar.systems; -import ve.ucv.ciens.ccg.nxtar.graphics.shaders.CustomShaderBase; +import com.artemis.Aspect; +import com.artemis.Entity; +import com.artemis.systems.EntityProcessingSystem; -import com.artemis.Component; +public abstract class GameLogicSystemBase extends EntityProcessingSystem { -public class CustomShaderComponent extends Component { - public CustomShaderBase shader; - - public CustomShaderComponent(CustomShaderBase shader) throws IllegalArgumentException{ - if(shader == null) - throw new IllegalArgumentException("Shader cannot be null."); - - this.shader = shader; + public GameLogicSystemBase(Aspect aspect){ + super(aspect); } + + @Override + protected abstract void process(Entity e); } diff --git a/src/ve/ucv/ciens/ccg/nxtar/graphics/shaders/CustomShaderBase.java b/src/ve/ucv/ciens/ccg/nxtar/utils/GameSettings.java similarity index 53% rename from src/ve/ucv/ciens/ccg/nxtar/graphics/shaders/CustomShaderBase.java rename to src/ve/ucv/ciens/ccg/nxtar/utils/GameSettings.java index 648fb22..000675c 100644 --- a/src/ve/ucv/ciens/ccg/nxtar/graphics/shaders/CustomShaderBase.java +++ b/src/ve/ucv/ciens/ccg/nxtar/utils/GameSettings.java @@ -13,20 +13,19 @@ * See the License for the specific language governing permissions and * limitations under the License. */ -package ve.ucv.ciens.ccg.nxtar.graphics.shaders; +package ve.ucv.ciens.ccg.nxtar.utils; -import ve.ucv.ciens.ccg.nxtar.exceptions.ShaderFailedToLoadException; +import ve.ucv.ciens.ccg.nxtar.entities.EntityCreatorBase; +import ve.ucv.ciens.ccg.nxtar.entities.MarkerTestEntityCreator; +import ve.ucv.ciens.ccg.nxtar.systems.GameLogicSystemBase; -import com.badlogic.gdx.graphics.glutils.ShaderProgram; +public abstract class GameSettings{ + public static EntityCreatorBase entityCreator = null; + public static GameLogicSystemBase gameLogicSystem = null; -public abstract class CustomShaderBase{ - protected ShaderProgram shaderProgram; - - public abstract CustomShaderBase loadShader() throws ShaderFailedToLoadException; - - public abstract void setUniforms(); - - public ShaderProgram getShaderProgram(){ - return this.shaderProgram; + public static void initGameSettings(){ + entityCreator = new MarkerTestEntityCreator(); + gameLogicSystem = null; + //gameLogicSystem = new BombGameLogicSystem(); } }