cubemaster21
/
Chuck-Proto
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Added capabilities for multiple light sources

Browse Source
master
Edward Peterson 9 years ago
parent 11679c2ffd
commit 6b98c2f0e3
5 changed files with 110 additions and 27 deletions
Show Stats Download Patch File Download Diff File

35
core/assets/Fragment.frag
Unescape Escape View File

@ -1,22 +1,43 @@
#version 410 core
//SpriteBatch will use texture unit 0 //SpriteBatch will use texture unit 0
uniform sampler2D u_texture; uniform sampler2D u_texture;
uniform vec2 u_screenResolution; uniform vec2 u_screenResolution;
uniform vec2 u_lightCoord[50];
uniform float u_lightIntensity[50];
uniform int u_actualLights;
//"in" varyings from our vertex shader //"in" varyings from our vertex shader
varying vec4 vColor; varying vec4 vColor;
varying vec2 vTexCoord; varying vec2 vTexCoord;
float getDistance(float x1, float y1, float x2, float y2){
float dx = x2 - x1;
float dy = y2 - y1;
float dis = sqrt(dx * dx + dy * dy);
return dis;
}
void main() { void main() {
//sample the texture //sample the texture
vec4 texColor = texture2D(u_texture, vTexCoord); vec4 texColor = texture2D(u_texture, vTexCoord);
float dx = u_screenResolution.x / 2.0 - gl_FragCoord.x;
float dy = u_screenResolution.y / 2.0 - gl_FragCoord.y; float dis = getDistance(u_screenResolution.x / 2.0, u_screenResolution.y / 2.0, gl_FragCoord.x, gl_FragCoord.y);
float dxi = u_screenResolution.x / 2.0; float disFull = getDistance(u_screenResolution.x / 2.0, u_screenResolution.y / 2.0, 0, 0);
float dyi = u_screenResolution.y / 2.0;
float dis = sqrt(dx * dx + dy * dy);
float disFull = sqrt(dxi * dxi + dyi * dyi);
float disSq = (1-(dis / disFull)); float disSq = (1-(dis / disFull));
texColor.rgb = texColor.rgb * disSq * disSq * disSq * disSq * disSq;
//Distance is measured in pixels
float brightest = 0;
for(int i = 0;i < u_actualLights;i++){
float dis2Light = getDistance(gl_FragCoord.x, gl_FragCoord.y, u_lightCoord[i].x, u_lightCoord[i].y);
float dis2Light2 = (1-(min(dis2Light/(disFull * u_lightIntensity[i]), 1)));
brightest = brightest + dis2Light2 - brightest * dis2Light2;
}
texColor.rgb = texColor.rgb * (pow(brightest, 10));
//final color //final color
gl_FragColor = texColor * vColor; gl_FragColor = texColor * vColor;
} }

16
core/assets/testmap.tmx
Unescape Escape View File

@ -1,5 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<map version="1.0" orientation="orthogonal" renderorder="right-up" width="50" height="50" tilewidth="16" tileheight="16" nextobjectid="66"> <map version="1.0" orientation="orthogonal" renderorder="right-up" width="50" height="50" tilewidth="16" tileheight="16" nextobjectid="78">
<tileset firstgid="1" name="env" tilewidth="16" tileheight="16" tilecount="64" columns="8"> <tileset firstgid="1" name="env" tilewidth="16" tileheight="16" tilecount="64" columns="8">
<image source="env.png" width="128" height="128"/> <image source="env.png" width="128" height="128"/>
</tileset> </tileset>
@ -112,4 +112,18 @@
<object id="63" x="608" y="352" width="192" height="40"/> <object id="63" x="608" y="352" width="192" height="40"/>
<object id="65" x="608" y="240" width="48" height="112"/> <object id="65" x="608" y="240" width="48" height="112"/>
</objectgroup> </objectgroup>
<objectgroup name="lights">
<object id="66" x="384" y="624"/>
<object id="67" x="576" y="624"/>
<object id="68" x="576" y="752"/>
<object id="69" x="384" y="752"/>
<object id="70" x="512" y="544"/>
<object id="71" x="512" y="416"/>
<object id="72" x="784" y="416"/>
<object id="73" x="784" y="768"/>
<object id="74" x="640" y="768"/>
<object id="75" x="384" y="336"/>
<object id="76" x="352" y="304"/>
<object id="77" x="416" y="304"/>
</objectgroup>
</map> </map>

23
core/src/com/toasted/chuck/ChuckGame.java
Unescape Escape View File

