Browse Source

Scripting bindings for Text3D, updating AtomicExamples submodule commit

Josh Engebretson 8 years ago
parent
commit
3c5810cc8d
2 changed files with 4 additions and 3 deletions
  1. 3 2
      Script/Packages/Atomic/Graphics.json
  2. 1 1
      Submodules/AtomicExamples

+ 3 - 2
Script/Packages/Atomic/Graphics.json

@@ -1,6 +1,6 @@
 {
 {
 	"name" : "Graphics",
 	"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>",
 	"includes" : ["<Atomic/Scene/Scene.h>", "<Atomic/Graphics/OcclusionBuffer.h>", "<Atomic/Scene/ValueAnimation.h>",
 							  "<Atomic/Container/ArrayPtr.h>", "<Atomic/Graphics/Animation.h>",
 							  "<Atomic/Container/ArrayPtr.h>", "<Atomic/Graphics/Animation.h>",
 							 "<Atomic/Graphics/Material.h>", "<Atomic/Resource/Image.h>", "<Atomic/Graphics/VertexBuffer.h>"],
 							 "<Atomic/Graphics/Material.h>", "<Atomic/Resource/Image.h>", "<Atomic/Graphics/VertexBuffer.h>"],
@@ -14,7 +14,8 @@
  				 "StaticModel",
  				 "StaticModel",
  				 "Animation", "AnimatedModel", "AnimationController", "AnimationState", "Billboard", "BillboardSet", "CustomGeometry",
  				 "Animation", "AnimatedModel", "AnimationController", "AnimationState", "Billboard", "BillboardSet", "CustomGeometry",
  				 "DecalSet", "ParticleEffect", "ParticleEmitter", "RibbonTrail",
  				 "DecalSet", "ParticleEffect", "ParticleEmitter", "RibbonTrail",
- 				 "Skybox", "StaticModelGroup", "Terrain", "TerrainPatch"],
+ 				 "Skybox", "StaticModelGroup", "Terrain", "TerrainPatch",
+			 	 "Text3D", "Text3DFont"],
 	"overloads" : {
 	"overloads" : {
 		"Viewport" : {
 		"Viewport" : {
 			"Viewport" : ["Context", "Scene", "Camera", "RenderPath"],
 			"Viewport" : ["Context", "Scene", "Camera", "RenderPath"],

+ 1 - 1
Submodules/AtomicExamples

@@ -1 +1 @@
-Subproject commit 207db6a2ae17bd7f358b4b6e83c4340f4c3037c5
+Subproject commit 1f0a6a6e893f8ecc7216ce885cbd5402c77a488f