@@ -1,4 +1,16 @@

 -------------------------------------------------------------------

+Wed Sep  7 05:11:05 UTC 2016 - avvissu@yandex.by

+

+- Update to 16.06:

+  * update FFmpeg to 3.1.1

+  * implement GPU-accelerated conversion of NV12 and XYZ12 formats

+  * image Viewer - put original filename into save file dialog

+  * fix saving playback time of recent file

+  * fix tracking playback state for keeping screen on

+  * improve language change without application restart

+  * prevent creation of multiple modal dialogs

+

+-------------------------------------------------------------------

 Tue Dec  8 20:59:51 UTC 2015 - avvissu@yandex.ru

 - Fix build errors with ffmpeg: define ffmpeg_includedir

​

@@ -16,11 +16,11 @@

 #

-%define src_ver 15_11

+%define src_ver 16_06

 %define src_name sView

 %define ffmpeg_includedir %(pkg-config --variable=includedir libavcodec)

 Name:           sview

-Version:        15.11

+Version:        16.06

 Release:        0

 Summary:        Stereoscopic media player

 License:        GPL-3.0+ and LGPL-3.0+

@@ -37,11 +37,11 @@

 BuildRequires:  pkgconfig(gl)

 BuildRequires:  pkgconfig(gtk+-2.0)

 BuildRequires:  pkgconfig(freetype2)

-BuildRequires:  pkgconfig(libavcodec) = 56.60.100

-BuildRequires:  pkgconfig(libavformat) = 56.40.101

-BuildRequires:  pkgconfig(libavutil) = 54.31.100

+BuildRequires:  pkgconfig(libavcodec)

+BuildRequires:  pkgconfig(libavformat)

+BuildRequires:  pkgconfig(libavutil)

 BuildRequires:  pkgconfig(libconfig++)

-BuildRequires:  pkgconfig(libswscale) = 3.1.101

+BuildRequires:  pkgconfig(libswscale)

 BuildRequires:  pkgconfig(openal)

 BuildRequires:  pkgconfig(xpm)

 BuildRequires:  pkgconfig(xrandr)

@@ -101,7 +101,7 @@

 %{_libdir}/%{src_name}/

 %{_datadir}/applications/%{src_name}IV.desktop

 %{_datadir}/applications/%{src_name}MP.desktop

-%{_datadir}/icons/hicolor/scalable/apps/%{name}.svg

+%{_datadir}/icons/hicolor/*/apps/%{name}.??g

 %{_datadir}/pixmaps/%{name}.xpm

 %{_datadir}/%{src_name}/

​

@@ -1,267 +0,0 @@

-/**

- * This source is a part of sView program.

- *

- * Copyright © Kirill Gavrilov, 2011-2013

- */

-

-#ifdef ST_HAVE_STCONFIG

-    #include <stconfig.conf>

-#endif

-

-#ifdef ST_HAVE_OCCT

-

-#include <BRep_Tool.hxx>

-#include <BRepAdaptor_Surface.hxx>

-#include <Bnd_Box.hxx>

-#include <BRepBndLib.hxx>

-#include <BRepTools.hxx>

-#include <BRepLProp_SLProps.hxx>

-#include <BRepMesh_IncrementalMesh.hxx>

-#include <Poly_Array1OfTriangle.hxx>

-#include <Poly_Triangulation.hxx>

-#include <Precision.hxx>

-#include <TopoDS.hxx>

-#include <TopExp_Explorer.hxx>

-#include <TColgp_Array1OfPnt.hxx>

-#include <TColgp_Array1OfPnt2d.hxx>

-#include <gp_Trsf.hxx>

-#include <gp_Pln.hxx>

-#include <gp_Sphere.hxx>

-#include <Geom_Surface.hxx>

-#include <GeomLProp_SLProps.hxx>

-

-#include <StGLCore/StGLCore20.h>

-#include "StCADModel.h"

-#include <StGLMesh/StBndBox.h>

-#include <StThreads/StTimer.h>

-

-/**

- * Compute boundary box approximation.

- * If triangulation is available - it will be based on it.

- */

-StBndBox getApproxBndBox(const TopoDS_Shape& theShape) {

-    if(theShape.IsNull()) {

-        return StBndBox();

-    }

-

-    Bnd_Box aBndBox;

-    BRepBndLib::Add(theShape, aBndBox);

-    if(aBndBox.IsVoid()) {

-        return StBndBox();

-    }

-

-    Standard_Real aXmin, aYmin, aZmin, aXmax, aYmax, aZmax;

-    aBndBox.Get(aXmin, aYmin, aZmin, aXmax, aYmax, aZmax);

-    return StBndBox(StGLVec3(GLfloat(aXmin), GLfloat(aYmin), GLfloat(aZmin)),

-                    StGLVec3(GLfloat(aXmax), GLfloat(aYmax), GLfloat(aZmax)));

-}

-

-StCADModel::StCADModel(const TopoDS_Shape& theShape)

-: StGLMesh(GL_TRIANGLES),

-  myShape(theShape),

-  myDeflection(0.004),

-  myApproxDiag(0.0) {

-    // compute deflection relative to the model dimensions

-    StBndBox anApproxBndBox = getApproxBndBox(theShape);

-    Standard_Real aDeflRelative = 0.004;

-    myApproxDiag = (Standard_Real )(anApproxBndBox.getMax() - anApproxBndBox.getMin()).modulus();

-    if(myApproxDiag > gp::Resolution()) {

-        myDeflection = myApproxDiag * aDeflRelative;

-    }

-}

-

-StCADModel::~StCADModel() {

-    //

-}

-

