sigonasr2/jmonkeyengine
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Fixed formatting thanks to EmpirePhoenix

Browse Source
This commit is contained in:
michael 2015-02-28 16:45:18 +01:00
parent a59f017710
commit 99d69d1d01
7 changed files with 330 additions and 332 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitignore vendored
View File

@ -131,5 +131,3 @@
!/jme3-bullet-native/libs/native/osx/x86_64/libbulletjme.dylib !/jme3-bullet-native/libs/native/osx/x86_64/libbulletjme.dylib
!/jme3-bullet-native/libs/native/linux/x86/libbulletjme.so !/jme3-bullet-native/libs/native/linux/x86/libbulletjme.so
!/jme3-bullet-native/libs/native/linux/x86_64/libbulletjme.so !/jme3-bullet-native/libs/native/linux/x86_64/libbulletjme.so
*.iml
/.idea/*

2
jme3-core/src/main/java/com/jme3/asset/cache/WeakRefCloneAssetCache.java vendored
View File

@ -33,7 +33,6 @@ package com.jme3.asset.cache;
import com.jme3.asset.AssetKey; import com.jme3.asset.AssetKey;
import com.jme3.asset.CloneableSmartAsset; import com.jme3.asset.CloneableSmartAsset;
import java.lang.ref.PhantomReference; import java.lang.ref.PhantomReference;
import java.lang.ref.ReferenceQueue; import java.lang.ref.ReferenceQueue;
import java.lang.ref.WeakReference; import java.lang.ref.WeakReference;
@ -124,6 +123,7 @@ public class WeakRefCloneAssetCache implements AssetCache {
public <T> void addToCache(AssetKey<T> originalKey, T obj) { public <T> void addToCache(AssetKey<T> originalKey, T obj) {
// Make room for new asset // Make room for new asset
removeCollectedAssets(); removeCollectedAssets();
CloneableSmartAsset asset = (CloneableSmartAsset) obj; CloneableSmartAsset asset = (CloneableSmartAsset) obj;
// No circular references, since the original asset is // No circular references, since the original asset is

2
jme3-core/src/main/java/com/jme3/material/TechniqueDef.java
View File

@ -50,8 +50,6 @@ public class TechniqueDef implements Savable {
*/ */
public static final int SAVABLE_VERSION = 1; public static final int SAVABLE_VERSION = 1;
/** /**
* Describes light rendering mode. * Describes light rendering mode.
*/ */

1
jme3-core/src/main/java/com/jme3/renderer/Caps.java
View File

@ -315,6 +315,7 @@ public enum Caps {
* Supports 32-bit index buffers. * Supports 32-bit index buffers.
*/ */
IntegerIndexBuffer, IntegerIndexBuffer,
/** /**
* Partial support for non-power-of-2 textures, typically found * Partial support for non-power-of-2 textures, typically found
* on OpenGL ES 2 devices. * on OpenGL ES 2 devices.

3
jme3-core/src/plugins/java/com/jme3/material/plugins/J3MLoader.java
View File

@ -222,7 +222,7 @@ public class J3MLoader implements AssetLoader {
} }
} }
// <TYPE> <NAME> [ "(" <FFBINDING> ")" ] [ ":" <DEFAULTVAL> ] [-LINEAR] // <TYPE> <NAME> [ "(" <FFBINDING> ")" ] [-LINEAR] [ ":" <DEFAULTVAL> ]
private void readParam(String statement) throws IOException{ private void readParam(String statement) throws IOException{
String name; String name;
String defaultVal = null; String defaultVal = null;
@ -240,6 +240,7 @@ public class J3MLoader implements AssetLoader {
statement = split[0].trim(); statement = split[0].trim();
defaultVal = split[1].trim(); defaultVal = split[1].trim();
} }
if (statement.endsWith("-LINEAR")) { if (statement.endsWith("-LINEAR")) {
colorSpace = ColorSpace.Linear; colorSpace = ColorSpace.Linear;
statement = statement.substring(0, statement.length() - "-LINEAR".length()); statement = statement.substring(0, statement.length() - "-LINEAR".length());