Skip to content

Commit e4604df

Browse files
JCashJCash
authored
Merge pull request #177 from defold/update-1-9-0
Updated to defold 1.9.0
2 parents 0ad38ef + 3b38321 commit e4604df

File tree

4 files changed

+82
-76
lines changed

4 files changed

+82
-76
lines changed

‎defold-spine/src/comp_spine_model.cpp

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,7 @@ extern "C" {
4141
#include <dmsdk/gameobject/component.h>
4242
#include <dmsdk/gamesys/property.h>
4343
#include <dmsdk/gamesys/resources/res_textureset.h>
44-
#include <dmsdk/resource/resource.h>
44+
#include <dmsdk/resource/resource.hpp>
4545
#include <gameobject/gameobject_ddf.h>
4646

4747
#include <common/vertices.h>
@@ -67,7 +67,7 @@ namespace dmSpine
6767

6868
static const uint32_t INVALID_ANIMATION_INDEX = 0xFFFFFFFF;
6969

70-
static void ResourceReloadedCallback(const dmResource::ResourceReloadedParams& params);
70+
static void ResourceReloadedCallback(const dmResource::ResourceReloadedParams* params);
7171
static void DestroyComponent(struct SpineModelWorld* world, uint32_t index);
7272

7373
struct SpineModelWorld
@@ -1314,7 +1314,7 @@ namespace dmSpine
13141314
return dmGameSystem::SetMaterialConstant(GetMaterial(component), params.m_PropertyId, params.m_Value, params.m_Options.m_Index, CompSpineModelSetConstantCallback, component);
13151315
}
13161316

1317-
static void ResourceReloadedCallback(const dmResource::ResourceReloadedParams& params)
1317+
static void ResourceReloadedCallback(const dmResource::ResourceReloadedParams* params)
13181318
{
13191319
// E.g. if the Spine json or atlas has changed, we may need to update things here
13201320

‎defold-spine/src/res_spine_json.cpp

Lines changed: 25 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,12 @@
33
#include <string.h>
44
#include <stdio.h>
55

6+
#ifdef __MACH__
7+
#include <malloc/malloc.h>
8+
#else
9+
#include <malloc.h>
10+
#endif
11+
612
#include <dmsdk/dlib/log.h>
713
#include <dmsdk/resource/resource.h>
814

@@ -31,35 +37,35 @@ namespace dmSpine
3137
delete resource;
3238
}
3339

34-
static dmResource::Result ResourceTypeJson_Create(const dmResource::ResourceCreateParams& params)
40+
static dmResource::Result ResourceTypeJson_Create(const dmResource::ResourceCreateParams* params)
3541
{
36-
SpineJsonResource* resource = CreateResource(params.m_Buffer, params.m_BufferSize);
42+
SpineJsonResource* resource = CreateResource(params->m_Buffer, params->m_BufferSize);
3743
if (!resource)
3844
{
3945
return dmResource::RESULT_OUT_OF_RESOURCES;
4046
}
4147

42-
params.m_Resource->m_Resource = (void*)resource;
43-
params.m_Resource->m_ResourceSize = resource->m_Length;
48+
dmResource::SetResource(params->m_Resource, resource);
49+
dmResource::SetResourceSize(params->m_Resource, resource->m_Length);
4450
return dmResource::RESULT_OK;
4551
}
4652

47-
static dmResource::Result ResourceTypeJson_Destroy(const dmResource::ResourceDestroyParams& params)
53+
static dmResource::Result ResourceTypeJson_Destroy(const dmResource::ResourceDestroyParams* params)
4854
{
49-
SpineJsonResource* resource = (SpineJsonResource*)params.m_Resource->m_Resource;
55+
SpineJsonResource* resource = (SpineJsonResource*)dmResource::GetResource(params->m_Resource);
5056
DestroyResource(resource);
5157
return dmResource::RESULT_OK;
5258
}
5359

