/*
- * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
}
Light::Light()
-: CustomActorImpl(ActorFlags::DISABLE_SIZE_NEGOTIATION)
+: Control(static_cast<ControlBehaviour>(ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS | ActorFlags::DISABLE_SIZE_NEGOTIATION))
{
}
#define DALI_SCENE3D_LIGHT_IMPL_H
/*
- * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*/
// EXTERNAL INCLUDES
-#include <dali/public-api/actors/custom-actor-impl.h>
+#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali/public-api/common/dali-common.h>
#include <dali/public-api/object/weak-handle.h>
#include <string_view>
*
* @SINCE_2_2.32
*/
-class DALI_SCENE3D_API Light : public CustomActorImpl
+class DALI_SCENE3D_API Light : public Toolkit::Internal::Control
{
public:
// Creation & Destruction
void Initialize();
public: // Public Method
-
/**
* @copydoc Scene3D::Light::GetMaximumEnabledLightCount()
*/
/// @cond internal
// Not copyable or movable
- DALI_INTERNAL Light(const Light&) = delete; ///< Deleted copy constructor.
- DALI_INTERNAL Light(Light&&) = delete; ///< Deleted move constructor.
+ DALI_INTERNAL Light(const Light&) = delete; ///< Deleted copy constructor.
+ DALI_INTERNAL Light(Light&&) = delete; ///< Deleted move constructor.
DALI_INTERNAL Light& operator=(const Light&) = delete; ///< Deleted copy assignment operator.
- DALI_INTERNAL Light& operator=(Light&&) = delete; ///< Deleted move assignment operator.
+ DALI_INTERNAL Light& operator=(Light&&) = delete; ///< Deleted move assignment operator.
private:
Dali::CameraActor mLightSourceActor;
/*
- * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
}
ModelNode::ModelNode()
-: CustomActorImpl(ActorFlags::DISABLE_SIZE_NEGOTIATION)
+: Control(static_cast<ControlBehaviour>(ControlBehaviour::DISABLE_STYLE_CHANGE_SIGNALS | ActorFlags::DISABLE_SIZE_NEGOTIATION))
{
}
#define DALI_SCENE3D_MODEL_COMPONENTS_MODEL_NODE_IMPL_H
/*
- * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*/
// EXTERNAL INCLUDES
+#include <dali-toolkit/public-api/controls/control-impl.h>
#include <dali/devel-api/common/map-wrapper.h>
-#include <dali/public-api/actors/custom-actor-impl.h>
#include <dali/public-api/common/dali-common.h>
#include <memory> // for std::unique_ptr
#include <string>
*
* @SINCE_2_2.99
*/
-class DALI_SCENE3D_API ModelNode : public CustomActorImpl, public ModelPrimitiveModifyObserver
+class DALI_SCENE3D_API ModelNode : public Toolkit::Internal::Control, public ModelPrimitiveModifyObserver
{
public:
using ModelPrimitiveContainer = std::vector<Scene3D::ModelPrimitive>;
/*
- * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
}
Light::Light(Internal::Light& implementation)
-: CustomActor(implementation)
+: Control(implementation)
{
}
Light::Light(Dali::Internal::CustomActor* internal)
-: CustomActor(internal)
+: Control(internal)
{
// Can have a NULL pointer so we only need to check if the internal implementation is our class
// when there is a value.
#define DALI_SCENE3D_LIGHT_H
/*
- * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
* @endcode
* @SINCE_2_2.32
*/
-class DALI_SCENE3D_API Light : public Dali::CustomActor
+class DALI_SCENE3D_API Light : public Dali::Toolkit::Control
{
public:
/**
/*
- * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
}
ModelNode::ModelNode(Internal::ModelNode& implementation)
-: CustomActor(implementation)
+: Control(implementation)
{
}
ModelNode::ModelNode(Dali::Internal::CustomActor* internal)
-: CustomActor(internal)
+: Control(internal)
{
// Can have a NULL pointer so we only need to check if the internal implementation is our class
// when there is a value.
#define DALI_SCENE3D_MODEL_COMPONENTS_MODEL_NODE_H
/*
- * Copyright (c) 2023 Samsung Electronics Co., Ltd.
+ * Copyright (c) 2024 Samsung Electronics Co., Ltd.
*
* Licensed under the Apache License, Version 2.0 (the "License");
* you may not use this file except in compliance with the License.
*/
// EXTERNAL INCLUDES
-#include <dali/public-api/actors/custom-actor.h>
+#include <dali-toolkit/public-api/controls/control.h>
#include <dali/public-api/common/dali-common.h>
// INTERNAL INCLUDES
* material.SetProperty(PropertyIndex, PropertyValue);
* @endcode
*/
-class DALI_SCENE3D_API ModelNode : public Dali::CustomActor
+class DALI_SCENE3D_API ModelNode : public Dali::Toolkit::Control
{
public:
/**