Changeset 26

Timestamp:

11/20/08 16:01:24 (3 years ago)

Author:

mirko

Message:

Ready for release?

Location:

branches/pdfcube-0.0.3

Files:

• Makefile.am (modified) (1 diff)
• configure.ac (modified) (3 diffs)
• m4 (added)
• m4/ax_boost_base.m4 (added)
• m4/ax_boost_program_options.m4 (added)
• src/Makefile.am (modified) (1 diff)
• src/pdfcube.cc (modified) (24 diffs)

branches/pdfcube-0.0.3/Makefile.am

@@ -1 +1 @@
 ## top-level Makefile.am
 
+#Include extra macros
+ACLOCAL_AMFLAGS = -I m4
+
 #Build in these directories:
-SUBDIRS = src
+SUBDIRS = src m4
 
 #Distribute these directories:
-DIST_SUBDIRS =  src
+DIST_SUBDIRS = src m4
 
-EXTRA_DIST=autogen.sh
+EXTRA_DIST = autogen.sh

branches/pdfcube-0.0.3/configure.ac

@@ -12 +12 @@
 AM_INIT_AUTOMAKE(pdfcube, 0.0.2)
 
+AC_CONFIG_MACRO_DIR([m4])
 
 dnl -----------------------------------------------
@@ -51 +52 @@
 AC_CHECK_HEADERS(GL/glut.h)
 
+AX_BOOST_BASE([1.33.1])
+AX_BOOST_PROGRAM_OPTIONS()
+
 dnl -----------------------------------------------
 dnl Generates Makefiles.
@@ -56 +60 @@
 
 AC_OUTPUT(Makefile \
-          src/Makefile
+          src/Makefile \
+          m4/Makefile
 )

branches/pdfcube-0.0.3/src/Makefile.am

@@ -2 +2 @@
 
 pdfcube_SOURCES = pdfcube.cc
-pdfcube_CXXFLAGS=-Wall -Weffc++
+pdfcube_CXXFLAGS = -Wall -Weffc++ 
 
-INCLUDES = $(glib_CFLAGS) $(gtk_CFLAGS) $(gtkglext_CFLAGS) $(poppler_CFLAGS) $(poppler_glib_CFLAGS)
+LDADD = $(glib_LIBS) $(gtk_LIBS) $(gtkglext_LIBS) $(poppler_LIBS) $(poppler_glib_LIBS) -lglut 
+INCLUDES = $(glib_CFLAGS) $(gtk_CFLAGS) $(gtkglext_CFLAGS) $(poppler_CFLAGS) $(poppler_glib_CFLAGS) $(BOOST_LDFLAGS)
 
-LDADD = $(glib_LIBS) $(gtk_LIBS) $(gtkglext_LIBS) $(poppler_LIBS) $(poppler_glib_LIBS) -lglut
+AM_CXXFLAGS = $(BOOST_CPPFLAGS) 
+AM_LDFLAGS=$(BOOST_LDFLAGS) $(BOOST_PROGRAM_OPTIONS_LIB)

branches/pdfcube-0.0.3/src/pdfcube.cc

@@ -43 +43 @@
 #include <poppler.h>
 
+#include <boost/program_options.hpp>
+
 using namespace std;
+namespace po = boost::program_options;
 
 //////////////////////////////////////////////////////////////////////////
@@ -65 +68 @@
 };
 
-static gboolean fullscreen = TRUE;
+static gboolean fullscreen;
 static gboolean animating = FALSE;
 animation active_animation = ANIM_NONE;
@@ -88 +91 @@
 
 static GtkWidget *create_window(GdkGLConfig * glconfig);
+
+
+static GLfloat clear_color[4] = { 0.6, 0.0, 0.0, 0.0 };
+static GLfloat top_color[4] = { 0.7, 0.6, 0.6, 0.0 };
+static double animation_emphasis = 3.0;
 
 static bool
@@ -233 +241 @@
     glPolygonMode(GL_FRONT, GL_FILL);
     glEdgeFlag(GL_FALSE);
