From b8f4a75ae37736a5c39b0319d3b05ad4d72e09f3 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Rafa=C5=82=20D=C5=82ugo=C5=82=C4=99cki?= Date: Wed, 22 Jan 2014 21:03:53 +0100 Subject: [PATCH] Added missing files. --- Makefile.am | 1 + src/graphics/family.h | 24 ++++++++++++++++++++++ src/graphics/individual.c | 40 +++++++++++++++++++++++++++++++++++++ src/graphics/individual.h | 25 +++++++++++++++++++++++ src/viewport/drawing_area.c | 5 ----- 5 files changed, 90 insertions(+), 5 deletions(-) create mode 100644 src/graphics/family.h create mode 100644 src/graphics/individual.c create mode 100644 src/graphics/individual.h diff --git a/Makefile.am b/Makefile.am index eec6ff5..a1b977a 100644 --- a/Makefile.am +++ b/Makefile.am @@ -40,6 +40,7 @@ bin_familia_SOURCES = \ src/storage/family.c \ src/storage/positions.c \ src/math/positions.c \ + src/graphics/individual.c \ src/gedcom/familia_gedcom.c \ src/memory_stack.c \ src/gui.c \ diff --git a/src/graphics/family.h b/src/graphics/family.h new file mode 100644 index 0000000..f084657 --- /dev/null +++ b/src/graphics/family.h @@ -0,0 +1,24 @@ +/**************************************************************************** + * Familia Lignum - Genealogical program * + * Copyright (C) 2011-2012 Rafał Długołęcki * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; version 2 of the License. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with this program; if not, write to the Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * + * * + ****************************************************************************/ + +#ifndef _FAMILIA_GRAPHICS_FAMILY_H +#define _FAMILIA_GRAPHICS_FAMILY_H + + +#endif /* _FAMILIA_GRAPHICS_FAMILY_H */ diff --git a/src/graphics/individual.c b/src/graphics/individual.c new file mode 100644 index 0000000..0d837ab --- /dev/null +++ b/src/graphics/individual.c @@ -0,0 +1,40 @@ +/**************************************************************************** + * Familia Lignum - Genealogical program * + * Copyright (C) 2011-2012 Rafał Długołęcki * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; version 2 of the License. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with this program; if not, write to the Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * + * * + ****************************************************************************/ + +#ifndef _FAMILIA_GRAPHICS_INDIVIDUAL_H +#define _FAMILIA_GRAPHICS_INDIVIDUAL_H + +#include +#include + +#include "individual.h" + +void graphics_render_individual() { + GLUquadric* quad = NULL; + quad = gluNewQuadric(); + gluQuadricDrawStyle(quad, GLU_LINE); + + if (quad) { + gluSphere(quad, 1, 10, 10); + gluDeleteQuadric(quad); + quad = NULL; + } +} + +#endif /* _FAMILIA_GRAPHICS_INDIVIDUAL_H */ diff --git a/src/graphics/individual.h b/src/graphics/individual.h new file mode 100644 index 0000000..0061474 --- /dev/null +++ b/src/graphics/individual.h @@ -0,0 +1,25 @@ +/**************************************************************************** + * Familia Lignum - Genealogical program * + * Copyright (C) 2011-2012 Rafał Długołęcki * + * * + * This program is free software; you can redistribute it and/or modify * + * it under the terms of the GNU General Public License as published by * + * the Free Software Foundation; version 2 of the License. * + * * + * This program is distributed in the hope that it will be useful, * + * but WITHOUT ANY WARRANTY; without even the implied warranty of * + * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the * + * GNU General Public License for more details. * + * * + * You should have received a copy of the GNU General Public License along * + * with this program; if not, write to the Free Software Foundation, Inc., * + * 51 Franklin Street, Fifth Floor, Boston, MA 02110-1301 USA. * + * * + ****************************************************************************/ + +#ifndef _FAMILIA_GRAPHICS_INDIVIDUAL_H +#define _FAMILIA_GRAPHICS_INDIVIDUAL_H + +void graphics_render_individual(); + +#endif /* _FAMILIA_GRAPHICS_INDIVIDUAL_H */ diff --git a/src/viewport/drawing_area.c b/src/viewport/drawing_area.c index 9a89fad..9cb96b0 100644 --- a/src/viewport/drawing_area.c +++ b/src/viewport/drawing_area.c @@ -48,11 +48,6 @@ gboolean drawing_area_configure_event (GtkWidget *widget, GLfloat w; /* OpenGL widget height */ GLfloat h; - - /* Current page width */ - GLfloat width = 0; - /* Current page height */ - GLfloat height = 0; /* Aspect ratio */ GLfloat aspect = 0; -- 2.30.2