Commit Graph

202 Commits

Author SHA1 Message Date
Hans Lambermont
dcb83e27a2 - use SDL sound on FreeBSD too.
- add solid include path to unix common makefile ... this is not FreeBSD
  specific, so I'm a bit confused as this wasn't corrected before.
2004-04-30 17:50:48 +00:00
Kester Maddock
ccc0e30fff Enable doppler on platforms other than WIN32. 2004-04-17 01:14:35 +00:00
Nathan Letwory
c4a95ebcb3 Correct a project dependency.
SoundSystem depends on STR_*, but that was not checked, so you had to build twice to get all internal libraries built.
2004-04-16 21:34:23 +00:00
Stefan Gartner
837da93f19 enable openal support for os x and linux-powerpc
as there is a conflict between openal and sdl (when compiled with cdrom
support), i had to disable support for cd playing using sdl on os x
for the time being.
2004-04-14 13:00:36 +00:00
Joseph Gilbert
b7f718fb2c - Sets this as the active project for internal make 2004-04-11 12:59:32 +00:00
Ton Roosendaal
2f503f6d09 Bug fix #799 revisited
Now we're on the root of the problem. Ghost (OSX) didn't accept rawkeys
for the 1-2-...0 keys on a french keyboard. These have apparently different
symbols on it. (these silly french! :)
This commit intercepts the rawkeys in convertKey() call, and manually
makes sure theyre correctly mapped.

So: now french (spanish, etc) OSX users can finally use layer hotkeys! And
the popup menu shortcuts! :)

Tested & verified by Lukep. Merci!
2004-04-11 12:46:53 +00:00
Joseph Gilbert
b9659a072a - MSVC 6 compiler include paths update 2004-04-10 21:32:35 +00:00
Simon Clitherow
efe556f132 cleaning up MSVC 6 project files -- fixed a couple of stray *.obj
file paths.
2004-04-09 17:30:00 +00:00
Nathan Letwory
9dea66a835 Major update for Visual Studio .Net project files. Both Release and Debug modes have been sanitised (ie. use .lib instead of .a). This update also makes the structure similar to the msvc6 projectfiles.
The new blender.sln is now found in directory projectfiles_vc7\\blender.

Update to the INSTALL file will follow soon.
2004-04-07 18:17:37 +00:00
Kester Maddock
1a8deeb85b Fix only looped sounds play on platforms other than Windows/Apple. 2004-04-04 09:34:58 +00:00
Chris Want
dc2d6b035a Fixes to projectfiles:
* Added SDL CD stuff to Open AL project (/me lazy)
* Made ketsji project find the python headers
* Added noise stuff to python project
2004-04-03 23:46:33 +00:00
Chris Want
240b409f51 Converted all of the projectfiles to DOS text format
(half were DOS, half were UNIX).
2004-04-03 23:28:27 +00:00
Kester Maddock
2ccb9cf785 Added CD Audio support for OpenAL.
Updated Scons & Makefiles to cope
2004-04-02 13:15:18 +00:00
Nathan Letwory
98bed4ca32 - [SCONS] update to use the new csg script if you set the variable to true. I keep it to this file for the moment, since building this is not always successfull. So if you want to use this instead of the current method, set NEW_CSG in this file to true. 2004-03-09 18:21:28 +00:00
Nathan Letwory
5bd9534103 - [SCONS] SConscript for the new csg library 2004-03-09 18:19:53 +00:00
Kent Mein
9ed4436058 Updated the Sun ifdef's basically I standardized them so they
were all the same and make sure all platforms see them.

Kent
2004-03-06 19:32:33 +00:00
Kent Mein
6f195f084c Got rid of a cast to float which was causing a warning. (Used a temp
var instead)   return (float)atof(something);

is now   float x=atof(something); return x;

There is still another one(warning)in this file but hey its a start.

