svn merge https://svn.blender.org/svnroot/bf-blender/trunk/blender -r12987:17416 Issues: * GHOST/X11 had conflicting changes. Some code was added in 2.5, which was later added in trunk also, but reverted partially, specifically revision 16683. I have left out this reversion in the 2.5 branch since I think it is needed there. http://projects.blender.org/plugins/scmsvn/viewcvs.php?view=rev&root=bf-blender&revision=16683 * Scons had various conflicting changes, I decided to go with trunk version for everything except priorities and some library renaming. * In creator.c, there were various fixes and fixes for fixes related to the -w -W and -p options. In 2.5 -w and -W is not coded yet, and -p is done differently. Since this is changed so much, and I don't think those fixes would be needed in 2.5, I've left them out. * Also in creator.c: there was code for a python bugfix where the screen was not initialized when running with -P. The code that initializes the screen there I had to disable, that can't work in 2.5 anymore but left it commented as a reminder. Further I had to disable some new function calls. using src/ and python/, as was done already in this branch, disabled function calls: * bpath.c: error reporting * BME_conversions.c: editmesh conversion functions. * SHD_dynamic: disabled almost completely, there is no python/. * KX_PythonInit.cpp and Ketsji/ build files: Mathutils is not there, disabled. * text.c: clipboard copy call. * object.c: OB_SUPPORT_MATERIAL. * DerivedMesh.c and subsurf_ccg, stipple_quarttone. Still to be done: * Go over files and functions that were moved to a different location but could still use changes that were done in trunk.
		
			
				
	
	
		
			235 lines
		
	
	
		
			4.9 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
			
		
		
	
	
			235 lines
		
	
	
		
			4.9 KiB
		
	
	
	
		
			C++
		
	
	
	
	
	
| /**
 | |
|  * $Id$
 | |
|  * ***** BEGIN GPL LICENSE BLOCK *****
 | |
|  *
 | |
|  * 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; either version 2
 | |
|  * of the License, or (at your option) any later version.
 | |
|  *
 | |
|  * 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., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
 | |
|  *
 | |
|  * The Original Code is Copyright (C) 2001-2002 by NaN Holding BV.
 | |
|  * All rights reserved.
 | |
|  *
 | |
|  * The Original Code is: all of this file.
 | |
|  *
 | |
|  * Contributor(s): none yet.
 | |
|  *
 | |
|  * ***** END GPL LICENSE BLOCK *****
 | |
|  */
 | |
| 
 | |
| #include "KX_BlenderGL.h"
 | |
| 
 | |
| #ifdef HAVE_CONFIG_H
 | |
| #include <config.h>
 | |
| #endif
 | |
| 
 | |
| /* 
 | |
|  * This little block needed for linking to Blender... 
 | |
|  */
 | |
| #ifdef WIN32
 | |
| #include "BLI_winstuff.h"
 | |
| #endif
 | |
| 
 | |
| #include <stdlib.h>
 | |
| #include <string.h>
 | |
| 
 | |
| #include "BMF_Api.h"
 | |
| 
 | |
| #include "BIF_gl.h"
 | |
| 
 | |
| #include "BL_Material.h" // MAXTEX
 | |
| 
 | |
| /* Data types encoding the game world: */
 | |
| #include "DNA_object_types.h"
 | |
| #include "DNA_scene_types.h"
 | |
| #include "DNA_screen_types.h"
 | |
| #include "DNA_camera_types.h"
 | |
| #include "DNA_world_types.h"
 | |
| #include "DNA_mesh_types.h"
 | |
| #include "DNA_meshdata_types.h"
 | |
| #include "DNA_image_types.h"
 | |
| #include "DNA_view3d_types.h"
 | |
| #include "DNA_material_types.h"
 | |
| 
 | |
| #include "BKE_global.h"
 | |
| #include "BKE_bmfont.h"
 | |
| #include "BKE_image.h"
 | |
| 
 | |
| extern "C" {
 | |
| //XXX #include "BDR_drawmesh.h"
 | |
| //XXX #include "BIF_mywindow.h"
 | |
| //XXX #include "BIF_toolbox.h"
 | |
| //XXX #include "BIF_graphics.h" /* For CURSOR_NONE CURSOR_WAIT CURSOR_STD */
 | |
| 
 | |
| }
 | |
| 
 | |
| /* end of blender block */
 | |
| 
 | |
| /* was in drawmesh.c */
 | |
| void spack(unsigned int ucol)
 | |
| {
 | |
| 	char *cp= (char *)&ucol;
 | |
|         
 | |
| 	glColor3ub(cp[3], cp[2], cp[1]);
 | |
| }
 | |
| 
 | |
| void BL_warp_pointer(int x,int y)
 | |
| {
 | |
| 	//XXX warp_pointer(x,y);
 | |
| }
 | |
| 
 | |
| void BL_SwapBuffers()
 | |
| {
 | |
| 	//XXX myswapbuffers();
 | |
| }
 | |
| 
 | |
| void DisableForText()
 | |