-
-    glClearColor(0.6, 0.0, 0.0, 0.0);
+    
+    glClearColor(clear_color[0], clear_color[1], clear_color[2], clear_color[3]);
     glCullFace(GL_FRONT);
     glDisable(GL_DEPTH_TEST);
@@ -248 +256 @@
     glEnable(GL_AUTO_NORMAL);
     glEnable(GL_NORMALIZE);
+
+    glEnable(GL_COLOR_MATERIAL);
+
 #ifdef ENABLE_FOG
     glEnable(GL_FOG);
@@ -336 +347 @@
           glMatrixMode(GL_MODELVIEW);
           glLoadIdentity();
-          lookposz -= 2.0*zsteps[frame];
-          lookposy = 3.0*xsteps[frame];
+          lookposz -= animation_emphasis*zsteps[frame];
+          lookposy = 1.5*animation_emphasis*xsteps[frame];
           gluLookAt(lookposx, lookposy, lookposz,
                     atx, aty, atz, 0, 1, 0);
@@ -764 +775 @@
   // Initialization of animation vectors
   void matrix_setup() {
-    float step_factor = 0.2 * double(N_FRAMES);        //this is little buggy
-    float step = (step_factor) / (double(N_FRAMES)/2.0);
-    int i = 0;
-    for (i = 0; i < N_FRAMES / 2; i++) {
-      steps[i] = i * step;
-      if (steps[i] > step_factor)
-        steps[i] = step_factor;
-    }
-    for (i = N_FRAMES / 2; i < N_FRAMES; i++) {
-      steps[i] = step_factor - (i - double(N_FRAMES) / 2.0) * step;
-      if (steps[i] < 0)
-        steps[i] = 0;
-    }
-    // steps[N_FRAMES - 1] = 0;
-#ifndef NDEBUG
-    cout << "Step " << step << endl;
+    double sum = 0.;
+    for(int i=0; i<N_FRAMES; i++)
+      {
+        steps[i] =std::pow(::sin(i*M_PI/double(N_FRAMES)), 2);
+        sum += steps[i];
+      } 
+    double factor = 90./sum;
+    for(int i=0; i<N_FRAMES; i++)
+      {
+        steps[i] *= factor;
+      }
+#ifndef NDEBUG
     cout << "Matrix ";
-    for (i = 0; i < N_FRAMES; i++)
+    for (int i = 0; i < N_FRAMES; i++)
       cout << steps[i] << " ";
     cout << endl;
@@ -789 +796 @@
     float xstep =
       double (xstep_ratio) / (double(N_FRAMES-1) / 2.0);
-    for (i = 0; i < N_FRAMES / 2; i++) {
+    for (int i = 0; i < N_FRAMES / 2; i++) {
       xsteps[i] = i * xstep;
       if (xsteps[i] > xstep_ratio)
         xsteps[i] = xstep_ratio;
     }
-    for (i = N_FRAMES / 2; i < N_FRAMES; i++) {
+    for (int i = N_FRAMES / 2; i < N_FRAMES; i++) {
       xsteps[i] = xstep_ratio - (i - double(N_FRAMES-1) / 2.0) * xstep;
       if (xsteps[i] < 0.01)
@@ -803 +810 @@
     cout << "Step x " << xstep << endl;
     cout << "Matrix2 ";
-    for (i = 0; i < N_FRAMES; i++)
+    for (int i = 0; i < N_FRAMES; i++)
       cout << xsteps[i] << " ";
     cout << endl;
@@ -810 +817 @@
     float granular = 0.07;
     float zstep = granular / (double(N_FRAMES) / 4.0);
-    for (i = 0; i < N_FRAMES / 4; i++) {
+    for (int i = 0; i < N_FRAMES / 4; i++) {
       zsteps[i] = -i * zstep;
     }
-    for (i = N_FRAMES / 4; i < N_FRAMES / 2; i++) {
+    for (int i = N_FRAMES / 4; i < N_FRAMES / 2; i++) {
       zsteps[i] = -granular + (i - double(N_FRAMES) / 4.0) * zstep;
     }
-    for (i = N_FRAMES / 2; i < N_FRAMES; i++) {
+    for (int i = N_FRAMES / 2; i < N_FRAMES; i++) {
       zsteps[i] = -zsteps[i - N_FRAMES / 2];
     }
@@ -823 +830 @@
     cout << "Step z " << zstep << endl;
     cout << "Matrix3 ";
-    for (i = 0; i < N_FRAMES; i++)
+    for (int i = 0; i < N_FRAMES; i++)
       cout << zsteps[i] << " ";
     cout << endl;
@@ -830 +837 @@
     float zoomstop = 0.38;
     float zoomstep = (zoomstop / double (N_FRAMES-1));
-    for (i = 0; i < N_FRAMES; i++) {
+    for (int i = 0; i < N_FRAMES; i++) {
       zoomsteps[i] = i * zoomstep;
     }
@@ -837 +844 @@
     cout << "Step zoom " << zoomstep << endl;
     cout << "Matrix4 ";
-    for (i = 0; i < N_FRAMES; i++)
+    for (int i = 0; i < N_FRAMES; i++)
       cout << zoomsteps[i] << " ";
     cout << endl;
@@ -844 +851 @@
     float perspstart = 44.00;
     float perspstop = 21.00;
-    for (i = 0; i < N_FRAMES; i++) {
+    for (int i = 0; i < N_FRAMES; i++) {
       perspsteps[i] = (cos(i*M_PI/(double(N_FRAMES)*2.0)))*(perspstart - perspstop)+perspstop;
     }
@@ -850 +857 @@
     // cout << "Step persp " << perspstep << endl;
     cout << "Matrix5 ";
-    for (i = 0; i < N_FRAMES; i++)
+    for (int i = 0; i < N_FRAMES; i++)
       cout << perspsteps[i] << " ";
     cout << endl;
@@ -857 +864 @@
     float perspcstart = 44.00;
     float perspcstop = 30.00;
-    for (i = 0; i < N_FRAMES; i++) {
+    for (int i = 0; i < N_FRAMES; i++) {
       perspstepsc[i] = (1.0+cos(i*M_PI/double(N_FRAMES)))/2.0*(perspcstart - perspcstop)+perspcstop;
     }
 #ifndef NDEBUG
     cout << "Matrix6 ";
-    for (i = 0; i < N_FRAMES; i++)
+    for (int i = 0; i < N_FRAMES; i++)
       cout << perspstepsc[i] << " ";
     cout << endl;
@@ -1039 +1046 @@
       glNewList(cube_faces+i,GL_COMPILE);
       glBegin(GL_QUADS);
-      glMultiTexCoord2f(GL_TEXTURE0_ARB,(1.0 - mapping[i][4]) * tex_width,
-                        mapping[i][5] * tex_height);
+      if(i<4)
+        glMultiTexCoord2f(GL_TEXTURE0_ARB,(1.0 - mapping[i][4]) * tex_width,
+                          mapping[i][5] * tex_height);
       glVertex3fv(&v[faces[i][0]][0]);
       
-      glMultiTexCoord2f(GL_TEXTURE0_ARB,(1.0 - mapping[i][6]) * tex_width,
-                        mapping[i][7] * tex_height);
+      if(i<4)
+        glMultiTexCoord2f(GL_TEXTURE0_ARB,(1.0 - mapping[i][6]) * tex_width,
+                          mapping[i][7] * tex_height);
       glVertex3fv(&v[faces[i][1]][0]);
       
-      glMultiTexCoord2f(GL_TEXTURE0_ARB,(1.0 - mapping[i][0]) * tex_width,
-                        mapping[i][1] * tex_height);
+      if(i<4)
+        glMultiTexCoord2f(GL_TEXTURE0_ARB,(1.0 - mapping[i][0]) * tex_width,
+                          mapping[i][1] * tex_height);
       glVertex3fv(&v[faces[i][2]][0]);
       
-      glMultiTexCoord2f(GL_TEXTURE0_ARB,(1.0 - mapping[i][2]) * tex_width,
-                        mapping[i][3] * tex_height);
+      if(i<4)
+        glMultiTexCoord2f(GL_TEXTURE0_ARB,(1.0 - mapping[i][2]) * tex_width,
+                          mapping[i][3] * tex_height);
       glVertex3fv(&v[faces[i][3]][0]);
       glEnd();
@@ -1081 +1092 @@
                       textures[texmap[2]]);
       } else if (i <= 3) {
+        glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE);
         glDisable(GL_TEXTURE_RECTANGLE_ARB);
-        glColor4f(0.4, 0.0, 0.0, 1.0);
+        glColor4f(top_color[0], top_color[1], top_color[2], top_color[4]);
       } else {
+        glColorMaterial(GL_FRONT, GL_AMBIENT_AND_DIFFUSE);
         glDisable(GL_TEXTURE_RECTANGLE_ARB);
-        glColor4f(1.0, 1.0, 1.0, 1.0);
+        glColor4f(top_color[0], top_color[1], top_color[2], top_color[4]);
       }
       glPolygonMode(GL_FRONT, GL_FILL);
@@ -1096 +1109 @@
 GLfloat
 pdfcube::n[6][3] = {
-  {0.0, 0.0, -1.0}
-  , {1.0, 0.0, 0.0}
-  , {0.0, 0.0, 1.0}
-  , {-1.0, 0.0, 0.0}
-  ,
-  {0.0, 1.0, 0.0}
-  , {0.0, -1.0, 0.0}
+  {0.0, 0.0, -1.0}, 
+  {1.0, 0.0, 0.0}, 
+  {0.0, 0.0, 1.0}, 
+  {-1.0, 0.0, 0.0},
+  {0.0, 1.0, 0.0},
+  {0.0, -1.0, 0.0}
 };
 //bcube faces
 GLint
 pdfcube::faces[6][4] = {
-  {7, 4, 0, 3}
-  , {7, 6, 5, 4}
-  , {5, 6, 2, 1}
-  , {0, 1, 2, 3}
-  ,
-  {3, 2, 6, 7}
-  , {4, 5, 1, 0}
+  {7, 4, 0, 3},
+  {7, 6, 5, 4},
+  {5, 6, 2, 1},
+  {0, 1, 2, 3},
+  {3, 2, 6, 7},
+  {4, 5, 1, 0}
 };
 // face mapping
@@ -1133 +1144 @@
 
 // the pdf-cube
-pdfcube *
-pc;
+pdfcube* pc;
 
 //////////////////////////////////////////////////////////////////////////
@@ -1827 +1837 @@
 //////////////////////////////////////////////////////////////////////////
 // Main function: should we use getopts? (who doesn't?)
+// (update: we do, let's use boost::program_options ;))
 
 int
 main(int argc, char *argv[])
 {
+
+  po::options_description opts("Available options");
+
+  opts.add_options()
+    ("help,h", 
+     "This help message.")
+    ("bgcolor,b", po::value<std::string>(),
+     "Background color is 'r,g,b' with real values between 0.0 and 1.0, no spaces.")
+    ("top-color,t", po::value<std::string>(),
+     "Cube top color in 'r,g,b' format again with reals in [0,1].")
+    ("transitions,c", po::value<std::vector<int> >()->multitoken(), 
+     "Pages at wich to do a cube transition by default eg. 2 4 7\nMust be the last option on the command line.")
+    ("input-file,i", po::value<std::string>(), "PDF file to show.")
+    ("no-fullscreen,n", 
+     "Don't activate full-screen mode by default.");
+
+  po::positional_options_description p;
+  p.add("input-file", -1);
+
+  po::variables_map vm;
+  po::store(po::command_line_parser(argc, argv).
+            options(opts).positional(p).run(), vm);
+  po::notify(vm);
+
+  string input_file;
+
+  if(vm.count("help")) {
+    cout << endl << "PDFCube 0.0.3" << endl;
+    cout << "=============" << endl;
+    cout << "Copyright (C) 2006-2008 Mirko Maischberger <mirko.maischberger@gmail.com>" << endl;
+    cout << "                   2008 Karol Sokolowski   <sokoow@gmail.com>" <<  endl << endl;
+    cout << opts << endl;
+    cout << endl;
+    cout << "Usage examples:" << endl;
+    cout << "  $ pdfcube presentation.pdf" << endl;
+    cout << "  $ pdfcube presentation.pdf --bgcolor 0,0,0 --top-color 0.6,0.2,0.2 --transitions 1 5 7"
+         << endl << endl << endl;
+    return 0;
+  }
+
+  if (vm.count("input-file")) {
+    input_file = vm["input-file"].as<std::string>();
+  } else {
+    cerr << "You must specify an input PDF file on the command line." << endl;
+    exit(1);
+  }
+
+  if(vm.count("bgcolor")) {
+    vector<double> cc; 
+    string v;
+    std::istringstream iss(vm["bgcolor"].as<std::string>());
+    while(getline(iss, v, ',')) cc.push_back(::atof(v.c_str())); 
+    if(cc.size() != 3)
+      {
+        cerr << "You should specify 3 values for background-color." << endl;
+        exit(1);
+      }
+    std::copy(&cc[0], &cc[3], &clear_color[0]);
+  }
+
+  if(vm.count("top-color")) {
+    vector<double> tc; 
+    string v;
+    std::istringstream iss(vm["top-color"].as<std::string>());
+    while(getline(iss, v, ',')) tc.push_back(::atof(v.c_str())); 
+    if(tc.size() != 3)
+      {
+        cerr << "You should specify 3 values for top-color." << endl;
+        exit(1);
+      }
+    std::copy(&tc[0], &tc[3], &top_color[0]);
+  }
+
   GtkWidget *
     window;
@@ -1845 +1929 @@
   glconfig = configure_gl();
 
-  if (argc < 2) {
-    perror("usage: pdfcube file_uri [cube_page ...]");
-    exit(1);
-  }
   gchar *
-    absoluteFileName = get_absolute_file_name(argv[1]);
+    absoluteFileName = get_absolute_file_name(input_file.c_str());
   gchar *
     filename_uri = g_filename_to_uri(absoluteFileName, NULL, NULL);
   g_free(absoluteFileName);
   if (NULL == filename_uri) {
-    cerr << "Errore nel nome del file" << endl;
+    cerr << "File name error." << endl;
   }
   PopplerDocument *
@@ -1861 +1941 @@
 
   if (document == NULL) {
-    perror("invaild pdf file");
-    exit(2);
+    perror("Invaild PDF file.");
+    exit(1);
   }
 
@@ -1868 +1948 @@
 
   page_transition = new bool[pc->pages()];
-
-  for (int ii = 0; ii < pc->pages(); ii++) {
-    page_transition[ii] = false;
-  }
-
-  for (int ii = 2; ii < argc; ii++) {
-    page_transition[atoi(argv[ii])] = true;
+  if(vm.count("transitions")) {
+    vector<int> tr = vm["transitions"].as<std::vector<int> >();
+    for(int ii = 0; ii < pc->pages(); ii++) {
+      page_transition[ii] = false;
+    }
+    for (std::vector<int>::iterator ii = tr.begin(); ii != tr.end(); ++ii) {
+      if(*ii > pc->pages()) 
+        cerr << "Transision after end of file." << endl;
+      else
+        page_transition[*ii-1] = true;
+    }
   }
 
   /* Create and show the application window. */
   window = create_window(glconfig);
-
-  if (fullscreen)
+  
+  if(vm.count("no-fullscreen"))
+    fullscreen = FALSE;
+  else
+    fullscreen = TRUE;
+
+  if(fullscreen)
     gtk_window_fullscreen((GtkWindow *) (window));
-
+  
   gtk_widget_show(window);