Context Navigation

← Previous Changeset
Next Changeset →

Changeset 6461

Timestamp:

04/06/07 17:36:13 (6 years ago)

Author:

robert

Message:

From Eric Wing, pedantic warning fixes

Location:

OpenSceneGraph/trunk

Files:

: 38 modified

applications/osgconv/osgconv.cpp (modified) (1 diff)
examples/osgdistortion/osgdistortion.cpp (modified) (2 diffs)
examples/osgunittests/UnitTestFramework.cpp (modified) (1 diff)
include/osgGA/KeySwitchMatrixManipulator (modified) (1 diff)
include/osgGA/NodeTrackerManipulator (modified) (2 diffs)
include/osgGA/TerrainManipulator (modified) (1 diff)
include/osgShadow/OccluderGeometry (modified) (2 diffs)
src/osgPlugins/3ds/atmosphere.h (modified) (1 diff)
src/osgPlugins/3ds/background.h (modified) (1 diff)
src/osgPlugins/3ds/camera.h (modified) (1 diff)
src/osgPlugins/3ds/chunk.h (modified) (1 diff)
src/osgPlugins/3ds/chunktable.h (modified) (1 diff)
src/osgPlugins/3ds/ease.h (modified) (1 diff)
src/osgPlugins/3ds/file.h (modified) (1 diff)
src/osgPlugins/3ds/lib3ds_float.h (modified) (1 diff)
src/osgPlugins/3ds/light.h (modified) (1 diff)
src/osgPlugins/3ds/material.h (modified) (1 diff)
src/osgPlugins/3ds/matrix.h (modified) (1 diff)
src/osgPlugins/3ds/mesh.h (modified) (1 diff)
src/osgPlugins/3ds/node.h (modified) (1 diff)
src/osgPlugins/3ds/quat.h (modified) (1 diff)
src/osgPlugins/3ds/readwrite.h (modified) (1 diff)
src/osgPlugins/3ds/shadow.h (modified) (1 diff)
src/osgPlugins/3ds/tcb.h (modified) (1 diff)
src/osgPlugins/3ds/tracks.h (modified) (1 diff)
src/osgPlugins/3ds/types.h (modified) (1 diff)
src/osgPlugins/3ds/vector.h (modified) (1 diff)
src/osgPlugins/3ds/viewport.h (modified) (1 diff)
src/osgPlugins/ac/ac3d.cpp (modified) (1 diff)
src/osgPlugins/geo/ReaderWriterGEO.cpp (modified) (1 diff)
src/osgPlugins/net/sockstream.h (modified) (1 diff)
src/osgPlugins/x/types.cpp (modified) (1 diff)
src/osgSim/ColorRange.cpp (modified) (1 diff)
src/osgTerrain/GeometryTechnique.cpp (modified) (1 diff)
src/osgText/Font.cpp (modified) (1 diff)
src/osgUtil/Statistics.cpp (modified) (1 diff)
src/osgUtil/TriStrip_tri_stripper.h (modified) (1 diff)
src/osgViewer/GraphicsWindowCarbon.cpp (modified) (1 diff)

Legend:

: Unmodified
: Added
: Removed

OpenSceneGraph/trunk/applications/osgconv/osgconv.cpp

r5955	r6461
165	165	NO_TRANSPARANCY_FIXING,
166	166	MAKE_OPAQUE_TEXTURE_STATESET_OPAQUE,
167		MAKE_ALL_STATESET_OPAQUE,
	167	MAKE_ALL_STATESET_OPAQUE
168	168	};
169	169

OpenSceneGraph/trunk/examples/osgdistortion/osgdistortion.cpp

r6385	r6461
424	424
425	425	return geometry;
426		};
	426	}
427	427
428	428	void setDomeCorrection(osgViewer::Viewer& viewer, osg::ArgumentParser& arguments)
…	…
713	713	return viewer.run();
714	714	}
715		;
	715

OpenSceneGraph/trunk/examples/osgunittests/UnitTestFramework.cpp

r5828	r6461
393	393
394	394
395		};
	395	}

OpenSceneGraph/trunk/include/osgGA/KeySwitchMatrixManipulator

r5954	r6461
136	136	};
137	137
138		};
	138	}
139	139
140	140	#endif

OpenSceneGraph/trunk/include/osgGA/NodeTrackerManipulator

r5375	r6461
58	58	/** Tack the center of the node's bounding sphere, and the all rotations of the node.
59	59	*/
60		NODE_CENTER_AND_ROTATION,
	60	NODE_CENTER_AND_ROTATION
61	61	};
62	62
…	…
72	72	/** Allow the elevation and azimuth angles to be adjust w.r.t the tracked orientation.
73	73	*/
74		ELEVATION_AZIM,
	74	ELEVATION_AZIM
75	75	};
76	76