54-
static dmResource::Result ResourceTypeJson_Recreate(const dmResource::ResourceRecreateParams& params)
60+
static dmResource::Result ResourceTypeJson_Recreate(const dmResource::ResourceRecreateParams* params)
5561
{
56-
SpineJsonResource* new_resource = CreateResource(params.m_Buffer, params.m_BufferSize);
62+
SpineJsonResource* new_resource = CreateResource(params->m_Buffer, params->m_BufferSize);
5763
if (!new_resource)
5864
{
5965
return dmResource::RESULT_OUT_OF_RESOURCES;
6066
}
6167

62-
SpineJsonResource* old_resource = (SpineJsonResource*) params.m_Resource->m_Resource;
68+
SpineJsonResource* old_resource = (SpineJsonResource*) dmResource::GetResource(params->m_Resource);
6369

6470
// swap the internals
6571
// we wish to keep the "old" resource, since that pointer might be shared in the system
@@ -70,20 +76,20 @@ namespace dmSpine
7076
new_resource->m_Json = tmp;
7177
DestroyResource(new_resource);
7278

73-
params.m_Resource->m_ResourceSize = old_resource->m_Length;
79+
dmResource::SetResourceSize(params->m_Resource, old_resource->m_Length);
7480
return dmResource::RESULT_OK;
7581
}
7682

77-
static dmResource::Result ResourceTypeJson_Register(dmResource::ResourceTypeRegisterContext& ctx)
83+
static ResourceResult ResourceTypeJson_Register(HResourceTypeContext ctx, HResourceType type)
7884
{
79-
return dmResource::RegisterType(ctx.m_Factory,
80-
ctx.m_Name,
81-
0, // context
82-
0, // preload
83-
ResourceTypeJson_Create,
84-
0, // post create
85-
ResourceTypeJson_Destroy,
86-
ResourceTypeJson_Recreate);
85+
return (ResourceResult)dmResource::SetupType(ctx,
86+
type,
87+
0, // context
88+
0, // preload
89+
ResourceTypeJson_Create,
90+
0, // post create
91+
ResourceTypeJson_Destroy,
92+
ResourceTypeJson_Recreate);
8793

8894
}
8995
}

‎defold-spine/src/res_spine_model.cpp

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -39,71 +39,71 @@ namespace dmSpine
3939
dmResource::Release(factory, resource->m_Material);
4040
}
4141

42-
static dmResource::Result ResourceTypeModel_Preload(const dmResource::ResourcePreloadParams& params)
42+
static dmResource::Result ResourceTypeModel_Preload(const dmResource::ResourcePreloadParams* params)
4343
{
4444
dmGameSystemDDF::SpineModelDesc* ddf;
45-
dmDDF::Result e = dmDDF::LoadMessage(params.m_Buffer, params.m_BufferSize, &dmGameSystemDDF_SpineModelDesc_DESCRIPTOR, (void**) &ddf);
45+
dmDDF::Result e = dmDDF::LoadMessage(params->m_Buffer, params->m_BufferSize, &dmGameSystemDDF_SpineModelDesc_DESCRIPTOR, (void**) &ddf);
4646
if (e != dmDDF::RESULT_OK)
4747
{
4848
return dmResource::RESULT_DDF_ERROR;
4949
}
5050

51-
dmResource::PreloadHint(params.m_HintInfo, ddf->m_SpineScene);
52-
dmResource::PreloadHint(params.m_HintInfo, ddf->m_Material);
51+
dmResource::PreloadHint(params->m_HintInfo, ddf->m_SpineScene);
52+
dmResource::PreloadHint(params->m_HintInfo, ddf->m_Material);
5353

54-
*params.m_PreloadData = ddf;
54+
*params->m_PreloadData = ddf;
5555
return dmResource::RESULT_OK;
5656
}
5757

58-
static dmResource::Result ResourceTypeModel_Create(const dmResource::ResourceCreateParams& params)
58+
static dmResource::Result ResourceTypeModel_Create(const dmResource::ResourceCreateParams* params)
5959
{
6060
SpineModelResource* model_resource = new SpineModelResource();
61-
model_resource->m_Ddf = (dmGameSystemDDF::SpineModelDesc*) params.m_PreloadData;
62-
dmResource::Result r = AcquireResources(params.m_Factory, model_resource, params.m_Filename);
61+
model_resource->m_Ddf = (dmGameSystemDDF::SpineModelDesc*) params->m_PreloadData;
62+
dmResource::Result r = AcquireResources(params->m_Factory, model_resource, params->m_Filename);
6363
if (r == dmResource::RESULT_OK)
6464
{
65-
params.m_Resource->m_Resource = (void*) model_resource;
65+
dmResource::SetResource(params->m_Resource, model_resource);
6666
}
6767
else
6868
{
69-
ReleaseResources(params.m_Factory, model_resource);
69+
ReleaseResources(params->m_Factory, model_resource);
7070
delete model_resource;
7171
}
7272
return r;
7373
}
7474

