hdrflow-svn Mailing List for HDRFlow (Page 10)
Status: Pre-Alpha
Brought to you by:
glslang
Menu
▾
▴
hdrflow-svn — HDRFlow SVN notifications
You can subscribe to this list here.
| 2007 |
Jan
|
Feb
|
Mar
|
Apr
(30) |
May
(38) |
Jun
(22) |
Jul
(53) |
Aug
(66) |
Sep
(56) |
Oct
(29) |
Nov
(13) |
Dec
(6) |
|---|---|---|---|---|---|---|---|---|---|---|---|---|
| 2008 |
Jan
(16) |
Feb
(22) |
Mar
(12) |
Apr
(4) |
May
|
Jun
|
Jul
|
Aug
|
Sep
(6) |
Oct
|
Nov
|
Dec
|
| 2009 |
Jan
|
Feb
|
Mar
|
Apr
(12) |
May
|
Jun
|
Jul
|
Aug
|
Sep
|
Oct
|
Nov
|
Dec
|
|
From: <gl...@us...> - 2007-08-08 20:14:21
|
Revision: 237
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=237&view=rev
Author: glslang
Date: 2007-08-08 13:13:45 -0700 (Wed, 08 Aug 2007)
Log Message:
-----------
+m4 macro to control the creation of umbrella frameworks
Added Paths:
-----------
trunk/lib/openlibraries/m4/umbrella_framework.m4
Added: trunk/lib/openlibraries/m4/umbrella_framework.m4
===================================================================
--- trunk/lib/openlibraries/m4/umbrella_framework.m4 (rev 0)
+++ trunk/lib/openlibraries/m4/umbrella_framework.m4 2007-08-08 20:13:45 UTC (rev 237)
@@ -0,0 +1,36 @@
+
+#
+# Enable/Disable Umbrella framework on OS/X
+#
+
+AC_DEFUN([AC_CHECK_UMBRELLA_FRAMEWORK],[
+ AC_ARG_ENABLE(umbrellaframework, AC_HELP_STRING([--disable-umbrellaframework], [disable Umbrella Framework]),
+ [enableumbrellaframework=$enableval],
+ [enableumbrellaframework=yes])
+
+ UMBRELLA_FLAGS=""
+
+ if test x$enableumbrellaframework = "xyes" ; then
+ case $host in
+ *-apple-darwin*)
+ ac_use_umbrellaframework=yes
+ AC_DEFINE(HAVE_UMBRELLAFRAMEWORK,1,[Define this if you want a umbrella framework])
+ ;;
+ esac
+ fi
+
+ AC_SUBST(UMBRELLA_FLAGS)
+ AM_CONDITIONAL(HAVE_UMBRELLAFRAMEWORK, [test x$ac_use_umbrellaframework = "xyes"])
+
+ if test x$ac_use_umbrellaframework = "xyes"; then
+ AC_MSG_RESULT(yes)
+ else
+ AC_MSG_RESULT(no)
+ fi
+
+ if test x$ac_use_umbrellaframework = "xyes"; then
+ ifelse([$1], , :, [$1])
+ else
+ ifelse([$2], , :, [$2])
+ fi
+])
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-07 21:03:46
|
Revision: 236
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=236&view=rev
Author: glslang
Date: 2007-08-07 14:03:43 -0700 (Tue, 07 Aug 2007)
Log Message:
-----------
+small changes to preferences (general view)
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-08-06 21:34:53 UTC (rev 235)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-08-07 21:03:43 UTC (rev 236)
@@ -7,11 +7,9 @@
<key>IBEditorPositions</key>
<dict>
<key>10</key>
- <string>514 465 412 270 0 0 1440 878 </string>
+ <string>285 339 412 270 0 0 1440 878 </string>
<key>12</key>
- <string>423 427 594 345 0 0 1440 878 </string>
- <key>173</key>
- <string>642 546 155 107 0 0 1440 878 </string>
+ <string>665 397 594 345 0 0 1440 878 </string>
<key>33</key>
<string>519 453 401 293 0 0 1440 878 </string>
</dict>
@@ -19,11 +17,10 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
- <integer>12</integer>
- <integer>33</integer>
<integer>10</integer>
+ <integer>33</integer>
+ <integer>12</integer>
<integer>5</integer>
- <integer>173</integer>
</array>
<key>IBSystem Version</key>
<string>8R2218</string>
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-06 21:34:55
|
Revision: 235
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=235&view=rev
Author: glslang
Date: 2007-08-06 14:34:53 -0700 (Mon, 06 Aug 2007)
Log Message:
-----------
+ initial view for dual monitor and fullscreen preferences
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
trunk/app/HDRFlow/PreferencesController.m
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-08-06 20:40:06 UTC (rev 234)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-08-06 21:34:53 UTC (rev 235)
@@ -10,6 +10,8 @@
<string>514 465 412 270 0 0 1440 878 </string>
<key>12</key>
<string>423 427 594 345 0 0 1440 878 </string>
+ <key>173</key>
+ <string>642 546 155 107 0 0 1440 878 </string>
<key>33</key>
<string>519 453 401 293 0 0 1440 878 </string>
</dict>
@@ -17,10 +19,11 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
+ <integer>12</integer>
<integer>33</integer>
<integer>10</integer>
- <integer>12</integer>
<integer>5</integer>
+ <integer>173</integer>
</array>
<key>IBSystem Version</key>
<string>8R2218</string>
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/PreferencesController.m
===================================================================
--- trunk/app/HDRFlow/PreferencesController.m 2007-08-06 20:40:06 UTC (rev 234)
+++ trunk/app/HDRFlow/PreferencesController.m 2007-08-06 21:34:53 UTC (rev 235)
@@ -26,6 +26,8 @@
preferencesView = [ [ [ self window ] contentView ] retain ];
[ [ self window ] setToolbar: [ toolbarHolder toolbar ] ];
+
+ [ self setActiveView: generalView animate: YES ];
}
- ( void ) dealloc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-06 20:40:38
|
Revision: 234
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=234&view=rev
Author: glslang
Date: 2007-08-06 13:40:06 -0700 (Mon, 06 Aug 2007)
Log Message:
-----------
+installer updates
Modified Paths:
--------------
trunk/HDRFlowFramework.pmproj
trunk/unity.sh
Modified: trunk/HDRFlowFramework.pmproj
===================================================================
(Binary files differ)
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-08-06 19:38:42 UTC (rev 233)
+++ trunk/unity.sh 2007-08-06 20:40:06 UTC (rev 234)
@@ -1,4 +1,4 @@
-#!/bin/sh -x
+#!/bin/sh -
# Copyright (c) 2007 Goncalo de Carvalho.
# Released under the GPLv2 or later.
# Unification of build and distribution:
@@ -19,7 +19,7 @@
if [ $# -eq "0" ]
then
- echo "usage: `basename $0` options (-evbfioxup)"
+ echo "usage: `basename $0` options (-evbfioxupas)"
exit 1
fi
@@ -35,10 +35,11 @@
build_application=0
framework_version="A"
install_name_prefix="/Library/Frameworks"
+strip_symbols=0
output_directory="."
-while getopts "v:b:efi:o:x:upa" option
+while getopts "v:b:efi:o:x:upas" option
do
case $option in
e ) update_boost_version=1;;
@@ -51,6 +52,7 @@
u ) build_umbrella=1;;
p ) build_installer=1;;
a ) build_application=1;;
+ s ) strip_symbols=1;;
esac
done
@@ -172,7 +174,7 @@
then plugins=`ls $2/../plugins`
for i in $plugins
do if [ -d $2/../plugins/$i ]
- then cp -R $2/../plugins/$i/*.opl $1.framework/Resources
+ then cp $2/../plugins/$i/*.opl $1.framework/Resources
fi
done
fi
@@ -408,9 +410,10 @@
cp -R ./app/HDRFlow/build/Release/HDRFlow.app .
}
-make_pkg_installer( )
+make_installer( )
{
- /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -build -proj HDRFlowFramework.pmproj -p HDRFlowFramework.pkg
+ /Developer/Applications/Utilities/PackageMaker.app/Contents/MacOS/PackageMaker -build -proj HDRFlowFramework.pmproj -p HDRFlowFramework.pkg &&
+ hdiutil create -ov -srcfolder HDRFlowFramework.pkg HDRFlowFramework.dmg -fs HFS+ -volname "HDRFlowFramework"
}
if [ "$build_frameworks" -eq 1 ] && [ "$PLATFORM" = "Darwin" ]
@@ -441,7 +444,7 @@
if [ "$build_installer" -eq 1 ]
then echo " Building packages..."
- make_pkg_installer
+ make_installer
check_status $?
fi
fi
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-06 19:39:31
|
Revision: 233
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=233&view=rev
Author: glslang
Date: 2007-08-06 12:38:42 -0700 (Mon, 06 Aug 2007)
Log Message:
-----------
+ Adds bindings to lut popup button
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
trunk/app/HDRFlow/HDRFlowController.h
trunk/app/HDRFlow/HDRFlowController.mm
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-08-05 20:08:01 UTC (rev 232)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-08-06 19:38:42 UTC (rev 233)
@@ -15,9 +15,9 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
- <integer>266</integer>
<integer>21</integer>
<integer>29</integer>
+ <integer>266</integer>
</array>
<key>IBSystem Version</key>
<string>8R2218</string>
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/HDRFlowController.h
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.h 2007-08-05 20:08:01 UTC (rev 232)
+++ trunk/app/HDRFlow/HDRFlowController.h 2007-08-06 19:38:42 UTC (rev 233)
@@ -19,6 +19,7 @@
{
NSMutableArray* channels;
NSMutableArray* alpha;
+ NSMutableArray* lut;
ScriptEditorController* scriptEditor;
PreferencesController* preferences;
@@ -30,7 +31,7 @@
- ( id ) init;
- ( void ) initScriptEngine;
-- ( void ) initChannelsAndAlpha;
+- ( void ) initDrawer;
- ( BOOL ) acceptsFirstResponder;
- ( BOOL ) becomesFirstResponder;
Modified: trunk/app/HDRFlow/HDRFlowController.mm
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.mm 2007-08-05 20:08:01 UTC (rev 232)
+++ trunk/app/HDRFlow/HDRFlowController.mm 2007-08-06 19:38:42 UTC (rev 233)
@@ -17,7 +17,7 @@
{
[ super init ];
- [ self initChannelsAndAlpha ];
+ [ self initDrawer ];
[ self initScriptEngine ];
return self;
@@ -36,7 +36,7 @@
engine->eval( [ bootstrap UTF8String ] );
}
-- ( void ) initChannelsAndAlpha
+- ( void ) initDrawer
{
channels = [ [ NSMutableArray alloc ] init ];
[ channels addObject: [ [ NSString alloc ] initWithString: @"RGBA" ] ];
@@ -50,6 +50,10 @@
[ alpha addObject: [ [ NSString alloc ] initWithString: @"Red" ] ];
[ alpha addObject: [ [ NSString alloc ] initWithString: @"Green" ] ];
[ alpha addObject: [ [ NSString alloc ] initWithString: @"Blue" ] ];
+
+ lut = [ [ NSMutableArray alloc ] init ];
+ [ lut addObject: [ [ NSString alloc ] initWithString: @"sRGB" ] ];
+ [ lut addObject: [ [ NSString alloc ] initWithString: @"Linear" ] ];
}
- ( void ) dealloc
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-05 20:08:04
|
Revision: 232
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=232&view=rev
Author: glslang
Date: 2007-08-05 13:08:01 -0700 (Sun, 05 Aug 2007)
Log Message:
-----------
+ installer update
Modified Paths:
--------------
trunk/HDRFlowFramework.pmproj
Modified: trunk/HDRFlowFramework.pmproj
===================================================================
(Binary files differ)
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-05 18:50:00
|
Revision: 231
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=231&view=rev
Author: glslang
Date: 2007-08-05 11:49:59 -0700 (Sun, 05 Aug 2007)
Log Message:
-----------
+ eol-style to native
Property Changed:
----------------
trunk/app/HDRFlow/Bucket.cpp
trunk/app/HDRFlow/Bucket.hpp
trunk/app/HDRFlow/Cache.cpp
trunk/app/HDRFlow/Cache.hpp
Property changes on: trunk/app/HDRFlow/Bucket.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/app/HDRFlow/Bucket.hpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/app/HDRFlow/Cache.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/app/HDRFlow/Cache.hpp
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-05 18:46:15
|
Revision: 230
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=230&view=rev
Author: glslang
Date: 2007-08-05 11:46:12 -0700 (Sun, 05 Aug 2007)
Log Message:
-----------
+ initial setup cache code
Modified Paths:
--------------
trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
trunk/app/HDRFlow/Viewer.hpp
Added Paths:
-----------
trunk/app/HDRFlow/Bucket.cpp
trunk/app/HDRFlow/Bucket.hpp
trunk/app/HDRFlow/Cache.cpp
trunk/app/HDRFlow/Cache.hpp
Added: trunk/app/HDRFlow/Bucket.cpp
===================================================================
--- trunk/app/HDRFlow/Bucket.cpp (rev 0)
+++ trunk/app/HDRFlow/Bucket.cpp 2007-08-05 18:46:12 UTC (rev 230)
@@ -0,0 +1,11 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#include "Bucket.hpp"
+
+namespace hdrflow {
+}
Added: trunk/app/HDRFlow/Bucket.hpp
===================================================================
--- trunk/app/HDRFlow/Bucket.hpp (rev 0)
+++ trunk/app/HDRFlow/Bucket.hpp 2007-08-05 18:46:12 UTC (rev 230)
@@ -0,0 +1,24 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#ifndef BUCKET_INC_
+#define BUCKET_INC_
+
+#include <HDRFlow/openlibraries.hpp>
+
+namespace hdrflow {
+
+class Bucket
+{
+public:
+ explicit Bucket( );
+};
+
+}
+
+#endif
+
Added: trunk/app/HDRFlow/Cache.cpp
===================================================================
--- trunk/app/HDRFlow/Cache.cpp (rev 0)
+++ trunk/app/HDRFlow/Cache.cpp 2007-08-05 18:46:12 UTC (rev 230)
@@ -0,0 +1,11 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#include "Cache.hpp"
+
+namespace hdrflow {
+}
Added: trunk/app/HDRFlow/Cache.hpp
===================================================================
--- trunk/app/HDRFlow/Cache.hpp (rev 0)
+++ trunk/app/HDRFlow/Cache.hpp 2007-08-05 18:46:12 UTC (rev 230)
@@ -0,0 +1,23 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#ifndef CACHE_INC_
+#define CACHE_INC_
+
+#include <HDRFlow/openlibraries.hpp>
+
+namespace hdrflow {
+
+class Cache
+{
+public:
+ explicit Cache( );
+};
+
+}
+
+#endif
Modified: trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-08-05 15:23:45 UTC (rev 229)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-08-05 18:46:12 UTC (rev 230)
@@ -11,6 +11,8 @@
671E22A30C4166E400CA1860 /* ScriptEditorController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 671E22A20C4166E400CA1860 /* ScriptEditorController.mm */; };
673D04500C522C980096513A /* PreferencesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 673D044F0C522C980096513A /* PreferencesController.m */; };
674E44640C3F854A0036A908 /* ScriptEditor.nib in Resources */ = {isa = PBXBuildFile; fileRef = 674E44620C3F854A0036A908 /* ScriptEditor.nib */; };
+ 676191B60C6643570076713C /* Bucket.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 676191B50C6643570076713C /* Bucket.cpp */; };
+ 676191BF0C6643B20076713C /* Cache.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 676191BE0C6643B20076713C /* Cache.cpp */; };
677740360C5C0184005FF29D /* PlugInsPreferencesOutlineViewNode.mm in Sources */ = {isa = PBXBuildFile; fileRef = 677740350C5C0184005FF29D /* PlugInsPreferencesOutlineViewNode.mm */; };
678A4AA70C2B18B50011E9F7 /* CustomOpenGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 678A4AA60C2B18B50011E9F7 /* CustomOpenGLView.m */; };
67A8A6EA0C41836600DB3F1B /* Python.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67A8A6E90C41836600DB3F1B /* Python.framework */; };
@@ -47,6 +49,10 @@
673D04450C522A610096513A /* PreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PreferencesController.h; sourceTree = "<group>"; };
673D044F0C522C980096513A /* PreferencesController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PreferencesController.m; sourceTree = "<group>"; };
674E44630C3F854A0036A908 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/ScriptEditor.nib; sourceTree = "<group>"; };
+ 676191810C663D100076713C /* Cache.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = Cache.hpp; sourceTree = "<group>"; };
+ 676191A40C6642CC0076713C /* Bucket.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = Bucket.hpp; sourceTree = "<group>"; };
+ 676191B50C6643570076713C /* Bucket.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Bucket.cpp; sourceTree = "<group>"; };
+ 676191BE0C6643B20076713C /* Cache.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Cache.cpp; sourceTree = "<group>"; };
6777402D0C5C0022005FF29D /* PlugInsPreferencesOutlineViewNode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PlugInsPreferencesOutlineViewNode.h; sourceTree = "<group>"; };
677740350C5C0184005FF29D /* PlugInsPreferencesOutlineViewNode.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = PlugInsPreferencesOutlineViewNode.mm; sourceTree = "<group>"; };
678A4AA60C2B18B50011E9F7 /* CustomOpenGLView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = CustomOpenGLView.m; sourceTree = "<group>"; };
@@ -92,6 +98,10 @@
080E96DDFE201D6D7F000001 /* Classes */ = {
isa = PBXGroup;
children = (
+ 676191A40C6642CC0076713C /* Bucket.hpp */,
+ 676191B50C6643570076713C /* Bucket.cpp */,
+ 676191810C663D100076713C /* Cache.hpp */,
+ 676191BE0C6643B20076713C /* Cache.cpp */,
67F6CCF70C285D6C00098F90 /* CustomOpenGLView.h */,
678A4AA60C2B18B50011E9F7 /* CustomOpenGLView.m */,
67DC61B10C2EAB5E005CFE6E /* ViewportOpenGLView.h */,
@@ -277,6 +287,8 @@
67C0BED90C5BCD4600E0E258 /* HDRFlowController.mm in Sources */,
67C0BEFB0C5BED8500E0E258 /* PlugInsPreferencesController.mm in Sources */,
677740360C5C0184005FF29D /* PlugInsPreferencesOutlineViewNode.mm in Sources */,
+ 676191B60C6643570076713C /* Bucket.cpp in Sources */,
+ 676191BF0C6643B20076713C /* Cache.cpp in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Modified: trunk/app/HDRFlow/Viewer.hpp
===================================================================
--- trunk/app/HDRFlow/Viewer.hpp 2007-08-05 15:23:45 UTC (rev 229)
+++ trunk/app/HDRFlow/Viewer.hpp 2007-08-05 18:46:12 UTC (rev 230)
@@ -8,4 +8,19 @@
#ifndef VIEWER_INC_
#define VIEWER_INC_
+#include <HDRFlow/openlibraries.hpp>
+
+namespace hdrflow {
+
+class Viewer
+{
+public:
+ explicit Viewer( );
+
+ void initialise( );
+ void display( il::image_type_ptr im );
+};
+
+}
+
#endif
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-05 15:23:47
|
Revision: 229
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=229&view=rev
Author: glslang
Date: 2007-08-05 08:23:45 -0700 (Sun, 05 Aug 2007)
Log Message:
-----------
+ Viewer settings bindings
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
trunk/app/HDRFlow/HDRFlowController.h
trunk/app/HDRFlow/HDRFlowController.mm
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-08-04 22:33:23 UTC (rev 228)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-08-05 15:23:45 UTC (rev 229)
@@ -15,9 +15,9 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
- <integer>29</integer>
<integer>266</integer>
<integer>21</integer>
+ <integer>29</integer>
</array>
<key>IBSystem Version</key>
<string>8R2218</string>
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-08-04 22:33:23 UTC (rev 228)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-08-05 15:23:45 UTC (rev 229)
@@ -9,7 +9,7 @@
<key>10</key>
<string>514 465 412 270 0 0 1440 878 </string>
<key>12</key>
- <string>435 427 594 345 0 0 1440 878 </string>
+ <string>423 427 594 345 0 0 1440 878 </string>
<key>33</key>
<string>519 453 401 293 0 0 1440 878 </string>
</dict>
@@ -18,8 +18,8 @@
<key>IBOpenObjects</key>
<array>
<integer>33</integer>
+ <integer>10</integer>
<integer>12</integer>
- <integer>10</integer>
<integer>5</integer>
</array>
<key>IBSystem Version</key>
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/HDRFlowController.h
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.h 2007-08-04 22:33:23 UTC (rev 228)
+++ trunk/app/HDRFlow/HDRFlowController.h 2007-08-05 15:23:45 UTC (rev 229)
@@ -17,6 +17,9 @@
@interface HDRFlowController : NSObject
{
+ NSMutableArray* channels;
+ NSMutableArray* alpha;
+
ScriptEditorController* scriptEditor;
PreferencesController* preferences;
@@ -27,6 +30,7 @@
- ( id ) init;
- ( void ) initScriptEngine;
+- ( void ) initChannelsAndAlpha;
- ( BOOL ) acceptsFirstResponder;
- ( BOOL ) becomesFirstResponder;
Modified: trunk/app/HDRFlow/HDRFlowController.mm
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.mm 2007-08-04 22:33:23 UTC (rev 228)
+++ trunk/app/HDRFlow/HDRFlowController.mm 2007-08-05 15:23:45 UTC (rev 229)
@@ -16,6 +16,8 @@
- ( id ) init
{
[ super init ];
+
+ [ self initChannelsAndAlpha ];
[ self initScriptEngine ];
return self;
@@ -34,10 +36,30 @@
engine->eval( [ bootstrap UTF8String ] );
}
+- ( void ) initChannelsAndAlpha
+{
+ channels = [ [ NSMutableArray alloc ] init ];
+ [ channels addObject: [ [ NSString alloc ] initWithString: @"RGBA" ] ];
+ [ channels addObject: [ [ NSString alloc ] initWithString: @"Red" ] ];
+ [ channels addObject: [ [ NSString alloc ] initWithString: @"Green" ] ];
+ [ channels addObject: [ [ NSString alloc ] initWithString: @"Blue" ] ];
+ [ channels addObject: [ [ NSString alloc ] initWithString: @"Alpha" ] ];
+
+ alpha = [ [ NSMutableArray alloc ] init ];
+ [ alpha addObject: [ [ NSString alloc ] initWithString: @"Alpha" ] ];
+ [ alpha addObject: [ [ NSString alloc ] initWithString: @"Red" ] ];
+ [ alpha addObject: [ [ NSString alloc ] initWithString: @"Green" ] ];
+ [ alpha addObject: [ [ NSString alloc ] initWithString: @"Blue" ] ];
+}
+
- ( void ) dealloc
{
delete engine;
+
+ [ channels release ];
+ [ alpha release ];
[ scriptEditor dealloc ];
+
[ super dealloc ];
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-04 22:33:31
|
Revision: 228
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=228&view=rev
Author: glslang
Date: 2007-08-04 15:33:23 -0700 (Sat, 04 Aug 2007)
Log Message:
-----------
+ Initialisation with bootstrap script
Modified Paths:
--------------
trunk/app/HDRFlow/HDRFlowController.h
trunk/app/HDRFlow/HDRFlowController.mm
trunk/app/HDRFlow/PlugInsPreferencesController.mm
trunk/unity.sh
Modified: trunk/app/HDRFlow/HDRFlowController.h
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.h 2007-08-04 19:57:41 UTC (rev 227)
+++ trunk/app/HDRFlow/HDRFlowController.h 2007-08-04 22:33:23 UTC (rev 228)
@@ -26,6 +26,7 @@
}
- ( id ) init;
+- ( void ) initScriptEngine;
- ( BOOL ) acceptsFirstResponder;
- ( BOOL ) becomesFirstResponder;
Modified: trunk/app/HDRFlow/HDRFlowController.mm
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.mm 2007-08-04 19:57:41 UTC (rev 227)
+++ trunk/app/HDRFlow/HDRFlowController.mm 2007-08-04 22:33:23 UTC (rev 228)
@@ -6,7 +6,6 @@
// For more information, see http://www.cryogenicgraphics.com/hdrflow.
#import "ScriptEngine.hpp"
-
#import "HDRFlowController.h"
#import "ViewportOpenGLView.h"
#import "PreferencesController.h"
@@ -17,10 +16,24 @@
- ( id ) init
{
[ super init ];
- engine = new hdrflow::ScriptEngine( );
+ [ self initScriptEngine ];
+
return self;
}
+- ( void ) initScriptEngine
+{
+ NSString* bootstrap;
+
+ engine = new hdrflow::ScriptEngine( );
+
+ NSBundle* bundle = [ NSBundle bundleForClass: [ self class ] ];
+ bootstrap = [ bundle pathForResource: @"bootstrap" ofType: @"py" ];
+ bootstrap = [ NSString stringWithContentsOfFile: bootstrap encoding: NSUTF8StringEncoding error: NULL ];
+
+ engine->eval( [ bootstrap UTF8String ] );
+}
+
- ( void ) dealloc
{
delete engine;
Modified: trunk/app/HDRFlow/PlugInsPreferencesController.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesController.mm 2007-08-04 19:57:41 UTC (rev 227)
+++ trunk/app/HDRFlow/PlugInsPreferencesController.mm 2007-08-04 22:33:23 UTC (rev 228)
@@ -43,8 +43,6 @@
{
[ super init ];
- opl::init( );
-
plugIns = [ [ NSMutableArray alloc ] init ];
[ self initPlugIns ];
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-08-04 19:57:41 UTC (rev 227)
+++ trunk/unity.sh 2007-08-04 22:33:23 UTC (rev 228)
@@ -319,6 +319,16 @@
done
}
+make_umbrella_framework_python_deps( )
+{
+ install_name_tool -id $install_name_prefix/HDRFlow.framework/Frameworks/$1.framework/Versions/A/PlugIns/$1.so $2
+ fmwklist="HDRFlowPlugin HDRFlowImage HDRFlowMedia"
+ for i in $fmwklist
+ do install_name_tool -change /Library/Frameworks/$i.framework/Versions/A/$i \
+ $install_name_prefix/HDRFlow.framework/Frameworks/$i.framework/Versions/A/$i $2
+ done
+}
+
make_umbrella_framework( )
{
rm -rf "./HDRFlow.framework"
@@ -347,19 +357,24 @@
install_name_tool -change $k \
$install_name_prefix/HDRFlow.framework/Versions/$framework_version/Libraries/$base \
HDRFlow.framework/Versions/$framework_version/Frameworks/$j.framework/$j
- done
+ done
+ done
- # Python modules
- depname=`otool -L HDRFlow.framework/Frameworks/$j.framework/PlugIns/$j.so | grep $i | cut -d ' ' -f 1`
+ for j in $fmwklist
+ do depname=`otool -L HDRFlow.framework/Frameworks/$j.framework/PlugIns/$j.so | grep $i | cut -d ' ' -f 1`
for k in $depname
- do base=`basename $k`
+ do base=`basename $k`
install_name_tool -change $k \
$install_name_prefix/HDRFlow.framework/Versions/$framework_version/Libraries/$base \
- HDRFlow.framework/Versions/$framework_version/Frameworks/$j.framework/PlugIns/$j.so
+ HDRFlow.framework/Frameworks/$j.framework/PlugIns/$j.so
done
done
done
+ make_umbrella_framework_python_deps "HDRFlowPlugin" "HDRFlow.framework/Frameworks/HDRFlowPlugin.framework/PlugIns/HDRFlowPlugin.so"
+ make_umbrella_framework_python_deps "HDRFlowImage" "HDRFlow.framework/Frameworks/HDRFlowImage.framework/PlugIns/HDRFlowImage.so"
+ make_umbrella_framework_python_deps "HDRFlowMedia" "HDRFlow.framework/Frameworks/HDRFlowMedia.framework/PlugIns/HDRFlowMedia.so"
+
# Umbrella Framework Header
deplist="openpluginlib/pl openimagelib/il openmedialib/ml"
for i in $deplist
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-04 19:57:45
|
Revision: 227
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=227&view=rev
Author: glslang
Date: 2007-08-04 12:57:41 -0700 (Sat, 04 Aug 2007)
Log Message:
-----------
+ add gcc visibility attributes
Modified Paths:
--------------
trunk/lib/openlibraries/configure.ac
trunk/lib/openlibraries/src/openassetlib/al/Makefile.am
trunk/lib/openlibraries/src/openassetlib/al/config.hpp
trunk/lib/openlibraries/src/openimagelib/il/Makefile.am
trunk/lib/openlibraries/src/openimagelib/il/config.hpp
trunk/lib/openlibraries/src/openimagelib/il/utility.hpp
trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/bmp/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/dds/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/dpx/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/exr/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/hdr/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/jpg/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/png/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/psd/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am
trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am
trunk/lib/openlibraries/src/openmedialib/ml/Makefile.am
trunk/lib/openlibraries/src/openmedialib/ml/audio.hpp
trunk/lib/openlibraries/src/openmedialib/ml/config.hpp
trunk/lib/openlibraries/src/openmedialib/ml/frame.hpp
trunk/lib/openlibraries/src/openmedialib/ml/input.hpp
trunk/lib/openlibraries/src/openmedialib/plugins/avformat/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/gensys/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/glew/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/ofx/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/oil/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/openal/Makefile.am
trunk/lib/openlibraries/src/openmedialib/plugins/template/Makefile.am
trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am
trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp
Removed Paths:
-------------
trunk/lib/openlibraries/src/openmedialib/plugins/caca/
Modified: trunk/lib/openlibraries/configure.ac
===================================================================
--- trunk/lib/openlibraries/configure.ac 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/configure.ac 2007-08-04 19:57:41 UTC (rev 227)
@@ -169,7 +169,7 @@
dnl OpenLibraries common flags
dnl NOTE: we could use $(var) instead of @var@ if we want late-expansion in the generated makefiles.
-OLIB_CXXFLAGS=''
+OLIB_CXXFLAGS='-fvisibility=hidden -fvisibility-inlines-hidden'
AC_SUBST(OLIB_CXXFLAGS)
OLIB_LDFLAGS=''
@@ -199,20 +199,6 @@
fi
AM_CONDITIONAL(HAVE_LIBAVFORMAT, [test x"$libavformat" = "xyes"])
-dnl caca support
-AC_PATH_PROG(CACA_CONFIG, caca-config, no)
-if test "x$CACA_CONFIG" = "xno" ; then
- AC_MSG_RESULT([*** caca support is not available ***])
-else
- AC_DEFINE(HAVE_LIBCACA,1,[Define this for caca support])
- CACA_CXXFLAGS=`$CACA_CONFIG --cflags`
- CACA_LIBS=`$CACA_CONFIG --plugin-libs`
- AC_SUBST(CACA_CXXFLAGS)
- AC_SUBST(CACA_LIBS)
- have_libcaca="yes"
-fi
-AM_CONDITIONAL(HAVE_LIBCACA, [test x"$have_libcaca" = "xyes"])
-
dnl mlt support
AC_PATH_PROG(MLT_CONFIG, mlt-config, no)
if test "x$MLT_CONFIG" = "xno" ; then
@@ -370,7 +356,6 @@
src/openmedialib/plugins/template/Makefile
src/openmedialib/plugins/avformat/Makefile
src/openmedialib/plugins/oil/Makefile
-src/openmedialib/plugins/caca/Makefile
src/openmedialib/plugins/glew/Makefile
src/openmedialib/plugins/openal/Makefile
src/openmedialib/plugins/gensys/Makefile
Modified: trunk/lib/openlibraries/src/openassetlib/al/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/al/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openassetlib/al/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -25,7 +25,8 @@
libopenassetlib_al_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
- $(XML2_CXXFLAGS)
+ $(XML2_CXXFLAGS) \
+ -DAL_EXPORTS
libopenassetlib_al_la_LIBADD =
Modified: trunk/lib/openlibraries/src/openassetlib/al/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openassetlib/al/config.hpp 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openassetlib/al/config.hpp 2007-08-04 19:57:41 UTC (rev 227)
@@ -7,7 +7,6 @@
#ifndef AL_CONFIG_INC_
#define AL_CONFIG_INC_
-//======================================================
#ifdef WIN32
# ifdef AL_EXPORTS
# define AL_DECLSPEC __declspec( dllexport )
@@ -15,15 +14,17 @@
# define AL_DECLSPEC __declspec( dllimport )
# endif
#else
-# define AL_DECLSPEC
+# ifdef AL_EXPORTS
+# define AL_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# else
+# define AL_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# endif
#endif
-//======================================================
#ifndef OPENASSETLIB_LIBNAME
# define OPENASSETLIB_LIBNAME "openassetlib_al"
#endif
-//======================================================
#ifndef OPENASSETLIB_TOOLSET
# if defined( _MSC_VER ) && ( _MSC_VER == 1310 ) && !defined( __ICL )
# define OPENASSETLIB_TOOLSET "vc71"
@@ -34,7 +35,6 @@
# endif
#endif
-//======================================================
#ifndef OPENASSETLIB_DEBUG_SUFFIX
# ifndef NDEBUG
# define OPENASSETLIB_DEBUG_SUFFIX "d"
@@ -43,12 +43,10 @@
# endif
#endif
-//======================================================
#ifndef OPENASSETLIB_VERSION
# define OPENASSETLIB_VERSION "0_4_0"
#endif
-//======================================================
// library search record (auto link).
#if defined( WIN32 ) && !defined( OPENASSETLIB_BUILD )
# if defined( OPENASSETLIB_LIBNAME ) && defined( OPENASSETLIB_TOOLSET ) && defined( OPENASSETLIB_DEBUG_SUFFIX ) && defined( OPENASSETLIB_VERSION )
@@ -56,6 +54,5 @@
# endif
#endif
-//======================================================
-
#endif
+
Modified: trunk/lib/openlibraries/src/openimagelib/il/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/il/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -23,7 +23,8 @@
libopenimagelib_il_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_il_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
Modified: trunk/lib/openlibraries/src/openimagelib/il/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/config.hpp 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/il/config.hpp 2007-08-04 19:57:41 UTC (rev 227)
@@ -9,14 +9,18 @@
#define IL_CONFIG_INC_
#ifdef WIN32
- #ifdef IL_EXPORTS
- #define IL_DECLSPEC __declspec( dllexport )
- #else
- #define IL_DECLSPEC __declspec( dllimport )
- #endif // IL_EXPORTS
+# ifdef IL_EXPORTS
+# define IL_DECLSPEC __declspec( dllexport )
+# else
+# define IL_DECLSPEC __declspec( dllimport )
+# endif
#else
- #define IL_DECLSPEC
-#endif // WIN32
+# ifdef IL_EXPORTS
+# define IL_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# else
+# define IL_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# endif
+#endif
#ifndef OPENIMAGELIB_LIBNAME
# define OPENIMAGELIB_LIBNAME "openimagelib_il"
Modified: trunk/lib/openlibraries/src/openimagelib/il/utility.hpp
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/il/utility.hpp 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/il/utility.hpp 2007-08-04 19:57:41 UTC (rev 227)
@@ -42,7 +42,7 @@
IL_DECLSPEC image_type_ptr deinterlace( const image_type_ptr &im );
IL_DECLSPEC image_type_ptr extract_alpha( const image_type_ptr &im );
-enum IL_DECLSPEC rescale_filter { POINT_SAMPLING, BILINEAR_SAMPLING, BICUBIC_SAMPLING, TRILINEAR_SAMPLING };
+enum rescale_filter { POINT_SAMPLING, BILINEAR_SAMPLING, BICUBIC_SAMPLING, TRILINEAR_SAMPLING };
IL_DECLSPEC image_type_ptr rescale( const image_type_ptr &im, int new_w, int new_h, int new_d = 1, rescale_filter filter = POINT_SAMPLING );
@@ -83,7 +83,7 @@
typedef std::vector<unsigned int> histogram_type;
-enum IL_DECLSPEC histogram_filter { LUMINANCE, RED, GREEN, BLUE, ALPHA }; // RED, GREEN, BLUE and ALPHA do relate to channels rather than actual pixel format being rgba.
+enum histogram_filter { LUMINANCE, RED, GREEN, BLUE, ALPHA }; // RED, GREEN, BLUE and ALPHA do relate to channels rather than actual pixel format being rgba.
IL_DECLSPEC void histogram( const image_type_ptr& im, int size, float mask[ ], histogram_type& hist );
IL_DECLSPEC void histogram( const image_type_ptr& im, int size, histogram_filter filter, histogram_type& hist );
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/3D_lightmap/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -12,7 +12,8 @@
libopenimagelib_3D_lightmap_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_3D_lightmap_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/bmp/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/bmp/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/bmp/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -12,7 +12,8 @@
libopenimagelib_bmp_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_bmp_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dds/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dds/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dds/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -12,7 +12,8 @@
libopenimagelib_dds_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_dds_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/dpx/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/dpx/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/dpx/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -12,7 +12,8 @@
libopenimagelib_dpx_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_dpx_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/exr/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/exr/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/exr/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -14,7 +14,8 @@
libopenimagelib_exr_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
- $(OPENEXR_CFLAGS)
+ $(OPENEXR_CFLAGS) \
+ -DIL_EXPORTS
libopenimagelib_exr_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/hdr/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/hdr/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/hdr/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -12,7 +12,8 @@
libopenimagelib_hdr_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_hdr_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/jpg/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/jpg/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/jpg/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -13,7 +13,8 @@
libopenimagelib_jpg_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)s
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_jpg_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/png/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/png/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/png/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -13,7 +13,8 @@
libopenimagelib_png_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_png_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/psd/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/psd/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/psd/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -12,7 +12,8 @@
libopenimagelib_psd_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_psd_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/quicktime/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -14,7 +14,8 @@
libopenimagelib_quicktime_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_quicktime_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/sgi/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -12,7 +12,8 @@
libopenimagelib_sgi_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_sgi_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tga/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -12,7 +12,8 @@
libopenimagelib_tga_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_tga_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS)
Modified: trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openimagelib/plugins/tiff/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -14,7 +14,8 @@
libopenimagelib_tiff_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DIL_EXPORTS
libopenimagelib_tiff_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/src/openmedialib/ml/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/ml/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -18,7 +18,8 @@
libopenmedialib_ml_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
- $(BOOST_INCLUDE_PATH)
+ $(BOOST_INCLUDE_PATH) \
+ -DML_EXPORTS
libopenmedialib_ml_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
Modified: trunk/lib/openlibraries/src/openmedialib/ml/audio.hpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/audio.hpp 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/ml/audio.hpp 2007-08-04 19:57:41 UTC (rev 227)
@@ -166,8 +166,8 @@
size_type eom_;
};
-typedef ML_DECLSPEC audio<unsigned char, audio_format> audio_type;
-typedef ML_DECLSPEC boost::shared_ptr<audio_type> audio_type_ptr;
+typedef audio<unsigned char, audio_format> audio_type;
+typedef boost::shared_ptr<audio_type> audio_type_ptr;
template<typename T, class storage = olib::openimagelib::il::default_storage<T> >
class pcm16 : public audio_format<T, storage>
@@ -208,3 +208,4 @@
} } }
#endif
+
Modified: trunk/lib/openlibraries/src/openmedialib/ml/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/config.hpp 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/ml/config.hpp 2007-08-04 19:57:41 UTC (rev 227)
@@ -9,28 +9,32 @@
#define ML_CONFIG_INC_
#ifdef WIN32
- #ifdef ML_PLUGIN_EXPORTS
- #define ML_PLUGIN_DECLSPEC __declspec( dllexport )
- #else
- #define ML_PLUGIN_DECLSPEC __declspec( dllimport )
- #endif
+# ifdef ML_PLUGIN_EXPORTS
+# define ML_PLUGIN_DECLSPEC __declspec( dllexport )
+# else
+# define ML_PLUGIN_DECLSPEC __declspec( dllimport )
+# endif
#else
- #ifdef ML_PLUGIN_EXPORTS
- #define ML_PLUGIN_DECLSPEC extern
- #else
- #define ML_PLUGIN_DECLSPEC
- #endif
+# ifdef ML_PLUGIN_EXPORTS
+# define ML_PLUGIN_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# else
+# define ML_PLUGIN_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# endif
#endif
#ifdef WIN32
- #ifdef ML_EXPORTS
- #define ML_DECLSPEC __declspec( dllexport )
- #else
- #define ML_DECLSPEC __declspec( dllimport )
- #endif // ML_EXPORTS
+# ifdef ML_EXPORTS
+# define ML_DECLSPEC __declspec( dllexport )
+# else
+# define ML_DECLSPEC __declspec( dllimport )
+# endif
#else
- #define ML_DECLSPEC
-#endif // WIN32
+# ifdef ML_EXPORTS
+# define ML_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# else
+# define ML_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# endif
+#endif
#ifndef OPENMEDIALIB_LIBNAME
# define OPENMEDIALIB_LIBNAME "openmedialib_ml"
Modified: trunk/lib/openlibraries/src/openmedialib/ml/frame.hpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/frame.hpp 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/ml/frame.hpp 2007-08-04 19:57:41 UTC (rev 227)
@@ -22,11 +22,11 @@
namespace pcos = olib::openpluginlib::pcos;
-typedef ML_DECLSPEC olib::openimagelib::il::image_type image_type;
-typedef ML_DECLSPEC olib::openimagelib::il::image_type_ptr image_type_ptr;
+typedef olib::openimagelib::il::image_type image_type;
+typedef olib::openimagelib::il::image_type_ptr image_type_ptr;
-class ML_DECLSPEC frame_type;
-typedef ML_DECLSPEC boost::shared_ptr< frame_type > frame_type_ptr;
+class frame_type;
+typedef boost::shared_ptr< frame_type > frame_type_ptr;
class ML_DECLSPEC frame_type
{
Modified: trunk/lib/openlibraries/src/openmedialib/ml/input.hpp
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/ml/input.hpp 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/ml/input.hpp 2007-08-04 19:57:41 UTC (rev 227)
@@ -47,7 +47,7 @@
process_flags;
// Forward declarations
-class ML_DECLSPEC input_type;
+class input_type;
typedef boost::shared_ptr< input_type > input_type_ptr;
// The input abstract class - implementations will extend this class and (minimally)
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/avformat/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/avformat/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/avformat/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -9,27 +9,24 @@
lib_LTLIBRARIES = libopenmedialib_avformat.la
libopenmedialib_avformat_la_SOURCES = \
- avformat_plugin.cpp \
- # end
+ avformat_plugin.cpp
libopenmedialib_avformat_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
$(LIBAVFORMAT_CFLAGS) \
- # end
+ -DML_PLUGIN_EXPORTS
libopenmedialib_avformat_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
$(LIBAVFORMAT_LIBS) \
$(top_builddir)/src/openmedialib/ml/libopenmedialib_ml.la \
- $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
- # end
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenmedialib_avformat_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE) \
- #end
+ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
libopenmedialib_avformat_ladir = $(OPENMEDIALIB_PLUGINPATH)
libopenmedialib_avformat_la_DATA = avformat_plugin.opl
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/gensys/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/gensys/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/gensys/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -8,25 +8,22 @@
lib_LTLIBRARIES = libopenmedialib_gensys.la
libopenmedialib_gensys_la_SOURCES = \
- gensys_plugin.cpp \
- # end
+ gensys_plugin.cpp
libopenmedialib_gensys_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
- # end
+ -DML_PLUGIN_EXPORTS
libopenmedialib_gensys_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
$(top_builddir)/src/openmedialib/ml/libopenmedialib_ml.la \
- $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
- # end
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenmedialib_gensys_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE) \
- #end
+ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
libopenmedialib_gensys_ladir = $(OPENMEDIALIB_PLUGINPATH)
libopenmedialib_gensys_la_DATA = gensys_plugin.opl
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/glew/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/glew/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/glew/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -9,14 +9,13 @@
lib_LTLIBRARIES = libopenmedialib_glew.la
libopenmedialib_glew_la_SOURCES = \
- glew_plugin.cpp \
- # end
+ glew_plugin.cpp
libopenmedialib_glew_la_CXXFLAGS = \
$(GLEW_INCLUDE_PATH) \
$(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
- # end
+ -DML_PLUGIN_EXPORTS
libopenmedialib_glew_la_LIBADD = \
$(OPENGL_LIBS) \
@@ -25,8 +24,7 @@
$(GLUT_LIBS) \
$(BOOST_FILESYSTEM_LIBS) \
$(top_builddir)/src/openmedialib/ml/libopenmedialib_ml.la \
- $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
- # end
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenmedialib_glew_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/ofx/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/ofx/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/ofx/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -15,7 +15,8 @@
libopenmedialib_ofx_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
- $(OFX_INCLUDE_PATH)
+ $(OFX_INCLUDE_PATH) \
+ -DML_PLUGIN_EXPORTS
libopenmedialib_ofx_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/oil/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/oil/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/oil/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -8,25 +8,22 @@
lib_LTLIBRARIES = libopenmedialib_oil.la
libopenmedialib_oil_la_SOURCES = \
- oil_plugin.cpp \
- # end
+ oil_plugin.cpp
libopenmedialib_oil_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
- # end
+ -DML_PLUGIN_EXPORTS
libopenmedialib_oil_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
$(top_builddir)/src/openmedialib/ml/libopenmedialib_ml.la \
- $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
- # end
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenmedialib_oil_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE) \
- #end
+ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
libopenmedialib_oil_ladir = $(OPENMEDIALIB_PLUGINPATH)
libopenmedialib_oil_la_DATA = oil_plugin.opl
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/openal/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/openal/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/openal/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -16,7 +16,8 @@
$(BOOST_INCLUDE_PATH) \
$(OPENAL_INCLUDE_PATH) \
$(GLEW_INCLUDE_PATH) \
- $(SWAB_AUDIO)
+ $(SWAB_AUDIO) \
+ -DML_PLUGIN_EXPORTS
libopenmedialib_openal_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
Modified: trunk/lib/openlibraries/src/openmedialib/plugins/template/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openmedialib/plugins/template/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openmedialib/plugins/template/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -14,19 +14,17 @@
libopenmedialib_template_la_CXXFLAGS = \
$(OLIB_CXXFLAGS) \
$(BOOST_INCLUDE_PATH) \
- # end
+ -DML_PLUGIN_EXPORTS
libopenmedialib_template_la_LIBADD = \
$(BOOST_FILESYSTEM_LIBS) \
$(top_builddir)/src/openmedialib/ml/libopenmedialib_ml.la \
- $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la \
- # end
+ $(top_builddir)/src/openimagelib/il/libopenimagelib_il.la
libopenmedialib_template_la_LDFLAGS = \
$(OLIB_LDFLAGS) \
$(BOOST_LIB_PATH) \
- -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE) \
- #end
+ -version-info $(OL_LT_CURRENT):$(OL_LT_REVISION):$(OL_LT_AGE)
libopenmedialib_template_ladir = $(OPENMEDIALIB_PLUGINPATH)
libopenmedialib_template_la_DATA = template_plugin.opl
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/Makefile.am 2007-08-04 19:57:41 UTC (rev 227)
@@ -70,6 +70,7 @@
$(GLEW_INCLUDE_PATH) \
$(XML2_CXXFLAGS) \
$(OFX_INCLUDE_PATH) \
+ -DOPENPLUGINLIB_EXPORTS \
-DOPENEFFECTSLIB_SHADERS=\"$(OPENEFFECTSLIB_SHADERSPATH)/\" \
-DOPENIMAGELIB_PLUGINS=\"$(OPENIMAGELIB_PLUGINPATH)\" \
-DOPENMEDIALIB_PLUGINS=\"$(OPENMEDIALIB_PLUGINPATH)\" \
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp 2007-08-04 18:12:56 UTC (rev 226)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/config.hpp 2007-08-04 19:57:41 UTC (rev 227)
@@ -15,7 +15,11 @@
# define OPENPLUGINLIB_DECLSPEC __declspec( dllimport )
# endif
#else
-# define OPENPLUGINLIB_DECLSPEC
+# ifdef OPENPLUGINLIB_EXPORTS
+# define OPENPLUGINLIB_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# else
+# define OPENPLUGINLIB_DECLSPEC __attribute__( ( visibility( "default" ) ) )
+# endif
#endif
#ifndef OPENPLUGINLIB_LIBNAME
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-04 18:12:59
|
Revision: 226
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=226&view=rev
Author: glslang
Date: 2007-08-04 11:12:56 -0700 (Sat, 04 Aug 2007)
Log Message:
-----------
+ small refactoring of ScriptEngine to support a bootstrap py script
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
trunk/app/HDRFlow/HDRFlowController.h
trunk/app/HDRFlow/HDRFlowController.mm
trunk/app/HDRFlow/ScriptEditorController.h
trunk/app/HDRFlow/ScriptEditorController.mm
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/HDRFlowController.h
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.h 2007-08-04 15:50:45 UTC (rev 225)
+++ trunk/app/HDRFlow/HDRFlowController.h 2007-08-04 18:12:56 UTC (rev 226)
@@ -12,13 +12,21 @@
@class ViewportOpenGLView;
@class PreferencesController;
+// forward declaration
+namespace hdrflow { class ScriptEngine; }
+
@interface HDRFlowController : NSObject
{
ScriptEditorController* scriptEditor;
+ PreferencesController* preferences;
+
IBOutlet ViewportOpenGLView* openGLView;
- PreferencesController* preferences;
+
+ hdrflow::ScriptEngine* engine;
}
+- ( id ) init;
+
- ( BOOL ) acceptsFirstResponder;
- ( BOOL ) becomesFirstResponder;
- ( BOOL ) resignFirstResponder;
Modified: trunk/app/HDRFlow/HDRFlowController.mm
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.mm 2007-08-04 15:50:45 UTC (rev 225)
+++ trunk/app/HDRFlow/HDRFlowController.mm 2007-08-04 18:12:56 UTC (rev 226)
@@ -5,12 +5,29 @@
// Released under the GPL.
// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+#import "ScriptEngine.hpp"
+
#import "HDRFlowController.h"
#import "ViewportOpenGLView.h"
#import "PreferencesController.h"
+#import "ScriptEditorController.h"
@implementation HDRFlowController
+- ( id ) init
+{
+ [ super init ];
+ engine = new hdrflow::ScriptEngine( );
+ return self;
+}
+
+- ( void ) dealloc
+{
+ delete engine;
+ [ scriptEditor dealloc ];
+ [ super dealloc ];
+}
+
#pragma mark ---- IB actions ----
- ( void ) openPanelDidEnd: ( NSOpenPanel* ) panel returnCode: ( int ) rc contextInfo: ( void* ) ctx
@@ -42,7 +59,10 @@
- ( IBAction ) scriptEditor: ( id ) sender
{
if( scriptEditor == nil )
+ {
scriptEditor = [ [ ScriptEditorController alloc ] initWithWindowNibName: @"ScriptEditor" ];
+ [ scriptEditor setScriptEngine: engine ];
+ }
[ scriptEditor showWindow: self ];
}
@@ -75,10 +95,4 @@
return YES;
}
-- ( void ) dealloc
-{
- [ scriptEditor dealloc ];
- [ super dealloc ];
-}
-
@end
Modified: trunk/app/HDRFlow/ScriptEditorController.h
===================================================================
--- trunk/app/HDRFlow/ScriptEditorController.h 2007-08-04 15:50:45 UTC (rev 225)
+++ trunk/app/HDRFlow/ScriptEditorController.h 2007-08-04 18:12:56 UTC (rev 226)
@@ -16,9 +16,11 @@
IBOutlet NSTextView* scriptOutput_;
IBOutlet NSTextField* scriptStatus_;
- hdrflow::ScriptEngine* engine_;
+ hdrflow::ScriptEngine* engine;
}
+- ( void ) setScriptEngine: ( hdrflow::ScriptEngine* ) scriptEngine;
+
- ( void ) executeScript;
- ( void ) clearScript;
Modified: trunk/app/HDRFlow/ScriptEditorController.mm
===================================================================
--- trunk/app/HDRFlow/ScriptEditorController.mm 2007-08-04 15:50:45 UTC (rev 225)
+++ trunk/app/HDRFlow/ScriptEditorController.mm 2007-08-04 18:12:56 UTC (rev 226)
@@ -11,6 +11,11 @@
@implementation ScriptEditorController
+- ( void ) setScriptEngine: ( hdrflow::ScriptEngine* ) scriptEngine
+{
+ engine = scriptEngine;
+}
+
#pragma mark ---- IB actions ----
- ( IBAction ) executeScript: ( id ) sender
@@ -25,13 +30,11 @@
- ( id ) initWithWindowNibName: ( NSString* ) windowNibName
{
- engine_ = new hdrflow::ScriptEngine( );
return [ super initWithWindowNibName: windowNibName ];
}
- ( void ) dealloc
{
- delete engine_;
[ super dealloc ];
}
@@ -39,12 +42,12 @@
{
NSString* script = [ scriptEdit_ string ];
- if( engine_->eval( [ script UTF8String ] ) )
+ if( engine->eval( [ script UTF8String ] ) )
[ scriptStatus_ setStringValue: @"Script successful." ];
else
[ scriptStatus_ setStringValue: @"Script failed." ];
- NSString* out = [ [ [ NSString alloc ] initWithUTF8String: engine_->result( ).c_str( ) ] autorelease ];
+ NSString* out = [ [ [ NSString alloc ] initWithUTF8String: engine->result( ).c_str( ) ] autorelease ];
[ scriptOutput_ setEditable: YES ];
[ scriptOutput_ insertText: out ];
[ scriptOutput_ setEditable: NO ];
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-04 15:50:47
|
Revision: 225
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=225&view=rev
Author: glslang
Date: 2007-08-04 08:50:45 -0700 (Sat, 04 Aug 2007)
Log Message:
-----------
+ Multiple column PlugIns OutlineView
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
trunk/app/HDRFlow/PlugInsPreferencesController.mm
trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h
trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm
trunk/unity.sh
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-08-04 14:22:14 UTC (rev 224)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-08-04 15:50:45 UTC (rev 225)
@@ -9,7 +9,7 @@
<key>10</key>
<string>514 465 412 270 0 0 1440 878 </string>
<key>12</key>
- <string>500 443 439 314 0 0 1440 878 </string>
+ <string>435 427 594 345 0 0 1440 878 </string>
<key>33</key>
<string>519 453 401 293 0 0 1440 878 </string>
</dict>
@@ -17,10 +17,10 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
+ <integer>33</integer>
+ <integer>12</integer>
<integer>10</integer>
<integer>5</integer>
- <integer>33</integer>
- <integer>12</integer>
</array>
<key>IBSystem Version</key>
<string>8R2218</string>
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/PlugInsPreferencesController.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesController.mm 2007-08-04 14:22:14 UTC (rev 224)
+++ trunk/app/HDRFlow/PlugInsPreferencesController.mm 2007-08-04 15:50:45 UTC (rev 225)
@@ -81,6 +81,11 @@
{
PlugInsPreferencesOutlineViewNode* child =
[ [ PlugInsPreferencesOutlineViewNode alloc ] initWithString: [ [ NSString alloc ] initWithUTF8String: opl::to_string( I->name( ) ).c_str( ) ] ];
+
+ [ child setType: [ [ NSString alloc ] initWithUTF8String: opl::to_string( I->type( ) ).c_str( ) ] ];
+ [ child setExtension: [ [ NSString alloc ] initWithUTF8String: opl::to_string( I->extension( ) ).c_str( ) ] ];
+ [ child setMerit: [ [ NSString alloc ] initWithFormat: @"%d", I->merit( ) ] ];
+
[ node addChildObject: child ];
}
Modified: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h 2007-08-04 14:22:14 UTC (rev 224)
+++ trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h 2007-08-04 15:50:45 UTC (rev 225)
@@ -10,13 +10,24 @@
@interface PlugInsPreferencesOutlineViewNode : NSObject
{
NSMutableArray* children;
+
NSString* itemName;
+ NSString* type;
+ NSString* extension;
+ NSString* merit;
}
- ( id ) initWithString: ( NSString* ) name;
- ( void ) addChildObject: ( id ) childObject;
+
- ( NSString* ) itemName;
+- ( NSString* ) type;
+- ( void ) setType: ( NSString* ) plugInType;
+- ( NSString* ) extension;
+- ( void ) setExtension: ( NSString* ) extensionTypes;
+- ( NSString* ) merit;
+- ( void ) setMerit: ( NSString* ) meritValue;
- ( int ) numberOfChildren;
- ( NSArray* ) children;
Modified: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm 2007-08-04 14:22:14 UTC (rev 224)
+++ trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm 2007-08-04 15:50:45 UTC (rev 225)
@@ -22,7 +22,12 @@
- ( void ) dealloc
{
[ children release ];
+
[ itemName release ];
+ [ type release ];
+ [ extension release ];
+ [ merit release ];
+
[ super dealloc ];
}
@@ -36,6 +41,36 @@
return itemName;
}
+- ( NSString* ) type
+{
+ return type;
+}
+
+- ( void ) setType: ( NSString* ) plugInType
+{
+ type = plugInType;
+}
+
+- ( NSString* ) extension
+{
+ return extension;
+}
+
+- ( void ) setExtension: ( NSString* ) extensionTypes
+{
+ extension = extensionTypes;
+}
+
+- ( NSString* ) merit
+{
+ return merit;
+}
+
+- ( void ) setMerit: ( NSString* ) meritValue
+{
+ merit = meritValue;
+}
+
#pragma mark ---- NSTreeController and Bindings ----
- ( int ) numberOfChildren
Modified: trunk/unity.sh
===================================================================
--- trunk/unity.sh 2007-08-04 14:22:14 UTC (rev 224)
+++ trunk/unity.sh 2007-08-04 15:50:45 UTC (rev 225)
@@ -93,9 +93,29 @@
header_path_first=`cut -d '/' -f 5 header_temp.$$`
header_path_second=`cut -d '/' -f 6 header_temp.$$`
header_path="$header_path_first/$header_path_second"
- sed -e "s|$header_path|$2|g" -e "s|GL/glew.h|HDRFlowPlugin/glew.h|g" -e "s|boost/|HDRFlowPlugin/boost/|" $1/$i > $2.framework/Versions/Current/Headers/$i
+
+ cp $1/$i current_header.$$
+
+ deplist="openpluginlib/pl openimagelib/il openmedialib/ml"
+ for j in $deplist
+ do case $j in
+ openpluginlib* )
+ sed -e "s|$j|HDRFlowPlugin|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
+ ;;
+ openimagelib* )
+ sed -e "s|$j|HDRFlowImage|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
+ ;;
+ openmedialib* )
+ sed -e "s|$j|HDRFlowMedia|g" -i '' current_header.$$ > $2.framework/Versions/Current/Headers/$i
+ ;;
+ esac
+ done
+
+ sed -e "s|$header_path|$2|g" -e "s|GL/glew.h|HDRFlowPlugin/glew.h|g" -e "s|boost/|HDRFlowPlugin/boost/|" current_header.$$ > $2.framework/Versions/Current/Headers/$i
done
+
rm header_temp.$$
+ rm current_header.$$
}
make_framework_libs( )
@@ -356,8 +376,9 @@
esac
done
- # Copy Boost headers
+ # Copy Boost and GLEW headers
cp -R /usr/local/include/boost-$boost_new_version/boost HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers
+ cp -R /usr/local/include/GL/glew.h HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers
header_prefix="HDRFlow.framework/Versions/$framework_version/Frameworks/HDRFlowPlugin.framework/Headers/boost"
find $header_prefix -name '*.hpp' | xargs sed -e "s|boost/|HDRFlowPlugin/boost/|g" -i ''
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-04 14:22:20
|
Revision: 224
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=224&view=rev
Author: glslang
Date: 2007-08-04 07:22:14 -0700 (Sat, 04 Aug 2007)
Log Message:
-----------
+ export plugin extensions as a single string
Modified Paths:
--------------
trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp
Modified: trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp
===================================================================
--- trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp 2007-08-04 13:27:55 UTC (rev 223)
+++ trunk/lib/openlibraries/src/openpluginlib/pl/openpluginlib.hpp 2007-08-04 14:22:14 UTC (rev 224)
@@ -65,6 +65,14 @@
{ return item_.in_filter; }
wstring out_filter( ) const
{ return item_.out_filter; }
+ wstring extension( ) const
+ {
+ wstring ext;
+ for( std::vector<wstring>::const_iterator I = item_.extension.begin( ); I != item_.extension.end( ); ++I )
+ ext += *I + L" ";
+
+ return ext;
+ }
int merit( ) const
{ return item_.merit; }
void* context( ) const
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-04 13:27:58
|
Revision: 223
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=223&view=rev
Author: glslang
Date: 2007-08-04 06:27:55 -0700 (Sat, 04 Aug 2007)
Log Message:
-----------
+ changes tonemap plugin to openeffects plugin
Modified Paths:
--------------
trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.opl
Modified: trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.opl
===================================================================
--- trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.opl 2007-08-04 13:10:53 UTC (rev 222)
+++ trunk/lib/openlibraries/src/openeffectslib/plugins/tonemap/tonemap_plugin.opl 2007-08-04 13:27:55 UTC (rev 223)
@@ -1,7 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?>
<openlibraries version="1.0">
<!-- plugins go here -->
- <openmedialib name="oel" version="0.1.0">
+ <openeffectslib name="oel" version="0.1.0">
<plugin name="OpenLibraries tonemap plugin" type="filter" extension='"tm_linear", "tm_ilm_exr", "tm_ferwerda"' merit="0" filename='"libopeneffectslib_tonemap.so", "libopeneffectslib_tonemap.dylib", "openeffectslib_tonemap-vc80-d-0_4_0.dll", "openeffectslib_tonemap-vc80-r-0_4_0.dll"'/>
- </openmedialib>
+ </openeffectslib>
</openlibraries>
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-04 13:10:58
|
Revision: 222
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=222&view=rev
Author: glslang
Date: 2007-08-04 06:10:53 -0700 (Sat, 04 Aug 2007)
Log Message:
-----------
+ Preferences plugins filling of Outline view
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
trunk/app/HDRFlow/PlugInsPreferencesController.h
trunk/app/HDRFlow/PlugInsPreferencesController.mm
trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h
trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-08-03 21:29:44 UTC (rev 221)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-08-04 13:10:53 UTC (rev 222)
@@ -17,10 +17,10 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
- <integer>12</integer>
<integer>10</integer>
+ <integer>5</integer>
<integer>33</integer>
- <integer>5</integer>
+ <integer>12</integer>
</array>
<key>IBSystem Version</key>
<string>8R2218</string>
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/PlugInsPreferencesController.h
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesController.h 2007-08-03 21:29:44 UTC (rev 221)
+++ trunk/app/HDRFlow/PlugInsPreferencesController.h 2007-08-04 13:10:53 UTC (rev 222)
@@ -9,10 +9,11 @@
@interface PlugInsPreferencesController : NSObject
{
- NSMutableArray* rootItems;
+ NSMutableArray* plugIns;
PlugInsPreferencesOutlineViewNode* selectedItem;
}
-- ( void ) initRootItems;
+- ( void ) initPlugIns;
+- ( void ) initNodeMetadata: ( NSString* ) name library: ( NSString* ) library type: ( NSString* ) type;
@end
Modified: trunk/app/HDRFlow/PlugInsPreferencesController.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesController.mm 2007-08-03 21:29:44 UTC (rev 221)
+++ trunk/app/HDRFlow/PlugInsPreferencesController.mm 2007-08-04 13:10:53 UTC (rev 222)
@@ -5,34 +5,87 @@
// Released under the GPL.
// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+#import <HDRFlow/openlibraries.hpp>
+
#import "PlugInsPreferencesController.h"
+namespace opl = olib::openpluginlib;
+
+namespace
+{
+ struct query_traits
+ {
+ explicit query_traits( const opl::wstring& libname, const opl::wstring& type )
+ : libname_( libname )
+ , type_( type )
+ { }
+
+ opl::wstring libname( ) const
+ { return libname_; }
+
+ opl::wstring to_match( ) const
+ { return L""; }
+
+ opl::wstring type( ) const
+ { return type_; }
+
+ int merit( ) const
+ { return 0; }
+
+ opl::wstring libname_;
+ opl::wstring type_;
+ };
+}
+
@implementation PlugInsPreferencesController
- ( id ) init
{
[ super init ];
- rootItems = [ [ NSMutableArray alloc ] init ];
- [ self initRootItems ];
- selectedItem = [ rootItems objectAtIndex: 0 ];
+ opl::init( );
+ plugIns = [ [ NSMutableArray alloc ] init ];
+
+ [ self initPlugIns ];
+ selectedItem = [ plugIns objectAtIndex: 0 ];
+
return self;
}
- ( void ) dealloc
{
- [ rootItems release ];
+ [ plugIns release ];
[ super dealloc ];
}
-- ( void ) initRootItems
+- ( void ) initPlugIns
{
- [ rootItems addObject: [ [ PlugInsPreferencesOutlineViewNode alloc ] initWithString: @"All" ] ];
- [ rootItems addObject: [ [ PlugInsPreferencesOutlineViewNode alloc ] initWithString: @"Image" ] ];
- [ rootItems addObject: [ [ PlugInsPreferencesOutlineViewNode alloc ] initWithString: @"Media" ] ];
- [ rootItems addObject: [ [ PlugInsPreferencesOutlineViewNode alloc ] initWithString: @"Effects" ] ];
- [ rootItems addObject: [ [ PlugInsPreferencesOutlineViewNode alloc ] initWithString: @"OFX" ] ];
+ [ self initNodeMetadata: @"All" library: @"" type: @"" ];
+ [ self initNodeMetadata: @"Image" library: @"openimagelib" type: @"" ];
+ [ self initNodeMetadata: @"Media" library: @"openmedialib" type: @"" ];
+ [ self initNodeMetadata: @"Effects" library: @"openeffectslib" type: @"" ];
+ [ self initNodeMetadata: @"OFX" library: @"" type: @"ofx" ];
}
+- ( void ) initNodeMetadata: ( NSString* ) name library: ( NSString* ) library type: ( NSString* ) type
+{
+ typedef opl::discovery<query_traits> discovery;
+
+ discovery plugins( query_traits( opl::to_wstring( [ library UTF8String ] ), opl::to_wstring( [ type UTF8String ] ) ) );
+ if( !plugins.empty( ) )
+ {
+ PlugInsPreferencesOutlineViewNode* node = [ [ PlugInsPreferencesOutlineViewNode alloc ] initWithString: name ];
+
+ for( discovery::const_iterator I = plugins.begin( ); I != plugins.end( ); ++I )
+ {
+ PlugInsPreferencesOutlineViewNode* child =
+ [ [ PlugInsPreferencesOutlineViewNode alloc ] initWithString: [ [ NSString alloc ] initWithUTF8String: opl::to_string( I->name( ) ).c_str( ) ] ];
+ [ node addChildObject: child ];
+ }
+
+ [ plugIns addObject: node ];
+ }
+}
+
@end
Modified: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h 2007-08-03 21:29:44 UTC (rev 221)
+++ trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h 2007-08-04 13:10:53 UTC (rev 222)
@@ -16,8 +16,9 @@
- ( id ) initWithString: ( NSString* ) name;
- ( void ) addChildObject: ( id ) childObject;
+- ( NSString* ) itemName;
+
- ( int ) numberOfChildren;
-- ( NSString* ) itemName;
- ( NSArray* ) children;
- ( BOOL ) isLeaf;
Modified: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm 2007-08-03 21:29:44 UTC (rev 221)
+++ trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm 2007-08-04 13:10:53 UTC (rev 222)
@@ -13,6 +13,7 @@
{
[ super init ];
children = [ [ NSMutableArray alloc ] init ];
+
itemName = [ [ NSString alloc ] initWithString: name ];
return self;
@@ -30,14 +31,16 @@
[ children addObject: childObject ];
}
-- ( int ) numberOfChildren
+- ( NSString* ) itemName
{
- return [ children count ];
+ return itemName;
}
-- ( NSString* ) itemName
+#pragma mark ---- NSTreeController and Bindings ----
+
+- ( int ) numberOfChildren
{
- return itemName;
+ return [ children count ];
}
- ( NSArray* ) children
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-08-03 21:29:45
|
Revision: 221
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=221&view=rev
Author: glslang
Date: 2007-08-03 14:29:44 -0700 (Fri, 03 Aug 2007)
Log Message:
-----------
+Plugins Preferences Popup button and Outline view synchronised update
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
trunk/app/HDRFlow/PlugInsPreferencesController.h
trunk/app/HDRFlow/PlugInsPreferencesController.mm
trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h
trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-30 22:22:35 UTC (rev 220)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-08-03 21:29:44 UTC (rev 221)
@@ -17,10 +17,10 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
- <integer>5</integer>
<integer>12</integer>
+ <integer>10</integer>
<integer>33</integer>
- <integer>10</integer>
+ <integer>5</integer>
</array>
<key>IBSystem Version</key>
<string>8R2218</string>
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/PlugInsPreferencesController.h
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesController.h 2007-07-30 22:22:35 UTC (rev 220)
+++ trunk/app/HDRFlow/PlugInsPreferencesController.h 2007-08-03 21:29:44 UTC (rev 221)
@@ -13,13 +13,6 @@
PlugInsPreferencesOutlineViewNode* selectedItem;
}
-- ( int ) outlineView: ( NSOutlineView* ) outlineView numberOfChildrenOfItem: ( id ) item;
-- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView isItemExpandable: ( id ) item;
-- ( id ) outlineView: ( NSOutlineView* ) outlineView child: ( int ) index ofItem: ( id ) item;
-- ( id ) outlineView: ( NSOutlineView* ) outlineView objectValueForTableColumn: ( NSTableColumn* ) tableColumn byItem: ( id ) item;
-- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView shouldEditTableColumn: ( NSTableColumn* ) tableColumn item: ( id ) item;
-- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView shouldSelectItem: ( id ) item;
-
- ( void ) initRootItems;
@end
Modified: trunk/app/HDRFlow/PlugInsPreferencesController.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesController.mm 2007-07-30 22:22:35 UTC (rev 220)
+++ trunk/app/HDRFlow/PlugInsPreferencesController.mm 2007-08-03 21:29:44 UTC (rev 221)
@@ -26,42 +26,6 @@
[ super dealloc ];
}
-- ( int ) outlineView: ( NSOutlineView* ) outlineView numberOfChildrenOfItem: ( id ) item
-{
- return item == nil ? 1 : [ item numberOfChildren ];
-}
-
-- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView isItemExpandable: ( id ) item
-{
- return [ selectedItem numberOfChildren ] != 0;
-}
-
-- ( id ) outlineView: ( NSOutlineView* ) outlineView child: ( int ) index ofItem: ( id ) item
-{
- if( item == nil )
- return selectedItem;
- else
- return [ item childAtIndex: index ];
-}
-
-- ( id ) outlineView: ( NSOutlineView* ) outlineView objectValueForTableColumn: ( NSTableColumn* ) tableColumn byItem: ( id ) item
-{
- if( item == nil )
- return [ selectedItem itemName ];
- else
- return [ item itemName ];
-}
-
-- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView shouldEditTableColumn: ( NSTableColumn* ) tableColumn item: ( id ) item
-{
- return NO;
-}
-
-- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView shouldSelectItem: ( id ) item
-{
- return YES;
-}
-
- ( void ) initRootItems
{
[ rootItems addObject: [ [ PlugInsPreferencesOutlineViewNode alloc ] initWithString: @"All" ] ];
Modified: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h 2007-07-30 22:22:35 UTC (rev 220)
+++ trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h 2007-08-03 21:29:44 UTC (rev 221)
@@ -17,9 +17,8 @@
- ( void ) addChildObject: ( id ) childObject;
- ( int ) numberOfChildren;
-- ( id ) childAtIndex: ( int ) index;
- ( NSString* ) itemName;
+- ( NSArray* ) children;
+- ( BOOL ) isLeaf;
-- ( void ) indexPath;
-
@end
Modified: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm 2007-07-30 22:22:35 UTC (rev 220)
+++ trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm 2007-08-03 21:29:44 UTC (rev 221)
@@ -35,18 +35,19 @@
return [ children count ];
}
-- ( id ) childAtIndex: ( int ) index
+- ( NSString* ) itemName
{
- return [ [ [ children objectAtIndex: index ] retain ] autorelease ];
+ return itemName;
}
-- ( NSString* ) itemName
+- ( NSArray* ) children
{
- return itemName;
+ return children;
}
-- ( void ) indexPath
+- ( BOOL ) isLeaf
{
+ return [ self numberOfChildren ] == 0;
}
@end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-30 22:22:37
|
Revision: 220
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=220&view=rev
Author: glslang
Date: 2007-07-30 15:22:35 -0700 (Mon, 30 Jul 2007)
Log Message:
-----------
+Initial table view bindings
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h
trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-29 22:02:38 UTC (rev 219)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-30 22:22:35 UTC (rev 220)
@@ -17,10 +17,10 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
- <integer>10</integer>
- <integer>33</integer>
<integer>5</integer>
<integer>12</integer>
+ <integer>33</integer>
+ <integer>10</integer>
</array>
<key>IBSystem Version</key>
<string>8R2218</string>
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h 2007-07-29 22:02:38 UTC (rev 219)
+++ trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h 2007-07-30 22:22:35 UTC (rev 220)
@@ -18,7 +18,8 @@
- ( void ) addChildObject: ( id ) childObject;
- ( int ) numberOfChildren;
- ( id ) childAtIndex: ( int ) index;
-
- ( NSString* ) itemName;
+- ( void ) indexPath;
+
@end
Modified: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm 2007-07-29 22:02:38 UTC (rev 219)
+++ trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm 2007-07-30 22:22:35 UTC (rev 220)
@@ -45,4 +45,8 @@
return itemName;
}
+- ( void ) indexPath
+{
+}
+
@end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-29 22:02:42
|
Revision: 219
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=219&view=rev
Author: glslang
Date: 2007-07-29 15:02:38 -0700 (Sun, 29 Jul 2007)
Log Message:
-----------
+OutlineView in Plugins Preferences
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
trunk/app/HDRFlow/PlugInsPreferencesController.h
trunk/app/HDRFlow/PlugInsPreferencesController.mm
trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h
trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-29 18:17:40 UTC (rev 218)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-29 22:02:38 UTC (rev 219)
@@ -17,10 +17,10 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
+ <integer>10</integer>
<integer>33</integer>
<integer>5</integer>
<integer>12</integer>
- <integer>10</integer>
</array>
<key>IBSystem Version</key>
<string>8R2218</string>
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/PlugInsPreferencesController.h
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesController.h 2007-07-29 18:17:40 UTC (rev 218)
+++ trunk/app/HDRFlow/PlugInsPreferencesController.h 2007-07-29 22:02:38 UTC (rev 219)
@@ -10,7 +10,7 @@
@interface PlugInsPreferencesController : NSObject
{
NSMutableArray* rootItems;
- NSObject* selectedItem;
+ PlugInsPreferencesOutlineViewNode* selectedItem;
}
- ( int ) outlineView: ( NSOutlineView* ) outlineView numberOfChildrenOfItem: ( id ) item;
Modified: trunk/app/HDRFlow/PlugInsPreferencesController.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesController.mm 2007-07-29 18:17:40 UTC (rev 218)
+++ trunk/app/HDRFlow/PlugInsPreferencesController.mm 2007-07-29 22:02:38 UTC (rev 219)
@@ -28,22 +28,28 @@
- ( int ) outlineView: ( NSOutlineView* ) outlineView numberOfChildrenOfItem: ( id ) item
{
- return item == nil ? [ rootItems count ] : [ item numberOfChildren ];
+ return item == nil ? 1 : [ item numberOfChildren ];
}
- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView isItemExpandable: ( id ) item
{
- return item == nil ? YES : [ item numberOfChildren ] != 0;
+ return [ selectedItem numberOfChildren ] != 0;
}
- ( id ) outlineView: ( NSOutlineView* ) outlineView child: ( int ) index ofItem: ( id ) item
{
- return nil;
+ if( item == nil )
+ return selectedItem;
+ else
+ return [ item childAtIndex: index ];
}
- ( id ) outlineView: ( NSOutlineView* ) outlineView objectValueForTableColumn: ( NSTableColumn* ) tableColumn byItem: ( id ) item
{
- return nil;
+ if( item == nil )
+ return [ selectedItem itemName ];
+ else
+ return [ item itemName ];
}
- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView shouldEditTableColumn: ( NSTableColumn* ) tableColumn item: ( id ) item
@@ -53,7 +59,7 @@
- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView shouldSelectItem: ( id ) item
{
- return NO;
+ return YES;
}
- ( void ) initRootItems
Modified: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h 2007-07-29 18:17:40 UTC (rev 218)
+++ trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h 2007-07-29 22:02:38 UTC (rev 219)
@@ -19,4 +19,6 @@
- ( int ) numberOfChildren;
- ( id ) childAtIndex: ( int ) index;
+- ( NSString* ) itemName;
+
@end
Modified: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm 2007-07-29 18:17:40 UTC (rev 218)
+++ trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm 2007-07-29 22:02:38 UTC (rev 219)
@@ -14,7 +14,7 @@
[ super init ];
children = [ [ NSMutableArray alloc ] init ];
itemName = [ [ NSString alloc ] initWithString: name ];
-
+
return self;
}
@@ -40,4 +40,9 @@
return [ [ [ children objectAtIndex: index ] retain ] autorelease ];
}
+- ( NSString* ) itemName
+{
+ return itemName;
+}
+
@end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-29 18:17:43
|
Revision: 218
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=218&view=rev
Author: glslang
Date: 2007-07-29 11:17:40 -0700 (Sun, 29 Jul 2007)
Log Message:
-----------
+ More popup menu bindings
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
trunk/app/HDRFlow/PlugInsPreferencesController.h
trunk/app/HDRFlow/PlugInsPreferencesController.mm
trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h
trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/PlugInsPreferencesController.h
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesController.h 2007-07-29 17:57:59 UTC (rev 217)
+++ trunk/app/HDRFlow/PlugInsPreferencesController.h 2007-07-29 18:17:40 UTC (rev 218)
@@ -20,4 +20,6 @@
- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView shouldEditTableColumn: ( NSTableColumn* ) tableColumn item: ( id ) item;
- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView shouldSelectItem: ( id ) item;
+- ( void ) initRootItems;
+
@end
Modified: trunk/app/HDRFlow/PlugInsPreferencesController.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesController.mm 2007-07-29 17:57:59 UTC (rev 217)
+++ trunk/app/HDRFlow/PlugInsPreferencesController.mm 2007-07-29 18:17:40 UTC (rev 218)
@@ -14,6 +14,9 @@
[ super init ];
rootItems = [ [ NSMutableArray alloc ] init ];
+ [ self initRootItems ];
+ selectedItem = [ rootItems objectAtIndex: 0 ];
+
return self;
}
@@ -53,4 +56,13 @@
return NO;
}
+- ( void ) initRootItems
+{
+ [ rootItems addObject: [ [ PlugInsPreferencesOutlineViewNode alloc ] initWithString: @"All" ] ];
+ [ rootItems addObject: [ [ PlugInsPreferencesOutlineViewNode alloc ] initWithString: @"Image" ] ];
+ [ rootItems addObject: [ [ PlugInsPreferencesOutlineViewNode alloc ] initWithString: @"Media" ] ];
+ [ rootItems addObject: [ [ PlugInsPreferencesOutlineViewNode alloc ] initWithString: @"Effects" ] ];
+ [ rootItems addObject: [ [ PlugInsPreferencesOutlineViewNode alloc ] initWithString: @"OFX" ] ];
+}
+
@end
Modified: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h 2007-07-29 17:57:59 UTC (rev 217)
+++ trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h 2007-07-29 18:17:40 UTC (rev 218)
@@ -13,10 +13,10 @@
NSString* itemName;
}
+- ( id ) initWithString: ( NSString* ) name;
+
- ( void ) addChildObject: ( id ) childObject;
- ( int ) numberOfChildren;
- ( id ) childAtIndex: ( int ) index;
-- ( void ) setName: ( NSString* ) name;
-- ( NSString* ) name;
@end
Modified: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm 2007-07-29 17:57:59 UTC (rev 217)
+++ trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm 2007-07-29 18:17:40 UTC (rev 218)
@@ -9,10 +9,11 @@
@implementation PlugInsPreferencesOutlineViewNode
-- ( id ) init
+- ( id ) initWithString: ( NSString* ) name
{
[ super init ];
children = [ [ NSMutableArray alloc ] init ];
+ itemName = [ [ NSString alloc ] initWithString: name ];
return self;
}
@@ -39,14 +40,4 @@
return [ [ [ children objectAtIndex: index ] retain ] autorelease ];
}
-- ( void ) setName: ( NSString* ) name
-{
- itemName = [ [ NSString alloc ] initWithString: name ];
-}
-
-- ( NSString* ) name
-{
- return itemName;
-}
-
@end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-29 17:58:01
|
Revision: 217
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=217&view=rev
Author: glslang
Date: 2007-07-29 10:57:59 -0700 (Sun, 29 Jul 2007)
Log Message:
-----------
+initial bindings for plugins popup button in preferences
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
trunk/app/HDRFlow/PlugInsPreferencesController.h
trunk/app/HDRFlow/PlugInsPreferencesController.mm
trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h
trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib 2007-07-29 08:31:14 UTC (rev 216)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib 2007-07-29 17:57:59 UTC (rev 217)
@@ -7,6 +7,11 @@
SUPERCLASS = NSObject;
},
{
+ CLASS = PlugInsPreferencesOutlineViewNode;
+ LANGUAGE = ObjC;
+ SUPERCLASS = NSObject;
+ },
+ {
ACTIONS = {toolbarItem = id; };
CLASS = PreferencesController;
LANGUAGE = ObjC;
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-29 08:31:14 UTC (rev 216)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-29 17:57:59 UTC (rev 217)
@@ -17,9 +17,9 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
- <integer>12</integer>
<integer>33</integer>
<integer>5</integer>
+ <integer>12</integer>
<integer>10</integer>
</array>
<key>IBSystem Version</key>
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/PlugInsPreferencesController.h
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesController.h 2007-07-29 08:31:14 UTC (rev 216)
+++ trunk/app/HDRFlow/PlugInsPreferencesController.h 2007-07-29 17:57:59 UTC (rev 217)
@@ -9,9 +9,15 @@
@interface PlugInsPreferencesController : NSObject
{
+ NSMutableArray* rootItems;
+ NSObject* selectedItem;
}
-- ( int ) outlineView: ( NSOutlineView* ) outlineView numberOfChildrenOfItem: ( id ) item;
+- ( int ) outlineView: ( NSOutlineView* ) outlineView numberOfChildrenOfItem: ( id ) item;
- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView isItemExpandable: ( id ) item;
+- ( id ) outlineView: ( NSOutlineView* ) outlineView child: ( int ) index ofItem: ( id ) item;
+- ( id ) outlineView: ( NSOutlineView* ) outlineView objectValueForTableColumn: ( NSTableColumn* ) tableColumn byItem: ( id ) item;
+- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView shouldEditTableColumn: ( NSTableColumn* ) tableColumn item: ( id ) item;
+- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView shouldSelectItem: ( id ) item;
@end
Modified: trunk/app/HDRFlow/PlugInsPreferencesController.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesController.mm 2007-07-29 08:31:14 UTC (rev 216)
+++ trunk/app/HDRFlow/PlugInsPreferencesController.mm 2007-07-29 17:57:59 UTC (rev 217)
@@ -9,9 +9,23 @@
@implementation PlugInsPreferencesController
+- ( id ) init
+{
+ [ super init ];
+ rootItems = [ [ NSMutableArray alloc ] init ];
+
+ return self;
+}
+
+- ( void ) dealloc
+{
+ [ rootItems release ];
+ [ super dealloc ];
+}
+
- ( int ) outlineView: ( NSOutlineView* ) outlineView numberOfChildrenOfItem: ( id ) item
{
- return item == nil ? 1 : [ item numberOfChildren ];
+ return item == nil ? [ rootItems count ] : [ item numberOfChildren ];
}
- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView isItemExpandable: ( id ) item
@@ -19,4 +33,24 @@
return item == nil ? YES : [ item numberOfChildren ] != 0;
}
+- ( id ) outlineView: ( NSOutlineView* ) outlineView child: ( int ) index ofItem: ( id ) item
+{
+ return nil;
+}
+
+- ( id ) outlineView: ( NSOutlineView* ) outlineView objectValueForTableColumn: ( NSTableColumn* ) tableColumn byItem: ( id ) item
+{
+ return nil;
+}
+
+- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView shouldEditTableColumn: ( NSTableColumn* ) tableColumn item: ( id ) item
+{
+ return NO;
+}
+
+- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView shouldSelectItem: ( id ) item
+{
+ return NO;
+}
+
@end
Modified: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h 2007-07-29 08:31:14 UTC (rev 216)
+++ trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h 2007-07-29 17:57:59 UTC (rev 217)
@@ -9,8 +9,14 @@
@interface PlugInsPreferencesOutlineViewNode : NSObject
{
+ NSMutableArray* children;
+ NSString* itemName;
}
+- ( void ) addChildObject: ( id ) childObject;
- ( int ) numberOfChildren;
+- ( id ) childAtIndex: ( int ) index;
+- ( void ) setName: ( NSString* ) name;
+- ( NSString* ) name;
@end
Modified: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm 2007-07-29 08:31:14 UTC (rev 216)
+++ trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm 2007-07-29 17:57:59 UTC (rev 217)
@@ -9,9 +9,44 @@
@implementation PlugInsPreferencesOutlineViewNode
+- ( id ) init
+{
+ [ super init ];
+ children = [ [ NSMutableArray alloc ] init ];
+
+ return self;
+}
+
+- ( void ) dealloc
+{
+ [ children release ];
+ [ itemName release ];
+ [ super dealloc ];
+}
+
+- ( void ) addChildObject: ( id ) childObject
+{
+ [ children addObject: childObject ];
+}
+
- ( int ) numberOfChildren
{
- return 0;
+ return [ children count ];
}
+- ( id ) childAtIndex: ( int ) index
+{
+ return [ [ [ children objectAtIndex: index ] retain ] autorelease ];
+}
+
+- ( void ) setName: ( NSString* ) name
+{
+ itemName = [ [ NSString alloc ] initWithString: name ];
+}
+
+- ( NSString* ) name
+{
+ return itemName;
+}
+
@end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-29 08:31:16
|
Revision: 216
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=216&view=rev
Author: glslang
Date: 2007-07-29 01:31:14 -0700 (Sun, 29 Jul 2007)
Log Message:
-----------
+ eol-style to native
Property Changed:
----------------
trunk/app/HDRFlow/HDRFlowController.mm
trunk/app/HDRFlow/PlugInsPreferencesController.h
trunk/app/HDRFlow/PlugInsPreferencesController.mm
trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h
trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm
trunk/app/HDRFlow/Viewer.cpp
trunk/app/HDRFlow/Viewer.hpp
Property changes on: trunk/app/HDRFlow/HDRFlowController.mm
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/app/HDRFlow/PlugInsPreferencesController.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/app/HDRFlow/PlugInsPreferencesController.mm
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/app/HDRFlow/Viewer.cpp
___________________________________________________________________
Name: svn:eol-style
+ native
Property changes on: trunk/app/HDRFlow/Viewer.hpp
___________________________________________________________________
Name: svn:eol-style
+ native
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-28 23:17:27
|
Revision: 215
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=215&view=rev
Author: glslang
Date: 2007-07-28 16:17:23 -0700 (Sat, 28 Jul 2007)
Log Message:
-----------
+initial Preferences plugins pane implementation
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
Added Paths:
-----------
trunk/app/HDRFlow/HDRFlowController.mm
trunk/app/HDRFlow/PlugInsPreferencesController.h
trunk/app/HDRFlow/PlugInsPreferencesController.mm
trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h
trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm
Removed Paths:
-------------
trunk/app/HDRFlow/HDRFlowController.m
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib 2007-07-28 18:46:38 UTC (rev 214)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib 2007-07-28 23:17:23 UTC (rev 215)
@@ -2,6 +2,11 @@
IBClasses = (
{CLASS = FirstResponder; LANGUAGE = ObjC; SUPERCLASS = NSObject; },
{
+ CLASS = PlugInsPreferencesController;
+ LANGUAGE = ObjC;
+ SUPERCLASS = NSObject;
+ },
+ {
ACTIONS = {toolbarItem = id; };
CLASS = PreferencesController;
LANGUAGE = ObjC;
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-28 18:46:38 UTC (rev 214)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-28 23:17:23 UTC (rev 215)
@@ -3,13 +3,13 @@
<plist version="1.0">
<dict>
<key>IBDocumentLocation</key>
- <string>69 54 356 240 0 0 1440 878 </string>
+ <string>59 71 356 240 0 0 1440 878 </string>
<key>IBEditorPositions</key>
<dict>
<key>10</key>
<string>514 465 412 270 0 0 1440 878 </string>
<key>12</key>
- <string>500 476 439 314 0 0 1440 878 </string>
+ <string>500 443 439 314 0 0 1440 878 </string>
<key>33</key>
<string>519 453 401 293 0 0 1440 878 </string>
</dict>
@@ -17,10 +17,10 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
+ <integer>12</integer>
<integer>33</integer>
<integer>5</integer>
<integer>10</integer>
- <integer>12</integer>
</array>
<key>IBSystem Version</key>
<string>8R2218</string>
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj
===================================================================
--- trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-07-28 18:46:38 UTC (rev 214)
+++ trunk/app/HDRFlow/HDRFlow.xcodeproj/project.pbxproj 2007-07-28 23:17:23 UTC (rev 215)
@@ -11,12 +11,14 @@
671E22A30C4166E400CA1860 /* ScriptEditorController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 671E22A20C4166E400CA1860 /* ScriptEditorController.mm */; };
673D04500C522C980096513A /* PreferencesController.m in Sources */ = {isa = PBXBuildFile; fileRef = 673D044F0C522C980096513A /* PreferencesController.m */; };
674E44640C3F854A0036A908 /* ScriptEditor.nib in Resources */ = {isa = PBXBuildFile; fileRef = 674E44620C3F854A0036A908 /* ScriptEditor.nib */; };
+ 677740360C5C0184005FF29D /* PlugInsPreferencesOutlineViewNode.mm in Sources */ = {isa = PBXBuildFile; fileRef = 677740350C5C0184005FF29D /* PlugInsPreferencesOutlineViewNode.mm */; };
678A4AA70C2B18B50011E9F7 /* CustomOpenGLView.m in Sources */ = {isa = PBXBuildFile; fileRef = 678A4AA60C2B18B50011E9F7 /* CustomOpenGLView.m */; };
67A8A6EA0C41836600DB3F1B /* Python.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 67A8A6E90C41836600DB3F1B /* Python.framework */; };
67A8A73E0C4183C500DB3F1B /* ScriptEngine.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67A8A73D0C4183C500DB3F1B /* ScriptEngine.cpp */; };
- 67BD59C90C36BE3700F0F7DF /* HDRFlowController.m in Sources */ = {isa = PBXBuildFile; fileRef = 67BD59C80C36BE3700F0F7DF /* HDRFlowController.m */; };
67C064EE0C52231A00E9ED8E /* Preferences.nib in Resources */ = {isa = PBXBuildFile; fileRef = 67C064EC0C52231A00E9ED8E /* Preferences.nib */; };
67C0BA2B0C5B69C600E0E258 /* Viewer.cpp in Sources */ = {isa = PBXBuildFile; fileRef = 67C0BA2A0C5B69C600E0E258 /* Viewer.cpp */; };
+ 67C0BED90C5BCD4600E0E258 /* HDRFlowController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 67C0BED80C5BCD4600E0E258 /* HDRFlowController.mm */; };
+ 67C0BEFB0C5BED8500E0E258 /* PlugInsPreferencesController.mm in Sources */ = {isa = PBXBuildFile; fileRef = 67C0BEFA0C5BED8500E0E258 /* PlugInsPreferencesController.mm */; };
67C3D3220C53A71000136EE8 /* ToolbarHolder.m in Sources */ = {isa = PBXBuildFile; fileRef = 67C3D3210C53A71000136EE8 /* ToolbarHolder.m */; };
67C8D8B80C4AD8340006B871 /* bootstrap.py in Resources */ = {isa = PBXBuildFile; fileRef = 67C8D8B70C4AD8340006B871 /* bootstrap.py */; };
67CF88AA0C53D62E005B6662 /* AdvancedPreferences.tiff in Resources */ = {isa = PBXBuildFile; fileRef = 67CF88A90C53D62E005B6662 /* AdvancedPreferences.tiff */; };
@@ -45,15 +47,19 @@
673D04450C522A610096513A /* PreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PreferencesController.h; sourceTree = "<group>"; };
673D044F0C522C980096513A /* PreferencesController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = PreferencesController.m; sourceTree = "<group>"; };
674E44630C3F854A0036A908 /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/ScriptEditor.nib; sourceTree = "<group>"; };
+ 6777402D0C5C0022005FF29D /* PlugInsPreferencesOutlineViewNode.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PlugInsPreferencesOutlineViewNode.h; sourceTree = "<group>"; };
+ 677740350C5C0184005FF29D /* PlugInsPreferencesOutlineViewNode.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = PlugInsPreferencesOutlineViewNode.mm; sourceTree = "<group>"; };
678A4AA60C2B18B50011E9F7 /* CustomOpenGLView.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = CustomOpenGLView.m; sourceTree = "<group>"; };
67A8A6E40C4181C600DB3F1B /* ScriptEngine.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = ScriptEngine.hpp; sourceTree = "<group>"; };
67A8A6E90C41836600DB3F1B /* Python.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = Python.framework; path = /System/Library/Frameworks/Python.framework; sourceTree = "<absolute>"; };
67A8A73D0C4183C500DB3F1B /* ScriptEngine.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = ScriptEngine.cpp; sourceTree = "<group>"; };
67BD59C70C36BE3600F0F7DF /* HDRFlowController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = HDRFlowController.h; sourceTree = "<group>"; };
- 67BD59C80C36BE3700F0F7DF /* HDRFlowController.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = HDRFlowController.m; sourceTree = "<group>"; };
67C064ED0C52231A00E9ED8E /* English */ = {isa = PBXFileReference; lastKnownFileType = wrapper.nib; name = English; path = English.lproj/Preferences.nib; sourceTree = "<group>"; };
67C0BA220C5B69AF00E0E258 /* Viewer.hpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.h; path = Viewer.hpp; sourceTree = "<group>"; };
67C0BA2A0C5B69C600E0E258 /* Viewer.cpp */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.cpp; path = Viewer.cpp; sourceTree = "<group>"; };
+ 67C0BED80C5BCD4600E0E258 /* HDRFlowController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = HDRFlowController.mm; sourceTree = "<group>"; };
+ 67C0BEF40C5BED2C00E0E258 /* PlugInsPreferencesController.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = PlugInsPreferencesController.h; sourceTree = "<group>"; };
+ 67C0BEFA0C5BED8500E0E258 /* PlugInsPreferencesController.mm */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.cpp.objcpp; path = PlugInsPreferencesController.mm; sourceTree = "<group>"; };
67C3D3170C5361C600136EE8 /* ToolbarHolder.h */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.h; path = ToolbarHolder.h; sourceTree = "<group>"; };
67C3D3210C53A71000136EE8 /* ToolbarHolder.m */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = sourcecode.c.objc; path = ToolbarHolder.m; sourceTree = "<group>"; };
67C8D8B70C4AD8340006B871 /* bootstrap.py */ = {isa = PBXFileReference; fileEncoding = 30; lastKnownFileType = text.script.python; name = bootstrap.py; path = Scripts/bootstrap.py; sourceTree = "<group>"; };
@@ -91,7 +97,11 @@
67DC61B10C2EAB5E005CFE6E /* ViewportOpenGLView.h */,
67DC61B80C2EAC94005CFE6E /* ViewportOpenGLView.m */,
67BD59C70C36BE3600F0F7DF /* HDRFlowController.h */,
- 67BD59C80C36BE3700F0F7DF /* HDRFlowController.m */,
+ 67C0BED80C5BCD4600E0E258 /* HDRFlowController.mm */,
+ 67C0BEF40C5BED2C00E0E258 /* PlugInsPreferencesController.h */,
+ 67C0BEFA0C5BED8500E0E258 /* PlugInsPreferencesController.mm */,
+ 6777402D0C5C0022005FF29D /* PlugInsPreferencesOutlineViewNode.h */,
+ 677740350C5C0184005FF29D /* PlugInsPreferencesOutlineViewNode.mm */,
673D04450C522A610096513A /* PreferencesController.h */,
673D044F0C522C980096513A /* PreferencesController.m */,
671E22910C41652E00CA1860 /* ScriptEditorController.h */,
@@ -259,12 +269,14 @@
8D11072D0486CEB800E47090 /* main.m in Sources */,
678A4AA70C2B18B50011E9F7 /* CustomOpenGLView.m in Sources */,
67DC61B90C2EAC94005CFE6E /* ViewportOpenGLView.m in Sources */,
- 67BD59C90C36BE3700F0F7DF /* HDRFlowController.m in Sources */,
671E22A30C4166E400CA1860 /* ScriptEditorController.mm in Sources */,
67A8A73E0C4183C500DB3F1B /* ScriptEngine.cpp in Sources */,
673D04500C522C980096513A /* PreferencesController.m in Sources */,
67C3D3220C53A71000136EE8 /* ToolbarHolder.m in Sources */,
67C0BA2B0C5B69C600E0E258 /* Viewer.cpp in Sources */,
+ 67C0BED90C5BCD4600E0E258 /* HDRFlowController.mm in Sources */,
+ 67C0BEFB0C5BED8500E0E258 /* PlugInsPreferencesController.mm in Sources */,
+ 677740360C5C0184005FF29D /* PlugInsPreferencesOutlineViewNode.mm in Sources */,
);
runOnlyForDeploymentPostprocessing = 0;
};
Deleted: trunk/app/HDRFlow/HDRFlowController.m
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.m 2007-07-28 18:46:38 UTC (rev 214)
+++ trunk/app/HDRFlow/HDRFlowController.m 2007-07-28 23:17:23 UTC (rev 215)
@@ -1,84 +0,0 @@
-
-// HDRFlow - A image processing application
-
-// Copyright (c) 2007 Goncalo N. M. de Carvalho
-// Released under the GPL.
-// For more information, see http://www.cryogenicgraphics.com/hdrflow.
-
-#import "HDRFlowController.h"
-#import "ViewportOpenGLView.h"
-#import "PreferencesController.h"
-
-@implementation HDRFlowController
-
-#pragma mark ---- IB actions ----
-
-- ( void ) openPanelDidEnd: ( NSOpenPanel* ) panel returnCode: ( int ) rc contextInfo: ( void* ) ctx
-{
- if( rc == NSOKButton )
- {
- }
-}
-
-- ( IBAction ) fileOpen: ( id ) sender
-{
- NSOpenPanel* openPanel = [ NSOpenPanel openPanel ];
-
- [ openPanel setCanChooseDirectories: YES ];
- [ openPanel setCanChooseFiles: YES ];
- [ openPanel setAllowsMultipleSelection: YES ];
-
- NSArray* fileTypes = [ NSArray arrayWithObjects:@"exr", @"jpg", nil ];
-
- [ openPanel beginSheetForDirectory: nil
- file: nil
- types: fileTypes
- modalForWindow: [ NSApp mainWindow ]
- modalDelegate: self
- didEndSelector: @selector( openPanelDidEnd: returnCode: contextInfo: )
- contextInfo: nil ];
-}
-
-- ( IBAction ) scriptEditor: ( id ) sender
-{
- if( scriptEditor == nil )
- scriptEditor = [ [ ScriptEditorController alloc ] initWithWindowNibName: @"ScriptEditor" ];
-
- [ scriptEditor showWindow: self ];
-}
-
-- ( IBAction ) viewFullscreen: ( id ) sender
-{
- [ openGLView fullscreen ];
-}
-
-- ( IBAction ) preferences: ( id ) sender
-{
- if( preferences == nil )
- preferences = [ [ PreferencesController alloc ] initWithWindowNibName: @"Preferences" ];
-
- [ preferences showWindow: self ];
-}
-
-- ( BOOL ) acceptsFirstResponder
-{
- return YES;
-}
-
-- ( BOOL ) becomesFirstResponder
-{
- return YES;
-}
-
-- ( BOOL ) resignFirstResponder
-{
- return YES;
-}
-
-- ( void ) dealloc
-{
- [ scriptEditor dealloc ];
- [ super dealloc ];
-}
-
-@end
Added: trunk/app/HDRFlow/HDRFlowController.mm
===================================================================
--- trunk/app/HDRFlow/HDRFlowController.mm (rev 0)
+++ trunk/app/HDRFlow/HDRFlowController.mm 2007-07-28 23:17:23 UTC (rev 215)
@@ -0,0 +1,84 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#import "HDRFlowController.h"
+#import "ViewportOpenGLView.h"
+#import "PreferencesController.h"
+
+@implementation HDRFlowController
+
+#pragma mark ---- IB actions ----
+
+- ( void ) openPanelDidEnd: ( NSOpenPanel* ) panel returnCode: ( int ) rc contextInfo: ( void* ) ctx
+{
+ if( rc == NSOKButton )
+ {
+ }
+}
+
+- ( IBAction ) fileOpen: ( id ) sender
+{
+ NSOpenPanel* openPanel = [ NSOpenPanel openPanel ];
+
+ [ openPanel setCanChooseDirectories: YES ];
+ [ openPanel setCanChooseFiles: YES ];
+ [ openPanel setAllowsMultipleSelection: YES ];
+
+ NSArray* fileTypes = [ NSArray arrayWithObjects:@"exr", @"jpg", nil ];
+
+ [ openPanel beginSheetForDirectory: nil
+ file: nil
+ types: fileTypes
+ modalForWindow: [ NSApp mainWindow ]
+ modalDelegate: self
+ didEndSelector: @selector( openPanelDidEnd: returnCode: contextInfo: )
+ contextInfo: nil ];
+}
+
+- ( IBAction ) scriptEditor: ( id ) sender
+{
+ if( scriptEditor == nil )
+ scriptEditor = [ [ ScriptEditorController alloc ] initWithWindowNibName: @"ScriptEditor" ];
+
+ [ scriptEditor showWindow: self ];
+}
+
+- ( IBAction ) viewFullscreen: ( id ) sender
+{
+ [ openGLView fullscreen ];
+}
+
+- ( IBAction ) preferences: ( id ) sender
+{
+ if( preferences == nil )
+ preferences = [ [ PreferencesController alloc ] initWithWindowNibName: @"Preferences" ];
+
+ [ preferences showWindow: self ];
+}
+
+- ( BOOL ) acceptsFirstResponder
+{
+ return YES;
+}
+
+- ( BOOL ) becomesFirstResponder
+{
+ return YES;
+}
+
+- ( BOOL ) resignFirstResponder
+{
+ return YES;
+}
+
+- ( void ) dealloc
+{
+ [ scriptEditor dealloc ];
+ [ super dealloc ];
+}
+
+@end
Added: trunk/app/HDRFlow/PlugInsPreferencesController.h
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesController.h (rev 0)
+++ trunk/app/HDRFlow/PlugInsPreferencesController.h 2007-07-28 23:17:23 UTC (rev 215)
@@ -0,0 +1,17 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#import "PlugInsPreferencesOutlineViewNode.h"
+
+@interface PlugInsPreferencesController : NSObject
+{
+}
+
+- ( int ) outlineView: ( NSOutlineView* ) outlineView numberOfChildrenOfItem: ( id ) item;
+- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView isItemExpandable: ( id ) item;
+
+@end
Added: trunk/app/HDRFlow/PlugInsPreferencesController.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesController.mm (rev 0)
+++ trunk/app/HDRFlow/PlugInsPreferencesController.mm 2007-07-28 23:17:23 UTC (rev 215)
@@ -0,0 +1,22 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#import "PlugInsPreferencesController.h"
+
+@implementation PlugInsPreferencesController
+
+- ( int ) outlineView: ( NSOutlineView* ) outlineView numberOfChildrenOfItem: ( id ) item
+{
+ return item == nil ? 1 : [ item numberOfChildren ];
+}
+
+- ( BOOL ) outlineView: ( NSOutlineView* ) outlineView isItemExpandable: ( id ) item
+{
+ return item == nil ? YES : [ item numberOfChildren ] != 0;
+}
+
+@end
Added: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h (rev 0)
+++ trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.h 2007-07-28 23:17:23 UTC (rev 215)
@@ -0,0 +1,16 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#import <Cocoa/Cocoa.h>
+
+@interface PlugInsPreferencesOutlineViewNode : NSObject
+{
+}
+
+- ( int ) numberOfChildren;
+
+@end
Added: trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm
===================================================================
--- trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm (rev 0)
+++ trunk/app/HDRFlow/PlugInsPreferencesOutlineViewNode.mm 2007-07-28 23:17:23 UTC (rev 215)
@@ -0,0 +1,17 @@
+
+// HDRFlow - A image processing application
+
+// Copyright (c) 2007 Goncalo N. M. de Carvalho
+// Released under the GPL.
+// For more information, see http://www.cryogenicgraphics.com/hdrflow.
+
+#import "PlugInsPreferencesOutlineViewNode.h"
+
+@implementation PlugInsPreferencesOutlineViewNode
+
+- ( int ) numberOfChildren
+{
+ return 0;
+}
+
+@end
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-28 18:46:41
|
Revision: 214
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=214&view=rev
Author: glslang
Date: 2007-07-28 11:46:38 -0700 (Sat, 28 Jul 2007)
Log Message:
-----------
+script editor improvements
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
trunk/app/HDRFlow/ScriptEngine.cpp
trunk/app/HDRFlow/ViewportOpenGLView.m
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-28 17:32:52 UTC (rev 213)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-28 18:46:38 UTC (rev 214)
@@ -9,7 +9,7 @@
<key>10</key>
<string>514 465 412 270 0 0 1440 878 </string>
<key>12</key>
- <string>395 379 650 442 0 0 1440 878 </string>
+ <string>500 476 439 314 0 0 1440 878 </string>
<key>33</key>
<string>519 453 401 293 0 0 1440 878 </string>
</dict>
@@ -17,10 +17,10 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
- <integer>12</integer>
+ <integer>33</integer>
<integer>5</integer>
- <integer>33</integer>
<integer>10</integer>
+ <integer>12</integer>
</array>
<key>IBSystem Version</key>
<string>8R2218</string>
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/ScriptEngine.cpp
===================================================================
--- trunk/app/HDRFlow/ScriptEngine.cpp 2007-07-28 17:32:52 UTC (rev 213)
+++ trunk/app/HDRFlow/ScriptEngine.cpp 2007-07-28 18:46:38 UTC (rev 214)
@@ -23,11 +23,57 @@
py::object strobj( py::handle<>( PyObject_Str( obj ) ) );
py::extract<std::string> extract( strobj );
if( extract.check( ) )
- return extract( );
+ return extract( ) + "\n";
}
return pl::string( );
}
+
+ std::pair<pl::string, bool> in_python( const pl::string& script, int start )
+ {
+ pl::string result;
+
+ py::object main_module( py::handle<>( py::borrowed( PyImport_AddModule( "__main__" ) ) ) );
+ py::object main_namespace = main_module.attr( "__dict__" );
+
+ PyErr_Clear( );
+
+ try
+ {
+ pl::string eval_result;
+
+ py::handle<> handle( PyRun_String( script.c_str( ), start, main_namespace.ptr( ), main_namespace.ptr( ) ) );
+
+ py::object strobj( py::handle<>( PyObject_Str( py::object( handle ).ptr( ) ) ) );
+ if( strobj )
+ {
+ eval_result = PyString_AsString( strobj.ptr( ) );
+ if( eval_result != "None" )
+ result += eval_result + "\n";
+ }
+ }
+ catch( py::error_already_set )
+ {
+ PyObject* error_type;
+ PyObject* error_data;
+ PyObject* error_traceback;
+
+ PyErr_Fetch( &error_type, &error_data, &error_traceback );
+ PyErr_NormalizeException( &error_type, &error_data, &error_traceback );
+
+ result += error_to_result( error_type );
+ result += error_to_result( error_data );
+ result += error_to_result( error_traceback );
+
+ Py_XDECREF( error_type );
+ Py_XDECREF( error_data );
+ Py_XDECREF( error_traceback );
+
+ return std::pair<pl::string, bool>( result, false );
+ }
+
+ return std::pair<pl::string, bool>( result, true );
+ }
}
ScriptEngine::ScriptEngine( )
@@ -42,11 +88,8 @@
bool ScriptEngine::eval( const pl::string& str )
{
- py::object main_module( py::handle<>( py::borrowed( PyImport_AddModule( "__main__" ) ) ) );
- py::object main_namespace = main_module.attr( "__dict__" );
+ result_.clear( );
- result_.clear( );
-
std::string trim_str( str.c_str( ) );
boost::trim( trim_str );
@@ -58,47 +101,12 @@
for( const_iterator I = split_vec.begin( ); I != split_vec.end( ); ++I )
result_ += "# " + *I + "\n";
- int start = split_vec.size( ) == 1 &&
- split_vec[ 0 ].find( "import" ) == std::string::npos && split_vec[ 0 ].find( "def" ) == std::string::npos ? Py_eval_input : Py_file_input;
+ std::pair<pl::string, bool> result = in_python( str, Py_eval_input );
+ if( !result.second )
+ result = in_python( str, Py_file_input );
- try
- {
- pl::string eval_result;
-
- py::handle<> handle( PyRun_String( str.c_str( ), start, main_namespace.ptr( ), main_namespace.ptr( ) ) );
-
- py::object strobj( py::handle<>( PyObject_Str( py::object( handle ).ptr( ) ) ) );
- if( strobj )
- {
- eval_result = PyString_AsString( strobj.ptr( ) );
- if( eval_result != "None" )
- result_ += eval_result + "\n";
- }
- }
- catch( py::error_already_set )
- {
- PyObject* error_type;
- PyObject* error_data;
- PyObject* error_traceback;
-
- PyErr_Fetch( &error_type, &error_data, &error_traceback );
- PyErr_NormalizeException( &error_type, &error_data, &error_traceback );
-
- result_ += error_to_result( error_type );
- result_ += error_to_result( error_data );
- result_ += error_to_result( error_traceback );
-
- if( result_.empty( ) )
- result_ = "<no info available>";
-
- Py_XDECREF( error_type );
- Py_XDECREF( error_data );
- Py_XDECREF( error_traceback );
-
- return false;
- }
-
- return true;
+ result_ += result.first;
+ return result.second;
}
pl::string ScriptEngine::result( ) const
Modified: trunk/app/HDRFlow/ViewportOpenGLView.m
===================================================================
--- trunk/app/HDRFlow/ViewportOpenGLView.m 2007-07-28 17:32:52 UTC (rev 213)
+++ trunk/app/HDRFlow/ViewportOpenGLView.m 2007-07-28 18:46:38 UTC (rev 214)
@@ -61,10 +61,7 @@
glViewport( 0, 0, NSWidth( bounds ), NSHeight( bounds ) );
glClear( GL_COLOR_BUFFER_BIT | GL_DEPTH_BUFFER_BIT | GL_STENCIL_BUFFER_BIT );
- if( [ self inLiveResize ] )
- glFlush( );
- else
- [ [ self openGLContext ] flushBuffer ];
+ [ [ self openGLContext ] flushBuffer ];
}
- ( void ) prepareOpenGL
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
|
From: <gl...@us...> - 2007-07-28 17:32:53
|
Revision: 213
http://hdrflow.svn.sourceforge.net/hdrflow/?rev=213&view=rev
Author: glslang
Date: 2007-07-28 10:32:52 -0700 (Sat, 28 Jul 2007)
Log Message:
-----------
+animated Preferences view
Modified Paths:
--------------
trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
trunk/app/HDRFlow/PreferencesController.h
trunk/app/HDRFlow/PreferencesController.m
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-07-28 15:57:40 UTC (rev 212)
+++ trunk/app/HDRFlow/English.lproj/MainMenu.nib/info.nib 2007-07-28 17:32:52 UTC (rev 213)
@@ -15,9 +15,9 @@
<string>446.1</string>
<key>IBOpenObjects</key>
<array>
+ <integer>29</integer>
<integer>266</integer>
<integer>21</integer>
- <integer>29</integer>
</array>
<key>IBSystem Version</key>
<string>8R2218</string>
Modified: trunk/app/HDRFlow/English.lproj/MainMenu.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib 2007-07-28 15:57:40 UTC (rev 212)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/classes.nib 2007-07-28 17:32:52 UTC (rev 213)
@@ -5,7 +5,7 @@
ACTIONS = {toolbarItem = id; };
CLASS = PreferencesController;
LANGUAGE = ObjC;
- OUTLETS = {generalView = NSView; };
+ OUTLETS = {advancedView = NSView; generalView = NSView; plugInsView = NSView; };
SUPERCLASS = NSWindowController;
}
);
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib
===================================================================
--- trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-28 15:57:40 UTC (rev 212)
+++ trunk/app/HDRFlow/English.lproj/Preferences.nib/info.nib 2007-07-28 17:32:52 UTC (rev 213)
@@ -19,8 +19,8 @@
<array>
<integer>12</integer>
<integer>5</integer>
+ <integer>33</integer>
<integer>10</integer>
- <integer>33</integer>
</array>
<key>IBSystem Version</key>
<string>8R2218</string>
Modified: trunk/app/HDRFlow/English.lproj/Preferences.nib/keyedobjects.nib
===================================================================
(Binary files differ)
Modified: trunk/app/HDRFlow/PreferencesController.h
===================================================================
--- trunk/app/HDRFlow/PreferencesController.h 2007-07-28 15:57:40 UTC (rev 212)
+++ trunk/app/HDRFlow/PreferencesController.h 2007-07-28 17:32:52 UTC (rev 213)
@@ -14,10 +14,14 @@
{
ToolbarHolder* toolbarHolder;
+ NSView* preferencesView;
+
IBOutlet NSView* generalView;
+ IBOutlet NSView* plugInsView;
+ IBOutlet NSView* advancedView;
}
- ( IBAction ) toolbarItem: ( id ) sender;
-- ( void ) setActiveView: ( NSView* ) view;
+- ( void ) setActiveView: ( NSView* ) view animate: ( BOOL ) flag;
@end
Modified: trunk/app/HDRFlow/PreferencesController.m
===================================================================
--- trunk/app/HDRFlow/PreferencesController.m 2007-07-28 15:57:40 UTC (rev 212)
+++ trunk/app/HDRFlow/PreferencesController.m 2007-07-28 17:32:52 UTC (rev 213)
@@ -23,6 +23,8 @@
[ toolbarHolder addToolbarItem: @"PlugIns" label: @"PlugIns" paletteLabel: @"PlugIns" tooltip: @"PlugIns availability" target: self settingSelector: @selector( setImage: ) itemContent: [ NSImage imageNamed: @"PlugInsPreferences" ] action: @selector( toolbarItem: ) ];
[ toolbarHolder addToolbarItem: @"Advanced" label: @"Advanced" paletteLabel: @"Advanced" tooltip: @"Advanced application parameters" target: self settingSelector: @selector( setImage: ) itemContent: [ NSImage imageNamed: @"AdvancedPreferences" ] action: @selector( toolbarItem: ) ];
+ preferencesView = [ [ [ self window ] contentView ] retain ];
+
[ [ self window ] setToolbar: [ toolbarHolder toolbar ] ];
}
@@ -36,10 +38,34 @@
- ( IBAction ) toolbarItem: ( id ) sender
{
+ NSString* identifier = [ sender itemIdentifier ];
+
+ NSView* view;
+ if( [ identifier isEqualToString: @"General" ] )
+ view = generalView;
+ else if( [ identifier isEqualToString: @"PlugIns" ] )
+ view = plugInsView;
+ else if( [ identifier isEqualToString: @"Advanced" ] )
+ view = advancedView;
+ else
+ view = nil;
+
+ [ self setActiveView: view animate: YES ];
}
-- ( void ) setActiveView: ( NSView* ) view
+- ( void ) setActiveView: ( NSView* ) view animate: ( BOOL ) flag
{
+ NSRect windowFrame = [ [ self window ] frame ];
+ NSRect viewFrame = [ [ [ self window ] contentView ] frame ];
+
+ NSRect animatedFrame;
+ animatedFrame.size.width = [ view frame ].size.width + windowFrame.size.width - viewFrame.size.width;
+ animatedFrame.size.height = [ view frame ].size.height + windowFrame.size.height - viewFrame.size.height;
+ animatedFrame.origin.x = windowFrame.origin.x;
+ animatedFrame.origin.y = NSMaxY( windowFrame ) - animatedFrame.size.height;
+
+ [ [ self window ] setContentView: preferencesView ];
+ [ [ self window ] setFrame: animatedFrame display: YES animate: flag ];
[ [ self window ] setContentView: view ];
}
This was sent by the SourceForge.net collaborative development platform, the world's largest Open Source development site.
|