Kent
2004-03-06 17:04:52 +00:00
Nathan Letwory
8771b2eb98 - [SCons] Take out redundant 'defines' usage. _LIB is not needed for SoundSystem. This stops SCons from complaining on Windows when building. 2004-03-02 21:34:41 +00:00
Nathan Letwory
af2c3a4c10 Added OpenBSD3.x to the SCons build system. 2004-03-02 08:40:19 +00:00
Michel Selten
70a4ead0ae SCons updates
* Blender static now links. By default this option is disabled on all
  platforms. Simply set the option in config.opts to 'true'.
* Added the following flags to config.opts:
  - HOST_CC.    This is the C compiler for the host platform. This value is the
                same as TARGET_CC when not cross compiling.
  - HOST_CXX.   This is the C++ compiler for the host platform. This value is
                the same as TARGET_CXX when not cross compiling.
  - TARGET_CC.  This is the C compiler for the target platform.
  - TARGET_CXX. This is the C++ compiler for the target platform.
  - TARGET_AR.  This is the linker command for linking libraries.
  - PATH        This is the standard search path
  All SConscript files have been updated to reflect these changes. Now it's
  possible to change only the root SConstruct file, and all compiler specific
  variables are passed automatically to all SConscript files. Of course, this
  does not apply to makesdna because there the host and target platform is
  different from all other libraries.
  To pass a variable that applies to all platforms, all we now have to do is
  set the correct value in library_env


Note: as usual, to get the latest options in the config.opts file, first
      remove your version.
2004-02-29 21:40:48 +00:00
Michel Selten
d4b27baa2b SCons updates
* OpenAL support is now available on Linux. By default this feature is
  disabled since it is only necessary when building the game engine. And the
  game engine is disabled by default as well, so...
* Added 3 configurable options to config.opts. These apply to OpenAL settings.

NOTE: remove your current config.opts file to get the new options. (remember
      your current settings though ;) )

2nd NOTE: All options* are now configurable via the config.opts file. If the
          default settings for your platform are not correct, you should be
          able to only update the config.opts file.
  * FMOD is still not available - and I do not know if it is necessary to
    enable this feature.
2004-02-23 16:18:28 +00:00
Kent Mein
8134398de4 removed an extra ;
Found it with Sun's compiler.

Kent
2004-02-23 15:31:27 +00:00
Kent Mein
50549b602a Added a return GHOST_kSuccess;
to setWindowCustomCursorShape

Sun's compiler complained that it didn't return anything even though
it was suppose to.

Kent
2004-02-23 14:10:00 +00:00
Michel Selten
9330e553e8 SCons updates
* libraries are now generated in [BUILD_DIR]/lib
* passed the user_options to all libraries now.
  This means I could remove a couple of Export/Import lines.
* Changed the order in source/blender/src/SConscript and
  source/gameengine/SConscript.
  All libraries are now sorted alphabetically. This has no impact on the build
  process.
2004-02-15 19:25:32 +00:00
Simon Clitherow
6101f0d03d Learning to follow my own advice (I had set the dependancies to csg
already!)
2004-02-11 18:55:31 +00:00
Simon Clitherow
c205e7d1c7 - Added csg.dsp to the main intern workspace (intern.dsw)
- Fixed up the paths for "/lib/..." in csg.dsp

Quick note: Currently intern still builds the old lib (bsplib).

To compile the new lib (when everything is ready for it), uncheck
bsplib from the dependancies in build_install_all and replace with csg.
Will eventually drop bsplib completely - but not just yet :)
2004-02-11 18:36:48 +00:00
Francis Laurence
12966aed05 Ok here is the new CSG library that implements boolean operations for blender through the 'C' api in csg/extern/CSG_Interface.h.
As mentioned earlier on bf-commiters mailing list, there is no current *nix make file only an msvc60 project file. I only have a linux box at work and to be honest I want to avoid doing any commits from there! So if some kind soul could sort it out that would be great.

Dependencies:
This code only depends on other stuff in the intern library, moto and memutils the CSG lib needs to have their include paths to compile. Other than that its completely self contained.

Acknowledgements:
To speed up the polygon-polygon intersection queries I've used some code (under the GPL) from freesolid2.0 this clearly marked in the appropriate files and Gino van den Bergen still owns the copyright to that material. The algorithm I used in based on one from Paul Nettle described on flipcode (www.flipcode.com) and I think his work was a derivative of the "Laidlaw algorithm"

