support Chinese characters

README.md

@@ -1,3 +1,10 @@
+The original author doesn't maintain vis-editor any more and also reject any pull request for the editor, so I fork his repository to work on for my game.
+原作者已不再维护vis-editor，本分支上的维护用于我自己的游戏。
+
+Install to Maven Local repository (default localtion is ~/.m2/repository/)
+===
+./gradelw clean install
+
 VisEditor
 =========
 

build-editor.gradle

@@ -2,6 +2,7 @@ buildscript {
     ext.kotlinVersion = '1.1.1'
 
     repositories {
+        mavenLocal()
         mavenCentral()
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
         maven { url "https://plugins.gradle.org/m2/" }
@@ -53,6 +54,7 @@ allprojects {
     }
 
     repositories {
+        mavenLocal()
         mavenCentral()
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
         maven { url "https://oss.sonatype.org/content/repositories/releases/" }

build.gradle

@@ -1,8 +1,10 @@
 buildscript {
-    ext.kotlinVersion = '1.1.1'
+    ext.kotlinVersion = '1.2.20'
 
     repositories {
+        mavenLocal()
         mavenCentral()
+        maven { url "http://maven.aliyun.com/nexus/content/groups/public"}
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
         maven { url "https://plugins.gradle.org/m2/" }
     }
@@ -25,6 +27,7 @@ allprojects {
     apply plugin: "java"
     apply plugin: "nebula.provided-base"
     apply plugin: "nebula.optional-base"
+    apply plugin: "maven"
 
     ext {
         appName = 'vis'
@@ -37,12 +40,21 @@ allprojects {
     }
 
     repositories {
+        mavenLocal()
         mavenCentral()
         maven { url "https://oss.sonatype.org/content/repositories/snapshots/" }
         maven { url "https://oss.sonatype.org/content/repositories/releases/" }
     }
 }
 
+publishing {
+    publications {
+        mavenJava(MavenPublication) {
+            from components.java
+        }
+    }
+}
+
 nexusStaging {
     packageGroup = "com.kotcrab"
     username = ossrhUsername

editor/build.gradle

@@ -2,6 +2,7 @@ apply plugin: 'java'
 apply plugin: 'maven'
 apply plugin: 'kotlin'
 apply from: '../deploy.gradle'
+//pply plugin: "maven-publish"
 
 group = 'com.kotcrab.vis'
 archivesBaseName = "vis-editor"

editor/src/main/java/com/kotcrab/vis/editor/module/project/FontCacheModule.java

@@ -47,7 +47,7 @@ public class FontCacheModule extends ProjectModule implements WatchListener {
 	public static final int MIN_FONT_SIZE = 5;
 
 	public static final int DEFAULT_FONT_SIZE = 20;
-	public static final String DEFAULT_TEXT = "The quick brown fox jumps over the lazy dog";
+	public static final String DEFAULT_TEXT = "这是中文。The quick brown fox jumps over the lazy dog";
 
 	private FileAccessModule fileAccess;
 	private AssetsWatcherModule watcherModule;

editor/src/main/java/com/kotcrab/vis/editor/module/project/TtfEditorFont.java

@@ -22,6 +22,7 @@
 import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator;
 import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator.FreeTypeFontParameter;
 import com.badlogic.gdx.utils.ObjectMap;
+import com.kotcrab.vis.ui.util.font.LazyBitmapFont;
 
 /**
  * TTF font provider that allows to get font for user provided size. TtfEditorFont can only provide fonts for one pixelsPerUnits value.
@@ -47,7 +48,7 @@ public BitmapFont get (int size) {
 		BitmapFont font = bitmapFonts.get(size);
 
 		if (font == null) {
-			font = generator.generateFont(getParameterForSize(size));
+			font = new LazyBitmapFont(generator, getParameterForSize(size));
 			font.setUseIntegerPositions(false);
 			font.getData().setScale(1f / pixelsPerUnit);
 			bitmapFonts.put(size, font);
@@ -59,6 +60,7 @@ public BitmapFont get (int size) {
 	private FreeTypeFontParameter getParameterForSize (int size) {
 		FreeTypeFontParameter parameter = new FreeTypeFontParameter();
 		parameter.size = size;
+		parameter.incremental = true;
 		parameter.minFilter = TextureFilter.Linear;
 		parameter.magFilter = TextureFilter.Linear;
 		return parameter;

gradle/wrapper/gradle-wrapper.properties

@@ -1,6 +1,6 @@
-#Wed May 10 11:00:00 CEST 2017
+#Mon Nov 20 12:37:50 CST 2017
 distributionBase=GRADLE_USER_HOME
 distributionPath=wrapper/dists
 zipStoreBase=GRADLE_USER_HOME
 zipStorePath=wrapper/dists
-distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-bin.zip
+distributionUrl=https\://services.gradle.org/distributions/gradle-3.5-all.zip

runtime/src/main/java/com/kotcrab/vis/runtime/assets/TextureAsset.java

@@ -0,0 +1,11 @@
+package com.kotcrab.vis.runtime.assets;
+
+public class TextureAsset extends PathAsset {
+    @Deprecated
+    public TextureAsset () {
+    }
+
+    public TextureAsset (String relativePath) {
+        super(relativePath);
+    }
+}

runtime/src/main/java/com/kotcrab/vis/runtime/font/FreeTypeFontProvider.java

@@ -47,6 +47,6 @@ public void load (Array<AssetDescriptor> dependencies, VisAssetDescriptor asset)
 	@Override
 	public void setLoaders (AssetManager assetManager) {
 		assetManager.setLoader(FreeTypeFontGenerator.class, new FreeTypeFontGeneratorLoader(assetManager.getFileHandleResolver()));
-		assetManager.setLoader(BitmapFont.class, ".ttf", new FreetypeFontLoader(assetManager.getFileHandleResolver()));
+		assetManager.setLoader(BitmapFont.class, ".ttf", new LazyFreetypeFontLoader(assetManager.getFileHandleResolver()));
 	}
 }

runtime/src/main/java/com/kotcrab/vis/runtime/font/LazyFreetypeFontLoader.java

@@ -0,0 +1,33 @@
+package com.kotcrab.vis.runtime.font;
+
+import com.badlogic.gdx.assets.AssetManager;
+import com.badlogic.gdx.assets.loaders.FileHandleResolver;
+import com.badlogic.gdx.files.FileHandle;
+import com.badlogic.gdx.graphics.g2d.BitmapFont;
+import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator;
+import com.badlogic.gdx.graphics.g2d.freetype.FreetypeFontLoader;
+import com.kotcrab.vis.runtime.util.font.LazyBitmapFont;
+
+public class LazyFreetypeFontLoader extends FreetypeFontLoader {
+    public LazyFreetypeFontLoader(FileHandleResolver resolver) {
+        super(resolver);
+    }
+
+    @Override
+    public BitmapFont loadSync(AssetManager manager, String fileName, FileHandle file, FreeTypeFontLoaderParameter parameter) {
+        if(parameter == null) throw new RuntimeException("FreetypeFontParameter must be set in AssetManager#load to point at a TTF file!");
+        FreeTypeFontGenerator generator = manager.get(parameter.fontFileName + ".gen", FreeTypeFontGenerator.class);
+//        BitmapFont font = generator.generateFont(parameter.fontParameters);
+        BitmapFont font = new LazyBitmapFont(generator, parameter.fontParameters);
+        return font;
+    }
+
+//    private FreeTypeFontGenerator.FreeTypeFontParameter getParameterForSize (int size) {
+//        FreeTypeFontGenerator.FreeTypeFontParameter parameter = new FreeTypeFontGenerator.FreeTypeFontParameter();
+//        parameter.size = size;
+//        parameter.incremental = true;
+//        parameter.minFilter = Texture.TextureFilter.Linear;
+//        parameter.magFilter = Texture.TextureFilter.Linear;
+//        return parameter;
+//    }
+}

runtime/src/main/java/com/kotcrab/vis/runtime/system/inflater/SpriteInflater.java

@@ -19,10 +19,12 @@
 import com.artemis.Aspect;
 import com.artemis.ComponentMapper;
 import com.badlogic.gdx.assets.AssetManager;
+import com.badlogic.gdx.graphics.Texture;
 import com.badlogic.gdx.graphics.g2d.TextureAtlas;
 import com.badlogic.gdx.graphics.g2d.TextureRegion;
 import com.kotcrab.vis.runtime.RuntimeConfiguration;
 import com.kotcrab.vis.runtime.assets.AtlasRegionAsset;
+import com.kotcrab.vis.runtime.assets.TextureAsset;
 import com.kotcrab.vis.runtime.assets.TextureRegionAsset;
 import com.kotcrab.vis.runtime.assets.VisAssetDescriptor;
 import com.kotcrab.vis.runtime.component.AssetReference;
@@ -57,25 +59,36 @@ public void inserted (int entityId) {
 
 		String atlasPath;
 		String atlasRegion;
+		TextureAtlas atlas;
+		TextureRegion region;
 
 		if (asset instanceof TextureRegionAsset) {
 			TextureRegionAsset regionAsset = (TextureRegionAsset) asset;
 			atlasPath = sceneTextureAtlasPath;
 			atlasRegion = PathUtils.removeExtension(regionAsset.getPath());
+			atlas = manager.get(atlasPath, TextureAtlas.class);
+			region = atlas.findRegion(atlasRegion);
 
 		} else if (asset instanceof AtlasRegionAsset) {
 			AtlasRegionAsset regionAsset = (AtlasRegionAsset) asset;
 			atlasPath = regionAsset.getPath();
 			atlasRegion = regionAsset.getRegionName();
+			atlas = manager.get(atlasPath, TextureAtlas.class);
+			region = atlas.findRegion(atlasRegion);
 
+		} else if (asset instanceof TextureAsset) {
+			TextureAsset textureAsset = (TextureAsset) asset;
+			manager.load(textureAsset.getPath(), Texture.class);
+			manager.finishLoading();
+            Texture texture = manager.get(textureAsset.getPath(), Texture.class);
+            region = new TextureRegion(texture);
+            atlasRegion = textureAsset.getPath();
 		} else {
 			throw new UnsupportedAssetDescriptorException(asset);
 		}
 
-		TextureAtlas atlas = manager.get(atlasPath, TextureAtlas.class);
-		TextureRegion region = atlas.findRegion(atlasRegion);
-		if (region == null) throw new IllegalStateException("Can't load scene, gfx asset is missing: " + atlasRegion);
 
+		if (region == null) throw new IllegalStateException("Can't load scene, gfx asset is missing: " + atlasRegion);
 		VisSprite sprite = spriteCm.create(entityId);
 		sprite.setRegion(region);
 		protoCm.get(entityId).fill(sprite);

runtime/src/main/java/com/kotcrab/vis/runtime/util/font/LazyBitmapFont.java

@@ -0,0 +1,147 @@
+package com.kotcrab.vis.runtime.util.font;
+
+import com.badlogic.gdx.graphics.Color;
+import com.badlogic.gdx.graphics.Pixmap;
+import com.badlogic.gdx.graphics.Texture;
+import com.badlogic.gdx.graphics.g2d.BitmapFont;
+import com.badlogic.gdx.graphics.g2d.TextureRegion;
+import com.badlogic.gdx.graphics.g2d.freetype.FreeType;
+import com.badlogic.gdx.graphics.g2d.freetype.FreeTypeFontGenerator;
+import com.badlogic.gdx.utils.GdxRuntimeException;
+
+import java.lang.reflect.Field;
+
+/**
+ * Created by dotw on 2017/11/23.
+ */
+public class LazyBitmapFont extends BitmapFont {
+
+    private FreeTypeFontGenerator generator;
+    private FreeTypeFontGenerator.FreeTypeBitmapFontData data;
+    private FreeTypeFontGenerator.FreeTypeFontParameter parameter;
+
+    public LazyBitmapFont(FreeTypeFontGenerator generator, FreeTypeFontGenerator.FreeTypeFontParameter param) {
+        super();
+        if (generator == null)
+            throw new GdxRuntimeException("lazyBitmapFont global generator must be not null to use this constructor.");
+        this.generator = generator;
+        this.parameter = param;
+        this.data = new LazyBitmapFontData(generator, param.size, this);
+        try {
+            Field f = getClass().getSuperclass().getDeclaredField("data");
+            f.setAccessible(true);
+            f.set(this, data);
+        } catch (Exception e) {
+            e.printStackTrace();
+        }
+
+        genrateData();
+    }
+
+    private void genrateData() {
+        FreeType.Face face = null;
+        try {
+            Field field = generator.getClass().getDeclaredField("face");
+            field.setAccessible(true);
+            face = (FreeType.Face) field.get(generator);
+        } catch (Exception e) {
+            e.printStackTrace();
+            return;
+        }
+
+        // set general font data
+        FreeType.SizeMetrics fontMetrics = face.getSize().getMetrics();
+
+        // Set space glyph.
+        Glyph spaceGlyph = data.getGlyph(' ');
+        if (spaceGlyph == null) {
+            spaceGlyph = new Glyph();
+            spaceGlyph.xadvance = (int) data.spaceWidth;//.spaceXadvance;
+            spaceGlyph.id = (int) ' ';
+            data.setGlyph(' ', spaceGlyph);
+        }
+        if (spaceGlyph.width == 0)
+            spaceGlyph.width = (int) (spaceGlyph.xadvance + data.padRight);
+
+        // set general font data
+        data.flipped = parameter.flip;
+        data.ascent = FreeType.toInt(fontMetrics.getAscender());
+        data.descent = FreeType.toInt(fontMetrics.getDescender());
+        data.lineHeight = FreeType.toInt(fontMetrics.getHeight());
+
+        // determine x-height
+        for (char xChar : data.xChars) {
+            if (!face.loadChar(xChar, FreeType.FT_LOAD_DEFAULT))
+                continue;
+            data.xHeight = FreeType.toInt(face.getGlyph().getMetrics().getHeight());
+            break;
+        }
+        if (data.xHeight == 0)
+            throw new GdxRuntimeException("No x-height character found in font");
+        for (char capChar : data.capChars) {
+            if (!face.loadChar(capChar, FreeType.FT_LOAD_DEFAULT))
+                continue;
+            data.capHeight = FreeType.toInt(face.getGlyph().getMetrics().getHeight());
+            break;
+        }
+
+        // determine cap height
+        if (data.capHeight == 1)
+            throw new GdxRuntimeException("No cap character found in font");
+        data.ascent = data.ascent - data.capHeight;
+        data.down = -data.lineHeight;
+        if (parameter.flip) {
+            data.ascent = -data.ascent;
+            data.down = -data.down;
+        }
+
+    }
+
+    @Override
+    public void dispose() {
+        setOwnsTexture(true);
+        super.dispose();
+        data.dispose();
+
+    }
+
+    public static class LazyBitmapFontData extends FreeTypeFontGenerator.FreeTypeBitmapFontData {
+
+        private FreeTypeFontGenerator generator;
+        private int fontSize;
+        private LazyBitmapFont font;
+        private int page = 1;
+
+        public LazyBitmapFontData(FreeTypeFontGenerator generator, int fontSize, LazyBitmapFont lbf) {
+            this.generator = generator;
+            this.fontSize = fontSize;
+            this.font = lbf;
+        }
+
+        public Glyph getGlyph(char ch) {
+            Glyph glyph = super.getGlyph(ch);
+            if (glyph == null && ch != 0)
+                glyph = generateGlyph(ch);
+            return glyph;
+        }
+
+        protected Glyph generateGlyph(char ch) {
+            FreeTypeFontGenerator.GlyphAndBitmap gab = generator.generateGlyphAndBitmap(ch, fontSize, false);
+            if (gab == null || gab.bitmap == null)
+                return null;
+
+            Pixmap map = gab.bitmap.getPixmap(Pixmap.Format.RGBA8888, Color.WHITE, 1);
+            TextureRegion rg = new TextureRegion(new Texture(map));
+            map.dispose();
+
+            font.getRegions().add(rg);
+
+            gab.glyph.page = page++;
+            super.setGlyph(ch, gab.glyph);
+            setGlyphRegion(gab.glyph, rg);
+
+            return gab.glyph;
+        }
+
+    }
+}

runtime/src/main/java/com/kotcrab/vis/runtime/util/json/RuntimeJsonTags.java

@@ -41,6 +41,7 @@ public static void registerTags (JsonTagRegistrar registrar) {
 		registrar.register("ShaderAsset", ShaderAsset.class);
 		registrar.register("SoundAsset", SoundAsset.class);
 		registrar.register("TextureRegionAsset", TextureRegionAsset.class);
+		registrar.register("TextureAsset", TextureAsset.class);
 		registrar.register("TtfFontAsset", TtfFontAsset.class);
 
 		registrar.register("Transform", Transform.class);

settings.gradle

@@ -1,4 +1,4 @@
-def visuiOnly = true
+def visuiOnly = false
 
 if (visuiOnly) {
     rootProject.name = 'vis-ui'

ui/build.gradle

@@ -11,6 +11,7 @@ sourceCompatibility = 1.6
 
 dependencies {
     compile "com.badlogicgames.gdx:gdx:$gdxVersion"
+    compile "com.badlogicgames.gdx:gdx-freetype:$gdxVersion"
     provided "com.apple:AppleJavaExtensions:$appleJavaExtensionsVersion", optional
     testCompile "com.badlogicgames.gdx:gdx-backend-lwjgl3:$gdxVersion"
     testCompile "com.badlogicgames.gdx:gdx-platform:$gdxVersion:natives-desktop"