Skip to content
This repository was archived by the owner on Apr 25, 2019. It is now read-only.

Commit 6fa3f6b

Browse files
4ian4ian
committed
Remove AdMobObject extension (replaced by AdMob extension)
1 parent 1993291 commit 6fa3f6b

File tree

6 files changed

+45
-296
lines changed

6 files changed

+45
-296
lines changed

‎Bindings/Bindings.idl

-29
Original file line numberDiff line numberDiff line change
@@ -1947,35 +1947,6 @@ interface PanelSpriteObject {
19471947
void UnserializeFrom([Ref] Project project, [Const, Ref] SerializerElement element);
19481948
};
19491949

1950-
interface AdMobObject {
1951-
void AdMobObject([Const] DOMString name);
1952-
1953-
//Inherited from gdObject:
1954-
void SetName([Const] DOMString name);
1955-
[Const, Ref] DOMString GetName();
1956-
void SetType([Const] DOMString type);
1957-
[Const, Ref] DOMString GetType();
1958-
1959-
[Value] MapStringPropertyDescriptor GetProperties([Ref] Project project);
1960-
boolean UpdateProperty([Const] DOMString name, [Const] DOMString value, [Ref] Project project);
1961-
1962-
[Value] MapStringPropertyDescriptor GetInitialInstanceProperties([Const, Ref] InitialInstance instance, [Ref] Project project, [Ref] Layout scene);
1963-
boolean UpdateInitialInstanceProperty([Ref] InitialInstance instance, [Const] DOMString name, [Const] DOMString value, [Ref] Project project, [Ref] Layout scene);
1964-
1965-
void ExposeResources([Ref] ArbitraryResourceWorker worker);
1966-
1967-
[Ref] VariablesContainer GetVariables();
1968-
[Value] VectorString GetAllBehaviorNames();
1969-
boolean HasBehaviorNamed([Const] DOMString name);
1970-
Behavior AddNewBehavior([Ref] Project project, [Const] DOMString type, [Const] DOMString name);
1971-
[Ref] Behavior GetBehavior([Const] DOMString name);
1972-
void RemoveBehavior([Const] DOMString name);
1973-
boolean RenameBehavior([Const] DOMString oldBame, [Const] DOMString name);
1974-
1975-
void SerializeTo([Ref] SerializerElement element);
1976-
void UnserializeFrom([Ref] Project project, [Const, Ref] SerializerElement element);
1977-
};
1978-
19791950
interface ShapePainterObject {
19801951
void ShapePainterObject([Const] DOMString name);
19811952

‎Bindings/Wrapper.cpp

-1
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,6 @@
5656
#include <GDCore/Extensions/Builtin/SpriteExtension/Sprite.h>
5757
#include <GDCore/Extensions/Builtin/SpriteExtension/SpriteObject.h>
5858

59-
#include "../../Extensions/AdMobObject/AdMobObject.h"
6059
#include "../../Extensions/PanelSpriteObject/PanelSpriteObject.h"
6160
#include "../../Extensions/ParticleSystem/ParticleEmitterObject.h"
6261
#include "../../Extensions/PrimitiveDrawing/ShapePainterObject.h"

‎Bindings/glue.cpp

+8-85
Original file line numberDiff line numberDiff line change
@@ -1153,6 +1153,14 @@ const char* EMSCRIPTEN_KEEPALIVE emscripten_bind_Project_GetOrientation_0(Projec
11531153
return self->GetOrientation().c_str();
11541154
}
11551155

1156+
void EMSCRIPTEN_KEEPALIVE emscripten_bind_Project_SetAdMobAppId_1(Project* self, const char* arg0) {
1157+
self->SetAdMobAppId(arg0);
1158+
}
1159+
1160+
const char* EMSCRIPTEN_KEEPALIVE emscripten_bind_Project_GetAdMobAppId_0(Project* self) {
1161+
return self->GetAdMobAppId().c_str();
1162+
}
1163+
11561164
void EMSCRIPTEN_KEEPALIVE emscripten_bind_Project_SetProjectFile_1(Project* self, const char* arg0) {
11571165
self->SetProjectFile(arg0);
11581166
}
@@ -1906,91 +1914,6 @@ void EMSCRIPTEN_KEEPALIVE emscripten_bind_ExtensionAndInstructionMetadata___dest
19061914
delete self;
19071915
}
19081916