-bool StCADModel::computeNormals(const TopoDS_Face& theFace, const TColgp_Array1OfPnt2d& theUVNodes) {

-    bool isReversed = theFace.Orientation() == TopAbs_REVERSED;

-    // notice that TopoDS_Face contains 2 locations!

-    // BRep_Tool give us result location = TopDS_Shape::Location() * BRep_TFace.Location()

-    // this redundant annoying location will be probably removed in next version

-    // but now we should care about this difference with another TopoDS_Shape inheritances

-    TopLoc_Location aLoc;

-    Handle(Geom_Surface) aSurf = BRep_Tool::Surface(theFace, aLoc);

-    gp_Trsf aTrsf(aLoc);

-    GeomAdaptor_Surface aSurfAdaptor(aSurf);

-    switch(aSurfAdaptor.GetType()) {

-        case GeomAbs_Plane: {

-            // compute just one normal and duplicated it

-            gp_Pnt aPnt; gp_Vec aD1U, aD1V;

-            aSurf->D1(0.0, 0.0, aPnt, aD1U, aD1V);

-            gp_Dir aDir = (aD1U.Crossed(aD1V)).XYZ();

-            aDir.Transform(aTrsf);

-

-            if(isReversed) {

-                aDir.Reverse();

-            }

-            StGLVec3 aNormal(GLfloat(aDir.X()), GLfloat(aDir.Y()), GLfloat(aDir.Z()));

-            for(Standard_Integer aNodeId = theUVNodes.Lower(); aNodeId <= theUVNodes.Upper(); ++aNodeId) {

-                myNormals.add(aNormal);

-            }

-            return true;

-        }

-        case GeomAbs_Sphere: {

-            // sphere has peculiar properties on its poles

-            const gp_Pnt aLoc = aSurfAdaptor.Sphere().Location().Transformed(aTrsf);

-            GLfloat aRadInv = 1.0f / GLfloat(aSurfAdaptor.Sphere().Radius());

-            if(isReversed) {

-                aRadInv = -aRadInv;

-            }

-            gp_Pnt aPnt;

-            for(Standard_Integer aNodeId = theUVNodes.Lower(); aNodeId <= theUVNodes.Upper(); ++aNodeId) {

-                gp_Pnt2d aUVPnt = theUVNodes(aNodeId);

-                aSurf->D0(aUVPnt.X(), aUVPnt.Y(), aPnt);

-                aPnt = aPnt.Transformed(aTrsf);

-                myNormals.add(StGLVec3(GLfloat(aPnt.X() - aLoc.X()) * aRadInv,

-                                       GLfloat(aPnt.Y() - aLoc.Y()) * aRadInv,

-                                       GLfloat(aPnt.Z() - aLoc.Z()) * aRadInv));

-            }

-            return true;

-        }

-        default: {

-            // general case, use special tool

-            gp_Dir aNormal;

-            GeomLProp_SLProps aProps(aSurf,

-                                     1, // needed to get normal

-                                     1e-12);

-            for(Standard_Integer aNodeId = theUVNodes.Lower(); aNodeId <= theUVNodes.Upper(); ++aNodeId) {

-                gp_Pnt2d aUVPnt = theUVNodes(aNodeId);

-                aProps.SetParameters(aUVPnt.X(), aUVPnt.Y());

-                if(!aProps.IsNormalDefined()) {

-                    ST_DEBUG_LOG("GeomLProp_SLProps failer!");

-                    myNormals.add(StGLVec3::DZ());

-                    continue;

-                }

-                aNormal = aProps.Normal().Transformed(aTrsf);

-                if(isReversed) {

-                    aNormal.Reverse();

-                }

-                myNormals.add(StGLVec3(GLfloat(aNormal.X()),

-                                       GLfloat(aNormal.Y()),

-                                       GLfloat(aNormal.Z())));

-            }

-            return true;

-        }

-    }

-}

-

