AuroraMiddleware/OpenSubdiv
1
0
Fork 0
mirror of https://github.com/PixarAnimationStudios/OpenSubdiv synced 2024-11-30 07:10:07 +00:00
Code Issues Releases Wiki Activity

Merge branch 'dev' of https://github.com/PixarAnimationStudios/OpenSubdiv into dev_farviewer

Browse Source
This commit is contained in:
George ElKoura 2015-05-19 19:23:43 -07:00
commit 5d89260d5b
6 changed files with 224 additions and 215 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
cmake/FindDXSDK.cmake
View File

@ -42,9 +42,9 @@ if (WIN32)
"$ENV{DXSDK_LOCATION}/Include"
"${DXSDK_ROOT}/Include"
"$ENV{DXSDK_ROOT}/Include"
"C:/Program Files (x86)/Windows Kits/8.1/Include/um"
"C:/Program Files (x86)/Microsoft DirectX SDK*/Include"
"C:/Program Files/Microsoft DirectX SDK*/Include"
"C:/Program Files (x86)/Windows Kits/8.1/Include/um"
)
if ("${CMAKE_GENERATOR}" MATCHES "[Ww]in64")
@ -60,9 +60,9 @@ if (WIN32)
"$ENV{DXSDK_LOCATION}/Lib/${ARCH}"
"${DXSDK_ROOT}/Lib/${ARCH}"
"$ENV{DXSDK_ROOT}/Lib/${ARCH}"
"C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/${ARCH}"
"C:/Program Files (x86)/Microsoft DirectX SDK*/Lib/${ARCH}"
"C:/Program Files/Microsoft DirectX SDK*/Lib/${ARCH}"
"C:/Program Files (x86)/Windows Kits/8.1/Lib/winv6.3/um/${ARCH}"
)
set(DXSDK_LIBRARY_DIR ${LIBRARY_DIR})

17
examples/farViewer/gl_mesh.cpp
View File