@ -12,10 +12,10 @@ import com.badlogic.gdx.maps.MapLayer;
import com.badlogic.gdx.maps.MapObject; import com.badlogic.gdx.maps.MapObject;
import com.badlogic.gdx.maps.objects.RectangleMapObject; import com.badlogic.gdx.maps.objects.RectangleMapObject;
import com.badlogic.gdx.maps.tiled.TiledMap; import com.badlogic.gdx.maps.tiled.TiledMap;
import com.badlogic.gdx.maps.tiled.TiledMapRenderer;
import com.badlogic.gdx.maps.tiled.TmxMapLoader; import com.badlogic.gdx.maps.tiled.TmxMapLoader;
import com.badlogic.gdx.maps.tiled.renderers.OrthogonalTiledMapRenderer; import com.badlogic.gdx.maps.tiled.renderers.OrthogonalTiledMapRenderer;
import com.badlogic.gdx.math.Rectangle; import com.badlogic.gdx.math.Rectangle;
import com.badlogic.gdx.math.Vector2;
public class ChuckGame extends ApplicationAdapter implements InputProcessor{ public class ChuckGame extends ApplicationAdapter implements InputProcessor{
Graphics graphics; Graphics graphics;
@ -25,6 +25,8 @@ public class ChuckGame extends ApplicationAdapter implements InputProcessor{
TiledMap tiledMap; TiledMap tiledMap;
OrthogonalTiledMapRenderer tmRenderer; OrthogonalTiledMapRenderer tmRenderer;
ArrayList<Rectangle> collisions = new ArrayList<Rectangle>(); ArrayList<Rectangle> collisions = new ArrayList<Rectangle>();
ArrayList<Light> lights = new ArrayList<Light>();
Light playerLight;
@Override @Override
public void create () { public void create () {
Gdx.input.setInputProcessor(this); Gdx.input.setInputProcessor(this);
@ -43,6 +45,9 @@ public class ChuckGame extends ApplicationAdapter implements InputProcessor{
}; };
tiledMap = new TmxMapLoader().load("testmap.tmx"); tiledMap = new TmxMapLoader().load("testmap.tmx");
tmRenderer = new OrthogonalTiledMapRenderer(tiledMap, graphics.getBatch()); tmRenderer = new OrthogonalTiledMapRenderer(tiledMap, graphics.getBatch());
playerLight = new Light(8, 8, 1);
lights.add(playerLight);
lights.add(new Light( 100, 100, .3f));
MapLayer ml = tiledMap.getLayers().get("collisions"); MapLayer ml = tiledMap.getLayers().get("collisions");
for(MapObject o: ml.getObjects()){ for(MapObject o: ml.getObjects()){
@ -51,7 +56,14 @@ public class ChuckGame extends ApplicationAdapter implements InputProcessor{
collisions.add(r); collisions.add(r);
} }
MapLayer lightLayer = tiledMap.getLayers().get("lights");
Vector2 t = new Vector2();
for(MapObject o: lightLayer.getObjects()){
RectangleMapObject rmo = (RectangleMapObject) o;
t = new Rectangle(rmo.getRectangle()).getCenter(t);
lights.add(new Light(t.x, t.y, .3f));
}
} }
@ -59,13 +71,13 @@ public class ChuckGame extends ApplicationAdapter implements InputProcessor{
@Override @Override
public void render () { public void render () {
// player.update(Gdx.graphics.getDeltaTime(), entities);
for(Entity e: entities){ for(Entity e: entities){
e.update(Gdx.graphics.getDeltaTime(), entities, collisions); e.update(Gdx.graphics.getDeltaTime(), entities, collisions);
} }
Collections.sort(entities, zSorter); Collections.sort(entities, zSorter);
playerLight.position.x = player.position.x + 8;
playerLight.position.y = player.position.y + 8;
// graphics.cam.lookAt(player.position.x, player.position.y, 0);
graphics.cam.position.x = player.position.x + 8; graphics.cam.position.x = player.position.x + 8;
graphics.cam.position.y = player.position.y + 8; graphics.cam.position.y = player.position.y + 8;
@ -73,21 +85,20 @@ public class ChuckGame extends ApplicationAdapter implements InputProcessor{
graphics.prepare(); graphics.prepare();
graphics.passLightsToShader(lights);
Gdx.gl.glClearColor(0, 0, 0, 1); Gdx.gl.glClearColor(0, 0, 0, 1);
Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT); Gdx.gl.glClear(GL20.GL_COLOR_BUFFER_BIT);
tmRenderer.setView(graphics.cam); tmRenderer.setView(graphics.cam);
tmRenderer.render(); tmRenderer.render();
graphics.startSprite(); graphics.startSprite();
// tmRenderer.getBatch().setShader(graphics.shader);
// player.draw(graphics);
for(Entity e: entities){ for(Entity e: entities){
if(e.shouldDrawSelf) if(e.shouldDrawSelf)
e.draw(graphics); e.draw(graphics);
} }
graphics.endSprite(); graphics.endSprite();
// graphics.endShapes(); System.out.println("FPS:" + Gdx.graphics.getFramesPerSecond());
} }
@Override @Override

40
core/src/com/toasted/chuck/Graphics.java
Unescape Escape View File

@ -1,5 +1,7 @@
package com.toasted.chuck; package com.toasted.chuck;
import java.util.ArrayList;
import com.badlogic.gdx.Gdx; import com.badlogic.gdx.Gdx;
import com.badlogic.gdx.files.FileHandle; import com.badlogic.gdx.files.FileHandle;
import com.badlogic.gdx.graphics.OrthographicCamera; import com.badlogic.gdx.graphics.OrthographicCamera;
@ -8,6 +10,7 @@ import com.badlogic.gdx.graphics.glutils.ShaderProgram;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer; import com.badlogic.gdx.graphics.glutils.ShapeRenderer;
import com.badlogic.gdx.graphics.glutils.ShapeRenderer.ShapeType; import com.badlogic.gdx.graphics.glutils.ShapeRenderer.ShapeType;
import com.badlogic.gdx.math.Vector2; import com.badlogic.gdx.math.Vector2;
import com.badlogic.gdx.math.Vector3;
public class Graphics { public class Graphics {
private SpriteBatch spriteBatch; private SpriteBatch spriteBatch;
@ -16,6 +19,10 @@ public class Graphics {
final FileHandle VERTEX = Gdx.files.internal("Vertex.vert"); final FileHandle VERTEX = Gdx.files.internal("Vertex.vert");
final FileHandle FRAGMENT = Gdx.files.internal("Fragment.frag"); final FileHandle FRAGMENT = Gdx.files.internal("Fragment.frag");
final int orthoX = 16 * 28;
final int orthoY = 9 * 28;
final float orthoScale = orthoX / (float)getWidth();
ShaderProgram shader = new ShaderProgram(VERTEX, FRAGMENT); ShaderProgram shader = new ShaderProgram(VERTEX, FRAGMENT);
public Graphics(){ public Graphics(){
@ -23,7 +30,7 @@ public class Graphics {
spriteBatch = new SpriteBatch(); spriteBatch = new SpriteBatch();
shapeRenderer = new ShapeRenderer(); shapeRenderer = new ShapeRenderer();
cam.setToOrtho(false, 16 * 28, 9 * 28); cam.setToOrtho(false, orthoX, orthoY);
} }
public int getWidth(){ public int getWidth(){
@ -32,6 +39,7 @@ public class Graphics {
public int getHeight(){ public int getHeight(){
return Gdx.graphics.getHeight(); return Gdx.graphics.getHeight();
} }
public void startShapes(ShapeType shapeType){ public void startShapes(ShapeType shapeType){
shapeRenderer.begin(shapeType); shapeRenderer.begin(shapeType);
} }
@ -54,18 +62,30 @@ public class Graphics {
shapeRenderer.setProjectionMatrix(cam.combined); shapeRenderer.setProjectionMatrix(cam.combined);
spriteBatch.setProjectionMatrix(cam.combined); spriteBatch.setProjectionMatrix(cam.combined);
System.out.println(shader.getLog());
spriteBatch.setShader(shader); spriteBatch.setShader(shader);
System.out.println(shader.getUniforms());
// for(String s: shader.getUniforms()){
// System.out.println(s);
// }
// System.out.println(shader.getFragmentShaderSource());
// shader.begin();
shader.begin();
// shader.setUniform2fv("u_resolution", new float[]{(float) getWidth(), (float) getHeight()}, 0, 2); if(!shader.isCompiled()){
System.err.println(shader.getLog());
}
shader.begin();
shader.setUniformf("u_screenResolution", new Vector2(getWidth(), getHeight())); shader.setUniformf("u_screenResolution", new Vector2(getWidth(), getHeight()));
} }
public void passLightsToShader(ArrayList<Light> lights){
if(lights.size() > 50){ // if there are too many to do
} else {
shader.setUniformi("u_actualLights", lights.size());
int loc = shader.getUniformLocation("u_lightCoord[" + 0 + "]");
int locIn = shader.getUniformLocation("u_lightIntensity[0]");
for(int i = 0;i < lights.size();i++){
Vector3 v3 = cam.project(new Vector3(lights.get(i).position.x, lights.get(i).position.y, 0));
Vector2 v = new Vector2(v3.x, v3.y);
shader.setUniformf(loc + i, v);
shader.setUniformf(locIn + i, lights.get(i).intensity);
}
}
}
} }

17
core/src/com/toasted/chuck/Light.java
Unescape Escape View File

@ -0,0 +1,17 @@
package com.toasted.chuck;
import com.badlogic.gdx.math.Vector2;
public class Light {
private static Vector2 tmp = new Vector2();
Vector2 position;
float intensity = 1;
public Light(float x, float y, float intensity){
position = new Vector2(x, y);
this.intensity = intensity;
}
public Vector2 getScreenPos(float cx, float cy){
return tmp.set(position).sub(cx, cy);
}
}
Write Preview
Loading…
Cancel
Save