Skip to content

Commit 3c9817d

Browse files
JoshEngebretsonJoshEngebretson
committed
Compilation and link delta
1 parent 5da0f7d commit 3c9817d

241 files changed

Lines changed: 1817 additions & 1863 deletions

File tree

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

‎Script/Packages/Atomic/Atomic2D.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@
33
"sources" : ["Source/Atomic/Atomic2D"],
44
"includes" : ["<Atomic/Graphics/Texture2D.h>", "<Atomic/Scene/Node.h>", "<Atomic/Graphics/Material.h>"],
55
"classes" : [ "SpriteSheet2D", "Sprite2D", "Drawable2D", "StaticSprite2D", "AnimationSet2D", "AnimatedSprite2D",
6-
"CollisionShape2D", "CollisionBox2D", "RigidBody2D", "Animation2D", "CollisionChain2D",
6+
"CollisionShape2D", "CollisionBox2D", "RigidBody2D", "CollisionChain2D",
77
"CollisionCircle2D", "CollisionEdge2D", "CollisionPolygon2D",
88
"Constraint2D", "ConstraintDistance2D", "ConstraintFriction2D", "ConstraintGear2D",
99
"ConstraintMotor2D", "ConstraintMouse2D", "ConstraintPrismatic2D", "ConstraintPulley2D",

‎Script/Packages/Atomic/Atomic3D.json‎

Lines changed: 0 additions & 43 deletions
This file was deleted.

‎Script/Packages/Atomic/Graphics.json‎

Lines changed: 30 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,20 @@
11
{
22
"name" : "Graphics",
33
"sources" : ["Source/Atomic/Graphics"],
4-
"includes" : ["<Atomic/Scene/Scene.h>", "<Atomic/Graphics/OcclusionBuffer.h>", "<Atomic/Scene/ValueAnimation.h>"],
4+
"includes" : ["<Atomic/Scene/Scene.h>", "<Atomic/Graphics/OcclusionBuffer.h>", "<Atomic/Scene/ValueAnimation.h>",
5+
"<Atomic/Container/ArrayPtr.h>", "<Atomic/Graphics/Animation.h>",
6+
"<Atomic/Graphics/Material.h>", "<Atomic/Resource/Image.h>", "<Atomic/Graphics/VertexBuffer.h>"],
57
"classes" : ["Graphics", "Texture", "Texture2D", "Material", "Drawable",
68
"Viewport", "Renderer", "Octree", "Zone", "Camera", "Light", "RenderPath",
79
"DebugRenderer",
810
"RenderSurface", "Shader", "ShaderPrecache", "ShaderVariation",
911
"Pass", "Technique",
1012
"Texture3D", "TextureCube", "View",
11-
"VertexBuffer"],
13+
"VertexBuffer", "Model",
14+
"StaticModel",
15+
"Animation", "AnimatedModel", "AnimationController", "AnimationState", "Billboard", "BillboardSet", "CustomGeometry",
16+
"DecalSet", "ParticleEffect", "ParticleEmitter",
17+
"Skybox", "StaticModelGroup", "Terrain", "TerrainPatch"],
1218
"overloads" : {
1319
"Viewport" : {
1420
"Viewport" : ["Context", "Scene", "Camera", "RenderPath"],
@@ -20,8 +26,18 @@
2026
"Graphics" : {
2127
"SetWindowPosition" : ["int", "int"],
2228
"Draw" : ["PrimitiveType", "unsigned", "unsigned"]
29+
},
30+
"StaticModel" : {
31+
"SetMaterial" : ["Material"]
32+
},
33+
"AnimationState" : {
34+
"AnimationState" : ["AnimatedModel", "Animation"]
35+
},
36+
"CustomGeometry" : {
37+
"SetMaterial" : ["Material"]
2338
}
2439

40+
2541
},
2642
"typescript_decl" : {
2743

@@ -33,6 +49,12 @@
3349
"getShadowCascade():Number[];",
3450
"setShadowCascade(split1:number, split2:number, split3:number, split4:number, fadeStart:number, biasAutoAdjust?:number);",
3551
"setShadowCascadeParameter(index:number, value:number);"
52+
],
53+
"StaticModel" : [
54+
"setMaterialIndex(index:number, material:Material);"
55+
],
56+
"CustomGeometry" : [
57+
"setMaterialIndex(index:number, material:Material);"
3658
]
3759

3860
},
@@ -42,6 +64,12 @@
4264
"function getShadowCascade():Array<Float>;",
4365
"function setShadowCascade(split1:Float, split2:Float, split3:Float, split4:Float, fadeStart:Float, ?biasAutoAdjust:Float):Void;",
4466
"function setShadowCascadeParameter(index:Int, value:Float):Void;"
67+
],
68+
"StaticModel" : [
69+
"function setMaterialIndex(index:UInt, material:Material):Void;"
70+
],
71+
"CustomGeometry" : [
72+
"function setMaterialIndex(index:UInt, material:Material):Void;"
4573
]
4674

4775
}