There is also some basic 'ear clipping' triangulation code that unfortunately remains unatributable. I have no right to publish this code under the GPL nor BPL for that matter as I have no idea who the original authors are. Its just one of those random bits of internet code.

Warning!
The stuff used a lot of C++ template features, which on one hand makes it very generic but on the other means that some work will need to be done to get working with other compilters. The msvc60 compiler is not very compliant to the C++ standards with respect to templates so its very difficult to say if this code will compile out of the box on other platforms.

I still haven't committed modifications to booleanops.c in the blender code as without a working library to link to it will break the current build. This needs to be done first!

Improvements
This code is much simpler than the previous bsp implementation see intern/bsp and this old code should be deprectated/removed. However, whilst this implementation produces less triangles in the output than the bps algo, its still not an optimal solution. This is just hard to do and beyond my humble skills.

License:
Just to make it clear this stuff for the reasons mentioned above and for the fact I'm to mean to give the copyright away to BF is licensed under the GPL only.

Cheers,
Laurence.
2004-02-10 20:16:44 +00:00
Nathan Letwory
a66108134c - Added the SConscripts for ftfont and quicktime
- [win32] python_include was missing, there was a double python_libpath. Corrected
- [win32] the soundsystem SConscript broke the win32 build.
2004-01-05 18:17:23 +00:00
Wouter van Heyst
57a7dfe5a5 - Revert to NaN makefiles 2004-01-05 00:06:11 +00:00
Alejandro Conty Estevez
eff07b8329 Basic initial yafray integration by Eeshlo.
Materials are exported the best we can do by now. It will look almost as in
blender except for the missing procedural textures and some minor issues.
You have to tweak normal modulation amount to get the desired result cause
is not the same in yafray.

We added a panel in render space to adjust some yafray settings (GI and so)

Also we export transparency and reflection using new raytracing settings,
but that will be changed and improved soon.

Remember that you have to set YFexport path in user defaults and yafray must
be on path (version 0.0.6)

We added the "yafray" button to activate all this stuff in the render window.
Panel and settings are only shown when checked.

So now when activated the code calls yafray export instead of the internal
renderer and finally the resulting image is loaded back into render window's
buffer. So animation is also possible and results can be saved using blender
usual scheme.
2004-01-04 22:10:36 +00:00
Michel Selten
d3e1fc8870 SCons build system files added.
You'll need SCons (www.scons.org) to build.
Platforms currently working:
* Linux (me)
  - options for quicktime, openal and international disabled
  - uses the system libs and include files for building - no option to build
    with the precompiled libraries yet.
* Windows (jesterKing)
  - builds with quicktime (optional)
  - builds with openal (optional)
  - builds with international support (optional)
  - Use the DOS box to build
  - builds with precompiled libraries
* Irix (Hos)
  - Uses default Irix compiler
  - Not all optimization levels correct yet
  - options for quicktime, openal and international disabled
  - builds with precompiled libraries
* Cygwin (me)
  - has a problem in the linking stage
  - uses free build tools (gcc)
  - options for quicktime, openal and international disabled
  - uses the system libs and include files for building - no option to build
    with the precompiled libraries yet.
* MacOS (sgefant)
  - builds with quicktime (optional)
  - options for openal and international disabled
  - builds a nice bundle
  - builds with precompiled libraries

Thanks to IanWill for a bugfix in the Linux build.
Note: This is a work in progress. A lot still has to be done - for example the
      optional parts are only to be enabled by directly setting 'true' or
      'false' in the SConstruct file. This needs to be moved to a user config
      file. Also, the .o/.obj files are stored in the source tree. This needs
      to be fixed as well.
      The game engine is not yet built.
