|
|
@ -421,7 +421,8 @@ public class Image extends NativeObject implements Savable /*, Cloneable*/ { |
|
|
|
|
|
|
|
|
|
|
|
/** |
|
|
|
/** |
|
|
|
* @return True if the image needs to have mipmaps generated |
|
|
|
* @return True if the image needs to have mipmaps generated |
|
|
|
* for it (as requested by the texture). |
|
|
|
* for it (as requested by the texture). This stays true even |
|
|
|
|
|
|
|
* after mipmaps have been generated. |
|
|
|
*/ |
|
|
|
*/ |
|
|
|
public boolean isGeneratedMipmapsRequired() { |
|
|
|
public boolean isGeneratedMipmapsRequired() { |
|
|
|
return needGeneratedMips; |
|
|
|
return needGeneratedMips; |
|
|
@ -434,8 +435,9 @@ public class Image extends NativeObject implements Savable /*, Cloneable*/ { |
|
|
|
@Override |
|
|
|
@Override |
|
|
|
public void setUpdateNeeded() { |
|
|
|
public void setUpdateNeeded() { |
|
|
|
super.setUpdateNeeded(); |
|
|
|
super.setUpdateNeeded(); |
|
|
|
if (!isGeneratedMipmapsRequired() && !hasMipmaps()) { |
|
|
|
if (isGeneratedMipmapsRequired() && !hasMipmaps()) { |
|
|
|
setNeedGeneratedMipmaps(); |
|
|
|
// Mipmaps are no longer valid, since the image was changed.
|
|
|
|
|
|
|
|
setMipmapsGenerated(false); |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
@ -527,11 +529,13 @@ public class Image extends NativeObject implements Savable /*, Cloneable*/ { |
|
|
|
|
|
|
|
|
|
|
|
this(); |
|
|
|
this(); |
|
|
|
|
|
|
|
|
|
|
|
if (mipMapSizes != null && mipMapSizes.length <= 1) { |
|
|
|
if (mipMapSizes != null) { |
|
|
|
mipMapSizes = null; |
|
|
|
if (mipMapSizes.length <= 1) { |
|
|
|
} else { |
|
|
|
mipMapSizes = null; |
|
|
|
needGeneratedMips = false; |
|
|
|
} else { |
|
|
|
mipsWereGenerated = true; |
|
|
|
needGeneratedMips = false; |
|
|
|
|
|
|
|
mipsWereGenerated = true; |
|
|
|
|
|
|
|
} |
|
|
|
} |
|
|
|
} |
|
|
|
|
|
|
|
|
|
|
|
setFormat(format); |
|
|
|
setFormat(format); |
|
|
|