Skip to content

Commit de5b26c

Browse files
split colorbar functions into shared
There is a lot of useful code that is currently intertwined with GLUT and GLUI. This splits that code out and put it into shared. This introduces a new head shared_structures.h to hold some structs which are used in shared files. This should eventually be factored out. This does include some refactoring in that colorbar data is collected into a struct of type `colorbar_collection` which can be used without reference to global variables (including tests as shown in `Tests/parse_colorbar.c`).
1 parent 0accda2 commit de5b26c

32 files changed

+1975
-1588
lines changed

Build/smokeview/Makefile

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -48,7 +48,7 @@ bin = .
4848

4949
csrc = callbacks.c camera.c color2rgb.c readimage.c readgeom.c readobject.c readcad.c colortimebar.c compress.c csphere.c dmalloc.c \
5050
drawGeometry.c file_util.c getdata.c getdatabounds.c getdatacolors.c glew.c \
51-
histogram.c infoheader.c readlabel.c readtour.c readhvac.c readslice.c readsmoke.c \
51+
histogram.c infoheader.c readlabel.c readtour.c readhvac.c readslice.c readsmoke.c colorbars.c colorbar_defs.c \
5252
IOboundary.c IOgeometry.c IOhvac.c IOiso.c IOobjects.c IOpart.c IOplot2d.c IOplot3d.c \
5353
IOscript.c IOshooter.c IOslice.c IOsmoke.c IOtour.c IOvolsmoke.c IOwui.c IOzone.c IOframe.o isobox.c \
5454
main.c md5.c menus.c output.c readsmv.c renderhtml.c renderimage.c scontour2d.c sha1.c \

Source/shared/CMakeLists.txt

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ add_library(libsmv STATIC
1616
stdio_buffer.c
1717
getdata.c
1818
color2rgb.c
19+
colorbars.c
20+
colorbar_defs.c
1921
readimage.c
2022
readcad.c
2123
readgeom.c

0 commit comments

Comments
 (0)