2004-01-04 21:11:59 +00:00
Daniel Dunbar
7303944ea9 - update VC7 projectfiles 2004-01-02 23:35:21 +00:00
Maarten Gribnau
f351708967 Fixes the freeze on Mac OSX when a Quicktime Settings window for Compression was brought up. Blender swallowed every event, not giving Quicktime a change to receive update events and mouse clicks. 2003-12-31 15:47:09 +00:00
Martin Poirier
50448cdb1a Function without a return (warning)
This function just calls another function which returns a success value, so I'm just passing that value directly as a return value.

Slap me with a trout if I wasn't suppose to fix this.
2003-12-28 20:24:32 +00:00
Robert Wenzlaff
c476658348 More cursor port bugs. 2003-12-26 23:01:47 +00:00
Robert Wenzlaff
3f7cc9b217 Bugfix: Error in cursor port, only showed up under cygwin. 2003-12-26 22:41:51 +00:00
Robert Wenzlaff
85ae21d5dd Commit of cursor framework. Cursors now defined in source/blender/src/cursors.c and
source/blender/include/BIF_cursors.h.  Allows large cursors on Win32 and X11.
See cursors.c for documentatioin on how to use.
2003-12-26 20:12:42 +00:00
Simon Clitherow
8d94f3723d Removed an '#ifndef FREE_WINDOWS' statement that prevented
a gcc/cygwin built Blender from showing the Blender app icon in the
main window title bar.

Only a minor issue, but it annoyed me long enough to want to fix it!
2003-12-12 20:21:35 +00:00
Wouter van Heyst
9b4f87508a The debug target was erroneously removed, put it back.
Fixes build failure reported by ztonzy
2003-11-24 15:42:46 +00:00
Ton Roosendaal
0ff0ac9b87 - another hack!
well... probably OK, got it from a python mailing list.

  When starting from commandline, the window doesnt pop to the front. this
  was really bad for the play function in blender, which opens a new blender
  thread.
  solved with SetFrontProcess()
2003-11-23 23:04:35 +00:00
Michel Selten
ef9bfdcc75 A couple of files I left in the intern/python dir needed to be removed as
well.
To remove the directories on your system, do a:
cvs update -P
2003-11-22 17:29:46 +00:00
Michel Selten
930fc9ee40 First action of removing the old Python API stuff from cvs. Removed the
/intern/python stuff.
To remove the directories on your system, do a:
cvs update -P
2003-11-22 17:28:05 +00:00
Robert Wenzlaff
8dfd33c4fb Improved Knife line drawing, and added Knife cursor. 2003-11-06 00:01:51 +00:00
Robert Wenzlaff
32a03fe460 Changed Knife cursor in windows back to an arrow, since cross is "normal" cursor. 2003-10-27 00:03:18 +00:00
Ton Roosendaal
4d156ec195 - found the bad line in Ghost that preventing closing windows.
I've mailed Maarten to verify it, this commit is for test at other
  OSX platforms.

- this was the baddie:
  setDrawingContextType(GHOST_kDrawingContextTypeNone);
  it was called in the window destructor, for each window closed.
  I've hacked in a temporal global var to store the mainwindow. When this
  line is only called for mainwindow, it all works smoothly.

- next commit is needed too!
2003-10-25 13:25:59 +00:00
Robert Wenzlaff
9b032d6c2a Fixes Makefile for intern/SoundSystem/intern. 2003-10-21 23:27:08 +00:00
Alexander Ewering
5c2005cf06 Robert (DetectiveThorn) Wenzlaff's Knife subdivide tool. See previous
message on Bf-committers for description.
2003-10-12 23:43:26 +00:00
Simon Clitherow
cb667fd282 - removed keymaker project from intern build (MSVC 6) - no longer needed. 2003-10-07 20:59:42 +00:00
Hans Lambermont
1bbf616b59 Finally add spike's FreeBSD suggestions. Tnxto Chris for forwarding. 2003-10-05 19:37:16 +00:00
Michel Selten
357b070120 * Fix bug #390 - auto/gcc compile fails on irix:openal
OpenAL is now a configurable option again. The trick was to update the
  SND_DependKludge not to #define/#undef anything when the auto* tools are
  used.
2003-09-16 19:28:29 +00:00