OpenSceneGraph/trunk/include/osgGA/TerrainManipulator

r5328	r6461
32	32	{
33	33	ELEVATION_AZIM_ROLL,
34		ELEVATION_AZIM,
	34	ELEVATION_AZIM
35	35	};
36	36

OpenSceneGraph/trunk/include/osgShadow/OccluderGeometry

r6010	r6461
145	145	if (edge.boundaryEdge()) return true;
146	146
	147	float offset = 0.0f;
	148
147	149	osg::Vec3 delta(lightpos-_vertices[edge._p1]);
148		float n1 = delta * _triangleNormals[edge._t1];
149		float n2 = delta * _triangleNormals[edge._t2];
	150	delta.normalize();
	151
	152	float n1 = delta * _triangleNormals[edge._t1] + offset;
	153	float n2 = delta * _triangleNormals[edge._t2] + offset;
	154
	155	float angle_offset = 0.0f;
	156
	157	n1 = cos(acosf(n1) + angle_offset);
	158	n2 = cos(acosf(n2) + angle_offset);
150	159
151	160	if (n1==0.0f && n2==0.0f) return false;
…	…
158	167	if (edge.boundaryEdge()) return true;
159	168
160		float n1 = lightdirection * _triangleNormals[edge._t1];
161		float n2 = lightdirection * _triangleNormals[edge._t2];
	169	float offset = 0.0f;
	170
	171	float n1 = lightdirection * _triangleNormals[edge._t1] + offset;
	172	float n2 = lightdirection * _triangleNormals[edge._t2] + offset;
	173
	174	float angle_offset = 0.0f;
	175
	176	n1 = cos(acosf(n1) + angle_offset);
	177	n2 = cos(acosf(n2) + angle_offset);
162	178
163	179	if (n1==0.0f && n2==0.0f) return false;

OpenSceneGraph/trunk/src/osgPlugins/3ds/atmosphere.h

r1563	r6461
96	96
97	97	#ifdef __cplusplus
98		};
	98	}
99	99	#endif
100	100	#endif

OpenSceneGraph/trunk/src/osgPlugins/3ds/background.h

r1563	r6461
76	76
77	77	#ifdef __cplusplus
78		};
	78	}
79	79	#endif
80	80	#endif

OpenSceneGraph/trunk/src/osgPlugins/3ds/camera.h

r1563	r6461
55	55
56	56	#ifdef __cplusplus
57		};
	57	}
58	58	#endif
59	59	#endif

OpenSceneGraph/trunk/src/osgPlugins/3ds/chunk.h

r1563	r6461
282	282
283	283	#ifdef __cplusplus
284		};
285		#endif
286		#endif
287
288
	284	}
	285	#endif
	286	#endif
	287
	288

OpenSceneGraph/trunk/src/osgPlugins/3ds/chunktable.h

r1563	r6461
258	258
259	259	#ifdef __cplusplus
260		};
261		#endif
262		#endif
263
	260	}
	261	#endif
	262	#endif
	263

OpenSceneGraph/trunk/src/osgPlugins/3ds/ease.h

r1563	r6461
36	36
37	37	#ifdef __cplusplus
38		};
	38	}
39	39	#endif
40	40	#endif

OpenSceneGraph/trunk/src/osgPlugins/3ds/file.h

r1531	r6461
100	100
101	101	#ifdef __cplusplus
102		};
	102	}
103	103	#endif
104	104	#endif

OpenSceneGraph/trunk/src/osgPlugins/3ds/lib3ds_float.h

r1563	r6461
36	36
37	37	#ifdef __cplusplus
38		};
	38	}
39	39	#endif
40	40	#endif

OpenSceneGraph/trunk/src/osgPlugins/3ds/light.h

r1563	r6461
73	73
74	74	#ifdef __cplusplus
75		};
	75	}
76	76	#endif
77	77	#endif

OpenSceneGraph/trunk/src/osgPlugins/3ds/material.h

r1563	r6461
161	161
162	162	#ifdef __cplusplus
163		};
	163	}
164	164	#endif
165	165	#endif

OpenSceneGraph/trunk/src/osgPlugins/3ds/matrix.h

r1563	r6461
62	62
63	63	#ifdef __cplusplus
64		};
	64	}
65	65	#endif
66	66	#endif

OpenSceneGraph/trunk/src/osgPlugins/3ds/mesh.h

r1563	r6461
130	130
131	131	#ifdef __cplusplus
132		};
	132	}
133	133	#endif
134	134	#endif

OpenSceneGraph/trunk/src/osgPlugins/3ds/node.h

r1563	r6461
164	164
165	165	#ifdef __cplusplus
166		};
	166	}
167	167	#endif
168	168	#endif

OpenSceneGraph/trunk/src/osgPlugins/3ds/quat.h

r1563	r6461
56	56
57	57	#ifdef __cplusplus
58		};
	58	}