-bool StCADModel::computeMesh() {

-    // reset current mesh

-    clearRAM();

-    if(myShape.IsNull()) {

-        return false;

-    }

-

-    TopLoc_Location aLoc;

-    size_t aFacesCount = 0;

-    size_t aVertCount = 0; // a nodes number

-    size_t anIndCount = 0; // an indices number

-    const Standard_Real anEps2 = Precision::Confusion() * Precision::Confusion();

-

-    Standard_Real aDeflection = myDeflection;

-    // 12.0 * Standard_PI / 180.0;

-    // 20.0 * Standard_PI / 180.0;

-    Standard_Real anAngular = 20.0 * M_PI / 180.0;

-    const bool toComputeMesh = !BRepTools::Triangulation(myShape, myDeflection);

-    StTimer aTimer(true);

-    if(toComputeMesh) {

-        // perform incremental mesh

-        BRepMesh_IncrementalMesh aMesher(myShape, aDeflection, Standard_False, anAngular);

-    }

-

-    // If computed triangulation has greater tolerance - get the maximal value

-    // to prevent unnecessary and useless recomputation of triangulation next time

-    for(TopExp_Explorer aFaceExp(myShape, TopAbs_FACE); aFaceExp.More(); aFaceExp.Next()) {

-        const TopoDS_Face& aFace = TopoDS::Face(aFaceExp.Current());

-        const Handle(Poly_Triangulation)& aTri = BRep_Tool::Triangulation(aFace, aLoc);

-        if(aTri.IsNull() || !aTri->HasUVNodes()) {

-            continue;

-        }

-        aDeflection = stMax(aTri->Deflection(), aDeflection); // find deflection maximum

-

-        // collect information

-        anIndCount += 3 * size_t(aTri->Triangles().Length());

-        aVertCount += size_t(aTri->Nodes().Length());

-    }

-    myDeflection = aDeflection;

-

-    if(toComputeMesh) {

-        ST_DEBUG_LOG("Triangulation computed in "

-                   + aTimer.getElapsedTimeInMilliSec() + " msec\n"

-                   + " with deflection " + aDeflection + " (requested " + myDeflection + ") "

-                   + " and angle " + (anAngular * 180.0 / M_PI) + " degrees "

-                   + "; Indices= " + anIndCount + "; Vertices= " + aVertCount); ///

-    } else {

-        ST_DEBUG_LOG("Triangulation reused\n"

-                   + " with deflection " + aDeflection + " (requested " + myDeflection + ") "

-                   + " and angle " + (anAngular * 180.0 / M_PI) + " degrees "

-                   + "; Indices= " + anIndCount + "; Vertices= " + aVertCount); ///

-    }

-

-    // initialize the whole memory block at once

-    myIndices.initList(anIndCount);

-    myVertices.initList(aVertCount);

-    myNormals.initList(aVertCount);

-

-    Standard_Integer aV1, aV2, aV3;

-    gp_Trsf aTrsf;

-    // iterate over all faces

-    for(TopExp_Explorer aFaceExp(myShape, TopAbs_FACE); aFaceExp.More(); aFaceExp.Next(), ++aFacesCount) {

-        const TopoDS_Face& aFace = TopoDS::Face(aFaceExp.Current());

-        const bool isReversed = (aFace.Orientation() == TopAbs_REVERSED);

-        const Handle(Poly_Triangulation)& aTri = BRep_Tool::Triangulation(aFace, aLoc);

-        aTrsf = gp_Trsf(aLoc);

-        if(aTri.IsNull() || !aTri->HasUVNodes()) {

-            continue;

-        }

-

-        const Poly_Array1OfTriangle& aTriangles = aTri->Triangles();

-        const TColgp_Array1OfPnt&    aNodes     = aTri->Nodes();

-        const TColgp_Array1OfPnt2d&  aUVNodes   = aTri->UVNodes();

-

-        // collect indices

-        Standard_Integer aNodesNbBefore = Standard_Integer(myVertices.size());

-        for(Standard_Integer aTriangleId = aTriangles.Lower(); aTriangleId <= aTriangles.Upper(); ++aTriangleId) {

-            aTriangles.Value(aTriangleId).Get(aV1, aV2, aV3);

-            // check that triangle is not degenerative

-            if(((aNodes(aV3).XYZ() -

-                 aNodes(aV1).XYZ()) ^

-                (aNodes(aV2).XYZ() -

-                 aNodes(aV1).XYZ())).SquareModulus() > anEps2) {

-                aV1 += (aNodesNbBefore - aNodes.Lower());

-                aV2 += (aNodesNbBefore - aNodes.Lower());

-                aV3 += (aNodesNbBefore - aNodes.Lower());

-                myIndices.add(GLuint(aV1));

-                if(isReversed) {

-                    // this is significant only if front/back face materials are different

-                    myIndices.add(GLuint(aV3));

-                    myIndices.add(GLuint(aV2));

-                } else {

-                    myIndices.add(GLuint(aV2));

-                    myIndices.add(GLuint(aV3));

-                }

-            }

-        }

-

-        // collect nodes

-        for(Standard_Integer aNodeId = aNodes.Lower(); aNodeId <= aNodes.Upper(); ++aNodeId) {

-            const gp_Pnt aNode = aNodes.Value(aNodeId).Transformed(aTrsf);

-            myVertices.add(StGLVec3(GLfloat(aNode.X()), GLfloat(aNode.Y()), GLfloat(aNode.Z())));

-        }

-

-        // collect surface normals

-        computeNormals(aFace, aUVNodes);

-    }

-

-    ST_DEBUG_LOG("Mesh info: nodes= " + myVertices.size()

-               + "; normals= " + myNormals.size()

-               + "; triangles= " + (myIndices.size() / 3)

-               + "; faces= " + aFacesCount);

-

-    // compute bounding sphere

-    myBndSphere.enlarge(myVertices);

-    return myVertices.size() >= 3;

-}

-

-#endif // ST_HAVE_OCCT

​

@@ -1,47 +0,0 @@

-/**

- * This source is a part of sView program.

- *

- * Copyright © Kirill Gavrilov, 2011-2013

- */

-

-#ifndef __StCADModel_h_

-#define __StCADModel_h_

-

-#ifdef ST_HAVE_STCONFIG

-    #include <stconfig.conf>

-#endif

-

-#ifdef ST_HAVE_OCCT

-

-// OCCT stuff

-#include <TopoDS_Shape.hxx>

-

-#include <StGLMesh/StGLMesh.h>

-#include <StGLMesh/StBndSphere.h>

-

-class TopoDS_Face;

-class TColgp_Array1OfPnt2d;

-

-class ST_LOCAL StCADModel : public StGLMesh {

-

-        private:

-

-    TopoDS_Shape  myShape;      //!< original shape

-    Standard_Real myDeflection; //!< deflection for triangulation

-    Standard_Real myApproxDiag; //!< boundary box approximation diagonal

-

-        private:

-

-    bool computeNormals(const TopoDS_Face& theFace, const TColgp_Array1OfPnt2d& theUVNodes);

-

-        public:

-

-    StCADModel(const TopoDS_Shape& theShape);

-    virtual ~StCADModel();

-

-    virtual bool computeMesh();

-

-};

-

-#endif // ST_HAVE_OCCT

-#endif // __StCADModel_h_

​

@@ -1,211 +0,0 @@

-/**

- * This source is a part of sView program.

- *

- * Copyright © Kirill Gavrilov, 2011-2013

- */

-

-#include "StMeshFileOBJ.h"

-

-#include <StStrings/StStringStream.h>

-#include <StFile/StRawFile.h>

-#include <StGLCore/StGLCore20.h>

-

-StMeshFileOBJ::StMeshFileOBJ()

-: myMesh() {

-    //

-}

-

-static char* nextLine(char* theBuffer) {

-    if(theBuffer == NULL) {

-        return NULL;

-    }

-    char* aPtr = theBuffer;

-    while(*aPtr != '\0' && *aPtr != '\n') {

-        ++aPtr;

-    }

-    if(*aPtr == '\0') {

-        return NULL;

-    }

-    return ++aPtr;

-}

-

