Explorar o código

ToonTown now running with Atomic3D split out

Josh Engebretson %!s(int64=10) %!d(string=hai) anos
pai
achega
833b02d11e

+ 4 - 0
Source/Atomic/Atomic3D/Atomic3D.cpp

@@ -2,6 +2,8 @@
 #include "StaticModel.h"
 #include "StaticModelGroup.h"
 #include "Skybox.h"
+#include "Animation.h"
+#include "Model.h"
 #include "AnimatedModel.h"
 #include "AnimationController.h"
 #include "BillboardSet.h"
@@ -19,6 +21,8 @@ namespace Atomic
 
 void RegisterAtomic3DLibrary(Context* context)
 {
+    Animation::RegisterObject(context);
+    Model::RegisterObject(context);
     StaticModel::RegisterObject(context);
     StaticModelGroup::RegisterObject(context);
     Skybox::RegisterObject(context);

+ 1 - 1
Source/AtomicJS/CMakeLists.txt

@@ -32,7 +32,7 @@ if (NOT MSVC)
 endif()
 
 # Create the JSBind files ahead of time, so they are picked up with glob
-set (JSFILES JSModuleAtomic2D.cpp;JSModuleAudio.cpp;JSModuleContainer.cpp;JSModuleCore.cpp;
+set (JSFILES JSModuleAtomic2D.cpp;JSModuleAtomic2D.cpp;JSModuleAudio.cpp;JSModuleContainer.cpp;JSModuleCore.cpp;
              JSModuleEngine.cpp;JSModuleEnvironment.cpp;JSModuleGraphics.cpp;JSModuleInput.cpp;
              JSModuleIO.cpp;JSModuleJavascript.cpp;JSModuleMath.cpp;JSModuleNavigation.cpp;
              JSModuleNetwork.cpp;JSModulePhysics.cpp;JSModuleResource.cpp;JSModules.cpp;

+ 8 - 15
Source/AtomicJS/JSBind/modules/Atomic3D.json

@@ -1,24 +1,17 @@
 {
-	"name" : "Graphics",
-	"sources" : ["Graphics"],
-	"includes" : ["<Atomic/Scene/Scene.h>", "<Atomic/Graphics/Animation.h>", "<Atomic/Graphics/OcclusionBuffer.h>", "<Atomic/Scene/ValueAnimation.h>"],
-	"classes" : ["Graphics", "Texture", "Texture2D", "Model", "Material", "Drawable", 
-				 "Viewport", "Renderer", "Octree", "Zone", "StaticModel", "Camera", "Light", "RenderPath",
+	"name" : "Atomic3D",
+	"sources" : ["Atomic3D"],
+	"includes" : ["<Atomic/Scene/Scene.h>", "<Atomic/Atomic3D/Animation.h>", "<Atomic/Graphics/OcclusionBuffer.h>", 
+			      "<Atomic/Scene/ValueAnimation.h>", "<Atomic/Graphics/Material.h>", "<Atomic/Resource/Image.h>"],
+	"classes" : ["Model",
+				 "StaticModel", 
 				 "Animation", "AnimatedModel", "AnimationController", "AnimationState", "BillboardSet", "CustomGeometry",
-				 "DebugRenderer", "DecalSet", "OcclusionBuffer", "ParticleEffect", "ParticleEmitter",
-				 "RenderSurface", "Shader", "ShaderPrecache", "ShaderVariation", 
-				 "Skybox", "StaticModelGroup", "Pass", "Technique", "Terrain", "TerrainPatch", 
-				 "Texture3D", "TextureCube", "View"],
+				 "DecalSet", "ParticleEffect", "ParticleEmitter",				
+				 "Skybox", "StaticModelGroup", "Terrain", "TerrainPatch"],
 	"overloads" : {
 		"StaticModel" : {
 			"SetMaterial" : ["Material"]
 		},
-		"Viewport" : {
-			"Viewport" : ["Context", "Scene", "Camera", "RenderPath"]
-		},
-		"Camera" : {
-			"SetOrthoSize" : ["float"]
-		},
 		"AnimationState" : {
 			"AnimationState" : ["AnimatedModel", "Animation"]
 		}		

+ 1 - 1
Source/AtomicJS/JSBind/modules/Modules.json

@@ -1,6 +1,6 @@
 
 {
-	"modules" : ["Container", "Math", "Core", "Scene", "Graphics", "Atomic2D", "Audio", 
+	"modules" : ["Container", "Math", "Core", "Scene", "Graphics", "Atomic3D", "Atomic2D", "Audio", 
 	"Physics", "Navigation", "Input", "UI", "Resource", "Network", "IO",
 	"Engine", "Javascript", "Environment"],