@ -540,13 +540,9 @@ getNumEdges(int numCVs) {
int const *
getEdgeList(int numCVs) {
/*
static int edgeList4[] = { 0, 1, 1, 2, 2, 3, 3, 0 };
static int * edgeList9 = edgeList4,
* edgeList12 = edgeList4,
* edgeList16 = edgeList4;
/*
static int edgeList9[] = { 0, 1, 1, 4,
3, 2, 2, 5,
8, 7, 7, 6,
@ -570,14 +566,13 @@ getEdgeList(int numCVs) {
14, 3, 3, 2, 2, 9,
13, 12, 12, 11, 11, 10 };
*/
static int edgeList4of16[] = { 5, 6, 6, 10, 10, 9, 9, 5 };
static int edgeList4of20[] = { 0, 5, 5, 10, 10, 15, 15, 0 };
switch (numCVs) {
case 4: return edgeList4; break;
case 9: return edgeList9; break;
case 12: return edgeList12; break;
case 16: return edgeList16; break;
case 20: return edgeList4; break;
case 4: return edgeList4of20; break;
case 16: return edgeList4of16; break;
case 20: return edgeList4of20; break;
default:
assert(0);
}

1
opensubdiv/far/CMakeLists.txt
View File

@ -60,6 +60,7 @@ set(PUBLIC_HEADER_FILES
ptexIndices.h
stencilTables.h
stencilTablesFactory.h
topologyLevel.h
topologyRefiner.h
topologyRefinerFactory.h
types.h

113
opensubdiv/far/topologyLevel.h Normal file
View File

@ -0,0 +1,113 @@
//
// Copyright 2015 DreamWorks Animation LLC.
//
// Licensed under the Apache License, Version 2.0 (the "Apache License")
// with the following modification; you may not use this file except in
// compliance with the Apache License and the following modification to it:
// Section 6. Trademarks. is deleted and replaced with:
//
// 6. Trademarks. This License does not grant permission to use the trade
// names, trademarks, service marks, or product names of the Licensor
// and its affiliates, except as required to comply with Section 4(c) of
// the License and to reproduce the content of the NOTICE file.
//
// You may obtain a copy of the Apache License at
//
// http://www.apache.org/licenses/LICENSE-2.0
//
// Unless required by applicable law or agreed to in writing, software
// distributed under the Apache License with the above modification is
// distributed on an "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
// KIND, either express or implied. See the Apache License for the specific
// language governing permissions and limitations under the Apache License.
//
#pragma once
#ifndef OPENSUBDIV3_FAR_TOPOLOGY_LEVEL_H
#define OPENSUBDIV3_FAR_TOPOLOGY_LEVEL_H
#include "../version.h"
#include "../vtr/level.h"
#include "../vtr/refinement.h"
#include "../far/types.h"
#include <vector>
namespace OpenSubdiv {
namespace OPENSUBDIV_VERSION {
namespace Far {
///
/// \brief TopologyLevel is an interface for accessing data in a specific level of a refined
/// topology hierarchy. TopologyLevels are created and owned by a TopologyRefiner, which will
/// return const-references to them. Such references are only valid during the lifetime of
/// TopologyRefiner that created and returned them, and only for a given refinement, i.e. if
/// the TopologyRefiner is re-refined, any references to TopoologyLevels are invalidated.
///
class TopologyLevel {
public:
// Inventory of components:
int GetNumVertices() const { return _level->getNumVertices(); }
int GetNumEdges() const { return _level->getNumEdges(); }
int GetNumFaces() const { return _level->getNumFaces(); }
int GetNumFaceVertices() const { return _level->getNumFaceVerticesTotal(); }
float GetEdgeSharpness(Index e) const { return _level->getEdgeSharpness(e); }
float GetVertexSharpness(Index v) const { return _level->getVertexSharpness(v); }
bool IsFaceHole(Index f) const { return _level->isFaceHole(f); }
Sdc::Crease::Rule GetVertexRule(Index v) const { return _level->getVertexRule(v); }
int GetNumFVarValues( int channel = 0) const { return _level->getNumFVarValues(channel); }
ConstIndexArray GetFVarFaceValues(Index f, int channel = 0) const { return _level->getFVarFaceValues(f, channel); }
ConstIndexArray GetFaceVertices(Index f) const { return _level->getFaceVertices(f); }
ConstIndexArray GetFaceEdges(Index f) const { return _level->getFaceEdges(f); }
ConstIndexArray GetEdgeVertices(Index e) const { return _level->getEdgeVertices(e); }
ConstIndexArray GetEdgeFaces(Index e) const { return _level->getEdgeFaces(e); }
ConstIndexArray GetVertexFaces( Index v) const { return _level->getVertexFaces(v); }
ConstIndexArray GetVertexEdges( Index v) const { return _level->getVertexEdges(v); }
ConstLocalIndexArray GetEdgeFaceLocalIndices(Index e) const { return _level->getEdgeFaceLocalIndices(e); }
ConstLocalIndexArray GetVertexFaceLocalIndices(Index v) const { return _level->getVertexFaceLocalIndices(v); }
ConstLocalIndexArray GetVertexEdgeLocalIndices(Index v) const { return _level->getVertexEdgeLocalIndices(v); }
Index FindEdge(Index v0, Index v1) const { return _level->findEdge(v0, v1); }
ConstIndexArray GetFaceChildFaces(Index f) const { return _refToChild->getFaceChildFaces(f); }
ConstIndexArray GetFaceChildEdges(Index f) const { return _refToChild->getFaceChildEdges(f); }
ConstIndexArray GetEdgeChildEdges(Index e) const { return _refToChild->getEdgeChildEdges(e); }
Index GetFaceChildVertex( Index f) const { return _refToChild->getFaceChildVertex(f); }
Index GetEdgeChildVertex( Index e) const { return _refToChild->getEdgeChildVertex(e); }
Index GetVertexChildVertex(Index v) const { return _refToChild->getVertexChildVertex(v); }
Index GetFaceParentFace(Index f) const { return _refToParent->getChildFaceParentFace(f); }
Index GetFaceBaseFace( Index f) const { return _refToParent->getChildFaceBaseFace(f); }
bool ValidateTopology() const { return _level->validateTopology(); }
void PrintTopology(bool children = true) const { _level->print((children && _refToChild) ? _refToChild : 0); }
private:
friend class TopologyRefiner;
Vtr::Level const * _level;
Vtr::Refinement const * _refToParent;
Vtr::Refinement const * _refToChild;
public:
// Not intended for public use, but required by std::vector, etc...
TopologyLevel() { }
~TopologyLevel() { }
};
} // end namespace Far
} // end namespace OPENSUBDIV_VERSION
using namespace OPENSUBDIV_VERSION;
} // end namespace OpenSubdiv
#endif /* OPENSUBDIV3_FAR_TOPOLOGY_LEVEL_H */

31
opensubdiv/far/topologyRefiner.cpp
View File

@ -58,6 +58,8 @@ TopologyRefiner::TopologyRefiner(Sdc::SchemeType schemeType, Sdc::Options scheme
// but will probably have to settle for explicit new/delete...
_levels.reserve(10);
_levels.push_back(new Vtr::Level);
_farLevels.reserve(10);
assembleFarLevels();
}
TopologyRefiner::~TopologyRefiner() {
@ -85,6 +87,8 @@ TopologyRefiner::Unrefine() {
delete _refinements[i];
}
_refinements.clear();
assembleFarLevels();
}
@ -150,6 +154,31 @@ TopologyRefiner::appendRefinement(Vtr::Refinement & newRefinement) {
_refinements.push_back(&newRefinement);
}
void
TopologyRefiner::assembleFarLevels() {
_farLevels.resize(_levels.size());
_farLevels[0]._refToParent = 0;
_farLevels[0]._level = _levels[0];
_farLevels[0]._refToChild = 0;
int nRefinements = (int)_refinements.size();
if (nRefinements) {
_farLevels[0]._refToChild = _refinements[0];
for (int i = 1; i < nRefinements; ++i) {
_farLevels[i]._refToParent = _refinements[i - 1];
_farLevels[i]._level = _levels[i];
_farLevels[i]._refToChild = _refinements[i];;
}
_farLevels[nRefinements]._refToParent = _refinements[nRefinements - 1];
_farLevels[nRefinements]._level = _levels[nRefinements];
_farLevels[nRefinements]._refToChild = 0;
}
}
//
// Accessors to the topology information:
@ -228,6 +257,7 @@ TopologyRefiner::RefineUniform(UniformOptions options) {
appendLevel(childLevel);
appendRefinement(*refinement);
}
assembleFarLevels();
}
@ -299,6 +329,7 @@ TopologyRefiner::RefineAdaptive(AdaptiveOptions options) {
appendLevel(childLevel);
appendRefinement(*refinement);
}
assembleFarLevels();
}
//

273
opensubdiv/far/topologyRefiner.h
View File

@ -40,6 +40,7 @@
#include "../vtr/maskInterfaces.h"
#include "../far/types.h"
#include "../far/error.h"
#include "../far/topologyLevel.h"
#include <vector>
#include <cassert>
@ -100,6 +101,9 @@ public:
/// \brief Returns the total number of face vertices in all levels
int GetNumFaceVerticesTotal() const { return _totalFaceVertices; }
/// \brief Returns a handle to access data specific to a particular level
TopologyLevel const & GetLevel(int level) const { return _farLevels[level]; }
//@{
/// @name High-level refinement and related methods
///
@ -298,127 +302,11 @@ public:
//@}
//@{
/// @name Inspection of components per level
///
/// \brief Returns the number of vertices at a given level of refinement
int GetNumVertices(int level) const {
return _levels[level]->getNumVertices();
}
/// \brief Returns the number of edges at a given level of refinement
int GetNumEdges(int level) const {
return _levels[level]->getNumEdges();
}
/// \brief Returns the number of face vertex indices at a given level of refinement
int GetNumFaces(int level) const {
return _levels[level]->getNumFaces();
}
/// \brief Returns the number of faces marked as holes at the given level
int GetNumHoles(int level) const;
/// \brief Returns the number of faces at a given level of refinement
int GetNumFaceVertices(int level) const {
return _levels[level]->getNumFaceVerticesTotal();
}
/// \brief Returns the sharpness of a given edge (at 'level' of refinement)
float GetEdgeSharpness(int level, Index edge) const {
return _levels[level]->getEdgeSharpness(edge);
}
/// \brief Returns the sharpness of a given vertex (at 'level' of refinement)
float GetVertexSharpness(int level, Index vert) const {
return _levels[level]->getVertexSharpness(vert);
}
/// \brief Returns the subdivision rule of a given vertex (at 'level' of refinement)
Sdc::Crease::Rule GetVertexRule(int level, Index vert) const {
return _levels[level]->getVertexRule(vert);
}
//@}
//@{
/// @name Topological relations -- incident/adjacent components
/// @name Number and properties of face-varying channels:
///
/// \brief Returns the vertices of a 'face' at 'level'
ConstIndexArray GetFaceVertices(int level, Index face) const {
return _levels[level]->getFaceVertices(face);
}
/// \brief Returns the edges of a 'face' at 'level'
ConstIndexArray GetFaceEdges(int level, Index face) const {
return _levels[level]->getFaceEdges(face);
}
/// \brief Returns true if 'face' at 'level' is tagged as a hole
bool IsFaceHole(int level, Index face) const {
return _levels[level]->isFaceHole(face);
}
/// \brief Returns the vertices of an 'edge' at 'level' (2 of them)
ConstIndexArray GetEdgeVertices(int level, Index edge) const {
return _levels[level]->getEdgeVertices(edge);
}
/// \brief Returns the faces incident to 'edge' at 'level'
ConstIndexArray GetEdgeFaces(int level, Index edge) const {
return _levels[level]->getEdgeFaces(edge);
}
/// \brief Returns the faces incident to 'vertex' at 'level'
ConstIndexArray GetVertexFaces(int level, Index vert) const {
return _levels[level]->getVertexFaces(vert);
}
/// \brief Returns the edges incident to 'vertex' at 'level'
ConstIndexArray GetVertexEdges(int level, Index vert) const {
return _levels[level]->getVertexEdges(vert);
}
/// \brief Returns the local face indices of edge 'edge' at 'level'
ConstLocalIndexArray GetEdgeFaceLocalIndices(int level, Index edge) const {
return _levels[level]->getEdgeFaceLocalIndices(edge);
}
/// \brief Returns the local face indices of vertex 'vert' at 'level'
ConstLocalIndexArray GetVertexFaceLocalIndices(int level, Index vert) const {
return _levels[level]->getVertexFaceLocalIndices(vert);
}
/// \brief Returns the local edge indices of vertex 'vert' at 'level'
ConstLocalIndexArray GetVertexEdgeLocalIndices(int level, Index vert) const {
return _levels[level]->getVertexEdgeLocalIndices(vert);
}
/// \brief Returns true if the given face does not contain extraordinary vertices
bool FaceIsRegular(int level, Index face) const {
ConstIndexArray fVerts = _levels[level]->getFaceVertices(face);
Vtr::Level::VTag compFaceVertTag =
_levels[level]->getFaceCompositeVTag(fVerts);
return not compFaceVertTag._xordinary;
}
/// \brief Returns the edge with vertices 'v0' and 'v1' (or INDEX_INVALID if
/// they are not connected)
Index FindEdge(int level, Index v0, Index v1) const {
return _levels[level]->findEdge(v0, v1);
}
//@}
//@{
/// @name Inspection of face-varying channels and their contents:
///
/// \brief Returns the number of face-varying channels in the tables
int GetNumFVarChannels() const;
@ -428,87 +316,74 @@ public:
/// \brief Returns the total number of face-varying values in all levels
int GetNumFVarValuesTotal(int channel = 0) const;
/// \brief Returns the number of face-varying values at a given level of refinement
int GetNumFVarValues(int level, int channel = 0) const;
/// \brief Returns the face-varying values of a 'face' at 'level'
ConstIndexArray GetFVarFaceValues(int level, Index face, int channel = 0) const;
//@}
//@{
/// @name Parent-to-child relationships,
/// Relationships between components in one level
/// and the next (entries may be invalid if sparse):
///
/// \brief Returns the child faces of face 'f' at 'level'
ConstIndexArray GetFaceChildFaces(int level, Index f) const {
return _refinements[level]->getFaceChildFaces(f);
}
/// \brief Returns the child edges of face 'f' at 'level'
ConstIndexArray GetFaceChildEdges(int level, Index f) const {
return _refinements[level]->getFaceChildEdges(f);
}
/// \brief Returns the child edges of edge 'e' at 'level'
ConstIndexArray GetEdgeChildEdges(int level, Index e) const {
return _refinements[level]->getEdgeChildEdges(e);
}
/// \brief Returns the child vertex of face 'f' at 'level'
Index GetFaceChildVertex( int level, Index f) const {
return _refinements[level]->getFaceChildVertex(f);
}
/// \brief Returns the child vertex of edge 'e' at 'level'
Index GetEdgeChildVertex( int level, Index e) const {
return _refinements[level]->getEdgeChildVertex(e);
}
/// \brief Returns the child vertex of vertex 'v' at 'level'
Index GetVertexChildVertex(int level, Index v) const {
return _refinements[level]->getVertexChildVertex(v);
}
//@}
//@{
/// @name Child-to-parent or child-to-base relationships,
/// Relationships between components in one level and the
/// previous or base level (to be called with level > 0):
///
/// \brief Returns the parent face of face 'f' at 'level'
Index GetFaceParentFace(int level, Index f) const {
return _refinements[level-1]->getChildFaceParentFace(f);
}
/// \brief Returns the base face of face 'f' at 'level'
Index GetFaceBaseFace(int level, Index f) const {
return _refinements[level-1]->getChildFaceBaseFace(f);
}
//@}
//@{
/// @name Debugging aides
///
//
// Access to data per-level -- being made obsolete via this->GetLevel(level).Method():
//
// Component inventory:
int GetNumVertices(int level) const { return GetLevel(level).GetNumVertices(); }
int GetNumEdges(int level) const { return GetLevel(level).GetNumEdges(); }
int GetNumFaces(int level) const { return GetLevel(level).GetNumFaces(); }
int GetNumFaceVertices(int level) const { return GetLevel(level).GetNumFaceVertices(); }
/// \brief Returns true if the topology of 'level' is valid
bool ValidateTopology(int level) const {
return _levels[level]->validateTopology();
// Component tags:
float GetEdgeSharpness(int level, Index e) const { return GetLevel(level).GetEdgeSharpness(e); }
float GetVertexSharpness(int level, Index v) const { return GetLevel(level).GetVertexSharpness(v); }
bool IsFaceHole(int level, Index f) const { return GetLevel(level).IsFaceHole(f); }
Sdc::Crease::Rule GetVertexRule(int level, Index v) const { return GetLevel(level).GetVertexRule(v); }
// Face-varying values:
int GetNumFVarValues(int level, int channel = 0) const { return GetLevel(level).GetNumFVarValues(channel); }
ConstIndexArray GetFVarFaceValues(int level, Index f, int channel = 0) const { return GetLevel(level).GetFVarFaceValues(f, channel); }
// Component neighbors:
ConstIndexArray GetFaceVertices(int level, Index f) const { return GetLevel(level).GetFaceVertices(f); }
ConstIndexArray GetFaceEdges(int level, Index f) const { return GetLevel(level).GetFaceEdges(f); }
ConstIndexArray GetEdgeVertices(int level, Index e) const { return GetLevel(level).GetEdgeVertices(e); }
ConstIndexArray GetEdgeFaces(int level, Index e) const { return GetLevel(level).GetEdgeFaces(e); }
ConstIndexArray GetVertexFaces(int level, Index v) const { return GetLevel(level).GetVertexFaces(v); }
ConstIndexArray GetVertexEdges(int level, Index v) const { return GetLevel(level).GetVertexEdges(v); }
ConstLocalIndexArray GetEdgeFaceLocalIndices(int level, Index e) const { return GetLevel(level).GetEdgeFaceLocalIndices(e); }
ConstLocalIndexArray GetVertexFaceLocalIndices(int level, Index v) const { return GetLevel(level).GetVertexFaceLocalIndices(v); }
ConstLocalIndexArray GetVertexEdgeLocalIndices(int level, Index v) const { return GetLevel(level).GetVertexEdgeLocalIndices(v); }
Index FindEdge(int level, Index v0, Index v1) const { return GetLevel(level).FindEdge(v0, v1); }
// Child components:
ConstIndexArray GetFaceChildFaces(int level, Index f) const { return GetLevel(level).GetFaceChildFaces(f); }
ConstIndexArray GetFaceChildEdges(int level, Index f) const { return GetLevel(level).GetFaceChildEdges(f); }
ConstIndexArray GetEdgeChildEdges(int level, Index e) const { return GetLevel(level).GetEdgeChildEdges(e); }
Index GetFaceChildVertex( int level, Index f) const { return GetLevel(level).GetFaceChildVertex(f); }
Index GetEdgeChildVertex( int level, Index e) const { return GetLevel(level).GetEdgeChildVertex(e); }
Index GetVertexChildVertex(int level, Index v) const { return GetLevel(level).GetVertexChildVertex(v); }
// Parent components:
Index GetFaceParentFace(int level, Index f) const { return GetLevel(level).GetFaceParentFace(f); }
Index GetFaceBaseFace(int level, Index f) const { return GetLevel(level).GetFaceBaseFace(f); }
// Debugging aides:
bool ValidateTopology(int level) const { return GetLevel(level).ValidateTopology(); }
void PrintTopology(int level, bool children = true) const { GetLevel(level).PrintTopology(children); }
// UNDER RE-CONSIDERATION...
//
// Potentially too special-purpose to warrant public method (needs to iterate through all faces):
int GetNumHoles(int level) const;
// Appears to be completely unused:
bool FaceIsRegular(int level, Index face) const {
ConstIndexArray fVerts = _levels[level]->getFaceVertices(face);
Vtr::Level::VTag compFaceVertTag =
_levels[level]->getFaceCompositeVTag(fVerts);
return not compFaceVertTag._xordinary;
}
/// \brief Prints topology information to console
void PrintTopology(int level, bool children = true) const {
_levels[level]->print((children && ((int)_refinements.size() > level)) ? _refinements[level] : 0);
}
//@}
protected:
@ -607,6 +482,7 @@ private:
void appendLevel(Vtr::Level & newLevel);
void appendRefinement(Vtr::Refinement & newRefinement);
void assembleFarLevels();
private:
@ -628,8 +504,11 @@ private:
int _totalFaceVertices;
int _maxValence;
// There is some redundancy here -- to be reduced later
std::vector<Vtr::Level *> _levels;
std::vector<Vtr::Refinement *> _refinements;
std::vector<TopologyLevel> _farLevels;;
};
@ -644,16 +523,6 @@ TopologyRefiner::GetFVarLinearInterpolation(int channel) const {
return _levels[0]->getFVarOptions(channel).GetFVarLinearInterpolation();
}
inline int
TopologyRefiner::GetNumFVarValues(int level, int channel) const {
return _levels[level]->getNumFVarValues(channel);
}
inline ConstIndexArray
TopologyRefiner::GetFVarFaceValues(int level, Index face, int channel) const {
return _levels[level]->getFVarFaceValues(face, channel);
}
inline int
TopologyRefiner::createBaseFVarChannel(int numValues) {
return _levels[0]->createFVarChannel(numValues, _subdivOptions);