1909-
// AdMobObject
1910-
1911-
AdMobObject* EMSCRIPTEN_KEEPALIVE emscripten_bind_AdMobObject_AdMobObject_1(const char* arg0) {
1912-
return new AdMobObject(arg0);
1913-
}
1914-
1915-
void EMSCRIPTEN_KEEPALIVE emscripten_bind_AdMobObject_SetName_1(AdMobObject* self, const char* arg0) {
1916-
self->SetName(arg0);
1917-
}
1918-
1919-
const char* EMSCRIPTEN_KEEPALIVE emscripten_bind_AdMobObject_GetName_0(AdMobObject* self) {
1920-
return self->GetName().c_str();
1921-
}
1922-
1923-
void EMSCRIPTEN_KEEPALIVE emscripten_bind_AdMobObject_SetType_1(AdMobObject* self, const char* arg0) {
1924-
self->SetType(arg0);
1925-
}
1926-
1927-
const char* EMSCRIPTEN_KEEPALIVE emscripten_bind_AdMobObject_GetType_0(AdMobObject* self) {
1928-
return self->GetType().c_str();
1929-
}
1930-
1931-
MapStringPropertyDescriptor* EMSCRIPTEN_KEEPALIVE emscripten_bind_AdMobObject_GetProperties_1(AdMobObject* self, Project* arg0) {
1932-
static MapStringPropertyDescriptor temp;
1933-
return (temp = self->GetProperties(*arg0), &temp);
1934-
}
1935-
1936-
bool EMSCRIPTEN_KEEPALIVE emscripten_bind_AdMobObject_UpdateProperty_3(AdMobObject* self, const char* arg0, const char* arg1, Project* arg2) {
1937-
return self->UpdateProperty(arg0, arg1, *arg2);
1938-
}
1939-
1940-
MapStringPropertyDescriptor* EMSCRIPTEN_KEEPALIVE emscripten_bind_AdMobObject_GetInitialInstanceProperties_3(AdMobObject* self, const InitialInstance* arg0, Project* arg1, Layout* arg2) {
1941-
static MapStringPropertyDescriptor temp;
1942-
return (temp = self->GetInitialInstanceProperties(*arg0, *arg1, *arg2), &temp);
1943-
}
1944-
1945-
bool EMSCRIPTEN_KEEPALIVE emscripten_bind_AdMobObject_UpdateInitialInstanceProperty_5(AdMobObject* self, InitialInstance* arg0, const char* arg1, const char* arg2, Project* arg3, Layout* arg4) {
1946-
return self->UpdateInitialInstanceProperty(*arg0, arg1, arg2, *arg3, *arg4);
1947-
}
1948-
1949-
void EMSCRIPTEN_KEEPALIVE emscripten_bind_AdMobObject_ExposeResources_1(AdMobObject* self, ArbitraryResourceWorker* arg0) {
1950-
self->ExposeResources(*arg0);
1951-
}
1952-
1953-
VariablesContainer* EMSCRIPTEN_KEEPALIVE emscripten_bind_AdMobObject_GetVariables_0(AdMobObject* self) {
1954-
return &self->GetVariables();
1955-
}
1956-
1957-
VectorString* EMSCRIPTEN_KEEPALIVE emscripten_bind_AdMobObject_GetAllBehaviorNames_0(AdMobObject* self) {
1958-
static VectorString temp;
1959-
return (temp = self->GetAllBehaviorNames(), &temp);
1960-
}
1961-
1962-
bool EMSCRIPTEN_KEEPALIVE emscripten_bind_AdMobObject_HasBehaviorNamed_1(AdMobObject* self, const char* arg0) {
1963-
return self->HasBehaviorNamed(arg0);
1964-
}
1965-
1966-
Behavior* EMSCRIPTEN_KEEPALIVE emscripten_bind_AdMobObject_AddNewBehavior_3(AdMobObject* self, Project* arg0, const char* arg1, const char* arg2) {
1967-
return self->AddNewBehavior(*arg0, arg1, arg2);
1968-
}
1969-
1970-
Behavior* EMSCRIPTEN_KEEPALIVE emscripten_bind_AdMobObject_GetBehavior_1(AdMobObject* self, const char* arg0) {
1971-
return &self->GetBehavior(arg0);
1972-
}
1973-
1974-
void EMSCRIPTEN_KEEPALIVE emscripten_bind_AdMobObject_RemoveBehavior_1(AdMobObject* self, const char* arg0) {
1975-
self->RemoveBehavior(arg0);
1976-
}
1977-
1978-
bool EMSCRIPTEN_KEEPALIVE emscripten_bind_AdMobObject_RenameBehavior_2(AdMobObject* self, const char* arg0, const char* arg1) {
1979-
return self->RenameBehavior(arg0, arg1);
1980-
}
1981-
1982-
void EMSCRIPTEN_KEEPALIVE emscripten_bind_AdMobObject_SerializeTo_1(AdMobObject* self, SerializerElement* arg0) {
1983-
self->SerializeTo(*arg0);
1984-
}
1985-
1986-
void EMSCRIPTEN_KEEPALIVE emscripten_bind_AdMobObject_UnserializeFrom_2(AdMobObject* self, Project* arg0, const SerializerElement* arg1) {
1987-
self->UnserializeFrom(*arg0, *arg1);
1988-
}
1989-
1990-
void EMSCRIPTEN_KEEPALIVE emscripten_bind_AdMobObject___destroy___0(AdMobObject* self) {
1991-
delete self;
1992-
}
1993-
19941917
// ExternalLayout
19951918

