[Top][All Lists]
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index]
[Nel] GNU/Linux patches
|
From: |
Loic Dachary |
|
Subject: |
[Nel] GNU/Linux patches |
|
Date: |
Wed, 20 Mar 2002 16:13:20 +0100 |
Hi,
Here are the current patches I have against todays CVS tree.
I understand that some of them were already applied, here is a
description of the others:
- FREETYPE_CFLAGS first so that freetype1 and freetype2 installed
are not confused with each other
- AM_PATH_OPENAL last otherwise it may fail to be detected
(complex case involving sdl + xf86vidmode)
- spurious inlines (again ;-) in driver_opengl_material.cpp and
driver_opengl_texture.cpp that triggers problems when compiling
in debug mode
- additional client.cfg.in so that GNU/Linux installations know
where to fetch the data
- create nelns/README in bootstrap so that make dist does not
bark
Index: nel/acinclude.m4
===================================================================
RCS file: /home/cvsroot/code/nel/acinclude.m4,v
retrieving revision 1.9
diff -u -r1.9 acinclude.m4
--- nel/acinclude.m4 19 Mar 2002 17:42:48 -0000 1.9
+++ nel/acinclude.m4 20 Mar 2002 14:44:44 -0000
@@ -659,7 +659,7 @@
dnl Checking the FreeType 2 instalation
_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CXXFLAGS $FREETYPE_CFLAGS"
+CPPFLAGS=" $FREETYPE_CFLAGS $CXXFLAGS"
AC_MSG_CHECKING(for FreeType version = 2)
Index: nel/configure.in
===================================================================
RCS file: /home/cvsroot/code/nel/configure.in,v
retrieving revision 1.60
diff -u -r1.60 configure.in
--- nel/configure.in 19 Mar 2002 17:42:48 -0000 1.60
+++ nel/configure.in 20 Mar 2002 14:44:44 -0000
@@ -222,12 +222,6 @@
dnl ====================================================================
-dnl OpenAL
-
-AM_PATH_OPENAL($enable_sound)
-
-
-dnl ====================================================================
dnl Python
AM_PATH_PYTHON(1.5,$enable_ai)
@@ -265,6 +259,11 @@
dnl Check for XF86VidMode extension (-lXxf86vm)
AM_PATH_XF86VIDMODE
+
+dnl ====================================================================
+dnl OpenAL
+
+AM_PATH_OPENAL($enable_sound)
dnl Arrange for the include directory to be in the search path even when
dnl build is done outside the source tree
Index: nel/src/3d/Makefile.am
===================================================================
RCS file: /home/cvsroot/code/nel/src/3d/Makefile.am,v
retrieving revision 1.72
diff -u -r1.72 Makefile.am
--- nel/src/3d/Makefile.am 19 Mar 2002 17:42:48 -0000 1.72
+++ nel/src/3d/Makefile.am 20 Mar 2002 14:44:50 -0000
@@ -208,6 +208,7 @@
patch.h \
patchuv_locator.cpp \
patchuv_locator.h \
+ patch_lightmap.cpp \
patch_noise.cpp \
patch_rdr_pass.cpp \
patch_rdr_pass.h \
@@ -439,6 +440,8 @@
vegetable_def.h \
vegetable_instance_group.cpp \
vegetable_instance_group.h \
+ vegetable_light_ex.cpp \
+ vegetable_light_ex.h \
vegetable_manager.cpp \
vegetable_manager.h \
vegetable_quadrant.cpp \
Index: nel/src/3d/mesh_mrm.cpp
===================================================================
RCS file: /home/cvsroot/code/nel/src/3d/mesh_mrm.cpp,v
retrieving revision 1.27
diff -u -r1.27 mesh_mrm.cpp
--- nel/src/3d/mesh_mrm.cpp 14 Mar 2002 18:12:22 -0000 1.27
+++ nel/src/3d/mesh_mrm.cpp 20 Mar 2002 14:44:50 -0000
@@ -861,7 +861,7 @@
// Is this mesh skinned?? true only if mesh is skinned, skeletonmodel
is not NULL, and isSkinApply().
bool bMorphApplied = _MeshMorpher.BlendShapes.size() > 0;
bool bSkinApplied = _Skinned && mi->isSkinApply() && skeleton;
- bool useTangentSpace = _MeshVertexProgram ||
!_MeshVertexProgram->needTangentSpace();
+ bool useTangentSpace = _MeshVertexProgram &&
!_MeshVertexProgram->needTangentSpace();
if (bMorphApplied)
{
Index: nel/src/3d/vegetable_light_ex.cpp
===================================================================
RCS file: /home/cvsroot/code/nel/src/3d/vegetable_light_ex.cpp,v
retrieving revision 1.2
diff -u -r1.2 vegetable_light_ex.cpp
--- nel/src/3d/vegetable_light_ex.cpp 15 Mar 2002 16:10:44 -0000 1.2
+++ nel/src/3d/vegetable_light_ex.cpp 20 Mar 2002 14:44:50 -0000
@@ -42,7 +42,8 @@
// get the attenuation
uint att= PointLightFactor[i];
// modulate the color with it.
- Color[i].modulateFromui(pl->getDiffuse(), att);
+ NLMISC::CRGBA diffuse = pl->getDiffuse();
+ Color[i].modulateFromui(diffuse, att);
}
}
Index: nel/src/3d/driver/opengl/driver_opengl_material.cpp
===================================================================
RCS file:
/home/cvsroot/code/nel/src/3d/driver/opengl/driver_opengl_material.cpp,v
retrieving revision 1.59
diff -u -r1.59 driver_opengl_material.cpp
--- nel/src/3d/driver/opengl/driver_opengl_material.cpp 14 Mar 2002 18:28:20
-0000 1.59
+++ nel/src/3d/driver/opengl/driver_opengl_material.cpp 20 Mar 2002 14:44:51
-0000
@@ -177,7 +177,7 @@
}
}
-inline void CDriverGL::disableUserTextureMatrix()
+void CDriverGL::disableUserTextureMatrix()
{
if (_UserTexMatEnabled != 0)
{
@@ -1065,7 +1065,7 @@
// ***************************************************************************
-inline CTextureCube *CDriverGL::getSpecularCubeMap(uint exp)
+CTextureCube *CDriverGL::getSpecularCubeMap(uint exp)
{
const uint SpecularMapSize = 32;
const uint SpecularMapSizeHighExponent = 64;
Index: nel/src/3d/driver/opengl/driver_opengl_texture.cpp
===================================================================
RCS file:
/home/cvsroot/code/nel/src/3d/driver/opengl/driver_opengl_texture.cpp,v
retrieving revision 1.50
diff -u -r1.50 driver_opengl_texture.cpp
--- nel/src/3d/driver/opengl/driver_opengl_texture.cpp 14 Mar 2002 18:28:20
-0000 1.50
+++ nel/src/3d/driver/opengl/driver_opengl_texture.cpp 20 Mar 2002 14:44:51
-0000
@@ -822,7 +822,7 @@
// ***************************************************************************
-inline void CDriverGL::forceActivateTexEnvColor(uint stage,
NLMISC::CRGBA col)
+void CDriverGL::forceActivateTexEnvColor(uint stage, NLMISC::CRGBA
col)
{
static const float OO255= 1.0f/255;
_CurrentTexEnv[stage].ConstantColor= col;
Index: nel/src/net/transport_class.cpp
===================================================================
RCS file: /home/cvsroot/code/nel/src/net/transport_class.cpp,v
retrieving revision 1.5
diff -u -r1.5 transport_class.cpp
--- nel/src/net/transport_class.cpp 14 Mar 2002 13:48:12 -0000 1.5
+++ nel/src/net/transport_class.cpp 20 Mar 2002 14:44:53 -0000
@@ -85,7 +85,7 @@
void CTransportClass::displayDifferentClass (uint8 sid, const string
&className, const vector<CRegisteredBaseProp> &otherClass, const
vector<CRegisteredBaseProp *> &myClass)
{
- nlinfo ("Service with sid %u send me the TransportClass '%s' with
differents properties:", sid, className);
+ nlinfo ("Service with sid %u send me the TransportClass '%s' with
differents properties:", sid, className.c_str());
uint i;
nlinfo (" My local TransportClass is:");
for (i = 0; i < myClass.size(); i++)
Index: nelns/acinclude.m4
===================================================================
RCS file: /home/cvsroot/code/nelns/acinclude.m4,v
retrieving revision 1.9
diff -u -r1.9 acinclude.m4
--- nelns/acinclude.m4 19 Mar 2002 17:42:48 -0000 1.9
+++ nelns/acinclude.m4 20 Mar 2002 14:45:07 -0000
@@ -659,7 +659,7 @@
dnl Checking the FreeType 2 instalation
_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CXXFLAGS $FREETYPE_CFLAGS"
+CPPFLAGS=" $FREETYPE_CFLAGS $CXXFLAGS"
AC_MSG_CHECKING(for FreeType version = 2)
Index: nelns/bootstrap
===================================================================
RCS file: /home/cvsroot/code/nelns/bootstrap,v
retrieving revision 1.2
diff -u -r1.2 bootstrap
--- nelns/bootstrap 29 Jun 2001 16:22:30 -0000 1.2
+++ nelns/bootstrap 20 Mar 2002 14:45:07 -0000
@@ -10,6 +10,10 @@
then
touch ChangeLog
fi
+if test ! -f README
+then
+ touch README
+fi
aclocal \
&& autoheader \
Index: snowballs2/acinclude.m4
===================================================================
RCS file: /home/cvsroot/code/snowballs2/acinclude.m4,v
retrieving revision 1.9
diff -u -r1.9 acinclude.m4
--- snowballs2/acinclude.m4 19 Mar 2002 17:42:48 -0000 1.9
+++ snowballs2/acinclude.m4 20 Mar 2002 14:45:12 -0000
@@ -659,7 +659,7 @@
dnl Checking the FreeType 2 instalation
_CPPFLAGS="$CPPFLAGS"
-CPPFLAGS="$CXXFLAGS $FREETYPE_CFLAGS"
+CPPFLAGS=" $FREETYPE_CFLAGS $CXXFLAGS"
AC_MSG_CHECKING(for FreeType version = 2)
client.cfg.in
Description: Binary data
--
Loic Dachary http://www.dachary.org/ address@hidden
12 bd Magenta http://www.senga.org/ address@hidden
75010 Paris T: 33 1 42 45 07 97 address@hidden
GPG Public Key: http://www.dachary.org/loic/gpg.txt
- [Nel] GNU/Linux patches,
Loic Dachary <=