dmSDK: Added possibility to load collection proxies and spawn factories from C++

engine/engine/src/engine.cpp

@@ -3,10 +3,10 @@
 // Copyright 2009-2014 Ragnar Svensson, Christian Murray
 // Licensed under the Defold License version 1.0 (the "License"); you may not use
 // this file except in compliance with the License.
-// 
+//
 // You may obtain a copy of the License, together with FAQs at
 // https://www.defold.com/license
-// 
+//
 // Unless required by applicable law or agreed to in writing, software distributed
 // under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 // CONDITIONS OF ANY KIND, either express or implied. See the License for the
@@ -274,6 +274,20 @@ namespace dmEngine
 
     void Delete(HEngine engine)
     {
+        {
+            dmExtension::Params params;
+            params.m_ConfigFile = engine->m_Config;
+            params.m_ResourceFactory = engine->m_Factory;
+            if (engine->m_SharedScriptContext) {
+                params.m_L = dmScript::GetLuaState(engine->m_SharedScriptContext);
+            } else {
+                params.m_L = dmScript::GetLuaState(engine->m_GOScriptContext);
+            }
+            dmExtension::Event event;
+            event.m_Event = dmExtension::EVENT_ID_ENGINE_DELETE;
+            dmExtension::DispatchEvent( &params, &event );
+        }
+
         if (engine->m_MainCollection)
             dmResource::Release(engine->m_Factory, engine->m_MainCollection);
         dmGameObject::PostUpdate(engine->m_Register);
@@ -1392,6 +1406,20 @@ namespace dmEngine
             dmEngineService::InitProfiler(engine->m_EngineService, engine->m_Factory, engine->m_Register);
         }
 
+        {
+            dmExtension::Params params;
+            params.m_ConfigFile = engine->m_Config;
+            params.m_ResourceFactory = engine->m_Factory;
+            if (engine->m_SharedScriptContext) {
+                params.m_L = dmScript::GetLuaState(engine->m_SharedScriptContext);
+            } else {
+                params.m_L = dmScript::GetLuaState(engine->m_GOScriptContext);
+            }
+            dmExtension::Event event;
+            event.m_Event = dmExtension::EVENT_ID_ENGINE_INITIALIZED;
+            dmExtension::DispatchEvent( &params, &event );
+        }
+
         engine->m_PreviousFrameTime = dmTime::GetTime();
 
         return true;

engine/extension/src/dmsdk/extension/extension.h

@@ -3,10 +3,10 @@
 // Copyright 2009-2014 Ragnar Svensson, Christian Murray
 // Licensed under the Defold License version 1.0 (the "License"); you may not use
 // this file except in compliance with the License.
-// 
+//
 // You may obtain a copy of the License, together with FAQs at
 // https://www.defold.com/license
-// 
+//
 // Unless required by applicable law or agreed to in writing, software distributed
 // under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 // CONDITIONS OF ANY KIND, either express or implied. See the License for the
@@ -118,6 +118,9 @@ namespace dmExtension
         EVENT_ID_DEACTIVATEAPP,
         EVENT_ID_ICONIFYAPP,
         EVENT_ID_DEICONIFYAPP,
+
+        EVENT_ID_ENGINE_INITIALIZED,// After Init() has been run, before first Step()
+        EVENT_ID_ENGINE_DELETE,     // At the top of the Delete() of the engine
     };
 
     /*# extra callback enumeration

engine/gameobject/src/dmsdk/gameobject/component.h

@@ -3,10 +3,10 @@
 // Copyright 2009-2014 Ragnar Svensson, Christian Murray
 // Licensed under the Defold License version 1.0 (the "License"); you may not use
 // this file except in compliance with the License.
-// 
+//
 // You may obtain a copy of the License, together with FAQs at
 // https://www.defold.com/license
-// 
+//
 // Unless required by applicable law or agreed to in writing, software distributed
 // under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 // CONDITIONS OF ANY KIND, either express or implied. See the License for the
@@ -217,9 +217,9 @@ namespace dmGameObject
     struct ComponentGetParams
     {
         /// Component world
-        void* m_World;
+        dmGameObject::HComponentWorld       m_World;
         /// User data storage pointer
-        uintptr_t* m_UserData;
+        dmGameObject::HComponentInternal    m_UserData;
     };
 
     /*#

engine/gameobject/src/dmsdk/gameobject/gameobject.h

@@ -3,10 +3,10 @@
 // Copyright 2009-2014 Ragnar Svensson, Christian Murray
 // Licensed under the Defold License version 1.0 (the "License"); you may not use
 // this file except in compliance with the License.
-// 
+//
 // You may obtain a copy of the License, together with FAQs at
 // https://www.defold.com/license
-// 
+//
 // Unless required by applicable law or agreed to in writing, software distributed
 // under the License is distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR
 // CONDITIONS OF ANY KIND, either express or implied. See the License for the
@@ -86,6 +86,34 @@ namespace dmGameObject
      */
     typedef struct CollectionHandle* HCollection;
 
