Directory Core/Geometry/

Lines of Code

Developers

Most Recent Commits

callahan 2005-12-09 15:35 Rev.: 32790

Rename Quaternion::pow to Quaternion::Pow so as not to confuse it with the builtin pow function.

0 lines of code changed in 4 files:

• Core/Geometry: Quaternion.cc (changed), Quaternion.h (new)

mdavis 2005-11-10 18:50 Rev.: 32513

-Cut out DrawInfoOpenGL from Core/Geom/GeomOpenGL.cc into Core/Geom/GeomOpenGL.cc.
-Rename Core/Geom/GeomOpenGL.h to Core/Geom/DrawInfoOpenGL.h
-Fix #include statments for files that included Core/Geom/GeomOpenGL.h -- some files didn't need this include at all, just the sci_gl* includes.
-Add Plane::get(double[4]) method to return values how OpenGL wants them for clipping planes
-General cleanup and removed a few unused variables in DrawInfoOpenGL struct
-Moved ViewWindow:: symbols out of Dataflow/Modules/Render/OpenGL and into Dataflow/Modules/Render/ViewWindow.cc (where they belong)
-Hopefully this will provide some initial incentive to improve our GL state handling ablities

12 lines of code changed in 4 files:

• Core/Geometry: Plane.cc (+11), Plane.h (+1)

callahan 2005-10-21 13:26 Rev.: 32239

Rearrange dynamic compilation includes again. Now they go data, basis, mesh, container, field, other. Point.h, Vector, etc are now included before the basis classes that depend upon them.

0 lines of code changed in 2 files:

• Core/Geometry: Point.cc (new)

mjc 2005-10-11 14:29 Rev.: 32109

keep separate include lists in CompileInfo, Basis, Mesh, Fields tagged to identify which list they belong in

4 lines of code changed in 4 files:

• Core/Geometry: Tensor.cc (new), Vector.cc (new)

mjc 2005-10-10 09:59 Rev.: 32092

initial commit of H_O_Basis branch merge

43 lines of code changed in 7 files:

• Core/Geometry: Point.h (new), Tensor.cc (+19), Tensor.h (+6), Vector.h (+6)

mdavis 2005-09-28 21:57 Rev.: 32041

New Feature - Multiple 2D transfer functions per volume via user selected clipping planes.

At the network level, this makes the SCIRun->Visualization->VolumeVisualizer 2D colormap input port a dynamic input port. The first 2d colormap input behaves as before and thus backwards funcitonality is the same.

Any subsequent 2D colormaps input to the VolumeVisualizer will create an arrow widget in the viewer. This widget specifies where the new transfer funciton will be applied to the volume. The arrow points in the direction where the transfer function is not applied, allowing the user to more easily pick the direction of the clipping plane while not being occluded by the volume. But if the widget is occluded by the volume, it still shows as a lightly stippled widget that the user can still manipulate.


Files changed and a brief description:

A Core/Geom/GeomStippleOccluded.cc
A Core/Geom/GeomStippleOccluded.h
M Core/Geom/sub.mk
M Core/Geom/GeomSwitch.h
M Core/Geom/GeomOpenGL.cc
---> Added GeomStippleOccluded container that inherits from GeomSwitch. All children look normal, until they are occluded by another object, then they are drawn with a stipple pattern to allow them to be seen behind other objects. Gives a nice transparency look without the computation expense. Very useful for widgets.


M Core/Volume/VolumeRenderer.cc
M Core/Volume/VolumeRenderer.h
---> Added parameter to VolumeRenderer constructor to take in an array of clipping planes that determine where the 2D colormaps are applied. Added support for computing multple transfer functions regions with call to TextureBrick::mask_polygons. Other minor Code Cleanup.


M Core/Volume/TextureBrick.cc
M Core/Volume/TextureBrick.h
---> Rewrite for code clarity. Major addition of mask_polygons method, which takes in a vector of clipping Planes, slices the polygons into clipped and non-clipped regions, and returns their resultant bitmasks. Remove min/max of t parameter calculation that was causing re-slicing of volume at different planes for each different zoom level.

M Core/Volume/SliceRenderer.h
M Core/Volume/SliceRenderer.cc
---> Minor code to support the vector of colormap2's being passed down

M Core/Volume/TextureRenderer.h
M Core/Volume/TextureRenderer.cc
---> Code factoring to seperate long blocks of code in build_colormap2. Added code for rendering multiple colormap2s into one texture to support the multiple transfer functions that can be applied to a volume. Set bitmask for which colormaps to apply to a polygon via shader parameter to draw_polygons. Got rid of extraneous use_pbuffer_ boolean. Other minor code cleanup.

M Core/Volume/VolShader.h
M Core/Volume/VolShader.cc
---> Added shader to render using multiple transfer functions via a bitmask. Trickery by using a floating point parameter as a boolean bit mask.

M Core/Geometry/Plane.cc
M Core/Geometry/Plane.h
---> Added Plane::ChangePlane(Point,Vector) for linking w/ ArrowWidget. Added Plane::Intersect(Point, Vector, t) to get the parametric parameter where a ray hits the plane, used in TextureBrick::mask_polygons.

M Dataflow/XML/VolumeVisualizer.xml
---> Made last ColorMap2D port dynamic to support multiple transfer functions.

