Browse Source

Update copyright header

David Rose 24 years ago
parent
commit
00b55bf50c
100 changed files with 1675 additions and 373 deletions
  1. 14 1
      direct/src/dcparse/dcparse.cxx
  2. 23 10
      direct/src/dcparser/dcAtomicField.cxx
  3. 14 1
      direct/src/dcparser/dcAtomicField.h
  4. 16 3
      direct/src/dcparser/dcClass.cxx
  5. 14 1
      direct/src/dcparser/dcClass.h
  6. 15 2
      direct/src/dcparser/dcField.cxx
  7. 14 1
      direct/src/dcparser/dcField.h
  8. 16 3
      direct/src/dcparser/dcFile.cxx
  9. 14 1
      direct/src/dcparser/dcFile.h
  10. 14 1
      direct/src/dcparser/dcLexerDefs.h
  11. 15 2
      direct/src/dcparser/dcMolecularField.cxx
  12. 15 2
      direct/src/dcparser/dcMolecularField.h
  13. 14 1
      direct/src/dcparser/dcParserDefs.h
  14. 14 1
      direct/src/dcparser/dcSubatomicType.cxx
  15. 15 2
      direct/src/dcparser/dcSubatomicType.h
  16. 14 1
      direct/src/dcparser/dcbase.h
  17. 15 2
      direct/src/dcparser/dcindent.cxx
  18. 13 0
      direct/src/dcparser/dcindent.h
  19. 15 2
      direct/src/dcparser/hashGenerator.cxx
  20. 14 1
      direct/src/dcparser/hashGenerator.h
  21. 15 2
      direct/src/dcparser/primeNumberGenerator.cxx
  22. 15 2
      direct/src/dcparser/primeNumberGenerator.h
  23. 14 1
      direct/src/deadrec/correction.cxx
  24. 14 1
      direct/src/deadrec/correction.h
  25. 14 1
      direct/src/deadrec/prediction.cxx
  26. 14 1
      direct/src/deadrec/prediction.h
  27. 15 2
      direct/src/directbase/directbase.cxx
  28. 15 3
      direct/src/directbase/directbase.h
  29. 17 6
      direct/src/directbase/directsymbols.h
  30. 24 11
      direct/src/showbase/showBase.cxx
  31. 16 3
      direct/src/showbase/showBase.h
  32. 16 3
      pandaapp/src/stitch/stitchCommandProgram.cxx
  33. 14 1
      pandaapp/src/stitch/stitchCommandProgram.h
  34. 17 4
      pandaapp/src/stitch/stitchImageProgram.cxx
  35. 14 1
      pandaapp/src/stitch/stitchImageProgram.h
  36. 17 4
      pandaapp/src/stitch/stitchViewerProgram.cxx
  37. 14 1
      pandaapp/src/stitch/stitchViewerProgram.h
  38. 14 1
      pandaapp/src/stitchbase/config_stitch.cxx
  39. 14 1
      pandaapp/src/stitchbase/config_stitch.h
  40. 14 1
      pandaapp/src/stitchbase/fixedPoint.h
  41. 25 12
      pandaapp/src/stitchbase/layeredImage.cxx
  42. 15 2
      pandaapp/src/stitchbase/layeredImage.h
  43. 26 13
      pandaapp/src/stitchbase/morphGrid.cxx
  44. 14 1
      pandaapp/src/stitchbase/morphGrid.h
  45. 19 6
      pandaapp/src/stitchbase/stitchCommand.cxx
  46. 16 3
      pandaapp/src/stitchbase/stitchCommand.h
  47. 16 3
      pandaapp/src/stitchbase/stitchCommandReader.cxx
  48. 14 1
      pandaapp/src/stitchbase/stitchCommandReader.h
  49. 19 6
      pandaapp/src/stitchbase/stitchCylindricalLens.cxx
  50. 19 6
      pandaapp/src/stitchbase/stitchCylindricalLens.h
  51. 15 2
      pandaapp/src/stitchbase/stitchFile.cxx
  52. 15 2
      pandaapp/src/stitchbase/stitchFile.h
  53. 30 17
      pandaapp/src/stitchbase/stitchFisheyeLens.cxx
  54. 18 5
      pandaapp/src/stitchbase/stitchFisheyeLens.h
  55. 20 7
      pandaapp/src/stitchbase/stitchImage.cxx
  56. 19 6
      pandaapp/src/stitchbase/stitchImage.h
  57. 14 1
      pandaapp/src/stitchbase/stitchImageCommandOutput.cxx
  58. 15 2
      pandaapp/src/stitchbase/stitchImageCommandOutput.h
  59. 14 1
      pandaapp/src/stitchbase/stitchImageOutputter.cxx
  60. 14 1
      pandaapp/src/stitchbase/stitchImageOutputter.h
  61. 21 8
      pandaapp/src/stitchbase/stitchImageRasterizer.cxx
  62. 15 2
      pandaapp/src/stitchbase/stitchImageRasterizer.h
  63. 16 3
      pandaapp/src/stitchbase/stitchLens.cxx
  64. 19 6
      pandaapp/src/stitchbase/stitchLens.h
  65. 14 1
      pandaapp/src/stitchbase/stitchLexerDefs.h
  66. 29 16
      pandaapp/src/stitchbase/stitchPSphereLens.cxx
  67. 20 7
      pandaapp/src/stitchbase/stitchPSphereLens.h
  68. 18 0
      pandaapp/src/stitchbase/stitchParser.h
  69. 14 1
      pandaapp/src/stitchbase/stitchParserDefs.h
  70. 15 2
      pandaapp/src/stitchbase/stitchPerspectiveLens.cxx
  71. 16 3
      pandaapp/src/stitchbase/stitchPerspectiveLens.h
  72. 14 1
      pandaapp/src/stitchbase/stitchPoint.cxx
  73. 14 1
      pandaapp/src/stitchbase/stitchPoint.h
  74. 42 29
      pandaapp/src/stitchbase/stitcher.cxx
  75. 16 3
      pandaapp/src/stitchbase/stitcher.h
  76. 14 1
      pandaapp/src/stitchbase/triangle.cxx
  77. 14 1
      pandaapp/src/stitchbase/triangle.h
  78. 28 15
      pandaapp/src/stitchbase/triangleRasterizer.cxx
  79. 16 3
      pandaapp/src/stitchbase/triangleRasterizer.h
  80. 16 3
      pandaapp/src/stitchviewer/stitchImageConverter.cxx
  81. 14 1
      pandaapp/src/stitchviewer/stitchImageConverter.h
  82. 23 10
      pandaapp/src/stitchviewer/stitchImageVisualizer.cxx
  83. 15 2
      pandaapp/src/stitchviewer/stitchImageVisualizer.h
  84. 17 4
      pandaapp/src/stitchviewer/triangleMesh.cxx
  85. 15 2
      pandaapp/src/stitchviewer/triangleMesh.h
  86. 19 6
      pandatool/src/bam/bamInfo.cxx
  87. 15 2
      pandatool/src/bam/bamInfo.h
  88. 19 6
      pandatool/src/bam/eggToBam.cxx
  89. 15 2
      pandatool/src/bam/eggToBam.h
  90. 23 10
      pandatool/src/converter/distanceUnit.cxx
  91. 14 1
      pandatool/src/converter/distanceUnit.h
  92. 14 1
      pandatool/src/converter/somethingToEggConverter.I
  93. 17 4
      pandatool/src/converter/somethingToEggConverter.cxx
  94. 14 1
      pandatool/src/converter/somethingToEggConverter.h
  95. 23 10
      pandatool/src/cvscopy/cvsCopy.cxx
  96. 17 4
      pandatool/src/cvscopy/cvsCopy.h
  97. 19 6
      pandatool/src/cvscopy/cvsSourceDirectory.cxx
  98. 14 1
      pandatool/src/cvscopy/cvsSourceDirectory.h
  99. 20 7
      pandatool/src/cvscopy/cvsSourceTree.cxx
  100. 15 2
      pandatool/src/cvscopy/cvsSourceTree.h

+ 14 - 1
direct/src/dcparse/dcparse.cxx

@@ -1,6 +1,19 @@
 // Filename: dcparse.cxx
 // Created by:  drose (05Oct00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include <dcbase.h>

+ 23 - 10
direct/src/dcparser/dcAtomicField.cxx

@@ -1,6 +1,19 @@
 // Filename: dcAtomicField.cxx
 // Created by:  drose (05Oct00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "dcAtomicField.h"
