Merge pull request AtomicGameEngine#1564 from AtomicGameEngine/JME-AT…

…OMIC-260 Text3D port to Graphics module
lemosdeveloper · Jun 12, 2017 · 9d05fa9 · 9d05fa9
2 parents 3bd27a0 + 3c5810c
commit 9d05fa9
Show file tree

Hide file tree

Showing 18 changed files with 4,589 additions and 4 deletions.
diff --git a/Script/Packages/Atomic/Graphics.json b/Script/Packages/Atomic/Graphics.json
@@ -1,6 +1,6 @@
 {
 	"name" : "Graphics",
-	"sources" : ["Source/Atomic/Graphics"],
+	"sources" : ["Source/Atomic/Graphics", "Source/Atomic/Graphics/Text3D"],
 	"includes" : ["<Atomic/Scene/Scene.h>", "<Atomic/Graphics/OcclusionBuffer.h>", "<Atomic/Scene/ValueAnimation.h>",
 							  "<Atomic/Container/ArrayPtr.h>", "<Atomic/Graphics/Animation.h>",
 							 "<Atomic/Graphics/Material.h>", "<Atomic/Resource/Image.h>", "<Atomic/Graphics/VertexBuffer.h>"],
@@ -14,7 +14,8 @@
  				 "StaticModel",
  				 "Animation", "AnimatedModel", "AnimationController", "AnimationState", "Billboard", "BillboardSet", "CustomGeometry",
  				 "DecalSet", "ParticleEffect", "ParticleEmitter", "RibbonTrail",
- 				 "Skybox", "StaticModelGroup", "Terrain", "TerrainPatch"],
+ 				 "Skybox", "StaticModelGroup", "Terrain", "TerrainPatch",
+			 	 "Text3D", "Text3DFont"],
 	"overloads" : {
 		"Viewport" : {
 			"Viewport" : ["Context", "Scene", "Camera", "RenderPath"],

diff --git a/Source/Atomic/CMakeLists.txt b/Source/Atomic/CMakeLists.txt
@@ -20,7 +20,7 @@ file (GLOB SYSTEM_UI_SOURCE UI/SystemUI/*.cpp UI/SystemUI/*.h)
 file (GLOB PHYSICS_SOURCE Physics/*.cpp Physics/*.h)
 file (GLOB NAVIGATION_SOURCE Navigation/*.cpp Navigation/*.h)
 file (GLOB ENVIRONMENT_SOURCE Environment/*.cpp Environment/*.h)
-file (GLOB GRAPHICS_SOURCE Graphics/*.cpp Graphics/*.h)
+file (GLOB GRAPHICS_SOURCE Graphics/*.cpp Graphics/*.h Graphics/Text3D/*.cpp Graphics/Text3D/*.h)
 if (ATOMIC_IK)
     file (GLOB IK_SOURCE IK/*.cpp IK/*.h)
 endif ()

diff --git a/Source/Atomic/Graphics/Graphics.cpp b/Source/Atomic/Graphics/Graphics.cpp
@@ -53,6 +53,11 @@
 #include "../IO/Log.h"
 
 // ATOMIC BEGIN
+
+#include "Text3D/Text3DFont.h"
+#include "Text3D/Text3DText.h"
+#include "Text3D/Text3D.h"
+
 #include <SDL/include/SDL.h>
 #include <SDL/include/SDL_syswm.h>
 // ATOMIC END
@@ -404,6 +409,12 @@ void RegisterGraphicsLibrary(Context* context)
     DebugRenderer::RegisterObject(context);
     Octree::RegisterObject(context);
     Zone::RegisterObject(context);
+
+    // ATOMIC BEGIN
+    Text3DFont::RegisterObject(context);
+    Text3DText::RegisterObject(context);
+    Text3D::RegisterObject(context);
+    // ATOMIC END
 }
 
 // ATOMIC BEGIN