${UIFW_DIRECTORY}/inc
${UIFW_DIRECTORY}/src/ui/inc
${UIFW_DIRECTORY}/src/ui/animations
+ ${UIFW_DIRECTORY}/src/ui/animations/platform
${RSA_DEV_DIRECTORY}/external/boost
)
ELSEIF(_WIN32)
${UIFW_DIRECTORY}/inc
${UIFW_DIRECTORY}/src/ui/inc
${UIFW_DIRECTORY}/src/ui/animations
+ ${UIFW_DIRECTORY}/src/ui/animations/platform
${RSA_DEV_DIRECTORY}/external/boost
)
ENDIF(LINUX)
graphics/FGrpRectangle.cpp
${UIFW_DIRECTORY}/src/ui/animations/platform/FUiAnim_NativeWindow.cpp
${UIFW_DIRECTORY}/src/ui/animations/platform/FUiAnim_GlContext.cpp
+ ${UIFW_DIRECTORY}/src/ui/animations/platform/FUiAnim_Egl.cpp
+ ${UIFW_DIRECTORY}/src/ui/animations/platform/FUiAnim_Wgl.cpp
${UIFW_DIRECTORY}/src/ui/animations/FUiAnim_AnimationGroupNode.cpp
${UIFW_DIRECTORY}/src/ui/animations/FUiAnim_AnimationManager.cpp
${UIFW_DIRECTORY}/src/ui/animations/FUiAnimAnimationTransaction.cpp
${UIFW_DIRECTORY}/src/ui/animations/FUiAnim_Looper.cpp
)
ELSEIF(_WIN32)
-ADD_DEFINITIONS("-DVE_WIN32_GL -DBUILD_UI_CORE")
+ADD_DEFINITIONS("-DVE_WIN32_GL -DBUILD_UI_CORE -D")
LIST(APPEND ${this_target}_SOURCE_FILES
${UIFW_DIRECTORY}/src/ui/animations/platform/FUiAnim_Win32Window.cpp
#include "FUiAnim_DisplayContextImpl.h"
#include "FUiAnim_Looper.h"
#include "FUiAnim_NativeWindow.h"
+#include "FUiAnim_Win32Window.h"
+#include "FUiAnim_GlLayer.h"
using namespace Tizen::Graphics;
using namespace Tizen::Ui::Animations;
void InitLibrary(int windowHandle, int width, int height)
{
-#ifdef LINUX
- _DisplayManager::CreateInstance();
_AnimationManager::CreateInstance();
+ _DisplayManager::CreateInstance();
+#ifdef LINUX
pNativeLayer = _NativeLayer::CreateInstanceN();
pNativeLayer->SetShowState(true);
+
+ pDisplayContext = _DisplayContextImpl::CreatePublicInstance(*pNativeLayer);
#elif _WIN32
+ _Win32Window* pWindow = new _Win32Window(windowHandle);
+
+ _GlLayer* pLayer = new _GlLayer();
+ pLayer->ConstructForNativeWindow(*pWindow);
+ pLayer->SetShowState(true);
+
+ pDisplayContext = _DisplayContextImpl::CreatePublicInstance(*pLayer);
#endif
- pDisplayContext = _DisplayContextImpl::CreatePublicInstance(*pNativeLayer);
+
}
void CreateVisualElement(int x, int y, int width, int height)
#include <FBaseSysLog.h>
+#include <assert.h>
void SysLogInternal(unsigned long id, const char* pFunction, int lineNumber, const char* pFormat, ...){}
void SysLogExceptionInternal(unsigned long id, result r, const char* pFunction, int lineNumber, const char* pFormat, ...){}
void SysLogTagInternal(unsigned long id, const char* pTag, const char* pFunction, int lineNumber, const char* pFormat, ...){}
void SysLogExceptionTagInternal(unsigned long id, const char* pTag, result r, const char* pFunction, int lineNumber, const char* pFormat, ...){}
-void SysAssertInternal(const char* pFileName, int lineNumber, const char* pFunction){}
+void SysAssertInternal(const char* pFileName, int lineNumber, const char* pFunction)
+{
+ assert(true);
+}
void SysAssertfInternal(const char* expr, const char* pFunction, int lineNumber, const char* pFormat, ...){}
void SysPropagateInternal(const char* pFunction, int lineNumber, unsigned long nid, result r){}
void SysTryReturnResultInternal(unsigned long id, result r, const char* pFunction, int lineNumber, const char* pFormat, ...){}
namespace Tizen { namespace Ui { namespace Animations
{
-#if defined(_OSP_EMUL_)
+#if defined(_OSP_EMUL_) || defined(BUILD_UI_CORE)
#define VE_USE_GL_MULTI_CONTEXT
#endif
__pLayer = reinterpret_cast<_GlLayer*>(handle);
SysAssertf(__pLayer, "Cannot create surface for null window");
+#ifndef BUILD_UI_CORE
// WARNING: By default, we assume 32bit-packed stride (for Osp 2.0 compatibility and etc.)
FloatDimension physSize = _CoordinateSystemUtils::Transform(size);
+#endif
(dynamic)? __surfaceInfo.type = SURFACE_TYPE_DYNAMIC : __surfaceInfo.type = SURFACE_TYPE_STATIC;
__surfaceInfo.bitsPerPixel = 32;
__surfaceInfo.x = 0;
__surfaceInfo.y = 0;
+#ifndef BUILD_UI_CORE
__surfaceInfo.width = physSize.width;
__surfaceInfo.height = physSize.height;
+#else
+ __surfaceInfo.width = size.width;
+ __surfaceInfo.height = size.height;
+#endif
__surfaceInfo.stride = __surfaceInfo.width * __surfaceInfo.bitsPerPixel / 8;
__surfaceInfo.updated = false;
- if (__surfaceInfo.type == SURFACE_TYPE_STATIC)
+ // if (__surfaceInfo.type == SURFACE_TYPE_STATIC)
{
__surfaceInfo.pPixels = (unsigned long*) new (std::nothrow) unsigned char[__surfaceInfo.stride * __surfaceInfo.height];
SysTryReturnVoidResult(NID_UI_ANIM, __surfaceInfo.pPixels, E_OUT_OF_MEMORY, "[E_OUT_OF_MEMORY]");
glDisable(GL_STENCIL_TEST);
glDisable(GL_DEPTH_TEST);
- glClearColor(0.0f, 0.0f, 0.0f, 0.0f);
+ glClearColor(1.0f, 0.0f, 0.0f, 1.0f);
+ glClear(GL_COLOR_BUFFER_BIT);
glClearStencil(0);
glActiveTexture(GL_TEXTURE0);