19961919
ExternalLayout* EMSCRIPTEN_KEEPALIVE emscripten_bind_ExternalLayout_ExternalLayout_0() {

‎Bindings/glue.js

+13-156
Original file line numberDiff line numberDiff line change
@@ -1948,6 +1948,19 @@ Project.prototype['GetOrientation'] = Project.prototype.GetOrientation = /** @su
19481948
return Pointer_stringify(_emscripten_bind_Project_GetOrientation_0(self));
19491949
};;
19501950

1951+
Project.prototype['SetAdMobAppId'] = Project.prototype.SetAdMobAppId = /** @suppress {undefinedVars, duplicate} */function(arg0) {
1952+
var self = this.ptr;
1953+
ensureCache.prepare();
1954+
if (arg0 && typeof arg0 === 'object') arg0 = arg0.ptr;
1955+
else arg0 = ensureString(arg0);
1956+
_emscripten_bind_Project_SetAdMobAppId_1(self, arg0);
1957+
};;
1958+
1959+
Project.prototype['GetAdMobAppId'] = Project.prototype.GetAdMobAppId = /** @suppress {undefinedVars, duplicate} */function() {
1960+
var self = this.ptr;
1961+
return Pointer_stringify(_emscripten_bind_Project_GetAdMobAppId_0(self));
1962+
};;
1963+
19511964
Project.prototype['SetProjectFile'] = Project.prototype.SetProjectFile = /** @suppress {undefinedVars, duplicate} */function(arg0) {
19521965
var self = this.ptr;
19531966
ensureCache.prepare();
@@ -3210,162 +3223,6 @@ ExtensionAndInstructionMetadata.prototype['GetMetadata'] = ExtensionAndInstructi
32103223
var self = this.ptr;
32113224
_emscripten_bind_ExtensionAndInstructionMetadata___destroy___0(self);
32123225
};
3213-
// AdMobObject
3214-
/** @suppress {undefinedVars, duplicate} */function AdMobObject(arg0) {
3215-
ensureCache.prepare();
3216-
if (arg0 && typeof arg0 === 'object') arg0 = arg0.ptr;
3217-
else arg0 = ensureString(arg0);
3218-
this.ptr = _emscripten_bind_AdMobObject_AdMobObject_1(arg0);
3219-
getCache(AdMobObject)[this.ptr] = this;
3220-
};;
3221-
AdMobObject.prototype = Object.create(WrapperObject.prototype);
3222-
AdMobObject.prototype.constructor = AdMobObject;
3223-
AdMobObject.prototype.__class__ = AdMobObject;
3224-
AdMobObject.__cache__ = {};
3225-
Module['AdMobObject'] = AdMobObject;
3226-
3227-
AdMobObject.prototype['SetName'] = AdMobObject.prototype.SetName = /** @suppress {undefinedVars, duplicate} */function(arg0) {
3228-
var self = this.ptr;
3229-
ensureCache.prepare();
3230-
if (arg0 && typeof arg0 === 'object') arg0 = arg0.ptr;
3231-
else arg0 = ensureString(arg0);
3232-
_emscripten_bind_AdMobObject_SetName_1(self, arg0);
3233-
};;
3234-
3235-
AdMobObject.prototype['GetName'] = AdMobObject.prototype.GetName = /** @suppress {undefinedVars, duplicate} */function() {
3236-
var self = this.ptr;
3237-
return Pointer_stringify(_emscripten_bind_AdMobObject_GetName_0(self));
3238-
};;
3239-
3240-
AdMobObject.prototype['SetType'] = AdMobObject.prototype.SetType = /** @suppress {undefinedVars, duplicate} */function(arg0) {
3241-
var self = this.ptr;
3242-
ensureCache.prepare();
3243-
if (arg0 && typeof arg0 === 'object') arg0 = arg0.ptr;
3244-
else arg0 = ensureString(arg0);
3245-
_emscripten_bind_AdMobObject_SetType_1(self, arg0);
3246-
};;
3247-
3248-
AdMobObject.prototype['GetType'] = AdMobObject.prototype.GetType = /** @suppress {undefinedVars, duplicate} */function() {
3249-
var self = this.ptr;
3250-
return Pointer_stringify(_emscripten_bind_AdMobObject_GetType_0(self));
3251-
};;
3252-
3253-
AdMobObject.prototype['GetProperties'] = AdMobObject.prototype.GetProperties = /** @suppress {undefinedVars, duplicate} */function(arg0) {
3254-
var self = this.ptr;
3255-
if (arg0 && typeof arg0 === 'object') arg0 = arg0.ptr;
3256-
return wrapPointer(_emscripten_bind_AdMobObject_GetProperties_1(self, arg0), MapStringPropertyDescriptor);
3257-
};;
3258-
3259-
AdMobObject.prototype['UpdateProperty'] = AdMobObject.prototype.UpdateProperty = /** @suppress {undefinedVars, duplicate} */function(arg0, arg1, arg2) {
3260-
var self = this.ptr;
3261-
ensureCache.prepare();
3262-
if (arg0 && typeof arg0 === 'object') arg0 = arg0.ptr;
3263-
else arg0 = ensureString(arg0);
3264-
if (arg1 && typeof arg1 === 'object') arg1 = arg1.ptr;
3265-
else arg1 = ensureString(arg1);
3266-
if (arg2 && typeof arg2 === 'object') arg2 = arg2.ptr;
3267-
return !!(_emscripten_bind_AdMobObject_UpdateProperty_3(self, arg0, arg1, arg2));
3268-
};;
3269-
3270-
AdMobObject.prototype['GetInitialInstanceProperties'] = AdMobObject.prototype.GetInitialInstanceProperties = /** @suppress {undefinedVars, duplicate} */function(arg0, arg1, arg2) {
3271-
var self = this.ptr;
3272-
if (arg0 && typeof arg0 === 'object') arg0 = arg0.ptr;
3273-
if (arg1 && typeof arg1 === 'object') arg1 = arg1.ptr;
3274-
if (arg2 && typeof arg2 === 'object') arg2 = arg2.ptr;
3275-
return wrapPointer(_emscripten_bind_AdMobObject_GetInitialInstanceProperties_3(self, arg0, arg1, arg2), MapStringPropertyDescriptor);
3276-
};;
3277-
3278-
AdMobObject.prototype['UpdateInitialInstanceProperty'] = AdMobObject.prototype.UpdateInitialInstanceProperty = /** @suppress {undefinedVars, duplicate} */function(arg0, arg1, arg2, arg3, arg4) {
3279-
var self = this.ptr;
3280-
ensureCache.prepare();
3281-
if (arg0 && typeof arg0 === 'object') arg0 = arg0.ptr;
3282-
if (arg1 && typeof arg1 === 'object') arg1 = arg1.ptr;
3283-
else arg1 = ensureString(arg1);
3284-
if (arg2 && typeof arg2 === 'object') arg2 = arg2.ptr;
3285-
else arg2 = ensureString(arg2);
3286-
if (arg3 && typeof arg3 === 'object') arg3 = arg3.ptr;
3287-
if (arg4 && typeof arg4 === 'object') arg4 = arg4.ptr;
3288-
return !!(_emscripten_bind_AdMobObject_UpdateInitialInstanceProperty_5(self, arg0, arg1, arg2, arg3, arg4));
3289-
};;
3290-
3291-
AdMobObject.prototype['ExposeResources'] = AdMobObject.prototype.ExposeResources = /** @suppress {undefinedVars, duplicate} */function(arg0) {
3292-
var self = this.ptr;
3293-
if (arg0 && typeof arg0 === 'object') arg0 = arg0.ptr;
3294-
_emscripten_bind_AdMobObject_ExposeResources_1(self, arg0);
3295-
};;
3296-
3297-
AdMobObject.prototype['GetVariables'] = AdMobObject.prototype.GetVariables = /** @suppress {undefinedVars, duplicate} */function() {
3298-
var self = this.ptr;
3299-
return wrapPointer(_emscripten_bind_AdMobObject_GetVariables_0(self), VariablesContainer);
3300-
};;
3301-
3302-
AdMobObject.prototype['GetAllBehaviorNames'] = AdMobObject.prototype.GetAllBehaviorNames = /** @suppress {undefinedVars, duplicate} */function() {
3303-
var self = this.ptr;
3304-
return wrapPointer(_emscripten_bind_AdMobObject_GetAllBehaviorNames_0(self), VectorString);
3305-
};;
3306-
3307-
AdMobObject.prototype['HasBehaviorNamed'] = AdMobObject.prototype.HasBehaviorNamed = /** @suppress {undefinedVars, duplicate} */function(arg0) {
3308-
var self = this.ptr;
3309-
ensureCache.prepare();
3310-
if (arg0 && typeof arg0 === 'object') arg0 = arg0.ptr;
3311-
else arg0 = ensureString(arg0);
3312-
return !!(_emscripten_bind_AdMobObject_HasBehaviorNamed_1(self, arg0));
3313-
};;
3314-
3315-
AdMobObject.prototype['AddNewBehavior'] = AdMobObject.prototype.AddNewBehavior = /** @suppress {undefinedVars, duplicate} */function(arg0, arg1, arg2) {
3316-
var self = this.ptr;
3317-
ensureCache.prepare();
3318-
if (arg0 && typeof arg0 === 'object') arg0 = arg0.ptr;
3319-
if (arg1 && typeof arg1 === 'object') arg1 = arg1.ptr;
3320-
else arg1 = ensureString(arg1);
3321-
if (arg2 && typeof arg2 === 'object') arg2 = arg2.ptr;
3322-
else arg2 = ensureString(arg2);
3323-
return wrapPointer(_emscripten_bind_AdMobObject_AddNewBehavior_3(self, arg0, arg1, arg2), Behavior);
3324-
};;
3325-
3326-
AdMobObject.prototype['GetBehavior'] = AdMobObject.prototype.GetBehavior = /** @suppress {undefinedVars, duplicate} */function(arg0) {
3327-
var self = this.ptr;
3328-
ensureCache.prepare();
3329-
if (arg0 && typeof arg0 === 'object') arg0 = arg0.ptr;
3330-
else arg0 = ensureString(arg0);
3331-
return wrapPointer(_emscripten_bind_AdMobObject_GetBehavior_1(self, arg0), Behavior);
3332-
};;
3333-
3334-
AdMobObject.prototype['RemoveBehavior'] = AdMobObject.prototype.RemoveBehavior = /** @suppress {undefinedVars, duplicate} */function(arg0) {
3335-
var self = this.ptr;
3336-
ensureCache.prepare();
3337-
if (arg0 && typeof arg0 === 'object') arg0 = arg0.ptr;
3338-
else arg0 = ensureString(arg0);
3339-
_emscripten_bind_AdMobObject_RemoveBehavior_1(self, arg0);
3340-
};;
3341-
3342-
AdMobObject.prototype['RenameBehavior'] = AdMobObject.prototype.RenameBehavior = /** @suppress {undefinedVars, duplicate} */function(arg0, arg1) {
3343-
var self = this.ptr;
3344-
ensureCache.prepare();
3345-
if (arg0 && typeof arg0 === 'object') arg0 = arg0.ptr;
3346-
else arg0 = ensureString(arg0);
3347-
if (arg1 && typeof arg1 === 'object') arg1 = arg1.ptr;
3348-
else arg1 = ensureString(arg1);
3349-
return !!(_emscripten_bind_AdMobObject_RenameBehavior_2(self, arg0, arg1));
3350-
};;
3351-
3352-
AdMobObject.prototype['SerializeTo'] = AdMobObject.prototype.SerializeTo = /** @suppress {undefinedVars, duplicate} */function(arg0) {
3353-
var self = this.ptr;
3354-
if (arg0 && typeof arg0 === 'object') arg0 = arg0.ptr;
3355-
_emscripten_bind_AdMobObject_SerializeTo_1(self, arg0);
3356-
};;
3357-
3358-
AdMobObject.prototype['UnserializeFrom'] = AdMobObject.prototype.UnserializeFrom = /** @suppress {undefinedVars, duplicate} */function(arg0, arg1) {
3359-
var self = this.ptr;
3360-
if (arg0 && typeof arg0 === 'object') arg0 = arg0.ptr;
3361-
if (arg1 && typeof arg1 === 'object') arg1 = arg1.ptr;
3362-
_emscripten_bind_AdMobObject_UnserializeFrom_2(self, arg0, arg1);
3363-
};;
3364-
3365-
AdMobObject.prototype['__destroy__'] = AdMobObject.prototype.__destroy__ = /** @suppress {undefinedVars, duplicate} */function() {
3366-
var self = this.ptr;
3367-
_emscripten_bind_AdMobObject___destroy___0(self);
3368-
};
33693226
// ExternalLayout
33703227
/** @suppress {undefinedVars, duplicate} */function ExternalLayout() {
33713228
this.ptr = _emscripten_bind_ExternalLayout_ExternalLayout_0();

‎CMakeLists.txt

-1
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,6 @@ target_link_libraries(GD TiledSpriteObject)
8787
target_link_libraries(GD DraggableBehavior)
8888
target_link_libraries(GD TopDownMovementBehavior)
8989
target_link_libraries(GD TextObject)
90-
target_link_libraries(GD AdMobObject)
9190
target_link_libraries(GD PanelSpriteObject)
9291
target_link_libraries(GD AnchorBehavior)
9392
target_link_libraries(GD PrimitiveDrawing)

0 commit comments

Comments
 (0)