diff --git a/src/libtess.js/dict/Dict.js b/src/libtess.js/dict/Dict.js index 1186031bcd..fa97f5c280 100644 --- a/src/libtess.js/dict/Dict.js +++ b/src/libtess.js/dict/Dict.js @@ -35,6 +35,10 @@ // require libtess /*global libtess */ +goog.provide('libtess.Dict'); +goog.require('libtess'); +goog.require('libtess.DictNode'); + // TODO(bckenny): better typing for DictKey? actually libtess.ActiveRegion /** @typedef {Object} */ diff --git a/src/libtess.js/dict/DictNode.js b/src/libtess.js/dict/DictNode.js index 8a41190a2c..4cb6e34dc9 100644 --- a/src/libtess.js/dict/DictNode.js +++ b/src/libtess.js/dict/DictNode.js @@ -36,6 +36,9 @@ // require libtess.Dict /*global libtess */ +goog.provide('libtess.DictNode'); +goog.require('libtess'); + // TODO(bckenny): better typing for DictKey? diff --git a/src/libtess.js/geom.js b/src/libtess.js/geom.js index b399ec29bf..63524392fa 100644 --- a/src/libtess.js/geom.js +++ b/src/libtess.js/geom.js @@ -40,10 +40,8 @@ // require libtess.GluVertex /*global libtess */ - -libtess.geom = function() { - -}; +goog.provide('libtess.geom'); +goog.require('libtess'); /** diff --git a/src/libtess.js/libtess.js b/src/libtess.js/libtess.js index 9c289a0fb4..8c6c714670 100644 --- a/src/libtess.js/libtess.js +++ b/src/libtess.js/libtess.js @@ -32,11 +32,7 @@ * @author bckenny@google.com (Brendan Kenny) */ - -/** - * Base namespace. - */ -var libtess = libtess || {}; +goog.provide('libtess'); /** diff --git a/src/libtess.js/libtess/CachedVertex.js b/src/libtess.js/libtess/CachedVertex.js index 71532139e6..b2d9ed9363 100644 --- a/src/libtess.js/libtess/CachedVertex.js +++ b/src/libtess.js/libtess/CachedVertex.js @@ -35,6 +35,9 @@ // require libtess /*global libtess */ +goog.provide('libtess.CachedVertex'); +goog.require('libtess'); + /** diff --git a/src/libtess.js/libtess/GluTesselator.js b/src/libtess.js/libtess/GluTesselator.js index 97bed914bb..f286ed268f 100644 --- a/src/libtess.js/libtess/GluTesselator.js +++ b/src/libtess.js/libtess/GluTesselator.js @@ -40,6 +40,16 @@ // require libtess.sweep /*global libtess */ +goog.provide('libtess.GluTesselator'); +goog.require('libtess'); +goog.require('libtess.CachedVertex'); +goog.require('libtess.GluMesh'); +goog.require('libtess.mesh'); +goog.require('libtess.normal'); +goog.require('libtess.render'); +goog.require('libtess.sweep'); +goog.require('libtess.tessmono'); + // TODO(bckenny): options for just triangles, just tristrips, single tristrip w/ resets // other primitives with index buffer? would have to add a better tristrip extractor // monotone poly -> tristrip seems possible... diff --git a/src/libtess.js/mesh.js b/src/libtess.js/mesh.js index be21302489..402064859d 100644 --- a/src/libtess.js/mesh.js +++ b/src/libtess.js/mesh.js @@ -39,13 +39,15 @@ // require libtess.GluVertex /*global libtess */ +goog.provide('libtess.mesh'); +goog.require('libtess'); +goog.require('libtess.GluFace'); +goog.require('libtess.GluHalfEdge'); +goog.require('libtess.GluVertex'); + // TODO(bckenny): could maybe merge GluMesh and mesh.js since these are // operations on the mesh -libtess.mesh = function() { - -}; - /****************** Basic Edge Operations **********************/ diff --git a/src/libtess.js/mesh/GluFace.js b/src/libtess.js/mesh/GluFace.js index c19cf0bcfd..f4a47384f1 100644 --- a/src/libtess.js/mesh/GluFace.js +++ b/src/libtess.js/mesh/GluFace.js @@ -36,6 +36,9 @@ // requre libtess.GluHalfEdge /*global libtess */ +goog.provide('libtess.GluFace'); +goog.require('libtess'); + /** diff --git a/src/libtess.js/mesh/GluHalfEdge.js b/src/libtess.js/mesh/GluHalfEdge.js index ec706cc541..8cbc06c68d 100644 --- a/src/libtess.js/mesh/GluHalfEdge.js +++ b/src/libtess.js/mesh/GluHalfEdge.js @@ -38,6 +38,9 @@ // require libtess.ActiveRegion /*global libtess */ +goog.provide('libtess.GluHalfEdge'); +goog.require('libtess'); + /** diff --git a/src/libtess.js/mesh/GluMesh.js b/src/libtess.js/mesh/GluMesh.js index cc37745ad0..d76eaa4460 100644 --- a/src/libtess.js/mesh/GluMesh.js +++ b/src/libtess.js/mesh/GluMesh.js @@ -37,6 +37,12 @@ // require libtess.GluVertex /*global libtess */ +goog.provide('libtess.GluMesh'); +goog.require('libtess'); +goog.require('libtess.GluFace'); +goog.require('libtess.GluHalfEdge'); +goog.require('libtess.GluVertex'); + /** diff --git a/src/libtess.js/mesh/GluVertex.js b/src/libtess.js/mesh/GluVertex.js index 1e92dab8a1..f69e4383cd 100644 --- a/src/libtess.js/mesh/GluVertex.js +++ b/src/libtess.js/mesh/GluVertex.js @@ -35,6 +35,9 @@ // requre libtess.GluHalfEdge /*global libtess */ +goog.provide('libtess.GluVertex'); +goog.require('libtess'); + /** diff --git a/src/libtess.js/normal.js b/src/libtess.js/normal.js index 43bc6081e2..7834bd470b 100644 --- a/src/libtess.js/normal.js +++ b/src/libtess.js/normal.js @@ -36,9 +36,8 @@ // require libtess.GluTesselator /*global libtess */ -libtess.normal = function() { - -}; +goog.provide('libtess.normal'); +goog.require('libtess'); // TODO(bckenny): NOTE: diff --git a/src/libtess.js/priorityq/PQHandleElem.js b/src/libtess.js/priorityq/PQHandleElem.js index 8167b646de..12f992a427 100644 --- a/src/libtess.js/priorityq/PQHandleElem.js +++ b/src/libtess.js/priorityq/PQHandleElem.js @@ -35,6 +35,9 @@ // require libtess /*global libtess */ +goog.provide('libtess.PQHandleElem'); +goog.require('libtess'); + // TODO(bckenny): more specific typing on key diff --git a/src/libtess.js/priorityq/PQNode.js b/src/libtess.js/priorityq/PQNode.js index a29342d3c9..b879201320 100644 --- a/src/libtess.js/priorityq/PQNode.js +++ b/src/libtess.js/priorityq/PQNode.js @@ -35,6 +35,9 @@ // require libtess /*global libtess */ +goog.provide('libtess.PQNode'); +goog.require('libtess'); + // TODO(bckenny): maybe just have these created inline as literals // (or unboxed directly - PQHandle is just an array index number) diff --git a/src/libtess.js/priorityq/PriorityQ.js b/src/libtess.js/priorityq/PriorityQ.js index f1a19c9268..eee4c013aa 100644 --- a/src/libtess.js/priorityq/PriorityQ.js +++ b/src/libtess.js/priorityq/PriorityQ.js @@ -36,6 +36,10 @@ // require libtess.PriorityQHeap /*global libtess */ +goog.provide('libtess.PriorityQ'); +goog.require('libtess'); +goog.require('libtess.PriorityQHeap'); + // TODO(bckenny): preallocating arrays may actually be hurting us in sort // performance (esp if theres some undefs in there) diff --git a/src/libtess.js/priorityq/PriorityQHeap.js b/src/libtess.js/priorityq/PriorityQHeap.js index 99a5e1b5ec..90d527114c 100644 --- a/src/libtess.js/priorityq/PriorityQHeap.js +++ b/src/libtess.js/priorityq/PriorityQHeap.js @@ -37,6 +37,11 @@ // require libtess.PQHandleElem /*global libtess */ +goog.provide('libtess.PriorityQHeap'); +goog.require('libtess'); +goog.require('libtess.PQHandleElem'); +goog.require('libtess.PQNode'); + // TODO(bckenny): keys appear to always be GluVertex in this case? diff --git a/src/libtess.js/render.js b/src/libtess.js/render.js index 403a10c4ff..35c49135cc 100644 --- a/src/libtess.js/render.js +++ b/src/libtess.js/render.js @@ -40,12 +40,12 @@ // require libtess.GluMesh /*global libtess */ +goog.provide('libtess.render'); +goog.require('libtess'); +goog.require('libtess.FaceCount'); + // TODO(bckenny): most of these doc strings are probably more internal comments -libtess.render = function() { - -}; - /** * [SIGN_INCONSISTENT_ description] diff --git a/src/libtess.js/render/FaceCount.js b/src/libtess.js/render/FaceCount.js index 8fd51633d3..d4a9dacad0 100644 --- a/src/libtess.js/render/FaceCount.js +++ b/src/libtess.js/render/FaceCount.js @@ -37,6 +37,9 @@ // require libtess.GluTesselator /*global libtess */ +goog.provide('libtess.FaceCount'); +goog.require('libtess'); + // TODO(bckenny): Used only in private functions of render.js diff --git a/src/libtess.js/sweep.js b/src/libtess.js/sweep.js index 9dc3b64814..2d530a5fd6 100644 --- a/src/libtess.js/sweep.js +++ b/src/libtess.js/sweep.js @@ -38,6 +38,15 @@ // require libtess.PriorityQ /*global libtess */ +goog.provide('libtess.sweep'); +goog.require('libtess'); +goog.require('libtess.ActiveRegion'); +goog.require('libtess.Dict'); +goog.require('libtess.GluVertex'); +goog.require('libtess.PriorityQ'); +goog.require('libtess.geom'); +goog.require('libtess.mesh'); + // TODO(bckenny): a number of these never return null (as opposed to original) and should be typed appropriately /* @@ -70,10 +79,6 @@ * when it is necessary.) */ -libtess.sweep = function() { - -}; - /** * Make the sentinel coordinates big enough that they will never be diff --git a/src/libtess.js/sweep/ActiveRegion.js b/src/libtess.js/sweep/ActiveRegion.js index 169c909417..6e34127ec9 100644 --- a/src/libtess.js/sweep/ActiveRegion.js +++ b/src/libtess.js/sweep/ActiveRegion.js @@ -38,6 +38,9 @@ // require libtess.GluHalfEdge /*global libtess */ +goog.provide('libtess.ActiveRegion'); +goog.require('libtess.DictNode'); + // TODO(bckenny): apparently only visible outside of sweep for debugging routines. // find out if we can hide diff --git a/src/libtess.js/tessmono.js b/src/libtess.js/tessmono.js index 466c1ed5cb..dcaf5e22c1 100644 --- a/src/libtess.js/tessmono.js +++ b/src/libtess.js/tessmono.js @@ -38,9 +38,10 @@ // require libtess.GluMesh /*global libtess */ -libtess.tessmono = function() { - -}; +goog.provide('libtess.tessmono'); +goog.require('libtess'); +goog.require('libtess.geom'); +goog.require('libtess.mesh'); /**