+    /*#
+     * Handle to a list of properties (gameobject_props.h)
+     * @typedef
+     * @name HPropertyContainer
+     */
+    typedef struct PropertyContainer* HPropertyContainer;
+
+    /*#
+     * Opaque handle to component instance
+     * @typedef
+     * @name HComponent
+     */
+    typedef void* HComponent;
+
+    /*#
+     * Opaque handle to internal representation of a component instance
+     * @typedef
+     * @name HComponentInternal
+     */
+    typedef uintptr_t HComponentInternal;
+
+    /*#
+     * Opaque handle to a component world
+     * @typedef
+     * @name HComponentWorld
+     */
+    typedef void* HComponentWorld;
+
     typedef void* HCollectionDesc;
 
     /*#
@@ -473,6 +501,22 @@ namespace dmGameObject
      */
     dmMessage::HSocket GetMessageSocket(HCollection collection);
 
+    /*# spawn a new game object
+     * Spawns a new gameobject instance. The actual creation is performed after the update is completed.
+     * @name Spawn
+     * @param collection [type: HCollection] Gameobject collection
+     * @param prototype [type: HPrototype] Prototype
+     * @param prototype_name [type: const char*] Prototype file name (.goc)
+     * @param id [type: dmhash_t] Id of the spawned instance
+     * @param properties [type: HPropertyContainer] Container with override properties
+     * @param position [type: dmVMath::Vector3] Position of the spawed object
+     * @param rotation [type: dmVMath::Quat] Rotation of the spawned object
+     * @param scale [type: dmVMath::Vector3] Scale of the spawned object
+     * return instance [type: HInstance] the spawned instance, 0 at failure
+     */
+    HInstance Spawn(HCollection collection, HPrototype prototype, const char* prototype_name, dmhash_t id,
+                      HPropertyContainer properties, const dmVMath::Point3& position, const dmVMath::Quat& rotation, const dmVMath::Vector3& scale);
+
     /*#
      * Retrieve a collection from the specified instance
      * @name GetCollection
@@ -560,6 +604,9 @@ namespace dmGameObject
      */
     Result GetComponentId(HInstance instance, uint16_t component_index, dmhash_t* component_id);
 
+    // Get the component, component type and its world
+    Result GetComponent(HInstance instance, dmhash_t component_id, uint32_t* component_type, HComponent* component, HComponentWorld* out_world);
+
     /*# set position
      * Set gameobject instance position
      * @name SetPosition
@@ -728,6 +775,31 @@ namespace dmGameObject
      */
     HInstance GetParent(HInstance instance);
 
+    /*#
+     * Get the component type index
+     * @name GetComponentTypeIndex
+     * @param collection Collection handle
+     * @param type_hash [type:dhmash_t] The hashed name of the registered component type (e.g. dmHashString("guic"))
+     * @return type_index [type:uint32_t] The component type index. 0xFFFFFFFF if not found
+     */
+    uint32_t GetComponentTypeIndex(HCollection collection, dmhash_t type_hash);
+
+    /*#
+     * Retrieve the world in the collection connected to the supplied component
+     * @param collection Collection handle
+     * @param component_type_index index of the component type
+     * @return world [type:void*] The pointer to the world, 0x0 if not found
+     */
+    HComponentWorld GetWorld(HCollection collection, uint32_t component_type_index);
+
+    /*#
+     * Retrieve the context for a component type
+     * @param collection Collection handle
+     * @param component_type_index index of the component type
+     * @return context [type:void*] The pointer to the context, 0x0 if not found
+     */
+    void* GetContext(HCollection collection, uint32_t component_type_index);
+
 
     // These functions are used for profiling functionality
 
@@ -976,4 +1048,3 @@ namespace dmGameObject
 }
 
 #endif // DMSDK_GAMEOBJECT_H
-