59	59	#endif
60	60	#endif

OpenSceneGraph/trunk/src/osgPlugins/3ds/readwrite.h

r5453	r6461
56	56
57	57	#ifdef __cplusplus
58		};
	58	}
59	59	#endif
60	60	#endif

OpenSceneGraph/trunk/src/osgPlugins/3ds/shadow.h

r1563	r6461
50	50
51	51	#ifdef __cplusplus
52		};
	52	}
53	53	#endif
54	54	#endif

OpenSceneGraph/trunk/src/osgPlugins/3ds/tcb.h

r1563	r6461
57	57
58	58	#ifdef __cplusplus
59		};
	59	}
60	60	#endif
61	61	#endif

OpenSceneGraph/trunk/src/osgPlugins/3ds/tracks.h

r1563	r6461
204	204
205	205	#ifdef __cplusplus
206		};
207		#endif
208		#endif
209
	206	}
	207	#endif
	208	#endif
	209

OpenSceneGraph/trunk/src/osgPlugins/3ds/types.h

r5453	r6461
135	135
136	136	#ifdef __cplusplus
137		};
	137	}
138	138	#endif
139	139	#endif

OpenSceneGraph/trunk/src/osgPlugins/3ds/vector.h

r1563	r6461
53	53
54	54	#ifdef __cplusplus
55		};
	55	}
56	56	#endif
57	57	#endif

OpenSceneGraph/trunk/src/osgPlugins/3ds/viewport.h

r1563	r6461
128	128
129	129	#ifdef __cplusplus
130		};
	130	}
131	131	#endif
132	132	#endif

OpenSceneGraph/trunk/src/osgPlugins/ac/ac3d.cpp

r5940	r6461
187	187
188	188	SurfaceShaded = 1<<4,
189		SurfaceTwoSided = 1<<5,
	189	SurfaceTwoSided = 1<<5
190	190	};
191	191

OpenSceneGraph/trunk/src/osgPlugins/geo/ReaderWriterGEO.cpp

r6051	r6461
62	62	_initialTick = _timer.tick();
63	63	color_palette=new colourPalette;
64		};
	64	}
65	65	const geoValue *geoHeaderGeo::getGeoVar(const unsigned fid) const {
66	66	const geoValue *st=intVars->getGeoVar(fid);

OpenSceneGraph/trunk/src/osgPlugins/net/sockstream.h

r3963	r6461
166	166	msg_oob = MSG_OOB,
167	167	msg_peek = MSG_PEEK,
168		msg_dontroute = MSG_DONTROUTE,
	168	msg_dontroute = MSG_DONTROUTE
169	169
170	170	#if !(defined(__FreeBSD__) \|\| defined(__NetBSD__) \|\| defined(__OpenBSD__) \|\| defined(__bsdi__) \|\| defined(__APPLE__))
171		msg_maxiovlen = MSG_MAXIOVLEN
	171	,msg_maxiovlen = MSG_MAXIOVLEN
172	172	#endif
173	173	};

OpenSceneGraph/trunk/src/osgPlugins/x/types.cpp

r5224	r6461
240	240	}
241	241
242		};
	242	}

OpenSceneGraph/trunk/src/osgSim/ColorRange.cpp

r3028	r6461
16	16	{
17	17	setColors(colors);
18		};
	18	}
19	19
20	20	void ColorRange::setColors(const std::vector<osg::Vec4>& colors)

OpenSceneGraph/trunk/src/osgTerrain/GeometryTechnique.cpp

r6451	r6461
328	328	}
329	329
	330	// _geometry->setUseDisplayList(false);
	331
330	332	_dirty = false;
331	333	}

OpenSceneGraph/trunk/src/osgText/Font.cpp

r5943	r6461
1		;
2	1	/* --c++-- OpenSceneGraph - Copyright (C) 1998-2006 Robert Osfield
3	2	*

OpenSceneGraph/trunk/src/osgUtil/Statistics.cpp

r5863	r6461
32	32	{
33	33	reset();
34		};
	34	}
35	35
36	36	void Statistics::reset()

OpenSceneGraph/trunk/src/osgUtil/TriStrip_tri_stripper.h

r3390	r6461
380	380
381	381
382		}; // namespace triangle_stripper
	382	} // namespace triangle_stripper
383	383
384	384	#endif

OpenSceneGraph/trunk/src/osgViewer/GraphicsWindowCarbon.cpp

r6404	r6461
892	892	{
893	893	kEventParamMouseWheelSmoothVerticalDelta = 'saxy', // typeSInt32
894		kEventParamMouseWheelSmoothHorizontalDelta = 'saxx', // typeSInt32
	894	kEventParamMouseWheelSmoothHorizontalDelta = 'saxx' // typeSInt32
895	895	};
896	896

Context Navigation

Changeset 6461

Legend:

Download in other formats: