goat3d

changeset 93:07c0ec4a410d

[goatview] line endings fix and missing post_redisplay in load_scene
author John Tsiombikas <nuclear@member.fsf.org>
date Sun, 18 May 2014 06:20:20 +0300
parents ae6c5941faac
children 21319e71117f
files goatview/src/goatview.cc goatview/src/opengl.c goatview/src/opengl.h
diffstat 3 files changed, 41 insertions(+), 40 deletions(-) [+]
line diff
     1.1 --- a/goatview/src/goatview.cc	Sun May 18 01:19:10 2014 +0300
     1.2 +++ b/goatview/src/goatview.cc	Sun May 18 06:20:20 2014 +0300
     1.3 @@ -93,6 +93,7 @@
     1.4  	treeview->resizeColumnToContents(0);
     1.5  
     1.6  	sdata = scene_model;	// set the global sdata ptr
     1.7 +	post_redisplay();
     1.8  	return true;
     1.9  }
    1.10  
    1.11 @@ -574,7 +575,7 @@
    1.12  	QMessageBox::information(this, "About GoatView", about_str);
    1.13  }
    1.14  
    1.15 -
    1.16 +
    1.17  static int next_pow2(int x)
    1.18  {
    1.19  	x--;
     2.1 --- a/goatview/src/opengl.c	Sun May 18 01:19:10 2014 +0300
     2.2 +++ b/goatview/src/opengl.c	Sun May 18 06:20:20 2014 +0300
     2.3 @@ -1,8 +1,8 @@
     2.4 -#include <string.h>
     2.5 -#include "opengl.h"
     2.6 -
     2.7 -int init_opengl(void)
     2.8 -{
     2.9 -	glewInit();
    2.10 -	return 0;
    2.11 -}
    2.12 +#include <string.h>
    2.13 +#include "opengl.h"
    2.14 +
    2.15 +int init_opengl(void)
    2.16 +{
    2.17 +	glewInit();
    2.18 +	return 0;
    2.19 +}
     3.1 --- a/goatview/src/opengl.h	Sun May 18 01:19:10 2014 +0300
     3.2 +++ b/goatview/src/opengl.h	Sun May 18 06:20:20 2014 +0300
     3.3 @@ -1,31 +1,31 @@
     3.4 -#ifndef OPENGL_H_
     3.5 -#define OPENGL_H_
     3.6 -
     3.7 -#include <GL/glew.h>
     3.8 -#define QT_NO_OPENGL_ES_2
     3.9 -
    3.10 -#ifdef WIN32
    3.11 -#define WIN32_LEAN_AND_MEAN 1
    3.12 -#include <windows.h>
    3.13 -#undef min
    3.14 -#endif
    3.15 -
    3.16 -#ifdef __APPLE__
    3.17 -#include <OpenGL/gl.h>
    3.18 -#include <OpenGL/glu.h>
    3.19 -#else
    3.20 -#include <GL/gl.h>
    3.21 -#include <GL/glu.h>
    3.22 -#endif
    3.23 -
    3.24 -#ifdef __cplusplus
    3.25 -extern "C" {
    3.26 -#endif
    3.27 -
    3.28 -int init_opengl(void);
    3.29 -
    3.30 -#ifdef __cplusplus
    3.31 -}
    3.32 -#endif
    3.33 -
    3.34 -#endif	/* OPENGL_H_ */
    3.35 +#ifndef OPENGL_H_
    3.36 +#define OPENGL_H_
    3.37 +
    3.38 +#include <GL/glew.h>
    3.39 +#define QT_NO_OPENGL_ES_2
    3.40 +
    3.41 +#ifdef WIN32
    3.42 +#define WIN32_LEAN_AND_MEAN 1
    3.43 +#include <windows.h>
    3.44 +#undef min
    3.45 +#endif
    3.46 +
    3.47 +#ifdef __APPLE__
    3.48 +#include <OpenGL/gl.h>
    3.49 +#include <OpenGL/glu.h>
    3.50 +#else
    3.51 +#include <GL/gl.h>
    3.52 +#include <GL/glu.h>
    3.53 +#endif
    3.54 +
    3.55 +#ifdef __cplusplus
    3.56 +extern "C" {
    3.57 +#endif
    3.58 +
    3.59 +int init_opengl(void);
    3.60 +
    3.61 +#ifdef __cplusplus
    3.62 +}
    3.63 +#endif
    3.64 +
    3.65 +#endif	/* OPENGL_H_ */