75-
static dmResource::Result ResourceTypeModel_Destroy(const dmResource::ResourceDestroyParams& params)
75+
static dmResource::Result ResourceTypeModel_Destroy(const dmResource::ResourceDestroyParams* params)
7676
{
77-
SpineModelResource* model_resource = (SpineModelResource*)params.m_Resource->m_Resource;
78-
ReleaseResources(params.m_Factory, model_resource);
77+
SpineModelResource* model_resource = (SpineModelResource*)dmResource::GetResource(params->m_Resource);
78+
ReleaseResources(params->m_Factory, model_resource);
7979
delete model_resource;
8080
return dmResource::RESULT_OK;
8181
}
8282

83-
static dmResource::Result ResourceTypeModel_Recreate(const dmResource::ResourceRecreateParams& params)
83+
static dmResource::Result ResourceTypeModel_Recreate(const dmResource::ResourceRecreateParams* params)
8484
{
8585
dmGameSystemDDF::SpineModelDesc* ddf;
86-
dmDDF::Result e = dmDDF::LoadMessage(params.m_Buffer, params.m_BufferSize, &dmGameSystemDDF_SpineModelDesc_DESCRIPTOR, (void**) &ddf);
86+
dmDDF::Result e = dmDDF::LoadMessage(params->m_Buffer, params->m_BufferSize, &dmGameSystemDDF_SpineModelDesc_DESCRIPTOR, (void**) &ddf);
8787
if (e != dmDDF::RESULT_OK)
8888
{
8989
return dmResource::RESULT_DDF_ERROR;
9090
}
91-
SpineModelResource* model_resource = (SpineModelResource*)params.m_Resource->m_Resource;
92-
ReleaseResources(params.m_Factory, model_resource);
91+
SpineModelResource* model_resource = (SpineModelResource*)dmResource::GetResource(params->m_Resource);
92+
ReleaseResources(params->m_Factory, model_resource);
9393
model_resource->m_Ddf = ddf;
94-
return AcquireResources(params.m_Factory, model_resource, params.m_Filename);
94+
return AcquireResources(params->m_Factory, model_resource, params->m_Filename);
9595
}
9696

97-
static dmResource::Result ResourceTypeModel_Register(dmResource::ResourceTypeRegisterContext& ctx)
97+
static ResourceResult ResourceTypeModel_Register(HResourceTypeContext ctx, HResourceType type)
9898
{
99-
return dmResource::RegisterType(ctx.m_Factory,
100-
ctx.m_Name,
101-
0, // context
102-
ResourceTypeModel_Preload,
103-
ResourceTypeModel_Create,
104-
0, // post create
105-
ResourceTypeModel_Destroy,
106-
ResourceTypeModel_Recreate);
99+
return (ResourceResult)dmResource::SetupType(ctx,
100+
type,
101+
0, // context
102+
ResourceTypeModel_Preload,
103+
ResourceTypeModel_Create,
104+
0, // post create
105+
ResourceTypeModel_Destroy,
106+
ResourceTypeModel_Recreate);
107107

108108
}
109109
}

‎defold-spine/src/res_spine_scene.cpp

Lines changed: 27 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -133,71 +133,71 @@ namespace dmSpine
133133
delete[] resource->m_Regions;
134134
}
135135

136-
static dmResource::Result ResourceTypeScene_Preload(const dmResource::ResourcePreloadParams& params)
136+
static dmResource::Result ResourceTypeScene_Preload(const dmResource::ResourcePreloadParams* params)
137137
{
138138
dmGameSystemDDF::SpineSceneDesc* ddf;
139-
dmDDF::Result e = dmDDF::LoadMessage(params.m_Buffer, params.m_BufferSize, &dmGameSystemDDF_SpineSceneDesc_DESCRIPTOR, (void**) &ddf);
139+
dmDDF::Result e = dmDDF::LoadMessage(params->m_Buffer, params->m_BufferSize, &dmGameSystemDDF_SpineSceneDesc_DESCRIPTOR, (void**) &ddf);
140140
if (e != dmDDF::RESULT_OK)
141141
{
142142
return dmResource::RESULT_DDF_ERROR;
143143
}
144144

145-
dmResource::PreloadHint(params.m_HintInfo, ddf->m_SpineJson);
146-
dmResource::PreloadHint(params.m_HintInfo, ddf->m_Atlas);
145+
dmResource::PreloadHint(params->m_HintInfo, ddf->m_SpineJson);
146+
dmResource::PreloadHint(params->m_HintInfo, ddf->m_Atlas);
147147

148-
*params.m_PreloadData = ddf;
148+
*params->m_PreloadData = ddf;
149149
return dmResource::RESULT_OK;
150150
}
151151

