Merge 1. Pull in cpp files in the performance enhanced Khronos RI OVG files which are newly added. I've ignored platform-specific cpp files for linux, macosx, and null operating systems because this local solution has its own platform glue (i.e. facility to target Bitmaps but no full windowing support). I've ignored sfEGLInterface.cpp because this is used as a bridge to go from EGL to Nokia's Platsim which offers an EGL service. That's not relevant to this implementation because this is ARM side code, not Intel side. I just left a comment to sfEGLInterface.cpp in case we need to pick up this later on. The current code compiles on winscw. Prior to this fix, the code works on winscw, and can launch the SVG tiger (tiger.exe). That takes about 20 seconds to render. I hope to always be able to show this icon on each commit, and the plan is for the render time to reduce with this series of submissions. On this commit, the tiger renders ok in 20 seconds.
// Copyright (c) 2008-2010 Nokia Corporation and/or its subsidiary(-ies).
// All rights reserved.
// This component and the accompanying materials are made available
// under the terms of "Eclipse Public License v1.0"
// which accompanies this distribution, and is available
// at the URL "http://www.eclipse.org/legal/epl-v10.html".
//
// Initial Contributors:
// Nokia Corporation - initial contribution.
//
// Contributors:
//
// Description:
// inline implementations for TAdvancedPointerEvent
//
//
#ifndef ADVANCEDPOINTEREVENT_INL_
#define ADVANCEDPOINTEREVENT_INL_
/** Does basic initialisation of a TAdvancedPointerEvent
@internalTechnology */
inline void TAdvancedPointerEvent::Init()
{
iModifiers=EModifierAdvancedPointerEvent;
iData.ints.iSpare1=0;
iData.ints.iSpare2=0;
}
/** Does specific initialisation of a TAdvancedPointerEvent
@param aType The pointer event type.
@param aModifiers Additional modifiers for the event.
@param aPoint3D The 3D coordinated of the event.
@param aPointerNumber The pointer number for the event.
@internalTechnology */
inline void TAdvancedPointerEvent::Init(const TPointerEvent::TType aType, const TUint aModifiers, const TPoint3D &aPoint3D, const TUint8 aPointerNumber)
{
Init();
iType=aType;
iModifiers|=aModifiers; //add the new modifiers to EModifierAdvancedPointerEvent
iPosition.iX=aPoint3D.iX;
iPosition.iY=aPoint3D.iY;
iData.multiPos3D.iPosZ=aPoint3D.iZ;
iData.multiPos3D.iPointerNumber=aPointerNumber;
}
/** Sets the pointer number and enforces pointer event to an advanced pointer event.
@internalTechnology */
inline void TAdvancedPointerEvent::SetPointerNumber(TUint8 aPointerNumber)
{
iModifiers|=EModifierAdvancedPointerEvent; // ensure we're an AdvancePointerEvent
iData.multiPos3D.iPointerNumber=aPointerNumber;
}
/** Sets Z and enforces pointer event to advanced pointer event
@internalTechnology */
inline void TAdvancedPointerEvent::SetPointerZ(TInt aZ)
{
iModifiers|=EModifierAdvancedPointerEvent; // ensure we're an advanced pointer event
iData.multiPos3D.iPosZ=aZ;
}
inline void TAdvancedPointerEvent::Copy(const TAdvancedPointerEvent& aPointerEvent)
{
if(aPointerEvent.iModifiers&EModifierAdvancedPointerEvent)
{
iType=aPointerEvent.iType;
iModifiers=aPointerEvent.iModifiers;
iPosition=aPointerEvent.iPosition;
iParentPosition=aPointerEvent.iParentPosition;
iData=aPointerEvent.iData;
}
else
{
// delegate to TPointerEvent::Copy
TPointerEvent::Copy(aPointerEvent);
}
}
#endif /*ADVANCEDPOINTEREVENT_INL_*/