*/
AnimatableVertex(const AnimatableVertex& vertex);
+ /**
+ * @brief Undefined Assignment Operator
+ */
+ AnimatableVertex& operator=(const AnimatableVertex& vertex);
+
int mVertex; ///< The index of this vertex in the parent mesh
Internal::AnimatableMesh& mMesh; ///< The parent mesh
};
Constrainable(const Constrainable& handle);
/**
- * @brief This assignment operator is required for (smart) pointer semantics.
- *
- * @param [in] rhs A reference to the copied handle
- * @return A reference to this
- */
- Constrainable& operator=(const Handle& rhs);
-
- /**
* @copydoc Dali::BaseHandle::operator=
*/
using BaseHandle::operator=;
{
Touch, ///< A touch event, when the user interacts with the screen.
Key, ///< A key pressed event, from the virtual or external keyboard.
- Notification, ///< @deprecated; Use Core::ProcessEvents() instead.
Gesture, ///< A Gesture event has been detected.
MouseWheel ///< A mouse wheel event, when the mouse wheel is being rolled from an external mouse.
};
std::string LightTypeString(const LightType type)
{
- std::string ret;
+ std::string ret("AMBIENT");
- if(type == AMBIENT)
+ switch ( type )
{
- ret = "AMBIENT" ;
- }
- else if(type == DIRECTIONAL)
- {
- ret = "DIRECTIONAL" ;
- }
- else if(type == SPOT)
- {
- ret = "SPOT" ;
- }
- else if(type == POINT)
- {
- ret = "POINT" ;
- }
- else
- {
- DALI_LOG_WARNING("Unknown Light Type:%d\n", type);
- ret = "AMBIENT";
- }
+ case AMBIENT:
+ {
+ ret = "AMBIENT";
+ break;
+ }
+
+ case DIRECTIONAL:
+ {
+ ret = "DIRECTIONAL";
+ break;
+ }
+ case SPOT:
+ {
+ ret = "SPOT";
+ break;
+ }
+ case POINT:
+ {
+ ret = "POINT";
+ break;
+ }
+ }
return ret;
}
-
-}
+} // namespace
LightActorPtr LightActor::New()
}
/**
+ * Copy from a PropertyInputAccessor
+ */
+ PropertyInputAccessor& operator=(const PropertyInputAccessor& accessor)
+ {
+ mInput = accessor.mInput;
+
+ return *this;
+ }
+
+ /**
* Set the property input.
*/
void SetInput( const PropertyInputImpl& input, int componentIndex )
}
/**
+ * Assign from a PropertyInputComponentAccessor
+ */
+ PropertyInputComponentAccessor& operator=(const PropertyInputComponentAccessor& accessor)
+ {
+ mInput = accessor.mInput;
+ mComponentIndex = accessor.mComponentIndex;
+ return *this;
+ }
+
+ /**
* Set the property input.
*/
void SetInput( const PropertyInputImpl& input, int componentIndex )
const Vector4* near = NULL;
const Vector4* far = NULL;
- if ( true || (pointA.z > 0.0f && pointB.z < 0.0f ))
+ if ( pointA.z > 0.0f && pointB.z < 0.0f )
{
near = &pointA;
far = &pointB;
Property::Index ProxyObject::GetPropertyIndex(const std::string& name) const
{
- Property::Index index = Property::INVALID_INDEX;
-
- index = GetDefaultPropertyIndex( name );
+ Property::Index index = GetDefaultPropertyIndex( name );
if ( index == Property::INVALID_INDEX )
{
TypeRegistry();
~TypeRegistry();
+ /**
+ * @brief Undefined Copy Constructor
+ */
TypeRegistry(TypeRegistry &);
- TypeRegistry &operator()(const TypeRegistry &);
+
+ /**
+ * @brief Undefined Assignment Operator
+ */
+ TypeRegistry& operator=(const TypeRegistry &);
};
break;
}
- case Event::Notification:
- {
- // TODO - Remove this deprecated event
- break;
- }
-
case Event::Gesture:
{
QueueGestureEvent( static_cast<const Integration::GestureEvent&>(event) );
break;
}
- default:
- {
- DALI_ASSERT_ALWAYS( false && "Invalid event sent from Integration\n" );
- break;
- }
}
}
break;
}
-
- default:
- {
- DALI_ASSERT_ALWAYS( false && "Invalid event sent from Integration\n" );
- break;
- }
}
}
break;
}
- default:
- {
- DALI_ASSERT_ALWAYS( false && "Invalid event sent from Integration\n" );
- break;
- }
-
- // Call virtual destructor explictly; since delete will not be called after placement new
- event->~Event();
}
+ // Call virtual destructor explictly; since delete will not be called after placement new
+ event->~Event();
}
queueToProcess->Reset();
case Gesture::Tap:
mTapGestureProcessor.Process(static_cast<const Integration::TapGestureEvent&>(event));
break;
-
- default:
- DALI_ASSERT_ALWAYS( false && "Invalid gesture type sent from Integration\n" );
- break;
}
}
mTapGestureProcessor.AddGestureDetector(tap);
break;
}
-
- default:
- DALI_ASSERT_DEBUG( false && "Invalid gesture detector type created\n" );
- break;
}
}
mTapGestureProcessor.RemoveGestureDetector(tap);
break;
}
-
- default:
- DALI_ASSERT_DEBUG( false && "Invalid gesture detector type removal request\n" );
- break;
}
}
mTapGestureProcessor.GestureDetectorUpdated(tap);
break;
}
-
- default:
- DALI_ASSERT_DEBUG( false && "Invalid gesture type update request\n" );
- break;
}
}
break; // result = 0
}
- default:
- {
- DALI_ASSERT_ALWAYS( false && "ResourceTypeId enumeration invalid" );
- break;
- }
}
}
return result;
return GetMaxSize();
}
-unsigned int GlyphAtlasSize::GetNextSize( unsigned int currentSize)
+unsigned int GlyphAtlasSize::GetNextSize( unsigned int currentSize )
{
for( std::size_t i = 0; i < ATLAS_SIZE_COUNT; ++i)
{
// find the atlas which is best suited to displaying the text string
GlyphAtlas* atlas = FindAtlas( text, format, fontId, bestRank);
+ DALI_ASSERT_DEBUG( atlas && "Find atlas should always return a valid atlas." );
+
// if the atlas is full, create a new larger one
if( bestRank.GetSpaceStatus() == AtlasRanking::FULL_CAN_BE_RESIZED )
{
return atlas;
}
-GlyphAtlas* GlyphAtlasManager::FindAtlas( const TextArray& text , const TextFormat& format, FontId fontId, AtlasRanking &bestRank)
+GlyphAtlas* GlyphAtlasManager::FindAtlas( const TextArray& text,
+ const TextFormat& format,
+ FontId fontId,
+ AtlasRanking &bestRank )
{
// if the text is underlined, add the underline character to the text string
TextArray searchText( text );
mConditionFunction = PropertyNotification::EvalFalse;
break;
}
- default:
- {
- DALI_ASSERT_ALWAYS(false && "Unrecognized ConditionType");
- break;
- }
}
mProperty = mProxy->GetSceneObjectInputProperty( mPropertyIndex );
// 3) Traverse the scene-graph, filling the lists for the current render-task
// 4) Prepare render-instructions
- bool resourcesFinished = false;
-
DALI_LOG_INFO(gRenderTaskLogFilter, Debug::General, "ProcessRenderTasks() Offscreens first\n");
// First process off screen render tasks - we may need the results of these for the on screen renders
continue;
}
- resourcesFinished = false;
+ bool resourcesFinished = false;
if( renderTask.IsRenderRequired() )
{
ClearRenderables( sortedLayers );
renderTask.UpdateState(resourcesFinished);
}
- resourcesFinished = false;
-
DALI_LOG_INFO(gRenderTaskLogFilter, Debug::General, "ProcessRenderTasks() Onscreen\n");
// Now that the off screen renders are done we can process on screen render tasks
continue;
}
- resourcesFinished = false;
+ bool resourcesFinished = false;
if( renderTask.IsRenderRequired() )
{
ClearRenderables( sortedLayers );
AnimatableProperty<Vector3> position;
AnimatableProperty<Vector4> color;
AnimatableProperty<Vector2> textureCoords;
+
+ private:
+ VertexProperties& operator=(const VertexProperties& rhs);
};
VertexProperties* mVertices;
}
// ID should be in one of the live sets
+ if (foundLiveRequest)
+ {
+ DALI_LOG_WARNING("HandleDiscardResourceRequest: ID should be in one of the live sets!");
+ }
DALI_ASSERT_DEBUG(foundLiveRequest);
if (wasComplete)
private:
/**
- * Undefined Copy Constructor
+ * Undefined Copy Constructor and assignment operator
*/
ResourceTracker(const ResourceTracker& rhs);
+ ResourceTracker& operator=(const ResourceTracker& rhs);
};
virtual bool DoIsComplete();
private:
+
/**
* Undefined Copy Constructor
*/
SyncResourceTracker(const SyncResourceTracker& rhs);
+ /**
+ * @brief Undefined Assignment Operator
+ */
+ SyncResourceTracker& operator=(const SyncResourceTracker& rhs);
+
private:
Integration::GlSyncAbstraction& mGlSyncAbstraction; ///< The synchronisation interface
SceneGraph::RenderMessageDispatcher& mRenderMessageDispatcher; ///< RenderManager message dispatcher
{
}
-Constrainable& Constrainable::operator=(const Handle& rhs)
-{
- if( this != &rhs )
- {
- Handle::operator=(rhs);
- }
-
- return *this;
-}
-
ActiveConstraint Constrainable::ApplyConstraint( Constraint constraint )
{
return GetImplementation(*this).ApplyConstraint(GetImplementation(constraint));
projects / platform / core / uifw / dali-core.git / commitdiff