M Dataflow/GUI/VolumeVisualizer.tcl
---> Added checkbutton to turn off transfer function clipping plane arrow widgets.

M Dataflow/Widgets/ArrowWidget.cc
M Dataflow/Widgets/ArrowWidget.h
M Dataflow/Widgets/BaseWidget.cc
M Dataflow/Widgets/BaseWidget.h
---> Added boolean parameter to constructor to specify if ArrowWidget is rendered with a stipple pattern when occluded. Useful when arrow widget is inside the volume.

M Dataflow/Modules/Visualization/VolumeSlicer.cc
---> Send Colormap2 as vector to SliceRenderer.

M Dataflow/Modules/Visualization/VolumeVisualizer.cc
---> Create an arrow widget for each extra ColorMap2, so user can specify half-plaen where transfer function is applied to volume. Code for multiple transfer funcitons.

-McKay Davis

96 lines of code changed in 2 files:

• Core/Geometry: Plane.cc (+94 -12), Plane.h (+2)

allen 2005-08-29 10:45 Rev.: 31751

added rayplane test

0 lines of code changed in 4 files:

• Core/Geometry: CompGeom.cc (new), CompGeom.h (new)

allen 2005-08-29 10:18 Rev.: 31749

added comp geom functions

116 lines of code changed in 4 files:

• Core/Geometry: CompGeom.cc (+65), CompGeom.h (+50), sub.mk (new)

livne 2005-08-22 13:22 Rev.: 31637

Moved the operator<< to be friend functions as this allows the (g++) compiler to find the functions and not get confused and give a unknown function error message when compiling. Strangely, all (most?) << functions must be friends as most any arbitrary new << function that is not a friend function causes others to be 'lost'. Also had to put the << functions into the Uintah namespace in the .cc files.

16 lines of code changed in 6 files:

• Core/Geometry: IntVector.cc (+7 -5), IntVector.h (new), Point.h (+3 -4), Vector.h (+3 -3)

worthen 2005-06-23 12:52 Rev.: 30854

IntVector: rewrite < and (didn't sort for STL functions) remove >, <=, >=

Everything else: Make Particle Subsets work with a specified range instead of with ghost cells

26 lines of code changed in 1 file:

• Core/Geometry: IntVector.h (+26 -12)

sparker 2005-05-13 00:53 Rev.: 30167

SCI_NOPERSISTENT and SCI_NOTYPEDESCRIPTION are no longer needed
since Geometry is not used in Manta any longer

1 lines of code changed in 9 files:

• Core/Geometry: BBox.cc (new), Point.cc (-10), Transform.cc (new), Transform.h (new), Vector.cc (-6), Vector.h (-2)

callahan 2005-04-20 14:59 Rev.: 29888

Fix compilation, reinsert virtual io function

1 lines of code changed in 1 file:

• Core/Geometry: Transform.h (+1)

sparker 2005-04-20 12:57 Rev.: 29882

Added ability to compile outside of SCIRun (disabling Persistent stuff and type description stuff through #ifdef)

41 lines of code changed in 6 files:

• Core/Geometry: BBox.cc (+4 -1), Point.cc (+6), Transform.cc (+12 -8), Transform.h (+11 -3), Vector.cc (+6), Vector.h (+2)

sparker 2005-04-15 19:36 Rev.: 29841

Retire .cvsignore files

0 lines of code changed in 1 file:

• Core/Geometry: .cvsignore (del)

callahan 2005-04-15 14:47 Rev.: 29835

Remove unneeded Core/Persistent/Pstreams.h includes

0 lines of code changed in 1 file:

• Core/Geometry: Transform.cc (-1)

callahan 2005-03-15 16:41 Rev.: 29345

Merge v1_24_1_release into trunk

13 lines of code changed in 1 file:

• Core/Geometry: Transform.cc (+13 -22)

mjc 2005-02-23 21:43 Rev.: 28907

checkpoint merge from branch for bux fixes

1 lines of code changed in 1 file:

• Core/Geometry: Tensor.cc (+1 -1)

worthen 2005-02-21 21:05 Rev.: 28804

Get rid of unnecesesary SCICORESHARE

47 lines of code changed in 17 files:

• Core/Geometry: BBox.h (+2 -3), Grid.h (+1 -5), IntVector.h (+2 -3), Plane.h (+1 -3), Point.h (+14 -15), Polygon.h (new), Quaternion.cc (-1), Quaternion.h (+5 -6), Ray.h (new), Tensor.cc (+1 -1), Tensor.h (+4 -5), Transform.h (+1 -2), Vector.h (+12 -13)

callahan 2005-02-04 18:25 Rev.: 28471

Merge v1_24_0_release

237 lines of code changed in 4 files:

• Core/Geometry: Tensor.cc (+28 -5), Tensor.h (+3 -3), Transform.cc (+203 -145), sub.mk (+3 -1)

bigler 2005-01-24 16:33 Rev.: 28190

Changed rotate to return true if the rotation was applied, false otherwise. rotate now returns false if the vectors to be rotated are too close together instead of picking an arbitrary axis of rotation.

9 lines of code changed in 2 files:

• Core/Geometry: Transform.cc (+7 -6), Transform.h (+2 -1)