From 946f1eea2b734a8b4854d57e2935f091f736fef7 Mon Sep 17 00:00:00 2001
From: Christophe Geuzaine <cgeuzaine@ulg.ac.be>
Date: Mon, 10 Sep 2007 04:57:35 +0000
Subject: [PATCH] moving to new post-processing database
*** WARNING ***
do not upgrade if you need plugins or adaptive view: these have not
been ported (yet) to the new database
*** WARNING ***
---
Common/Context.h | 1 -
Common/DefaultOptions.h | 3 ---
Common/Options.cpp | 11 +----------
Common/Options.h | 2 --
4 files changed, 1 insertion(+), 16 deletions(-)
diff --git a/Common/Context.h b/Common/Context.h
index 563164d13f..69ae071b08 100644
--- a/Common/Context.h
+++ b/Common/Context.h
@@ -200,7 +200,6 @@ public :
// post processing options
struct{
List_T *list ;
- int force_num, compute_bb, vertex_arrays;
int draw, link, horizontal_scales ;
int smooth, anim_cycle, combine_time, combine_remove_orig ;
int file_format, plugins;
diff --git a/Common/DefaultOptions.h b/Common/DefaultOptions.h
index 5ef7f14f6d..f35ae61558 100644
--- a/Common/DefaultOptions.h
+++ b/Common/DefaultOptions.h
@@ -1130,9 +1130,6 @@ StringXNumber PostProcessingOptions_Number[] = {
{ F|O, "Smoothing" , opt_post_smooth , 0. ,
"Apply (non-reversible) smoothing to post-processing view when merged" },
- { F|O, "VertexArrays" , opt_post_vertex_arrays , 1. ,
- "Use OpenGL vertex arrays to draw triangles in post-processing views?" },
-
{ 0, NULL , NULL , 0. }
} ;
diff --git a/Common/Options.cpp b/Common/Options.cpp
index 6325e6cc2b..8bfe368b0d 100644
--- a/Common/Options.cpp
+++ b/Common/Options.cpp
@@ -1,4 +1,4 @@
-// $Id: Options.cpp,v 1.353 2007-09-10 04:47:02 geuzaine Exp $
+// $Id: Options.cpp,v 1.354 2007-09-10 04:57:35 geuzaine Exp $
//
// Copyright (C) 1997-2007 C. Geuzaine, J.-F. Remacle
//
@@ -134,7 +134,6 @@ void Init_Options(int num)
CTX.mesh.draw = 1;
CTX.post.draw = 1;
CTX.post.list = NULL;
- CTX.post.force_num = 0;
CTX.threads_lock = 0; // very primitive locking
CTX.mesh.changed = 0;
CTX.post.combine_time = 0; // try to combine_time views at startup
@@ -5278,14 +5277,6 @@ double opt_solver_merge_views4(OPT_ARGS_NUM)
return opt_solver_merge_views(4, action, val);
}
-double opt_post_vertex_arrays(OPT_ARGS_NUM)
-{
- if(action & GMSH_SET) {
- CTX.post.vertex_arrays = (int)val;
- }
- return CTX.post.vertex_arrays;
-}
-
double opt_post_horizontal_scales(OPT_ARGS_NUM)
{
if(action & GMSH_SET)
diff --git a/Common/Options.h b/Common/Options.h
index a936eed5f5..a22abd964f 100644
--- a/Common/Options.h
+++ b/Common/Options.h
@@ -458,7 +458,6 @@ double opt_mesh_volumes_num(OPT_ARGS_NUM);
double opt_mesh_point_size(OPT_ARGS_NUM);
double opt_mesh_point_type(OPT_ARGS_NUM);
double opt_mesh_line_width(OPT_ARGS_NUM);
-double opt_mesh_vertex_arrays(OPT_ARGS_NUM);
double opt_mesh_reverse_all_normals(OPT_ARGS_NUM);
double opt_mesh_smooth_normals(OPT_ARGS_NUM);
double opt_mesh_angle_smooth_normals(OPT_ARGS_NUM);
@@ -522,7 +521,6 @@ double opt_solver_merge_views1(OPT_ARGS_NUM);
double opt_solver_merge_views2(OPT_ARGS_NUM);
double opt_solver_merge_views3(OPT_ARGS_NUM);
double opt_solver_merge_views4(OPT_ARGS_NUM);
-double opt_post_vertex_arrays(OPT_ARGS_NUM);
double opt_post_horizontal_scales(OPT_ARGS_NUM);
double opt_post_link(OPT_ARGS_NUM);
double opt_post_smooth(OPT_ARGS_NUM);
--
GitLab