152-
static dmResource::Result ResourceTypeScene_Create(const dmResource::ResourceCreateParams& params)
152+
static dmResource::Result ResourceTypeScene_Create(const dmResource::ResourceCreateParams* params)
153153
{
154154
SpineSceneResource* scene_resource = new SpineSceneResource();
155-
scene_resource->m_Ddf = (dmGameSystemDDF::SpineSceneDesc*) params.m_PreloadData;
156-
dmResource::Result r = AcquireResources(params.m_Factory, scene_resource, params.m_Filename);
155+
scene_resource->m_Ddf = (dmGameSystemDDF::SpineSceneDesc*) params->m_PreloadData;
156+
dmResource::Result r = AcquireResources(params->m_Factory, scene_resource, params->m_Filename);
157157
if (r == dmResource::RESULT_OK)
158158
{
159-
params.m_Resource->m_Resource = (void*) scene_resource;
159+
dmResource::SetResource(params->m_Resource, scene_resource);
160160
}
161161
else
162162
{
163-
ReleaseResources(params.m_Factory, scene_resource);
163+
ReleaseResources(params->m_Factory, scene_resource);
164164
delete scene_resource;
165165
}
166166
return r;
167167
}
168168

169-
static dmResource::Result ResourceTypeScene_Destroy(const dmResource::ResourceDestroyParams& params)
169+
static dmResource::Result ResourceTypeScene_Destroy(const dmResource::ResourceDestroyParams* params)
170170
{
171-
SpineSceneResource* scene_resource = (SpineSceneResource*)params.m_Resource->m_Resource;
172-
ReleaseResources(params.m_Factory, scene_resource);
171+
SpineSceneResource* scene_resource = (SpineSceneResource*)dmResource::GetResource(params->m_Resource);
172+
ReleaseResources(params->m_Factory, scene_resource);
173173
delete scene_resource;
174174
return dmResource::RESULT_OK;
175175
}
176176

177-
static dmResource::Result ResourceTypeScene_Recreate(const dmResource::ResourceRecreateParams& params)
177+
static dmResource::Result ResourceTypeScene_Recreate(const dmResource::ResourceRecreateParams* params)
178178
{
179179
dmGameSystemDDF::SpineSceneDesc* ddf;
180-
dmDDF::Result e = dmDDF::LoadMessage(params.m_Buffer, params.m_BufferSize, &dmGameSystemDDF_SpineSceneDesc_DESCRIPTOR, (void**) &ddf);
180+
dmDDF::Result e = dmDDF::LoadMessage(params->m_Buffer, params->m_BufferSize, &dmGameSystemDDF_SpineSceneDesc_DESCRIPTOR, (void**) &ddf);
181181
if (e != dmDDF::RESULT_OK)
182182
{
183183
return dmResource::RESULT_DDF_ERROR;
184184
}
185-
SpineSceneResource* resource = (SpineSceneResource*)params.m_Resource->m_Resource;
186-
ReleaseResources(params.m_Factory, resource);
185+
SpineSceneResource* resource = (SpineSceneResource*)dmResource::GetResource(params->m_Resource);
186+
ReleaseResources(params->m_Factory, resource);
187187
resource->m_Ddf = ddf;
188-
return AcquireResources(params.m_Factory, resource, params.m_Filename);
188+
return AcquireResources(params->m_Factory, resource, params->m_Filename);
189189
}
190190

191-
static dmResource::Result ResourceTypeScene_Register(dmResource::ResourceTypeRegisterContext& ctx)
191+
static ResourceResult ResourceTypeScene_Register(HResourceTypeContext ctx, HResourceType type)
192192
{
193-
return dmResource::RegisterType(ctx.m_Factory,
194-
ctx.m_Name,
195-
0, // context
196-
ResourceTypeScene_Preload,
197-
ResourceTypeScene_Create,
198-
0, // post create
199-
ResourceTypeScene_Destroy,
200-
ResourceTypeScene_Recreate);
193+
return (ResourceResult)dmResource::SetupType(ctx,
194+
type,
195+
0, // context
196+
ResourceTypeScene_Preload,
197+
ResourceTypeScene_Create,
198+
0, // post create
199+
ResourceTypeScene_Destroy,
200+
ResourceTypeScene_Recreate);
201201

202202
}
203203
}

0 commit comments

Comments
 (0)