-bool StMeshFileOBJ::load(const StString& theFilePath) {

-    myMesh.nullify();

-

-    // read the file into RAM

-    StRawFile aFile(theFilePath);

-    if(!aFile.readFile()) {

-        // no file - no mesh

-        return false;

-    }

-

-    // determine arrays lengths

-    char* aBuffer = (char* )aFile.getBuffer();

-    size_t aLen = aFile.getSize();

-    size_t aVertNb  = 0;

-    size_t aNormNb  = 0;

-    size_t aFacesNb = 0;

-    for(char* aLine = aBuffer; aLine != NULL; aLine = nextLine(aLine)) {

-        if(aLine[0] == 'v' && aLine[1] == ' ') {

-            // vertex

-            ++aVertNb;

-            aLine += 2;

-        } else if(aLine[0] == 'v' && aLine[1] == 'n' && aLine[2] == ' ') {

-            // normal

-            ++aNormNb;

-            aLine += 3;

-        } else if(aLine[0] == 'f' && aLine[1] == ' ') {

-            // face

-            ++aFacesNb;

-            aLine += 2;

-        }

-    }

-

-ST_DEBUG_LOG("aVertNb= " + aVertNb + "; aFacesNb= " + aFacesNb + "; aNormNb= " + aNormNb);

-    if(aVertNb == 0 || aFacesNb == 0) {

-        // invalid or unsupported data

-        return false;

-    }

-

-    // allocate arrays

-    myMesh = new StGLMesh(GL_TRIANGLES);

-    StArrayList<StGLVec3>& aVertices = myMesh->changeVertices();

-    StArrayList<StGLVec3>& aNormals  = myMesh->changeNormals();

-    StArrayList<GLuint>&   anIndices = myMesh->changeIndices();

-    aVertices.initList(aVertNb);

-    anIndices.initList(aFacesNb * 6); // OBJ files often contains quads, reserve additional memory for quads -> triangles splitting

-

-    // temporary arrays

-    StArrayList<StGLVec3> aNormalsTmp;

-    StArrayList<GLuint> aNormalIndices;

-    aNormalsTmp.initList(aNormNb);

-    aNormalIndices.initList(anIndices.size());

-

-    // temporary variables

-    StGLVec3 aVert, aNorm;

-    GLuint aVertIndex = 0;

-    GLuint aNormIndex = 0;

-    GLuint aTmpIndex1 = 0;

-    GLuint aTmpIndex2 = 0;

-    size_t anIndexSet = 0;

-    size_t anIndexIter = 0;

-    bool isTermination = false;

-

-    // make sure floats are read using C locale

-    StStringStream aStream;

-    aStream.setCLocale();

-

-    // fill arrays

-    for(char* aLine = aBuffer; aLine != NULL; aLine = nextLine(aLine)) {

-        if(aLine[0] == 'v' && aLine[1] == ' ') {

-            // vertex

-            aLine += 2;

-            aStream.setInputBuffer(aLine, aLen - size_t(aLine - aBuffer));

-            aStream >> aVert.x(); aStream >> aVert.y(); aStream >> aVert.z();

-            aVertices.add(aVert);

-        } else if(aLine[0] == 'v' && aLine[1] == 'n' && aLine[2] == ' ') {

-            // normal

-            aLine += 3;

-            aStream.setInputBuffer(aLine, aLen - size_t(aLine - aBuffer));

-            aStream >> aNorm.x(); aStream >> aNorm.y(); aStream >> aNorm.z();

-            aNormalsTmp.add(aNorm);

-        } else if(aLine[0] == 'f' && aLine[1] == ' ') {

-            // face indices

-            aLine += 2;

-            char* anEnd = aLine;

-            anIndexIter = 0;

-            anIndexSet = 0;

-            aVertIndex = 0;

-            aNormIndex = 0;

-            for(;; ++anEnd) {

-                isTermination = *anEnd == '\0' || *anEnd == '\n';

-                if(*anEnd != '/' && *anEnd != ' ' && !isTermination) {

-                    continue;

-                }

-                ++anIndexIter;

-                if(aLine != anEnd) {

-                    aStream.setInputBuffer(aLine, size_t(anEnd - aLine));

-                    switch(anIndexIter) {

-                        case 1: {

-                            // vertex index

-                            aStream >> aVertIndex;

-                            ++anIndexSet;

-                            break;

-                        }

-                        case 2: {

-                            // texture coordinates index

-                            //anIndices.add(anIndex - 1);

-                            break;

-                        }

-                        case 3: {

-                            // normal index

-                            aStream >> aNormIndex;

-                            break;

-                        }

-                        default: break;

-                    }

-                    if(*anEnd != '/') {

-                        if(aVertIndex == 0 || aVertIndex > aVertNb) {

-                            // index out of bounds - ignore line

-                            break;

-                        }

-

-                        // indices set ends

-                        if(anIndexSet <= 3) {

-                            // got triangle

-                            anIndices.add(aVertIndex - 1); // in OBJ indices starts from 1

-                            if(aNormIndex > 0 && aNormIndex <= aNormNb) {

-                                aNormalIndices.add(aNormIndex - 1); // in OBJ indices starts from 1

-                            }

-                        } else if(anIndices.size() >= 3) {

-                            // got polygon, split it to triangles

-                            aTmpIndex1 = anIndices.getValue(anIndices.size() - 3);

-                            aTmpIndex2 = anIndices.getLast();

-                            anIndices.add(aTmpIndex1);

-                            anIndices.add(aTmpIndex2);

-                            anIndices.add(aVertIndex - 1); // in OBJ indices starts from 1

-                            if(aNormIndex > 0 && aNormIndex <= aNormNb

-                            && aNormalIndices.size() >= 3) {

-                                aTmpIndex1 = aNormalIndices.getValue(aNormalIndices.size() - 3);

-                                aTmpIndex2 = aNormalIndices.getLast();

-                                aNormalIndices.add(aTmpIndex1);

-                                aNormalIndices.add(aTmpIndex2);

-                                aNormalIndices.add(aNormIndex - 1); // in OBJ indices starts from 1

-                            }

-                        }

-                        anIndexIter = 0;

-                    }

-                }

-                if(isTermination) {

-                    break;

-                }

-                aLine = anEnd + 1;

-            }

-        }

-    }

-

-    if(aNormalIndices.size() == anIndices.size() && !aNormalsTmp.isEmpty()) {

-        // move collected normals to the mesh

-        StArray<bool> anIndMap(aVertices.size());

-        stMemSet(&anIndMap.changeFirst(), false, sizeof(bool) * aVertices.size());

-        aNormals.initArray(aVertices.size());

-        size_t aNormIndex = 0;

-        size_t aVertIndex = 0;

-        for(size_t anIndexId = 0; anIndexId < aNormalIndices.size(); ++anIndexId) {

-            aVertIndex = anIndices[anIndexId];

-            if(!anIndMap[aVertIndex]) {

-                aNormIndex = aNormalIndices[anIndexId];

-                aNormals.changeValue(aVertIndex) = aNormalsTmp[aNormIndex];

-                anIndMap[aVertIndex] = true;

-            }

-        }

-    } else {

-        // compute coarse normals

-        myMesh->computeNormals();

-    }

-

-    // compute bounding sphere

-    myMesh->computeMesh();

-

-    return true;

-}

