From: <he...@us...> - 2015-09-12 01:47:39
|
Revision: 398 http://sourceforge.net/p/simspark/svn/398 Author: hedayat Date: 2015-09-12 01:47:34 +0000 (Sat, 12 Sep 2015) Log Message: ----------- Add Carbon to Spark Modified Paths: -------------- trunk/spark/CMakeLists.txt trunk/spark/ChangeLog trunk/spark/README trunk/spark/data/CMakeLists.txt trunk/spark/doc/Doxyfile.in trunk/spark/lib/kerosin/inputserver/inputsystem.cpp trunk/spark/lib/kerosin/inputserver/inputsystem.h trunk/spark/lib/kerosin/renderserver/rendercontrol.cpp trunk/spark/lib/kerosin/renderserver/rendercontrol.h trunk/spark/lib/kerosin/renderserver/rendercontrol_c.cpp trunk/spark/lib/kerosin/renderserver/renderserver.cpp trunk/spark/lib/oxygen/sceneserver/fpscontroller.cpp trunk/spark/lib/oxygen/simulationserver/simcontrolnode.h trunk/spark/lib/oxygen/simulationserver/simulationserver.cpp trunk/spark/lib/oxygen/simulationserver/simulationserver.h trunk/spark/lib/salt/gmath.h trunk/spark/lib/zeitgeist/core.cpp trunk/spark/lib/zeitgeist/core.h trunk/spark/lib/zeitgeist/leaf_c.cpp trunk/spark/lib/zeitgeist/logserver/logserver.cpp trunk/spark/lib/zeitgeist/logserver/logserver.h trunk/spark/lib/zeitgeist/logserver/logserver_c.cpp trunk/spark/lib/zeitgeist/logserver/logserverstreambuf.cpp trunk/spark/lib/zeitgeist/logserver/logserverstreambuf.h trunk/spark/lib/zeitgeist/scriptserver/scriptserver.cpp trunk/spark/plugin/CMakeLists.txt trunk/spark/plugin/filesystemzip/filesystemzip.cpp trunk/spark/spark/CMakeLists.txt trunk/spark/spark/spark.cpp trunk/spark/spark/spark.h trunk/spark/spark/spark.rb trunk/spark/test/scenetest/main.cpp trunk/spark/test/scenetest/md5mesh.cpp Added Paths: ----------- trunk/spark/carbon/ trunk/spark/carbon/CMakeLists.txt trunk/spark/carbon/Doxyfile trunk/spark/carbon/about.ui trunk/spark/carbon/aboutdialog.cpp trunk/spark/carbon/aboutdialog.h trunk/spark/carbon/abstractcommand.cpp trunk/spark/carbon/abstractcommand.h trunk/spark/carbon/abstractcommandqueue.cpp trunk/spark/carbon/abstractcommandqueue.h trunk/spark/carbon/abstractplugin.cpp trunk/spark/carbon/abstractplugin.h trunk/spark/carbon/attachableframe.cpp trunk/spark/carbon/attachableframe.h trunk/spark/carbon/build_doc.bat trunk/spark/carbon/carbon.cpp trunk/spark/carbon/carbon.h trunk/spark/carbon/communicationmanager.cpp trunk/spark/carbon/communicationmanager.h trunk/spark/carbon/cutelogger/ trunk/spark/carbon/cutelogger/abstractappender.cpp trunk/spark/carbon/cutelogger/abstractappender.h trunk/spark/carbon/cutelogger/abstractstringappender.cpp trunk/spark/carbon/cutelogger/abstractstringappender.h trunk/spark/carbon/cutelogger/consoleappender.cpp trunk/spark/carbon/cutelogger/consoleappender.h trunk/spark/carbon/cutelogger/debugappender.cpp trunk/spark/carbon/cutelogger/debugappender.h trunk/spark/carbon/cutelogger/fileappender.cpp trunk/spark/carbon/cutelogger/fileappender.h trunk/spark/carbon/cutelogger/functionappender.cpp trunk/spark/carbon/cutelogger/functionappender.h trunk/spark/carbon/cutelogger/imessagereceiver.cpp trunk/spark/carbon/cutelogger/imessagereceiver.h trunk/spark/carbon/cutelogger/logger.cpp trunk/spark/carbon/cutelogger/logger.h trunk/spark/carbon/cutelogger/logmessage.cpp trunk/spark/carbon/cutelogger/logmessage.h trunk/spark/carbon/cutelogger/logstream.cpp trunk/spark/carbon/cutelogger/logstream.h trunk/spark/carbon/cutelogger/logstreambuffer.cpp trunk/spark/carbon/cutelogger/logstreambuffer.h trunk/spark/carbon/cutelogger/messageobjectappender.cpp trunk/spark/carbon/cutelogger/messageobjectappender.h trunk/spark/carbon/cutelogger/messagereceiverappender.cpp trunk/spark/carbon/cutelogger/messagereceiverappender.h trunk/spark/carbon/frameattachmentpoint.cpp trunk/spark/carbon/frameattachmentpoint.h trunk/spark/carbon/glwidget.cpp trunk/spark/carbon/glwidget.h trunk/spark/carbon/gui.pri trunk/spark/carbon/gui.pro trunk/spark/carbon/guisettings_pluginsettings.cpp trunk/spark/carbon/guisettings_pluginsettings.h trunk/spark/carbon/guisettings_pluginsettings.ui trunk/spark/carbon/guisettings_simulationsettings.cpp trunk/spark/carbon/guisettings_simulationsettings.h trunk/spark/carbon/guisettings_simulationsettings.ui trunk/spark/carbon/guisimcontrol.cpp trunk/spark/carbon/guisimcontrol.h trunk/spark/carbon/guisimcontrol_c.cpp trunk/spark/carbon/imageresources.qrc trunk/spark/carbon/inputqt.cpp trunk/spark/carbon/inputqt.h trunk/spark/carbon/isimcontrol.cpp trunk/spark/carbon/isimcontrol.h trunk/spark/carbon/libraryloader.cpp trunk/spark/carbon/libraryloader.h trunk/spark/carbon/main.cpp trunk/spark/carbon/matrixwidget.cpp trunk/spark/carbon/matrixwidget.h trunk/spark/carbon/matrixwidget.ui trunk/spark/carbon/menumanager.cpp trunk/spark/carbon/menumanager.h trunk/spark/carbon/menuobject.cpp trunk/spark/carbon/menuobject.h trunk/spark/carbon/menuobjectcall.cpp trunk/spark/carbon/menuobjectcall.h trunk/spark/carbon/menuobjectconnection.cpp trunk/spark/carbon/menuobjectconnection.h trunk/spark/carbon/menuobjectfile.cpp trunk/spark/carbon/menuobjectfile.h trunk/spark/carbon/menuobjectmenu.cpp trunk/spark/carbon/menuobjectmenu.h trunk/spark/carbon/menuobjectmenuaction.cpp trunk/spark/carbon/menuobjectmenuaction.h trunk/spark/carbon/menuobjecttoolbar.cpp trunk/spark/carbon/menuobjecttoolbar.h trunk/spark/carbon/namedactionreceiver.cpp trunk/spark/carbon/namedactionreceiver.h trunk/spark/carbon/numberedactionreceiver.cpp trunk/spark/carbon/numberedactionreceiver.h trunk/spark/carbon/openglmanager.cpp trunk/spark/carbon/openglmanager.h trunk/spark/carbon/plugin.cpp trunk/spark/carbon/plugin.h trunk/spark/carbon/plugindefinition.cpp trunk/spark/carbon/plugindefinition.h trunk/spark/carbon/plugindialog.cpp trunk/spark/carbon/plugindialog.h trunk/spark/carbon/plugindialog.ui trunk/spark/carbon/plugininstantiatormodel.cpp trunk/spark/carbon/plugininstantiatormodel.h trunk/spark/carbon/pluginmanager.cpp trunk/spark/carbon/pluginmanager.h trunk/spark/carbon/pluginthread.cpp trunk/spark/carbon/pluginthread.h trunk/spark/carbon/plugintype.cpp trunk/spark/carbon/plugintype.h trunk/spark/carbon/process.cpp trunk/spark/carbon/process.h trunk/spark/carbon/serverthread.cpp trunk/spark/carbon/serverthread.h trunk/spark/carbon/settings.cpp trunk/spark/carbon/settings.h trunk/spark/carbon/settingsdialog.cpp trunk/spark/carbon/settingsdialog.h trunk/spark/carbon/settingsdialog.ui trunk/spark/carbon/settingstreeview.cpp trunk/spark/carbon/settingstreeview.h trunk/spark/carbon/settingswidget.cpp trunk/spark/carbon/settingswidget.h trunk/spark/carbon/setupdialog.cpp trunk/spark/carbon/setupdialog.h trunk/spark/carbon/setupdialog.ui trunk/spark/carbon/setupframe.cpp trunk/spark/carbon/setupframe.h trunk/spark/carbon/setupframe.ui trunk/spark/carbon/signalplugin.cpp trunk/spark/carbon/signalplugin.h trunk/spark/carbon/simspark.cpp trunk/spark/carbon/simspark.h trunk/spark/carbon/simulation.cpp trunk/spark/carbon/simulation.h trunk/spark/carbon/simulationmanager.cpp trunk/spark/carbon/simulationmanager.h trunk/spark/carbon/simulationprocess.cpp trunk/spark/carbon/simulationprocess.h trunk/spark/carbon/simulationsetup.cpp trunk/spark/carbon/simulationsetup.h trunk/spark/carbon/simulationtask.cpp trunk/spark/carbon/simulationtask.h trunk/spark/carbon/simulationthread.cpp trunk/spark/carbon/simulationthread.h trunk/spark/carbon/sparkcommandqueue.cpp trunk/spark/carbon/sparkcommandqueue.h trunk/spark/carbon/sparkcommands.cpp trunk/spark/carbon/sparkcommands.h trunk/spark/carbon/sparkcontext.cpp trunk/spark/carbon/sparkcontext.h trunk/spark/carbon/sparkcontroller.cpp trunk/spark/carbon/sparkcontroller.h trunk/spark/carbon/sparkprocess.cpp trunk/spark/carbon/sparkprocess.h trunk/spark/carbon/sparkproperty.cpp trunk/spark/carbon/sparkproperty.h trunk/spark/carbon/sparkpropertycontrol.cpp trunk/spark/carbon/sparkpropertycontrol.h trunk/spark/carbon/sparkpropertycontrolbasic.cpp trunk/spark/carbon/sparkpropertycontrolbasic.h trunk/spark/carbon/sparkpropertydata.cpp trunk/spark/carbon/sparkpropertydata.h trunk/spark/carbon/sparkpropertyexecuter.cpp trunk/spark/carbon/sparkpropertyexecuter.h trunk/spark/carbon/sparkpropertylist.cpp trunk/spark/carbon/sparkpropertylist.h trunk/spark/carbon/sparkpropertymanager.cpp trunk/spark/carbon/sparkpropertymanager.h trunk/spark/carbon/sparkpropertytablewidget.cpp trunk/spark/carbon/sparkpropertytablewidget.h trunk/spark/carbon/sparkpropertywidget.cpp trunk/spark/carbon/sparkpropertywidget.h trunk/spark/carbon/sparkpropertywidget.ui trunk/spark/carbon/sparksimulationthread.cpp trunk/spark/carbon/sparksimulationthread.h trunk/spark/carbon/sparktreemodel.cpp trunk/spark/carbon/sparktreemodel.h trunk/spark/carbon/sparktreeview.cpp trunk/spark/carbon/sparktreeview.h trunk/spark/carbon/taskdefinition.cpp trunk/spark/carbon/taskdefinition.h trunk/spark/carbon/toolseparatorbutton.cpp trunk/spark/carbon/toolseparatorbutton.h trunk/spark/carbon/topic.cpp trunk/spark/carbon/topic.h trunk/spark/carbon/topicregistration.cpp trunk/spark/carbon/topicregistration.h trunk/spark/carbon/treeitem.cpp trunk/spark/carbon/treeitem.h trunk/spark/carbon/typedlineedit.cpp trunk/spark/carbon/typedlineedit.h trunk/spark/carbon/vector2x3widget.cpp trunk/spark/carbon/vector2x3widget.h trunk/spark/carbon/vector3widget.cpp trunk/spark/carbon/vector3widget.h trunk/spark/carbon/vector3widget.ui trunk/spark/carbon/vector4widget.cpp trunk/spark/carbon/vector4widget.h trunk/spark/carbon/vector4widget.ui trunk/spark/carbon/windowdefinition.cpp trunk/spark/carbon/windowdefinition.h trunk/spark/carbon/windowmanager.cpp trunk/spark/carbon/windowmanager.h trunk/spark/data/guisetups/ trunk/spark/data/guisetups/DefaultSetupGrid.xml trunk/spark/data/guisetups/ExternalSoccerSim.xml trunk/spark/data/guisetups/IntegratedSoccerSim.xml trunk/spark/data/guisetups/InternalSoccerSim.xml trunk/spark/data/images/ trunk/spark/data/images/ilikebuttons/ trunk/spark/data/images/ilikebuttons/VeryIcon.com.url trunk/spark/data/images/ilikebuttons/VeryIcon.txt trunk/spark/data/images/ilikebuttons/permission.txt trunk/spark/data/images/ilikebuttons/png/ trunk/spark/data/images/ilikebuttons/png/Aqua_Favorites.png trunk/spark/data/images/ilikebuttons/png/Aqua_Menu.png trunk/spark/data/images/ilikebuttons/png/Aqua_Next.png trunk/spark/data/images/ilikebuttons/png/Aqua_Pause.png trunk/spark/data/images/ilikebuttons/png/Aqua_Play.png trunk/spark/data/images/ilikebuttons/png/Aqua_Previous.png trunk/spark/data/images/ilikebuttons/png/Aqua_Stop.png trunk/spark/data/images/ilikebuttons/png/NN_Play.png trunk/spark/data/images/ilikebuttons/png/NN_Stop.png trunk/spark/data/images/led/ trunk/spark/data/images/led/1license.txt trunk/spark/data/images/led/entension.txt trunk/spark/data/images/led/png/ trunk/spark/data/images/led/png/accept.png trunk/spark/data/images/led/png/add.png trunk/spark/data/images/led/png/alarm.png trunk/spark/data/images/led/png/anchor.png trunk/spark/data/images/led/png/application.png trunk/spark/data/images/led/png/application2.png trunk/spark/data/images/led/png/application_add.png trunk/spark/data/images/led/png/application_cascade.png trunk/spark/data/images/led/png/application_delete.png trunk/spark/data/images/led/png/application_double.png trunk/spark/data/images/led/png/application_edit.png trunk/spark/data/images/led/png/application_error.png trunk/spark/data/images/led/png/application_form.png trunk/spark/data/images/led/png/application_get.png trunk/spark/data/images/led/png/application_go.png trunk/spark/data/images/led/png/application_home.png trunk/spark/data/images/led/png/application_key.png trunk/spark/data/images/led/png/application_lightning.png trunk/spark/data/images/led/png/application_link.png trunk/spark/data/images/led/png/application_osx.png trunk/spark/data/images/led/png/application_osx_terminal.png trunk/spark/data/images/led/png/application_put.png trunk/spark/data/images/led/png/application_side_boxes.png trunk/spark/data/images/led/png/application_side_contract.png trunk/spark/data/images/led/png/application_side_expand.png trunk/spark/data/images/led/png/application_side_list.png trunk/spark/data/images/led/png/application_side_tree.png trunk/spark/data/images/led/png/application_split.png trunk/spark/data/images/led/png/application_tile_horizontal.png trunk/spark/data/images/led/png/application_tile_vertical.png trunk/spark/data/images/led/png/application_view_columns.png trunk/spark/data/images/led/png/application_view_detail.png trunk/spark/data/images/led/png/application_view_gallery.png trunk/spark/data/images/led/png/application_view_icons.png trunk/spark/data/images/led/png/application_view_list.png trunk/spark/data/images/led/png/application_view_tile.png trunk/spark/data/images/led/png/application_view_xp.png trunk/spark/data/images/led/png/application_view_xp_terminal.png trunk/spark/data/images/led/png/arrow_branch.png trunk/spark/data/images/led/png/arrow_collapse.png trunk/spark/data/images/led/png/arrow_divide.png trunk/spark/data/images/led/png/arrow_down.png trunk/spark/data/images/led/png/arrow_expand.png trunk/spark/data/images/led/png/arrow_in.png trunk/spark/data/images/led/png/arrow_inout.png trunk/spark/data/images/led/png/arrow_join.png trunk/spark/data/images/led/png/arrow_left.png trunk/spark/data/images/led/png/arrow_merge.png trunk/spark/data/images/led/png/arrow_out.png trunk/spark/data/images/led/png/arrow_play.png trunk/spark/data/images/led/png/arrow_redo.png trunk/spark/data/images/led/png/arrow_refresh.png trunk/spark/data/images/led/png/arrow_right.png trunk/spark/data/images/led/png/arrow_undo.png trunk/spark/data/images/led/png/arrow_up.png trunk/spark/data/images/led/png/asterisk_orange.png trunk/spark/data/images/led/png/attach.png trunk/spark/data/images/led/png/attach_2.png trunk/spark/data/images/led/png/award_star_gold.png trunk/spark/data/images/led/png/bandaid.png trunk/spark/data/images/led/png/basket.png trunk/spark/data/images/led/png/bell.png trunk/spark/data/images/led/png/bin_closed.png trunk/spark/data/images/led/png/blog.png trunk/spark/data/images/led/png/blueprint.png trunk/spark/data/images/led/png/blueprint_horizontal.png trunk/spark/data/images/led/png/bluetooth.png trunk/spark/data/images/led/png/bomb.png trunk/spark/data/images/led/png/book.png trunk/spark/data/images/led/png/book_addresses.png trunk/spark/data/images/led/png/book_next.png trunk/spark/data/images/led/png/book_open.png trunk/spark/data/images/led/png/book_previous.png trunk/spark/data/images/led/png/bookmark.png trunk/spark/data/images/led/png/bookmark_book.png trunk/spark/data/images/led/png/bookmark_book_open.png trunk/spark/data/images/led/png/bookmark_document.png trunk/spark/data/images/led/png/bookmark_folder.png trunk/spark/data/images/led/png/books.png trunk/spark/data/images/led/png/box.png trunk/spark/data/images/led/png/brick.png trunk/spark/data/images/led/png/bricks.png trunk/spark/data/images/led/png/briefcase.png trunk/spark/data/images/led/png/bug.png trunk/spark/data/images/led/png/buildings.png trunk/spark/data/images/led/png/bullet_add_1.png trunk/spark/data/images/led/png/bullet_add_2.png trunk/spark/data/images/led/png/bullet_key.png trunk/spark/data/images/led/png/cake.png trunk/spark/data/images/led/png/calculator.png trunk/spark/data/images/led/png/calendar_1.png trunk/spark/data/images/led/png/calendar_2.png trunk/spark/data/images/led/png/camera.png trunk/spark/data/images/led/png/cancel.png trunk/spark/data/images/led/png/car.png trunk/spark/data/images/led/png/cart.png trunk/spark/data/images/led/png/cd.png trunk/spark/data/images/led/png/chart_bar.png trunk/spark/data/images/led/png/chart_curve.png trunk/spark/data/images/led/png/chart_line.png trunk/spark/data/images/led/png/chart_organisation.png trunk/spark/data/images/led/png/chart_pie.png trunk/spark/data/images/led/png/clipboard_paste_image.png trunk/spark/data/images/led/png/clipboard_sign.png trunk/spark/data/images/led/png/clipboard_text.png trunk/spark/data/images/led/png/clock.png trunk/spark/data/images/led/png/cog.png trunk/spark/data/images/led/png/coins.png trunk/spark/data/images/led/png/color_swatch_1.png trunk/spark/data/images/led/png/color_swatch_2.png trunk/spark/data/images/led/png/comment.png trunk/spark/data/images/led/png/compass.png trunk/spark/data/images/led/png/compress.png trunk/spark/data/images/led/png/computer.png trunk/spark/data/images/led/png/connect.png trunk/spark/data/images/led/png/contrast.png trunk/spark/data/images/led/png/control_eject.png trunk/spark/data/images/led/png/control_end.png trunk/spark/data/images/led/png/control_equalizer.png trunk/spark/data/images/led/png/control_fastforward.png trunk/spark/data/images/led/png/control_pause.png trunk/spark/data/images/led/png/control_play.png trunk/spark/data/images/led/png/control_repeat.png trunk/spark/data/images/led/png/control_rewind.png trunk/spark/data/images/led/png/control_start.png trunk/spark/data/images/led/png/control_stop.png trunk/spark/data/images/led/png/control_wheel.png trunk/spark/data/images/led/png/counter.png trunk/spark/data/images/led/png/counter_count.png trunk/spark/data/images/led/png/counter_count_up.png trunk/spark/data/images/led/png/counter_reset.png trunk/spark/data/images/led/png/counter_stop.png trunk/spark/data/images/led/png/cross.png trunk/spark/data/images/led/png/cross_octagon.png trunk/spark/data/images/led/png/cross_octagon_fram.png trunk/spark/data/images/led/png/cross_shield.png trunk/spark/data/images/led/png/cross_shield_2.png trunk/spark/data/images/led/png/crown.png trunk/spark/data/images/led/png/crown_bronze.png trunk/spark/data/images/led/png/crown_silver.png trunk/spark/data/images/led/png/css.png trunk/spark/data/images/led/png/cursor.png trunk/spark/data/images/led/png/cut.png trunk/spark/data/images/led/png/dashboard.png trunk/spark/data/images/led/png/data.png trunk/spark/data/images/led/png/database.png trunk/spark/data/images/led/png/databases.png trunk/spark/data/images/led/png/delete.png trunk/spark/data/images/led/png/delivery.png trunk/spark/data/images/led/png/desktop.png trunk/spark/data/images/led/png/desktop_empty.png trunk/spark/data/images/led/png/direction.png trunk/spark/data/images/led/png/disconnect.png trunk/spark/data/images/led/png/disk.png trunk/spark/data/images/led/png/doc_access.png trunk/spark/data/images/led/png/doc_break.png trunk/spark/data/images/led/png/doc_convert.png trunk/spark/data/images/led/png/doc_excel_csv.png trunk/spark/data/images/led/png/doc_excel_table.png trunk/spark/data/images/led/png/doc_film.png trunk/spark/data/images/led/png/doc_illustrator.png trunk/spark/data/images/led/png/doc_music.png trunk/spark/data/images/led/png/doc_music_playlist.png trunk/spark/data/images/led/png/doc_offlice.png trunk/spark/data/images/led/png/doc_page.png trunk/spark/data/images/led/png/doc_page_previous.png trunk/spark/data/images/led/png/doc_pdf.png trunk/spark/data/images/led/png/doc_photoshop.png trunk/spark/data/images/led/png/doc_resize.png trunk/spark/data/images/led/png/doc_resize_actual.png trunk/spark/data/images/led/png/doc_shred.png trunk/spark/data/images/led/png/doc_stand.png trunk/spark/data/images/led/png/doc_table.png trunk/spark/data/images/led/png/doc_tag.png trunk/spark/data/images/led/png/doc_text_image.png trunk/spark/data/images/led/png/door.png trunk/spark/data/images/led/png/door_in.png trunk/spark/data/images/led/png/drawer.png trunk/spark/data/images/led/png/drink.png trunk/spark/data/images/led/png/drink_empty.png trunk/spark/data/images/led/png/drive.png trunk/spark/data/images/led/png/drive_burn.png trunk/spark/data/images/led/png/drive_cd.png trunk/spark/data/images/led/png/drive_cd_empty.png trunk/spark/data/images/led/png/drive_delete.png trunk/spark/data/images/led/png/drive_disk.png trunk/spark/data/images/led/png/drive_error.png trunk/spark/data/images/led/png/drive_go.png trunk/spark/data/images/led/png/drive_link.png trunk/spark/data/images/led/png/drive_network.png trunk/spark/data/images/led/png/drive_rename.png trunk/spark/data/images/led/png/dvd.png trunk/spark/data/images/led/png/email.png trunk/spark/data/images/led/png/email_open.png trunk/spark/data/images/led/png/email_open_image.png trunk/spark/data/images/led/png/emoticon_evilgrin.png trunk/spark/data/images/led/png/emoticon_grin.png trunk/spark/data/images/led/png/emoticon_happy.png trunk/spark/data/images/led/png/emoticon_smile.png trunk/spark/data/images/led/png/emoticon_surprised.png trunk/spark/data/images/led/png/emoticon_tongue.png trunk/spark/data/images/led/png/emoticon_unhappy.png trunk/spark/data/images/led/png/emoticon_waii.png trunk/spark/data/images/led/png/emoticon_wink.png trunk/spark/data/images/led/png/envelope.png trunk/spark/data/images/led/png/envelope_2.png trunk/spark/data/images/led/png/error.png trunk/spark/data/images/led/png/exclamation.png trunk/spark/data/images/led/png/exclamation_octagon_fram.png trunk/spark/data/images/led/png/eye.png trunk/spark/data/images/led/png/feed.png trunk/spark/data/images/led/png/feed_ballon.png trunk/spark/data/images/led/png/feed_document.png trunk/spark/data/images/led/png/female.png trunk/spark/data/images/led/png/film.png trunk/spark/data/images/led/png/films.png trunk/spark/data/images/led/png/find.png trunk/spark/data/images/led/png/flag_blue.png trunk/spark/data/images/led/png/folder.png trunk/spark/data/images/led/png/font.png trunk/spark/data/images/led/png/funnel.png trunk/spark/data/images/led/png/grid.png trunk/spark/data/images/led/png/grid_dot.png trunk/spark/data/images/led/png/group.png trunk/spark/data/images/led/png/hammer.png trunk/spark/data/images/led/png/hammer_screwdriver.png trunk/spark/data/images/led/png/hand.png trunk/spark/data/images/led/png/hand_point.png trunk/spark/data/images/led/png/heart.png trunk/spark/data/images/led/png/heart_break.png trunk/spark/data/images/led/png/heart_empty.png trunk/spark/data/images/led/png/heart_half.png trunk/spark/data/images/led/png/heart_small.png trunk/spark/data/images/led/png/help.png trunk/spark/data/images/led/png/highlighter.png trunk/spark/data/images/led/png/house.png trunk/spark/data/images/led/png/html.png trunk/spark/data/images/led/png/image_1.png trunk/spark/data/images/led/png/image_2.png trunk/spark/data/images/led/png/images.png trunk/spark/data/images/led/png/inbox.png trunk/spark/data/images/led/png/ipod.png trunk/spark/data/images/led/png/ipod_cast.png trunk/spark/data/images/led/png/joystick.png trunk/spark/data/images/led/png/key.png trunk/spark/data/images/led/png/keyboard.png trunk/spark/data/images/led/png/layer_treansparent.png trunk/spark/data/images/led/png/layers.png trunk/spark/data/images/led/png/layout.png trunk/spark/data/images/led/png/layout_header_footer_3.png trunk/spark/data/images/led/png/layout_header_footer_3_mix.png trunk/spark/data/images/led/png/layout_join.png trunk/spark/data/images/led/png/layout_join_vertical.png trunk/spark/data/images/led/png/layout_select.png trunk/spark/data/images/led/png/layout_select_content.png trunk/spark/data/images/led/png/layout_select_footer.png trunk/spark/data/images/led/png/layout_select_sidebar.png trunk/spark/data/images/led/png/layout_split.png trunk/spark/data/images/led/png/layout_split_vertical.png trunk/spark/data/images/led/png/lifebuoy.png trunk/spark/data/images/led/png/lightbulb.png trunk/spark/data/images/led/png/lightbulb_off.png trunk/spark/data/images/led/png/lightning.png trunk/spark/data/images/led/png/link.png trunk/spark/data/images/led/png/link_break.png trunk/spark/data/images/led/png/lock.png trunk/spark/data/images/led/png/lock_unlock.png trunk/spark/data/images/led/png/magnet.png trunk/spark/data/images/led/png/magnifier.png trunk/spark/data/images/led/png/magnifier_zoom_in.png trunk/spark/data/images/led/png/male.png trunk/spark/data/images/led/png/map.png trunk/spark/data/images/led/png/marker.png trunk/spark/data/images/led/png/medal_bronze_1.png trunk/spark/data/images/led/png/medal_gold_1.png trunk/spark/data/images/led/png/media_player_small_blue.png trunk/spark/data/images/led/png/microphone.png trunk/spark/data/images/led/png/mobile_phone.png trunk/spark/data/images/led/png/money.png trunk/spark/data/images/led/png/money_dollar.png trunk/spark/data/images/led/png/money_euro.png trunk/spark/data/images/led/png/money_pound.png trunk/spark/data/images/led/png/money_yen.png trunk/spark/data/images/led/png/monitor.png trunk/spark/data/images/led/png/mouse.png trunk/spark/data/images/led/png/music.png trunk/spark/data/images/led/png/music_beam.png trunk/spark/data/images/led/png/neutral.png trunk/spark/data/images/led/png/new.png trunk/spark/data/images/led/png/newspaper.png trunk/spark/data/images/led/png/note.png trunk/spark/data/images/led/png/nuclear.png trunk/spark/data/images/led/png/package.png trunk/spark/data/images/led/png/page.png trunk/spark/data/images/led/png/page_2.png trunk/spark/data/images/led/png/page_2_copy.png trunk/spark/data/images/led/png/page_code.png trunk/spark/data/images/led/png/page_copy.png trunk/spark/data/images/led/png/page_excel.png trunk/spark/data/images/led/png/page_lightning.png trunk/spark/data/images/led/png/page_paste.png trunk/spark/data/images/led/png/page_red.png trunk/spark/data/images/led/png/page_refresh.png trunk/spark/data/images/led/png/page_save.png trunk/spark/data/images/led/png/page_white_cplusplus.png trunk/spark/data/images/led/png/page_white_csharp.png trunk/spark/data/images/led/png/page_white_cup.png trunk/spark/data/images/led/png/page_white_database.png trunk/spark/data/images/led/png/page_white_delete.png trunk/spark/data/images/led/png/page_white_dvd.png trunk/spark/data/images/led/png/page_white_edit.png trunk/spark/data/images/led/png/page_white_error.png trunk/spark/data/images/led/png/page_white_excel.png trunk/spark/data/images/led/png/page_white_find.png trunk/spark/data/images/led/png/page_white_flash.png trunk/spark/data/images/led/png/page_white_freehand.png trunk/spark/data/images/led/png/page_white_gear.png trunk/spark/data/images/led/png/page_white_get.png trunk/spark/data/images/led/png/page_white_paintbrush.png trunk/spark/data/images/led/png/page_white_paste.png trunk/spark/data/images/led/png/page_white_php.png trunk/spark/data/images/led/png/page_white_picture.png trunk/spark/data/images/led/png/page_white_powerpoint.png trunk/spark/data/images/led/png/page_white_put.png trunk/spark/data/images/led/png/page_white_ruby.png trunk/spark/data/images/led/png/page_white_stack.png trunk/spark/data/images/led/png/page_white_star.png trunk/spark/data/images/led/png/page_white_swoosh.png trunk/spark/data/images/led/png/page_white_text.png trunk/spark/data/images/led/png/page_white_text_width.png trunk/spark/data/images/led/png/page_white_tux.png trunk/spark/data/images/led/png/page_white_vector.png trunk/spark/data/images/led/png/page_white_visualstudio.png trunk/spark/data/images/led/png/page_white_width.png trunk/spark/data/images/led/png/page_white_word.png trunk/spark/data/images/led/png/page_white_world.png trunk/spark/data/images/led/png/page_white_wrench.png trunk/spark/data/images/led/png/page_white_zip.png trunk/spark/data/images/led/png/paintbrush.png trunk/spark/data/images/led/png/paintcan.png trunk/spark/data/images/led/png/palette.png trunk/spark/data/images/led/png/paper_bag.png trunk/spark/data/images/led/png/paste_plain.png trunk/spark/data/images/led/png/paste_word.png trunk/spark/data/images/led/png/pause.png trunk/spark/data/images/led/png/pencil.png trunk/spark/data/images/led/png/photo.png trunk/spark/data/images/led/png/photo_album.png trunk/spark/data/images/led/png/photos.png trunk/spark/data/images/led/png/piano.png trunk/spark/data/images/led/png/picture.png trunk/spark/data/images/led/png/pilcrow.png trunk/spark/data/images/led/png/pill.png trunk/spark/data/images/led/png/pin.png trunk/spark/data/images/led/png/pipette.png trunk/spark/data/images/led/png/plaing_card.png trunk/spark/data/images/led/png/plug.png trunk/spark/data/images/led/png/plugin.png trunk/spark/data/images/led/png/printer.png trunk/spark/data/images/led/png/projection_screen.png trunk/spark/data/images/led/png/projection_screen_present.png trunk/spark/data/images/led/png/rainbow.png trunk/spark/data/images/led/png/readme.txt trunk/spark/data/images/led/png/report.png trunk/spark/data/images/led/png/rocket.png trunk/spark/data/images/led/png/rosette.png trunk/spark/data/images/led/png/rss.png trunk/spark/data/images/led/png/ruby.png trunk/spark/data/images/led/png/ruler_1.png trunk/spark/data/images/led/png/ruler_2.png trunk/spark/data/images/led/png/ruler_crop.png trunk/spark/data/images/led/png/ruler_triangle.png trunk/spark/data/images/led/png/safe.png trunk/spark/data/images/led/png/script.png trunk/spark/data/images/led/png/selection.png trunk/spark/data/images/led/png/selection_select.png trunk/spark/data/images/led/png/server.png trunk/spark/data/images/led/png/shading.png trunk/spark/data/images/led/png/shape_aling_bottom.png trunk/spark/data/images/led/png/shape_aling_center.png trunk/spark/data/images/led/png/shape_aling_left.png trunk/spark/data/images/led/png/shape_aling_middle.png trunk/spark/data/images/led/png/shape_aling_right.png trunk/spark/data/images/led/png/shape_aling_top.png trunk/spark/data/images/led/png/shape_flip_horizontal.png trunk/spark/data/images/led/png/shape_flip_vertical.png trunk/spark/data/images/led/png/shape_group.png trunk/spark/data/images/led/png/shape_handles.png trunk/spark/data/images/led/png/shape_move_back.png trunk/spark/data/images/led/png/shape_move_backwards.png trunk/spark/data/images/led/png/shape_move_forwards.png trunk/spark/data/images/led/png/shape_move_front.png trunk/spark/data/images/led/png/shape_square.png trunk/spark/data/images/led/png/shape_stop.png trunk/spark/data/images/led/png/shield.png trunk/spark/data/images/led/png/sitemap.png trunk/spark/data/images/led/png/slide.png trunk/spark/data/images/led/png/slides.png trunk/spark/data/images/led/png/slides_stack.png trunk/spark/data/images/led/png/smiley_confuse.png trunk/spark/data/images/led/png/smiley_cool.png trunk/spark/data/images/led/png/smiley_cry.png trunk/spark/data/images/led/png/smiley_fat.png trunk/spark/data/images/led/png/smiley_mad.png trunk/spark/data/images/led/png/smiley_red.png trunk/spark/data/images/led/png/smiley_roll.png trunk/spark/data/images/led/png/smiley_slim.png trunk/spark/data/images/led/png/smiley_yell.png trunk/spark/data/images/led/png/socket.png trunk/spark/data/images/led/png/sockets.png trunk/spark/data/images/led/png/sort.png trunk/spark/data/images/led/png/sort_alphabet.png trunk/spark/data/images/led/png/sort_date.png trunk/spark/data/images/led/png/sort_disable.png trunk/spark/data/images/led/png/sort_number.png trunk/spark/data/images/led/png/sort_price.png trunk/spark/data/images/led/png/sort_quantity.png trunk/spark/data/images/led/png/sort_rating.png trunk/spark/data/images/led/png/sound.png trunk/spark/data/images/led/png/sound_note.png trunk/spark/data/images/led/png/spellcheck.png trunk/spark/data/images/led/png/sport_8ball.png trunk/spark/data/images/led/png/sport_basketball.png trunk/spark/data/images/led/png/sport_football.png trunk/spark/data/images/led/png/sport_golf.png trunk/spark/data/images/led/png/sport_raquet.png trunk/spark/data/images/led/png/sport_shuttlecock.png trunk/spark/data/images/led/png/sport_soccer.png trunk/spark/data/images/led/png/sport_tennis.png trunk/spark/data/images/led/png/stamp.png trunk/spark/data/images/led/png/star_1.png trunk/spark/data/images/led/png/star_2.png trunk/spark/data/images/led/png/status_online.png trunk/spark/data/images/led/png/stop.png trunk/spark/data/images/led/png/style.png trunk/spark/data/images/led/png/subtract.png trunk/spark/data/images/led/png/sum.png trunk/spark/data/images/led/png/sum_2.png trunk/spark/data/images/led/png/switch.png trunk/spark/data/images/led/png/tab.png trunk/spark/data/images/led/png/table.png trunk/spark/data/images/led/png/tag.png trunk/spark/data/images/led/png/tag_blue.png trunk/spark/data/images/led/png/target.png trunk/spark/data/images/led/png/telephone.png trunk/spark/data/images/led/png/television.png trunk/spark/data/images/led/png/text_align_center.png trunk/spark/data/images/led/png/text_align_justify.png trunk/spark/data/images/led/png/text_align_left.png trunk/spark/data/images/led/png/text_align_right.png trunk/spark/data/images/led/png/text_allcaps.png trunk/spark/data/images/led/png/text_bold.png trunk/spark/data/images/led/png/text_columns.png trunk/spark/data/images/led/png/text_dropcaps.png trunk/spark/data/images/led/png/text_heading_1.png trunk/spark/data/images/led/png/text_horizontalrule.png trunk/spark/data/images/led/png/text_indent.png trunk/spark/data/images/led/png/text_indent_remove.png trunk/spark/data/images/led/png/text_italic.png trunk/spark/data/images/led/png/text_kerning.png trunk/spark/data/images/led/png/text_letter_omega.png trunk/spark/data/images/led/png/text_letterspacing.png trunk/spark/data/images/led/png/text_linespacing.png trunk/spark/data/images/led/png/text_list_bullets.png trunk/spark/data/images/led/png/text_list_numbers.png trunk/spark/data/images/led/png/text_lowercase.png trunk/spark/data/images/led/png/text_padding_bottom.png trunk/spark/data/images/led/png/text_padding_left.png trunk/spark/data/images/led/png/text_padding_right.png trunk/spark/data/images/led/png/text_padding_top.png trunk/spark/data/images/led/png/text_signature.png trunk/spark/data/images/led/png/text_smallcaps.png trunk/spark/data/images/led/png/text_strikethrough.png trunk/spark/data/images/led/png/text_subscript.png trunk/spark/data/images/led/png/textfield.png trunk/spark/data/images/led/png/textfield_rename.png trunk/spark/data/images/led/png/ticket.png trunk/spark/data/images/led/png/timeline_marker.png trunk/spark/data/images/led/png/traffic.png trunk/spark/data/images/led/png/transmit.png trunk/spark/data/images/led/png/trophy.png trunk/spark/data/images/led/png/trophy_bronze.png trunk/spark/data/images/led/png/trophy_silver.png trunk/spark/data/images/led/png/ui_combo_box.png trunk/spark/data/images/led/png/ui_saccordion.png trunk/spark/data/images/led/png/ui_slider_1.png trunk/spark/data/images/led/png/ui_slider_2.png trunk/spark/data/images/led/png/ui_tab_bottom.png trunk/spark/data/images/led/png/ui_tab_content.png trunk/spark/data/images/led/png/ui_tab_disable.png trunk/spark/data/images/led/png/ui_tab_side.png trunk/spark/data/images/led/png/ui_text_field_hidden.png trunk/spark/data/images/led/png/ui_text_field_password.png trunk/spark/data/images/led/png/umbrella.png trunk/spark/data/images/led/png/user.png trunk/spark/data/images/led/png/user_black_female.png trunk/spark/data/images/led/png/user_business.png trunk/spark/data/images/led/png/user_business_boss.png trunk/spark/data/images/led/png/user_female.png trunk/spark/data/images/led/png/user_silhouette.png trunk/spark/data/images/led/png/user_thief.png trunk/spark/data/images/led/png/user_thief_baldie.png trunk/spark/data/images/led/png/vcard.png trunk/spark/data/images/led/png/vector.png trunk/spark/data/images/led/png/wait.png trunk/spark/data/images/led/png/wall.png trunk/spark/data/images/led/png/wall_break.png trunk/spark/data/images/led/png/wall_brick.png trunk/spark/data/images/led/png/wall_disable.png trunk/spark/data/images/led/png/wand.png trunk/spark/data/images/led/png/weather_clouds.png trunk/spark/data/images/led/png/weather_cloudy.png trunk/spark/data/images/led/png/weather_lightning.png trunk/spark/data/images/led/png/weather_rain.png trunk/spark/data/images/led/png/weather_snow.png trunk/spark/data/images/led/png/weather_sun.png trunk/spark/data/images/led/png/webcam.png trunk/spark/data/images/led/png/world.png trunk/spark/data/images/led/png/zone.png trunk/spark/data/images/led/png/zone_money.png trunk/spark/data/images/led/png/zones.png trunk/spark/data/images/spark/ trunk/spark/data/images/spark/png/ trunk/spark/data/images/spark/png/spark.png trunk/spark/data/images/splashyIcons/ trunk/spark/data/images/splashyIcons/png/ trunk/spark/data/images/splashyIcons/png/error.png trunk/spark/data/images/splashyIcons/png/warning_triangle.png trunk/spark/data/images/splashyIcons/png/zoom.png trunk/spark/data/images/splashyIcons/png/zoom_in.png trunk/spark/data/images/splashyIcons/png/zoom_out.png trunk/spark/data/images/toolbar1/ trunk/spark/data/images/toolbar1/VeryIcon.com.url trunk/spark/data/images/toolbar1/VeryIcon.txt trunk/spark/data/images/toolbar1/license.txt trunk/spark/data/images/toolbar1/png/ trunk/spark/data/images/toolbar1/png/bug.png trunk/spark/data/images/toolbar1/png/config.png trunk/spark/data/images/toolbar1/png/document.png trunk/spark/data/images/toolbar1/png/info.png trunk/spark/data/images/toolbar1/png/monitor.png trunk/spark/data/images/toolbar1/png/new.png trunk/spark/data/images/toolbar1/png/print.png trunk/spark/data/images/toolbar1/png/save.png trunk/spark/data/images/toolbar1/png/search.png trunk/spark/data/images/toolbar1/png/soccer.png trunk/spark/data/images/toolbar1/png/star.png trunk/spark/guilayout/ trunk/spark/guilayout/CMakeLists.txt trunk/spark/guilayout/guigridlayout/ trunk/spark/guilayout/guigridlayout/CMakeLists.txt trunk/spark/guilayout/guigridlayout/export.h trunk/spark/guilayout/guigridlayout/guigridlayout.cpp trunk/spark/guilayout/guigridlayout/guigridlayout.h trunk/spark/guilayout/guigridlayout/guigridlayout.ui trunk/spark/guilayout/guisimplelayout/ trunk/spark/guilayout/guisimplelayout/CMakeLists.txt trunk/spark/guilayout/guisimplelayout/export.h trunk/spark/guilayout/guisimplelayout/guisimplelayout.cpp trunk/spark/guilayout/guisimplelayout/guisimplelayout.h trunk/spark/guilayout/guisimplelayout/guisimplelayout.ui trunk/spark/guiplugin/ trunk/spark/guiplugin/CMakeLists.txt trunk/spark/guiplugin/logframe/ trunk/spark/guiplugin/logframe/CMakeLists.txt trunk/spark/guiplugin/logframe/export.h trunk/spark/guiplugin/logframe/logframe.cpp trunk/spark/guiplugin/logframe/logframe.h trunk/spark/guiplugin/logframe/logframe.ui trunk/spark/guiplugin/logframe/logframe_logsettings.cpp trunk/spark/guiplugin/logframe/logframe_logsettings.h trunk/spark/guiplugin/logframe/logframe_logsettings.ui trunk/spark/guiplugin/monitorframe/ trunk/spark/guiplugin/monitorframe/CMakeLists.txt trunk/spark/guiplugin/monitorframe/export.h trunk/spark/guiplugin/monitorframe/monitorframe.cpp trunk/spark/guiplugin/monitorframe/monitorframe.h trunk/spark/guiplugin/monitorframe/monitorframe.ui trunk/spark/guiplugin/monitorframe/monitorframe_glconstants.cpp trunk/spark/guiplugin/monitorframe/monitorframe_glconstants.h trunk/spark/guiplugin/monitorframe/monitorframe_sparkglrender.cpp trunk/spark/guiplugin/monitorframe/monitorframe_sparkglrender.h trunk/spark/guiplugin/monitorframe/monitorframe_sparkglwidget.cpp trunk/spark/guiplugin/monitorframe/monitorframe_sparkglwidget.h trunk/spark/guiplugin/scenegraphframe/ trunk/spark/guiplugin/scenegraphframe/CMakeLists.txt trunk/spark/guiplugin/scenegraphframe/export.h trunk/spark/guiplugin/scenegraphframe/scenegraphframe.cpp trunk/spark/guiplugin/scenegraphframe/scenegraphframe.h trunk/spark/guiplugin/scenegraphframe/scenegraphframe.ui trunk/spark/guiplugin/scenegraphframe/scenegraphframe_propertyframe.cpp trunk/spark/guiplugin/scenegraphframe/scenegraphframe_propertyframe.h trunk/spark/guiplugin/scenegraphframe/scenegraphframe_propertyframe.ui trunk/spark/guiplugin/scenegraphframe/scenegraphframe_scenegraphwidget.cpp trunk/spark/guiplugin/scenegraphframe/scenegraphframe_scenegraphwidget.h trunk/spark/guiplugin/scenegraphframe/scenegraphframe_scenegraphwidget.ui trunk/spark/guiplugin/setupframe/ trunk/spark/guiplugin/setupframe/CMakeLists.txt trunk/spark/guiplugin/setupframe/export.h trunk/spark/guiplugin/setupframe/setupframe.cpp trunk/spark/guiplugin/setupframe/setupframe.h trunk/spark/guiplugin/setupframe/setupframe.ui trunk/spark/guiplugin/simulationframe/ trunk/spark/guiplugin/simulationframe/CMakeLists.txt trunk/spark/guiplugin/simulationframe/export.h trunk/spark/guiplugin/simulationframe/simulationframe.cpp trunk/spark/guiplugin/simulationframe/simulationframe.h trunk/spark/guiplugin/simulationframe/simulationframe.ui trunk/spark/guiplugin/simulationframe/simulationframe_taskwidget.cpp trunk/spark/guiplugin/simulationframe/simulationframe_taskwidget.h trunk/spark/guiplugin/simulationframe/simulationframe_taskwidget.ui trunk/spark/plugin/inputqt/ trunk/spark/plugin/inputqt/CMakeLists.txt trunk/spark/plugin/inputqt/export.cpp trunk/spark/plugin/inputqt/inputqt.cpp trunk/spark/plugin/inputqt/inputqt.h trunk/spark/plugin/inputqt/inputsystemqt.cpp trunk/spark/plugin/inputqt/inputsystemqt.h trunk/spark/plugin/inputqt/inputsystemqt_c.cpp trunk/spark/plugin/openglsysqt/ trunk/spark/plugin/openglsysqt/CMakeLists.txt trunk/spark/plugin/openglsysqt/export.cpp trunk/spark/plugin/openglsysqt/openglsystemqt.cpp trunk/spark/plugin/openglsysqt/openglsystemqt.h trunk/spark/plugin/openglsysqt/openglsystemqt_c.cpp trunk/spark/spark/sparkbullet.rb trunk/spark/spark/sparkode.rb Modified: trunk/spark/CMakeLists.txt =================================================================== --- trunk/spark/CMakeLists.txt 2015-07-14 21:56:34 UTC (rev 397) +++ trunk/spark/CMakeLists.txt 2015-09-12 01:47:34 UTC (rev 398) @@ -58,6 +58,7 @@ find_package(ODE REQUIRED) find_package(OpenGL REQUIRED) find_package(SDL REQUIRED) +find_package(Qt4 COMPONENTS QtGui QtCore QtXml QtOpenGl) find_package(FMOD) find_package(ZLIB) set(HAVE_IL_IL_H 1) @@ -111,7 +112,7 @@ link_directories(${Boost_LIBRARY_DIRS}) if (UNIX) - set(CMAKE_CXX_FLAGS $ENV{CXXFLAGS} CACHE + set(CMAKE_CXX_FLAGS $ENV{CXXFLAGS} "--std=gnu++11" CACHE STRING "Common C++ compiler flags" FORCE) set(CMAKE_C_FLAGS $ENV{CFLAGS} CACHE STRING "Common C compiler flags" FORCE) @@ -127,7 +128,13 @@ set(INCLUDEDIR "include" CACHE PATH "The directory to install includes into.") set(CMAKE_SHARED_MODULE_PREFIX "") +set(CARBON_LAYOUT_LIB_DIR ${LIBDIR}/guilayout CACHE PATH "The directory to install carbon gui layout libraries into.") +set(CARBON_PLUGIN_LIB_DIR ${LIBDIR}/guiplugin CACHE PATH "The directory to install carbon gui plugin libraries into.") +set(CARBON_LAYOUT_INCLUDE_DIR ${INCLUDEDIR}/guilayout CACHE PATH "The directory to install carbon gui layout include files into.") +set(CARBON_PLUGIN_INCLUDE_DIR ${INCLUDEDIR}/guiplugin CACHE PATH "The directory to install carbon gui plugin include files into.") + mark_as_advanced(BINDIR LIBDIR DATADIR INCLUDEDIR) +set(BUILD_CARBON TRUE CACHE BOOL "Check if the Carbon libraries and plugins should be built.") set(BUILD_SHARED_LIBS TRUE) if (BUILD_SHARED_LIBS) set(SHARED_LIB_COMPILE 1) @@ -162,6 +169,8 @@ set(KEROSIN_VERSION ${KEROSIN_SO_VERSION}.1.1) set(SPARK_SO_VERSION 1) set(SPARK_VERSION ${SPARK_SO_VERSION}.0.1) +set(CARBON_SO_VERSION 1) +set(CARBON_VERSION ${CARBON_SO_VERSION}.0.0) set(RCSSNET_SO_VERSION 0) set(RCSSNET_VERSION ${RCSSNET_SO_VERSION}.1.0) @@ -173,8 +182,14 @@ set(zeitgeist_version ${ZEITGEIST_VERSION}) set(oxygen_version ${OXYGEN_VERSION}) set(kerosin_version ${KEROSIN_VERSION}) +set(carbon_version ${CARBON_VERSION}) set(includedir ${CMAKE_INSTALL_PREFIX}/${INCLUDEDIR}) set(libdir ${CMAKE_INSTALL_PREFIX}/${LIBDIR}) +set(guipluginlibdir ${CMAKE_INSTALL_PREFIX}/${CARBON_PLUGIN_LIB_DIR}) +set(guilayoutlibdir ${CMAKE_INSTALL_PREFIX}/${CARBON_LAYOUT_LIB_DIR}) +set(guidatadir ${CMAKE_INSTALL_PREFIX}/${DATADIR}/carbon) +set(guisetupdir ${guidatadir}/setups) +set(guiscriptdir ${guidatadir}/scripts) if (CMAKE_BUILD_TYPE STREQUAL "Debug") set(debug "true") else (CMAKE_BUILD_TYPE STREQUAL "Debug") @@ -194,6 +209,11 @@ add_subdirectory(doc) add_subdirectory(spark) add_subdirectory(data) +if (BUILD_CARBON) + add_subdirectory(carbon) + add_subdirectory(guiplugin) + add_subdirectory(guilayout) +endif (BUILD_CARBON) ########### install files ############### Modified: trunk/spark/ChangeLog =================================================================== --- trunk/spark/ChangeLog 2015-07-14 21:56:34 UTC (rev 397) +++ trunk/spark/ChangeLog 2015-09-12 01:47:34 UTC (rev 398) @@ -10,8 +10,28 @@ * cmake/AdditionalSearchPaths.cmake: - fixed some problems in building Windows installer (with MinGW) +2013-06-13 Hedayat Vatankhah <hed...@gm...> + + * README: + * ChangeLog: + - added Patrick changes and documentation about the new parts + 2013-06-12 Hedayat Vatankhah <hed...@gm...> + * carbon/: + * guiplugin/: + * guilayout/: + * data/guisetups/: + * plugin/inputsysqt/: + * plugin/openglsysqt/: + - fixed compilation issues under GNU/Linux+GCC. + + * lib/salt/gmath.h: + - removed type specifier for std::isnan, since not all overloads are + templates + +2013-06-12 Hedayat Vatankhah <hed...@gm...> + * NEWS: * RELEASE: * CMakeLists.txt: @@ -23,6 +43,105 @@ * plugin/sceneeffector/sceneeffector.cpp: - added the ability to receive and apply scene parameters +2012-06-23 Patrick Geib <Pat...@on...> + + * carbon/ + - the Carbon library + + * guiplugin/ + - generic (not soccer related) plugins for the carbon gui + + * guilayout/ + - layout projects for the Gui + + * data/guisetups/ + - image resources for the carbon gui. + + * plugin/inputsysqt/ + - a new spark plugin which handles inputs to a spark simulation by + converting from qt to spark defines. + + * plugin/openglsysqt/ + - empty placeholder openglsystem to be used in simspark when an external + rendering by carbon is used. + + * spark/spark.h: + * spark/spark.cpp: + - relative path prefix can now be given in constructor as optional + parameter. Needed by carbon. + + * spark.rb: + - the spark script now contains logging functions and other functions + needed by the carbon gui + + * plugin/odeimps/odecollider.cpp: + - fixed bug where body was deleted twice + + * lib/zeitgeist/core.h: + * lib/zeitgeist/core.cpp: + - added function to reset the self pointer. Needed by carbon. + + * lib/zeitgeist/leaf_c.cpp: + - added unlinkLeaf() function to ruby interface. + + * lib/zeitgeist/logserver/logserverstreambuf.h: + * lib/zeitgeist/logserver/logserverstreambuf.cpp: + - replaced typedef TMaskStream with struct MaskStream. Now it not only + contains the integer mask and stream pointer, but also a synchronization + flag. If the flag is true, the stream will by sync()'ed every time the + input stream flushes a message. This is needed for carbons message stream + appenders, so it can receive the logservers messages immediately when the + simulation thread sends them. + + * lib/zeitgeist/logserver/logserver.h: + * lib/zeitgeist/logserver/logserver.cpp: + * lib/zeitgeist/logserver/logserver_c.cpp: + - streams can now be added with an optional synchronization flag. + - updated the script interface for AddStream too. + + * lib/zeitgeist/scriptserver/scriptserver.cpp: + - ruby error messages are now sent to ->Error() instead of ->Debug(). + + * lib/oxygen/simulationserver/simulationserver.h: + * lib/oxygen/simulationserver/simulationserver.cpp: + - the Simulation can now be paused. There is a flag in the simulation + server and a pause/unpause function. When a simulation is paused, the next + simulation cycle will not call StartCycle, SenseAgent, ActAgent and + EndCycle, but a new control event CE_WaitCycle. + When a simulation is paused, the simulation time does not advance and + agents are not notified about changed time. The wait cycle lasts as long + as a normal simulation cycle. Calling pause(false) will resume the normal + simulation cycle after the current wait cycle and agents are + notified again. + The pausing function is meant to pause and observe the state of the + simulation using the carbon library and the gui. It was tested with + several agent implementations and seemed to work perfectly. + + * lib/oxygen/simulationserver/simcontrolnode.h: + - the new control event CE_WaitCycle calls a new interface function + WaitCycle() in simcontrolnodes. This way control nodes can be notified + about running and paused simulation steps. This is used by carbon. + WaitCycle() and EndCycle() are used for SimControlNodes which act as + interface between carbon and spark. + + * lib/kerosin/inputsystem/inputsystem.h: + * lib/kerosin/inputsystem/inputsystem.cpp: + - AddInput() and GetInput() now use a boost::shared_mutex to make the + access thread safe. This is neccessary because there may be simulatneous + access from different threads in a carbon simulation. + + * lib/kerosin/renderserver/renderserver.cpp: + - added OpenGlError-code checking between rendering stages. Removed double + picking-end-bracket glPopName() which caused picking to fail. + + * lib/kerosin/renderserver/rendercontrol.cpp: + * lib/kerosin/renderserver/rendercontrol.h: + * lib/kerosin/renderserver/rendercontrol_c.cpp: + - RenderControlNodes can now be activated or deactivated. Carbon uses this + feature to deactivate them in the spark simulation if the rendering is + done in the gui thread or any other than the server thread. + - Added setActive() function to ruby interface. + 2012-05-23 Hedayat Vatankhah <hed...@gm...> * lib/kerosin/CMakeLists.txt: Modified: trunk/spark/README =================================================================== --- trunk/spark/README 2015-07-14 21:56:34 UTC (rev 397) +++ trunk/spark/README 2015-09-12 01:47:34 UTC (rev 398) @@ -83,7 +83,50 @@ for creating simulations using simspark ./test applications for testing different subsystems of the simulator. - +./carbon The carbon library contains a gui-framework and a + simulation-framework which wraps simspark using qt. + Its main features are: + - Offering a graphical user interface which can be extended + by visual and functional plugins. The plugins can be used + to write easy-to-use interfaces to simspark simulations. + - Creating, managing and executing simspark-simulations + alongside with any additional threads and processes. + - The gui can be altered flexibly. Its main window with + "attachment points" is loaded from a shared library, and + its used plugins are loaded from shared libraries too. + Plugins with visual representation can be attached to the + Gui. +./guilayout Layout projects for the Gui. They export main windows for + the carbon gui from a shared library. You can easily and + quickly create a new layout for the gui by creating a new + layout project. A gui-layout (main window) may define + attachment points for gui-plugins. + + Initial layout projects: + - guigridlayout: Contains 4 attachment points (left, center, + right, bottom) + - guisimplelayout: Contains 2 attachment points (left, right) +./guiplugin Generic (not soccer related) plugins for the carbon gui. + Plugins can be anything to extend the gui with. There are + three types: Simple Plugins (can be executed), Signal + Plugins (can communicate), and AttachableFrame Plugins (can + be embedded into the Gui). Examples which can be created + really easily and quickly, are: executable plugins running in + a new thread, function libraries, toolboxes or menu entries, + or visual plugins made for user interaction. + + Initial plugins (all of them are plugins that can be attached + to attachment points): + - logframe: logs and displays messages + - setupframe: creates simulation setups for the gui + - simulationframe: displays and controls simulation tasks and + processes in the gui + - scenegraphframe: displays and controls the whole scene graph + of a spark simulation. The user can freely change the values + of several types of nodes. + This interaction can be extended with additional plugins. + - monitorframe: renders a spark simulation + Literature: [1] Marco Kögler and Oliver Obst. Simulation League: The Next Generation. Added: trunk/spark/carbon/CMakeLists.txt =================================================================== --- trunk/spark/carbon/CMakeLists.txt (rev 0) +++ trunk/spark/carbon/CMakeLists.txt 2015-09-12 01:47:34 UTC (rev 398) @@ -0,0 +1,324 @@ +########### moc target files ############### +set(carbon_QOBJECT_HEADERS + cutelogger/imessagereceiver.h + process.h + pluginthread.h + simulationprocess.h + simulationmanager.h + serverthread.h + signalplugin.h + simulationsetup.h + simulation.h + simulationthread.h + sparksimulationthread.h + simulationtask.h + taskdefinition.h + menumanager.h + menuobjectconnection.h + plugininstantiatormodel.h + plugindefinition.h + pluginmanager.h + attachableframe.h + windowdefinition.h + frameattachmentpoint.h + numberedactionreceiver.h + guisettings_pluginsettings.h + guisettings_simulationsettings.h + namedactionreceiver.h + matrixwidget.h + toolseparatorbutton.h + vector3widget.h + vector4widget.h + vector2x3widget.h + typedlineedit.h + carbon.h + settingsdialog.h + settingswidget.h + plugindialog.h + settings.h + setupdialog.h + abstractcommand.h + sparkcontroller.h + sparkcommands.h + sparktreemodel.h + sparktreeview.h + sparkpropertylist.h + sparkpropertywidget.h + sparkpropertycontrol.h + sparkpropertyexecuter.h + sparkpropertymanager.h + glwidget.h + openglmanager.h + communicationmanager.h + topic.h + ) + +set(carbon_HEADERS + cutelogger/abstractappender.h + cutelogger/abstractstringappender.h + cutelogger/consoleappender.h + cutelogger/debugappender.h + cutelogger/fileappender.h + cutelogger/functionappender.h + cutelogger/logger.h + cutelogger/logmessage.h + cutelogger/logstream.h + cutelogger/logstreambuffer.h + cutelogger/messageobjectappender.h + cutelogger/messagereceiverappender.h + cutelogger/imessagereceiver.h + sparkprocess.h + process.h + pluginthread.h + simulationprocess.h + simulationmanager.h + serverthread.h + simulationsetup.h + simulation.h + simulationthread.h + sparksimulationthread.h + simulationtask.h + taskdefinition.h + menuobject.h + menuobjectcall.h + menuobjectfile.h + menuobjectmenu.h + menuobjectmenuaction.h + menuobjecttoolbar.h + menumanager.h + menuobjectconnection.h + plugin.h + plugintype.h + signalplugin.h + abstractplugin.h + plugininstantiatormodel.h + plugindefinition.h + pluginmanager.h + attachableframe.h + windowmanager.h + windowdefinition.h + frameattachmentpoint.h + aboutdialog.h + treeitem.h + numberedactionreceiver.h + guisettings_pluginsettings.h + guisettings_simulationsettings.h + namedactionreceiver.h + matrixwidget.h + toolseparatorbutton.h + vector3widget.h + vector4widget.h + vector2x3widget.h + typedlineedit.h + libraryloader.h + carbon.h + settingsdialog.h + settingswidget.h + plugindialog.h + settings.h + setupdialog.h + abstractcommandqueue.h + guisimcontrol.h + isimcontrol.h + sparkcontext.h + simspark.h + sparkproperty.h + sparkpropertycontrolbasic.h + sparkpropertydata.h + sparkpropertytablewidget.h + abstractcommand.h + sparkcontroller.h + sparkcommands.h + sparkcommandqueue.h + sparktreemodel.h + sparktreeview.h + sparkpropertylist.h + sparkpropertywidget.h + sparkpropertycontrol.h + sparkpropertyexecuter.h + sparkpropertymanager.h + inputqt.h + glwidget.h + openglmanager.h + topicregistration.h + communicationmanager.h + topic.h + ) + +set(carbon_SOURCES + cutelogger/abstractappender.cpp + cutelogger/abstractstringappender.cpp + cutelogger/consoleappender.cpp + cutelogger/debugappender.cpp + cutelogger/fileappender.cpp + cutelogger/functionappender.cpp + cutelogger/imessagereceiver.cpp + cutelogger/logger.cpp + cutelogger/logmessage.cpp + cutelogger/logstream.cpp + cutelogger/logstreambuffer.cpp + cutelogger/messageobjectappender.cpp + cutelogger/messagereceiverappender.cpp + pluginthread.cpp + process.cpp + sparkprocess.cpp + simulationprocess.cpp + serverthread.cpp + simulationmanager.cpp + simulationsetup.cpp + simulation.cpp + simulationtask.cpp + simulationthread.cpp + sparksimulationthread.cpp + taskdefinition.cpp + menumanager.cpp + menuobject.cpp + menuobjectcall.cpp + menuobjectconnection.cpp + ... [truncated message content] |