| {
 | |
| 	if(glIsEnabled(GL_BLEND)) glDisable(GL_BLEND);
 | |
| 	if(glIsEnabled(GL_ALPHA_TEST)) glDisable(GL_ALPHA_TEST);
 | |
| 
 | |
| 	if(glIsEnabled(GL_LIGHTING)) {
 | |
| 		glDisable(GL_LIGHTING);
 | |
| 		glDisable(GL_COLOR_MATERIAL);
 | |
| 	}
 | |
| 
 | |
| 	if(GLEW_ARB_multitexture) {
 | |
| 		for(int i=0; i<MAXTEX; i++) {
 | |
| 			glActiveTextureARB(GL_TEXTURE0_ARB+i);
 | |
| 
 | |
| 			if(GLEW_ARB_texture_cube_map)
 | |
| 				if(glIsEnabled(GL_TEXTURE_CUBE_MAP_ARB))
 | |
| 					glDisable(GL_TEXTURE_CUBE_MAP_ARB);
 | |
| 
 | |
| 			if(glIsEnabled(GL_TEXTURE_2D))
 | |
| 				glDisable(GL_TEXTURE_2D);
 | |
| 		}
 | |
| 
 | |
| 		glActiveTextureARB(GL_TEXTURE0_ARB);
 | |
| 	}
 | |
| 	else {
 | |
| 		if(GLEW_ARB_texture_cube_map)
 | |
| 			if(glIsEnabled(GL_TEXTURE_CUBE_MAP_ARB))
 | |
| 				glDisable(GL_TEXTURE_CUBE_MAP_ARB);
 | |
| 
 | |
| 		if(glIsEnabled(GL_TEXTURE_2D))
 | |
| 			glDisable(GL_TEXTURE_2D);
 | |
| 	}
 | |
| }
 | |
| 
 | |
| void BL_print_gamedebug_line(char* text, int xco, int yco, int width, int height)
 | |
| {	
 | |
| 	/* gl prepping */
 | |
| 	DisableForText();
 | |
| 	//glDisable(GL_TEXTURE_2D);
 | |
| 
 | |
| 	glMatrixMode(GL_PROJECTION);
 | |
| 	glPushMatrix();
 | |
| 	glLoadIdentity();
 | |
| 	
 | |
| 	glOrtho(0, width,
 | |
| 			0, height, 0, 1);
 | |
| 	
 | |
| 	glMatrixMode(GL_MODELVIEW);
 | |
| 	glPushMatrix();
 | |
| 	glLoadIdentity();
 | |
| 	glMatrixMode(GL_TEXTURE);
 | |
| 	glPushMatrix();
 | |
| 	glLoadIdentity();
 | |
| 
 | |
| 	/* the actual drawing */
 | |
| 	glColor3ub(255, 255, 255);
 | |
| 	glRasterPos2s(xco, height-yco);
 | |
| 	BMF_DrawString(G.fonts, text);
 | |
| 
 | |
| 	glMatrixMode(GL_TEXTURE);
 | |
| 	glPopMatrix();
 | |
| 	glMatrixMode(GL_PROJECTION);
 | |
| 	glPopMatrix();
 | |
| 	glMatrixMode(GL_MODELVIEW);
 | |
| 	glPopMatrix();
 | |
| 	glEnable(GL_DEPTH_TEST);
 | |
| }
 | |
| 
 | |
| void BL_print_gamedebug_line_padded(char* text, int xco, int yco, int width, int height)
 | |
| {
 | |
| 	/* This is a rather important line :( The gl-mode hasn't been left
 | |
| 	 * behind quite as neatly as we'd have wanted to. I don't know
 | |
| 	 * what cause it, though :/ .*/
 | |
| 	DisableForText();
 | |
| 	//glDisable(GL_TEXTURE_2D);
 | |
| 
 | |
| 	glMatrixMode(GL_PROJECTION);
 | |
| 	glPushMatrix();
 | |
| 	glLoadIdentity();
 | |
| 	
 | |
| 	glOrtho(0, width,
 | |
| 			0, height, 0, 1);
 | |
| 	
 | |
| 	glMatrixMode(GL_MODELVIEW);
 | |
| 	glPushMatrix();
 | |
| 	glLoadIdentity();
 | |
| 	glMatrixMode(GL_TEXTURE);
 | |
| 	glPushMatrix();
 | |
| 	glLoadIdentity();
 | |
| 
 | |
| 	/* draw in black first*/
 | |
| 	glColor3ub(0, 0, 0);
 | |
| 	glRasterPos2s(xco+1, height-yco-1);
 | |
| 	BMF_DrawString(G.fonts, text);
 | |
| 	glColor3ub(255, 255, 255);
 | |
| 	glRasterPos2s(xco, height-yco);
 | |
| 	BMF_DrawString(G.fonts, text);
 | |
| 
 | |
| 	glMatrixMode(GL_TEXTURE);
 | |
| 	glPopMatrix();
 | |
| 	glMatrixMode(GL_PROJECTION);
 | |
| 	glPopMatrix();
 | |
| 	glMatrixMode(GL_MODELVIEW);
 | |
| 	glPopMatrix();
 | |
| 	glEnable(GL_DEPTH_TEST);
 | |
| }
 | |
| 
 | |
| void BL_HideMouse()
 | |
| {
 | |
| 	//XXX set_cursor(CURSOR_NONE);
 | |
| }
 | |
| 
 | |
| 
 | |
| void BL_WaitMouse()
 | |
| {
 | |
| 	//XXX set_cursor(CURSOR_WAIT);
 | |
| }
 | |
| 
 | |
| 
 | |
| void BL_NormalMouse()
 | |
| {
 | |
| 	//XXX set_cursor(CURSOR_STD);
 | |
| }
 | |
| #define MAX_FILE_LENGTH 512
 | |
| 
 | |
| 
 | |
| void BL_MakeScreenShot(struct ScrArea *area, const char* filename)
 | |
| {
 | |
| 	char copyfilename[MAX_FILE_LENGTH];
 | |
| 	strcpy(copyfilename,filename);
 | |
| 
 | |
| 	// filename read - only
 | |
| 	
 | |
| 	  /* XXX will need to change at some point */
 | |
| 	//XXX BIF_screendump(0);
 | |
| 
 | |
| 	// write+read filename
 | |
| 	//XXX write_screendump((char*) copyfilename);
 | |
| }
 | |
| 
 |