-
Notifications
You must be signed in to change notification settings - Fork 0
/
osg.diff
executable file
·4457 lines (3933 loc) · 179 KB
/
osg.diff
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
222
223
224
225
226
227
228
229
230
231
232
233
234
235
236
237
238
239
240
241
242
243
244
245
246
247
248
249
250
251
252
253
254
255
256
257
258
259
260
261
262
263
264
265
266
267
268
269
270
271
272
273
274
275
276
277
278
279
280
281
282
283
284
285
286
287
288
289
290
291
292
293
294
295
296
297
298
299
300
301
302
303
304
305
306
307
308
309
310
311
312
313
314
315
316
317
318
319
320
321
322
323
324
325
326
327
328
329
330
331
332
333
334
335
336
337
338
339
340
341
342
343
344
345
346
347
348
349
350
351
352
353
354
355
356
357
358
359
360
361
362
363
364
365
366
367
368
369
370
371
372
373
374
375
376
377
378
379
380
381
382
383
384
385
386
387
388
389
390
391
392
393
394
395
396
397
398
399
400
401
402
403
404
405
406
407
408
409
410
411
412
413
414
415
416
417
418
419
420
421
422
423
424
425
426
427
428
429
430
431
432
433
434
435
436
437
438
439
440
441
442
443
444
445
446
447
448
449
450
451
452
453
454
455
456
457
458
459
460
461
462
463
464
465
466
467
468
469
470
471
472
473
474
475
476
477
478
479
480
481
482
483
484
485
486
487
488
489
490
491
492
493
494
495
496
497
498
499
500
501
502
503
504
505
506
507
508
509
510
511
512
513
514
515
516
517
518
519
520
521
522
523
524
525
526
527
528
529
530
531
532
533
534
535
536
537
538
539
540
541
542
543
544
545
546
547
548
549
550
551
552
553
554
555
556
557
558
559
560
561
562
563
564
565
566
567
568
569
570
571
572
573
574
575
576
577
578
579
580
581
582
583
584
585
586
587
588
589
590
591
592
593
594
595
596
597
598
599
600
601
602
603
604
605
606
607
608
609
610
611
612
613
614
615
616
617
618
619
620
621
622
623
624
625
626
627
628
629
630
631
632
633
634
635
636
637
638
639
640
641
642
643
644
645
646
647
648
649
650
651
652
653
654
655
656
657
658
659
660
661
662
663
664
665
666
667
668
669
670
671
672
673
674
675
676
677
678
679
680
681
682
683
684
685
686
687
688
689
690
691
692
693
694
695
696
697
698
699
700
701
702
703
704
705
706
707
708
709
710
711
712
713
714
715
716
717
718
719
720
721
722
723
724
725
726
727
728
729
730
731
732
733
734
735
736
737
738
739
740
741
742
743
744
745
746
747
748
749
750
751
752
753
754
755
756
757
758
759
760
761
762
763
764
765
766
767
768
769
770
771
772
773
774
775
776
777
778
779
780
781
782
783
784
785
786
787
788
789
790
791
792
793
794
795
796
797
798
799
800
801
802
803
804
805
806
807
808
809
810
811
812
813
814
815
816
817
818
819
820
821
822
823
824
825
826
827
828
829
830
831
832
833
834
835
836
837
838
839
840
841
842
843
844
845
846
847
848
849
850
851
852
853
854
855
856
857
858
859
860
861
862
863
864
865
866
867
868
869
870
871
872
873
874
875
876
877
878
879
880
881
882
883
884
885
886
887
888
889
890
891
892
893
894
895
896
897
898
899
900
901
902
903
904
905
906
907
908
909
910
911
912
913
914
915
916
917
918
919
920
921
922
923
924
925
926
927
928
929
930
931
932
933
934
935
936
937
938
939
940
941
942
943
944
945
946
947
948
949
950
951
952
953
954
955
956
957
958
959
960
961
962
963
964
965
966
967
968
969
970
971
972
973
974
975
976
977
978
979
980
981
982
983
984
985
986
987
988
989
990
991
992
993
994
995
996
997
998
999
1000
diff --git a/examples/osgpoints/osgpoints.cpp b/examples/osgpoints/osgpoints.cpp
index 3df360f..dc0945e 100644
--- a/examples/osgpoints/osgpoints.cpp
+++ b/examples/osgpoints/osgpoints.cpp
@@ -36,6 +36,7 @@ public:
_stateset(stateset)
{
_point = new osg::Point;
+ _point->setSize(1.0);
_point->setDistanceAttenuation(osg::Vec3(0.0,0.0000,0.05f));
_stateset->setAttribute(_point.get());
}
@@ -119,8 +120,7 @@ int main( int argc, char **argv )
arguments.getApplicationUsage()->addCommandLineOption("--points","Sets the polygon mode to GL_POINT for front and back faces.");
- // construct the viewer.
- osgViewer::Viewer viewer;
+
bool shader = false;
while (arguments.read("--shader")) shader = true;
@@ -143,6 +143,9 @@ int main( int argc, char **argv )
arguments.getApplicationUsage()->write(std::cout,osg::ApplicationUsage::COMMAND_LINE_OPTION);
return 1;
}
+
+ // construct the viewer.
+ osgViewer::Viewer viewer(arguments);
// read the scene from the list of file specified commandline args.
osg::ref_ptr<osg::Node> loadedModel = osgDB::readRefNodeFiles(arguments);
@@ -213,7 +216,6 @@ int main( int argc, char **argv )
osg::Shader* vertex_shader = new osg::Shader(osg::Shader::VERTEX, vertexShaderSource);
program->addShader(vertex_shader);
-
#if 0
//////////////////////////////////////////////////////////////////
// fragment shader
@@ -221,7 +223,10 @@ int main( int argc, char **argv )
char fragmentShaderSource[] =
"void main(void) \n"
"{ \n"
- " gl_FragColor = gl_Color; \n"
+ " gl_FragColor[0] = gl_Color[0]/255.0;\n"
+ " gl_FragColor[1] = gl_Color[1]/255.0;\n"
+ " gl_FragColor[2] = gl_Color[2]/255.0;\n"
+ " gl_FragColor[3] = gl_Color[3]/255.0;\n"
"}\n";
osg::Shader* fragment_shader = new osg::Shader(osg::Shader::FRAGMENT, fragmentShaderSource);
diff --git a/examples/osgvolume/osgvolume.cpp b/examples/osgvolume/osgvolume.cpp
index 0390ca9..eb448f5 100644
--- a/examples/osgvolume/osgvolume.cpp
+++ b/examples/osgvolume/osgvolume.cpp
@@ -420,8 +420,10 @@ int main( int argc, char **argv )
arguments.getApplicationUsage()->addCommandLineOption("--s_maxTextureSize <size>","Set the texture maximum resolution in the s (x) dimension.");
arguments.getApplicationUsage()->addCommandLineOption("--t_maxTextureSize <size>","Set the texture maximum resolution in the t (y) dimension.");
arguments.getApplicationUsage()->addCommandLineOption("--r_maxTextureSize <size>","Set the texture maximum resolution in the r (z) dimension.");
+ arguments.getApplicationUsage()->addCommandLineOption("--modulate-alpha-by-colour <colourModulate.x()> <colourModulate.y()> <colourModulate.z()> <colourModulate.w()>","For each pixel multiply the alpha value by the color.");
arguments.getApplicationUsage()->addCommandLineOption("--modulate-alpha-by-luminance","For each pixel multiply the alpha value by the luminance.");
arguments.getApplicationUsage()->addCommandLineOption("--replace-alpha-with-luminance","For each pixel set the alpha value to the luminance.");
+ arguments.getApplicationUsage()->addCommandLineOption("--replace-alpha-with-luminance-inverted","For each pixel set the alpha value to 1-luminance.");
arguments.getApplicationUsage()->addCommandLineOption("--replace-rgb-with-luminance","For each rgb pixel convert to the luminance.");
arguments.getApplicationUsage()->addCommandLineOption("--num-components <num>","Set the number of components to in he target image.");
arguments.getApplicationUsage()->addCommandLineOption("--no-rescale","Disable the rescaling of the pixel data to 0.0 to 1.0 range");
@@ -566,7 +568,9 @@ int main( int argc, char **argv )
while(arguments.read("--modulate-alpha-by-luminance")) { colourSpaceOperation = osg::MODULATE_ALPHA_BY_LUMINANCE; }
while(arguments.read("--modulate-alpha-by-colour", colourModulate.x(),colourModulate.y(),colourModulate.z(),colourModulate.w() )) { colourSpaceOperation = osg::MODULATE_ALPHA_BY_COLOR; }
while(arguments.read("--replace-alpha-with-luminance")) { colourSpaceOperation = osg::REPLACE_ALPHA_WITH_LUMINANCE; }
+ while(arguments.read("--replace-alpha-with-luminance-inverted")) { colourSpaceOperation = osg::REPLACE_ALPHA_WITH_LUMINANCE_INVERTED; }
while(arguments.read("--replace-rgb-with-luminance")) { colourSpaceOperation = osg::REPLACE_RGB_WITH_LUMINANCE; }
+
enum RescaleOperation
diff --git a/include/osg/AlphaFunc b/include/osg/AlphaFunc
index 9535865..7162ad1 100644
--- a/include/osg/AlphaFunc
+++ b/include/osg/AlphaFunc
@@ -38,9 +38,9 @@ class OSG_EXPORT AlphaFunc : public StateAttribute
AlphaFunc();
- AlphaFunc(ComparisonFunction func,float ref):
+ AlphaFunc(ComparisonFunction func,float ref_in):
_comparisonFunc(func),
- _referenceValue(ref) {}
+ _referenceValue(ref_in) {}
/** Copy constructor using CopyOp to manage deep vs shallow copy. */
AlphaFunc(const AlphaFunc& af,const CopyOp& copyop=CopyOp::SHALLOW_COPY):
@@ -70,10 +70,10 @@ class OSG_EXPORT AlphaFunc : public StateAttribute
return true;
}
- inline void setFunction(ComparisonFunction func,float ref)
+ inline void setFunction(ComparisonFunction func,float ref_in)
{
_comparisonFunc = func;
- _referenceValue = ref;
+ _referenceValue = ref_in;
}
inline void setFunction(ComparisonFunction func) { _comparisonFunc=func; }
diff --git a/include/osg/ArgumentParser b/include/osg/ArgumentParser
index 21b8ca3..24f4e9a 100644
--- a/include/osg/ArgumentParser
+++ b/include/osg/ArgumentParser
@@ -92,7 +92,7 @@ class OSG_EXPORT ArgumentParser
public:
- ArgumentParser(int* argc,char **argv);
+ ArgumentParser(int* argc_in,char **argv_in);
void setApplicationUsage(ApplicationUsage* usage) { _usage = usage; }
ApplicationUsage* getApplicationUsage() { return _usage.get(); }
diff --git a/include/osg/Array b/include/osg/Array
index 7155dde..ac2afd5 100644
--- a/include/osg/Array
+++ b/include/osg/Array
@@ -393,7 +393,7 @@ class TemplateIndexArray : public IndexArray, public MixinVector<T>
virtual unsigned int getElementSize() const { return sizeof(ElementDataType); }
virtual const GLvoid* getDataPointer() const { if (!this->empty()) return &this->front(); else return 0; }
- virtual const GLvoid* getDataPointer(unsigned int index) const { if (!this->empty()) return &((*this)[index]); else return 0; }
+ virtual const GLvoid* getDataPointer(unsigned int index_in) const { if (!this->empty()) return &((*this)[index_in]); else return 0; }
virtual unsigned int getTotalDataSize() const { return static_cast<unsigned int>(this->size()*sizeof(T)); }
virtual unsigned int getNumElements() const { return static_cast<unsigned int>(this->size()); }
virtual void reserveArray(unsigned int num) { this->reserve(num); }
@@ -717,10 +717,10 @@ template<typename T, Array::Type ARRAYTYPE, int DataSize, int DataType>
inline void TemplateIndexArray<T,ARRAYTYPE,DataSize,DataType>::accept(ConstArrayVisitor& av) const { av.apply(*this); }
template<typename T, Array::Type ARRAYTYPE, int DataSize, int DataType>
-inline void TemplateIndexArray<T,ARRAYTYPE,DataSize,DataType>::accept(unsigned int index,ValueVisitor& vv) { vv.apply( (*this)[index] ); }
+inline void TemplateIndexArray<T,ARRAYTYPE,DataSize,DataType>::accept(unsigned int index_in,ValueVisitor& vv) { vv.apply( (*this)[index_in] ); }
template<typename T, Array::Type ARRAYTYPE, int DataSize, int DataType>
-inline void TemplateIndexArray<T,ARRAYTYPE,DataSize,DataType>::accept(unsigned int index,ConstValueVisitor& vv) const { vv.apply( (*this)[index] );}
+inline void TemplateIndexArray<T,ARRAYTYPE,DataSize,DataType>::accept(unsigned int index_in,ConstValueVisitor& vv) const { vv.apply( (*this)[index_in] );}
}
diff --git a/include/osg/BoundingSphere b/include/osg/BoundingSphere
index 4502e45..c400bfe 100644
--- a/include/osg/BoundingSphere
+++ b/include/osg/BoundingSphere
@@ -67,10 +67,10 @@ class BoundingSphereImpl
inline bool operator != (const BoundingSphereImpl& rhs) const { return _center!=rhs._center || _radius!=rhs._radius; }
/** Set the bounding sphere to the given center/radius using floats. */
- inline void set(const vec_type& center,value_type radius)
+ inline void set(const vec_type& center_in,value_type radius_in)
{
- _center = center;
- _radius = radius;
+ _center = center_in;
+ _radius = radius_in;
}
/** Returns the center of the bounding sphere. */
diff --git a/include/osg/GraphicsContext b/include/osg/GraphicsContext
index 33d7b0b..832e8fc 100644
--- a/include/osg/GraphicsContext
+++ b/include/osg/GraphicsContext
@@ -51,7 +51,7 @@ class OSG_EXPORT GraphicsContext : public Object
* Note, if either of displayNum or screenNum are not defined then -1 is set to
* signify that this parameter has not been set. When parameters are undefined one can call
* call setUndefinedScreenDetailsToDefaultScreen() after readDISPLAY() to ensure valid values. */
- void setScreenIdentifier(const std::string& displayName);
+ void setScreenIdentifier(const std::string& displayName_in);
/** Set any undefined displayNum or screenNum values (i.e. -1) to the default display & screen of 0 respectively.*/
void setUndefinedScreenDetailsToDefaultScreen()
diff --git a/include/osg/Identifier b/include/osg/Identifier
index 24d6160..1120429 100644
--- a/include/osg/Identifier
+++ b/include/osg/Identifier
@@ -52,7 +52,7 @@ public:
const int& number() const { return _number; }
protected:
- Identifier(const std::string& name, int number, osg::Referenced* f, osg::Referenced* s);
+ Identifier(const std::string& name_in, int number_in, osg::Referenced* f, osg::Referenced* s);
virtual ~Identifier();
virtual void objectDeleted(void* ptr);
diff --git a/include/osg/Image b/include/osg/Image
index 28c2842..9a72df3 100644
--- a/include/osg/Image
+++ b/include/osg/Image
@@ -226,16 +226,16 @@ class OSG_EXPORT Image : public BufferData
/** Allocate a pixel block of specified size and type. */
- virtual void allocateImage(int s,int t,int r,
+ virtual void allocateImage(int s_in,int t_in,int r_in,
GLenum pixelFormat,GLenum type,
int packing=1);
/** Set the image dimensions, format and data. */
- virtual void setImage(int s,int t,int r,
+ virtual void setImage(int s_in,int t_in,int r_in,
GLint internalTextureformat,
GLenum pixelFormat,GLenum type,
- unsigned char* data,
+ unsigned char* data_in,
AllocationMode mode,
int packing=1, int rowLength=0);
@@ -255,10 +255,10 @@ class OSG_EXPORT Image : public BufferData
void swap(osg::Image& rhs);
/** Scale image to specified size. */
- void scaleImage(int s,int t,int r) { scaleImage(s,t,r, getDataType()); }
+ void scaleImage(int s_in,int t_in,int r_in) { scaleImage(s_in,t_in,r_in, getDataType()); }
/** Scale image to specified size and with specified data type. */
- virtual void scaleImage(int s,int t,int r, GLenum newDataType);
+ virtual void scaleImage(int s_in,int t_in,int r_in, GLenum newDataType);
/** Copy a source Image into a subpart of this Image at specified position.
* Typically used to copy to an already allocated image, such as creating
@@ -405,7 +405,7 @@ class OSG_EXPORT Image : public BufferData
};
/** Get the color value for specified texcoord.*/
- Vec4 getColor(unsigned int s,unsigned t=0,unsigned r=0) const;
+ Vec4 getColor(unsigned int s_in,unsigned t_in=0,unsigned r_in=0) const;
/** Get the color value for specified texcoord.*/
Vec4 getColor(const Vec2& texcoord) const { return getColor(Vec3(texcoord.x(),texcoord.y(),0.0f)); }
@@ -451,9 +451,9 @@ class OSG_EXPORT Image : public BufferData
static unsigned int computePixelSizeInBits(GLenum pixelFormat,GLenum type);
static unsigned int computeRowWidthInBytes(int width,GLenum pixelFormat,GLenum type,int packing);
static unsigned int computeImageSizeInBytes(int width,int height, int depth, GLenum pixelFormat, GLenum type, int packing = 1, int slice_packing = 1, int image_packing = 1);
- static int roudUpToMultiple(int s, int pack);
- static int computeNearestPowerOfTwo(int s,float bias=0.5f);
- static int computeNumberOfMipmapLevels(int s,int t = 1, int r = 1);
+ static int roudUpToMultiple(int s_in, int pack);
+ static int computeNearestPowerOfTwo(int s_in,float bias=0.5f);
+ static int computeNumberOfMipmapLevels(int s_in,int t_in = 1, int r_in = 1);
/** Precomputed mipmaps stuff. */
typedef std::vector< unsigned int > MipmapDataType;
@@ -574,7 +574,7 @@ class OSG_EXPORT Image : public BufferData
void deallocateData();
- void setData(unsigned char* data,AllocationMode allocationMode);
+ void setData(unsigned char* data_in,AllocationMode allocationMode);
MipmapDataType _mipmapData;
diff --git a/include/osg/ImageSequence b/include/osg/ImageSequence
index 29297dc..e5fada6 100644
--- a/include/osg/ImageSequence
+++ b/include/osg/ImageSequence
@@ -42,7 +42,7 @@ class OSG_EXPORT ImageSequence : public ImageStream
/** Return -1 if *this < *rhs, 0 if *this==*rhs, 1 if *this>*rhs. */
virtual int compare(const Image& rhs) const;
- virtual void setReferenceTime(double t) { _referenceTime = t; }
+ virtual void setReferenceTime(double t_in) { _referenceTime = t_in; }
virtual double getReferenceTime() const { return _referenceTime; }
virtual void setTimeMultiplier(double tm) { _timeMultiplier = tm; }
@@ -94,12 +94,12 @@ class OSG_EXPORT ImageSequence : public ImageStream
template<class T> void addImage(const osg::ref_ptr<T>& image) { addImage(image.get()); }
- void setImage(int s,int t,int r,
+ void setImage(int s_in,int t_in,int r_in,
GLint internalTextureformat,
GLenum pixelFormat,GLenum type,
- unsigned char* data,
+ unsigned char* data_in,
AllocationMode mode,
- int packing=1) { Image::setImage(s,t,r,internalTextureformat, pixelFormat, type, data, mode, packing); }
+ int packing=1) { Image::setImage(s_in,t_in,r_in,internalTextureformat, pixelFormat, type, data_in, mode, packing); }
void setImage(unsigned int pos, osg::Image* image);
diff --git a/include/osg/ImageUtils b/include/osg/ImageUtils
index a79d739..9ce09fd 100644
--- a/include/osg/ImageUtils
+++ b/include/osg/ImageUtils
@@ -233,6 +233,7 @@ enum ColorSpaceOperation
MODULATE_ALPHA_BY_LUMINANCE,
MODULATE_ALPHA_BY_COLOR,
REPLACE_ALPHA_WITH_LUMINANCE,
+ REPLACE_ALPHA_WITH_LUMINANCE_INVERTED,
REPLACE_RGB_WITH_LUMINANCE
};
diff --git a/include/osg/Matrixd b/include/osg/Matrixd
index b9e3940..a4fcacc 100644
--- a/include/osg/Matrixd
+++ b/include/osg/Matrixd
@@ -33,8 +33,8 @@ class OSG_EXPORT Matrixd
inline Matrixd() { makeIdentity(); }
inline Matrixd( const Matrixd& mat) { set(mat.ptr()); }
Matrixd( const Matrixf& mat );
- inline explicit Matrixd( float const * const ptr ) { set(ptr); }
- inline explicit Matrixd( double const * const ptr ) { set(ptr); }
+ inline explicit Matrixd( float const * const ptr_in ) { set(ptr_in); }
+ inline explicit Matrixd( double const * const ptr_in ) { set(ptr_in); }
inline explicit Matrixd( const Quat& quat ) { makeRotate(quat); }
Matrixd(value_type a00, value_type a01, value_type a02, value_type a03,
@@ -72,16 +72,16 @@ class OSG_EXPORT Matrixd
void set(const Matrixf& rhs);
- inline void set(float const * const ptr)
+ inline void set(float const * const ptr_in)
{
value_type* local_ptr = (value_type*)_mat;
- for(int i=0;i<16;++i) local_ptr[i]=(value_type)ptr[i];
+ for(int i=0;i<16;++i) local_ptr[i]=(value_type)ptr_in[i];
}
- inline void set(double const * const ptr)
+ inline void set(double const * const ptr_in)
{
value_type* local_ptr = (value_type*)_mat;
- for(int i=0;i<16;++i) local_ptr[i]=(value_type)ptr[i];
+ for(int i=0;i<16;++i) local_ptr[i]=(value_type)ptr_in[i];
}
void set(value_type a00, value_type a01, value_type a02,value_type a03,
diff --git a/include/osg/Matrixf b/include/osg/Matrixf
index e9bcfbb..43ea877 100644
--- a/include/osg/Matrixf
+++ b/include/osg/Matrixf
@@ -33,8 +33,8 @@ class OSG_EXPORT Matrixf
inline Matrixf() { makeIdentity(); }
inline Matrixf( const Matrixf& mat) { set(mat.ptr()); }
Matrixf( const Matrixd& mat );
- inline explicit Matrixf( float const * const ptr ) { set(ptr); }
- inline explicit Matrixf( double const * const ptr ) { set(ptr); }
+ inline explicit Matrixf( float const * const ptr_in ) { set(ptr_in); }
+ inline explicit Matrixf( double const * const ptr_in ) { set(ptr_in); }
inline explicit Matrixf( const Quat& quat ) { makeRotate(quat); }
Matrixf( value_type a00, value_type a01, value_type a02, value_type a03,
@@ -72,16 +72,16 @@ class OSG_EXPORT Matrixf
void set(const Matrixd& rhs);
- inline void set(float const * const ptr)
+ inline void set(float const * const ptr_in)
{
value_type* local_ptr = (value_type*)_mat;
- for(int i=0;i<16;++i) local_ptr[i]=(value_type)ptr[i];
+ for(int i=0;i<16;++i) local_ptr[i]=(value_type)ptr_in[i];
}
- inline void set(double const * const ptr)
+ inline void set(double const * const ptr_in)
{
value_type* local_ptr = (value_type*)_mat;
- for(int i=0;i<16;++i) local_ptr[i]=(value_type)ptr[i];
+ for(int i=0;i<16;++i) local_ptr[i]=(value_type)ptr_in[i];
}
void set(value_type a00, value_type a01, value_type a02,value_type a03,
diff --git a/include/osg/Quat b/include/osg/Quat
index c8ef76f..4f1fe61 100644
--- a/include/osg/Quat
+++ b/include/osg/Quat
@@ -41,12 +41,12 @@ class OSG_EXPORT Quat
inline Quat() { _v[0]=0.0; _v[1]=0.0; _v[2]=0.0; _v[3]=1.0; }
- inline Quat( value_type x, value_type y, value_type z, value_type w )
+ inline Quat( value_type x_in, value_type y_in, value_type z_in, value_type w_in )
{
- _v[0]=x;
- _v[1]=y;
- _v[2]=z;
- _v[3]=w;
+ _v[0]=x_in;
+ _v[1]=y_in;
+ _v[2]=z_in;
+ _v[3]=w_in;
}
inline Quat( const Vec4f& v )
@@ -119,12 +119,12 @@ class OSG_EXPORT Quat
return Vec3d(_v[0], _v[1], _v[2]);
}
- inline void set(value_type x, value_type y, value_type z, value_type w)
+ inline void set(value_type x_in, value_type y_in, value_type z_in, value_type w_in)
{
- _v[0]=x;
- _v[1]=y;
- _v[2]=z;
- _v[3]=w;
+ _v[0]=x_in;
+ _v[1]=y_in;
+ _v[2]=z_in;
+ _v[3]=w_in;
}
inline void set(const osg::Vec4f& v)
@@ -204,14 +204,14 @@ class OSG_EXPORT Quat
/// Unary multiply
inline Quat& operator*=(const Quat& rhs)
{
- value_type x = rhs._v[3]*_v[0] + rhs._v[0]*_v[3] + rhs._v[1]*_v[2] - rhs._v[2]*_v[1];
- value_type y = rhs._v[3]*_v[1] - rhs._v[0]*_v[2] + rhs._v[1]*_v[3] + rhs._v[2]*_v[0];
- value_type z = rhs._v[3]*_v[2] + rhs._v[0]*_v[1] - rhs._v[1]*_v[0] + rhs._v[2]*_v[3];
+ value_type x_ = rhs._v[3]*_v[0] + rhs._v[0]*_v[3] + rhs._v[1]*_v[2] - rhs._v[2]*_v[1];
+ value_type y_ = rhs._v[3]*_v[1] - rhs._v[0]*_v[2] + rhs._v[1]*_v[3] + rhs._v[2]*_v[0];
+ value_type z_ = rhs._v[3]*_v[2] + rhs._v[0]*_v[1] - rhs._v[1]*_v[0] + rhs._v[2]*_v[3];
_v[3] = rhs._v[3]*_v[3] - rhs._v[0]*_v[0] - rhs._v[1]*_v[1] - rhs._v[2]*_v[2];
- _v[2] = z;
- _v[1] = y;
- _v[0] = x;
+ _v[2] = z_;
+ _v[1] = y_;
+ _v[0] = x_;
return (*this); // enable nesting
}
diff --git a/include/osg/Scissor b/include/osg/Scissor
index e7e25e2..c044348 100644
--- a/include/osg/Scissor
+++ b/include/osg/Scissor
@@ -24,11 +24,11 @@ class OSG_EXPORT Scissor : public StateAttribute
public :
Scissor();
- Scissor(int x,int y,int width,int height):
- _x(x),
- _y(y),
- _width(width),
- _height(height) {}
+ Scissor(int x_in,int y_in,int width_in,int height_in):
+ _x(x_in),
+ _y(y_in),
+ _width(width_in),
+ _height(height_in) {}
/** Copy constructor using CopyOp to manage deep vs shallow copy. */
@@ -64,20 +64,20 @@ class OSG_EXPORT Scissor : public StateAttribute
return true;
}
- inline void setScissor(int x,int y,int width,int height)
+ inline void setScissor(int x_in,int y_in,int width_in,int height_in)
{
- _x = x;
- _y = y;
- _width = width;
- _height = height;
+ _x = x_in;
+ _y = y_in;
+ _width = width_in;
+ _height = height_in;
}
- void getScissor(int& x,int& y,int& width,int& height) const
+ void getScissor(int& x_out,int& y_out,int& width_out,int& height_out) const
{
- x = _x;
- y = _y;
- width = _width;
- height = _height;
+ x_out = _x;
+ y_out = _y;
+ width_out = _width;
+ height_out = _height;
}
inline int& x() { return _x; }
diff --git a/include/osg/Stencil b/include/osg/Stencil
index 1960c17..798ad7e 100644
--- a/include/osg/Stencil
+++ b/include/osg/Stencil
@@ -94,17 +94,17 @@ class OSG_EXPORT Stencil : public StateAttribute
ALWAYS = GL_ALWAYS
};
- inline void setFunction(Function func,int ref,unsigned int mask)
+ inline void setFunction(Function func,int ref_in,unsigned int mask)
{
_func = func;
- _funcRef = ref;
+ _funcRef = ref_in;
_funcMask = mask;
}
inline void setFunction(Function func) { _func = func; }
inline Function getFunction() const { return _func; }
- inline void setFunctionRef(int ref) { _funcRef=ref; }
+ inline void setFunctionRef(int ref_in) { _funcRef=ref_in; }
inline int getFunctionRef() const { return _funcRef; }
inline void setFunctionMask(unsigned int mask) { _funcMask=mask; }
diff --git a/include/osg/StencilTwoSided b/include/osg/StencilTwoSided
index 224be39..38a63c0 100644
--- a/include/osg/StencilTwoSided
+++ b/include/osg/StencilTwoSided
@@ -74,17 +74,17 @@ class OSG_EXPORT StencilTwoSided : public StateAttribute
ALWAYS = GL_ALWAYS
};
- inline void setFunction(Face face, Function func,int ref,unsigned int mask)
+ inline void setFunction(Face face, Function func,int ref_in,unsigned int mask)
{
_func[face] = func;
- _funcRef[face] = ref;
+ _funcRef[face] = ref_in;
_funcMask[face] = mask;
}
inline void setFunction(Face face, Function func) { _func[face] = func; }
inline Function getFunction(Face face) const { return _func[face]; }
- inline void setFunctionRef(Face face, int ref) { _funcRef[face]=ref; }
+ inline void setFunctionRef(Face face, int ref_in) { _funcRef[face]=ref_in; }
inline int getFunctionRef(Face face) const { return _funcRef[face]; }
inline void setFunctionMask(Face face, unsigned int mask) { _funcMask[face]=mask; }
diff --git a/include/osg/Texture b/include/osg/Texture
index e611d77..2d17adc 100644
--- a/include/osg/Texture
+++ b/include/osg/Texture
@@ -993,9 +993,9 @@ class OSG_EXPORT Texture : public osg::StateAttribute
{
public:
- inline TextureObject(Texture* texture, GLuint id, GLenum target):
- _id(id),
- _profile(target),
+ inline TextureObject(Texture* texture, GLuint id_in, GLenum target_in):
+ _id(id_in),
+ _profile(target_in),
_set(0),
_previous(0),
_next(0),
@@ -1004,8 +1004,8 @@ class OSG_EXPORT Texture : public osg::StateAttribute
_frameLastUsed(0),
_timeStamp(0) {}
- inline TextureObject(Texture* texture, GLuint id, const TextureProfile& profile):
- _id(id),
+ inline TextureObject(Texture* texture, GLuint id_in, const TextureProfile& profile):
+ _id(id_in),
_profile(profile),
_set(0),
_previous(0),
@@ -1016,16 +1016,16 @@ class OSG_EXPORT Texture : public osg::StateAttribute
_timeStamp(0) {}
inline TextureObject(Texture* texture,
- GLuint id,
- GLenum target,
+ GLuint id_in,
+ GLenum target_in,
GLint numMipmapLevels,
GLenum internalFormat,
GLsizei width,
GLsizei height,
GLsizei depth,
GLint border):
- _id(id),
- _profile(target,numMipmapLevels,internalFormat,width,height,depth,border),
+ _id(id_in),
+ _profile(target_in,numMipmapLevels,internalFormat,width,height,depth,border),
_set(0),
_previous(0),
_next(0),
@@ -1034,7 +1034,7 @@ class OSG_EXPORT Texture : public osg::StateAttribute
_frameLastUsed(0),
_timeStamp(0) {}
- inline bool match(GLenum target,
+ inline bool match(GLenum target_in,
GLint numMipmapLevels,
GLenum internalFormat,
GLsizei width,
@@ -1043,7 +1043,7 @@ class OSG_EXPORT Texture : public osg::StateAttribute
GLint border)
{
return isReusable() &&
- _profile.match(target,numMipmapLevels,internalFormat,width,height,depth,border);
+ _profile.match(target_in,numMipmapLevels,internalFormat,width,height,depth,border);
}
diff --git a/include/osg/Timer b/include/osg/Timer
index ac1a452..d40e482 100644
--- a/include/osg/Timer
+++ b/include/osg/Timer
@@ -80,8 +80,8 @@ class OSG_EXPORT Timer {
class ElapsedTime
{
public:
- inline ElapsedTime(double* elapsedTime, osg::Timer* timer = 0):
- _time(elapsedTime)
+ inline ElapsedTime(double* elapsedTime_in, osg::Timer* timer = 0):
+ _time(elapsedTime_in)
{
init(timer);
}
diff --git a/include/osg/Uniform b/include/osg/Uniform
index 22fbc39..467a060 100644
--- a/include/osg/Uniform
+++ b/include/osg/Uniform
@@ -96,10 +96,10 @@ class MatrixTemplate
void set(const MatrixTemplate& rhs) { set(rhs.ptr()); }
- void set(value_type const * const ptr)
+ void set(value_type const * const ptr_in)
{
value_type* local_ptr = (value_type*)_mat;
- for(int i=0;i<value_count;++i) local_ptr[i]=ptr[i];
+ for(int i=0;i<value_count;++i) local_ptr[i]=ptr_in[i];
}
value_type* ptr() { return (value_type*)_mat; }
diff --git a/include/osg/Vec2b b/include/osg/Vec2b
index 67f6cf6..400f885 100644
--- a/include/osg/Vec2b
+++ b/include/osg/Vec2b
@@ -40,9 +40,9 @@ class Vec2b
/** Constructor that sets all components of the vector to zero */
Vec2b() { _v[0]=0; _v[1]=0; }
- Vec2b(value_type r, value_type g)
+ Vec2b(value_type r_in, value_type g_in)
{
- _v[0]=r; _v[1]=g;
+ _v[0]=r_in; _v[1]=g_in;
}
inline bool operator == (const Vec2b& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1]; }
@@ -59,9 +59,9 @@ class Vec2b
inline value_type* ptr() { return _v; }
inline const value_type* ptr() const { return _v; }
- inline void set( value_type x, value_type y)
+ inline void set( value_type x_in, value_type y_in)
{
- _v[0]=x; _v[1]=y;
+ _v[0]=x_in; _v[1]=y_in;
}
inline void set( const Vec2b& rhs)
diff --git a/include/osg/Vec2d b/include/osg/Vec2d
index 96bc48e..5c516c8 100644
--- a/include/osg/Vec2d
+++ b/include/osg/Vec2d
@@ -40,7 +40,7 @@ class Vec2d
/** Constructor that sets all components of the vector to zero */
Vec2d() {_v[0]=0.0; _v[1]=0.0;}
- Vec2d(value_type x,value_type y) { _v[0]=x; _v[1]=y; }
+ Vec2d(value_type x_in,value_type y_in) { _v[0]=x_in; _v[1]=y_in; }
inline Vec2d(const Vec2f& vec) { _v[0]=vec._v[0]; _v[1]=vec._v[1]; }
@@ -61,7 +61,7 @@ class Vec2d
inline value_type* ptr() { return _v; }
inline const value_type* ptr() const { return _v; }
- inline void set( value_type x, value_type y ) { _v[0]=x; _v[1]=y; }
+ inline void set( value_type x_in, value_type y_in ) { _v[0]=x_in; _v[1]=y_in; }
inline value_type& operator [] (int i) { return _v[i]; }
inline value_type operator [] (int i) const { return _v[i]; }
diff --git a/include/osg/Vec2f b/include/osg/Vec2f
index 35d82da..c9c2367 100644
--- a/include/osg/Vec2f
+++ b/include/osg/Vec2f
@@ -41,7 +41,7 @@ class Vec2f
/** Constructor that sets all components of the vector to zero */
Vec2f() {_v[0]=0.0; _v[1]=0.0;}
- Vec2f(value_type x,value_type y) { _v[0]=x; _v[1]=y; }
+ Vec2f(value_type x_in,value_type y_in) { _v[0]=x_in; _v[1]=y_in; }
inline bool operator == (const Vec2f& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1]; }
@@ -58,7 +58,7 @@ class Vec2f
inline value_type * ptr() { return _v; }
inline const value_type * ptr() const { return _v; }
- inline void set( value_type x, value_type y ) { _v[0]=x; _v[1]=y; }
+ inline void set( value_type x_in, value_type y_in ) { _v[0]=x_in; _v[1]=y_in; }
inline void set( const Vec2f& rhs) { _v[0]=rhs._v[0]; _v[1]=rhs._v[1]; }
inline value_type & operator [] (int i) { return _v[i]; }
diff --git a/include/osg/Vec2i b/include/osg/Vec2i
index bc26d69..fcddc2b 100644
--- a/include/osg/Vec2i
+++ b/include/osg/Vec2i
@@ -33,7 +33,7 @@ class Vec2i
Vec2i() { _v[0]=0; _v[1]=0; }
- Vec2i(value_type x, value_type y) { _v[0] = x; _v[1] = y; }
+ Vec2i(value_type x_in, value_type y_in) { _v[0] = x_in; _v[1] = y_in; }
inline bool operator == (const Vec2i& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1]; }
inline bool operator != (const Vec2i& v) const { return _v[0]!=v._v[0] || _v[1]!=v._v[1]; }
@@ -47,9 +47,9 @@ class Vec2i
inline value_type* ptr() { return _v; }
inline const value_type* ptr() const { return _v; }
- inline void set( value_type x, value_type y)
+ inline void set( value_type x_in, value_type y_in)
{
- _v[0]=x; _v[1]=y;
+ _v[0]=x_in; _v[1]=y_in;
}
inline void set( const Vec2i& rhs)
diff --git a/include/osg/Vec2s b/include/osg/Vec2s
index 137cc83..7d8ce0b 100644
--- a/include/osg/Vec2s
+++ b/include/osg/Vec2s
@@ -31,7 +31,7 @@ class Vec2s
/** Constructor that sets all components of the vector to zero */
Vec2s() { _v[0]=0; _v[1]=0; }
- Vec2s(value_type x, value_type y) { _v[0] = x; _v[1] = y; }
+ Vec2s(value_type x_in, value_type y_in) { _v[0] = x_in; _v[1] = y_in; }
inline bool operator == (const Vec2s& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1]; }
inline bool operator != (const Vec2s& v) const { return _v[0]!=v._v[0] || _v[1]!=v._v[1]; }
@@ -45,9 +45,9 @@ class Vec2s
inline value_type* ptr() { return _v; }
inline const value_type* ptr() const { return _v; }
- inline void set( value_type x, value_type y)
+ inline void set( value_type x_in, value_type y_in)
{
- _v[0]=x; _v[1]=y;
+ _v[0]=x_in; _v[1]=y_in;
}
inline void set( const Vec2s& rhs)
diff --git a/include/osg/Vec2ub b/include/osg/Vec2ub
index 4e5c76e..e81c9d1 100644
--- a/include/osg/Vec2ub
+++ b/include/osg/Vec2ub
@@ -34,7 +34,7 @@ class Vec2ub
/** Constructor that sets all components of the vector to zero */
Vec2ub() { _v[0]=0; _v[1]=0; }
- Vec2ub(value_type r, value_type g) { _v[0]=r; _v[1]=g; }
+ Vec2ub(value_type r_in, value_type g_in) { _v[0]=r_in; _v[1]=g_in; }
inline bool operator == (const Vec2ub& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1]; }
inline bool operator != (const Vec2ub& v) const { return _v[0]!=v._v[0] || _v[1]!=v._v[1]; }
@@ -48,9 +48,9 @@ class Vec2ub
inline value_type* ptr() { return _v; }
inline const value_type* ptr() const { return _v; }
- inline void set( value_type x, value_type y)
+ inline void set( value_type x_in, value_type y_in)
{
- _v[0]=x; _v[1]=y;
+ _v[0]=x_in; _v[1]=y_in;
}
inline void set( const Vec2ub& rhs)
diff --git a/include/osg/Vec2ui b/include/osg/Vec2ui
index 641bc4e..a047763 100644
--- a/include/osg/Vec2ui
+++ b/include/osg/Vec2ui
@@ -33,7 +33,7 @@ class Vec2ui
Vec2ui() { _v[0]=0; _v[1]=0; }
- Vec2ui(value_type x, value_type y) { _v[0] = x; _v[1] = y; }
+ Vec2ui(value_type x_in, value_type y_in) { _v[0] = x_in; _v[1] = y_in; }
inline bool operator == (const Vec2ui& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1]; }
inline bool operator != (const Vec2ui& v) const { return _v[0]!=v._v[0] || _v[1]!=v._v[1]; }
@@ -47,9 +47,9 @@ class Vec2ui
inline value_type* ptr() { return _v; }
inline const value_type* ptr() const { return _v; }
- inline void set( value_type x, value_type y)
+ inline void set( value_type x_in, value_type y_in)
{
- _v[0]=x; _v[1]=y;
+ _v[0]=x_in; _v[1]=y_in;
}
inline void set( const Vec2ui& rhs)
diff --git a/include/osg/Vec2us b/include/osg/Vec2us
index 4649c4c..64f4975 100644
--- a/include/osg/Vec2us
+++ b/include/osg/Vec2us
@@ -31,7 +31,7 @@ class Vec2us
/** Constructor that sets all components of the vector to zero */
Vec2us() { _v[0]=0; _v[1]=0; }
- Vec2us(value_type x, value_type y) { _v[0] = x; _v[1] = y; }
+ Vec2us(value_type x_in, value_type y_in) { _v[0] = x_in; _v[1] = y_in; }
inline bool operator == (const Vec2us& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1]; }
inline bool operator != (const Vec2us& v) const { return _v[0]!=v._v[0] || _v[1]!=v._v[1]; }
@@ -45,9 +45,9 @@ class Vec2us
inline value_type* ptr() { return _v; }
inline const value_type* ptr() const { return _v; }
- inline void set( value_type x, value_type y)
+ inline void set( value_type x_in, value_type y_in)
{
- _v[0]=x; _v[1]=y;
+ _v[0]=x_in; _v[1]=y_in;
}
inline void set( const Vec2us& rhs)
diff --git a/include/osg/Vec3b b/include/osg/Vec3b
index 1706e01..a690dff 100644
--- a/include/osg/Vec3b
+++ b/include/osg/Vec3b
@@ -37,7 +37,7 @@ class Vec3b
/** Constructor that sets all components of the vector to zero */
Vec3b() { _v[0]=0; _v[1]=0; _v[2]=0; }
- Vec3b(value_type r, value_type g, value_type b) { _v[0]=r; _v[1]=g; _v[2]=b; }
+ Vec3b(value_type r_in, value_type g_in, value_type b_in) { _v[0]=r_in; _v[1]=g_in; _v[2]=b_in; }
inline bool operator == (const Vec3b& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1] && _v[2]==v._v[2]; }
@@ -55,9 +55,9 @@ class Vec3b
inline value_type* ptr() { return _v; }
inline const value_type* ptr() const { return _v; }
- inline void set(value_type r, value_type g, value_type b)
+ inline void set(value_type r_in, value_type g_in, value_type b_in)
{
- _v[0]=r; _v[1]=g; _v[2]=b;
+ _v[0]=r_in; _v[1]=g_in; _v[2]=b_in;
}
inline void set( const Vec3b& rhs)
diff --git a/include/osg/Vec3d b/include/osg/Vec3d
index 1406275..703a80c 100644
--- a/include/osg/Vec3d
+++ b/include/osg/Vec3d
@@ -45,7 +45,7 @@ class Vec3d
inline operator Vec3f() const { return Vec3f(static_cast<float>(_v[0]),static_cast<float>(_v[1]),static_cast<float>(_v[2]));}
- Vec3d(value_type x,value_type y,value_type z) { _v[0]=x; _v[1]=y; _v[2]=z; }
+ Vec3d(value_type x_in,value_type y_in,value_type z_in) { _v[0]=x_in; _v[1]=y_in; _v[2]=z_in; }
Vec3d(const Vec2d& v2,value_type zz)
{
_v[0] = v2[0];
@@ -69,9 +69,9 @@ class Vec3d
inline value_type* ptr() { return _v; }
inline const value_type* ptr() const { return _v; }
- inline void set( value_type x, value_type y, value_type z)
+ inline void set( value_type x_in, value_type y_in, value_type z_in)
{
- _v[0]=x; _v[1]=y; _v[2]=z;
+ _v[0]=x_in; _v[1]=y_in; _v[2]=z_in;
}
inline void set( const Vec3d& rhs)
diff --git a/include/osg/Vec3f b/include/osg/Vec3f
index c388111..45397f8 100644
--- a/include/osg/Vec3f
+++ b/include/osg/Vec3f
@@ -39,7 +39,7 @@ class Vec3f
/** Constructor that sets all components of the vector to zero */
Vec3f() { _v[0]=0.0f; _v[1]=0.0f; _v[2]=0.0f;}
- Vec3f(value_type x,value_type y,value_type z) { _v[0]=x; _v[1]=y; _v[2]=z; }
+ Vec3f(value_type x_in,value_type y_in,value_type z_in) { _v[0]=x_in; _v[1]=y_in; _v[2]=z_in; }
Vec3f(const Vec2f& v2,value_type zz)
{
_v[0] = v2[0];
@@ -64,9 +64,9 @@ class Vec3f
inline value_type* ptr() { return _v; }
inline const value_type* ptr() const { return _v; }
- inline void set( value_type x, value_type y, value_type z)
+ inline void set( value_type x_in, value_type y_in, value_type z_in)
{
- _v[0]=x; _v[1]=y; _v[2]=z;
+ _v[0]=x_in; _v[1]=y_in; _v[2]=z_in;
}
inline void set( const Vec3f& rhs)
diff --git a/include/osg/Vec3i b/include/osg/Vec3i
index 8844600..fe13b19 100644
--- a/include/osg/Vec3i
+++ b/include/osg/Vec3i
@@ -33,7 +33,7 @@ class Vec3i
Vec3i() { _v[0]=0; _v[1]=0; _v[2]=0; }
- Vec3i(value_type r, value_type g, value_type b) { _v[0]=r; _v[1]=g; _v[2]=b; }
+ Vec3i(value_type r_in, value_type g_in, value_type b_in) { _v[0]=r_in; _v[1]=g_in; _v[2]=b_in; }
inline bool operator == (const Vec3i& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1] && _v[2]==v._v[2]; }
inline bool operator != (const Vec3i& v) const { return _v[0]!=v._v[0] || _v[1]!=v._v[1] || _v[2]!=v._v[2]; }
@@ -49,9 +49,9 @@ class Vec3i
inline value_type* ptr() { return _v; }
inline const value_type* ptr() const { return _v; }
- inline void set(value_type r, value_type g, value_type b)
+ inline void set(value_type r_in, value_type g_in, value_type b_in)
{
- _v[0]=r; _v[1]=g; _v[2]=b;
+ _v[0]=r_in; _v[1]=g_in; _v[2]=b_in;
}
inline void set( const Vec3i& rhs)
diff --git a/include/osg/Vec3s b/include/osg/Vec3s
index a212606..efd3bb4 100644
--- a/include/osg/Vec3s
+++ b/include/osg/Vec3s
@@ -31,7 +31,7 @@ class Vec3s
/** Constructor that sets all components of the vector to zero */
Vec3s() { _v[0]=0; _v[1]=0; _v[2]=0; }
- Vec3s(value_type r, value_type g, value_type b) { _v[0]=r; _v[1]=g; _v[2]=b; }
+ Vec3s(value_type r_in, value_type g_in, value_type b_in) { _v[0]=r_in; _v[1]=g_in; _v[2]=b_in; }
inline bool operator == (const Vec3s& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1] && _v[2]==v._v[2]; }
inline bool operator != (const Vec3s& v) const { return _v[0]!=v._v[0] || _v[1]!=v._v[1] || _v[2]!=v._v[2]; }
@@ -47,9 +47,9 @@ class Vec3s
inline value_type* ptr() { return _v; }
inline const value_type* ptr() const { return _v; }
- inline void set(value_type r, value_type g, value_type b)
+ inline void set(value_type r_in, value_type g_in, value_type b_in)
{
- _v[0]=r; _v[1]=g; _v[2]=b;
+ _v[0]=r_in; _v[1]=g_in; _v[2]=b_in;
}
inline void set( const Vec3s& rhs)
diff --git a/include/osg/Vec3ub b/include/osg/Vec3ub
index e862e20..363c68a 100644
--- a/include/osg/Vec3ub
+++ b/include/osg/Vec3ub
@@ -37,7 +37,7 @@ class Vec3ub
/** Constructor that sets all components of the vector to zero */
Vec3ub() { _v[0]=0; _v[1]=0; _v[2]=0; }
- Vec3ub(value_type r, value_type g, value_type b) { _v[0]=r; _v[1]=g; _v[2]=b; }
+ Vec3ub(value_type r_in, value_type g_in, value_type b_in) { _v[0]=r_in; _v[1]=g_in; _v[2]=b_in; }
inline bool operator == (const Vec3ub& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1] && _v[2]==v._v[2]; }
@@ -55,9 +55,9 @@ class Vec3ub
inline value_type* ptr() { return _v; }
inline const value_type* ptr() const { return _v; }
- inline void set(value_type r, value_type g, value_type b)
+ inline void set(value_type r_in, value_type g_in, value_type b_in)
{
- _v[0]=r; _v[1]=g; _v[2]=b;
+ _v[0]=r_in; _v[1]=g_in; _v[2]=b_in;
}
inline void set( const Vec3ub& rhs)
diff --git a/include/osg/Vec3ui b/include/osg/Vec3ui
index 126a975..1309d75 100644
--- a/include/osg/Vec3ui
+++ b/include/osg/Vec3ui
@@ -33,7 +33,7 @@ class Vec3ui
Vec3ui() { _v[0]=0; _v[1]=0; _v[2]=0; }
- Vec3ui(value_type r, value_type g, value_type b) { _v[0]=r; _v[1]=g; _v[2]=b; }
+ Vec3ui(value_type r_in, value_type g_in, value_type b_in) { _v[0]=r_in; _v[1]=g_in; _v[2]=b_in; }
inline bool operator == (const Vec3ui& v) const { return _v[0]==v._v[0] && _v[1]==v._v[1] && _v[2]==v._v[2]; }
inline bool operator != (const Vec3ui& v) const { return _v[0]!=v._v[0] || _v[1]!=v._v[1] || _v[2]!=v._v[2]; }
@@ -49,9 +49,9 @@ class Vec3ui
inline value_type* ptr() { return _v; }
inline const value_type* ptr() const { return _v; }
- inline void set(value_type r, value_type g, value_type b)
+ inline void set(value_type r_in, value_type g_in, value_type b_in)
{
- _v[0]=r; _v[1]=g; _v[2]=b;