‎Script/Packages/Atomic/Package.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
{
33
"name" : "Atomic",
44
"namespace" : "Atomic",
5-
"modules" : ["Container", "Math", "Core", "Scene", "Graphics", "Atomic3D", "Atomic2D", "Audio",
5+
"modules" : ["Container", "Math", "Core", "Scene", "Graphics", "Atomic2D", "Audio",
66
"Physics", "Navigation", "Input", "UI", "Resource", "Network", "IO",
77
"Engine", "Script", "Javascript", "Environment", "Web", "IPC"],
88
"moduleExclude" : {

‎Script/Packages/Atomic/Physics.json‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,7 @@
22
"name" : "Physics",
33
"requires" : ["3D"],
44
"sources" : ["Source/Atomic/Physics"],
5-
"includes" : ["<Atomic/Atomic3D/Model.h>"],
5+
"includes" : ["<Atomic/Graphics/Model.h>"],
66
"classes" : ["CollisionShape", "Constraint", "PhysicsWorld", "RigidBody"],
77
"overloads" : {
88
"RigidBody" : {

‎Source/Atomic/Atomic2D/AnimatedSprite2D.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@
4141
namespace Atomic
4242
{
4343

44-
extern const char* URHO2D_CATEGORY;
44+
extern const char* ATOMIC2D_CATEGORY;
4545
extern const char* blendModeNames[];
4646

4747
const char* loopModeNames[] =
@@ -72,7 +72,7 @@ AnimatedSprite2D::~AnimatedSprite2D()
7272

7373
void AnimatedSprite2D::RegisterObject(Context* context)
7474
{
75-
context->RegisterFactory<AnimatedSprite2D>(URHO2D_CATEGORY);
75+
context->RegisterFactory<AnimatedSprite2D>(ATOMIC2D_CATEGORY);
7676

7777
ATOMIC_COPY_BASE_ATTRIBUTES(StaticSprite2D);
7878
ATOMIC_REMOVE_ATTRIBUTE("Sprite");

‎Source/Atomic/Atomic2D/Atomic2D.cpp‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -57,7 +57,7 @@
5757
namespace Atomic
5858
{
5959

60-
const char* URHO2D_CATEGORY = "Atomic2D";
60+
const char* ATOMIC2D_CATEGORY = "Atomic2D";
6161

6262
void RegisterAtomic2DLibrary(Context* context)
6363
{

‎Source/Atomic/Atomic2D/CollisionBox2D.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
namespace Atomic
3232
{
3333

34-
extern const char* URHO2D_CATEGORY;
34+
extern const char* ATOMIC2D_CATEGORY;
3535
static const Vector2 DEFAULT_BOX_SIZE(0.01f, 0.01f);
3636

3737
CollisionBox2D::CollisionBox2D(Context* context) :
@@ -52,7 +52,7 @@ CollisionBox2D::~CollisionBox2D()
5252

5353
void CollisionBox2D::RegisterObject(Context* context)
5454
{
55-
context->RegisterFactory<CollisionBox2D>(URHO2D_CATEGORY);
55+
context->RegisterFactory<CollisionBox2D>(ATOMIC2D_CATEGORY);
5656

5757
ATOMIC_ACCESSOR_ATTRIBUTE("Is Enabled", IsEnabled, SetEnabled, bool, true, AM_DEFAULT);
5858
ATOMIC_ACCESSOR_ATTRIBUTE("Size", GetSize, SetSize, Vector2, DEFAULT_BOX_SIZE, AM_DEFAULT);

‎Source/Atomic/Atomic2D/CollisionChain2D.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
namespace Atomic
3434
{
3535

36-
extern const char* URHO2D_CATEGORY;
36+
extern const char* ATOMIC2D_CATEGORY;
3737

3838
CollisionChain2D::CollisionChain2D(Context* context) :
3939
CollisionShape2D(context),
@@ -48,7 +48,7 @@ CollisionChain2D::~CollisionChain2D()
4848

4949
void CollisionChain2D::RegisterObject(Context* context)
5050
{
51-
context->RegisterFactory<CollisionChain2D>(URHO2D_CATEGORY);
51+
context->RegisterFactory<CollisionChain2D>(ATOMIC2D_CATEGORY);
5252

5353
ATOMIC_ACCESSOR_ATTRIBUTE("Is Enabled", IsEnabled, SetEnabled, bool, true, AM_DEFAULT);
5454
ATOMIC_ACCESSOR_ATTRIBUTE("Loop", GetLoop, SetLoop, bool, false, AM_DEFAULT);

‎Source/Atomic/Atomic2D/CollisionCircle2D.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@
3131
namespace Atomic
3232
{
3333

34-
extern const char* URHO2D_CATEGORY;
34+
extern const char* ATOMIC2D_CATEGORY;
3535
static const float DEFAULT_CLRCLE_RADIUS(0.01f);
3636

3737
CollisionCircle2D::CollisionCircle2D(Context* context) :
@@ -49,7 +49,7 @@ CollisionCircle2D::~CollisionCircle2D()
4949

5050
void CollisionCircle2D::RegisterObject(Context* context)
5151
{
52-
context->RegisterFactory<CollisionCircle2D>(URHO2D_CATEGORY);
52+
context->RegisterFactory<CollisionCircle2D>(ATOMIC2D_CATEGORY);
5353

5454
ATOMIC_ACCESSOR_ATTRIBUTE("Is Enabled", IsEnabled, SetEnabled, bool, true, AM_DEFAULT);
5555
ATOMIC_ACCESSOR_ATTRIBUTE("Radius", GetRadius, SetRadius, float, DEFAULT_CLRCLE_RADIUS, AM_DEFAULT);

0 commit comments

Comments
 (0)