​

@@ -1,40 +0,0 @@

-/**

- * This source is a part of sView program.

- *

- * Copyright © Kirill Gavrilov, 2011-2013

- */

-

-#ifndef __StMeshFileOBJ_h_

-#define __StMeshFileOBJ_h_

-

-#include <StTemplates/StHandle.h>

-#include <StGLMesh/StGLMesh.h>

-

-class ST_LOCAL StMeshFileOBJ {

-

-        private:

-

-    StHandle<StGLMesh> myMesh;

-

-        public:

-

-    /**

-     * Empty constructor.

-     */

-    StMeshFileOBJ();

-

-    /**

-     * Read the mesh from OBJ file.

-     */

-    bool load(const StString& theFilePath);

-

-    /**

-     * Return imported mesh.

-     */

-    const StHandle<StGLMesh>& getResult() const {

-        return myMesh;

-    }

-

-};

-

-#endif //__StMeshFileOBJ_h_

​

@@ -1,278 +0,0 @@

-/**

- * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>

- *

- * StMoviePlayer program is free software: you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation, either version 3 of the License, or

- * (at your option) any later version.

- *

- * StMoviePlayer program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

- * See the GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public

- * License along with this program.

- * If not, see <http://www.gnu.org/licenses/>.

- */

-

-#include "StSeekBar.h"

-

-#include <StGL/StGLProgram.h>

-#include <StGL/StGLContext.h>

-#include <StGLCore/StGLCore20.h>

-#include <StGLWidgets/StGLRootWidget.h>

-

-class StSeekBar::StProgramSB : public StGLProgram {

-

-        public:

-

-    StProgramSB() : StGLProgram("StSeekBar") {}

-

-    StGLVarLocation getVVertexLoc() const { return StGLVarLocation(0); }

-    StGLVarLocation getVColorLoc()  const { return StGLVarLocation(1); }

-

-    void setProjMat(StGLContext&      theCtx,

-                    const StGLMatrix& theProjMat) {

-        theCtx.core20fwd->glUniformMatrix4fv(uniProjMatLoc, 1, GL_FALSE, theProjMat);

-    }

-

-    using StGLProgram::use;

-    void use(StGLContext& theCtx) {

-        StGLProgram::use(theCtx);

-    }

-

-    void use(StGLContext&  theCtx,

-             const GLfloat theOpacityValue,

-             const GLfloat theDispX) {

-        StGLProgram::use(theCtx);

-        theCtx.core20fwd->glUniform1f(uniOpacityLoc, theOpacityValue);

-        if(!stAreEqual(myDispX, theDispX, 0.0001f)) {

-            myDispX = theDispX;

-            theCtx.core20fwd->glUniform4fv(uniDispLoc,  1, StGLVec4(theDispX, 0.0f, 0.0f, 0.0f));

-        }

-    }

-

-    virtual bool init(StGLContext& theCtx) {

-        const char VERTEX_SHADER[] =

-           "uniform mat4  uProjMatrix;\n"

-           "uniform vec4  uDisp;\n"

-           "uniform float uOpacity;\n"

-           "attribute vec4 vVertex;\n"

-           "attribute vec4 vColor;\n"

-           "varying vec4 fColor;\n"

-           "void main(void) {\n"

-           "    fColor = vec4(vColor.rgb, vColor.a * uOpacity);\n"

-           "    gl_Position = uProjMatrix * (vVertex + uDisp);\n"

-           "}\n";

-

-        const char FRAGMENT_SHADER[] =

-           "varying vec4 fColor;\n"

-           "void main(void) {\n"

-           "    gl_FragColor = fColor;\n"

-           "}\n";

-

-        StGLVertexShader aVertexShader(StGLProgram::getTitle());

-        StGLAutoRelease aTmp1(theCtx, aVertexShader);

-        aVertexShader.init(theCtx, VERTEX_SHADER);

-

-        StGLFragmentShader aFragmentShader(StGLProgram::getTitle());

-        StGLAutoRelease aTmp2(theCtx, aFragmentShader);

-        aFragmentShader.init(theCtx, FRAGMENT_SHADER);

-        if(!StGLProgram::create(theCtx)

-           .attachShader(theCtx, aVertexShader)

-           .attachShader(theCtx, aFragmentShader)

-           .bindAttribLocation(theCtx, "vVertex", getVVertexLoc())

-           .bindAttribLocation(theCtx, "vColor",  getVColorLoc())

-           .link(theCtx)) {

-            return false;

-        }

-

-        uniProjMatLoc = StGLProgram::getUniformLocation(theCtx, "uProjMatrix");

-        uniDispLoc    = StGLProgram::getUniformLocation(theCtx, "uDisp");

-        uniOpacityLoc = StGLProgram::getUniformLocation(theCtx, "uOpacity");

-        return uniProjMatLoc.isValid() && uniOpacityLoc.isValid();

-    }

-

-        private:

-

-    GLfloat         myDispX;

-    StGLVarLocation uniProjMatLoc;

-    StGLVarLocation uniDispLoc;

-    StGLVarLocation uniOpacityLoc;

-

-};

-

-StSeekBar::StSeekBar(StGLWidget* theParent,

-                     const int   theTop,

-                     const int   theMargin)

