|
@@ -434,6 +434,17 @@ public class Material implements CloneableSmartAsset, Cloneable, Savable {
|
|
public Collection<MatParam> getParams() {
|
|
public Collection<MatParam> getParams() {
|
|
return paramValues.values();
|
|
return paramValues.values();
|
|
}
|
|
}
|
|
|
|
+
|
|
|
|
+ /**
|
|
|
|
+ * Returns the ListMap of all parameters set on this material.
|
|
|
|
+ *
|
|
|
|
+ * @return a ListMap of all parameters set on this material.
|
|
|
|
+ *
|
|
|
|
+ * @see #setParam(java.lang.String, com.jme3.shader.VarType, java.lang.Object)
|
|
|
|
+ */
|
|
|
|
+ public ListMap getParamsMap() {
|
|
|
|
+ return paramValues;
|
|
|
|
+ }
|
|
|
|
|
|
/**
|
|
/**
|
|
* Check if setting the parameter given the type and name is allowed.
|
|
* Check if setting the parameter given the type and name is allowed.
|
|
@@ -882,6 +893,12 @@ public class Material implements CloneableSmartAsset, Cloneable, Savable {
|
|
// When choosing technique, we choose one that
|
|
// When choosing technique, we choose one that
|
|
// supports all the caps.
|
|
// supports all the caps.
|
|
EnumSet<Caps> rendererCaps = renderManager.getRenderer().getCaps();
|
|
EnumSet<Caps> rendererCaps = renderManager.getRenderer().getCaps();
|
|
|
|
+
|
|
|
|
+ //workaround, always assume we support GLSL100
|
|
|
|
+ //some cards just don't report this correctly
|
|
|
|
+ if( rendererCaps.contains(Caps.GLSL100) == false )
|
|
|
|
+ rendererCaps.add(Caps.GLSL100);
|
|
|
|
+
|
|
if (tech == null) {
|
|
if (tech == null) {
|
|
|
|
|
|
if (name.equals("Default")) {
|
|
if (name.equals("Default")) {
|