@@ -32,7 +45,7 @@ operator << (ostream &out, const DCAtomicField::ElementType &et) {
 ////////////////////////////////////////////////////////////////////
 //     Function: DCAtomicField::ElementType::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 DCAtomicField::ElementType::
 ElementType() {
@@ -157,13 +170,13 @@ end_array() {
       // We've accumulated all the elements of the array; now we must
       // prepend the array length.
       int length = _default_value.length();
-      _default_value = 
+      _default_value =
         string(1, (char)(length & 0xff)) +
         string(1, (char)((length >> 8) & 0xff)) +
         _default_value;
     }
     return true;
-    
+
   default:
     return false;
   }
@@ -193,7 +206,7 @@ format_default_value(double num, string &formatted) const {
   case ST_uint16:
   case ST_int16array:
   case ST_uint16array:
-    formatted = 
+    formatted =
       string(1, (char)(int_value & 0xff)) +
       string(1, (char)((int_value >> 8) & 0xff));
     break;
@@ -202,7 +215,7 @@ format_default_value(double num, string &formatted) const {
   case ST_uint32:
   case ST_int32array:
   case ST_uint32array:
-    formatted = 
+    formatted =
       string(1, (char)(int_value & 0xff)) +
       string(1, (char)((int_value >> 8) & 0xff)) +
       string(1, (char)((int_value >> 16) & 0xff)) +
@@ -212,7 +225,7 @@ format_default_value(double num, string &formatted) const {
   case ST_int64:
     // We don't fully support default values for int64.  The
     // high-order 32 bits cannot be specified.
-    formatted = 
+    formatted =
       string(1, (char)(int_value & 0xff)) +
       string(1, (char)((int_value >> 8) & 0xff)) +
       string(1, (char)((int_value >> 16) & 0xff)) +
@@ -223,7 +236,7 @@ format_default_value(double num, string &formatted) const {
   case ST_uint64:
     // We don't fully support default values for int64.  The
     // high-order 32 bits cannot be specified.
-    formatted = 
+    formatted =
       string(1, (char)(int_value & 0xff)) +
       string(1, (char)((int_value >> 8) & 0xff)) +
       string(1, (char)((int_value >> 16) & 0xff)) +
@@ -276,7 +289,7 @@ format_default_value(const string &str, string &formatted) const {
   case ST_blob:
     {
       int length = str.length();
-      formatted = 
+      formatted =
         string(1, (char)(length & 0xff)) +
         string(1, (char)((length >> 8) & 0xff)) +
         str;
@@ -473,7 +486,7 @@ is_ownsend() const {
 ////////////////////////////////////////////////////////////////////
 //     Function: DCAtomicField::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 DCAtomicField::
 DCAtomicField() {

+ 14 - 1
direct/src/dcparser/dcAtomicField.h

@@ -1,6 +1,19 @@
 // Filename: dcAtomicField.h
 // Created by:  drose (05Oct00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef DCATOMICFIELD_H

+ 16 - 3
direct/src/dcparser/dcClass.cxx

@@ -1,6 +1,19 @@
 // Filename: dcClass.cxx
 // Created by:  drose (05Oct00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "dcClass.h"
@@ -150,7 +163,7 @@ get_inherited_field(int n) {
 ////////////////////////////////////////////////////////////////////
 //     Function: DCClass::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 DCClass::
 DCClass() {
@@ -159,7 +172,7 @@ DCClass() {
 ////////////////////////////////////////////////////////////////////
 //     Function: DCClass::Destructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 DCClass::
 ~DCClass() {

+ 14 - 1
direct/src/dcparser/dcClass.h

@@ -1,6 +1,19 @@
 // Filename: dcClass.h
 // Created by:  drose (05Oct00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef DCCLASS_H

+ 15 - 2
direct/src/dcparser/dcField.cxx

@@ -1,6 +1,19 @@
 // Filename: dcField.cxx
 // Created by:  drose (11Oct00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "dcField.h"
@@ -55,7 +68,7 @@ as_molecular_field() {
 ////////////////////////////////////////////////////////////////////
 //     Function: DCField::Destructor
 //       Access: Public, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 DCField::
 ~DCField() {

+ 14 - 1
direct/src/dcparser/dcField.h

@@ -1,6 +1,19 @@
 // Filename: dcField.h
 // Created by:  drose (11Oct00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef DCFIELD_H

+ 16 - 3
direct/src/dcparser/dcFile.cxx

@@ -1,6 +1,19 @@
 // Filename: dcFile.cxx
 // Created by:  drose (05Oct00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "dcFile.h"
@@ -16,7 +29,7 @@
 ////////////////////////////////////////////////////////////////////
 //     Function: DCFile::Constructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 DCFile::
 DCFile() {
@@ -25,7 +38,7 @@ DCFile() {
 ////////////////////////////////////////////////////////////////////
 //     Function: DCFile::Destructor
 //       Access: Published
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 DCFile::
 ~DCFile() {

+ 14 - 1
direct/src/dcparser/dcFile.h

@@ -1,6 +1,19 @@
 // Filename: dcFile.h
 // Created by:  drose (05Oct00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef DCFILE_H

+ 14 - 1
direct/src/dcparser/dcLexerDefs.h

@@ -1,6 +1,19 @@
 // Filename: dcLexerDefs.h
 // Created by:  drose (05Oct00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef DCLEXERDEFS_H

+ 15 - 2
direct/src/dcparser/dcMolecularField.cxx

@@ -1,6 +1,19 @@
 // Filename: dcMolecularField.cxx
 // Created by:  drose (05Oct00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "dcMolecularField.h"
@@ -50,7 +63,7 @@ get_atomic(int n) const {
 ////////////////////////////////////////////////////////////////////
 //     Function: DCMolecularField::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 DCMolecularField::
 DCMolecularField() {

+ 15 - 2
direct/src/dcparser/dcMolecularField.h

@@ -1,6 +1,19 @@
 // Filename: dcMolecularField.h
 // Created by:  drose (05Oct00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef DCMOLECULARFIELD_H
@@ -41,4 +54,4 @@ public:
 
 #endif
 
-  
+

+ 14 - 1
direct/src/dcparser/dcParserDefs.h

@@ -1,6 +1,19 @@
 // Filename: dcParserDefs.h
 // Created by:  drose (05Oct00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef DCPARSERDEFS_H

+ 14 - 1
direct/src/dcparser/dcSubatomicType.cxx

@@ -1,6 +1,19 @@
 // Filename: dcSubatomicType.cxx
 // Created by:  drose (05Oct00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "dcSubatomicType.h"

+ 15 - 2
direct/src/dcparser/dcSubatomicType.h

@@ -1,6 +1,19 @@
 // Filename: dcSubatomicType.h
 // Created by:  drose (05Oct00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef DCSUBATOMICTYPE_H
@@ -44,4 +57,4 @@ ostream &operator << (ostream &out, DCSubatomicType type);
 
 #endif
 
-  
+

+ 14 - 1
direct/src/dcparser/dcbase.h

@@ -1,6 +1,19 @@
 // Filename: dcbase.h
 // Created by:  drose (05Oct00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef DCBASE_H

+ 15 - 2
direct/src/dcparser/dcindent.cxx

@@ -1,6 +1,19 @@
 // Filename: dcindent.cxx
 // Created by:  drose (05May00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "dcindent.h"
@@ -8,7 +21,7 @@
 #ifndef WITHIN_PANDA
 
 ////////////////////////////////////////////////////////////////////
-//     Function: indent 
+//     Function: indent
 //  Description:
 ////////////////////////////////////////////////////////////////////
 ostream &

+ 13 - 0
direct/src/dcparser/dcindent.h

@@ -2,6 +2,19 @@
 // Created by:  drose (16Jan99)
 //
 ////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
+////////////////////////////////////////////////////////////////////
 
 #ifndef DCINDENT_H
 #define DCINDENT_H

+ 15 - 2
direct/src/dcparser/hashGenerator.cxx

@@ -1,6 +1,19 @@
 // Filename: hashGenerator.cxx
 // Created by:  drose (22Mar01)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "hashGenerator.h"
@@ -20,7 +33,7 @@ static const int max_prime_numbers = 10000;
 ////////////////////////////////////////////////////////////////////
 //     Function: HashGenerator::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 HashGenerator::
 HashGenerator() {

+ 14 - 1
direct/src/dcparser/hashGenerator.h

@@ -1,6 +1,19 @@
 // Filename: hashGenerator.h
 // Created by:  drose (22Mar01)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef DCHASHGENERATOR_H

+ 15 - 2
direct/src/dcparser/primeNumberGenerator.cxx

@@ -1,6 +1,19 @@
 // Filename: primeNumberGenerator.cxx
 // Created by:  drose (22Mar01)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "primeNumberGenerator.h"
@@ -9,7 +22,7 @@
 ////////////////////////////////////////////////////////////////////
 //     Function: PrimeNumberGenerator::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 PrimeNumberGenerator::
 PrimeNumberGenerator() {

+ 15 - 2
direct/src/dcparser/primeNumberGenerator.h

@@ -1,6 +1,19 @@
 // Filename: primeNumberGenerator.h
 // Created by:  drose (22Mar01)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef PRIMENUMBERGENERATOR_H
@@ -19,7 +32,7 @@
 class PrimeNumberGenerator {
 public:
   PrimeNumberGenerator();
-  
+
   int operator [] (int n);
 
 private:

+ 14 - 1
direct/src/deadrec/correction.cxx

@@ -1,6 +1,19 @@
 // Filename: correction.cxx
 // Created by:  cary (20Dec00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "correction.h"

+ 14 - 1
direct/src/deadrec/correction.h

@@ -1,6 +1,19 @@
 // Filename: correction.h
 // Created by:  cary (20Dec00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef __CORRECTION_H__

+ 14 - 1
direct/src/deadrec/prediction.cxx

@@ -1,6 +1,19 @@
 // Filename: prediction.cxx
 // Created by:  cary (20Dec00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "prediction.h"

+ 14 - 1
direct/src/deadrec/prediction.h

@@ -1,6 +1,19 @@
 // Filename: prediction.h
 // Created by:  cary (20Dec00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef __PREDICTION_H__

+ 15 - 2
direct/src/directbase/directbase.cxx

@@ -1,6 +1,19 @@
-// Filename: directbase.cc
+// Filename: directbase.cxx
 // Created by:  drose (15Sep00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "directbase.h"

+ 15 - 3
direct/src/directbase/directbase.h

@@ -1,8 +1,20 @@
-/*
- * Filename: directbase.h
+/* Filename: directbase.h
  * Created by:  drose (12Sep00)
  *
- */
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * PANDA 3D SOFTWARE
+ * Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+ *
+ * All use of this software is subject to the terms of the Panda 3d
+ * Software license.  You should have received a copy of this license
+ * along with this source code; you will also find a current copy of
+ * the license at http://www.panda3d.org/license.txt .
+ *
+ * To contact the maintainers of this program write to
+ * [email protected] .
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 /* This file is included at the beginning of every header file and/or
    C or C++ file.  It must be compilable for C as well as C++ files,

+ 17 - 6
direct/src/directbase/directsymbols.h

@@ -1,9 +1,20 @@
-/*
-// Filename: directsymbols.h
-// Created by:  drose (18Feb00)
-// 
-////////////////////////////////////////////////////////////////////
-*/
+/* Filename: directsymbols.h
+ * Created by:  drose (18Feb00)
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * *
+ *
+ * PANDA 3D SOFTWARE
+ * Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+ *
+ * All use of this software is subject to the terms of the Panda 3d
+ * Software license.  You should have received a copy of this license
+ * along with this source code; you will also find a current copy of
+ * the license at http://www.panda3d.org/license.txt .
+ *
+ * To contact the maintainers of this program write to
+ * [email protected] .
+ *
+ * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * * */
 
 #ifndef DIRECTSYMBOLS_H
 #define DIRECTSYMBOLS_H

+ 24 - 11
direct/src/showbase/showBase.cxx

@@ -1,6 +1,19 @@
 // Filename: showBase.cxx
 // Created by:  shochet (02Feb00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "showBase.h"
@@ -72,15 +85,15 @@ public:
     _initial_state(initial_state),
     _app_traverser(RenderRelation::get_class_type()) { }
   virtual ~WindowCallback() { }
-  
+
   virtual void draw(bool) {
     _app_traverser.traverse(_render);
     render_frame(_pipe, *_initial_state);
   }
-  
+
   virtual void idle(void) {
   }
-  
+
   PT(GraphicsPipe) _pipe;
   PT(Node) _render;
   NodeAttributes *_initial_state;
@@ -90,7 +103,7 @@ public:
 
 PT(GraphicsPipe) make_graphics_pipe() {
   PT(GraphicsPipe) main_pipe;
-  
+
   // load display modules
   GraphicsPipe::resolve_modules();
 
@@ -111,7 +124,7 @@ PT(GraphicsPipe) make_graphics_pipe() {
   return main_pipe;
 }
 
-PT(GraphicsWindow) make_graphics_window(GraphicsPipe *pipe, 
+PT(GraphicsWindow) make_graphics_window(GraphicsPipe *pipe,
                                         NamedNode *render,
                                         NamedNode *camera,
                                         NodeAttributes &initial_state) {
@@ -137,7 +150,7 @@ PT(GraphicsWindow) make_graphics_window(GraphicsPipe *pipe,
   main_win = ChanConfig(pipe, conf, camera, render, override);
   assert(main_win != (GraphicsWindow*)0L);
 
-  WindowCallback *wcb = 
+  WindowCallback *wcb =
     new WindowCallback(pipe, render, &initial_state);
 
   // Set draw and idle callbacks
@@ -153,7 +166,7 @@ PT(GraphicsWindow) make_graphics_window(GraphicsPipe *pipe,
 NodePath
 setup_panda_2d(GraphicsWindow *win, const string &graph_name) {
   PT(Node) render2d_top;
-  
+
   render2d_top = new NamedNode(graph_name + "_top");
   Node *render2d = new NamedNode(graph_name);
   RenderRelation *render2d_arc = new RenderRelation(render2d_top, render2d);
@@ -219,7 +232,7 @@ toggle_wireframe(NodeAttributes &initial_state) {
     initial_state.set_attribute(CullFaceTransition::get_class_type(), cfa);
 
   } else {
-    // Set the initial state up for wireframe mode. 
+    // Set the initial state up for wireframe mode.
     RenderModeAttribute *rma = new RenderModeAttribute;
     rma->set_mode(RenderModeProperty::M_wireframe);
     CullFaceAttribute *cfa = new CullFaceAttribute;
@@ -276,8 +289,8 @@ void take_snapshot(GraphicsWindow *win, const string &name) {
 
   int width = dr->get_pixel_width();
   int height = dr->get_pixel_height();
-  
-  PixelBuffer p(width, height, 3, 1, PixelBuffer::T_unsigned_byte, 
+
+  PixelBuffer p(width, height, 3, 1, PixelBuffer::T_unsigned_byte,
                 PixelBuffer::F_rgb);
 
   p.copy(gsg, dr, rb);

+ 16 - 3
direct/src/showbase/showBase.h

@@ -1,6 +1,19 @@
 // Filename: showBase.h
 // Created by:  shochet (02Feb00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef SHOWBASE_H
@@ -29,8 +42,8 @@ BEGIN_PUBLISH
 EXPCL_DIRECT DSearchPath &get_particle_path();
 
 EXPCL_DIRECT PT(GraphicsPipe) make_graphics_pipe();
-EXPCL_DIRECT PT(GraphicsWindow) 
-  make_graphics_window(GraphicsPipe *pipe, 
+EXPCL_DIRECT PT(GraphicsWindow)
+  make_graphics_window(GraphicsPipe *pipe,
                        NamedNode *render,
                        NamedNode *camera,
                        NodeAttributes &initial_state);

+ 16 - 3
pandaapp/src/stitch/stitchCommandProgram.cxx

@@ -1,6 +1,19 @@
 // Filename: stitchCommandProgram.cxx
 // Created by:  drose (16Mar00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "stitchCommandProgram.h"
@@ -9,7 +22,7 @@
 ////////////////////////////////////////////////////////////////////
 //     Function: StitchCommandProgram::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 StitchCommandProgram::
 StitchCommandProgram() {
@@ -28,7 +41,7 @@ StitchCommandProgram() {
 ////////////////////////////////////////////////////////////////////
 //     Function: StitchCommandProgram::run
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void StitchCommandProgram::
 run() {

+ 14 - 1
pandaapp/src/stitch/stitchCommandProgram.h

@@ -1,6 +1,19 @@
 // Filename: stitchCommandProgram.h
 // Created by:  drose (16Mar00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef STITCHCOMMANDPROGRAM_H

+ 17 - 4
pandaapp/src/stitch/stitchImageProgram.cxx

@@ -1,6 +1,19 @@
 // Filename: stitchImageProgram.cxx
 // Created by:  drose (16Mar00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "stitchImageProgram.h"
@@ -9,7 +22,7 @@
 ////////////////////////////////////////////////////////////////////
 //     Function: StitchImageProgram::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 StitchImageProgram::
 StitchImageProgram() {
@@ -22,7 +35,7 @@ StitchImageProgram() {
      "algorithm (no graphics hardware is used).");
 
   add_option
-    ("f", "", 0, 
+    ("f", "", 0,
      "Apply a very simple filter in an attempt to smooth the results.",
      &StitchImageProgram::dispatch_none, &_filter_output);
 }
@@ -30,7 +43,7 @@ StitchImageProgram() {
 ////////////////////////////////////////////////////////////////////
 //     Function: StitchImageProgram::run
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void StitchImageProgram::
 run() {

+ 14 - 1
pandaapp/src/stitch/stitchImageProgram.h

@@ -1,6 +1,19 @@
 // Filename: stitchImageProgram.h
 // Created by:  drose (16Mar00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef STITCHIMAGEPROGRAM_H

+ 17 - 4
pandaapp/src/stitch/stitchViewerProgram.cxx

@@ -1,6 +1,19 @@
 // Filename: stitchViewerProgram.cxx
 // Created by:  drose (16Mar00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "stitchViewerProgram.h"
@@ -9,7 +22,7 @@
 ////////////////////////////////////////////////////////////////////
 //     Function: StitchViewerProgram::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 StitchViewerProgram::
 StitchViewerProgram() {
@@ -18,7 +31,7 @@ StitchViewerProgram() {
      "is indicated by the command file, and draws a 3-d representation of "
      "all of the input images described in the command file.  The output "
      "images are ignored.\n"
-     
+
      "This program is primarily useful for showing the 3-d relationship "
      "between images that has been inferred from the stitch command file.");
 }
@@ -26,7 +39,7 @@ StitchViewerProgram() {
 ////////////////////////////////////////////////////////////////////
 //     Function: StitchViewerProgram::run
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void StitchViewerProgram::
 run() {

+ 14 - 1
pandaapp/src/stitch/stitchViewerProgram.h

@@ -1,6 +1,19 @@
 // Filename: stitchViewerProgram.h
 // Created by:  drose (16Mar00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef STITCHVIEWERPROGRAM_H

+ 14 - 1
pandaapp/src/stitchbase/config_stitch.cxx

@@ -1,6 +1,19 @@
 // Filename: config_stitch.cxx
 // Created by:  drose (05Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "config_stitch.h"

+ 14 - 1
pandaapp/src/stitchbase/config_stitch.h

@@ -1,6 +1,19 @@
 // Filename: config_stitch.h
 // Created by:  drose (05Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef CONFIG_STITCH_H

+ 14 - 1
pandaapp/src/stitchbase/fixedPoint.h

@@ -1,6 +1,19 @@
 // Filename: fixedPoint.h
 // Created by:  drose (06Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef FIXEDPOINT_H

+ 25 - 12
pandaapp/src/stitchbase/layeredImage.cxx

@@ -1,6 +1,19 @@
 // Filename: layeredImage.cxx
 // Created by:  drose (29Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "layeredImage.h"
@@ -19,7 +32,7 @@
 
 LayeredImage::TileManager::
 TileManager(const PNMImage *image, int channel) :
-  _data(image), _channel(channel) 
+  _data(image), _channel(channel)
 {
   int width = image->get_x_size();
   int height = image->get_y_size();
@@ -39,7 +52,7 @@ TileManager(const PNMImage *image, int channel) :
 
   _levels.push_back(Level());
   Level &l = _levels.back();
-  
+
   l._width = width;
   l._height = height;
   l._ntile_rows = (height + TILE_HEIGHT - 1) / TILE_HEIGHT;
@@ -107,12 +120,12 @@ trim() {
   if (_data->has_alpha()) {
     int xsize = _data->get_x_size();
     int ysize = _data->get_y_size();
-    
+
     int top = xsize - 1;
     int left = ysize - 1;
     int bottom = 0;
     int right = 0;
-    
+
     for (int y = 0; y < ysize; y++) {
       for (int x = 0; x < xsize; x++) {
         if (_data->get_alpha_val(x, y) != 0) {
@@ -325,8 +338,8 @@ xcf_save_layer_props(const LayeredImage::Layer &layer) {
   xcf_save_prop(PROP_SHOW_MASK, 0);
   xcf_save_prop(PROP_MODE, 0);
 
-  xcf_save_prop(PROP_OFFSETS, 
-                (int32_t)layer._offset[0], 
+  xcf_save_prop(PROP_OFFSETS,
+                (int32_t)layer._offset[0],
                 (int32_t)layer._offset[1]);
   xcf_save_prop(PROP_END);
 }
@@ -352,7 +365,7 @@ xcf_save_prop(LayeredImage::PropType prop_type, ...) {
   switch (prop_type) {
   case PROP_END:
     size = 0;
-    
+
     xcf_write_int32((int32_t*)&prop_type, 1);
     xcf_write_int32(&size, 1);
     break;
@@ -634,7 +647,7 @@ xcf_save_hierarchy(const PNMImage *image, int channel) {
     // save the start offset of where we are writing
     // out the next level.
     int32_t offset = _pos;
-    
+
     // write out the level.
     xcf_save_level(tm, i);
 
@@ -649,7 +662,7 @@ xcf_save_hierarchy(const PNMImage *image, int channel) {
 
     // seek to the end of the file which is where
     // we will write out the next level.
-    xcf_seek_end();  
+    xcf_seek_end();
   }
 
   // write out a '0' offset position to indicate the end
@@ -676,7 +689,7 @@ xcf_save_level(const LayeredImage::TileManager &tm, int level) {
     // save the start offset of where we are writing
     // out the next tile.
     int32_t offset = _pos;
-    
+
     // write out the tile.
     xcf_save_tile(tm, level, i);
 
@@ -688,7 +701,7 @@ xcf_save_level(const LayeredImage::TileManager &tm, int level) {
     // increment the location we are to write out the
     // next offset.
     saved_pos = _pos;
-    
+
     xcf_seek_end();
   }
 

+ 15 - 2
pandaapp/src/stitchbase/layeredImage.h

@@ -1,6 +1,19 @@
 // Filename: layeredImage.h
 // Created by:  drose (29Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef LAYEREDIMAGE_H
@@ -100,7 +113,7 @@ private:
   void xcf_save_channel_props();
   void xcf_save_prop(PropType prop_type, ...);
   void xcf_save_layer(const Layer &layer);
-  void xcf_save_channel(const string &name, const PNMImage *image, 
+  void xcf_save_channel(const string &name, const PNMImage *image,
                         int channel);
   void xcf_save_hierarchy(const PNMImage *image, int channel);
   void xcf_save_level(const TileManager &tm, int level);

+ 26 - 13
pandaapp/src/stitchbase/morphGrid.cxx

@@ -1,6 +1,19 @@
 // Filename: morphGrid.cxx
 // Created by:  drose (08Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "morphGrid.h"
@@ -64,20 +77,20 @@ void MorphGrid::Triangle::
 recompute() {
   for (int i = 0; i < (int)TT_num; i++) {
     for (int a = 0; a < 2; a++) {
-      _min_p[i][a] = min(min(_v[0]->_p[i][a], _v[1]->_p[i][a]), 
+      _min_p[i][a] = min(min(_v[0]->_p[i][a], _v[1]->_p[i][a]),
                          _v[2]->_p[i][a]);
-      _max_p[i][a] = max(max(_v[0]->_p[i][a], _v[1]->_p[i][a]), 
+      _max_p[i][a] = max(max(_v[0]->_p[i][a], _v[1]->_p[i][a]),
                          _v[2]->_p[i][a]);
     }
-  
+
     LPoint2d origin = _v[1]->_p[i];
     LVector2d yaxis = _v[0]->_p[i] - origin;
     LVector2d xaxis = _v[2]->_p[i] - origin;
-    
+
     _mat[i] = LMatrix3d(xaxis[0], xaxis[1], 0.0,
                         yaxis[0], yaxis[1], 0.0,
                         origin[0], origin[1], 1.0);
-    
+
     _inv[i] = invert(_mat[i]);
   }
 }
@@ -124,14 +137,14 @@ recompute() {
 
     for (int i = 0; i < (int)TT_num; i++) {
       for (int a = 0; a < 2; a++) {
-        _min_p[i][a] = 
+        _min_p[i][a] =
           min(_u._tree[0]->_min_p[i][a], _u._tree[1]->_min_p[i][a]);
         _max_p[i][a] =
           max(_u._tree[0]->_max_p[i][a], _u._tree[1]->_max_p[i][a]);
       }
     }
   }
-}    
+}
 
 MorphGrid::Triangle *MorphGrid::TriangleTree::
 find_triangle(const LPoint2d &p, TableType from) const {
@@ -195,7 +208,7 @@ init(int x_verts, int y_verts) {
   _triangles.clear();
   _last_triangle = NULL;
   _table.clear();
-  
+
   if (is_empty()) {
     return;
   }
@@ -349,8 +362,8 @@ fill_alpha() {
         _table[y][x]._alpha = 1.0;
 
       } else {
-        int dist_from_edge = 
-          min(min(x, y), 
+        int dist_from_edge =
+          min(min(x, y),
               min(_x_verts - 1 - x, _y_verts - 1 - y));
 
         assert(_table[y][x]._dist_from_interior >= 0);
@@ -358,7 +371,7 @@ fill_alpha() {
         // We subtract one from dist_from_interior to give us a bit of
         // comfort zone around the interior edge--we're not precisely
         // sure where the actual edge is.
-        int dist_from_interior = 
+        int dist_from_interior =
           max(_table[y][x]._dist_from_interior - 1, 0);
 
         // Now if dist_from_edge is 0, it must be transparent; if
@@ -380,7 +393,7 @@ fill_alpha() {
     }
   }
 }
-  
+
 LPoint2d MorphGrid::
 morph_point(const LPoint2d &p, TableType from, TableType to) {
   if (is_empty()) {

+ 14 - 1
pandaapp/src/stitchbase/morphGrid.h

@@ -1,6 +1,19 @@
 // Filename: morphGrid.h
 // Created by:  drose (08Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef MORPHGRID_H

+ 19 - 6
pandaapp/src/stitchbase/stitchCommand.cxx

@@ -1,6 +1,19 @@
 // Filename: stitchCommand.cxx
 // Created by:  drose (08Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "stitchCommand.h"
@@ -123,7 +136,7 @@ operator << (ostream &out, StitchCommand::Command c) {
   case StitchCommand::C_user_command:
     return out << "user_command";
     break;
-   
+
   default:
     return out << "(**unknown command**)";
   }
@@ -399,7 +412,7 @@ StitchCommand *StitchCommand::
 find_definition(const string &name) {
   Commands::const_iterator ci;
   for (ci = _nested.begin(); ci != _nested.end(); ++ci) {
-    if (((*ci)->_command == C_define || (*ci)->_command == C_lens) && 
+    if (((*ci)->_command == C_define || (*ci)->_command == C_lens) &&
         (*ci)->_name == name) {
       return (*ci);
     }
@@ -436,7 +449,7 @@ find_lens() {
   for (ci = _nested.begin(); ci != _nested.end(); ++ci) {
     if ((*ci)->_command == C_lens) {
       return (*ci)->make_lens();
-    }    
+    }
   }
   if (_parent != NULL) {
     return _parent->find_using_lens();
@@ -565,7 +578,7 @@ create_image() {
     nout << "Warning: No lens defined for " << filename << "\n";
     lens = make_lens();
   }
-  
+
   StitchCommand *cmd;
   cmd = find_command(C_image_size);
   if (cmd != NULL) {
@@ -598,7 +611,7 @@ create_image() {
     film_offset_mm = cmd->get_point2d();
   }
 
-  StitchImage *image = 
+  StitchImage *image =
     new StitchImage(get_name(), filename, lens, size_pixels, resolution,
                     film_offset_mm);
   image->setup_grid(50, 50);

+ 16 - 3
pandaapp/src/stitchbase/stitchCommand.h

@@ -1,6 +1,19 @@
 // Filename: stitchCommand.h
 // Created by:  drose (08Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef STITCHCOMMAND_H
@@ -51,7 +64,7 @@ public:
     C_user_command,
   };
 
-  StitchCommand(StitchCommand *parent = NULL, 
+  StitchCommand(StitchCommand *parent = NULL,
                 Command command = C_global);
   ~StitchCommand();
 
@@ -128,7 +141,7 @@ private:
 
   typedef vector<StitchCommand *> Commands;
   Commands _using;
-  Commands _nested;  
+  Commands _nested;
 };
 
 inline ostream &operator << (ostream &out, const StitchCommand &c) {

+ 16 - 3
pandaapp/src/stitchbase/stitchCommandReader.cxx

@@ -1,6 +1,19 @@
 // Filename: stitchCommandReader.cxx
 // Created by:  drose (16Mar00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "stitchCommandReader.h"
@@ -8,7 +21,7 @@
 ////////////////////////////////////////////////////////////////////
 //     Function: StitchCommandReader::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 StitchCommandReader::
 StitchCommandReader() {
@@ -20,7 +33,7 @@ StitchCommandReader() {
 ////////////////////////////////////////////////////////////////////
 //     Function: StitchCommandReader::handle_args
 //       Access: Protected, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 bool StitchCommandReader::
 handle_args(ProgramBase::Args &args) {

+ 14 - 1
pandaapp/src/stitchbase/stitchCommandReader.h

@@ -1,6 +1,19 @@
 // Filename: stitchCommandReader.h
 // Created by:  drose (16Mar00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef STITCHCOMMANDREADER_H

+ 19 - 6
pandaapp/src/stitchbase/stitchCylindricalLens.cxx

@@ -1,6 +1,19 @@
 // Filename: stitchCylindricalLens.cxx
 // Created by:  drose (09Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "stitchCylindricalLens.h"
@@ -44,7 +57,7 @@ get_hfov(double width_mm) const {
 
 double StitchCylindricalLens::
 get_vfov(double height_mm) const {
-  return 2.0 * rad_2_deg(atan(height_mm / 
+  return 2.0 * rad_2_deg(atan(height_mm /
                               (2.0 * get_focal_length(height_mm))));
 }
 
@@ -66,7 +79,7 @@ project(const LVector3d &vec, double width_mm) const {
   // the vertical direction.
 
   LVector3d v3 = vec * LMatrix4d::convert_mat(CS_default, CS_zup_right);
-  
+
   // To compute the x position on the frame, we only need to consider
   // the angle of the vector about the Z axis.  Project the vector
   // into the XY plane to do this.
@@ -76,7 +89,7 @@ project(const LVector3d &vec, double width_mm) const {
   // The x position is the angle about the Z axis.
   double x =
     rad_2_deg(atan2(xy[0], xy[1])) * get_focal_length(width_mm) / k;
-  
+
   // The y position is the Z height divided by the perspective
   // distance.
   double y = v3[2] / length(xy) * get_focal_length(width_mm);
@@ -95,7 +108,7 @@ project_left(const LVector3d &vec, double width_mm) const {
   double x =
     (rad_2_deg(atan2(-xy[0], -xy[1])) - 180.0) *
     get_focal_length(width_mm) / k;
-  
+
   double y = v3[2] / length(xy) * get_focal_length(width_mm);
   return LPoint2d(x, y);
 }
@@ -111,7 +124,7 @@ project_right(const LVector3d &vec, double width_mm) const {
   double x =
     (rad_2_deg(atan2(-xy[0], -xy[1])) + 180.0) *
     get_focal_length(width_mm) / k;
-  
+
   double y = v3[2] / length(xy) * get_focal_length(width_mm);
   return LPoint2d(x, y);
 }

+ 19 - 6
pandaapp/src/stitchbase/stitchCylindricalLens.h

@@ -1,6 +1,19 @@
 // Filename: stitchCylindricalLens.h
 // Created by:  drose (09Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef STITCHCYLINDRICALLENS_H
@@ -17,16 +30,16 @@ public:
   virtual double get_vfov(double height_mm) const;
 
   virtual LVector3d extrude(const LPoint2d &point_mm, double width_mm) const;
-  virtual LPoint2d project(const LVector3d &vec, double width_mm) const; 
+  virtual LPoint2d project(const LVector3d &vec, double width_mm) const;
 
-  LPoint2d project_left(const LVector3d &vec, double width_mm) const; 
-  LPoint2d project_right(const LVector3d &vec, double width_mm) const; 
+  LPoint2d project_left(const LVector3d &vec, double width_mm) const;
+  LPoint2d project_right(const LVector3d &vec, double width_mm) const;
 
   virtual void draw_triangle(TriangleRasterizer &rast,
                              const LMatrix3d &mm_to_pixels,
                              double width_mm,
-                             const RasterizerVertex *v0, 
-                             const RasterizerVertex *v1, 
+                             const RasterizerVertex *v0,
+                             const RasterizerVertex *v1,
                              const RasterizerVertex *v2);
 
   virtual void make_lens_command(StitchCommand *parent);

+ 15 - 2
pandaapp/src/stitchbase/stitchFile.cxx

@@ -1,6 +1,19 @@
 // Filename: stitchFile.cxx
 // Created by:  drose (08Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "stitchFile.h"
@@ -44,4 +57,4 @@ void StitchFile::
 process(StitchImageOutputter &outputter) {
   _root.process(outputter, (Stitcher *)NULL, *this);
   outputter.execute();
-}  
+}

+ 15 - 2
pandaapp/src/stitchbase/stitchFile.h

@@ -1,6 +1,19 @@
 // Filename: stitchFile.h
 // Created by:  drose (08Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef STITCHFILE_H
@@ -31,4 +44,4 @@ inline ostream &operator << (ostream &out, const StitchFile &f) {
 
 #endif
 
-  
+

+ 30 - 17
pandaapp/src/stitchbase/stitchFisheyeLens.cxx

@@ -1,6 +1,19 @@
 // Filename: stitchFisheyeLens.cxx
 // Created by:  drose (09Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "stitchFisheyeLens.h"
@@ -70,11 +83,11 @@ extrude(const LPoint2d &point_mm, double width_mm) const {
   }
 
   v2 /= r;
-      
+
   // Now get the point r units around the circle in the YZ plane.
   double dist = r * k / get_focal_length(width_mm);
   LVector3d p(0.0, cos(deg_2_rad(dist)), sin(deg_2_rad(dist)));
-  
+
   // And rotate this point around the Y axis.
   LVector3d result = LVector3d::rfu(p[0]*v2[1] + p[2]*v2[0],
                                     p[1],
@@ -89,32 +102,32 @@ project(const LVector3d &vec, double width_mm) const {
   // proportional to the actual distance on the sphere along the great
   // circle.  Also, the angle to the point on the projection is equal
   // to the angle to the point on the sphere.
-    
+
   // First, discard the distance by normalizing the vector.
   LVector3d v2 = normalize(vec * LMatrix4d::convert_mat(CS_default,
                                                         CS_zup_right));
-    
+
   // Now, project the point into the XZ plane and measure its angle
   // to the Z axis.  This is the same angle it will have to the
   // vertical axis on the film.
   LVector2d y(v2[0], v2[2]);
   y = normalize(y);
-    
+
   if (y == LVector2d(0.0, 0.0)) {
     // Special case.  This point is either directly ahead or directly
     // behind.
     return LPoint2d(0.0, 0.0);
   }
-  
+
   // Now bring the vector into the YZ plane by rotating about the Y
   // axis.
   LVector2d x(v2[1], v2[0]*y[0]+v2[2]*y[1]);
   x = normalize(x);
-    
+
   // Now the angle of x to the forward vector represents the distance
   // along the great circle to the point.
   double r = 90.0 - rad_2_deg(atan2(x[0], x[1]));
-    
+
   return y * (r * get_focal_length(width_mm) / k);
 }
 
@@ -134,7 +147,7 @@ draw_triangle(TriangleRasterizer &rast, const LMatrix3d &,
   // with a user-specified angle (the _singularity_tolerance) from the
   // singularity point.
 
-  
+
   // Determine which quadrant each of the vertices is in.  The
   // triangle crosses the singularity if all vertices' y coordinate is
   // negative, and if the projection of the triangle into the x, z
@@ -154,7 +167,7 @@ draw_triangle(TriangleRasterizer &rast, const LMatrix3d &,
                  dot(v2->_space, LVector3d::up()));
 
     // This projection will reverse the vertex order.
-    if (triangle_contains_circle(LPoint2d(0.0, 0.0), 
+    if (triangle_contains_circle(LPoint2d(0.0, 0.0),
                                  _singularity_radius,
                                  xz0, xz2, xz1)) {
       // The triangle does cross the singularity!  Reject it.
@@ -173,7 +186,7 @@ draw_triangle(TriangleRasterizer &rast, const LMatrix3d &,
 }
 
 void StitchFisheyeLens::
-pick_up_singularity(TriangleRasterizer &rast, 
+pick_up_singularity(TriangleRasterizer &rast,
                     const LMatrix3d &mm_to_pixels,
                     const LMatrix3d &pixels_to_mm,
                     const LMatrix3d &rotate,
@@ -186,11 +199,11 @@ pick_up_singularity(TriangleRasterizer &rast,
     // represent points (180 - _singularity_tolerance * 2) degrees
     // from forward.
 
-    double outer_mm = 
+    double outer_mm =
       (180 * get_focal_length(width_mm) / k);
-    double inner_mm = 
+    double inner_mm =
       ((180 - _singularity_tolerance * 2) * get_focal_length(width_mm) / k);
-    
+
     int xsize = rast._output->get_x_size();
     int ysize = rast._output->get_y_size();
 
@@ -271,7 +284,7 @@ pick_up_singularity(TriangleRasterizer &rast,
       v0._p.set(left_x_1 + 1, yi);
       v0._space = extrude(v0._p * pixels_to_mm, width_mm) * rotate;
       v0._uv = input->project(v0._space);
-      
+
       for (xi = left_x_1; xi <= right_x_1; xi++) {
         double last_u = v0._uv[0];
 
@@ -285,7 +298,7 @@ pick_up_singularity(TriangleRasterizer &rast,
       v0._p.set(left_x_2 + 1, yi);
       v0._space = extrude(v0._p * pixels_to_mm, width_mm) * rotate;
       v0._uv = input->project(v0._space);
-      
+
       for (xi = left_x_2; xi <= right_x_2; xi++) {
         double last_u = v0._uv[0];
 

+ 18 - 5
pandaapp/src/stitchbase/stitchFisheyeLens.h

@@ -1,6 +1,19 @@
 // Filename: stitchFisheyeLens.h
 // Created by:  drose (09Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef STITCHFISHEYELENS_H
@@ -16,16 +29,16 @@ public:
   virtual double get_hfov(double width_mm) const;
 
   virtual LVector3d extrude(const LPoint2d &point_mm, double width_mm) const;
-  virtual LPoint2d project(const LVector3d &vec, double width_mm) const; 
+  virtual LPoint2d project(const LVector3d &vec, double width_mm) const;
 
   virtual void draw_triangle(TriangleRasterizer &rast,
                              const LMatrix3d &mm_to_pixels,
                              double width_mm,
-                             const RasterizerVertex *v0, 
-                             const RasterizerVertex *v1, 
+                             const RasterizerVertex *v0,
+                             const RasterizerVertex *v1,
                              const RasterizerVertex *v2);
 
-  virtual void pick_up_singularity(TriangleRasterizer &rast, 
+  virtual void pick_up_singularity(TriangleRasterizer &rast,
                                    const LMatrix3d &mm_to_pixels,
                                    const LMatrix3d &pixels_to_mm,
                                    const LMatrix3d &rotate,

+ 20 - 7
pandaapp/src/stitchbase/stitchImage.cxx

@@ -1,6 +1,19 @@
 // Filename: stitchImage.cxx
 // Created by:  drose (04Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "stitchImage.h"
@@ -32,7 +45,7 @@ StitchImage(const string &name, const string &filename,
 
   // UV's are used for doing most operations.  They range from (0, 0)
   // at the lower-left corner to (1, 1) at the upper-right.
-  
+
   // Pixels are used when interfacing with the user.  They range from
   // (0, 0) at the upper-left corner to (_size_pixels[0] - 1,
   // _size_pixels[1] - 1) at the lower-right.
@@ -44,7 +57,7 @@ StitchImage(const string &name, const string &filename,
 
   LVector2d pixels_per_uv(_size_pixels[0] - 1.0, _size_pixels[1] - 1.0);
 
-  _pixels_to_uv = 
+  _pixels_to_uv =
     LMatrix3d::translate_mat(LVector2d(0.0, -pixels_per_uv[1])) *
     LMatrix3d::scale_mat(1.0 / pixels_per_uv[0], -1.0 / pixels_per_uv[1]);
 
@@ -53,7 +66,7 @@ StitchImage(const string &name, const string &filename,
     LMatrix3d::translate_mat(LVector2d(0.0, pixels_per_uv[1]));
 
   /*
-  nout << "_pixels_to_uv * _uv_to_pixels is\n" 
+  nout << "_pixels_to_uv * _uv_to_pixels is\n"
        << _pixels_to_uv * _uv_to_pixels << "\n"
        << "Corners in pixels:\n"
        << "ll " << LPoint2d(0.0, 0.0) * _uv_to_pixels
@@ -65,7 +78,7 @@ StitchImage(const string &name, const string &filename,
 
   LVector2d mm_per_uv = get_size_mm();
 
-  _uv_to_mm = 
+  _uv_to_mm =
     LMatrix3d::translate_mat(LVector2d(-0.5, -0.5)) *
     LMatrix3d::scale_mat(mm_per_uv) *
     LMatrix3d::translate_mat(_film_offset_mm);
@@ -321,14 +334,14 @@ reset_singularity_detected() {
 }
 
 void StitchImage::
-draw_triangle(TriangleRasterizer &rast, const RasterizerVertex *v0, 
+draw_triangle(TriangleRasterizer &rast, const RasterizerVertex *v0,
               const RasterizerVertex *v1, const RasterizerVertex *v2) {
   _lens->draw_triangle(rast, _mm_to_pixels, _size_mm[0], v0, v1, v2);
 }
 
 void StitchImage::
 pick_up_singularity(TriangleRasterizer &rast, StitchImage *input) {
-  _lens->pick_up_singularity(rast, _mm_to_pixels, _pixels_to_mm, 
+  _lens->pick_up_singularity(rast, _mm_to_pixels, _pixels_to_mm,
                              _rotate, _size_mm[0], input);
 }
 

+ 19 - 6
pandaapp/src/stitchbase/stitchImage.h

@@ -1,6 +1,19 @@
 // Filename: stitchImage.h
 // Created by:  drose (04Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef STITCHIMAGE_H
@@ -26,7 +39,7 @@ class LayeredImage;
 class StitchImage {
 public:
   StitchImage(const string &name, const string &filename,
-              StitchLens *lens, 
+              StitchLens *lens,
               const LVecBase2d &size_pixels,
               const LVecBase2d &pixels_per_mm,
               const LVecBase2d &film_offset_mm);
@@ -71,7 +84,7 @@ public:
   LVecBase2d get_size_mm() const;
 
   LVector3d extrude(const LPoint2d &point_uv) const;
-  LPoint2d project(const LVector3d &vec) const; 
+  LPoint2d project(const LVector3d &vec) const;
   double get_alpha(const LPoint2d &point_uv) const;
 
   void reset_singularity_detected();
@@ -81,8 +94,8 @@ public:
   // something special if the triangle crosses a seam or singularity
   // in the lens' coordinate space.
   void draw_triangle(TriangleRasterizer &rast,
-                     const RasterizerVertex *v0, 
-                     const RasterizerVertex *v1, 
+                     const RasterizerVertex *v0,
+                     const RasterizerVertex *v1,
                      const RasterizerVertex *v2);
 
   // This function is to be called after all triangles have been
@@ -128,7 +141,7 @@ public:
   // sort the images in order as they are specified in the command
   // file.
   int _index;
-  
+
 private:
   Filename _filename;
   string _name;

+ 14 - 1
pandaapp/src/stitchbase/stitchImageCommandOutput.cxx

@@ -1,6 +1,19 @@
 // Filename: stitchImageCommandOutput.cxx
 // Created by:  drose (29Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "stitchImageCommandOutput.h"

+ 15 - 2
pandaapp/src/stitchbase/stitchImageCommandOutput.h

@@ -1,6 +1,19 @@
 // Filename: stitchImageCommandOutput.h
 // Created by:  drose (29Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef STITCHIMAGECOMMANDOUTPUT_H
@@ -23,7 +36,7 @@ public:
   virtual void add_stitcher(Stitcher *stitcher);
 
   virtual void execute();
-  
+
 protected:
   void fill_image_cmd(StitchCommand *image_cmd, StitchImage *image);
 

+ 14 - 1
pandaapp/src/stitchbase/stitchImageOutputter.cxx

@@ -1,6 +1,19 @@
 // Filename: stitchImageOutputter.cxx
 // Created by:  drose (09Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "stitchImageOutputter.h"

+ 14 - 1
pandaapp/src/stitchbase/stitchImageOutputter.h

@@ -1,6 +1,19 @@
 // Filename: stitchImageOutputter.h
 // Created by:  drose (09Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef STITCHIMAGEOUTPUTTER_H

+ 21 - 8
pandaapp/src/stitchbase/stitchImageRasterizer.cxx

@@ -1,6 +1,19 @@
 // Filename: stitchImageRasterizer.cxx
 // Created by:  drose (06Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "stitchImageRasterizer.h"
@@ -68,14 +81,14 @@ execute() {
         }
       }
       output->close_layer(shown_points);
-      
+
       if (!output->close_output_file()) {
         nout << "Error in writing.\n";
       }
     }
   }
 }
-  
+
 void StitchImageRasterizer::
 draw_points(StitchImage *output, StitchImage *input,
             const Colord &color, double radius) {
@@ -85,19 +98,19 @@ draw_points(StitchImage *output, StitchImage *input,
     draw_spot(output, to * output->_uv_to_pixels, color, radius);
   }
 }
-  
+
 void StitchImageRasterizer::
 draw_points(StitchImage *output, Stitcher *input,
             const Colord &color, double radius) {
   Stitcher::LoosePoints::const_iterator pi;
-  for (pi = input->_loose_points.begin(); 
+  for (pi = input->_loose_points.begin();
        pi != input->_loose_points.end(); ++pi) {
     LPoint2d to = output->project((*pi)->_space);
     draw_spot(output, to * output->_uv_to_pixels, color, radius);
   }
 }
 
-  
+
 void StitchImageRasterizer::
 draw_image(StitchImage *output, StitchImage *input) {
   nout << "Rasterizing " << input->get_name() << "\n";
@@ -176,10 +189,10 @@ draw_spot(StitchImage *output,
           const LPoint2d pixel_center, const Colord &color, double radius) {
   LPoint2d minp = pixel_center - LPoint2d(radius, radius);
   LPoint2d maxp = pixel_center + LPoint2d(radius, radius);
-  
+
   int min_x = (int)floor(minp[0]);
   int max_x = (int)ceil(maxp[0]);
-  
+
   int min_y = (int)floor(minp[1]);
   int max_y = (int)ceil(maxp[1]);
 

+ 15 - 2
pandaapp/src/stitchbase/stitchImageRasterizer.h

@@ -1,6 +1,19 @@
 // Filename: stitchImageRasterizer.h
 // Created by:  drose (06Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef STITCHIMAGERASTERIZER_H
@@ -24,7 +37,7 @@ public:
   virtual void execute();
 
   bool _filter_output;
-  
+
 protected:
   void draw_points(StitchImage *output, StitchImage *input,
                    const Colord &color, double radius);

+ 16 - 3
pandaapp/src/stitchbase/stitchLens.cxx

@@ -1,6 +1,19 @@
 // Filename: stitchLens.cxx
 // Created by:  drose (04Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "stitchLens.h"
@@ -63,7 +76,7 @@ draw_triangle(TriangleRasterizer &rast, const LMatrix3d &,
 }
 
 void StitchLens::
-pick_up_singularity(TriangleRasterizer &, const LMatrix3d &, 
-                    const LMatrix3d &, const LMatrix3d &, 
+pick_up_singularity(TriangleRasterizer &, const LMatrix3d &,
+                    const LMatrix3d &, const LMatrix3d &,
                     double, StitchImage *) {
 }

+ 19 - 6
pandaapp/src/stitchbase/stitchLens.h

@@ -1,6 +1,19 @@
 // Filename: stitchLens.h
 // Created by:  drose (04Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef STITCHLENS_H
@@ -30,7 +43,7 @@ public:
   virtual double get_vfov(double height_mm) const;
 
   virtual LVector3d extrude(const LPoint2d &point_mm, double width_mm) const=0;
-  virtual LPoint2d project(const LVector3d &vec, double width_mm) const=0; 
+  virtual LPoint2d project(const LVector3d &vec, double width_mm) const=0;
 
   // This function simply passes the indicated triangle on to the
   // rasterizer.  It exists here in the lens so that the lens may do
@@ -39,15 +52,15 @@ public:
   virtual void draw_triangle(TriangleRasterizer &rast,
                              const LMatrix3d &mm_to_pixels,
                              double width_mm,
-                             const RasterizerVertex *v0, 
-                             const RasterizerVertex *v1, 
+                             const RasterizerVertex *v0,
+                             const RasterizerVertex *v1,
                              const RasterizerVertex *v2);
 
   // This function is to be called after all triangles have been
   // drawn; it will draw pixel-by-pixel all the points within
   // _singularity_radius of any singularity points the lens may have
   // (these points were not draw by draw_triangle(), above).
-  virtual void pick_up_singularity(TriangleRasterizer &rast, 
+  virtual void pick_up_singularity(TriangleRasterizer &rast,
                                    const LMatrix3d &mm_to_pixels,
                                    const LMatrix3d &pixels_to_mm,
                                    const LMatrix3d &rotate,
@@ -56,7 +69,7 @@ public:
 
   // This generates a StitchCommand that represents the given lens.
   virtual void make_lens_command(StitchCommand *parent)=0;
-  
+
 protected:
   enum Flags {
     F_focal_length = 0x01,

+ 14 - 1
pandaapp/src/stitchbase/stitchLexerDefs.h

@@ -1,6 +1,19 @@
 // Filename: stitchLexerDefs.h
 // Created by:  drose (08Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef STITCHLEXERDEFS_H

+ 29 - 16
pandaapp/src/stitchbase/stitchPSphereLens.cxx

@@ -1,6 +1,19 @@
 // Filename: stitchPSphereLens.cxx
 // Created by:  drose (16Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "stitchPSphereLens.h"
@@ -61,7 +74,7 @@ project(const LVector3d &vec, double width_mm) const {
   // the horizontal and vertical directions.
 
   LVector3d v3 = vec * LMatrix4d::convert_mat(CS_default, CS_zup_right);
-  
+
   // To compute the x position on the frame, we only need to consider
   // the angle of the vector about the Z axis.  Project the vector
   // into the XY plane to do this.
@@ -71,7 +84,7 @@ project(const LVector3d &vec, double width_mm) const {
   // The x position is the angle about the Z axis.
   double x =
     rad_2_deg(atan2(xy[0], xy[1])) * get_focal_length(width_mm) / k;
-  
+
   // Unroll the Z angle, and the y position is the angle about the X
   // axis.
   xy = normalize(xy);
@@ -93,7 +106,7 @@ project_left(const LVector3d &vec, double width_mm) const {
   double x =
     (rad_2_deg(atan2(-xy[0], -xy[1])) - 180.0) *
     get_focal_length(width_mm) / k;
-  
+
   xy = normalize(xy);
   LVector2d yz(v3[0]*xy[0] + v3[1]*xy[1], v3[2]);
   double y =
@@ -113,7 +126,7 @@ project_right(const LVector3d &vec, double width_mm) const {
   double x =
     (rad_2_deg(atan2(-xy[0], -xy[1])) + 180.0) *
     get_focal_length(width_mm) / k;
-  
+
   xy = normalize(xy);
   LVector2d yz(v3[0]*xy[0] + v3[1]*xy[1], v3[2]);
   double y =
@@ -146,7 +159,7 @@ draw_triangle(TriangleRasterizer &rast, const LMatrix3d &mm_to_pixels,
   if (z0 < 0.0 && z1 < 0.0 && z2 < 0.0) {
     // A triangle on the southern hemisphere.  This projection will
     // reverse the vertex order.
-    if (triangle_contains_circle(LPoint2d(0.0, 0.0), 
+    if (triangle_contains_circle(LPoint2d(0.0, 0.0),
                                  _singularity_radius,
                                  xy0, xy2, xy1)) {
       // The triangle does cross the singularity!  Reject it.
@@ -156,7 +169,7 @@ draw_triangle(TriangleRasterizer &rast, const LMatrix3d &mm_to_pixels,
   } else if (z0 > 0.0 && z1 > 0.0 && z2 > 0.0) {
     // A triangle on the northern hemisphere.  This projection will
     // preserve the vertex order.
-    if (triangle_contains_circle(LPoint2d(0.0, 0.0), 
+    if (triangle_contains_circle(LPoint2d(0.0, 0.0),
                                  _singularity_radius,
                                  xy0, xy1, xy2)) {
       // The triangle does cross the singularity!  Reject it.
@@ -205,7 +218,7 @@ draw_triangle(TriangleRasterizer &rast, const LMatrix3d &mm_to_pixels,
 }
 
 void StitchPSphereLens::
-pick_up_singularity(TriangleRasterizer &rast, 
+pick_up_singularity(TriangleRasterizer &rast,
                     const LMatrix3d &mm_to_pixels,
                     const LMatrix3d &pixels_to_mm,
                     const LMatrix3d &rotate,
@@ -217,10 +230,10 @@ pick_up_singularity(TriangleRasterizer &rast,
     double d = deg_2_rad(_singularity_tolerance * 2.0);
     LPoint2d pmm = project(LVector3d(0.0, sin(d), cos(d)), width_mm);
     LPoint2d p = pmm * mm_to_pixels;
-    
+
     int xsize = rast._output->get_x_size();
     int ysize = rast._output->get_y_size();
-    
+
     int bot_y = min((int)ceil(p[1]), ysize - 1);
     RasterizerVertex v0;
     v0._p.set(0.0, 0.0);
@@ -228,14 +241,14 @@ pick_up_singularity(TriangleRasterizer &rast,
     v0._space.set(0.0, 0.0, 0.0);
     v0._alpha = 1.0;
     v0._visibility = 0;
-    
+
     int xi, yi;
     for (yi = 0; yi <= bot_y; yi++) {
       // Project xi point 1 to determine the radius.
       v0._p.set(xi, yi);
       v0._space = extrude(v0._p * pixels_to_mm, width_mm) * rotate;
       v0._uv = input->project(v0._space);
-      
+
       for (xi = 0; xi < xsize; xi++) {
         double last_u = v0._uv[0];
 
@@ -253,10 +266,10 @@ pick_up_singularity(TriangleRasterizer &rast,
     double d = deg_2_rad(_singularity_tolerance * 2.0);
     LPoint2d pmm = project(LVector3d(0.0, sin(d), -cos(d)), width_mm);
     LPoint2d p = pmm * mm_to_pixels;
-    
+
     int xsize = rast._output->get_x_size();
     int ysize = rast._output->get_y_size();
-    
+
     int top_y = max((int)floor(p[1]), 0);
     RasterizerVertex v0;
     v0._p.set(0.0, 0.0);
@@ -264,14 +277,14 @@ pick_up_singularity(TriangleRasterizer &rast,
     v0._space.set(0.0, 0.0, 0.0);
     v0._alpha = 1.0;
     v0._visibility = 0;
-    
+
     int xi, yi;
     for (yi = top_y; yi < ysize; yi++) {
       // Project xi point 1 to determine the radius.
       v0._p.set(xi, yi);
       v0._space = extrude(v0._p * pixels_to_mm, width_mm) * rotate;
       v0._uv = input->project(v0._space);
-      
+
       for (xi = 0; xi < xsize; xi++) {
         double last_u = v0._uv[0];
 

+ 20 - 7
pandaapp/src/stitchbase/stitchPSphereLens.h

@@ -1,6 +1,19 @@
 // Filename: stitchPSphereLens.h
 // Created by:  drose (16Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef STITCHPSPHERELENS_H
@@ -16,19 +29,19 @@ public:
   virtual double get_hfov(double width_mm) const;
 
   virtual LVector3d extrude(const LPoint2d &point_mm, double width_mm) const;
-  virtual LPoint2d project(const LVector3d &vec, double width_mm) const; 
+  virtual LPoint2d project(const LVector3d &vec, double width_mm) const;
 
-  LPoint2d project_left(const LVector3d &vec, double width_mm) const; 
-  LPoint2d project_right(const LVector3d &vec, double width_mm) const; 
+  LPoint2d project_left(const LVector3d &vec, double width_mm) const;
+  LPoint2d project_right(const LVector3d &vec, double width_mm) const;
 
   virtual void draw_triangle(TriangleRasterizer &rast,
                              const LMatrix3d &mm_to_pixels,
                              double width_mm,
-                             const RasterizerVertex *v0, 
-                             const RasterizerVertex *v1, 
+                             const RasterizerVertex *v0,
+                             const RasterizerVertex *v1,
                              const RasterizerVertex *v2);
 
-  virtual void pick_up_singularity(TriangleRasterizer &rast, 
+  virtual void pick_up_singularity(TriangleRasterizer &rast,
                                    const LMatrix3d &mm_to_pixels,
                                    const LMatrix3d &pixels_to_mm,
                                    const LMatrix3d &rotate,

+ 18 - 0
pandaapp/src/stitchbase/stitchParser.h

@@ -1,3 +1,21 @@
+// Filename: stitchParser.h
+// Created by:  
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
+////////////////////////////////////////////////////////////////////
+
 #define NUMBER  257
 #define IDENTIFIER      258
 #define STRING  259

+ 14 - 1
pandaapp/src/stitchbase/stitchParserDefs.h

@@ -1,6 +1,19 @@
 // Filename: stitchParserDefs.h
 // Created by:  drose (08Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef STITCHPARSERDEFS_H

+ 15 - 2
pandaapp/src/stitchbase/stitchPerspectiveLens.cxx

@@ -1,6 +1,19 @@
 // Filename: stitchPerspectiveLens.cxx
 // Created by:  drose (09Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "stitchPerspectiveLens.h"
@@ -58,7 +71,7 @@ project(const LVector3d &vec, double width_mm) const {
     // as near to infinity as we can comfortably manage.
     return LPoint2d(r / 0.000001, u / 0.000001);
   } else {
-    return LPoint2d(r / f * get_focal_length(width_mm), 
+    return LPoint2d(r / f * get_focal_length(width_mm),
                     u / f * get_focal_length(width_mm));
   }
 }

+ 16 - 3
pandaapp/src/stitchbase/stitchPerspectiveLens.h

@@ -1,6 +1,19 @@
 // Filename: stitchPerspectiveLens.h
 // Created by:  drose (09Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef STITCHPERSPECTIVELENS_H
@@ -18,10 +31,10 @@ public:
   virtual double get_hfov(double width_mm) const;
 
   virtual LVector3d extrude(const LPoint2d &point_mm, double width_mm) const;
-  virtual LPoint2d project(const LVector3d &vec, double width_mm) const; 
+  virtual LPoint2d project(const LVector3d &vec, double width_mm) const;
 
   virtual void make_lens_command(StitchCommand *parent);
-  
+
 private:
   double _tan_fov;
 };

+ 14 - 1
pandaapp/src/stitchbase/stitchPoint.cxx

@@ -1,6 +1,19 @@
 // Filename: stitchPoint.cxx
 // Created by:  drose (04Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "stitchPoint.h"

+ 14 - 1
pandaapp/src/stitchbase/stitchPoint.h

@@ -1,6 +1,19 @@
 // Filename: stitchPoint.h
 // Created by:  drose (04Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef STITCHPOINT_H

+ 42 - 29
pandaapp/src/stitchbase/stitcher.cxx

@@ -1,6 +1,19 @@
 // Filename: stitcher.cxx
 // Created by:  drose (09Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "stitcher.h"
@@ -92,17 +105,17 @@ stitch() {
   if (_loose_points.empty()) {
     StitchImage *image = _images.front();
     assert(image != NULL);
-    
+
     StitchImage::Points::const_iterator pi;
     for (pi = image->_points.begin(); pi != image->_points.end(); ++pi) {
       string name = (*pi).first;
       LPoint2d uv = (*pi).second;
-      
+
       Points::iterator ppi;
       ppi = _points.find(name);
       assert(ppi != _points.end());
       StitchPoint *sp = (*ppi).second;
-      
+
       LVector3d space = normalize(image->extrude(uv));
       sp->set_space(space);
     }
@@ -190,12 +203,12 @@ score_image(StitchImage *image) {
   StitchImage::Points::const_iterator pi;
   for (pi = image->_points.begin(); pi != image->_points.end(); ++pi) {
     string name = (*pi).first;
-    
+
     Points::iterator ppi;
     ppi = _points.find(name);
     assert(ppi != _points.end());
     StitchPoint *sp = (*ppi).second;
-    
+
     if (sp->_space_known) {
       score++;
     }
@@ -219,12 +232,12 @@ stitch_image(StitchImage *image) {
   for (pi = image->_points.begin(); pi != image->_points.end(); ++pi) {
     string name = (*pi).first;
     LPoint2d uv = (*pi).second;
-    
+
     Points::iterator ppi;
     ppi = _points.find(name);
     assert(ppi != _points.end());
     StitchPoint *sp = (*ppi).second;
-    
+
     if (sp->_space_known) {
       mp.push_back(MatchingPoint(sp, uv));
     }
@@ -238,7 +251,7 @@ stitch_image(StitchImage *image) {
   }
 
   double best_score = 0.0;
-  
+
   if (mp.empty()) {
     // If we have no points, we can at least place it where the hpr says to.
     nout << *image << "placed explicitly.\n\n";
@@ -248,11 +261,11 @@ stitch_image(StitchImage *image) {
 
     // Reset the image's total transform, since we'll be changing it.
     image->clear_transform();
-    
+
     // Find the best match.
     int best_i = -1;
     int best_j = -1;
-    
+
     if (mp.size() < 2) {
       // If we don't have two points, there's nothing to choose.
       best_i = 0;
@@ -295,8 +308,8 @@ stitch_image(StitchImage *image) {
     // Now morph the image out the last few pixels so that all the
     // points will match up exactly.
 
-    int x_verts = image->get_x_verts(); 
-    int y_verts = image->get_y_verts(); 
+    int x_verts = image->get_x_verts();
+    int y_verts = image->get_y_verts();
     image->_morph.init(x_verts, y_verts);
     int x, y;
     for (y = 0; y < y_verts; y++) {
@@ -327,14 +340,14 @@ stitch_image(StitchImage *image) {
       }
     }
     image->_morph.recompute();
-    
+
 
   /*
 
   for (mi = mp.begin(); mi != mp.end(); ++mi) {
     LVector3d va = normalize(LVector3d(image->extrude((*mi)._got_uv)));
     LVector3d vb = (*mi)._p->_space;
-    nout << 1000.0 * (1.0 - dot(va, vb)) << " for " << (*mi)._p->_name 
+    nout << 1000.0 * (1.0 - dot(va, vb)) << " for " << (*mi)._p->_name
          << "\n   at " << va << " vs. " << vb << "\n";
   }
   nout << "\n";
@@ -343,7 +356,7 @@ stitch_image(StitchImage *image) {
   for (mi = mp.begin(); mi != mp.end(); ++mi) {
     (*mi)._need_uv = image->project((*mi)._p->_space);
     (*mi)._diff = (*mi)._need_uv - (*mi)._got_uv;
-    
+
     nout << (*mi)._p->_name
          << " "<< (*mi)._need_uv << " vs. " << (*mi)._got_uv
          << " diff is " << length((*mi)._diff * image->_uv_to_pixels)
@@ -356,12 +369,12 @@ stitch_image(StitchImage *image) {
     for (pi = image->_points.begin(); pi != image->_points.end(); ++pi) {
       string name = (*pi).first;
       LPoint2d uv = (*pi).second;
-      
+
       Points::iterator ppi;
       ppi = _points.find(name);
       assert(ppi != _points.end());
       StitchPoint *sp = (*ppi).second;
-      
+
       if (!sp->_space_known) {
         LVector3d space = normalize(image->extrude(uv));
         sp->set_space(space);
@@ -377,9 +390,9 @@ feather_image(StitchImage *image) {
   // Feather the edges of the image wherever it overlaps with an image
   // we have laid down previously.  We do this by first determining
   // which morph points overlap with some other image.
-  int x_verts = image->get_x_verts(); 
-  int y_verts = image->get_y_verts(); 
-  
+  int x_verts = image->get_x_verts();
+  int y_verts = image->get_y_verts();
+
   if (image->_morph.is_empty()) {
     image->_morph.init(x_verts, y_verts);
     image->_morph.recompute();
@@ -390,9 +403,9 @@ feather_image(StitchImage *image) {
     for (x = 0; x < x_verts; x++) {
       LVector3d space = image->get_grid_vector(x, y);
       Images::const_iterator ii;
-      for (ii = _placed.begin(); 
-           ii != _placed.end() && 
-             !image->_morph._table[y][x]._over_another; 
+      for (ii = _placed.begin();
+           ii != _placed.end() &&
+             !image->_morph._table[y][x]._over_another;
            ++ii) {
         StitchImage *other = (*ii);
         if (other->_index < image->_index) {
@@ -434,19 +447,19 @@ try_match(StitchImage *image, LMatrix3d &rot,
     // second pair of points comes as close as possible to coinciding.
     LVector3d v1a = normalize(image->extrude(mp[one]._got_uv));
     LVector3d v1b = mp[one]._p->_space;
-    
+
     v1a = v1a * rot;
-    
+
     // We need to determine the appropriate angle to roll.  This is the
     // angle between the plane that contains v0 and v1a, and the plane
     // that contains v0 and v1b.
-    
+
     LVector3d normal_a = normalize(cross(v0b, v1a));
     LVector3d normal_b = normalize(cross(v0b, v1b));
-    
+
     double cos_theta = dot(normal_a, normal_b);
     double theta = rad_2_deg(acos(cos_theta));
-    
+
     rot = rot * LMatrix3d::rotate_mat(-theta, v0b);
   }
 

+ 16 - 3
pandaapp/src/stitchbase/stitcher.h

@@ -1,6 +1,19 @@
 // Filename: stitcher.h
 // Created by:  drose (09Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef STITCHER_H
@@ -39,8 +52,8 @@ private:
     MatchingPoint(StitchPoint *p, const LPoint2d &got_uv);
 
     StitchPoint *_p;
-    LPoint2d _need_uv; 
-    LPoint2d _got_uv; 
+    LPoint2d _need_uv;
+    LPoint2d _got_uv;
     LVector2d _diff;
   };
   typedef vector<MatchingPoint> MatchingPoints;

+ 14 - 1
pandaapp/src/stitchbase/triangle.cxx

@@ -1,6 +1,19 @@
 // Filename: triangle.cxx
 // Created by:  drose (16Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "triangle.h"

+ 14 - 1
pandaapp/src/stitchbase/triangle.h

@@ -1,6 +1,19 @@
 // Filename: triangle.h
 // Created by:  drose (16Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef TRIANGLE_H

+ 28 - 15
pandaapp/src/stitchbase/triangleRasterizer.cxx

@@ -1,6 +1,19 @@
 // Filename: triangleRasterizer.cxx
 // Created by:  drose (06Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "triangleRasterizer.h"
@@ -11,7 +24,7 @@ inline void TriangleRasterizer::
 filter_pixel(RGBColord &rgb, double &alpha,
              double s, double t,
              double dsdx, double dtdx, double dsdy, double dtdy) {
-  filter_pixel(rgb, alpha, s, t, 
+  filter_pixel(rgb, alpha, s, t,
                max(max(dsdx, dtdx), max(dsdy, dtdy)) / 2.0);
 }
 
@@ -35,8 +48,8 @@ TriangleRasterizer() {
 }
 
 void TriangleRasterizer::
-draw_triangle(const RasterizerVertex *v0, 
-              const RasterizerVertex *v1, 
+draw_triangle(const RasterizerVertex *v0,
+              const RasterizerVertex *v1,
               const RasterizerVertex *v2) {
   if ((v0->_visibility & v1->_visibility & v2->_visibility) != 0) {
     // All three vertices are out of bounds in the same direction, so
@@ -49,7 +62,7 @@ draw_triangle(const RasterizerVertex *v0,
   if (!_read_input) {
     read_input();
   }
-  
+
   double oneOverArea;
   const RasterizerVertex *vMin, *vMid, *vMax;
   /* Y(vMin)<=Y(vMid)<=Y(vMax) */
@@ -157,7 +170,7 @@ draw_triangle(const RasterizerVertex *v0,
     * By stepping rasterization parameters along the major edge,
     * we can avoid recomputing them at the discontinuity where
     * the top and bottom edges meet.  However, this forces us to
-    * be able to scan both left-to-right and right-to-left. 
+    * be able to scan both left-to-right and right-to-left.
     * Also, we must determine whether the major edge is at the
     * left or right side of the triangle.  We do this by
     * computing the magnitude of the cross-product of the major
@@ -190,7 +203,7 @@ draw_triangle(const RasterizerVertex *v0,
     FixedPoint fdtdx;
 
     // Set up values for texture coordinates.
-      
+
     double twidth, theight;
     if (_texture != NULL) {
       twidth = (double) _texture->get_x_size();
@@ -201,7 +214,7 @@ draw_triangle(const RasterizerVertex *v0,
     }
 
     ltor = (oneOverArea < 0.0);
-      
+
     // More alpha setup.
     {
       double eMaj_da, eBot_da;
@@ -255,7 +268,7 @@ draw_triangle(const RasterizerVertex *v0,
      * inside the triangle.
      *
      * Next we creep down the major edge until we reach that y,
-     * and compute the corresponding x coordinate on the edge. 
+     * and compute the corresponding x coordinate on the edge.
      * Then we find the half-integral x that lies on or just
      * inside the edge.  This is the first pixel that might lie in
      * the interior of the triangle.  (We won't know for sure
@@ -419,7 +432,7 @@ draw_triangle(const RasterizerVertex *v0,
 
             // Rasterize left to right at row iy.
             if (right > left) {
-              ffs -= FIXED_HALF; /* off-by-one error? */        
+              ffs -= FIXED_HALF; /* off-by-one error? */
               fft -= FIXED_HALF;
               ffa -= FIXED_HALF;
               for (int ix = left; ix < right; ix++) {
@@ -492,8 +505,8 @@ draw_pixel(const RasterizerVertex *v0, double radius) {
     if (_texture == NULL) {
       filter_pixel(rgb, alpha, v0->_uv[0], v0->_uv[1], radius);
     } else {
-      filter_pixel(rgb, alpha, 
-                   v0->_uv[0] * (_texture->get_x_size() - 1), 
+      filter_pixel(rgb, alpha,
+                   v0->_uv[0] * (_texture->get_x_size() - 1),
                    v0->_uv[1] * (_texture->get_y_size() - 1),
                    radius * (_texture->get_x_size() - 1));
     }
@@ -506,7 +519,7 @@ void TriangleRasterizer::
 filter_pixel(RGBColord &rgb, double &alpha,
              double s, double t, double radius) {
   if (_texture == NULL) {
-    rgb.set(_untextured_color[0], 
+    rgb.set(_untextured_color[0],
             _untextured_color[1],
             _untextured_color[2]);
     alpha = _untextured_color[3];
@@ -516,10 +529,10 @@ filter_pixel(RGBColord &rgb, double &alpha,
   int ri = (int)radius;
   int si = (int)(s + 0.5);
   int ti = _texture->get_y_size() - 1 - (int)(t + 0.5);
-  
+
   rgb.set(0.0, 0.0, 0.0);
   alpha = 0.0;
-  
+
   if (!_filter_output) {
     if (si >= 0 && si < _texture->get_x_size() &&
         ti >= 0 && ti < _texture->get_y_size()) {

+ 16 - 3
pandaapp/src/stitchbase/triangleRasterizer.h

@@ -1,6 +1,19 @@
 // Filename: triangleRasterizer.h
 // Created by:  drose (06Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef TRIANGLERASTERIZER_H
@@ -26,8 +39,8 @@ class TriangleRasterizer {
 public:
   TriangleRasterizer();
 
-  void draw_triangle(const RasterizerVertex *v0, 
-                     const RasterizerVertex *v1, 
+  void draw_triangle(const RasterizerVertex *v0,
+                     const RasterizerVertex *v1,
                      const RasterizerVertex *v2);
   void draw_pixel(const RasterizerVertex *v0, double radius);
 

+ 16 - 3
pandaapp/src/stitchviewer/stitchImageConverter.cxx

@@ -1,6 +1,19 @@
 // Filename: stitchImageConverter.cxx
 // Created by:  drose (06Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "stitchImageConverter.h"
@@ -33,7 +46,7 @@ override_chan_cfg(ChanCfgOverrides &override) {
   override.setField(ChanCfgOverrides::Title, "Stitch");
 
   LVecBase2d size = _output_image->get_size_pixels();
-  
+
   override.setField(ChanCfgOverrides::SizeX, (int)size[0]);
   override.setField(ChanCfgOverrides::SizeY, (int)size[1]);
 }
@@ -90,7 +103,7 @@ create_image_geometry(Image &im) {
 
   for (int xi = 0; xi < x_verts; xi++) {
     for (int yi = 0; yi < y_verts; yi++) {
-      LVector2d uvd = 
+      LVector2d uvd =
         _output_image->project(im._image->get_grid_vector(xi, yi));
 
       LVector3f p = LVector3f::rfu(2 * uvd[0] - 1,

+ 14 - 1
pandaapp/src/stitchviewer/stitchImageConverter.h

@@ -1,6 +1,19 @@
 // Filename: stitchImageConverter.h
 // Created by:  drose (06Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef STITCHIMAGECONVERTER_H

+ 23 - 10
pandaapp/src/stitchviewer/stitchImageVisualizer.cxx

@@ -1,6 +1,19 @@
 // Filename: stitchImageVisualizer.cxx
 // Created by:  drose (05Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "stitchImageVisualizer.h"
@@ -69,10 +82,10 @@ Image(StitchImage *image, int index, bool scale) :
     new_ysize = to_power_2(new_ysize);
 
     if (new_xsize != old_xsize || new_ysize != old_ysize) {
-      nout << "Scaling " << image->get_name() << " from " 
+      nout << "Scaling " << image->get_name() << " from "
            << old_xsize << " " << old_ysize << " to "
            << new_xsize << " " << new_ysize << "\n";
-      
+
       PNMImage *n = new PNMImage(new_xsize, new_ysize);
       n->quick_filter_from(*image->_data);
       delete image->_data;
@@ -90,7 +103,7 @@ Image(const Image &copy) :
   _index(copy._index)
 {
 }
- 
+
 void StitchImageVisualizer::Image::
 operator = (const Image &copy) {
   _image = copy._image;
@@ -114,7 +127,7 @@ add_input_image(StitchImage *image) {
   int index = _images.size();
   char letter = index + 'a';
   _images.push_back(Image(image, index, true));
-  
+
   string event_name(1, letter);
   _event_handler.add_hook(event_name, static_handle_event);
 }
@@ -144,7 +157,7 @@ execute() {
     nout << "Done drawing frame\n";
   }
 }
-  
+
 void StitchImageVisualizer::
 setup() {
   ChanCfgOverrides override;
@@ -153,7 +166,7 @@ setup() {
 
   // load display modules
   GraphicsPipe::resolve_modules();
-  
+
   // Create a window
   TypeHandle want_pipe_type = InteractiveGraphicsPipe::get_class_type();
   if (!is_interactive()) {
@@ -201,7 +214,7 @@ setup() {
   PT(Transform2SG) tball2cam = new Transform2SG("tball2cam");
   tball2cam->set_arc(cam_trans);
   new DataRelation(_trackball, tball2cam);
-  
+
   // Create an ButtonThrower to throw events from the keyboard.
   PT(ButtonThrower) et = new ButtonThrower("kb-events");
   new DataRelation(_mak, et);
@@ -257,7 +270,7 @@ create_image_geometry(StitchImageVisualizer::Image &im) {
   TriangleMesh mesh(x_verts, y_verts);
 
   StitchLens *lens = im._image->_lens;
-  LVector3d center = 
+  LVector3d center =
     lens->extrude(LPoint2d(0.0, 0.0), im._image->_size_mm[0]);
   double scale = 10.0 / length(center);
 
@@ -303,7 +316,7 @@ idle() {
   // Initiate the data traversal, to send device data down its
   // respective pipelines.
   traverse_data_graph(_data_root);
-  
+
   // Throw any events generated recently.
   _static_siv = this;
   _event_handler.process_events();

+ 15 - 2
pandaapp/src/stitchviewer/stitchImageVisualizer.h

@@ -1,6 +1,19 @@
 // Filename: stitchImageVisualizer.h
 // Created by:  drose (05Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef STITCHIMAGEVISUALIZER_H
@@ -32,7 +45,7 @@ public:
   virtual void add_stitcher(Stitcher *stitcher);
 
   virtual void execute();
-  
+
 protected:
   void setup();
 

+ 17 - 4
pandaapp/src/stitchviewer/triangleMesh.cxx

@@ -1,6 +1,19 @@
 // Filename: triangleMesh.cxx
 // Created by:  drose (06Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "triangleMesh.h"
@@ -66,15 +79,15 @@ build_mesh() const {
 
   assert(!_coords.empty());
   geom->set_coords(_coords, G_PER_VERTEX, vindex);
-  
+
   if (!_norms.empty()) {
     geom->set_normals(_norms, G_PER_VERTEX, vindex);
   }
-  
+
   if (!_colors.empty()) {
     geom->set_colors(_colors, G_PER_VERTEX, vindex);
   }
-  
+
   if (!_texcoords.empty()) {
     geom->set_texcoords(_texcoords, G_PER_VERTEX, vindex);
   }

+ 15 - 2
pandaapp/src/stitchviewer/triangleMesh.h

@@ -1,6 +1,19 @@
 // Filename: triangleMesh.h
 // Created by:  drose (06Nov99)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef TRIANGLEMESH_H
@@ -35,4 +48,4 @@ private:
 
 #endif
 
-  
+

+ 19 - 6
pandatool/src/bam/bamInfo.cxx

@@ -1,6 +1,19 @@
 // Filename: bamInfo.cxx
 // Created by:  drose (02Jul00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "bamInfo.h"
@@ -15,7 +28,7 @@
 ////////////////////////////////////////////////////////////////////
 //     Function: BamInfo::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 BamInfo::
 BamInfo() {
@@ -32,12 +45,12 @@ BamInfo() {
      &BamInfo::dispatch_none, &_ls);
 
   add_option
-    ("t", "", 0, 
+    ("t", "", 0,
      "List explicitly each transition in the hierarchy.",
      &BamInfo::dispatch_none, &_verbose_transitions);
 
   add_option
-    ("g", "", 0, 
+    ("g", "", 0,
      "Output verbose information about the each Geom in the Bam file.",
      &BamInfo::dispatch_none, &_verbose_geoms);
 
@@ -48,7 +61,7 @@ BamInfo() {
 ////////////////////////////////////////////////////////////////////
 //     Function: BamInfo::run
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void BamInfo::
 run() {
@@ -77,7 +90,7 @@ run() {
 ////////////////////////////////////////////////////////////////////
 //     Function: BamInfo::handle_args
 //       Access: Protected, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 bool BamInfo::
 handle_args(ProgramBase::Args &args) {

+ 15 - 2
pandatool/src/bam/bamInfo.h

@@ -1,6 +1,19 @@
 // Filename: bamInfo.h
 // Created by:  drose (02Jul00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef BAMINFO_H
@@ -19,7 +32,7 @@ class TypedWritable;
 
 ////////////////////////////////////////////////////////////////////
 //       Class : BamInfo
-// Description : 
+// Description :
 ////////////////////////////////////////////////////////////////////
 class BamInfo : public ProgramBase {
 public:

+ 19 - 6
pandatool/src/bam/eggToBam.cxx

@@ -1,6 +1,19 @@
 // Filename: eggToBam.cxx
 // Created by:  drose (28Jun00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "eggToBam.h"
@@ -16,7 +29,7 @@
 ////////////////////////////////////////////////////////////////////
 //     Function: EggToBam::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 EggToBam::
 EggToBam() :
@@ -31,20 +44,20 @@ EggToBam() :
   remove_option("f");
 
   add_option
-    ("tp", "path", 0, 
+    ("tp", "path", 0,
      "Add the indicated colon-delimited paths to the texture-path.  This "
      "option may also be repeated to add multiple paths.",
      &EggToBam::dispatch_search_path, NULL, &get_texture_path());
 
   add_option
-    ("kp", "", 0, 
+    ("kp", "", 0,
      "Keep the texture paths exactly as they are specified in the egg file, "
      "as relative paths, rather than storing them as full paths or as "
      "whatever is specified by the bam-texture-mode Configrc variable.",
      &EggToBam::dispatch_none, &_keep_paths);
 
   add_option
-    ("fl", "flag", 0, 
+    ("fl", "flag", 0,
      "Specifies whether to flatten the egg hierarchy after it is loaded.  "
      "If flag is zero, the egg hierarchy will not be flattened, but will "
      "instead be written to the bam file exactly as it is.  If flag is "
@@ -90,7 +103,7 @@ EggToBam() :
 ////////////////////////////////////////////////////////////////////
 //     Function: EggToBam::run
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 void EggToBam::
 run() {

+ 15 - 2
pandatool/src/bam/eggToBam.h

@@ -1,6 +1,19 @@
 // Filename: eggToBam.h
 // Created by:  drose (28Jun00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef EGGTOBAM_H
@@ -12,7 +25,7 @@
 
 ////////////////////////////////////////////////////////////////////
 //       Class : EggToBam
-// Description : 
+// Description :
 ////////////////////////////////////////////////////////////////////
 class EggToBam : public EggToSomething {
 public:

+ 23 - 10
pandatool/src/converter/distanceUnit.cxx

@@ -1,6 +1,19 @@
 // Filename: distanceUnit.cxx
 // Created by:  drose (17Apr01)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "distanceUnit.h"
@@ -94,7 +107,7 @@ format_long_unit(DistanceUnit unit) {
 
 ////////////////////////////////////////////////////////////////////
 //     Function: DistanceUnit output operator
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 ostream &
 operator << (ostream &out, DistanceUnit unit) {
@@ -120,22 +133,22 @@ string_distance_unit(const string &str) {
 
   } else if (cmp_nocase(str, "km") == 0 || cmp_nocase(str, "kilometers") == 0) {
     return DU_kilometers;
-  
+
   } else if (cmp_nocase(str, "yd") == 0 || cmp_nocase(str, "yards") == 0) {
     return DU_yards;
-  
+
   } else if (cmp_nocase(str, "ft") == 0 || cmp_nocase(str, "feet") == 0) {
     return DU_feet;
-  
+
   } else if (cmp_nocase(str, "in") == 0 || cmp_nocase(str, "inches") == 0) {
     return DU_inches;
-  
-  } else if (cmp_nocase(str, "nmi") == 0 || 
-             cmp_nocase(str, "nm") == 0 || 
+
+  } else if (cmp_nocase(str, "nmi") == 0 ||
+             cmp_nocase(str, "nm") == 0 ||
              cmp_nocase_uh(str, "nautical_miles") == 0) {
     return DU_nautical_miles;
-  
-  } else if (cmp_nocase(str, "mi") == 0 || 
+
+  } else if (cmp_nocase(str, "mi") == 0 ||
              cmp_nocase(str, "miles") == 0 ||
              cmp_nocase_uh(str, "statute_miles") == 0) {
     return DU_statute_miles;

+ 14 - 1
pandatool/src/converter/distanceUnit.h

@@ -1,6 +1,19 @@
 // Filename: distanceUnit.h
 // Created by:  drose (17Apr01)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef DISTANCEUNIT_H

+ 14 - 1
pandatool/src/converter/somethingToEggConverter.I

@@ -1,6 +1,19 @@
 // Filename: somethingToEggConverter.I
 // Created by:  drose (26Apr01)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 ////////////////////////////////////////////////////////////////////

+ 17 - 4
pandatool/src/converter/somethingToEggConverter.cxx

@@ -1,6 +1,19 @@
 // Filename: somethingToEggConverter.cxx
 // Created by:  drose (26Apr01)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "somethingToEggConverter.h"
@@ -11,7 +24,7 @@
 ////////////////////////////////////////////////////////////////////
 //     Function: SomethingToEggConverter::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 SomethingToEggConverter::
 SomethingToEggConverter() {
@@ -26,7 +39,7 @@ SomethingToEggConverter() {
 ////////////////////////////////////////////////////////////////////
 //     Function: SomethingToEggConverter::Copy Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 SomethingToEggConverter::
 SomethingToEggConverter(const SomethingToEggConverter &copy) :
@@ -44,7 +57,7 @@ SomethingToEggConverter(const SomethingToEggConverter &copy) :
 ////////////////////////////////////////////////////////////////////
 //     Function: SomethingToEggConverter::Destructor
 //       Access: Public, Virtual
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 SomethingToEggConverter::
 ~SomethingToEggConverter() {

+ 14 - 1
pandatool/src/converter/somethingToEggConverter.h

@@ -1,6 +1,19 @@
 // Filename: somethingToEggConverter.h
 // Created by:  drose (17Apr01)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef SOMETHINGTOEGGCONVERTER_H

+ 23 - 10
pandatool/src/cvscopy/cvsCopy.cxx

@@ -1,6 +1,19 @@
 // Filename: cvsCopy.cxx
 // Created by:  drose (31Oct00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "cvsCopy.h"
@@ -12,7 +25,7 @@
 ////////////////////////////////////////////////////////////////////
 //     Function: CVSCopy::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 CVSCopy::
 CVSCopy() {
@@ -41,26 +54,26 @@ CVSCopy() {
      &CVSCopy::dispatch_none, &_interactive);
 
   add_option
-    ("d", "dirname", 80, 
+    ("d", "dirname", 80,
      "Copy model files that are not already present somewhere in the tree "
      "to the indicated directory.  The default is the current directory.",
      &CVSCopy::dispatch_filename, &_got_model_dirname, &_model_dirname);
 
   add_option
-    ("m", "dirname", 80, 
+    ("m", "dirname", 80,
      "Copy texture map files to the indicated directory.  The default "
      "is src/maps from the root directory.",
      &CVSCopy::dispatch_filename, &_got_map_dirname, &_map_dirname);
 
   add_option
-    ("root", "dirname", 80, 
+    ("root", "dirname", 80,
      "Specify the root of the CVS source hierarchy.  The default is to "
      "use the ppremake convention of locating the directory above the -d "
      "directory that contains a file called Package.pp.",
      &CVSCopy::dispatch_filename, &_got_root_dirname, &_root_dirname);
 
   add_option
-    ("key", "filename", 80, 
+    ("key", "filename", 80,
      "Specify the name of the file that must exist in each directory for "
      "it to be considered part of the CVS source hierarchy.  The default "
      "is the ppremake convention, \"Sources.pp\".  Other likely candidates "
@@ -69,13 +82,13 @@ CVSCopy() {
      &CVSCopy::dispatch_filename, NULL, &_key_filename);
 
   add_option
-    ("nc", "", 80, 
+    ("nc", "", 80,
      "Do not attempt to add newly-created files to CVS.  The default "
      "is to add them.",
      &CVSCopy::dispatch_none, &_no_cvs);
 
   add_option
-    ("cvs", "cvs_binary", 80, 
+    ("cvs", "cvs_binary", 80,
      "Specify how to run the cvs program for adding newly-created files.  "
      "The default is simply \"cvs\".",
      &CVSCopy::dispatch_string, NULL, &_cvs_binary);
@@ -100,7 +113,7 @@ CVSCopy() {
 //               actually copied to.  On failure, returns NULL.
 ////////////////////////////////////////////////////////////////////
 CVSSourceDirectory *CVSCopy::
-import(const Filename &source, void *extra_data, 
+import(const Filename &source, void *extra_data,
        CVSSourceDirectory *suggested_dir) {
   CopiedFiles::const_iterator ci;
   ci = _copied_files.find(source);
@@ -116,7 +129,7 @@ import(const Filename &source, void *extra_data,
 
   string basename = source.get_basename();
 
-  CVSSourceDirectory *dir = 
+  CVSSourceDirectory *dir =
     _tree.choose_directory(basename, suggested_dir, _force, _interactive);
   nassertr(dir != (CVSSourceDirectory *)NULL, dir);
 

+ 17 - 4
pandatool/src/cvscopy/cvsCopy.h

@@ -1,6 +1,19 @@
 // Filename: cvsCopy.h
 // Created by:  drose (31Oct00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef CVSCOPY_H
@@ -25,7 +38,7 @@ public:
   CVSCopy();
 
   CVSSourceDirectory *
-  import(const Filename &source, void *extra_data, 
+  import(const Filename &source, void *extra_data,
          CVSSourceDirectory *suggested_dir);
 
 protected:
@@ -45,9 +58,9 @@ protected:
   bool cvs_add(const Filename &filename);
 
 private:
-  bool scan_hierarchy(); 
+  bool scan_hierarchy();
   bool scan_for_root(const string &dirname);
-  
+
 protected:
   bool _force;
   bool _interactive;

+ 19 - 6
pandatool/src/cvscopy/cvsSourceDirectory.cxx

@@ -1,6 +1,19 @@
 // Filename: cvsSourceDirectory.cxx
 // Created by:  drose (31Oct00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "cvsSourceDirectory.h"
@@ -11,7 +24,7 @@
 ////////////////////////////////////////////////////////////////////
 //     Function: CVSSourceDirectory::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 CVSSourceDirectory::
 CVSSourceDirectory(CVSSourceTree *tree, CVSSourceDirectory *parent,
@@ -30,7 +43,7 @@ CVSSourceDirectory(CVSSourceTree *tree, CVSSourceDirectory *parent,
 ////////////////////////////////////////////////////////////////////
 //     Function: CVSSourceDirectory::Destructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 CVSSourceDirectory::
 ~CVSSourceDirectory() {
@@ -235,14 +248,14 @@ scan(const Filename &directory, const string &key_filename) {
     Filename next_path(directory, filename);
     Filename key(next_path, key_filename);
     if (key.exists()) {
-      CVSSourceDirectory *subdir = 
+      CVSSourceDirectory *subdir =
         new CVSSourceDirectory(_tree, this, filename);
       _children.push_back(subdir);
-      
+
       if (!subdir->scan(next_path, key_filename)) {
         return false;
       }
-      
+
     } else {
       // It's not a subdirectory; call it a regular file.
       _tree->add_file(filename, this);

+ 14 - 1
pandatool/src/cvscopy/cvsSourceDirectory.h

@@ -1,6 +1,19 @@
 // Filename: cvsSourceDirectory.h
 // Created by:  drose (31Oct00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef CVSSOURCEDIRECTORY_H

+ 20 - 7
pandatool/src/cvscopy/cvsSourceTree.cxx

@@ -1,6 +1,19 @@
 // Filename: cvsSourceTree.cxx
 // Created by:  drose (31Oct00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #include "cvsSourceTree.h"
@@ -25,7 +38,7 @@ string CVSSourceTree::_start_fullpath;
 ////////////////////////////////////////////////////////////////////
 //     Function: CVSSourceTree::Constructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 CVSSourceTree::
 CVSSourceTree() {
@@ -36,7 +49,7 @@ CVSSourceTree() {
 ////////////////////////////////////////////////////////////////////
 //     Function: CVSSourceTree::Destructor
 //       Access: Public
-//  Description: 
+//  Description:
 ////////////////////////////////////////////////////////////////////
 CVSSourceTree::
 ~CVSSourceTree() {
@@ -319,7 +332,7 @@ prompt_user(const string &filename, CVSSourceDirectory *suggested_dir,
 CVSSourceDirectory *CVSSourceTree::
 ask_existing(const string &filename, CVSSourceDirectory *dir) {
   while (true) {
-    nout << filename << " found in tree at " 
+    nout << filename << " found in tree at "
          << dir->get_path() + "/" + filename << ".\n";
     string result = prompt("Overwrite this file (y/n)? ");
     nassertr(!result.empty(), (CVSSourceDirectory *)NULL);
@@ -349,7 +362,7 @@ ask_existing(const string &filename, const CVSSourceTree::Directories &dirs,
 
     bool any_suggested = false;
     for (int i = 0; i < (int)dirs.size(); i++) {
-      nout << "  " << (i + 1) << ". " 
+      nout << "  " << (i + 1) << ". "
            << dirs[i]->get_path() + "/" + filename << "\n";
       if (dirs[i] == suggested_dir) {
         any_suggested = true;
@@ -363,7 +376,7 @@ ask_existing(const string &filename, const CVSSourceTree::Directories &dirs,
       suggested_option = next_option;
       next_option++;
       nout << "\n" << suggested_option
-           << ". create " 
+           << ". create "
            << suggested_dir->get_path() + "/" + filename
            << "\n";
     }
@@ -469,7 +482,7 @@ prompt(const string &message) {
     while (p < response.length() && isspace(response[p])) {
       p++;
     }
-    
+
     size_t q = response.length();
     while (q > p && isspace(response[q - 1])) {
       q--;

+ 15 - 2
pandatool/src/cvscopy/cvsSourceTree.h

@@ -1,6 +1,19 @@
 // Filename: cvsSourceTree.h
 // Created by:  drose (31Oct00)
-// 
+//
+////////////////////////////////////////////////////////////////////
+//
+// PANDA 3D SOFTWARE
+// Copyright (c) 2001, Disney Enterprises, Inc.  All rights reserved
+//
+// All use of this software is subject to the terms of the Panda 3d
+// Software license.  You should have received a copy of this license
+// along with this source code; you will also find a current copy of
+// the license at http://www.panda3d.org/license.txt .
+//
+// To contact the maintainers of this program write to
+// [email protected] .
+//
 ////////////////////////////////////////////////////////////////////
 
 #ifndef CVSSOURCETREE_H
@@ -51,7 +64,7 @@ private:
   prompt_user(const string &filename, CVSSourceDirectory *suggested_dir,
               const Directories &dirs, bool force, bool interactive);
 
-  CVSSourceDirectory *ask_existing(const string &filename, 
+  CVSSourceDirectory *ask_existing(const string &filename,
                                    CVSSourceDirectory *dir);
   CVSSourceDirectory *ask_existing(const string &filename,
                                    const Directories &dirs,

Some files were not shown because too many files changed in this diff