-: StGLWidget(theParent, 0, theTop, StGLCorner(ST_VCORNER_TOP, ST_HCORNER_LEFT),

-             theParent->getRoot()->scale(512),

-             theParent->getRoot()->scale(12) + theMargin * 2),

-  myProgram(new StProgramSB()),

-  myProgress(0.0f),

-  myProgressPx(0),

-  myClickPos(-1),

-  myMoveTolerPx(myRoot->scale(myRoot->isMobile() ? 16 : 8)) {

-    StGLWidget::signals.onMouseClick  .connect(this, &StSeekBar::doMouseClick);

-    StGLWidget::signals.onMouseUnclick.connect(this, &StSeekBar::doMouseUnclick);

-    myMargins.top    = theMargin;

-    myMargins.bottom = theMargin;

-}

-

-StSeekBar::~StSeekBar() {

-    StGLContext& aCtx = getContext();

-    if(!myProgram.isNull()) {

-        myProgram->release(aCtx);

-    }

-    myVertices.release(aCtx);

-    myColors.release(aCtx);

-}

-

-void StSeekBar::stglResize() {

-    StGLWidget::stglResize();

-    StGLContext& aCtx = getContext();

-

-    stglUpdateVertices();

-

-    // update projection matrix

-    if(!myProgram.isNull()) {

-        myProgram->use(aCtx);

-        myProgram->setProjMat(aCtx, getRoot()->getScreenProjection());

-        myProgram->unuse(aCtx);

-    }

-}

-

-void StSeekBar::stglUpdateVertices() {

-    StArray<StGLVec2> aVertices(12);

-

-    // black border quad

-    StRectI_t aRectPx(getRectPxAbsolute());

-    aRectPx.top()    += myMargins.top;

-    aRectPx.bottom() -= myMargins.bottom;

-    aRectPx.left()   += myMargins.left;

-    aRectPx.right()  -= myMargins.right;

-

-    myRoot->getRectGl(aRectPx, aVertices, 0);

-

-    // inner empty quad

-    aRectPx.top()    += 1;

-    aRectPx.bottom() -= 1;

-    aRectPx.left()   += 1;

-    aRectPx.right()  -= 1;

-    myRoot->getRectGl(aRectPx, aVertices, 4);

-

-    // inner filled quad

-    myProgressPx = int(myProgress * GLfloat(aRectPx.width()));

-    myProgressPx = stClamp(myProgressPx, 0, aRectPx.width());

-    aRectPx.right() = aRectPx.left() + myProgressPx;

-    myRoot->getRectGl(aRectPx, aVertices, 8);

-

-    myVertices.init(getContext(), aVertices);

-    myIsResized = false;

-}

-

-bool StSeekBar::stglInit() {

-    StGLContext& aCtx = getContext();

-    const GLfloat COLORS[4 * 12] = {

-        // black border colors

-        0.0f, 0.0f, 0.0f, 1.0f, // quad's top-right

-        0.0f, 0.0f, 0.0f, 1.0f, // quad's bottom-right

-        0.0f, 0.0f, 0.0f, 1.0f, // quad's top-left

-        0.0f, 0.0f, 0.0f, 1.0f, // quad's bottom-left

-        // empty color

-        0.3f, 0.3f, 0.3f, 1.0f, // quad's top-right

-        0.3f, 0.3f, 0.3f, 1.0f, // quad's bottom-right

-        0.3f, 0.3f, 0.3f, 1.0f, // quad's top-left

-        0.3f, 0.3f, 0.3f, 1.0f, // quad's bottom-left

-        // fill color

-        0.13f, 0.35f, 0.49f, 1.0f, // quad's top-right

-        0.13f, 0.35f, 0.49f, 1.0f, // quad's bottom-right

-        0.13f, 0.35f, 0.49f, 1.0f, // quad's top-left

-        0.13f, 0.35f, 0.49f, 1.0f  // quad's bottom-left

-    };

-

-    myVertices.init(aCtx); // just generate buffer

-    myColors.init(aCtx, 4, 12, COLORS);

-

-    stglUpdateVertices();

-

-    return myProgram->init(aCtx)

-        && StGLWidget::stglInit();

-}

-

-void StSeekBar::stglDraw(unsigned int theView) {

-    StGLContext& aCtx = getContext();

-

-    // need to update vertices buffer?

-    if(myIsResized

-    || myProgressPx != int(myProgress * GLfloat((getRectPx().width() - myMargins.left - myMargins.right - 2)))) {

-        stglUpdateVertices();

-    }

-

-    aCtx.core20fwd->glBlendFunc(GL_SRC_ALPHA, GL_ONE_MINUS_SRC_ALPHA);

-    aCtx.core20fwd->glEnable(GL_BLEND);

-    myProgram->use(aCtx, myOpacity, myRoot->getScreenDispX());

-

-    myVertices.bindVertexAttrib(aCtx, myProgram->getVVertexLoc());

-    myColors  .bindVertexAttrib(aCtx, myProgram->getVColorLoc());

-

-    aCtx.core20fwd->glDrawArrays(GL_TRIANGLE_STRIP, 0, 4);

-    aCtx.core20fwd->glDrawArrays(GL_TRIANGLE_STRIP, 4, 4);

-

-    if(myProgressPx >= 1) {

-        aCtx.core20fwd->glDrawArrays(GL_TRIANGLE_STRIP, 8, 4);

-    }

-

-    myColors  .unBindVertexAttrib(aCtx, myProgram->getVColorLoc());

-    myVertices.unBindVertexAttrib(aCtx, myProgram->getVVertexLoc());

-

-    myProgram->unuse(aCtx);

-    aCtx.core20fwd->glDisable(GL_BLEND);

-

-    StGLWidget::stglDraw(theView);

-}

-

