Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Add normal maps to terrains and models #63

Merged
merged 6 commits into from
Jul 3, 2022
Merged

Add normal maps to terrains and models #63

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f0a2f29
Add normal maps to terrain
JamesTKhan Jun 29, 2022
7437235
Separate base normal logic.
JamesTKhan Jun 29, 2022
6aaca55
Update changes file
JamesTKhan Jun 30, 2022
4dbdb96
Remove normal map when remove diffuse texture
JamesTKhan Jun 30, 2022
122035f
Add normal mapping for models
JamesTKhan Jun 30, 2022
2f08b74
Fix normal map sampling
JamesTKhan Jun 30, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 10 additions & 1 deletion commons/src/main/com/mbrlabs/mundus/commons/assets/MaterialAsset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -111,6 +111,11 @@ public Material applyToMaterial(Material material) {
} else {
material.remove(TextureAttribute.Diffuse);
}
if (normalMap != null) {
material.set(new TextureAttribute(TextureAttribute.Normal, normalMap.getTexture()));
} else {
material.remove(TextureAttribute.Normal);
}
material.set(new FloatAttribute(FloatAttribute.Shininess, shininess));

return material;
Expand Down Expand Up @@ -138,7 +143,11 @@ public TextureAsset getNormalMap() {

public void setNormalMap(TextureAsset normalMap) {
this.normalMap = normalMap;
normalMapID = normalMap.getID();
if (normalMap != null) {
this.normalMapID = normalMap.getID();
} else {
this.normalMapID = null;
}
}

public TextureAsset getDiffuseTexture() {
Expand Down
126 changes: 126 additions & 0 deletions commons/src/main/com/mbrlabs/mundus/commons/assets/TerrainAsset.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -46,6 +46,11 @@ public class TerrainAsset extends Asset {
private TextureAsset splatG;
private TextureAsset splatB;
private TextureAsset splatA;
private TextureAsset splatBaseNormal;
private TextureAsset splatRNormal;
private TextureAsset splatBNormal;
private TextureAsset splatGNormal;
private TextureAsset splatANormal;

private Terrain terrain;

Expand Down Expand Up @@ -137,6 +142,71 @@ public void setSplatA(TextureAsset splatA) {
}
}

public TextureAsset getSplatBaseNormal() {
return splatBaseNormal;
}

public void setSplatBaseNormal(TextureAsset splatBaseNormal) {
this.splatBaseNormal = splatBaseNormal;
if (splatBaseNormal == null) {
meta.getTerrain().setSplatBaseNormal(null);
} else {
meta.getTerrain().setSplatBaseNormal(splatBaseNormal.getID());
}
}

public TextureAsset getSplatRNormal() {
return splatRNormal;
}

public void setSplatRNormal(TextureAsset splatRNormal) {
this.splatRNormal = splatRNormal;
if (splatRNormal == null) {
meta.getTerrain().setSplatRNormal(null);
} else {
meta.getTerrain().setSplatRNormal(splatRNormal.getID());
}
}

public TextureAsset getSplatBNormal() {
return splatBNormal;
}

public void setSplatBNormal(TextureAsset splatBNormal) {
this.splatBNormal = splatBNormal;
if (splatBNormal == null) {
meta.getTerrain().setSplatBNormal(null);
} else {
meta.getTerrain().setSplatBNormal(splatBNormal.getID());
}
}

public TextureAsset getSplatGNormal() {
return splatGNormal;
}

public void setSplatGNormal(TextureAsset splatGNormal) {
this.splatGNormal = splatGNormal;
if (splatGNormal == null) {
meta.getTerrain().setSplatGNormal(null);
} else {
meta.getTerrain().setSplatGNormal(splatGNormal.getID());
}
}

public TextureAsset getSplatANormal() {
return splatANormal;
}

public void setSplatANormal(TextureAsset splatANormal) {
this.splatANormal = splatANormal;
if (splatANormal == null) {
meta.getTerrain().setSplatANormal(null);
} else {
meta.getTerrain().setSplatANormal(splatANormal.getID());
}
}

public Terrain getTerrain() {
return terrain;
}
Expand Down Expand Up @@ -210,6 +280,36 @@ public void resolveDependencies(Map<String, Asset> assets) {
if (id != null && assets.containsKey(id)) {
setSplatA((TextureAsset) assets.get(id));
}

// splat normal channel base
id = meta.getTerrain().getSplatBaseNormal();
if (id != null && assets.containsKey(id)) {
setSplatBaseNormal((TextureAsset) assets.get(id));
}

// splat normal channel r
id = meta.getTerrain().getSplatRNormal();
if (id != null && assets.containsKey(id)) {
setSplatRNormal((TextureAsset) assets.get(id));
}

// splat normal channel g
id = meta.getTerrain().getSplatGNormal();
if (id != null && assets.containsKey(id)) {
setSplatGNormal((TextureAsset) assets.get(id));
}

// splat normal channel b
id = meta.getTerrain().getSplatBNormal();
if (id != null && assets.containsKey(id)) {
setSplatBNormal((TextureAsset) assets.get(id));
}

// splat normal channel a
id = meta.getTerrain().getSplatANormal();
if (id != null && assets.containsKey(id)) {
setSplatANormal((TextureAsset) assets.get(id));
}
}

@Override
Expand Down Expand Up @@ -247,6 +347,32 @@ public void applyDependencies() {
terrainTexture.setSplatTexture(new SplatTexture(SplatTexture.Channel.A, splatA));
}

if (splatBaseNormal == null) {
terrainTexture.removeNormalTexture(SplatTexture.Channel.BASE);
} else {
terrainTexture.setSplatNormalTexture(new SplatTexture(SplatTexture.Channel.BASE, splatBaseNormal));
}
if (splatRNormal == null) {
terrainTexture.removeNormalTexture(SplatTexture.Channel.R);
} else {
terrainTexture.setSplatNormalTexture(new SplatTexture(SplatTexture.Channel.R, splatRNormal));
}
if (splatGNormal == null) {
terrainTexture.removeNormalTexture(SplatTexture.Channel.G);
} else {
terrainTexture.setSplatNormalTexture(new SplatTexture(SplatTexture.Channel.G, splatGNormal));
}
if (splatBNormal == null) {
terrainTexture.removeNormalTexture(SplatTexture.Channel.B);
} else {
terrainTexture.setSplatNormalTexture(new SplatTexture(SplatTexture.Channel.B, splatBNormal));
}
if (splatANormal == null) {
terrainTexture.removeNormalTexture(SplatTexture.Channel.A);
} else {
terrainTexture.setSplatNormalTexture(new SplatTexture(SplatTexture.Channel.A, splatANormal));
}

terrain.update();
}

Expand Down
5 changes: 5 additions & 0 deletions commons/src/main/com/mbrlabs/mundus/commons/assets/meta/MetaLoader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -66,6 +66,11 @@ private void parseTerrain(Meta meta, JsonValue jsonTerrain) {
terrain.setSplatG(jsonTerrain.getString(MetaTerrain.JSON_SPLAT_G, null));
terrain.setSplatB(jsonTerrain.getString(MetaTerrain.JSON_SPLAT_B, null));
terrain.setSplatA(jsonTerrain.getString(MetaTerrain.JSON_SPLAT_A, null));
terrain.setSplatBaseNormal(jsonTerrain.getString(MetaTerrain.JSON_SPLAT_BASE_NORMAL, null));
terrain.setSplatRNormal(jsonTerrain.getString(MetaTerrain.JSON_SPLAT_R_NORMAL, null));
terrain.setSplatGNormal(jsonTerrain.getString(MetaTerrain.JSON_SPLAT_G_NORMAL, null));
terrain.setSplatBNormal(jsonTerrain.getString(MetaTerrain.JSON_SPLAT_B_NORMAL, null));
terrain.setSplatANormal(jsonTerrain.getString(MetaTerrain.JSON_SPLAT_A_NORMAL, null));

meta.setTerrain(terrain);
}
Expand Down
55 changes: 55 additions & 0 deletions commons/src/main/com/mbrlabs/mundus/commons/assets/meta/MetaTerrain.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -31,6 +31,11 @@ public class MetaTerrain {
public static final String JSON_SPLAT_G = "g";
public static final String JSON_SPLAT_B = "b";
public static final String JSON_SPLAT_A = "a";
public static final String JSON_SPLAT_BASE_NORMAL = "baseNorm";
public static final String JSON_SPLAT_R_NORMAL = "rNorm";
public static final String JSON_SPLAT_G_NORMAL = "gNorm";
public static final String JSON_SPLAT_B_NORMAL = "bNorm";
public static final String JSON_SPLAT_A_NORMAL = "aNorm";
public static final String JSON_UV_SCALE= "uv";

private int size;
Expand All @@ -42,6 +47,11 @@ public class MetaTerrain {
private String splatG;
private String splatB;
private String splatA;
private String splatBaseNormal;
private String splatRNormal;
private String splatGNormal;
private String splatBNormal;
private String splatANormal;

public String getSplatmap() {
return splatmap;
Expand Down Expand Up @@ -115,6 +125,46 @@ public void setUv(float uv) {
this.uv = uv;
}

public String getSplatBaseNormal() {
return splatBaseNormal;
}

public void setSplatBaseNormal(String splatBaseNormal) {
this.splatBaseNormal = splatBaseNormal;
}

public String getSplatRNormal() {
return splatRNormal;
}

public void setSplatRNormal(String splatRNormal) {
this.splatRNormal = splatRNormal;
}

public String getSplatGNormal() {
return splatGNormal;
}

public void setSplatGNormal(String splatGNormal) {
this.splatGNormal = splatGNormal;
}

public String getSplatBNormal() {
return splatBNormal;
}

public void setSplatBNormal(String splatBNormal) {
this.splatBNormal = splatBNormal;
}

public String getSplatANormal() {
return splatANormal;
}

public void setSplatANormal(String splatANormal) {
this.splatANormal = splatANormal;
}

@Override
public String toString() {
return "MetaTerrain{" +
Expand All @@ -127,6 +177,11 @@ public String toString() {
", splatG='" + splatG + '\'' +
", splatB='" + splatB + '\'' +
", splatA='" + splatA + '\'' +
", splatBaseNormal='" + splatBaseNormal + '\'' +
", splatRNormal='" + splatRNormal + '\'' +
", splatGNormal='" + splatGNormal + '\'' +
", splatBNormal='" + splatBNormal + '\'' +
", splatANormal='" + splatANormal + '\'' +
'}';
}
}
15 changes: 15 additions & 0 deletions commons/src/main/com/mbrlabs/mundus/commons/shaders/ModelShader.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@
import com.badlogic.gdx.graphics.g3d.attributes.TextureAttribute;
import com.badlogic.gdx.graphics.g3d.utils.RenderContext;
import com.badlogic.gdx.graphics.glutils.ShaderProgram;
import com.badlogic.gdx.math.Matrix3;
import com.mbrlabs.mundus.commons.env.Fog;
import com.mbrlabs.mundus.commons.env.MundusEnvironment;
import com.mbrlabs.mundus.commons.utils.ShaderUtils;
Expand All @@ -41,18 +42,23 @@ public class ModelShader extends LightShader {
// ============================ MATERIALS ============================
protected final int UNIFORM_MATERIAL_DIFFUSE_TEXTURE = register(new Uniform("u_diffuseTexture"));
protected final int UNIFORM_MATERIAL_DIFFUSE_USE_TEXTURE = register(new Uniform("u_diffuseUseTexture"));
protected final int UNIFORM_MATERIAL_NORMAL_TEXTURE = register(new Uniform("u_normalTexture"));
protected final int UNIFORM_MATERIAL_NORMAL_USE_TEXTURE = register(new Uniform("u_useNormalMap"));


// ============================ MATRICES & CAM POSITION ============================
protected final int UNIFORM_PROJ_VIEW_MATRIX = register(new Uniform("u_projViewMatrix"));
protected final int UNIFORM_TRANS_MATRIX = register(new Uniform("u_transMatrix"));
protected final int UNIFORM_NORMAL_MATRIX = register(new Uniform("u_normalMatrix"));
protected final int UNIFORM_CAM_POS = register(new Uniform("u_camPos"));

// ============================ FOG ============================
protected final int UNIFORM_FOG_DENSITY = register(new Uniform("u_fogDensity"));
protected final int UNIFORM_FOG_GRADIENT = register(new Uniform("u_fogGradient"));
protected final int UNIFORM_FOG_COLOR = register(new Uniform("u_fogColor"));

private final Matrix3 tmpM = new Matrix3();

private ShaderProgram program;

public ModelShader() {
Expand Down Expand Up @@ -97,9 +103,11 @@ public void render(Renderable renderable) {

setLights(env);
set(UNIFORM_TRANS_MATRIX, renderable.worldTransform);
set(UNIFORM_NORMAL_MATRIX, tmpM.set(renderable.worldTransform).inv().transpose());

// texture uniform
TextureAttribute diffuseTexture = ((TextureAttribute) (renderable.material.get(TextureAttribute.Diffuse)));
TextureAttribute normalMap = ((TextureAttribute) (renderable.material.get(TextureAttribute.Normal)));
ColorAttribute diffuseColor = ((ColorAttribute) (renderable.material.get(ColorAttribute.Diffuse)));

if (diffuseTexture != null) {
Expand All @@ -109,6 +117,13 @@ public void render(Renderable renderable) {
set(UNIFORM_MATERIAL_DIFFUSE_USE_TEXTURE, 0);
}

if (normalMap != null) {
set(UNIFORM_MATERIAL_NORMAL_TEXTURE, normalMap.textureDescription.texture);
set(UNIFORM_MATERIAL_NORMAL_USE_TEXTURE, 1);
} else {
set(UNIFORM_MATERIAL_NORMAL_USE_TEXTURE, 0);
}

set(UNIFORM_USE_MATERIAL, 1); // Use material for lighting
set(UNIFORM_MATERIAL_DIFFUSE_COLOR, diffuseColor.color.r, diffuseColor.color.g, diffuseColor.color.b);

Expand Down
Loading