Changeset 448 for trunk/gui/vizservers/nanovis/nanovis.cpp
- Timestamp:
- May 30, 2006 8:06:30 AM (18 years ago)
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
trunk/gui/vizservers/nanovis/nanovis.cpp
r445 r448 46 46 47 47 //if true nanovis renders volumes in 3D, if not renders 2D plane 48 bool volume_mode = true; 48 bool volume_mode = true; 49 49 50 50 // color table for built-in transfer function editor … … 272 272 273 273 int axis; 274 if (GetAxis(interp, argv[3], &axis) != TCL_OK) {274 if (GetAxis(interp, (char*) argv[3], &axis) != TCL_OK) { 275 275 return TCL_ERROR; 276 276 } … … 320 320 321 321 int axis; 322 if (GetAxis(interp, argv[3], &axis) != TCL_OK) {322 if (GetAxis(interp, (char*) argv[3], &axis) != TCL_OK) { 323 323 return TCL_ERROR; 324 324 } … … 421 421 char **xferv; 422 422 423 if (Tcl_SplitList(interp, argv[3], &xferc, &xferv) != TCL_OK) {423 if (Tcl_SplitList(interp, argv[3], &xferc, (const char***) &xferv) != TCL_OK) { 424 424 return TCL_ERROR; 425 425 } … … 664 664 665 665 float rgb[3]; 666 if (GetColor(interp, argv[3], rgb) != TCL_OK) {666 if (GetColor(interp, (char*) argv[3], rgb) != TCL_OK) { 667 667 return TCL_ERROR; 668 668 } … … 708 708 709 709 float cval[3]; 710 if (GetColor(interp, argv[3], cval) != TCL_OK) {710 if (GetColor(interp, (char*) argv[3], cval) != TCL_OK) { 711 711 return TCL_ERROR; 712 712 } … … 976 976 int rgbc; 977 977 char **rgbv; 978 if (Tcl_SplitList(interp, str, &rgbc, &rgbv) != TCL_OK) {978 if (Tcl_SplitList(interp, str, &rgbc, (const char***)&rgbv) != TCL_OK) { 979 979 return TCL_ERROR; 980 980 } … … 1929 1929 //load_volume_file(0, "./data/nw-AB-Vg=0.000-Vd=1.000-potential.dx"); 1930 1930 //load_volume_file(0, "./data/test2.dx"); 1931 //load_volume_file(0, "./data/mu-wire-3d.dx"); 1931 //load_volume_file(0, "./data/mu-wire-3d.dx"); //I added this line to debug: Wei 1932 1932 //load_volume_file(0, "./data/input_nd_dx_4"); //take a VERY long time? 1933 1933 //load_vector_file(1, "./data/J-wire-vec.dx"); 1934 //load_volume_file(1, "./data/mu-wire-3d.dx"); 1934 //load_volume_file(1, "./data/mu-wire-3d.dx"); //I added this line to debug: Wei 1935 1935 //load_volume_file(3, "./data/mu-wire-3d.dx"); 1936 1936 //load_volume_file(4, "./data/mu-wire-3d.dx"); … … 1941 1941 //create volume renderer and add volumes to it 1942 1942 vol_render = new VolumeRenderer(g_context); 1943 1944 /* 1945 //I added this to debug : Wei 1946 float tmp_data[4*124]; 1947 TransferFunction* tmp_tf = new TransferFunction(124, tmp_data); 1948 vol_render->add_volume(volume[0], tmp_tf); 1949 volume[1]->move(Vector3(0.5, 0.6, 0.7)); 1950 vol_render->add_volume(volume[1], tmp_tf); 1951 */ 1943 1952 1944 1953 //create an 2D plane renderer … … 1947 1956 1948 1957 plane_render->add_plane(plane[0], get_transfunc("default")); 1958 1959 assert(glGetError()==0); 1949 1960 1950 1961 //init_particle_system(); … … 2889 2900 2890 2901 #ifndef XINETD 2891 MainTransferFunctionWindow * tf_window;2892 tf_window = new MainTransferFunctionWindow();2893 tf_window->mainInit();2902 //MainTransferFunctionWindow * tf_window; 2903 //tf_window = new MainTransferFunctionWindow(); 2904 //tf_window->mainInit(); 2894 2905 2895 2906 glutMouseFunc(mouse);
Note: See TracChangeset
for help on using the changeset viewer.