-void StSeekBar::stglUpdate(const StPointD_t& theCursor) {

-    StGLWidget::stglUpdate(theCursor);

-    if(!isClicked(ST_MOUSE_LEFT)) {

-        return;

-    }

-

-    const double aPos   = stMin(stMax(getPointInEx(theCursor), 0.0), 1.0);

-    const int    aPosPx = int(aPos * double(getRectPx().width()));

-    if(myClickPos >= 0

-    && std::abs(aPosPx - myClickPos) < myMoveTolerPx) {

-        return;

-    }

-

-    myClickPos = aPosPx;

-    signals.onSeekClick(ST_MOUSE_LEFT, aPos);

-}

-

-double StSeekBar::getPointInEx(const StPointD_t& thePointZo) const {

-    StRectI_t aRectPx = getRectPxAbsolute();

-    aRectPx.left()  += myMargins.left;

-    aRectPx.right() -= myMargins.right;

-    const StRectD_t  aRectGl  = myRoot->getRectGl(aRectPx);;

-    const StPointD_t aPointGl = getPointGl(thePointZo);

-    return (aPointGl.x() - aRectGl.left()) / (aRectGl.right() - aRectGl.left());

-}

-

-void StSeekBar::doMouseClick(const int ) {

-    //

-}

-

-void StSeekBar::doMouseUnclick(const int mouseBtn) {

-    const double aPos       = stMin(stMax(getPointInEx(myRoot->getCursorZo()), 0.0), 1.0);

-    const int    aTolerance = myRoot->scale(1);

-    const int    aPosPx     = int(aPos * double(getRectPx().width()));

-    if(myClickPos >= 0

-    && std::abs(aPosPx - myClickPos) < aTolerance) {

-        myClickPos = -1;

-        return;

-    }

-

-    myClickPos = -1;

-    signals.onSeekClick(mouseBtn, aPos);

-}

​

@@ -1,95 +0,0 @@

-/**

- * Copyright © 2009-2015 Kirill Gavrilov <kirill@sview.ru>

- *

- * StMoviePlayer program is free software: you can redistribute it and/or modify

- * it under the terms of the GNU General Public License as published by

- * the Free Software Foundation, either version 3 of the License, or

- * (at your option) any later version.

- *

- * StMoviePlayer program is distributed in the hope that it will be useful,

- * but WITHOUT ANY WARRANTY; without even the implied warranty of

- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.

- * See the GNU General Public License for more details.

- *

- * You should have received a copy of the GNU General Public

- * License along with this program.

- * If not, see <http://www.gnu.org/licenses/>.

- */

-

-#ifndef __StSeekBar_h_

-#define __StSeekBar_h_

-

-#include <StGLWidgets/StGLWidget.h>

-#include <StGL/StGLVertexBuffer.h>

-

-/**

- * Simple seeking bar widget.

- */

-class ST_LOCAL StSeekBar : public StGLWidget {

-

-        public: //! @name public methods

-

-    /**

-     * Default constructor.

-     */

-    StSeekBar(StGLWidget* theParent,

-              const int   theTop,

-              const int   theMargin);

-

-    /**

-     * Destructor.

-     */

-    virtual ~StSeekBar();

-

-    /**

-     * @param theProgress - current progress from 0.0f to 1.0f;

-     */

-    void setProgress(const GLfloat theProgress) {

-        myProgress = theProgress;

-    }

-

-    void setMoveTolerance(const int theTolerPx) {

-        myMoveTolerPx = theTolerPx;

-    }

-

-    virtual void stglResize();

-    virtual bool stglInit();

-    virtual void stglUpdate(const StPointD_t& theCursor);

-    virtual void stglDraw(unsigned int view);

-

-        public:  //!< Signals

-

-    struct {

-        /**

-         * Emit callback Slot on mouse click.

-         * @param theMouseBtnId (const int ) - mouse button id;

-         * @param theProgress (const double ) - current progress value.

-         */

-        StSignal<void (const int , const double )> onSeekClick;

-    } signals;

-

-        private: //! @name callback Slots (private overriders)

-

-    void doMouseClick  (const int );

-    void doMouseUnclick(const int );

-

-        private: //! @name private methods

-

-    void stglUpdateVertices();

-    double getPointInEx(const StPointD_t& thePointZo) const;

-

-        private:

-

-    class StProgramSB;

-    StHandle<StProgramSB> myProgram;    //!< GLSL program

-

-    StGLVertexBuffer      myVertices;   //!< vertices VBO

-    StGLVertexBuffer      myColors;     //!< colors   VBO

-    GLfloat               myProgress;   //!< current progress 0..1

-    int                   myProgressPx; //!< current progress - width in pixels

-    int                   myClickPos;

-    int                   myMoveTolerPx;

-

-};

-

-#endif //__StSeekBar_h_

​

@@ -1,117 +0,0 @@

-/**

- * Copyright © 2011 Kirill Gavrilov <kirill@sview.ru>

- *

- * Distributed under the Boost Software License, Version 1.0.

- * See accompanying file license-boost.txt or copy at

- * http://www.boost.org/LICENSE_1_0.txt

- */

-

-#if (defined(__APPLE__))

-

-#include <StFile/StFileNode.h>

-#include <StFile/StMIMEList.h>

-

-#include <StCocoa/StCocoaLocalPool.h>

-

-#import <Cocoa/Cocoa.h>

-

-@interface StOpenFileInfo : NSObject

-    {

-        NSMutableArray* myFilter;

-        NSString*       myTitle;

-        NSString*       myFolder;

-        @public

-        StString        myResult;

-        bool            myToSave;

-        @public

-        bool            myIsFileSelected;

-    }

-

-    - (id ) init: (NSMutableArray* ) theFilter

-       withTitle: (NSString* )       theTitle

-      withFolder: (NSString* )       theFolder

-          toSave: (bool )            theToSave;

-

-    - (void ) doDialog: (id ) theSender;

-@end

-

-@implementation StOpenFileInfo

-

-    - (id ) init: (NSMutableArray* ) theFilter

-       withTitle: (NSString* )       theTitle

-      withFolder: (NSString* )       theFolder

