ModelImporter::LoadScene implemented, _GlShaderProgram and _CustomShader are merged...
authorYouri Sdobnikov <i.sdobnikov@samsung.com>
Tue, 1 Oct 2013 08:13:14 +0000 (11:13 +0300)
committerYouri Sdobnikov <i.sdobnikov@samsung.com>
Tue, 1 Oct 2013 08:13:14 +0000 (11:13 +0300)
commit606942594877de8ae83004ef29d524bcb45bbbee
tree697886cf05517d559f87ec6e7b5ca9b08e63fd35
parent235c7a5cf2893774c3ce76e4cbeecd66f32a258a
ModelImporter::LoadScene implemented, _GlShaderProgram and _CustomShader are merged to _GlShaderProgram, GetUniform and SetUniform for ShaderProgramm class are implemented, Load Save Mesh in binary, BoundingVolume splited at public and impl, BoundingVolume can be of Sphere or AABB type working with picking(GetChildAt(point)), fixes, path conflicts are fixed comments are processed

Change-Id: Iff728087c79648b99d066c798fb6154971ebaabf
Signed-off-by: Youri Sdobnikov <i.sdobnikov@samsung.com>
48 files changed:
inc/FUiAnimBoundingVolume.h [new file with mode: 0644]
inc/FUiAnimMesh.h
inc/FUiAnimModelImporter.h
inc/FUiAnimScene.h
inc/FUiAnimShader.h
inc/FUiAnimShaderProgram.h
src/ui/CMakeLists.txt
src/ui/animations/FUiAnimBoundingVolume.cpp [new file with mode: 0644]
src/ui/animations/FUiAnimLight.cpp
src/ui/animations/FUiAnimMaterial.cpp
src/ui/animations/FUiAnimMesh.cpp
src/ui/animations/FUiAnimModelImporter.cpp
src/ui/animations/FUiAnimScene.cpp
src/ui/animations/FUiAnimShader.cpp
src/ui/animations/FUiAnimShaderProgram.cpp
src/ui/animations/FUiAnim_BoundingVolume.cpp [deleted file]
src/ui/animations/FUiAnim_BoundingVolume.h [deleted file]
src/ui/animations/FUiAnim_BoundingVolumeImpl.cpp [new file with mode: 0644]
src/ui/animations/FUiAnim_CustomShader.cpp [deleted file]
src/ui/animations/FUiAnim_CustomShader.h [deleted file]
src/ui/animations/FUiAnim_GeometryInfo.cpp
src/ui/animations/FUiAnim_GlDefaultShaderProgram.cpp
src/ui/animations/FUiAnim_GlDefaultShaderProgram.h
src/ui/animations/FUiAnim_GlRenderManager.cpp
src/ui/animations/FUiAnim_GlShaderProgram.cpp
src/ui/animations/FUiAnim_GlShaderProgram.h
src/ui/animations/FUiAnim_MaterialImpl.cpp
src/ui/animations/FUiAnim_MeshImpl.cpp
src/ui/animations/FUiAnim_MeshImportSample.cpp
src/ui/animations/FUiAnim_ModelImporterImpl.cpp
src/ui/animations/FUiAnim_Ray.cpp
src/ui/animations/FUiAnim_Ray.h
src/ui/animations/FUiAnim_SceneImpl.cpp
src/ui/animations/FUiAnim_ShaderImpl.cpp
src/ui/animations/FUiAnim_ShaderProgramImpl.cpp
src/ui/animations/FUiAnim_ShaderProgramImpl.h
src/ui/animations/FUiAnim_VisualElementImpl.cpp
src/ui/animations/import-collada/FUiAnim_ImportColladaColladaAssets.cpp
src/ui/animations/import-collada/FUiAnim_ImportColladaColladaAssets.h
src/ui/animations/import-collada/library-geometries/FUiAnim_ImportColladaLibGeomGeometryMesh.cpp
src/ui/animations/import-collada/library-geometries/FUiAnim_ImportColladaLibGeomGeometryMesh.h
src/ui/animations/import-collada/library-visual-scenes/FUiAnim_ImportColladaLibVisScenNode.cpp
src/ui/animations/import-collada/library-visual-scenes/FUiAnim_ImportColladaLibVisScenNode.h
src/ui/inc/FUiAnim_BoundingVolumeImpl.h [new file with mode: 0644]
src/ui/inc/FUiAnim_MeshImpl.h
src/ui/inc/FUiAnim_ModelImporterImpl.h
src/ui/inc/FUiAnim_SceneImpl.h
src/ui/inc/FUiAnim_VisualElementImpl.h