-          toSave: (bool )            theToSave {

-        self = [super init];

-        if(self == NULL) {

-            return NULL;

-        }

-        myFilter = theFilter;

-        myTitle  = theTitle;

-        myFolder = theFolder;

-        myToSave = theToSave;

-        myIsFileSelected = false;

-        return self;

-    }

-

-    - (void ) doDialog: (id ) theSender {

-        StCocoaLocalPool aLocalPool;

-        NSSavePanel* aFilePanel = myToSave ? [NSSavePanel savePanel] : [NSOpenPanel openPanel];

-        [aFilePanel setTitle: myTitle];

-        [aFilePanel setDirectoryURL: [NSURL fileURLWithPath: myFolder]];

-

-        if(myFilter != NULL) {

-            [aFilePanel setAllowedFileTypes: myFilter];

-        }

-

-        if([aFilePanel runModal] == NSOKButton) {

-            myIsFileSelected = true;

-            // automatically convert filenames from decomposed form used by Mac OS X file systems

-            NSString* aFileName = [[aFilePanel filename] precomposedStringWithCanonicalMapping];

-            myResult = [aFileName UTF8String];

-        }

-    }

-

-@end

-

-bool StFileNode::openFileDialog(const StString& theFolder,

-                                const StString& theTitle,

-                                const StMIMEList& theFilter,

-                                StString& theFilePath,

-                                bool toSave) {

-    if(NSApp == nil) {

-        return false;

-    }

-

-    StCocoaLocalPool aLocalPool;

-    NSString* aTitle  = [NSString stringWithUTF8String: theTitle.toCString()];

-    NSString* aFolder = [NSString stringWithUTF8String: theFolder.toCString()];

-    NSMutableArray* aFilter = NULL;

-    if(!theFilter.isEmpty()) {

-        aFilter = [NSMutableArray arrayWithCapacity: theFilter.size()];

-        for(size_t aMimeId = 0; aMimeId < theFilter.size(); ++aMimeId) {

-            const StMIME& aMime = theFilter[aMimeId];

-            [aFilter addObject: [NSString stringWithUTF8String: aMime.getExtension().toCString()]];

-        }

-    }

-

-    StOpenFileInfo* anOpenFile = [[StOpenFileInfo alloc] init: aFilter

-                                                    withTitle: aTitle

-                                                   withFolder: aFolder

-                                                       toSave: toSave];

-    if([NSThread isMainThread]) {

-        [anOpenFile doDialog: NULL];

-    } else {

-        // create open file dialog in main thread due to Cocoa stupidity

-        [anOpenFile performSelectorOnMainThread: @selector(doDialog:)

-                                     withObject: NULL

-                                  waitUntilDone: YES];

-    }

-

-    bool isFileSelected = anOpenFile->myIsFileSelected;

-    theFilePath = anOpenFile->myResult;

-    [anOpenFile release];

-

-    return isFileSelected;

-}

-

-#endif // __APPLE__

​

@@ -10,6 +10,7 @@

 *.sh        eol=lf

 *.workspace eol=lf

 *.cbp       eol=lf

+*.yml       eol=lf

 *.vcxproj*  eol=crlf

 *.filters   eol=crlf

 *.sln       eol=crlf

​

@@ -19,6 +19,12 @@

 *.so

 *.zip

 *.7z

+*.gz

+*.bz2

+*.xz

+*.dmg

+custom.bat

+custom.sh

 Doxygen/

 distribution/repository/

 distribution/temp/

@@ -31,6 +37,8 @@

 3rdparty/include/freetype

 3rdparty/include/lib*

 3rdparty/include/ft2build.h

+3rdparty/include/OVR*

+3rdparty/include/Extras/OVR*

 build/

 bin/

 lib/

@@ -48,6 +56,9 @@

 StMoviePlayer/obj/

 StDiagnostics/obj/

 StCADViewer/obj/

+StCADViewer/gen/

+StCADViewer/.settings/

+StCADViewer/assets/

 StBrowserPlugin/obj/

 sview/obj/

 sview/gen/

​

@@ -0,0 +1,54 @@

+language: cpp

+compiler:

+  - gcc

+  #- clang

+

+os:

+  - linux

+  - osx

+

+env:

+  - MY_TARGET=linux

+  - MY_TARGET=android

+  - MY_TARGET=osx

+

+matrix:

+  exclude:

+    - os: osx

+      env: MY_TARGET=linux

+    - os: osx

+      env: MY_TARGET=android

+    - os: linux

+      env: MY_TARGET=osx

+

+# require Ubuntu 14.04 Trusty Tahr

+sudo: required

+dist: trusty

+

+addons:

+  apt:

+    packages:

+      - g++

+      - libgtk2.0-dev

+      - libopenal-dev

+      - libgl1-mesa-dev

+      - libwebp-dev

+      - libconfig++-dev

+      - libconfig-dev

+      - libxpm-dev

+      - libavcodec-dev

+      - libavdevice-dev

+      - libavformat-dev

+      - libavutil-dev

+      - libswscale-dev

+

+before_install:

+  - if [[ "$MY_TARGET" == "osx" ]]; then brew update; fi

+  - if [[ "$MY_TARGET" == "osx" ]]; then brew install freetype ffmpeg; fi

+

+install: true

+

+script:

+  - if [[ "$MY_TARGET" == "linux"   ]]; then ./contentiousIntegration/build_sview_linux.sh;   else echo "Skipping step for current target..."; fi

+  - if [[ "$MY_TARGET" == "android" ]]; then ./contentiousIntegration/build_sview_android.sh; else echo "Skipping step for current target..."; fi

+  - if [[ "$MY_TARGET" == "osx"     ]]; then ./contentiousIntegration/build_sview_osx.sh;     else echo "Skipping step for current target..."; fi

​

@@ -9,7 +9,8 @@

 rebuildDebug="false"

 rebuildAndroid="false"

 compilerPrefix=""

-androidNdkRoot="~/develop/android-ndk-r10"

+androidTarget=""

+androidNdkRoot="$HOME/develop/android-ndk-r12b"

 aSystem=`uname -s`

 aPwdBack=$PWD

@@ -32,6 +33,13 @@

   fi

 done