From 39e85d1a80486f69cdef785905909eee9f37a986 Mon Sep 17 00:00:00 2001 From: fukasawa Date: Mar 23 2016 15:56:29 +0000 Subject: Merge remote-tracking branch 'origin' into fix-thirdparty --- diff --git a/stuff/config/loc/japanese/colorfx.qm b/stuff/config/loc/japanese/colorfx.qm index 86f39c0..f0e99e2 100644 Binary files a/stuff/config/loc/japanese/colorfx.qm and b/stuff/config/loc/japanese/colorfx.qm differ diff --git a/stuff/config/loc/japanese/tnzcore.qm b/stuff/config/loc/japanese/tnzcore.qm index 1532d0a..475ee2b 100644 Binary files a/stuff/config/loc/japanese/tnzcore.qm and b/stuff/config/loc/japanese/tnzcore.qm differ diff --git a/stuff/config/loc/japanese/tnztools.qm b/stuff/config/loc/japanese/tnztools.qm index b780141..91bdef2 100644 Binary files a/stuff/config/loc/japanese/tnztools.qm and b/stuff/config/loc/japanese/tnztools.qm differ diff --git a/stuff/config/loc/japanese/toonz.qm b/stuff/config/loc/japanese/toonz.qm index f456cb2..cb187e1 100644 Binary files a/stuff/config/loc/japanese/toonz.qm and b/stuff/config/loc/japanese/toonz.qm differ diff --git a/stuff/config/loc/japanese/toonzlib.qm b/stuff/config/loc/japanese/toonzlib.qm index dd7cd5f..09a94e9 100644 Binary files a/stuff/config/loc/japanese/toonzlib.qm and b/stuff/config/loc/japanese/toonzlib.qm differ diff --git a/stuff/config/loc/japanese/toonzqt.qm b/stuff/config/loc/japanese/toonzqt.qm index 2f8eccd..2b9c8f7 100644 Binary files a/stuff/config/loc/japanese/toonzqt.qm and b/stuff/config/loc/japanese/toonzqt.qm differ diff --git a/stuff/config/qss/dark/bottomseparator.png b/stuff/config/qss/dark/bottomseparator.png deleted file mode 100644 index 070050b..0000000 Binary files a/stuff/config/qss/dark/bottomseparator.png and /dev/null differ diff --git a/stuff/config/qss/dark/but.png b/stuff/config/qss/dark/but.png deleted file mode 100644 index f5225fe..0000000 Binary files a/stuff/config/qss/dark/but.png and /dev/null differ diff --git a/stuff/config/qss/dark/butdis.png b/stuff/config/qss/dark/butdis.png deleted file mode 100644 index 5bf7318..0000000 Binary files a/stuff/config/qss/dark/butdis.png and /dev/null differ diff --git a/stuff/config/qss/dark/buthover.png b/stuff/config/qss/dark/buthover.png deleted file mode 100644 index 49c9030..0000000 Binary files a/stuff/config/qss/dark/buthover.png and /dev/null differ diff --git a/stuff/config/qss/dark/chk_chk.png b/stuff/config/qss/dark/chk_chk.png deleted file mode 100644 index c8b9cc4..0000000 Binary files a/stuff/config/qss/dark/chk_chk.png and /dev/null differ diff --git a/stuff/config/qss/dark/chk_chk_disabled.png b/stuff/config/qss/dark/chk_chk_disabled.png deleted file mode 100644 index cf08a05..0000000 Binary files a/stuff/config/qss/dark/chk_chk_disabled.png and /dev/null differ diff --git a/stuff/config/qss/dark/chk_unchk.png b/stuff/config/qss/dark/chk_unchk.png deleted file mode 100644 index ab9e9b6..0000000 Binary files a/stuff/config/qss/dark/chk_unchk.png and /dev/null differ diff --git a/stuff/config/qss/dark/chk_unchk_disabled.png b/stuff/config/qss/dark/chk_unchk_disabled.png deleted file mode 100644 index cfa015d..0000000 Binary files a/stuff/config/qss/dark/chk_unchk_disabled.png and /dev/null differ diff --git a/stuff/config/qss/dark/click.png b/stuff/config/qss/dark/click.png deleted file mode 100644 index 3fb14d6..0000000 Binary files a/stuff/config/qss/dark/click.png and /dev/null differ diff --git a/stuff/config/qss/dark/current.png b/stuff/config/qss/dark/current.png deleted file mode 100644 index dca53d5..0000000 Binary files a/stuff/config/qss/dark/current.png and /dev/null differ diff --git a/stuff/config/qss/dark/dark.qss b/stuff/config/qss/dark/dark.qss deleted file mode 100644 index 26af9ab..0000000 --- a/stuff/config/qss/dark/dark.qss +++ /dev/null @@ -1,1009 +0,0 @@ -/* TOONZ 6.1 Qt Style Test - Digital Video 2007 -*/ - -/*---------------------------------------------------------------------------*/ -QMainWindow #MainStackedWidget { - border: 6px solid rgb(60,60,60); - background-color: rgb(60,60,60); -} -/*---------------------------------------------------------------------------*/ -TPanel { - qproperty-BGColor: rgb(140,140,140); - background-color: rgb(140,140,140); -} -/*---------------------------------------------------------------------------*/ -.QWidget { -} -/*---------------------------------------------------------------------------*/ -/* QMenuBar */ -QMenuBar { - background-color: rgb(140,140,140); -} -/*---------------------------------------------------------------------------*/ -/*Menu*/ -#fxMenu::item:checked, #fxMenu::item:unchecked { - padding: 2px 25px 2px 20px; - border: 1px solid transparent; - background-color: rgb(140,140,140); - color: black; - font-weight: bold; -} -#fxMenu::indicator:unchecked { - image: url(); -} -#fxMenu::indicator:checked { - image: url(); -} -#fxMenu::item:selected { - background-color: rgb(49,106,197); - color: white; - border-color: darkblue; -} -#fxMenu::item:disabled { - color: gray; - background-color: rgb(140,140,140); -} -QMenu { - margin: 2px; - background-color: rgb(140,140,140); - border: 1px solid black; -} -QMenu::item { - padding: 2px 25px 2px 20px; - border: 1px solid transparent; - color: black; -} -QMenu::separator { - background-image: url(qss/dark/menuseparator.png) 1; - height: 2px; - margin-bottom: 2px; - margin-top: 2px; - margin-left: 5px; - margin-right: 5px; -} -QMenu::item:selected { - background-color: rgb(49,106,197); - color: white; - border-color: darkblue; -} -QMenu::item:disabled { - color: rgb(90,90,90); - background-color: rgb(140,140,140); - border: 1px solid transparent; -} -QMenu::indicator { - width: 13px; - height: 13px; -} -QMenu::indicator:unchecked { - image: url(qss/dark/chk_unchk.png); -} -QMenu::indicator:unchecked:disabled { - image: url(qss/standard/chk_unchk_disabled.png); -} -QMenu::indicator:checked { - image: url(qss/dark/chk_chk.png); -} -QMenu::indicator:checked:disabled { - image: url(qss/standard/chk_chk_disabled.png); -} -/*---------------------------------------------------------------------------*/ -/*PopupButton*/ -PopupButton { - padding-left:-8px; - padding-right:4px; -} -PopupButton QMenu { - background-color: rgb(140,140,140); - border: 0px; - padding: -1px; -} -PopupButton QMenu::item { - border: 1px solid transparent; - color: black; -} -PopupButton::menu-indicator { - image: url(qss/standard/down_arrow.png); - width: 10px; - height: 17px; - border-left: 1px solid grey; -} -PopupButton::menu-indicator:disabled { - image: url(qss/standard/down_arrow_disabled.png); -} -/*---------------------------------------------------------------------------*/ -/*Outline Style PopupButtons*/ -PopupButton#Cap { - min-width: 32px; max-width: 32px; -} -PopupButton#Cap QMenu { - min-width: 18px; max-width: 18px; -} -PopupButton#Cap QMenu::item { - min-width: 16px; max-width: 16px; - padding: 0px; -} -PopupButton#Join { - min-width: 32px; max-width: 32px; -} -PopupButton#Join QMenu { - min-width: 18px; max-width: 18px; -} -PopupButton#Join QMenu::item { - min-width: 16px; max-width: 16px; - padding: 0px; -} -/*---------------------------------------------------------------------------*/ -/* Generic QFrame */ -QFrame { - border: 0px; - margin: 0px; - background: rgb(140,140,140); -} -/*Text disable color*/ -QFrame:disabled { - color: rgb(120,120,120); -} -#OnePixelMarginFrame { - margin: 1px; -} -/*---------------------------------------------------------------------------*/ -/* QDialog */ -QDialog #dialogButtonFrame { - border-top: 1px solid rgb(90,90,90); - background-color: rgb(115,115,115); -} -QDialog #dialogButtonFrame QLabel { - background-color: rgb(115,115,115); -} -QDialog #dialogMainFrame { - background-color: rgb(140,140,140); - border: none; -} -/*---------------------------------------------------------------------------*/ -/* Special setting for the styleEditor */ -StyleEditor .QScrollArea { - margin: 0px; - border-right: 1px solid rgb(90,90,90); -} -StyleEditor QToolBar { - border-right: 1px solid rgb(90,90,90); -} -/*---------------------------------------------------------------------------*/ -/*Panel title bar*/ -#HorizontalPanelTitleBar { - background-color: transparent; - border-width: 8px; - border-image: url(qss/dark/titlebar_horizontal.png) 8; -} -#VerticalPanelTitleBar[Active="true"] { - background-color: transparent; - border-width: 8px; - border-image: url(qss/dark/titlebar_vertical.png) 8; -} -#VerticalPanelTitleBar[Active="false"] { - background-color: transparent; - border-width: 8px; - border-image: url(qss/dark/titlebar_vertical_inactive.png) 8; -} -/*---------------------------------------------------------------------------*/ -#SchematicSceneViewer { - background: rgb(100,100,100); -} -/*---------------------------------------------------------------------------*/ -/*SceneViewer Ruler*/ -Ruler { - qproperty-ParentBGColor: rgb(145,145,145); -} -/*---------------------------------------------------------------------------*/ -/* Menu bar */ -#subXsheetTabBarContainer { - background: rgb(120,120,120); -} -SubSheetBar { - qproperty-ParentBGColor: rgb(140,140,140); -} -#dvTopBar { - background-color: rgb(115,115,115); -} -/*---------------------------------------------------------------------------*/ -/* Tool bar */ -#ToolBarContainer { - background: rgb(140,140,140); -} -/*---------------------------------------------------------------------------*/ -/* Tab bar */ -#TabBarContainer { - border: none; - background: rgb(140,140,140); -} -/*---------------------------------------------------------------------------*/ -/* File Browser Tree and Cast Tree background*/ -#BrowserTreeView { - background-color: rgb(120,120,120); -} -/*---------------------------------------------------------------------------*/ -/* Customize sheet scrollArea */ -/* Sheet scrollAreas. - NB.: SpreadsheetViewer e XsheetViewer va reso un unico oggetto - una volta che si e' uniformato completamente l'xsheet alle colonne numeriche.*/ -SpreadsheetViewer { - background: rgb(140,140,140); - qproperty-LightLightBGColor: rgb(200,200,200); - qproperty-LightBGColor: rgb(155,155,155); - qproperty-BGColor: rgb(125,125,125); - qproperty-DarkBGColor: rgb(160,160,160); - qproperty-LightLineColor: rgb(135,135,135 ); - qproperty-DarkLineColor: rgb(90,90,90); -} -#ScrollArea { - border:1px solid rgb(95,95,95); -} -#CellScrollArea { - border-top:1px solid rgb(95,95,95); - border-left:1px solid rgb(95,95,95); -} -XsheetViewer { - background: rgb(140,140,140); - qproperty-LightLightBGColor: rgb(200,200,200); - qproperty-LightBGColor: rgb(155,155,155); - qproperty-BGColor: rgb(125,125,125); - qproperty-DarkBGColor: rgb(160,160,160); - qproperty-LightLineColor: rgb(135,135,135); - qproperty-DarkLineColor: rgb(90,90,90); -} -#xsheetScrollArea { - background: rgb(140,140,140); - margin: 1px; -} -#cornerWidget { - background: rgb(140,140,140); -} -#XshColumnChangeObjectWidget { - background-color: rgb(155,155,155); - selection-background-color: rgb(49,106,197); - border: 1px solid black -} -/*---------------------------------------------------------------------------*/ -/* Customize Function Area */ -FunctionPanel { - qproperty-BGColor: rgb(140,140,140); - qproperty-ValueLineColor: rgb(160,160,160); - qproperty-FrameLineColor: rgb(150,150,150); - qproperty-OtherCurvesColor: rgb(95,95,95); - qproperty-RulerBackground: rgb(160,160,160); -} -/*---------------------------------------------------------------------------*/ -/* Customize FilmStrip color */ -FilmstripFrames { - qproperty-BGColor: rgb(140,140,140); - qproperty-LightLineColor: rgb(100,100,100); - qproperty-DarkLineColor: rgb(95,95,95); -} -/*---------------------------------------------------------------------------*/ -/* Main toolbar */ -QToolBar { - /* top right bottom left */ - margin: 0px; - padding: 0px; - border-top: 1px solid rgb(90,90,90); - background-color: rgb(140,140,140); - border-image: none; -} -QToolBar::separator { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 0px; - image: url(qss/dark/bottomseparator.png); - width: 3px; -} -QToolBar QToolButton[checkable=false] { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 2px solid transparent; - padding-right: 2px; - border-image: none; - background-color: rgb(140,140,140); -} -QToolBar QToolButton:disabled { - border-image: none; -} -QToolBar QToolButton[checkable=false]:hover { - border-width: 2; - border-image: url(qss/dark/over.png) 2; -} -QToolBar QToolButton[checkable=false]:checked, -QToolBar QToolButton[checkable=false]:pressed { - border-width: 2; - border-image: url(qss/dark/click.png) 2; -} -/*Chackable buttons: NO border image*/ -QToolBar QToolButton[checkable=true] { - /* top right bottom left */ - margin: 1px -3px 0px -3px; - border: 0px solid transparent; - border-image: none; -} -QToolBar QToolButton[checkable=true]:hover { - image: none; -} -QToolBar QToolButton[checkable=true]:checked, -QToolBar QToolButton[checkable=true]:pressed { - border-image: none; -} -QToolBar QToolButton#chackableButtonWithImageBorder { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 2px solid transparent; - padding-right: 2px; - border-image: none; - background-color: rgb(140,140,140); -} -QToolBar QToolButton#chackableButtonWithImageBorder:hover { - border-width: 2; - border-image: url(qss/dark/over.png) 2; -} -QToolBar QToolButton#chackableButtonWithImageBorder:checked, -QToolBar QToolButton#chackableButtonWithImageBorder:pressed { - border-width: 2; - border-image: url(qss/dark/click.png) 2; -} -QToolBar QToolButton::menu-button { - margin-top: 1px; - border-image: none; - background-color: rgb(140,140,140); -} -QToolBar QLabel { - margin-top: 1px; - background-color: rgb(140,140,140); - border-width: 2; -} -/* To hide Arrow !! */ -QToolBar QToolButton::menu-indicator { - image: none; -} -/*---------------------------------------------------------------------------*/ -/* Tool Bar */ -#toolBar { - margin: 1px; - background-color: rgb(140,140,140); -} -#toolBar QToolBar { - border: none; - margin: 1px; -} -#toolBar QToolBar::separator { - image: none; - margin: 0px 1px 0px 1px; - background-color: rgb(90,90,90); - height: 1px; -} -#toolBar QToolButton { - margin: 0px; - border: 2px solid transparent; - border-image: none; - background-color: rgb(140,140,140); -} -#toolBar QToolButton:pressed { - border-image: url(qss/dark/click.png) 2; - border-width: 2; -} -#toolBar QToolButton:checked { - border-image: url(qss/dark/current.png) 2; - border-width: 2; -} -#toolBar QPushButton { - border: 1px solid black; -} -/*---------------------------------------------------------------------------*/ -/* ToolOptionPanel ToolBar */ -#toolOptionBar { - border: 0px; - margin: 0px; - background-color: rgb(140,140,140); -} -#toolOptionBar::separator { - image: none; - margin-top: 0px; - margin-bottom: 0px; - margin-left: 1px; - margin-right: 1px; - background-color: rgb(90,90,90); - height: 30px; - width: 1px; -} -#toolOptionBar QWidget { - background-color: rgb(140,140,140); -} -/*---------------------------------------------------------------------------*/ -/*Key frame navigator*/ -#keyFrameNavigator QToolButton { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 2px solid transparent; - padding-right: 1px; - border-image: none; - background-color: rgb(140,140,140); -} -#keyFrameNavigator QToolButton:hover { - margin: 1px 0px 0px 0px; - border-width: 2; - border-image: url(qss/dark/over.png) 2; -} -#keyFrameNavigator QToolButton:checked, -#keyFrameNavigator QToolButton:pressed { - border-width: 2; - border-image: url(qss/dark/click.png) 2; -} -/*---------------------------------------------------------------------------*/ -QMessageBox { - background-color: rgb(140,140,140); - border: 1px solid rgb(90,90,90); -} -/*---------------------------------------------------------------------------*/ -/* Customize arrows. */ -QComboBox::down-arrow, QComboBox::menu-indicator { - image: url(qss/dark/down_arrow.png); - width: 7px; - height: 7px; -} -QComboBox::down-arrow:disabled, QComboBox::down-arrow:off { - image: url(qss/dark/down_arrow_disabled.png); -} -QComboBox::up-arrow { - image: url(qss/dark/up_arrow.png); - width: 7px; - height: 7px; -} -QComboBox::up-arrow:disabled, QComboBox::up-arrow:off { - image: url(qss/dark/up_arrow_disabled.png); -} -/*---------------------------------------------------------------------------*/ -QPushButton { - border-image: url(qss/dark/but.png) 2; - border-width: 2; - color: black; -} -/*---------------------------------------------------------------------------*/ -#PeggingWidget { - background-color: rgb(0,0,0); -} -/*---------------------------------------------------------------------------*/ -#PeggingButton { - border-image: none; - background-color: rgb(228,228,228); - border: 0px solid black; -} -#PeggingButton:hover { - border-image: url(qss/standard/over.png) 2; - border-width: 2; -} -#PeggingButton:pressed { - border-image: url(qss/standard/click.png) 2; - border-width: 2; -} -#PeggingButton:checked { - border-image: none; - background-color: rgb(255,255,255); - border-left-color: lightgray; - border-left-width: 2px; - border-top-color: lightgray; - border-top-width: 2px; - border-right-width: 0px; - border-bottom-width: 0px; -} -/*---------------------------------------------------------------------------*/ -QComboBox[editable="false"] { - border-image: url(qss/dark/but.png) 2; - border-width: 2; -} -QComboBox[editable="true"] { - border-image: url(qss/dark/but.png) 2; - border-width: 2; -} -QComboBox:disabled, QPushButton:disabled { - border-image: url(qss/dark/butdis.png) 2; - border-width: 2; - height: 22px; - color: rgb(90,90,90); -} -QComboBox:hover, QPushButton:hover { - border-image: url(qss/dark/buthover.png) 2; - border-width: 2; - height: 22px; -} -QComboBox:pressed, QPushButton:pressed { - border-image: url(qss/dark/but.png) 2; - border-width: 2; - height: 22px; -} -/* Customize non-editable comboboxes drop-down */ -QComboBox[editable="false"] { - padding-left: 3px; - padding-right: 2px; -} -QComboBox[editable="false"]::drop-down { - width: 15px; - border-left-style: solid; - border-left-color: darkgray; - border-left-width: 1px; -} -/* Customize editable comboboxes.*/ -QComboBox[editable="true"] { - padding-right: 16px; -} -QComboBox[editable="true"]::drop-down { - subcontrol-origin: border; - subcontrol-position: top right; - width: 13px; - position: absolute; - top: 2px; - bottom: 2px; - right: 2px; -} -QComboBox[editable="true"]::drop-down, -QComboBox[editable="true"]::drop-down:hover, -QComboBox[editable="true"]::drop-down:on { - border-width: 0px; - border-left-width: 3px; /* we need only left and center part */ -} -/*---------------------------------------------------------------------------*/ -DvScrollWidget > QPushButton { - border-image: none; - border: 0px solid black; - background-color: rgb(160,160,160); -} -DvScrollWidget > QPushButton:hover { - border-image: none; - border: 0px solid black; - background-color: rgb(180,180,180); -} -DvScrollWidget > QPushButton:pressed { - border-image: none; - border: 0px solid black; - background-color: rgb(150,150,150); -} -/*---------------------------------------------------------------------------*/ -#ScrollLeftButton { - image: url(qss/dark/left_arrow_black.png); - border-right: 1px solid black; - min-width: 15px; - max-width: 15px; -} -#ScrollRightButton { - image: url(qss/dark/right_arrow_black.png); - border-left: 1px solid black; - min-width: 15px; - max-width: 15px; -} -#ScrollUpButton { - image: url(qss/dark/up_arrow_black.png); - border-bottom: 1px solid black; - min-height: 15px; - max-height: 15px; -} -#ScrollDownButton { - image: url(qss/dark/down_arrow_black.png); - border-top: 1px solid black; - min-height: 15px; - max-height: 15px; -} -/*---------------------------------------------------------------------------*/ -#ToolBarContainer #ScrollLeftButton { - margin-top: 1px; -} -#ToolBarContainer #ScrollRightButton { - margin-top: 1px; -} -/*---------------------------------------------------------------------------*/ -/* QToolButton */ -QToolButton { - border-image: url(qss/dark/but.png) 2; - border-width: 2; -} -QToolButton:disabled { - border-image: url(qss/dark/butdis.png) 2; - border-width: 2; -} -QToolButton:hover { - border-image: url(qss/dark/buthover.png) 2; - border-width: 2; -} -QToolButton:disabled:hover { - margin-top: 1px; - border-image: none; - border-width: 0px; -} -QToolButton:pressed { - border-image: url(qss/dark/but.png) 2; - border-width: 2; -} -QToolButton:checked { - border-image: url(qss/dark/buthover.png) 2; - border-width: 2; -} -/*---------------------------------------------------------------------------*/ -#ToolbarToolButton { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 2px solid transparent; - padding-right: 1px; - border-image: none; -} -#ToolbarToolButton:hover { - margin: 1px 0px 0px 0px; - border-width: 2; - border-image: url(qss/dark/over.png) 2; -} -#ToolbarToolButton:checked, -#ToolbarToolButton:pressed { - border-width: 2; - border-image: url(qss/dark/click.png) 2; -} -/*---------------------------------------------------------------------------*/ -#StyleEditorArrowButton { - margin: 0px 0px 0px 0px; - border: 1px solid transparent; - border-image: none; - background-color: rgb(145,145,145); -} -#StyleEditorArrowButton:hover { - border-width: 1; - border-image: url(qss/dark/over.png) 1; -} -#StyleEditorArrowButton:checked, -#StyleEditorArrowButton:pressed { - border-width: 1; - border-image: url(qss/dark/click.png) 1; -} -/*---------------------------------------------------------------------------*/ -/* QLineEdit */ -QLineEdit { - border-image: url(qss/dark/frame.png) 3; - border-width: 3; -} -QLineEdit::focus { - border-image: url(qss/dark/framehover.png) 3; - border-width: 3; -} -QLineEdit:disabled { - color: rgb(135,135,135); - border-image: url(qss/dark/framedisable.png) 3; -} -/*---------------------------------------------------------------------------*/ -/* QPlainTextEdit & QTextEdit */ -QPlainTextEdit, QTexEdit { - border-image: url(qss/dark/frame.png) 3; - border-width: 3; -} -QPlainTextEdit::focus, QTextEdit::focus { - border-image: url(qss/dark/framehover.png) 3; - border-width: 3; -} -QPlainTextEdit:disabled, QTextEdit:disabled { - color: rgb(135,135,135); - border-image: url(qss/dark/framedisable.png) 3; -} -/*---------------------------------------------------------------------------*/ -/* QGroupBox */ -QGroupBox -{ - background-color: none; - margin-top: 5px; - padding-top: 5px; - border: 1px solid; - border-radius: 3px; -} -QGroupBox:enabled -{ - border-color: rgb(90, 90, 90); -} -QGroupBox:disabled -{ - border-color: rgb(140, 140, 140); -} -QGroupBox::title { - subcontrol-origin: border; - top: -6px; - left: 6px; -} -/*---------------------------------------------------------------------------*/ -/* QStatusBar */ -QStatusBar { - background-color: rgb(140,140,140); -} -/*---------------------------------------------------------------------------*/ -/* Customize Horizontal QSlider. */ -QSlider { - height: 20; -} -QSlider::groove:horizontal { - border-image: url(qss/dark/sl_groove.png) 1; - border-width: 1; - height: 1px; -} -QSlider::handle:horizontal:enabled { - image: url(qss/dark/h_handle.png); - width: 16px; - margin: -16px -4px; -} -QSlider::handle:horizontal:disabled { - image: url(qss/dark/h_handle_disabled.png); - width: 16px; - margin: -16px -4px; -} - - -/* Customize Horizontal QSlider that have name "colorSlider" */ -#colorSlider::groove:horizontal { - border-image: none; -} -#colorSlider::handle:horizontal { - image: url(qss/dark/h_chandle.png); - width: 16px; - margin: -16px -3px -16px -4px; -} - -/*---------------------------------------------------------------------------*/ - -#IntPairField { - qproperty-HandleLeftPixmap: url(qss/dark/h_slider_left.png); - qproperty-HandleRightPixmap: url(qss/dark/h_slider_right.png); - qproperty-HandleLeftGrayPixmap: url(qss/dark/h_slider_left_disabled.png); - qproperty-HandleRightGrayPixmap: url(qss/dark/h_slider_right_disabled.png); -} - -/*---------------------------------------------------------------------------*/ - -#DoublePairField { - qproperty-HandleLeftPixmap: url(qss/dark/h_slider_left.png); - qproperty-HandleRightPixmap: url(qss/dark/h_slider_right.png); - qproperty-HandleLeftGrayPixmap: url(qss/dark/h_slider_left_disabled.png); - qproperty-HandleRightGrayPixmap: url(qss/dark/h_slider_right_disabled.png); -} - -/*---------------------------------------------------------------------------*/ - -/* Flipbook Slider. */ -FlipSlider { - qproperty-PBHeight: 10; - - qproperty-PBOverlay: url(qss/dark/flipslider.png); - qproperty-PBMarker: url(qss/dark/flipmarker.png); - - qproperty-PBColorMarginLeft: 2; - qproperty-PBColorMarginTop: 2; - qproperty-PBColorMarginRight: 2; - qproperty-PBColorMarginBottom: 3; - - qproperty-PBMarkerMarginLeft: 2; - qproperty-PBMarkerMarginRight: 2; - - qproperty-baseColor: rgb(235,235,235); - qproperty-notStartedColor: rgb(210,40,40); - qproperty-startedColor: rgb(220,160,160); - qproperty-finishedColor: rgb(235,235,235); -} - -/*---------------------------------------------------------------------------*/ - -/* Customize QTabBar */ -QTabBar { - height: 22px; - border: 0px; -} -QTabBar::tab { - top: -1px; - min-width: 54px; - min-height: 15px; -} -QTabBar::tab:selected { - padding-top: 2px; - border-image: url(qss/dark/uptab.png) 4; - border-width: 4; -} -QTabBar::tab:only-one { - padding-top: 2px; - border-image: url(qss/dark/oouptab.png) 4; - border-width: 4; -} -QTabBar::tab:first:selected { - border-image: url(qss/dark/fuptab.png) 4; - border-width: 4; -} -QTabBar::tab:!selected { - margin-top: 2px; - border-image: url(qss/dark/tab.png) 4; - border-width: 4; -} -QTabBar::tab:first:!selected { - border-image: url(qss/dark/ftab.png) 4; - border-width: 4; -} -QTabBar::tab:last:!selected { - border-image: url(qss/dark/ltab.png) 4; - border-width: 4; -} -/* Customize RoomTabWidget */ -/* ATTENTION: These declarations must be putted after the QTabBar ones */ -RoomTabWidget { - height: 22px; - background-color: rgb(120,120,120); - color: white; -} -RoomTabWidget::tab { - top: 1px; - min-width: 54px; - min-height: 15px; -} -RoomTabWidget::tab:selected { - border-image: url(qss/dark/uptbtab.png) 4; - border-width: 4; - font: bold; -} -RoomTabWidget::tab:first:selected, RoomTabWidget::tab:only-one { - border-image: url(qss/dark/fuptbtab.png) 4; - border-width: 4; - font: bold; -} -RoomTabWidget::tab:!selected { - margin-top: 2px; - border-image: url(qss/dark/tbtab.png) 4; - border-width: 4; - font: normal; -} -RoomTabWidget::tab:first:!selected { - border-image: url(qss/dark/ftbtab.png) 4; - border-width: 4; -} -RoomTabWidget::tab:last:!selected { - border-image: url(qss/dark/ltbtab.png) 4; - border-width: 4; -} -/*---------------------------------------------------------------------------*/ -/* Customize QScrollBar horizontal*/ -QScrollBar:horizontal { - background-image: url(qss/dark/sb_h.png); - height: 16px; - margin-top: 0px; - margin-bottom: 0px; - margin-right:15px; - margin-left:15px; -} -QScrollBar::handle:horizontal { - border-image: url(qss/dark/sb_hhandle.png)3; - border-width: 3; - image: url(qss/dark/sb_hline.png); - image-position: center center; -} -QScrollBar::add-line:horizontal { - image: url(qss/dark/sb_rarrow.png); - width: 15px; - subcontrol-position: right; - subcontrol-origin: margin; -} -QScrollBar::sub-line:horizontal { - image: url(qss/dark/sb_larrow.png); - width: 15px; - subcontrol-position: left; - subcontrol-origin: margin; -} -QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal { - background: none; -} -/* Customize QScrollBar vertical*/ -QScrollBar:vertical { - background-image: url(qss/dark/sb_v.png); - width: 16px; - margin-left: 0px; - margin-right: 0px; - margin-top:15px; - margin-bottom:15px; -} -QScrollBar::handle:vertical { - border-image: url(qss/dark/sb_vhandle.png)3; - border-width: 3; - image: url(qss/dark/sb_vline.png); - image-position: center center; -} -QScrollBar::add-line:vertical { - image: url(qss/dark/sb_downarrow.png); - height: 15px; - subcontrol-position: bottom; - subcontrol-origin: margin; -} -QScrollBar::sub-line:vertical { - image: url(qss/dark/sb_uparrow.png); - height: 15px; - subcontrol-position: top; - subcontrol-origin: margin; -} -QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { - background: none; -} -/*---------------------------------------------------------------------------*/ -/* Customize check boxes. */ -QCheckBox { - spacing: 1px; -} -QCheckBox::indicator { - width: 13px; - height: 13px; -} -QCheckBox::indicator:unchecked, QTreeView::indicator:unchecked { - image: url(qss/dark/chk_unchk.png); -} -QCheckBox::indicator:unchecked:disabled, QTreeView::indicator:unchecked:disabled { - image: url(qss/standard/chk_unchk_disabled.png); -} -QCheckBox::indicator:checked, QTreeView::indicator:checked { - image: url(qss/dark/chk_chk.png); -} -QCheckBox::indicator:checked:disabled, QTreeView::indicator:checked:disabled { - image: url(qss/standard/chk_chk_disabled.png); -} -/*---------------------------------------------------------------------------*/ -/* Customize radio buttons. */ -QRadioButton { - spacing: 5px; -} -QRadioButton::indicator { - width: 13px; - height: 13px; -} -QRadioButton::indicator::unchecked { - image: url(qss/dark/radio.png); -} -QRadioButton::indicator::checked { - image: url(qss/dark/radio_p.png); -} -/*---------------------------------------------------------------------------*/ -/* QSplitter (Un pochettino assumo che sono tutti verticali) */ -QSplitter { - background-color: rgb(120,120,120); -} -QSplitter::handle { - margin: 0px; - background-color: rgb(120,120,120); -} -QSplitter::handle:horizontal { - image: url(qss/dark/hsplitter_handle.png); - border-left: 1px solid rgb(90,90,90); - border-right: 1px solid rgb(90,90,90); - image-position: center center; -} -QSplitter::handle:vertical { - image: url(qss/dark/vsplitter_handle.png); - border-top: 1px solid rgb(90,90,90); - border-bottom: 1px solid rgb(90,90,90); - padding-left: 1px; - padding-right: 1px; - image-position: center center; -} -/*---------------------------------------------------------------------------*/ -/* QToolTip */ -QToolTip { - border: 1px solid black; - background-color: rgb(255,255,225); -} -/*---------------------------------------------------------------------------*/ -/* Generic Separators with inscribed name */ -DVGui--Separator { - alternate-background-color: rgb(120, 120, 120); /* line color */ -} -/*---------------------------------------------------------------------------*/ -/* Export Level Popup Options */ -#ExportLevelOptions -{ - background-color: rgb(115,115,115); -} -#ExportLevelOptions QWidget -{ - background-color: none; -} -ExportLevelPopup DVGui--Separator { - padding: 0px 5px 0px 5px; - alternate-background-color: rgb(90, 90, 90); -} - diff --git a/stuff/config/qss/dark/dark_mac.qss b/stuff/config/qss/dark/dark_mac.qss deleted file mode 100644 index 1ada2e9..0000000 --- a/stuff/config/qss/dark/dark_mac.qss +++ /dev/null @@ -1,1049 +0,0 @@ -/* TOONZ 6.1 Qt Style Test - Digital Video 2007 -*/ - -/*---------------------------------------------------------------------------*/ -QMainWindow #MainStackedWidget { - border: 6px solid rgb(60,60,60); - background-color: rgb(60,60,60); -} -/*---------------------------------------------------------------------------*/ -/*------------ Mac OS ------------*/ -TPanel { - qproperty-BGColor: rgb(140,140,140); - background-color: rgb(140,140,140); - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -/*---------------------------------------------------------------------------*/ -.QWidget { -} -/*---------------------------------------------------------------------------*/ -/* QMenuBar */ -QMenuBar { - background-color: rgb(140,140,140); - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -/*---------------------------------------------------------------------------*/ -/*Menu*/ -#fxMenu::item:checked, #fxMenu::item:unchecked { - padding: 2px 25px 2px 20px; - border: 1px solid transparent; - background-color: rgb(140,140,140); - color: black; - font-weight: bold; -} -#fxMenu::indicator:unchecked { - image: url(); -} -#fxMenu::indicator:checked { - image: url(); -} -#fxMenu::item:selected { - background-color: rgb(49,106,197); - color: white; - border-color: darkblue; -} -#fxMenu::item:disabled { - color: gray; - background-color: rgb(140,140,140); -} -QMenu { - margin: 2px; - background-color: rgb(140,140,140); - border: 1px solid black; - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -QMenu::item { - padding: 2px 25px 2px 20px; - border: 1px solid transparent; - color: black; -} -QMenu::separator { - background-image: url(qss/dark/menuseparator.png) 1; - height: 2px; - margin-bottom: 2px; - margin-top: 2px; - margin-left: 5px; - margin-right: 5px; -} -QMenu::item:selected { - background-color: rgb(49,106,197); - color: white; - border-color: darkblue; -} -QMenu::item:disabled { - color: rgb(90,90,90); - background-color: rgb(140,140,140); - border: 1px solid transparent; -} -QMenu::indicator { - width: 13px; - height: 13px; -} -QMenu::indicator:unchecked { - image: url(qss/dark/chk_unchk.png); -} -QMenu::indicator:unchecked:disabled { - image: url(qss/standard/chk_unchk_disabled.png); -} -QMenu::indicator:checked { - image: url(qss/dark/chk_chk.png); -} -QMenu::indicator:checked:disabled { - image: url(qss/standard/chk_chk_disabled.png); -} -/*---------------------------------------------------------------------------*/ -QPushButton { - margin-bottom: -1px; - border-image: url(qss/dark/but.png) 2; - border-width: 2; - color: black; - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -/*---------------------------------------------------------------------------*/ -/* Generic QFrame */ -QFrame { - border: 0px; - margin: 0px; - background: rgb(140,140,140); - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -/*Text disable color*/ -QFrame:disabled { - color: rgb(120,120,120); -} -#OnePixelMarginFrame { - margin: 1px; -} -/*---------------------------------------------------------------------------*/ -/* QDialog */ -QDialog #dialogButtonFrame { - border-top: 1px solid rgb(90,90,90); - background-color: rgb(115,115,115); -} -QDialog #dialogButtonFrame QLabel { - background-color: rgb(115,115,115); -} -QDialog #dialogMainFrame { - background-color: rgb(140,140,140); - border: none; -} -/*---------------------------------------------------------------------------*/ -/* Special setting for the styleEditor */ -StyleEditor .QScrollArea { - margin: 0px; - border-right: 1px solid rgb(90,90,90); -} -StyleEditor QToolBar { - border-right: 1px solid rgb(90,90,90); -} -/*---------------------------------------------------------------------------*/ -/*Panel title bar*/ -#HorizontalPanelTitleBar { - background-color: transparent; - border-width: 8px; - border-image: url(qss/dark/titlebar_horizontal.png) 8; -} -#VerticalPanelTitleBar[Active="true"] { - background-color: transparent; - border-width: 8px; - border-image: url(qss/dark/titlebar_vertical.png) 8; -} -#VerticalPanelTitleBar[Active="false"] { - background-color: transparent; - border-width: 8px; - border-image: url(qss/dark/titlebar_vertical_inactive.png) 8; -} -/*---------------------------------------------------------------------------*/ -#SchematicSceneViewer { - background: rgb(100,100,100); -} -/*---------------------------------------------------------------------------*/ -/*SceneViewer Ruler*/ -Ruler { - qproperty-ParentBGColor: rgb(145,145,145); -} -/*---------------------------------------------------------------------------*/ -/* Menu bar */ -#subXsheetTabBarContainer { - background: rgb(120,120,120); -} -SubSheetBar { - qproperty-ParentBGColor: rgb(115,115,115); -} -#dvTopBar { - background-color: rgb(115,115,115); -} -/*---------------------------------------------------------------------------*/ -/* Tool bar */ -#ToolBarContainer { - background: rgb(140,140,140); -} -/*---------------------------------------------------------------------------*/ -/* Tab bar */ -#TabBarContainer { - border: none; - background: rgb(140,140,140); -} -/*---------------------------------------------------------------------------*/ -/* File Browser Tree and Cast Tree background*/ -#BrowserTreeView { - background-color: rgb(120,120,120); -} -/*---------------------------------------------------------------------------*/ -/* Customize sheet scrollArea */ -/* Sheet scrollAreas. - NB.: SpreadsheetViewer e XsheetViewer va reso un unico oggetto - una volta che si e' uniformato completamente l'xsheet alle colonne numeriche.*/ -SpreadsheetViewer { - background: rgb(140,140,140); - qproperty-LightLightBGColor: rgb(200,200,200); - qproperty-LightBGColor: rgb(155,155,155); - qproperty-BGColor: rgb(125,125,125); - qproperty-DarkBGColor: rgb(160,160,160); - qproperty-LightLineColor: rgb(135,135,135 ); - qproperty-DarkLineColor: rgb(90,90,90); -} -#ScrollArea { - border:1px solid rgb(95,95,95); -} -#CellScrollArea { - border-top:1px solid rgb(95,95,95); - border-left:1px solid rgb(95,95,95); -} -XsheetViewer { - background: rgb(140,140,140); - qproperty-LightLightBGColor: rgb(200,200,200); - qproperty-LightBGColor: rgb(155,155,155); - qproperty-BGColor: rgb(125,125,125); - qproperty-DarkBGColor: rgb(160,160,160); - qproperty-LightLineColor: rgb(135,135,135); - qproperty-DarkLineColor: rgb(90,90,90); -} -#xsheetScrollArea { - background: rgb(140,140,140); - margin: 1px; -} -#cornerWidget { - background: rgb(140,140,140); -} -#XshColumnChangeObjectWidget { - background-color: rgb(155,155,155); - selection-background-color: rgb(49,106,197); - border: 1px solid black -} -/*---------------------------------------------------------------------------*/ -/* Customize Function Area */ -FunctionPanel { - qproperty-BGColor: rgb(140,140,140); - qproperty-ValueLineColor: rgb(160,160,160); - qproperty-FrameLineColor: rgb(150,150,150); - qproperty-OtherCurvesColor: rgb(95,95,95); - qproperty-RulerBackground: rgb(160,160,160); -} -/*---------------------------------------------------------------------------*/ -/* Customize FilmStrip color */ -FilmstripFrames { - qproperty-BGColor: rgb(140,140,140); - qproperty-LightLineColor: rgb(100,100,100); - qproperty-DarkLineColor: rgb(95,95,95); -} -/*---------------------------------------------------------------------------*/ -/* Main toolbar */ -QToolBar { - /* top right bottom left */ - margin: 0px; - padding: 0px; - border-top: 1px solid rgb(90,90,90); - background-color: rgb(140,140,140); - border-image: none; -} -QToolBar::separator { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 0px; - image: url(qss/dark/bottomseparator.png); - width: 3px; -} -QToolBar QToolButton[checkable=false] { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 2px solid transparent; - padding-right: 2px; - border-image: none; - background-color: rgb(140,140,140); -} -QToolBar QToolButton:disabled { - border-image: none; -} -QToolBar QToolButton[checkable=false]:hover { - border-width: 2; - border-image: url(qss/dark/over.png) 2; -} -QToolBar QToolButton[checkable=false]:checked, -QToolBar QToolButton[checkable=false]:pressed { - border-width: 2; - border-image: url(qss/dark/click.png) 2; -} -/*Chackable buttons: NO border image*/ -QToolBar QToolButton[checkable=true] { - /* top right bottom left */ - margin: 1px -3px 0px -3px; - border: 0px solid transparent; - border-image: none; -} -QToolBar QToolButton[checkable=true]:hover { - image: none; -} -QToolBar QToolButton[checkable=true]:checked, -QToolBar QToolButton[checkable=true]:pressed { - border-image: none; -} -QToolBar QToolButton#chackableButtonWithImageBorder { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 2px solid transparent; - padding-right: 2px; - border-image: none; - background-color: rgb(140,140,140); -} -QToolBar QToolButton#chackableButtonWithImageBorder:hover { - border-width: 2; - border-image: url(qss/dark/over.png) 2; -} -QToolBar QToolButton#chackableButtonWithImageBorder:checked, -QToolBar QToolButton#chackableButtonWithImageBorder:pressed { - border-width: 2; - border-image: url(qss/dark/click.png) 2; -} -QToolBar QToolButton::menu-button { - margin-top: 1px; - border-image: none; - background-color: rgb(140,140,140); -} -QToolBar QLabel { - margin-top: 1px; - background-color: rgb(140,140,140); - border-width: 2; -} -/* To hide Arrow !! */ -QToolBar QToolButton::menu-indicator { - image: none; -} -/*---------------------------------------------------------------------------*/ -/* Tool Bar */ -#toolBar { - margin: 1px; - background-color: rgb(140,140,140); -} -#toolBar QToolBar { - border: none; - margin: 1px; -} -#toolBar QToolBar::separator { - image: none; - margin: 0px 1px 0px 1px; - background-color: rgb(90,90,90); - height: 1px; -} -#toolBar QToolButton { - margin: 0px; - border: 2px solid transparent; - border-image: none; - background-color: rgb(140,140,140); -} -#toolBar QToolButton:pressed { - border-image: url(qss/dark/click.png) 2; - border-width: 2; -} -#toolBar QToolButton:checked { - border-image: url(qss/dark/current.png) 2; - border-width: 2; -} -#toolBar QPushButton { - margin: 0px; - border: 1px solid black; -} -/*---------------------------------------------------------------------------*/ -/* ToolOptionPanel ToolBar */ -#toolOptionBar { - border: 0px; - margin: 0px; - background-color: rgb(140,140,140); -} -#toolOptionBar::separator { - image: none; - margin-top: 0px; - margin-bottom: 0px; - margin-left: 1px; - margin-right: 1px; - background-color: rgb(90,90,90); - height: 30px; - width: 1px; -} -#toolOptionBar QWidget { - background-color: rgb(140,140,140); -} -/*---------------------------------------------------------------------------*/ -/*Key frame navigator*/ -#keyFrameNavigator QToolButton { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 2px solid transparent; - padding-right: 1px; - border-image: none; - background-color: rgb(140,140,140); -} -#keyFrameNavigator QToolButton:hover { - margin: 1px 0px 0px 0px; - border-width: 2; - border-image: url(qss/dark/over.png) 2; -} -#keyFrameNavigator QToolButton:checked, -#keyFrameNavigator QToolButton:pressed { - border-width: 2; - border-image: url(qss/dark/click.png) 2; -} -/*---------------------------------------------------------------------------*/ -QMessageBox { - background-color: rgb(140,140,140); - border: 1px solid rgb(90,90,90); -} -/*---------------------------------------------------------------------------*/ -/* Customize arrows. */ -QComboBox::down-arrow, QComboBox::menu-indicator { - image: url(qss/dark/down_arrow.png); - width: 7px; - height: 7px; -} -QComboBox::down-arrow:disabled, QComboBox::down-arrow:off { - image: url(qss/dark/down_arrow_disabled.png); -} -QComboBox::up-arrow { - image: url(qss/dark/up_arrow.png); - width: 7px; - height: 7px; -} -QComboBox::up-arrow:disabled, QComboBox::up-arrow:off { - image: url(qss/dark/up_arrow_disabled.png); -} -/*---------------------------------------------------------------------------*/ -/*PopupButton*/ -PopupButton { - margin: 0px; - padding-left:-8px; - padding-right:4px; -} -PopupButton QMenu { - background-color: rgb(140,140,140); - border: 0px; - padding: -1px; -} -PopupButton QMenu::item { - border: 1px solid transparent; - color: black; -} -PopupButton::menu-indicator { - image: url(qss/standard/down_arrow.png); - width: 10px; - height: 17px; - border-left: 1px solid grey; -} -PopupButton::menu-indicator:disabled { - image: url(qss/standard/down_arrow_disabled.png); -} -/*---------------------------------------------------------------------------*/ -/*Outline Style PopupButtons*/ -PopupButton#Cap { - min-width: 32px; max-width: 32px; -} -PopupButton#Cap QMenu { - min-width: 18px; max-width: 18px; -} -PopupButton#Cap QMenu::item { - min-width: 16px; max-width: 16px; - padding: 0px; -} -PopupButton#Join { - min-width: 32px; max-width: 32px; -} -PopupButton#Join QMenu { - min-width: 18px; max-width: 18px; -} -PopupButton#Join QMenu::item { - min-width: 16px; max-width: 16px; - padding: 0px; -} -/*---------------------------------------------------------------------------*/ -#PeggingButton { - border-image: none; - background-color: rgb(228,228,228); - border: 0px solid black; -} -#PeggingButton:hover { - border-image: url(qss/standard/over.png) 2; - border-width: 2; -} -#PeggingButton:pressed { - border-image: url(qss/standard/click.png) 2; - border-width: 2; -} -#PeggingButton:checked { - border-image: none; - background-color: rgb(255,255,255); - border-left-color: lightgray; - border-left-width: 2px; - border-top-color: lightgray; - border-top-width: 2px; - border-right-width: 0px; - border-bottom-width: 0px; -} -/*---------------------------------------------------------------------------*/ -QComboBox { - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -/*---------------------------------------------------------------------------*/ -QComboBox[editable="false"] { - border-image: url(qss/dark/but.png) 2; - border-width: 2; -} -QComboBox[editable="true"] { - border-image: url(qss/dark/but.png) 2; - border-width: 2; -} -QComboBox:disabled, QPushButton:disabled { - border-image: url(qss/dark/butdis.png) 2; - border-width: 2; - height: 22px; - color: rgb(90,90,90); -} -QComboBox:hover, QPushButton:hover { - border-image: url(qss/dark/buthover.png) 2; - border-width: 2; - height: 22px; -} -QComboBox:pressed, QPushButton:pressed { - border-image: url(qss/dark/but.png) 2; - border-width: 2; - height: 22px; -} -/* Customize non-editable comboboxes drop-down */ -QComboBox[editable="false"] { - padding-left: 3px; - padding-right: 2px; /* space for the arrow */ -} -QComboBox[editable="false"]::drop-down { - width: 15px; - border-left-style: solid; - border-left-color: darkgray; - border-left-width: 1px; -} -/* Customize editable comboboxes.*/ -QComboBox[editable="true"] { - padding-right: 16px; -} -QComboBox[editable="true"]::drop-down { - subcontrol-origin: border; - subcontrol-position: top right; - width: 13px; - position: absolute; - top: 2px; - bottom: 2px; - right: 2px; -} -QComboBox[editable="true"]::drop-down, -QComboBox[editable="true"]::drop-down:hover, -QComboBox[editable="true"]::drop-down:on { - border-width: 0px; - border-left-width: 3px; /* we need only left and center part */ -} -/*---------------------------------------------------------------------------*/ -DvScrollWidget > QPushButton { - border-image: none; - border: 0px solid black; - background-color: rgb(160,160,160); -} -DvScrollWidget > QPushButton:hover { - border-image: none; - border: 0px solid black; - background-color: rgb(180,180,180); -} -DvScrollWidget > QPushButton:pressed { - border-image: none; - border: 0px solid black; - background-color: rgb(150,150,150); -} -/*---------------------------------------------------------------------------*/ -#ScrollLeftButton { - image: url(qss/dark/left_arrow_black.png); - border-right: 1px solid black; - min-width: 15px; - max-width: 15px; -} -#ScrollRightButton { - image: url(qss/dark/right_arrow_black.png); - border-left: 1px solid black; - min-width: 15px; - max-width: 15px; -} -#ScrollUpButton { - image: url(qss/dark/up_arrow_black.png); - border-bottom: 1px solid black; - min-height: 15px; - max-height: 15px; -} -#ScrollDownButton { - image: url(qss/dark/down_arrow_black.png); - border-top: 1px solid black; - min-height: 15px; - max-height: 15px; -} -/*---------------------------------------------------------------------------*/ -#ToolBarContainer #ScrollLeftButton { - margin-top: 1px; -} -#ToolBarContainer #ScrollRightButton { - margin-top: 1px; -} -/*---------------------------------------------------------------------------*/ -/* QToolButton */ -QToolButton { - border-image: url(qss/dark/but.png) 2; - border-width: 2; - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -QToolButton:disabled { - border-image: url(qss/dark/butdis.png) 2; - border-width: 2; -} -QToolButton:hover { - border-image: url(qss/dark/buthover.png) 2; - border-width: 2; -} -QToolButton:disabled:hover { - margin-top: 1px; - border-image: none; - border-width: 0px; -} -QToolButton:pressed { - border-image: url(qss/dark/but.png) 2; - border-width: 2; -} -QToolButton:checked { - border-image: url(qss/dark/buthover.png) 2; - border-width: 2; -} -/*---------------------------------------------------------------------------*/ -#ToolbarToolButton { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 2px solid transparent; - padding-right: 1px; - border-image: none; -} -#ToolbarToolButton:hover { - margin: 1px 0px 0px 0px; - border-width: 2; - border-image: url(qss/dark/over.png) 2; -} -#ToolbarToolButton:checked, -#ToolbarToolButton:pressed { - border-width: 2; - border-image: url(qss/dark/click.png) 2; -} -/*---------------------------------------------------------------------------*/ -#StyleEditorArrowButton { - margin: 0px 0px 0px 0px; - border: 1px solid transparent; - border-image: none; - background-color: rgb(145,145,145); -} -#StyleEditorArrowButton:hover { - border-width: 1; - border-image: url(qss/dark/over.png) 1; -} -#StyleEditorArrowButton:checked, -#StyleEditorArrowButton:pressed { - border-width: 1; - border-image: url(qss/dark/click.png) 1; -} -/*---------------------------------------------------------------------------*/ -/* QLineEdit */ -QLineEdit { - margin-bottom: 1px; - margin-right: 1px; - border-image: url(qss/dark/frame.png) 3; - border-width: 3; - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -QLineEdit::focus { - border-image: url(qss/dark/framehover.png) 3; - border-width: 3; -} -QLineEdit:disabled { - color: rgb(135,135,135); - border-image: url(qss/dark/framedisable.png) 3; -} -/*---------------------------------------------------------------------------*/ -/* QPlainTextEdit & QTextEdit */ -QPlainTextEdit, QTexEdit { - border-image: url(qss/dark/frame.png) 3; - border-width: 3; -} -QPlainTextEdit::focus, QTextEdit::focus { - border-image: url(qss/dark/framehover.png) 3; - border-width: 3; -} -QPlainTextEdit:disabled, QTextEdit:disabled { - color: rgb(135,135,135); - border-image: url(qss/dark/framedisable.png) 3; -} -/*---------------------------------------------------------------------------*/ -/* QGroupBox */ -QGroupBox -{ - background-color: none; - margin-top: 5px; - padding-top: 5px; - border: 1px solid; - border-radius: 3px; - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -QGroupBox:enabled -{ - border-color: rgb(90, 90, 90); -} -QGroupBox:disabled -{ - border-color: rgb(140, 140, 140); -} -QGroupBox::title { - subcontrol-origin: border; - top: -6px; - left: 6px; -} -/*---------------------------------------------------------------------------*/ -/* QStatusBar */ -QStatusBar { - background-color: rgb(140,140,140); -} -/*---------------------------------------------------------------------------*/ -/* Customize Horizontal QSlider. */ -QSlider { - height: 20; -} -QSlider::groove:horizontal { - border-image: url(qss/dark/sl_groove.png) 1; - border-width: 1; - height: 1px; -} -QSlider::handle:horizontal:enabled { - image: url(qss/dark/h_handle.png); - width: 16px; - margin: -16px -4px; -} -QSlider::handle:horizontal:disabled { - image: url(qss/dark/h_handle_disabled.png); - width: 16px; - margin: -16px -4px; -} - - -/* Customize Horizontal QSlider that have name "colorSlider" */ -#colorSlider::groove:horizontal { - border-image: none; -} -#colorSlider::handle:horizontal { - image: url(qss/dark/h_chandle.png); - width: 16px; - margin: -16px -3px -16px -4px; -} - -/*---------------------------------------------------------------------------*/ - -#IntPairField { - qproperty-HandleLeftPixmap: url(qss/dark/h_slider_left.png); - qproperty-HandleRightPixmap: url(qss/dark/h_slider_right.png); - qproperty-HandleLeftGrayPixmap: url(qss/dark/h_slider_left_disabled.png); - qproperty-HandleRightGrayPixmap: url(qss/dark/h_slider_right_disabled.png); -} - -/*---------------------------------------------------------------------------*/ - -#DoublePairField { - qproperty-HandleLeftPixmap: url(qss/dark/h_slider_left.png); - qproperty-HandleRightPixmap: url(qss/dark/h_slider_right.png); - qproperty-HandleLeftGrayPixmap: url(qss/dark/h_slider_left_disabled.png); - qproperty-HandleRightGrayPixmap: url(qss/dark/h_slider_right_disabled.png); -} - -/*---------------------------------------------------------------------------*/ - -/* Flipbook Slider. */ -FlipSlider { - qproperty-PBHeight: 10; - - qproperty-PBOverlay: url(qss/dark/flipslider.png); - qproperty-PBMarker: url(qss/dark/flipmarker.png); - - qproperty-PBColorMarginLeft: 2; - qproperty-PBColorMarginTop: 2; - qproperty-PBColorMarginRight: 2; - qproperty-PBColorMarginBottom: 3; - - qproperty-PBMarkerMarginLeft: 2; - qproperty-PBMarkerMarginRight: 2; - - qproperty-baseColor: rgb(235,235,235); - qproperty-notStartedColor: rgb(210,40,40); - qproperty-startedColor: rgb(220,160,160); - qproperty-finishedColor: rgb(235,235,235); -} - -/*---------------------------------------------------------------------------*/ -/* Customize QTabBar */ -QTabBar { - height: 22px; - border: 0px; -} -QTabBar::tab { - top: -1px; - min-width: 54px; - min-height: 15px; -} -QTabBar::tab:selected { - padding-top: 2px; - border-image: url(qss/dark/uptab.png) 4; - border-width: 4; -} -QTabBar::tab:only-one { - padding-top: 2px; - border-image: url(qss/dark/oouptab.png) 4; - border-width: 4; -} -QTabBar::tab:first:selected { - border-image: url(qss/dark/fuptab.png) 4; - border-width: 4; -} -QTabBar::tab:!selected { - margin-top: 2px; - border-image: url(qss/dark/tab.png) 4; - border-width: 4; -} -QTabBar::tab:first:!selected { - border-image: url(qss/dark/ftab.png) 4; - border-width: 4; -} -QTabBar::tab:last:!selected { - border-image: url(qss/dark/ltab.png) 4; - border-width: 4; -} -/* Customize RoomTabWidget */ -/* ATTENTION: These declarations must be putted after the QTabBar ones */ -RoomTabWidget { - height: 22px; - background-color: rgb(120,120,120); - color: white; -} -RoomTabWidget::tab { - top: 1px; - min-width: 54px; - min-height: 15px; -} -RoomTabWidget::tab:selected { - border-image: url(qss/dark/uptbtab.png) 4; - border-width: 4; - font: bold; -} -RoomTabWidget::tab:first:selected, RoomTabWidget::tab:only-one { - border-image: url(qss/dark/fuptbtab.png) 4; - border-width: 4; - font: bold; -} -RoomTabWidget::tab:!selected { - margin-top: 2px; - border-image: url(qss/dark/tbtab.png) 4; - border-width: 4; - font: normal; -} -RoomTabWidget::tab:first:!selected { - border-image: url(qss/dark/ftbtab.png) 4; - border-width: 4; -} -RoomTabWidget::tab:last:!selected { - border-image: url(qss/dark/ltbtab.png) 4; - border-width: 4; -} -/*---------------------------------------------------------------------------*/ -/* Customize QScrollBar horizontal*/ -QScrollBar:horizontal { - background-image: url(qss/dark/sb_h.png); - height: 16px; - margin-top: 0px; - margin-bottom: 0px; - margin-right:15px; - margin-left:15px; -} -QScrollBar::handle:horizontal { - border-image: url(qss/dark/sb_hhandle.png)3; - border-width: 3; - image: url(qss/dark/sb_hline.png); - image-position: center center; -} -QScrollBar::add-line:horizontal { - image: url(qss/dark/sb_rarrow.png); - width: 15px; - subcontrol-position: right; - subcontrol-origin: margin; -} -QScrollBar::sub-line:horizontal { - image: url(qss/dark/sb_larrow.png); - width: 15px; - subcontrol-position: left; - subcontrol-origin: margin; -} -QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal { - background: none; -} -/* Customize QScrollBar vertical*/ -QScrollBar:vertical { - background-image: url(qss/dark/sb_v.png); - width: 16px; - margin-left: 0px; - margin-right: 0px; - margin-top:15px; - margin-bottom:15px; -} -QScrollBar::handle:vertical { - border-image: url(qss/dark/sb_vhandle.png)3; - border-width: 3; - image: url(qss/dark/sb_vline.png); - image-position: center center; -} -QScrollBar::add-line:vertical { - image: url(qss/dark/sb_downarrow.png); - height: 15px; - subcontrol-position: bottom; - subcontrol-origin: margin; -} -QScrollBar::sub-line:vertical { - image: url(qss/dark/sb_uparrow.png); - height: 15px; - subcontrol-position: top; - subcontrol-origin: margin; -} -QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { - background: none; -} -/*---------------------------------------------------------------------------*/ -/* Customize check boxes. */ -QCheckBox { - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; - spacing: 1px; -} -QCheckBox::indicator { - width: 13px; - height: 13px; -} -QCheckBox::indicator:unchecked, QTreeView::indicator:unchecked { - image: url(qss/dark/chk_unchk.png); -} -QCheckBox::indicator:unchecked:disabled, QTreeView::indicator:unchecked:disabled { - image: url(qss/standard/chk_unchk_disabled.png); -} -QCheckBox::indicator:checked, QTreeView::indicator:checked { - image: url(qss/dark/chk_chk.png); -} -QCheckBox::indicator:checked:disabled, QTreeView::indicator:checked:disabled { - image: url(qss/standard/chk_chk_disabled.png); -} -/*---------------------------------------------------------------------------*/ -/* Customize radio buttons. */ -QRadioButton { - spacing: 5px; - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -QRadioButton::indicator { - width: 13px; - height: 13px; -} -QRadioButton::indicator::unchecked { - image: url(qss/dark/radio.png); -} -QRadioButton::indicator::checked { - image: url(qss/dark/radio_p.png); -} -/*---------------------------------------------------------------------------*/ -/* QSplitter (Un pochettino assumo che sono tutti verticali) */ -QSplitter { - background-color: rgb(120,120,120); -} -QSplitter::handle { - margin: 0px; - background-color: rgb(120,120,120); -} -QSplitter::handle:horizontal { - image: url(qss/dark/hsplitter_handle.png); - border-left: 1px solid rgb(90,90,90); - border-right: 1px solid rgb(90,90,90); - image-position: center center; -} -QSplitter::handle:vertical { - image: url(qss/dark/vsplitter_handle.png); - border-top: 1px solid rgb(90,90,90); - border-bottom: 1px solid rgb(90,90,90); - padding-left: 1px; - padding-right: 1px; - image-position: center center; -} -/*---------------------------------------------------------------------------*/ -/* QToolTip */ -QToolTip { - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; - border: 1px solid black; - background-color: rgb(255,255,225); -} -/*---------------------------------------------------------------------------*/ -/* Generic Separators with inscribed name */ -DVGui--Separator { - alternate-background-color: rgb(120, 120, 120); /* line color */ -} -/*---------------------------------------------------------------------------*/ -/* Export Level Popup Options */ -#ExportLevelOptions -{ - background-color: rgb(115,115,115); -} -#ExportLevelOptions QWidget -{ - background-color: none; -} -ExportLevelPopup DVGui--Separator { - padding: 0px 5px 0px 5px; - alternate-background-color: rgb(90, 90, 90); -} - diff --git a/stuff/config/qss/dark/down_arrow.png b/stuff/config/qss/dark/down_arrow.png deleted file mode 100644 index 2bcd46a..0000000 Binary files a/stuff/config/qss/dark/down_arrow.png and /dev/null differ diff --git a/stuff/config/qss/dark/down_arrow_black.png b/stuff/config/qss/dark/down_arrow_black.png deleted file mode 100644 index d9fbc98..0000000 Binary files a/stuff/config/qss/dark/down_arrow_black.png and /dev/null differ diff --git a/stuff/config/qss/dark/down_arrow_disabled.png b/stuff/config/qss/dark/down_arrow_disabled.png deleted file mode 100644 index d9eefed..0000000 Binary files a/stuff/config/qss/dark/down_arrow_disabled.png and /dev/null differ diff --git a/stuff/config/qss/dark/flipmarker.png b/stuff/config/qss/dark/flipmarker.png deleted file mode 100644 index a35bfd9..0000000 Binary files a/stuff/config/qss/dark/flipmarker.png and /dev/null differ diff --git a/stuff/config/qss/dark/flipslider.png b/stuff/config/qss/dark/flipslider.png deleted file mode 100644 index f402f30..0000000 Binary files a/stuff/config/qss/dark/flipslider.png and /dev/null differ diff --git a/stuff/config/qss/dark/frame.png b/stuff/config/qss/dark/frame.png deleted file mode 100644 index ad1714f..0000000 Binary files a/stuff/config/qss/dark/frame.png and /dev/null differ diff --git a/stuff/config/qss/dark/framedisable.png b/stuff/config/qss/dark/framedisable.png deleted file mode 100644 index b150ab4..0000000 Binary files a/stuff/config/qss/dark/framedisable.png and /dev/null differ diff --git a/stuff/config/qss/dark/framehover.png b/stuff/config/qss/dark/framehover.png deleted file mode 100644 index f11d77f..0000000 Binary files a/stuff/config/qss/dark/framehover.png and /dev/null differ diff --git a/stuff/config/qss/dark/ftab.png b/stuff/config/qss/dark/ftab.png deleted file mode 100644 index 7f12d27..0000000 Binary files a/stuff/config/qss/dark/ftab.png and /dev/null differ diff --git a/stuff/config/qss/dark/ftbtab.png b/stuff/config/qss/dark/ftbtab.png deleted file mode 100644 index 52434cd..0000000 Binary files a/stuff/config/qss/dark/ftbtab.png and /dev/null differ diff --git a/stuff/config/qss/dark/fuptab.png b/stuff/config/qss/dark/fuptab.png deleted file mode 100644 index aefec60..0000000 Binary files a/stuff/config/qss/dark/fuptab.png and /dev/null differ diff --git a/stuff/config/qss/dark/fuptbtab.png b/stuff/config/qss/dark/fuptbtab.png deleted file mode 100644 index 10661f9..0000000 Binary files a/stuff/config/qss/dark/fuptbtab.png and /dev/null differ diff --git a/stuff/config/qss/dark/h_chandle.png b/stuff/config/qss/dark/h_chandle.png deleted file mode 100644 index ec9fb31..0000000 Binary files a/stuff/config/qss/dark/h_chandle.png and /dev/null differ diff --git a/stuff/config/qss/dark/h_handle.png b/stuff/config/qss/dark/h_handle.png deleted file mode 100644 index 2a2ba59..0000000 Binary files a/stuff/config/qss/dark/h_handle.png and /dev/null differ diff --git a/stuff/config/qss/dark/h_handle_disabled.png b/stuff/config/qss/dark/h_handle_disabled.png deleted file mode 100644 index db7ed13..0000000 Binary files a/stuff/config/qss/dark/h_handle_disabled.png and /dev/null differ diff --git a/stuff/config/qss/dark/h_slider_left.png b/stuff/config/qss/dark/h_slider_left.png deleted file mode 100644 index 1b9e355..0000000 Binary files a/stuff/config/qss/dark/h_slider_left.png and /dev/null differ diff --git a/stuff/config/qss/dark/h_slider_left_disabled.png b/stuff/config/qss/dark/h_slider_left_disabled.png deleted file mode 100644 index 8b97fe3..0000000 Binary files a/stuff/config/qss/dark/h_slider_left_disabled.png and /dev/null differ diff --git a/stuff/config/qss/dark/h_slider_right.png b/stuff/config/qss/dark/h_slider_right.png deleted file mode 100644 index 2276512..0000000 Binary files a/stuff/config/qss/dark/h_slider_right.png and /dev/null differ diff --git a/stuff/config/qss/dark/h_slider_right_disabled.png b/stuff/config/qss/dark/h_slider_right_disabled.png deleted file mode 100644 index 5d97d51..0000000 Binary files a/stuff/config/qss/dark/h_slider_right_disabled.png and /dev/null differ diff --git a/stuff/config/qss/dark/hsplitter_handle.png b/stuff/config/qss/dark/hsplitter_handle.png deleted file mode 100644 index 2893eb9..0000000 Binary files a/stuff/config/qss/dark/hsplitter_handle.png and /dev/null differ diff --git a/stuff/config/qss/dark/left_arrow_black.png b/stuff/config/qss/dark/left_arrow_black.png deleted file mode 100644 index b89cdcc..0000000 Binary files a/stuff/config/qss/dark/left_arrow_black.png and /dev/null differ diff --git a/stuff/config/qss/dark/ltab.png b/stuff/config/qss/dark/ltab.png deleted file mode 100644 index 6e1da97..0000000 Binary files a/stuff/config/qss/dark/ltab.png and /dev/null differ diff --git a/stuff/config/qss/dark/ltbtab.png b/stuff/config/qss/dark/ltbtab.png deleted file mode 100644 index f99cb00..0000000 Binary files a/stuff/config/qss/dark/ltbtab.png and /dev/null differ diff --git a/stuff/config/qss/dark/menuseparator.PNG b/stuff/config/qss/dark/menuseparator.PNG deleted file mode 100644 index 8f3bc2b..0000000 Binary files a/stuff/config/qss/dark/menuseparator.PNG and /dev/null differ diff --git a/stuff/config/qss/dark/oouptab.png b/stuff/config/qss/dark/oouptab.png deleted file mode 100644 index 6faf3fb..0000000 Binary files a/stuff/config/qss/dark/oouptab.png and /dev/null differ diff --git a/stuff/config/qss/dark/over.png b/stuff/config/qss/dark/over.png deleted file mode 100644 index 5ea84de..0000000 Binary files a/stuff/config/qss/dark/over.png and /dev/null differ diff --git a/stuff/config/qss/dark/radio.png b/stuff/config/qss/dark/radio.png deleted file mode 100644 index ef901a8..0000000 Binary files a/stuff/config/qss/dark/radio.png and /dev/null differ diff --git a/stuff/config/qss/dark/radio_p.png b/stuff/config/qss/dark/radio_p.png deleted file mode 100644 index 277940f..0000000 Binary files a/stuff/config/qss/dark/radio_p.png and /dev/null differ diff --git a/stuff/config/qss/dark/right_arrow_black.png b/stuff/config/qss/dark/right_arrow_black.png deleted file mode 100644 index 8878c62..0000000 Binary files a/stuff/config/qss/dark/right_arrow_black.png and /dev/null differ diff --git a/stuff/config/qss/dark/sb_downarrow.png b/stuff/config/qss/dark/sb_downarrow.png deleted file mode 100644 index bb82321..0000000 Binary files a/stuff/config/qss/dark/sb_downarrow.png and /dev/null differ diff --git a/stuff/config/qss/dark/sb_h.png b/stuff/config/qss/dark/sb_h.png deleted file mode 100644 index 741221f..0000000 Binary files a/stuff/config/qss/dark/sb_h.png and /dev/null differ diff --git a/stuff/config/qss/dark/sb_hhandle.png b/stuff/config/qss/dark/sb_hhandle.png deleted file mode 100644 index 2553dce..0000000 Binary files a/stuff/config/qss/dark/sb_hhandle.png and /dev/null differ diff --git a/stuff/config/qss/dark/sb_hline.png b/stuff/config/qss/dark/sb_hline.png deleted file mode 100644 index 2eb8d10..0000000 Binary files a/stuff/config/qss/dark/sb_hline.png and /dev/null differ diff --git a/stuff/config/qss/dark/sb_larrow.png b/stuff/config/qss/dark/sb_larrow.png deleted file mode 100644 index 856b246..0000000 Binary files a/stuff/config/qss/dark/sb_larrow.png and /dev/null differ diff --git a/stuff/config/qss/dark/sb_rarrow.png b/stuff/config/qss/dark/sb_rarrow.png deleted file mode 100644 index e7a2d35..0000000 Binary files a/stuff/config/qss/dark/sb_rarrow.png and /dev/null differ diff --git a/stuff/config/qss/dark/sb_uparrow.png b/stuff/config/qss/dark/sb_uparrow.png deleted file mode 100644 index 6645fca..0000000 Binary files a/stuff/config/qss/dark/sb_uparrow.png and /dev/null differ diff --git a/stuff/config/qss/dark/sb_v.png b/stuff/config/qss/dark/sb_v.png deleted file mode 100644 index 46a68fb..0000000 Binary files a/stuff/config/qss/dark/sb_v.png and /dev/null differ diff --git a/stuff/config/qss/dark/sb_vhandle.png b/stuff/config/qss/dark/sb_vhandle.png deleted file mode 100644 index 5caea11..0000000 Binary files a/stuff/config/qss/dark/sb_vhandle.png and /dev/null differ diff --git a/stuff/config/qss/dark/sb_vline.png b/stuff/config/qss/dark/sb_vline.png deleted file mode 100644 index 3633774..0000000 Binary files a/stuff/config/qss/dark/sb_vline.png and /dev/null differ diff --git a/stuff/config/qss/dark/sl_groove.png b/stuff/config/qss/dark/sl_groove.png deleted file mode 100644 index 951b253..0000000 Binary files a/stuff/config/qss/dark/sl_groove.png and /dev/null differ diff --git a/stuff/config/qss/dark/tab.png b/stuff/config/qss/dark/tab.png deleted file mode 100644 index 4f41d89..0000000 Binary files a/stuff/config/qss/dark/tab.png and /dev/null differ diff --git a/stuff/config/qss/dark/tbtab.png b/stuff/config/qss/dark/tbtab.png deleted file mode 100644 index 2ba38e7..0000000 Binary files a/stuff/config/qss/dark/tbtab.png and /dev/null differ diff --git a/stuff/config/qss/dark/titlebar_horizontal.png b/stuff/config/qss/dark/titlebar_horizontal.png deleted file mode 100644 index 62a1fbc..0000000 Binary files a/stuff/config/qss/dark/titlebar_horizontal.png and /dev/null differ diff --git a/stuff/config/qss/dark/titlebar_vertical.png b/stuff/config/qss/dark/titlebar_vertical.png deleted file mode 100644 index eacef0d..0000000 Binary files a/stuff/config/qss/dark/titlebar_vertical.png and /dev/null differ diff --git a/stuff/config/qss/dark/titlebar_vertical_inactive.png b/stuff/config/qss/dark/titlebar_vertical_inactive.png deleted file mode 100644 index 5564aca..0000000 Binary files a/stuff/config/qss/dark/titlebar_vertical_inactive.png and /dev/null differ diff --git a/stuff/config/qss/dark/up_arrow.png b/stuff/config/qss/dark/up_arrow.png deleted file mode 100644 index 142e60d..0000000 Binary files a/stuff/config/qss/dark/up_arrow.png and /dev/null differ diff --git a/stuff/config/qss/dark/up_arrow_black.png b/stuff/config/qss/dark/up_arrow_black.png deleted file mode 100644 index 6c27909..0000000 Binary files a/stuff/config/qss/dark/up_arrow_black.png and /dev/null differ diff --git a/stuff/config/qss/dark/up_arrow_disabled.png b/stuff/config/qss/dark/up_arrow_disabled.png deleted file mode 100644 index 4d2c277..0000000 Binary files a/stuff/config/qss/dark/up_arrow_disabled.png and /dev/null differ diff --git a/stuff/config/qss/dark/uptab.png b/stuff/config/qss/dark/uptab.png deleted file mode 100644 index b470ef8..0000000 Binary files a/stuff/config/qss/dark/uptab.png and /dev/null differ diff --git a/stuff/config/qss/dark/uptbtab.png b/stuff/config/qss/dark/uptbtab.png deleted file mode 100644 index 5fe4c9d..0000000 Binary files a/stuff/config/qss/dark/uptbtab.png and /dev/null differ diff --git a/stuff/config/qss/dark/vsplitter_handle.png b/stuff/config/qss/dark/vsplitter_handle.png deleted file mode 100644 index aae6b9a..0000000 Binary files a/stuff/config/qss/dark/vsplitter_handle.png and /dev/null differ diff --git a/stuff/config/qss/gray_048/gray_048.less b/stuff/config/qss/gray_048/gray_048.less index ce17b29..0becf02 100644 --- a/stuff/config/qss/gray_048/gray_048.less +++ b/stuff/config/qss/gray_048/gray_048.less @@ -2,8 +2,7 @@ /* LESS Definitions */ /*Image URL*/ -@base_url: "qss/gray_072"; -@image_url: "@{base_url}/imgs"; +@image_url: "../gray_072/imgs"; /*Text Color*/ @m_baseTxtColor: rgb(230,230,230); @@ -274,19 +273,21 @@ QPushButton { .base_outset; border-width: 1px; border-radius: 4px; - .set_padding(20px, 3px); - + .set_padding(15px, 3px); + &:checked { + .base_inset(light, 10%); + } /*lighten lilttle bit when hover*/ &:hover { .base_outset(light, 10%); &:pressed { .base_inset(light, 10%); } + &:checked { + .base_inset(light, 5%); + } } /*lighten lilttle bit when pressed*/ - &:checked { - .base_inset(light, 10%); - } &:disabled{ .base_outset(light, 5%); color: rgb(80,80,80); diff --git a/stuff/config/qss/gray_048/gray_048.qss b/stuff/config/qss/gray_048/gray_048.qss index 7acd983..db98773 100644 --- a/stuff/config/qss/gray_048/gray_048.qss +++ b/stuff/config/qss/gray_048/gray_048.qss @@ -121,10 +121,10 @@ QToolBar { border-image: none; } QToolBar::separator:horizontal { - image: url("qss/gray_072/imgs/bottomseparator.png"); + image: url("../gray_072/imgs/bottomseparator.png"); } QToolBar::separator:vertical { - image: url("qss/gray_072/imgs/separator.png"); + image: url("../gray_072/imgs/separator.png"); } QToolBar QToolButton { background-color: #303030; @@ -134,11 +134,11 @@ QToolBar QToolButton { border-image: none; } QToolBar QToolButton:hover { - border-image: url("qss/gray_072/imgs/over.png") 2; + border-image: url("../gray_072/imgs/over.png") 2; } QToolBar QToolButton:checked, QToolBar QToolButton:pressed { - border-image: url("qss/gray_072/imgs/click.png") 2; + border-image: url("../gray_072/imgs/click.png") 2; } QToolBar QToolButton:disabled { background-color: #3d3d3d; @@ -214,7 +214,7 @@ QComboBox::drop-down:on { border-bottom-color: #6c6c6c; } QComboBox::down-arrow { - image: url("qss/gray_072/imgs/combo_down_arrow.png"); + image: url("../gray_072/imgs/combo_down_arrow.png"); } QComboBox:disabled { background-color: #4a4a4a; @@ -234,13 +234,21 @@ QPushButton { border-bottom-color: #000000; border-width: 1px; border-radius: 4px; - padding-left: 20px; - padding-right: 20px; + padding-left: 15px; + padding-right: 15px; padding-top: 3px; padding-bottom: 3px; /*lighten lilttle bit when hover*/ /*lighten lilttle bit when pressed*/ } +QPushButton:checked { + background-color: #4a4a4a; + border-style: inset; + border-left-color: #262626; + border-top-color: #1a1a1a; + border-right-color: #727272; + border-bottom-color: #868686; +} QPushButton:hover { background-color: #4a4a4a; border-style: outset; @@ -257,13 +265,13 @@ QPushButton:hover:pressed { border-right-color: #727272; border-bottom-color: #868686; } -QPushButton:checked { - background-color: #4a4a4a; +QPushButton:hover:checked { + background-color: #3d3d3d; border-style: inset; - border-left-color: #262626; - border-top-color: #1a1a1a; - border-right-color: #727272; - border-bottom-color: #868686; + border-left-color: #191919; + border-top-color: #0d0d0d; + border-right-color: #656565; + border-bottom-color: #797979; } QPushButton:disabled { background-color: #3d3d3d; @@ -304,10 +312,10 @@ QCheckBox::indicator:disabled { border-bottom-color: #797979; } QCheckBox::indicator:checked { - image: url("qss/gray_072/imgs/check_indicator.png"); + image: url("../gray_072/imgs/check_indicator.png"); } QCheckBox::indicator:checked:disabled { - image: url("qss/gray_072/imgs/check_indicator_disabled.png"); + image: url("../gray_072/imgs/check_indicator_disabled.png"); } QSlider::groove:horizontal { background-color: #161616; @@ -444,13 +452,13 @@ PaletteViewer #ToolBarContainer #keyFrameNavigator { /* if there is only one tab, we don't want overlapping margins */ } #PaletteLockButton:hover { - border-image: url("qss/gray_072/imgs/over_yellow.png") 2; + border-image: url("../gray_072/imgs/over_yellow.png") 2; } #PaletteLockButton:checked { - border-image: url("qss/gray_072/imgs/click_pink.png") 2; + border-image: url("../gray_072/imgs/click_pink.png") 2; } #PaletteLockButton:checked:hover { - border-image: url("qss/gray_072/imgs/over_pressed_yellow.png") 2; + border-image: url("../gray_072/imgs/over_pressed_yellow.png") 2; } #PageViewer { qproperty-TextColor: #e6e6e6; @@ -520,23 +528,23 @@ PaletteViewer #ToolBarContainer #keyFrameNavigator { } #colorSliderAddButton, #colorSliderSubButton { - border-image: url("qss/gray_072/imgs/colorslider_button_bg.png") 2; + border-image: url("../gray_072/imgs/colorslider_button_bg.png") 2; padding: 0px; margin: 0px; border: 2px; image-position: center center; } #colorSliderAddButton { - image: url("qss/gray_072/imgs/colorslider_add.png"); + image: url("../gray_072/imgs/colorslider_add.png"); } #colorSliderAddButton:pressed { - image: url("qss/gray_072/imgs/colorslider_add_pressed.png"); + image: url("../gray_072/imgs/colorslider_add_pressed.png"); } #colorSliderSubButton { - image: url("qss/gray_072/imgs/colorslider_sub.png"); + image: url("../gray_072/imgs/colorslider_sub.png"); } #colorSliderSubButton:pressed { - image: url("qss/gray_072/imgs/colorslider_sub_pressed.png"); + image: url("../gray_072/imgs/colorslider_sub_pressed.png"); } #PlainColorPageParts { background-color: #303030; @@ -575,19 +583,19 @@ DvScrollWidget > QPushButton:pressed { max-width: 15px; } #ScrollLeftButton { - image: url("qss/gray_072/imgs/left_arrow_black.png"); + image: url("../gray_072/imgs/left_arrow_black.png"); border-right: 1px solid black; } #ScrollRightButton { - image: url("qss/gray_072/imgs/right_arrow_black.png"); + image: url("../gray_072/imgs/right_arrow_black.png"); border-left: 1px solid black; } #ScrollUpButton { - image: url("qss/gray_072/imgs/up_arrow_black.png"); + image: url("../gray_072/imgs/up_arrow_black.png"); border-bottom: 1px solid black; } #ScrollDownButton { - image: url("qss/gray_072/imgs/down_arrow_black.png"); + image: url("../gray_072/imgs/down_arrow_black.png"); border-top: 1px solid black; } /* ------ Viewer, Flipbook ------ */ @@ -621,30 +629,30 @@ FlipBook #ToolBarContainer { height: 21px; } #ViewerFpsSlider::handle { - border-image: url("qss/gray_072/imgs/handle_border.png") 6; + border-image: url("../gray_072/imgs/handle_border.png") 6; border-width: 6px; image: none; min-width: 5px; } #ViewerFpsSlider::add-line { - image: url("qss/gray_072/imgs/fpssb_g_rarrow.png"); + image: url("../gray_072/imgs/fpssb_g_rarrow.png"); width: 20px; subcontrol-position: right; subcontrol-origin: margin; margin: 0px; } #ViewerFpsSlider::add-line:pressed { - image: url("qss/gray_072/imgs/fpssb_g_rarrow_pressed.png"); + image: url("../gray_072/imgs/fpssb_g_rarrow_pressed.png"); } #ViewerFpsSlider::sub-line { - image: url("qss/gray_072/imgs/fpssb_g_larrow.png"); + image: url("../gray_072/imgs/fpssb_g_larrow.png"); width: 20px; subcontrol-position: left; subcontrol-origin: margin; margin: 0px; } #ViewerFpsSlider::sub-line:pressed { - image: url("qss/gray_072/imgs/fpssb_g_larrow_pressed.png"); + image: url("../gray_072/imgs/fpssb_g_larrow_pressed.png"); } #FlipConsolePlayToolBar { border: none; @@ -654,8 +662,8 @@ FlipBook #ToolBarContainer { } FlipSlider { qproperty-PBHeight: 20; - qproperty-PBOverlay: url("qss/gray_072/imgs/flipslider.png"); - qproperty-PBMarker: url("qss/gray_072/imgs/flipmarker.png"); + qproperty-PBOverlay: url("../gray_072/imgs/flipslider.png"); + qproperty-PBMarker: url("../gray_072/imgs/flipmarker.png"); qproperty-PBColorMarginLeft: 1; qproperty-PBColorMarginTop: 1; qproperty-PBColorMarginRight: 1; @@ -698,29 +706,29 @@ Ruler { margin: 0px; } #DirTreeView::branch:adjoins-item { - border-image: url("qss/gray_072/imgs/tree_branch-end.png") 0; + border-image: url("../gray_072/imgs/tree_branch-end.png") 0; } #DirTreeView::branch:has-siblings { - border-image: url("qss/gray_072/imgs/tree_vline.png") 0; + border-image: url("../gray_072/imgs/tree_vline.png") 0; } #DirTreeView::branch:has-siblings:adjoins-item { - border-image: url("qss/gray_072/imgs/tree_branch-more.png") 0; + border-image: url("../gray_072/imgs/tree_branch-more.png") 0; } #DirTreeView::branch:has-children:closed { border-image: none; - image: url("qss/gray_072/imgs/tree_branch-closed_nosib.png"); + image: url("../gray_072/imgs/tree_branch-closed_nosib.png"); } #DirTreeView::branch:has-children:open { border-image: none; - image: url("qss/gray_072/imgs/tree_branch-open_nosib.png"); + image: url("../gray_072/imgs/tree_branch-open_nosib.png"); } #DirTreeView::branch:has-children:has-siblings:closed { border-image: none; - image: url("qss/gray_072/imgs/tree_branch-closed.png"); + image: url("../gray_072/imgs/tree_branch-closed.png"); } #DirTreeView::branch:has-children:has-siblings:open { border-image: none; - image: url("qss/gray_072/imgs/tree_branch-open.png"); + image: url("../gray_072/imgs/tree_branch-open.png"); } DvItemViewerPanel { qproperty-TextColor: #e6e6e6; @@ -764,14 +772,14 @@ DvDirTreeView { border-width: 2px; padding: 0px; margin: 0px; - border-image: url("qss/gray_072/imgs/handle_border.png") 5; - image: url("qss/gray_072/imgs/plus.png"); + border-image: url("../gray_072/imgs/handle_border.png") 5; + image: url("../gray_072/imgs/plus.png"); image-position: center center; } #CleanupSettingsShowButton:checked, #LoadLevelShowButton:checked, #FxSettingsPreviewShowButton:checked { - image: url("qss/gray_072/imgs/minus.png"); + image: url("../gray_072/imgs/minus.png"); } ParamsPage { qproperty-TextColor: #e6e6e6; @@ -845,52 +853,52 @@ ParamsPage { image-position: center center; } #XsheetScrollBar::handle:vertical { - border-image: url("qss/gray_072/imgs/sb_g_vhandle.png") 4; - image: url("qss/gray_072/imgs/sb_g_vline.png"); + border-image: url("../gray_072/imgs/sb_g_vhandle.png") 4; + image: url("../gray_072/imgs/sb_g_vline.png"); min-height: 40px; } #XsheetScrollBar::handle:horizontal { - border-image: url("qss/gray_072/imgs/sb_g_hhandle.png") 4; - image: url("qss/gray_072/imgs/sb_g_hline.png"); + border-image: url("../gray_072/imgs/sb_g_hhandle.png") 4; + image: url("../gray_072/imgs/sb_g_hline.png"); min-width: 40px; } #XsheetScrollBar::add-line { subcontrol-origin: margin; } #XsheetScrollBar::add-line:vertical { - image: url("qss/gray_072/imgs/sb_g_downarrow.png"); + image: url("../gray_072/imgs/sb_g_downarrow.png"); height: 20px; subcontrol-position: bottom; } #XsheetScrollBar::add-line:vertical:pressed { - image: url("qss/gray_072/imgs/sb_g_downarrow_pressed.png"); + image: url("../gray_072/imgs/sb_g_downarrow_pressed.png"); } #XsheetScrollBar::add-line:horizontal { - image: url("qss/gray_072/imgs/sb_g_rarrow.png"); + image: url("../gray_072/imgs/sb_g_rarrow.png"); width: 20px; subcontrol-position: right; } #XsheetScrollBar::add-line:horizontal:pressed { - image: url("qss/gray_072/imgs/sb_g_rarrow_pressed.png"); + image: url("../gray_072/imgs/sb_g_rarrow_pressed.png"); } #XsheetScrollBar::sub-line { subcontrol-origin: margin; } #XsheetScrollBar::sub-line:vertical { - image: url("qss/gray_072/imgs/sb_g_uparrow.png"); + image: url("../gray_072/imgs/sb_g_uparrow.png"); height: 20px; subcontrol-position: top; } #XsheetScrollBar::sub-line:vertical:pressed { - image: url("qss/gray_072/imgs/sb_g_uparrow_pressed.png"); + image: url("../gray_072/imgs/sb_g_uparrow_pressed.png"); } #XsheetScrollBar::sub-line:horizontal { - image: url("qss/gray_072/imgs/sb_g_larrow.png"); + image: url("../gray_072/imgs/sb_g_larrow.png"); width: 20px; subcontrol-position: left; } #XsheetScrollBar::sub-line:horizontal:pressed { - image: url("qss/gray_072/imgs/sb_g_larrow_pressed.png"); + image: url("../gray_072/imgs/sb_g_larrow_pressed.png"); } #XsheetScrollBar::add-page { background: none; @@ -957,35 +965,35 @@ XsheetViewer { } #FunctionEditorTree::branch:adjoins-item, #ShortcutTree::branch:adjoins-item { - border-image: url("qss/gray_072/imgs/tree17_branch-end.png") 0; + border-image: url("../gray_072/imgs/tree17_branch-end.png") 0; } #FunctionEditorTree::branch:has-siblings, #ShortcutTree::branch:has-siblings { - border-image: url("qss/gray_072/imgs/tree17_vline.png") 0; + border-image: url("../gray_072/imgs/tree17_vline.png") 0; } #FunctionEditorTree::branch:has-siblings:adjoins-item, #ShortcutTree::branch:has-siblings:adjoins-item { - border-image: url("qss/gray_072/imgs/tree17_branch-more.png") 0; + border-image: url("../gray_072/imgs/tree17_branch-more.png") 0; } #FunctionEditorTree::branch:has-children:closed, #ShortcutTree::branch:has-children:closed { border-image: none; - image: url("qss/gray_072/imgs/tree17_branch-closed_nosib.png"); + image: url("../gray_072/imgs/tree17_branch-closed_nosib.png"); } #FunctionEditorTree::branch:has-children:open, #ShortcutTree::branch:has-children:open { border-image: none; - image: url("qss/gray_072/imgs/tree17_branch-open_nosib.png"); + image: url("../gray_072/imgs/tree17_branch-open_nosib.png"); } #FunctionEditorTree::branch:has-children:has-siblings:closed, #ShortcutTree::branch:has-children:has-siblings:closed { border-image: none; - image: url("qss/gray_072/imgs/tree17_branch-closed.png"); + image: url("../gray_072/imgs/tree17_branch-closed.png"); } #FunctionEditorTree::branch:has-children:has-siblings:open, #ShortcutTree::branch:has-children:has-siblings:open { border-image: none; - image: url("qss/gray_072/imgs/tree17_branch-open.png"); + image: url("../gray_072/imgs/tree17_branch-open.png"); } FunctionPanel { qproperty-BGColor: #303030; @@ -1039,7 +1047,7 @@ SpreadsheetViewer { #FunctionSegmentViewerLinkButton { border: 2px; margin: 0px; - background-image: url("qss/gray_072/imgs/segment_unlinked.png"); + background-image: url("../gray_072/imgs/segment_unlinked.png"); background-color: #636363; border-style: outset; border-left-color: #8b8b8b; @@ -1048,7 +1056,7 @@ SpreadsheetViewer { border-bottom-color: #333333; } #FunctionSegmentViewerLinkButton:checked { - background-image: url("qss/gray_072/imgs/segment_linked.png"); + background-image: url("../gray_072/imgs/segment_linked.png"); background-color: #636363; border-style: inset; border-left-color: #3f3f3f; @@ -1057,7 +1065,7 @@ SpreadsheetViewer { border-bottom-color: #9f9f9f; } #FunctionSegmentViewerLinkButton:disabled { - background-image: url("qss/gray_072/imgs/segment_disabled.png"); + background-image: url("../gray_072/imgs/segment_disabled.png"); background-color: #4a4a4a; border-style: outset; border-left-color: #727272; @@ -1099,13 +1107,13 @@ SpreadsheetViewer { height: 21px; } #CameraSettingsRadioButton::indicator:checked { - image: url("qss/gray_072/imgs/cam_lock.png"); + image: url("../gray_072/imgs/cam_lock.png"); } #CameraSettingsRadioButton::indicator:unchecked { - image: url("qss/gray_072/imgs/cam_unlock.png"); + image: url("../gray_072/imgs/cam_unlock.png"); } #CameraSettingsRadioButton::indicator:unchecked:hover { - image: url("qss/gray_072/imgs/cam_lock_hover.png"); + image: url("../gray_072/imgs/cam_lock_hover.png"); } #CameraSettingsDPI { color: #a8bee7; @@ -1118,25 +1126,25 @@ SpreadsheetViewer { height: 21px; } #CameraSettingsRadioButton_Small::indicator:checked { - image: url("qss/gray_072/imgs/cam_lock_small.png"); + image: url("../gray_072/imgs/cam_lock_small.png"); } #CameraSettingsRadioButton_Small::indicator:unchecked { - image: url("qss/gray_072/imgs/cam_unlock_small.png"); + image: url("../gray_072/imgs/cam_unlock_small.png"); } #CameraSettingsRadioButton_Small::indicator:unchecked:hover { - image: url("qss/gray_072/imgs/cam_lock_hover_small.png"); + image: url("../gray_072/imgs/cam_lock_hover_small.png"); } #ForceSquaredPixelButton { border: none; border-radius: 0px; padding: 0px; - image: url("qss/gray_072/imgs/fsp_released.png"); + image: url("../gray_072/imgs/fsp_released.png"); } #ForceSquaredPixelButton:hover { - image: url("qss/gray_072/imgs/fsp_hover.png"); + image: url("../gray_072/imgs/fsp_hover.png"); } #ForceSquaredPixelButton:checked { - image: url("qss/gray_072/imgs/fsp_pressed.png"); + image: url("../gray_072/imgs/fsp_pressed.png"); } /*------ Tool Options Bar------*/ #EditToolLockButton { @@ -1149,16 +1157,16 @@ SpreadsheetViewer { height: 21px; } #EditToolLockButton::indicator:unchecked { - image: url("qss/gray_072/imgs/cam_unlock.png"); + image: url("../gray_072/imgs/cam_unlock.png"); } #EditToolLockButton::indicator:unchecked:hover { - image: url("qss/gray_072/imgs/cam_unlock_hover.png"); + image: url("../gray_072/imgs/cam_unlock_hover.png"); } #EditToolLockButton::indicator:checked { - image: url("qss/gray_072/imgs/cam_lock.png"); + image: url("../gray_072/imgs/cam_lock.png"); } #EditToolLockButton::indicator:checked:hover { - image: url("qss/gray_072/imgs/cam_lock_hover.png"); + image: url("../gray_072/imgs/cam_lock_hover.png"); } /*------ Topbar and Menubar of the MainWindow ------*/ #TopBar { @@ -1175,7 +1183,7 @@ SpreadsheetViewer { padding: 0px; } #TopBarTab { - border-image: url("qss/gray_072/imgs/topbar_bg.png") 0 0 0 0 stretch stretch; + border-image: url("../gray_072/imgs/topbar_bg.png") 0 0 0 0 stretch stretch; /*background: qlineargradient(x1: 0,y1: 0, x2: 1, y2: 0, stop: 0 #a0a0a0, stop: 0.5 #404040);*/ border: 0px; padding: 0px; @@ -1262,21 +1270,21 @@ QDialog #dialogButtonFrame { #OutputSettingsShowButton { border: 2px; padding: 0px; - border-image: url("qss/gray_072/imgs/handle_border.png") 5; - image: url("qss/gray_072/imgs/plus.png"); + border-image: url("../gray_072/imgs/handle_border.png") 5; + image: url("../gray_072/imgs/plus.png"); image-position: center center; } #OutputSettingsShowButton:checked { - image: url("qss/gray_072/imgs/minus.png"); + image: url("../gray_072/imgs/minus.png"); } #IntPairField, #DoublePairField { qproperty-LightLineColor: #9b9b9b; qproperty-DarkLineColor: #2f2f2f; - qproperty-HandleLeftPixmap: url("qss/gray_072/imgs/h_slider_left.png"); - qproperty-HandleRightPixmap: url("qss/gray_072/imgs/h_slider_right.png"); - qproperty-HandleLeftGrayPixmap: url("qss/gray_072/imgs/h_slider_left_disabled.png"); - qproperty-HandleRightGrayPixmap: url("qss/gray_072/imgs/h_slider_right_disabled.png"); + qproperty-HandleLeftPixmap: url("../gray_072/imgs/h_slider_left.png"); + qproperty-HandleRightPixmap: url("../gray_072/imgs/h_slider_right.png"); + qproperty-HandleLeftGrayPixmap: url("../gray_072/imgs/h_slider_left_disabled.png"); + qproperty-HandleRightGrayPixmap: url("../gray_072/imgs/h_slider_right_disabled.png"); } #FxSettingsLabel { color: #a0e680; diff --git a/stuff/config/qss/gray_048/gray_048_mac.qss b/stuff/config/qss/gray_048/gray_048_mac.qss index 31f4a62..db98773 100644 --- a/stuff/config/qss/gray_048/gray_048_mac.qss +++ b/stuff/config/qss/gray_048/gray_048_mac.qss @@ -121,10 +121,10 @@ QToolBar { border-image: none; } QToolBar::separator:horizontal { - image: url("qss/gray_072/imgs/bottomseparator.png"); + image: url("../gray_072/imgs/bottomseparator.png"); } QToolBar::separator:vertical { - image: url("qss/gray_072/imgs/separator.png"); + image: url("../gray_072/imgs/separator.png"); } QToolBar QToolButton { background-color: #303030; @@ -134,11 +134,11 @@ QToolBar QToolButton { border-image: none; } QToolBar QToolButton:hover { - border-image: url("qss/gray_072/imgs/over.png") 2; + border-image: url("../gray_072/imgs/over.png") 2; } QToolBar QToolButton:checked, QToolBar QToolButton:pressed { - border-image: url("qss/gray_072/imgs/click.png") 2; + border-image: url("../gray_072/imgs/click.png") 2; } QToolBar QToolButton:disabled { background-color: #3d3d3d; @@ -214,7 +214,7 @@ QComboBox::drop-down:on { border-bottom-color: #6c6c6c; } QComboBox::down-arrow { - image: url("qss/gray_072/imgs/combo_down_arrow.png"); + image: url("../gray_072/imgs/combo_down_arrow.png"); } QComboBox:disabled { background-color: #4a4a4a; @@ -234,13 +234,21 @@ QPushButton { border-bottom-color: #000000; border-width: 1px; border-radius: 4px; - padding-left: 20px; - padding-right: 20px; + padding-left: 15px; + padding-right: 15px; padding-top: 3px; padding-bottom: 3px; /*lighten lilttle bit when hover*/ /*lighten lilttle bit when pressed*/ } +QPushButton:checked { + background-color: #4a4a4a; + border-style: inset; + border-left-color: #262626; + border-top-color: #1a1a1a; + border-right-color: #727272; + border-bottom-color: #868686; +} QPushButton:hover { background-color: #4a4a4a; border-style: outset; @@ -257,21 +265,13 @@ QPushButton:hover:pressed { border-right-color: #727272; border-bottom-color: #868686; } -QPushButton:pressed { - background-color: #4a4a4a; - border-style: inset; - border-left-color: #262626; - border-top-color: #1a1a1a; - border-right-color: #727272; - border-bottom-color: #868686; -} -QPushButton:checked { - background-color: #4a4a4a; +QPushButton:hover:checked { + background-color: #3d3d3d; border-style: inset; - border-left-color: #262626; - border-top-color: #1a1a1a; - border-right-color: #727272; - border-bottom-color: #868686; + border-left-color: #191919; + border-top-color: #0d0d0d; + border-right-color: #656565; + border-bottom-color: #797979; } QPushButton:disabled { background-color: #3d3d3d; @@ -312,10 +312,10 @@ QCheckBox::indicator:disabled { border-bottom-color: #797979; } QCheckBox::indicator:checked { - image: url("qss/gray_072/imgs/check_indicator.png"); + image: url("../gray_072/imgs/check_indicator.png"); } QCheckBox::indicator:checked:disabled { - image: url("qss/gray_072/imgs/check_indicator_disabled.png"); + image: url("../gray_072/imgs/check_indicator_disabled.png"); } QSlider::groove:horizontal { background-color: #161616; @@ -452,13 +452,13 @@ PaletteViewer #ToolBarContainer #keyFrameNavigator { /* if there is only one tab, we don't want overlapping margins */ } #PaletteLockButton:hover { - border-image: url("qss/gray_072/imgs/over_yellow.png") 2; + border-image: url("../gray_072/imgs/over_yellow.png") 2; } #PaletteLockButton:checked { - border-image: url("qss/gray_072/imgs/click_pink.png") 2; + border-image: url("../gray_072/imgs/click_pink.png") 2; } #PaletteLockButton:checked:hover { - border-image: url("qss/gray_072/imgs/over_pressed_yellow.png") 2; + border-image: url("../gray_072/imgs/over_pressed_yellow.png") 2; } #PageViewer { qproperty-TextColor: #e6e6e6; @@ -528,23 +528,23 @@ PaletteViewer #ToolBarContainer #keyFrameNavigator { } #colorSliderAddButton, #colorSliderSubButton { - border-image: url("qss/gray_072/imgs/colorslider_button_bg.png") 2; + border-image: url("../gray_072/imgs/colorslider_button_bg.png") 2; padding: 0px; margin: 0px; border: 2px; image-position: center center; } #colorSliderAddButton { - image: url("qss/gray_072/imgs/colorslider_add.png"); + image: url("../gray_072/imgs/colorslider_add.png"); } #colorSliderAddButton:pressed { - image: url("qss/gray_072/imgs/colorslider_add_pressed.png"); + image: url("../gray_072/imgs/colorslider_add_pressed.png"); } #colorSliderSubButton { - image: url("qss/gray_072/imgs/colorslider_sub.png"); + image: url("../gray_072/imgs/colorslider_sub.png"); } #colorSliderSubButton:pressed { - image: url("qss/gray_072/imgs/colorslider_sub_pressed.png"); + image: url("../gray_072/imgs/colorslider_sub_pressed.png"); } #PlainColorPageParts { background-color: #303030; @@ -583,19 +583,19 @@ DvScrollWidget > QPushButton:pressed { max-width: 15px; } #ScrollLeftButton { - image: url("qss/gray_072/imgs/left_arrow_black.png"); + image: url("../gray_072/imgs/left_arrow_black.png"); border-right: 1px solid black; } #ScrollRightButton { - image: url("qss/gray_072/imgs/right_arrow_black.png"); + image: url("../gray_072/imgs/right_arrow_black.png"); border-left: 1px solid black; } #ScrollUpButton { - image: url("qss/gray_072/imgs/up_arrow_black.png"); + image: url("../gray_072/imgs/up_arrow_black.png"); border-bottom: 1px solid black; } #ScrollDownButton { - image: url("qss/gray_072/imgs/down_arrow_black.png"); + image: url("../gray_072/imgs/down_arrow_black.png"); border-top: 1px solid black; } /* ------ Viewer, Flipbook ------ */ @@ -629,30 +629,30 @@ FlipBook #ToolBarContainer { height: 21px; } #ViewerFpsSlider::handle { - border-image: url("qss/gray_072/imgs/handle_border.png") 6; + border-image: url("../gray_072/imgs/handle_border.png") 6; border-width: 6px; image: none; min-width: 5px; } #ViewerFpsSlider::add-line { - image: url("qss/gray_072/imgs/fpssb_g_rarrow.png"); + image: url("../gray_072/imgs/fpssb_g_rarrow.png"); width: 20px; subcontrol-position: right; subcontrol-origin: margin; margin: 0px; } #ViewerFpsSlider::add-line:pressed { - image: url("qss/gray_072/imgs/fpssb_g_rarrow_pressed.png"); + image: url("../gray_072/imgs/fpssb_g_rarrow_pressed.png"); } #ViewerFpsSlider::sub-line { - image: url("qss/gray_072/imgs/fpssb_g_larrow.png"); + image: url("../gray_072/imgs/fpssb_g_larrow.png"); width: 20px; subcontrol-position: left; subcontrol-origin: margin; margin: 0px; } #ViewerFpsSlider::sub-line:pressed { - image: url("qss/gray_072/imgs/fpssb_g_larrow_pressed.png"); + image: url("../gray_072/imgs/fpssb_g_larrow_pressed.png"); } #FlipConsolePlayToolBar { border: none; @@ -662,8 +662,8 @@ FlipBook #ToolBarContainer { } FlipSlider { qproperty-PBHeight: 20; - qproperty-PBOverlay: url("qss/gray_072/imgs/flipslider.png"); - qproperty-PBMarker: url("qss/gray_072/imgs/flipmarker.png"); + qproperty-PBOverlay: url("../gray_072/imgs/flipslider.png"); + qproperty-PBMarker: url("../gray_072/imgs/flipmarker.png"); qproperty-PBColorMarginLeft: 1; qproperty-PBColorMarginTop: 1; qproperty-PBColorMarginRight: 1; @@ -706,29 +706,29 @@ Ruler { margin: 0px; } #DirTreeView::branch:adjoins-item { - border-image: url("qss/gray_072/imgs/tree_branch-end.png") 0; + border-image: url("../gray_072/imgs/tree_branch-end.png") 0; } #DirTreeView::branch:has-siblings { - border-image: url("qss/gray_072/imgs/tree_vline.png") 0; + border-image: url("../gray_072/imgs/tree_vline.png") 0; } #DirTreeView::branch:has-siblings:adjoins-item { - border-image: url("qss/gray_072/imgs/tree_branch-more.png") 0; + border-image: url("../gray_072/imgs/tree_branch-more.png") 0; } #DirTreeView::branch:has-children:closed { border-image: none; - image: url("qss/gray_072/imgs/tree_branch-closed_nosib.png"); + image: url("../gray_072/imgs/tree_branch-closed_nosib.png"); } #DirTreeView::branch:has-children:open { border-image: none; - image: url("qss/gray_072/imgs/tree_branch-open_nosib.png"); + image: url("../gray_072/imgs/tree_branch-open_nosib.png"); } #DirTreeView::branch:has-children:has-siblings:closed { border-image: none; - image: url("qss/gray_072/imgs/tree_branch-closed.png"); + image: url("../gray_072/imgs/tree_branch-closed.png"); } #DirTreeView::branch:has-children:has-siblings:open { border-image: none; - image: url("qss/gray_072/imgs/tree_branch-open.png"); + image: url("../gray_072/imgs/tree_branch-open.png"); } DvItemViewerPanel { qproperty-TextColor: #e6e6e6; @@ -772,14 +772,14 @@ DvDirTreeView { border-width: 2px; padding: 0px; margin: 0px; - border-image: url("qss/gray_072/imgs/handle_border.png") 5; - image: url("qss/gray_072/imgs/plus.png"); + border-image: url("../gray_072/imgs/handle_border.png") 5; + image: url("../gray_072/imgs/plus.png"); image-position: center center; } #CleanupSettingsShowButton:checked, #LoadLevelShowButton:checked, #FxSettingsPreviewShowButton:checked { - image: url("qss/gray_072/imgs/minus.png"); + image: url("../gray_072/imgs/minus.png"); } ParamsPage { qproperty-TextColor: #e6e6e6; @@ -853,52 +853,52 @@ ParamsPage { image-position: center center; } #XsheetScrollBar::handle:vertical { - border-image: url("qss/gray_072/imgs/sb_g_vhandle.png") 4; - image: url("qss/gray_072/imgs/sb_g_vline.png"); + border-image: url("../gray_072/imgs/sb_g_vhandle.png") 4; + image: url("../gray_072/imgs/sb_g_vline.png"); min-height: 40px; } #XsheetScrollBar::handle:horizontal { - border-image: url("qss/gray_072/imgs/sb_g_hhandle.png") 4; - image: url("qss/gray_072/imgs/sb_g_hline.png"); + border-image: url("../gray_072/imgs/sb_g_hhandle.png") 4; + image: url("../gray_072/imgs/sb_g_hline.png"); min-width: 40px; } #XsheetScrollBar::add-line { subcontrol-origin: margin; } #XsheetScrollBar::add-line:vertical { - image: url("qss/gray_072/imgs/sb_g_downarrow.png"); + image: url("../gray_072/imgs/sb_g_downarrow.png"); height: 20px; subcontrol-position: bottom; } #XsheetScrollBar::add-line:vertical:pressed { - image: url("qss/gray_072/imgs/sb_g_downarrow_pressed.png"); + image: url("../gray_072/imgs/sb_g_downarrow_pressed.png"); } #XsheetScrollBar::add-line:horizontal { - image: url("qss/gray_072/imgs/sb_g_rarrow.png"); + image: url("../gray_072/imgs/sb_g_rarrow.png"); width: 20px; subcontrol-position: right; } #XsheetScrollBar::add-line:horizontal:pressed { - image: url("qss/gray_072/imgs/sb_g_rarrow_pressed.png"); + image: url("../gray_072/imgs/sb_g_rarrow_pressed.png"); } #XsheetScrollBar::sub-line { subcontrol-origin: margin; } #XsheetScrollBar::sub-line:vertical { - image: url("qss/gray_072/imgs/sb_g_uparrow.png"); + image: url("../gray_072/imgs/sb_g_uparrow.png"); height: 20px; subcontrol-position: top; } #XsheetScrollBar::sub-line:vertical:pressed { - image: url("qss/gray_072/imgs/sb_g_uparrow_pressed.png"); + image: url("../gray_072/imgs/sb_g_uparrow_pressed.png"); } #XsheetScrollBar::sub-line:horizontal { - image: url("qss/gray_072/imgs/sb_g_larrow.png"); + image: url("../gray_072/imgs/sb_g_larrow.png"); width: 20px; subcontrol-position: left; } #XsheetScrollBar::sub-line:horizontal:pressed { - image: url("qss/gray_072/imgs/sb_g_larrow_pressed.png"); + image: url("../gray_072/imgs/sb_g_larrow_pressed.png"); } #XsheetScrollBar::add-page { background: none; @@ -965,35 +965,35 @@ XsheetViewer { } #FunctionEditorTree::branch:adjoins-item, #ShortcutTree::branch:adjoins-item { - border-image: url("qss/gray_072/imgs/tree17_branch-end.png") 0; + border-image: url("../gray_072/imgs/tree17_branch-end.png") 0; } #FunctionEditorTree::branch:has-siblings, #ShortcutTree::branch:has-siblings { - border-image: url("qss/gray_072/imgs/tree17_vline.png") 0; + border-image: url("../gray_072/imgs/tree17_vline.png") 0; } #FunctionEditorTree::branch:has-siblings:adjoins-item, #ShortcutTree::branch:has-siblings:adjoins-item { - border-image: url("qss/gray_072/imgs/tree17_branch-more.png") 0; + border-image: url("../gray_072/imgs/tree17_branch-more.png") 0; } #FunctionEditorTree::branch:has-children:closed, #ShortcutTree::branch:has-children:closed { border-image: none; - image: url("qss/gray_072/imgs/tree17_branch-closed_nosib.png"); + image: url("../gray_072/imgs/tree17_branch-closed_nosib.png"); } #FunctionEditorTree::branch:has-children:open, #ShortcutTree::branch:has-children:open { border-image: none; - image: url("qss/gray_072/imgs/tree17_branch-open_nosib.png"); + image: url("../gray_072/imgs/tree17_branch-open_nosib.png"); } #FunctionEditorTree::branch:has-children:has-siblings:closed, #ShortcutTree::branch:has-children:has-siblings:closed { border-image: none; - image: url("qss/gray_072/imgs/tree17_branch-closed.png"); + image: url("../gray_072/imgs/tree17_branch-closed.png"); } #FunctionEditorTree::branch:has-children:has-siblings:open, #ShortcutTree::branch:has-children:has-siblings:open { border-image: none; - image: url("qss/gray_072/imgs/tree17_branch-open.png"); + image: url("../gray_072/imgs/tree17_branch-open.png"); } FunctionPanel { qproperty-BGColor: #303030; @@ -1047,7 +1047,7 @@ SpreadsheetViewer { #FunctionSegmentViewerLinkButton { border: 2px; margin: 0px; - background-image: url("qss/gray_072/imgs/segment_unlinked.png"); + background-image: url("../gray_072/imgs/segment_unlinked.png"); background-color: #636363; border-style: outset; border-left-color: #8b8b8b; @@ -1056,7 +1056,7 @@ SpreadsheetViewer { border-bottom-color: #333333; } #FunctionSegmentViewerLinkButton:checked { - background-image: url("qss/gray_072/imgs/segment_linked.png"); + background-image: url("../gray_072/imgs/segment_linked.png"); background-color: #636363; border-style: inset; border-left-color: #3f3f3f; @@ -1065,7 +1065,7 @@ SpreadsheetViewer { border-bottom-color: #9f9f9f; } #FunctionSegmentViewerLinkButton:disabled { - background-image: url("qss/gray_072/imgs/segment_disabled.png"); + background-image: url("../gray_072/imgs/segment_disabled.png"); background-color: #4a4a4a; border-style: outset; border-left-color: #727272; @@ -1107,13 +1107,13 @@ SpreadsheetViewer { height: 21px; } #CameraSettingsRadioButton::indicator:checked { - image: url("qss/gray_072/imgs/cam_lock.png"); + image: url("../gray_072/imgs/cam_lock.png"); } #CameraSettingsRadioButton::indicator:unchecked { - image: url("qss/gray_072/imgs/cam_unlock.png"); + image: url("../gray_072/imgs/cam_unlock.png"); } #CameraSettingsRadioButton::indicator:unchecked:hover { - image: url("qss/gray_072/imgs/cam_lock_hover.png"); + image: url("../gray_072/imgs/cam_lock_hover.png"); } #CameraSettingsDPI { color: #a8bee7; @@ -1126,25 +1126,25 @@ SpreadsheetViewer { height: 21px; } #CameraSettingsRadioButton_Small::indicator:checked { - image: url("qss/gray_072/imgs/cam_lock_small.png"); + image: url("../gray_072/imgs/cam_lock_small.png"); } #CameraSettingsRadioButton_Small::indicator:unchecked { - image: url("qss/gray_072/imgs/cam_unlock_small.png"); + image: url("../gray_072/imgs/cam_unlock_small.png"); } #CameraSettingsRadioButton_Small::indicator:unchecked:hover { - image: url("qss/gray_072/imgs/cam_lock_hover_small.png"); + image: url("../gray_072/imgs/cam_lock_hover_small.png"); } #ForceSquaredPixelButton { border: none; border-radius: 0px; padding: 0px; - image: url("qss/gray_072/imgs/fsp_released.png"); + image: url("../gray_072/imgs/fsp_released.png"); } #ForceSquaredPixelButton:hover { - image: url("qss/gray_072/imgs/fsp_hover.png"); + image: url("../gray_072/imgs/fsp_hover.png"); } #ForceSquaredPixelButton:checked { - image: url("qss/gray_072/imgs/fsp_pressed.png"); + image: url("../gray_072/imgs/fsp_pressed.png"); } /*------ Tool Options Bar------*/ #EditToolLockButton { @@ -1157,16 +1157,16 @@ SpreadsheetViewer { height: 21px; } #EditToolLockButton::indicator:unchecked { - image: url("qss/gray_072/imgs/cam_unlock.png"); + image: url("../gray_072/imgs/cam_unlock.png"); } #EditToolLockButton::indicator:unchecked:hover { - image: url("qss/gray_072/imgs/cam_unlock_hover.png"); + image: url("../gray_072/imgs/cam_unlock_hover.png"); } #EditToolLockButton::indicator:checked { - image: url("qss/gray_072/imgs/cam_lock.png"); + image: url("../gray_072/imgs/cam_lock.png"); } #EditToolLockButton::indicator:checked:hover { - image: url("qss/gray_072/imgs/cam_lock_hover.png"); + image: url("../gray_072/imgs/cam_lock_hover.png"); } /*------ Topbar and Menubar of the MainWindow ------*/ #TopBar { @@ -1183,7 +1183,7 @@ SpreadsheetViewer { padding: 0px; } #TopBarTab { - border-image: url("qss/gray_072/imgs/topbar_bg.png") 0 0 0 0 stretch stretch; + border-image: url("../gray_072/imgs/topbar_bg.png") 0 0 0 0 stretch stretch; /*background: qlineargradient(x1: 0,y1: 0, x2: 1, y2: 0, stop: 0 #a0a0a0, stop: 0.5 #404040);*/ border: 0px; padding: 0px; @@ -1270,21 +1270,21 @@ QDialog #dialogButtonFrame { #OutputSettingsShowButton { border: 2px; padding: 0px; - border-image: url("qss/gray_072/imgs/handle_border.png") 5; - image: url("qss/gray_072/imgs/plus.png"); + border-image: url("../gray_072/imgs/handle_border.png") 5; + image: url("../gray_072/imgs/plus.png"); image-position: center center; } #OutputSettingsShowButton:checked { - image: url("qss/gray_072/imgs/minus.png"); + image: url("../gray_072/imgs/minus.png"); } #IntPairField, #DoublePairField { qproperty-LightLineColor: #9b9b9b; qproperty-DarkLineColor: #2f2f2f; - qproperty-HandleLeftPixmap: url("qss/gray_072/imgs/h_slider_left.png"); - qproperty-HandleRightPixmap: url("qss/gray_072/imgs/h_slider_right.png"); - qproperty-HandleLeftGrayPixmap: url("qss/gray_072/imgs/h_slider_left_disabled.png"); - qproperty-HandleRightGrayPixmap: url("qss/gray_072/imgs/h_slider_right_disabled.png"); + qproperty-HandleLeftPixmap: url("../gray_072/imgs/h_slider_left.png"); + qproperty-HandleRightPixmap: url("../gray_072/imgs/h_slider_right.png"); + qproperty-HandleLeftGrayPixmap: url("../gray_072/imgs/h_slider_left_disabled.png"); + qproperty-HandleRightGrayPixmap: url("../gray_072/imgs/h_slider_right_disabled.png"); } #FxSettingsLabel { color: #a0e680; diff --git a/stuff/config/qss/gray_072/gray_072.less b/stuff/config/qss/gray_072/gray_072.less index 8cc26a3..f3c63fb 100644 --- a/stuff/config/qss/gray_072/gray_072.less +++ b/stuff/config/qss/gray_072/gray_072.less @@ -1,8 +1,7 @@ /* LESS Definitions */ /*Image URL*/ -@base_url: "qss/gray_072"; -@image_url: "@{base_url}/imgs"; +@image_url: "imgs"; /*Text Color*/ @m_baseTxtColor: rgb(230,230,230); @@ -273,19 +272,21 @@ QPushButton { .base_outset; border-width: 1px; border-radius: 4px; - .set_padding(20px, 3px); - + .set_padding(15px, 3px); + &:checked { + .base_inset(light, 10%); + } /*lighten lilttle bit when hover*/ &:hover { .base_outset(light, 10%); &:pressed { .base_inset(light, 10%); } + &:checked { + .base_inset(light, 5%); + } } /*lighten lilttle bit when pressed*/ - &:checked { - .base_inset(light, 10%); - } &:disabled{ .base_outset(light, 5%); color: rgb(80,80,80); diff --git a/stuff/config/qss/gray_072/gray_072.qss b/stuff/config/qss/gray_072/gray_072.qss index b6d9d51..a8f7300 100644 --- a/stuff/config/qss/gray_072/gray_072.qss +++ b/stuff/config/qss/gray_072/gray_072.qss @@ -121,10 +121,10 @@ QToolBar { border-image: none; } QToolBar::separator:horizontal { - image: url("qss/gray_072/imgs/bottomseparator.png"); + image: url("imgs/bottomseparator.png"); } QToolBar::separator:vertical { - image: url("qss/gray_072/imgs/separator.png"); + image: url("imgs/separator.png"); } QToolBar QToolButton { background-color: #484848; @@ -134,11 +134,11 @@ QToolBar QToolButton { border-image: none; } QToolBar QToolButton:hover { - border-image: url("qss/gray_072/imgs/over.png") 2; + border-image: url("imgs/over.png") 2; } QToolBar QToolButton:checked, QToolBar QToolButton:pressed { - border-image: url("qss/gray_072/imgs/click.png") 2; + border-image: url("imgs/click.png") 2; } QToolBar QToolButton:disabled { background-color: #555555; @@ -214,7 +214,7 @@ QComboBox::drop-down:on { border-bottom-color: #808080; } QComboBox::down-arrow { - image: url("qss/gray_072/imgs/combo_down_arrow.png"); + image: url("imgs/combo_down_arrow.png"); } QComboBox:disabled { background-color: #626262; @@ -234,13 +234,21 @@ QPushButton { border-bottom-color: #000000; border-width: 1px; border-radius: 4px; - padding-left: 20px; - padding-right: 20px; + padding-left: 15px; + padding-right: 15px; padding-top: 3px; padding-bottom: 3px; /*lighten lilttle bit when hover*/ /*lighten lilttle bit when pressed*/ } +QPushButton:checked { + background-color: #626262; + border-style: inset; + border-left-color: #3a3a3a; + border-top-color: #1a1a1a; + border-right-color: #868686; + border-bottom-color: #9a9a9a; +} QPushButton:hover { background-color: #626262; border-style: outset; @@ -257,13 +265,13 @@ QPushButton:hover:pressed { border-right-color: #868686; border-bottom-color: #9a9a9a; } -QPushButton:checked { - background-color: #626262; +QPushButton:hover:checked { + background-color: #555555; border-style: inset; - border-left-color: #3a3a3a; - border-top-color: #1a1a1a; - border-right-color: #868686; - border-bottom-color: #9a9a9a; + border-left-color: #2d2d2d; + border-top-color: #0d0d0d; + border-right-color: #797979; + border-bottom-color: #8d8d8d; } QPushButton:disabled { background-color: #555555; @@ -304,10 +312,10 @@ QCheckBox::indicator:disabled { border-bottom-color: #8d8d8d; } QCheckBox::indicator:checked { - image: url("qss/gray_072/imgs/check_indicator.png"); + image: url("imgs/check_indicator.png"); } QCheckBox::indicator:checked:disabled { - image: url("qss/gray_072/imgs/check_indicator_disabled.png"); + image: url("imgs/check_indicator_disabled.png"); } QSlider::groove:horizontal { background-color: #2f2f2f; @@ -444,13 +452,13 @@ PaletteViewer #ToolBarContainer #keyFrameNavigator { /* if there is only one tab, we don't want overlapping margins */ } #PaletteLockButton:hover { - border-image: url("qss/gray_072/imgs/over_yellow.png") 2; + border-image: url("imgs/over_yellow.png") 2; } #PaletteLockButton:checked { - border-image: url("qss/gray_072/imgs/click_pink.png") 2; + border-image: url("imgs/click_pink.png") 2; } #PaletteLockButton:checked:hover { - border-image: url("qss/gray_072/imgs/over_pressed_yellow.png") 2; + border-image: url("imgs/over_pressed_yellow.png") 2; } #PageViewer { qproperty-TextColor: #e6e6e6; @@ -520,23 +528,23 @@ PaletteViewer #ToolBarContainer #keyFrameNavigator { } #colorSliderAddButton, #colorSliderSubButton { - border-image: url("qss/gray_072/imgs/colorslider_button_bg.png") 2; + border-image: url("imgs/colorslider_button_bg.png") 2; padding: 0px; margin: 0px; border: 2px; image-position: center center; } #colorSliderAddButton { - image: url("qss/gray_072/imgs/colorslider_add.png"); + image: url("imgs/colorslider_add.png"); } #colorSliderAddButton:pressed { - image: url("qss/gray_072/imgs/colorslider_add_pressed.png"); + image: url("imgs/colorslider_add_pressed.png"); } #colorSliderSubButton { - image: url("qss/gray_072/imgs/colorslider_sub.png"); + image: url("imgs/colorslider_sub.png"); } #colorSliderSubButton:pressed { - image: url("qss/gray_072/imgs/colorslider_sub_pressed.png"); + image: url("imgs/colorslider_sub_pressed.png"); } #PlainColorPageParts { background-color: #484848; @@ -575,19 +583,19 @@ DvScrollWidget > QPushButton:pressed { max-width: 15px; } #ScrollLeftButton { - image: url("qss/gray_072/imgs/left_arrow_black.png"); + image: url("imgs/left_arrow_black.png"); border-right: 1px solid black; } #ScrollRightButton { - image: url("qss/gray_072/imgs/right_arrow_black.png"); + image: url("imgs/right_arrow_black.png"); border-left: 1px solid black; } #ScrollUpButton { - image: url("qss/gray_072/imgs/up_arrow_black.png"); + image: url("imgs/up_arrow_black.png"); border-bottom: 1px solid black; } #ScrollDownButton { - image: url("qss/gray_072/imgs/down_arrow_black.png"); + image: url("imgs/down_arrow_black.png"); border-top: 1px solid black; } /* ------ Viewer, Flipbook ------ */ @@ -621,30 +629,30 @@ FlipBook #ToolBarContainer { height: 21px; } #ViewerFpsSlider::handle { - border-image: url("qss/gray_072/imgs/handle_border.png") 6; + border-image: url("imgs/handle_border.png") 6; border-width: 6px; image: none; min-width: 5px; } #ViewerFpsSlider::add-line { - image: url("qss/gray_072/imgs/fpssb_g_rarrow.png"); + image: url("imgs/fpssb_g_rarrow.png"); width: 20px; subcontrol-position: right; subcontrol-origin: margin; margin: 0px; } #ViewerFpsSlider::add-line:pressed { - image: url("qss/gray_072/imgs/fpssb_g_rarrow_pressed.png"); + image: url("imgs/fpssb_g_rarrow_pressed.png"); } #ViewerFpsSlider::sub-line { - image: url("qss/gray_072/imgs/fpssb_g_larrow.png"); + image: url("imgs/fpssb_g_larrow.png"); width: 20px; subcontrol-position: left; subcontrol-origin: margin; margin: 0px; } #ViewerFpsSlider::sub-line:pressed { - image: url("qss/gray_072/imgs/fpssb_g_larrow_pressed.png"); + image: url("imgs/fpssb_g_larrow_pressed.png"); } #FlipConsolePlayToolBar { border: none; @@ -654,8 +662,8 @@ FlipBook #ToolBarContainer { } FlipSlider { qproperty-PBHeight: 20; - qproperty-PBOverlay: url("qss/gray_072/imgs/flipslider.png"); - qproperty-PBMarker: url("qss/gray_072/imgs/flipmarker.png"); + qproperty-PBOverlay: url("imgs/flipslider.png"); + qproperty-PBMarker: url("imgs/flipmarker.png"); qproperty-PBColorMarginLeft: 1; qproperty-PBColorMarginTop: 1; qproperty-PBColorMarginRight: 1; @@ -698,29 +706,29 @@ Ruler { margin: 0px; } #DirTreeView::branch:adjoins-item { - border-image: url("qss/gray_072/imgs/tree_branch-end.png") 0; + border-image: url("imgs/tree_branch-end.png") 0; } #DirTreeView::branch:has-siblings { - border-image: url("qss/gray_072/imgs/tree_vline.png") 0; + border-image: url("imgs/tree_vline.png") 0; } #DirTreeView::branch:has-siblings:adjoins-item { - border-image: url("qss/gray_072/imgs/tree_branch-more.png") 0; + border-image: url("imgs/tree_branch-more.png") 0; } #DirTreeView::branch:has-children:closed { border-image: none; - image: url("qss/gray_072/imgs/tree_branch-closed_nosib.png"); + image: url("imgs/tree_branch-closed_nosib.png"); } #DirTreeView::branch:has-children:open { border-image: none; - image: url("qss/gray_072/imgs/tree_branch-open_nosib.png"); + image: url("imgs/tree_branch-open_nosib.png"); } #DirTreeView::branch:has-children:has-siblings:closed { border-image: none; - image: url("qss/gray_072/imgs/tree_branch-closed.png"); + image: url("imgs/tree_branch-closed.png"); } #DirTreeView::branch:has-children:has-siblings:open { border-image: none; - image: url("qss/gray_072/imgs/tree_branch-open.png"); + image: url("imgs/tree_branch-open.png"); } DvItemViewerPanel { qproperty-TextColor: #e6e6e6; @@ -764,14 +772,14 @@ DvDirTreeView { border-width: 2px; padding: 0px; margin: 0px; - border-image: url("qss/gray_072/imgs/handle_border.png") 5; - image: url("qss/gray_072/imgs/plus.png"); + border-image: url("imgs/handle_border.png") 5; + image: url("imgs/plus.png"); image-position: center center; } #CleanupSettingsShowButton:checked, #LoadLevelShowButton:checked, #FxSettingsPreviewShowButton:checked { - image: url("qss/gray_072/imgs/minus.png"); + image: url("imgs/minus.png"); } ParamsPage { qproperty-TextColor: #e6e6e6; @@ -845,52 +853,52 @@ ParamsPage { image-position: center center; } #XsheetScrollBar::handle:vertical { - border-image: url("qss/gray_072/imgs/sb_g_vhandle.png") 4; - image: url("qss/gray_072/imgs/sb_g_vline.png"); + border-image: url("imgs/sb_g_vhandle.png") 4; + image: url("imgs/sb_g_vline.png"); min-height: 40px; } #XsheetScrollBar::handle:horizontal { - border-image: url("qss/gray_072/imgs/sb_g_hhandle.png") 4; - image: url("qss/gray_072/imgs/sb_g_hline.png"); + border-image: url("imgs/sb_g_hhandle.png") 4; + image: url("imgs/sb_g_hline.png"); min-width: 40px; } #XsheetScrollBar::add-line { subcontrol-origin: margin; } #XsheetScrollBar::add-line:vertical { - image: url("qss/gray_072/imgs/sb_g_downarrow.png"); + image: url("imgs/sb_g_downarrow.png"); height: 20px; subcontrol-position: bottom; } #XsheetScrollBar::add-line:vertical:pressed { - image: url("qss/gray_072/imgs/sb_g_downarrow_pressed.png"); + image: url("imgs/sb_g_downarrow_pressed.png"); } #XsheetScrollBar::add-line:horizontal { - image: url("qss/gray_072/imgs/sb_g_rarrow.png"); + image: url("imgs/sb_g_rarrow.png"); width: 20px; subcontrol-position: right; } #XsheetScrollBar::add-line:horizontal:pressed { - image: url("qss/gray_072/imgs/sb_g_rarrow_pressed.png"); + image: url("imgs/sb_g_rarrow_pressed.png"); } #XsheetScrollBar::sub-line { subcontrol-origin: margin; } #XsheetScrollBar::sub-line:vertical { - image: url("qss/gray_072/imgs/sb_g_uparrow.png"); + image: url("imgs/sb_g_uparrow.png"); height: 20px; subcontrol-position: top; } #XsheetScrollBar::sub-line:vertical:pressed { - image: url("qss/gray_072/imgs/sb_g_uparrow_pressed.png"); + image: url("imgs/sb_g_uparrow_pressed.png"); } #XsheetScrollBar::sub-line:horizontal { - image: url("qss/gray_072/imgs/sb_g_larrow.png"); + image: url("imgs/sb_g_larrow.png"); width: 20px; subcontrol-position: left; } #XsheetScrollBar::sub-line:horizontal:pressed { - image: url("qss/gray_072/imgs/sb_g_larrow_pressed.png"); + image: url("imgs/sb_g_larrow_pressed.png"); } #XsheetScrollBar::add-page { background: none; @@ -957,35 +965,35 @@ XsheetViewer { } #FunctionEditorTree::branch:adjoins-item, #ShortcutTree::branch:adjoins-item { - border-image: url("qss/gray_072/imgs/tree17_branch-end.png") 0; + border-image: url("imgs/tree17_branch-end.png") 0; } #FunctionEditorTree::branch:has-siblings, #ShortcutTree::branch:has-siblings { - border-image: url("qss/gray_072/imgs/tree17_vline.png") 0; + border-image: url("imgs/tree17_vline.png") 0; } #FunctionEditorTree::branch:has-siblings:adjoins-item, #ShortcutTree::branch:has-siblings:adjoins-item { - border-image: url("qss/gray_072/imgs/tree17_branch-more.png") 0; + border-image: url("imgs/tree17_branch-more.png") 0; } #FunctionEditorTree::branch:has-children:closed, #ShortcutTree::branch:has-children:closed { border-image: none; - image: url("qss/gray_072/imgs/tree17_branch-closed_nosib.png"); + image: url("imgs/tree17_branch-closed_nosib.png"); } #FunctionEditorTree::branch:has-children:open, #ShortcutTree::branch:has-children:open { border-image: none; - image: url("qss/gray_072/imgs/tree17_branch-open_nosib.png"); + image: url("imgs/tree17_branch-open_nosib.png"); } #FunctionEditorTree::branch:has-children:has-siblings:closed, #ShortcutTree::branch:has-children:has-siblings:closed { border-image: none; - image: url("qss/gray_072/imgs/tree17_branch-closed.png"); + image: url("imgs/tree17_branch-closed.png"); } #FunctionEditorTree::branch:has-children:has-siblings:open, #ShortcutTree::branch:has-children:has-siblings:open { border-image: none; - image: url("qss/gray_072/imgs/tree17_branch-open.png"); + image: url("imgs/tree17_branch-open.png"); } FunctionPanel { qproperty-BGColor: #303030; @@ -1039,7 +1047,7 @@ SpreadsheetViewer { #FunctionSegmentViewerLinkButton { border: 2px; margin: 0px; - background-image: url("qss/gray_072/imgs/segment_unlinked.png"); + background-image: url("imgs/segment_unlinked.png"); background-color: #7b7b7b; border-style: outset; border-left-color: #9f9f9f; @@ -1048,7 +1056,7 @@ SpreadsheetViewer { border-bottom-color: #333333; } #FunctionSegmentViewerLinkButton:checked { - background-image: url("qss/gray_072/imgs/segment_linked.png"); + background-image: url("imgs/segment_linked.png"); background-color: #7b7b7b; border-style: inset; border-left-color: #535353; @@ -1057,7 +1065,7 @@ SpreadsheetViewer { border-bottom-color: #b3b3b3; } #FunctionSegmentViewerLinkButton:disabled { - background-image: url("qss/gray_072/imgs/segment_disabled.png"); + background-image: url("imgs/segment_disabled.png"); background-color: #626262; border-style: outset; border-left-color: #868686; @@ -1099,13 +1107,13 @@ SpreadsheetViewer { height: 21px; } #CameraSettingsRadioButton::indicator:checked { - image: url("qss/gray_072/imgs/cam_lock.png"); + image: url("imgs/cam_lock.png"); } #CameraSettingsRadioButton::indicator:unchecked { - image: url("qss/gray_072/imgs/cam_unlock.png"); + image: url("imgs/cam_unlock.png"); } #CameraSettingsRadioButton::indicator:unchecked:hover { - image: url("qss/gray_072/imgs/cam_lock_hover.png"); + image: url("imgs/cam_lock_hover.png"); } #CameraSettingsDPI { color: #a8bee7; @@ -1118,25 +1126,25 @@ SpreadsheetViewer { height: 21px; } #CameraSettingsRadioButton_Small::indicator:checked { - image: url("qss/gray_072/imgs/cam_lock_small.png"); + image: url("imgs/cam_lock_small.png"); } #CameraSettingsRadioButton_Small::indicator:unchecked { - image: url("qss/gray_072/imgs/cam_unlock_small.png"); + image: url("imgs/cam_unlock_small.png"); } #CameraSettingsRadioButton_Small::indicator:unchecked:hover { - image: url("qss/gray_072/imgs/cam_lock_hover_small.png"); + image: url("imgs/cam_lock_hover_small.png"); } #ForceSquaredPixelButton { border: none; border-radius: 0px; padding: 0px; - image: url("qss/gray_072/imgs/fsp_released.png"); + image: url("imgs/fsp_released.png"); } #ForceSquaredPixelButton:hover { - image: url("qss/gray_072/imgs/fsp_hover.png"); + image: url("imgs/fsp_hover.png"); } #ForceSquaredPixelButton:checked { - image: url("qss/gray_072/imgs/fsp_pressed.png"); + image: url("imgs/fsp_pressed.png"); } /*------ Tool Options Bar------*/ #EditToolLockButton { @@ -1149,16 +1157,16 @@ SpreadsheetViewer { height: 21px; } #EditToolLockButton::indicator:unchecked { - image: url("qss/gray_072/imgs/cam_unlock.png"); + image: url("imgs/cam_unlock.png"); } #EditToolLockButton::indicator:unchecked:hover { - image: url("qss/gray_072/imgs/cam_unlock_hover.png"); + image: url("imgs/cam_unlock_hover.png"); } #EditToolLockButton::indicator:checked { - image: url("qss/gray_072/imgs/cam_lock.png"); + image: url("imgs/cam_lock.png"); } #EditToolLockButton::indicator:checked:hover { - image: url("qss/gray_072/imgs/cam_lock_hover.png"); + image: url("imgs/cam_lock_hover.png"); } /*------ Topbar and Menubar of the MainWindow ------*/ #TopBar { @@ -1175,7 +1183,7 @@ SpreadsheetViewer { padding: 0px; } #TopBarTab { - border-image: url("qss/gray_072/imgs/topbar_bg.png") 0 0 0 0 stretch stretch; + border-image: url("imgs/topbar_bg.png") 0 0 0 0 stretch stretch; /*background: qlineargradient(x1: 0,y1: 0, x2: 1, y2: 0, stop: 0 #a0a0a0, stop: 0.5 #404040);*/ border: 0px; padding: 0px; @@ -1262,21 +1270,21 @@ QDialog #dialogButtonFrame { #OutputSettingsShowButton { border: 2px; padding: 0px; - border-image: url("qss/gray_072/imgs/handle_border.png") 5; - image: url("qss/gray_072/imgs/plus.png"); + border-image: url("imgs/handle_border.png") 5; + image: url("imgs/plus.png"); image-position: center center; } #OutputSettingsShowButton:checked { - image: url("qss/gray_072/imgs/minus.png"); + image: url("imgs/minus.png"); } #IntPairField, #DoublePairField { qproperty-LightLineColor: #9b9b9b; qproperty-DarkLineColor: #2f2f2f; - qproperty-HandleLeftPixmap: url("qss/gray_072/imgs/h_slider_left.png"); - qproperty-HandleRightPixmap: url("qss/gray_072/imgs/h_slider_right.png"); - qproperty-HandleLeftGrayPixmap: url("qss/gray_072/imgs/h_slider_left_disabled.png"); - qproperty-HandleRightGrayPixmap: url("qss/gray_072/imgs/h_slider_right_disabled.png"); + qproperty-HandleLeftPixmap: url("imgs/h_slider_left.png"); + qproperty-HandleRightPixmap: url("imgs/h_slider_right.png"); + qproperty-HandleLeftGrayPixmap: url("imgs/h_slider_left_disabled.png"); + qproperty-HandleRightGrayPixmap: url("imgs/h_slider_right_disabled.png"); } #FxSettingsLabel { color: #a0e680; diff --git a/stuff/config/qss/gray_072/gray_072_mac.qss b/stuff/config/qss/gray_072/gray_072_mac.qss index b6d9d51..a8f7300 100644 --- a/stuff/config/qss/gray_072/gray_072_mac.qss +++ b/stuff/config/qss/gray_072/gray_072_mac.qss @@ -121,10 +121,10 @@ QToolBar { border-image: none; } QToolBar::separator:horizontal { - image: url("qss/gray_072/imgs/bottomseparator.png"); + image: url("imgs/bottomseparator.png"); } QToolBar::separator:vertical { - image: url("qss/gray_072/imgs/separator.png"); + image: url("imgs/separator.png"); } QToolBar QToolButton { background-color: #484848; @@ -134,11 +134,11 @@ QToolBar QToolButton { border-image: none; } QToolBar QToolButton:hover { - border-image: url("qss/gray_072/imgs/over.png") 2; + border-image: url("imgs/over.png") 2; } QToolBar QToolButton:checked, QToolBar QToolButton:pressed { - border-image: url("qss/gray_072/imgs/click.png") 2; + border-image: url("imgs/click.png") 2; } QToolBar QToolButton:disabled { background-color: #555555; @@ -214,7 +214,7 @@ QComboBox::drop-down:on { border-bottom-color: #808080; } QComboBox::down-arrow { - image: url("qss/gray_072/imgs/combo_down_arrow.png"); + image: url("imgs/combo_down_arrow.png"); } QComboBox:disabled { background-color: #626262; @@ -234,13 +234,21 @@ QPushButton { border-bottom-color: #000000; border-width: 1px; border-radius: 4px; - padding-left: 20px; - padding-right: 20px; + padding-left: 15px; + padding-right: 15px; padding-top: 3px; padding-bottom: 3px; /*lighten lilttle bit when hover*/ /*lighten lilttle bit when pressed*/ } +QPushButton:checked { + background-color: #626262; + border-style: inset; + border-left-color: #3a3a3a; + border-top-color: #1a1a1a; + border-right-color: #868686; + border-bottom-color: #9a9a9a; +} QPushButton:hover { background-color: #626262; border-style: outset; @@ -257,13 +265,13 @@ QPushButton:hover:pressed { border-right-color: #868686; border-bottom-color: #9a9a9a; } -QPushButton:checked { - background-color: #626262; +QPushButton:hover:checked { + background-color: #555555; border-style: inset; - border-left-color: #3a3a3a; - border-top-color: #1a1a1a; - border-right-color: #868686; - border-bottom-color: #9a9a9a; + border-left-color: #2d2d2d; + border-top-color: #0d0d0d; + border-right-color: #797979; + border-bottom-color: #8d8d8d; } QPushButton:disabled { background-color: #555555; @@ -304,10 +312,10 @@ QCheckBox::indicator:disabled { border-bottom-color: #8d8d8d; } QCheckBox::indicator:checked { - image: url("qss/gray_072/imgs/check_indicator.png"); + image: url("imgs/check_indicator.png"); } QCheckBox::indicator:checked:disabled { - image: url("qss/gray_072/imgs/check_indicator_disabled.png"); + image: url("imgs/check_indicator_disabled.png"); } QSlider::groove:horizontal { background-color: #2f2f2f; @@ -444,13 +452,13 @@ PaletteViewer #ToolBarContainer #keyFrameNavigator { /* if there is only one tab, we don't want overlapping margins */ } #PaletteLockButton:hover { - border-image: url("qss/gray_072/imgs/over_yellow.png") 2; + border-image: url("imgs/over_yellow.png") 2; } #PaletteLockButton:checked { - border-image: url("qss/gray_072/imgs/click_pink.png") 2; + border-image: url("imgs/click_pink.png") 2; } #PaletteLockButton:checked:hover { - border-image: url("qss/gray_072/imgs/over_pressed_yellow.png") 2; + border-image: url("imgs/over_pressed_yellow.png") 2; } #PageViewer { qproperty-TextColor: #e6e6e6; @@ -520,23 +528,23 @@ PaletteViewer #ToolBarContainer #keyFrameNavigator { } #colorSliderAddButton, #colorSliderSubButton { - border-image: url("qss/gray_072/imgs/colorslider_button_bg.png") 2; + border-image: url("imgs/colorslider_button_bg.png") 2; padding: 0px; margin: 0px; border: 2px; image-position: center center; } #colorSliderAddButton { - image: url("qss/gray_072/imgs/colorslider_add.png"); + image: url("imgs/colorslider_add.png"); } #colorSliderAddButton:pressed { - image: url("qss/gray_072/imgs/colorslider_add_pressed.png"); + image: url("imgs/colorslider_add_pressed.png"); } #colorSliderSubButton { - image: url("qss/gray_072/imgs/colorslider_sub.png"); + image: url("imgs/colorslider_sub.png"); } #colorSliderSubButton:pressed { - image: url("qss/gray_072/imgs/colorslider_sub_pressed.png"); + image: url("imgs/colorslider_sub_pressed.png"); } #PlainColorPageParts { background-color: #484848; @@ -575,19 +583,19 @@ DvScrollWidget > QPushButton:pressed { max-width: 15px; } #ScrollLeftButton { - image: url("qss/gray_072/imgs/left_arrow_black.png"); + image: url("imgs/left_arrow_black.png"); border-right: 1px solid black; } #ScrollRightButton { - image: url("qss/gray_072/imgs/right_arrow_black.png"); + image: url("imgs/right_arrow_black.png"); border-left: 1px solid black; } #ScrollUpButton { - image: url("qss/gray_072/imgs/up_arrow_black.png"); + image: url("imgs/up_arrow_black.png"); border-bottom: 1px solid black; } #ScrollDownButton { - image: url("qss/gray_072/imgs/down_arrow_black.png"); + image: url("imgs/down_arrow_black.png"); border-top: 1px solid black; } /* ------ Viewer, Flipbook ------ */ @@ -621,30 +629,30 @@ FlipBook #ToolBarContainer { height: 21px; } #ViewerFpsSlider::handle { - border-image: url("qss/gray_072/imgs/handle_border.png") 6; + border-image: url("imgs/handle_border.png") 6; border-width: 6px; image: none; min-width: 5px; } #ViewerFpsSlider::add-line { - image: url("qss/gray_072/imgs/fpssb_g_rarrow.png"); + image: url("imgs/fpssb_g_rarrow.png"); width: 20px; subcontrol-position: right; subcontrol-origin: margin; margin: 0px; } #ViewerFpsSlider::add-line:pressed { - image: url("qss/gray_072/imgs/fpssb_g_rarrow_pressed.png"); + image: url("imgs/fpssb_g_rarrow_pressed.png"); } #ViewerFpsSlider::sub-line { - image: url("qss/gray_072/imgs/fpssb_g_larrow.png"); + image: url("imgs/fpssb_g_larrow.png"); width: 20px; subcontrol-position: left; subcontrol-origin: margin; margin: 0px; } #ViewerFpsSlider::sub-line:pressed { - image: url("qss/gray_072/imgs/fpssb_g_larrow_pressed.png"); + image: url("imgs/fpssb_g_larrow_pressed.png"); } #FlipConsolePlayToolBar { border: none; @@ -654,8 +662,8 @@ FlipBook #ToolBarContainer { } FlipSlider { qproperty-PBHeight: 20; - qproperty-PBOverlay: url("qss/gray_072/imgs/flipslider.png"); - qproperty-PBMarker: url("qss/gray_072/imgs/flipmarker.png"); + qproperty-PBOverlay: url("imgs/flipslider.png"); + qproperty-PBMarker: url("imgs/flipmarker.png"); qproperty-PBColorMarginLeft: 1; qproperty-PBColorMarginTop: 1; qproperty-PBColorMarginRight: 1; @@ -698,29 +706,29 @@ Ruler { margin: 0px; } #DirTreeView::branch:adjoins-item { - border-image: url("qss/gray_072/imgs/tree_branch-end.png") 0; + border-image: url("imgs/tree_branch-end.png") 0; } #DirTreeView::branch:has-siblings { - border-image: url("qss/gray_072/imgs/tree_vline.png") 0; + border-image: url("imgs/tree_vline.png") 0; } #DirTreeView::branch:has-siblings:adjoins-item { - border-image: url("qss/gray_072/imgs/tree_branch-more.png") 0; + border-image: url("imgs/tree_branch-more.png") 0; } #DirTreeView::branch:has-children:closed { border-image: none; - image: url("qss/gray_072/imgs/tree_branch-closed_nosib.png"); + image: url("imgs/tree_branch-closed_nosib.png"); } #DirTreeView::branch:has-children:open { border-image: none; - image: url("qss/gray_072/imgs/tree_branch-open_nosib.png"); + image: url("imgs/tree_branch-open_nosib.png"); } #DirTreeView::branch:has-children:has-siblings:closed { border-image: none; - image: url("qss/gray_072/imgs/tree_branch-closed.png"); + image: url("imgs/tree_branch-closed.png"); } #DirTreeView::branch:has-children:has-siblings:open { border-image: none; - image: url("qss/gray_072/imgs/tree_branch-open.png"); + image: url("imgs/tree_branch-open.png"); } DvItemViewerPanel { qproperty-TextColor: #e6e6e6; @@ -764,14 +772,14 @@ DvDirTreeView { border-width: 2px; padding: 0px; margin: 0px; - border-image: url("qss/gray_072/imgs/handle_border.png") 5; - image: url("qss/gray_072/imgs/plus.png"); + border-image: url("imgs/handle_border.png") 5; + image: url("imgs/plus.png"); image-position: center center; } #CleanupSettingsShowButton:checked, #LoadLevelShowButton:checked, #FxSettingsPreviewShowButton:checked { - image: url("qss/gray_072/imgs/minus.png"); + image: url("imgs/minus.png"); } ParamsPage { qproperty-TextColor: #e6e6e6; @@ -845,52 +853,52 @@ ParamsPage { image-position: center center; } #XsheetScrollBar::handle:vertical { - border-image: url("qss/gray_072/imgs/sb_g_vhandle.png") 4; - image: url("qss/gray_072/imgs/sb_g_vline.png"); + border-image: url("imgs/sb_g_vhandle.png") 4; + image: url("imgs/sb_g_vline.png"); min-height: 40px; } #XsheetScrollBar::handle:horizontal { - border-image: url("qss/gray_072/imgs/sb_g_hhandle.png") 4; - image: url("qss/gray_072/imgs/sb_g_hline.png"); + border-image: url("imgs/sb_g_hhandle.png") 4; + image: url("imgs/sb_g_hline.png"); min-width: 40px; } #XsheetScrollBar::add-line { subcontrol-origin: margin; } #XsheetScrollBar::add-line:vertical { - image: url("qss/gray_072/imgs/sb_g_downarrow.png"); + image: url("imgs/sb_g_downarrow.png"); height: 20px; subcontrol-position: bottom; } #XsheetScrollBar::add-line:vertical:pressed { - image: url("qss/gray_072/imgs/sb_g_downarrow_pressed.png"); + image: url("imgs/sb_g_downarrow_pressed.png"); } #XsheetScrollBar::add-line:horizontal { - image: url("qss/gray_072/imgs/sb_g_rarrow.png"); + image: url("imgs/sb_g_rarrow.png"); width: 20px; subcontrol-position: right; } #XsheetScrollBar::add-line:horizontal:pressed { - image: url("qss/gray_072/imgs/sb_g_rarrow_pressed.png"); + image: url("imgs/sb_g_rarrow_pressed.png"); } #XsheetScrollBar::sub-line { subcontrol-origin: margin; } #XsheetScrollBar::sub-line:vertical { - image: url("qss/gray_072/imgs/sb_g_uparrow.png"); + image: url("imgs/sb_g_uparrow.png"); height: 20px; subcontrol-position: top; } #XsheetScrollBar::sub-line:vertical:pressed { - image: url("qss/gray_072/imgs/sb_g_uparrow_pressed.png"); + image: url("imgs/sb_g_uparrow_pressed.png"); } #XsheetScrollBar::sub-line:horizontal { - image: url("qss/gray_072/imgs/sb_g_larrow.png"); + image: url("imgs/sb_g_larrow.png"); width: 20px; subcontrol-position: left; } #XsheetScrollBar::sub-line:horizontal:pressed { - image: url("qss/gray_072/imgs/sb_g_larrow_pressed.png"); + image: url("imgs/sb_g_larrow_pressed.png"); } #XsheetScrollBar::add-page { background: none; @@ -957,35 +965,35 @@ XsheetViewer { } #FunctionEditorTree::branch:adjoins-item, #ShortcutTree::branch:adjoins-item { - border-image: url("qss/gray_072/imgs/tree17_branch-end.png") 0; + border-image: url("imgs/tree17_branch-end.png") 0; } #FunctionEditorTree::branch:has-siblings, #ShortcutTree::branch:has-siblings { - border-image: url("qss/gray_072/imgs/tree17_vline.png") 0; + border-image: url("imgs/tree17_vline.png") 0; } #FunctionEditorTree::branch:has-siblings:adjoins-item, #ShortcutTree::branch:has-siblings:adjoins-item { - border-image: url("qss/gray_072/imgs/tree17_branch-more.png") 0; + border-image: url("imgs/tree17_branch-more.png") 0; } #FunctionEditorTree::branch:has-children:closed, #ShortcutTree::branch:has-children:closed { border-image: none; - image: url("qss/gray_072/imgs/tree17_branch-closed_nosib.png"); + image: url("imgs/tree17_branch-closed_nosib.png"); } #FunctionEditorTree::branch:has-children:open, #ShortcutTree::branch:has-children:open { border-image: none; - image: url("qss/gray_072/imgs/tree17_branch-open_nosib.png"); + image: url("imgs/tree17_branch-open_nosib.png"); } #FunctionEditorTree::branch:has-children:has-siblings:closed, #ShortcutTree::branch:has-children:has-siblings:closed { border-image: none; - image: url("qss/gray_072/imgs/tree17_branch-closed.png"); + image: url("imgs/tree17_branch-closed.png"); } #FunctionEditorTree::branch:has-children:has-siblings:open, #ShortcutTree::branch:has-children:has-siblings:open { border-image: none; - image: url("qss/gray_072/imgs/tree17_branch-open.png"); + image: url("imgs/tree17_branch-open.png"); } FunctionPanel { qproperty-BGColor: #303030; @@ -1039,7 +1047,7 @@ SpreadsheetViewer { #FunctionSegmentViewerLinkButton { border: 2px; margin: 0px; - background-image: url("qss/gray_072/imgs/segment_unlinked.png"); + background-image: url("imgs/segment_unlinked.png"); background-color: #7b7b7b; border-style: outset; border-left-color: #9f9f9f; @@ -1048,7 +1056,7 @@ SpreadsheetViewer { border-bottom-color: #333333; } #FunctionSegmentViewerLinkButton:checked { - background-image: url("qss/gray_072/imgs/segment_linked.png"); + background-image: url("imgs/segment_linked.png"); background-color: #7b7b7b; border-style: inset; border-left-color: #535353; @@ -1057,7 +1065,7 @@ SpreadsheetViewer { border-bottom-color: #b3b3b3; } #FunctionSegmentViewerLinkButton:disabled { - background-image: url("qss/gray_072/imgs/segment_disabled.png"); + background-image: url("imgs/segment_disabled.png"); background-color: #626262; border-style: outset; border-left-color: #868686; @@ -1099,13 +1107,13 @@ SpreadsheetViewer { height: 21px; } #CameraSettingsRadioButton::indicator:checked { - image: url("qss/gray_072/imgs/cam_lock.png"); + image: url("imgs/cam_lock.png"); } #CameraSettingsRadioButton::indicator:unchecked { - image: url("qss/gray_072/imgs/cam_unlock.png"); + image: url("imgs/cam_unlock.png"); } #CameraSettingsRadioButton::indicator:unchecked:hover { - image: url("qss/gray_072/imgs/cam_lock_hover.png"); + image: url("imgs/cam_lock_hover.png"); } #CameraSettingsDPI { color: #a8bee7; @@ -1118,25 +1126,25 @@ SpreadsheetViewer { height: 21px; } #CameraSettingsRadioButton_Small::indicator:checked { - image: url("qss/gray_072/imgs/cam_lock_small.png"); + image: url("imgs/cam_lock_small.png"); } #CameraSettingsRadioButton_Small::indicator:unchecked { - image: url("qss/gray_072/imgs/cam_unlock_small.png"); + image: url("imgs/cam_unlock_small.png"); } #CameraSettingsRadioButton_Small::indicator:unchecked:hover { - image: url("qss/gray_072/imgs/cam_lock_hover_small.png"); + image: url("imgs/cam_lock_hover_small.png"); } #ForceSquaredPixelButton { border: none; border-radius: 0px; padding: 0px; - image: url("qss/gray_072/imgs/fsp_released.png"); + image: url("imgs/fsp_released.png"); } #ForceSquaredPixelButton:hover { - image: url("qss/gray_072/imgs/fsp_hover.png"); + image: url("imgs/fsp_hover.png"); } #ForceSquaredPixelButton:checked { - image: url("qss/gray_072/imgs/fsp_pressed.png"); + image: url("imgs/fsp_pressed.png"); } /*------ Tool Options Bar------*/ #EditToolLockButton { @@ -1149,16 +1157,16 @@ SpreadsheetViewer { height: 21px; } #EditToolLockButton::indicator:unchecked { - image: url("qss/gray_072/imgs/cam_unlock.png"); + image: url("imgs/cam_unlock.png"); } #EditToolLockButton::indicator:unchecked:hover { - image: url("qss/gray_072/imgs/cam_unlock_hover.png"); + image: url("imgs/cam_unlock_hover.png"); } #EditToolLockButton::indicator:checked { - image: url("qss/gray_072/imgs/cam_lock.png"); + image: url("imgs/cam_lock.png"); } #EditToolLockButton::indicator:checked:hover { - image: url("qss/gray_072/imgs/cam_lock_hover.png"); + image: url("imgs/cam_lock_hover.png"); } /*------ Topbar and Menubar of the MainWindow ------*/ #TopBar { @@ -1175,7 +1183,7 @@ SpreadsheetViewer { padding: 0px; } #TopBarTab { - border-image: url("qss/gray_072/imgs/topbar_bg.png") 0 0 0 0 stretch stretch; + border-image: url("imgs/topbar_bg.png") 0 0 0 0 stretch stretch; /*background: qlineargradient(x1: 0,y1: 0, x2: 1, y2: 0, stop: 0 #a0a0a0, stop: 0.5 #404040);*/ border: 0px; padding: 0px; @@ -1262,21 +1270,21 @@ QDialog #dialogButtonFrame { #OutputSettingsShowButton { border: 2px; padding: 0px; - border-image: url("qss/gray_072/imgs/handle_border.png") 5; - image: url("qss/gray_072/imgs/plus.png"); + border-image: url("imgs/handle_border.png") 5; + image: url("imgs/plus.png"); image-position: center center; } #OutputSettingsShowButton:checked { - image: url("qss/gray_072/imgs/minus.png"); + image: url("imgs/minus.png"); } #IntPairField, #DoublePairField { qproperty-LightLineColor: #9b9b9b; qproperty-DarkLineColor: #2f2f2f; - qproperty-HandleLeftPixmap: url("qss/gray_072/imgs/h_slider_left.png"); - qproperty-HandleRightPixmap: url("qss/gray_072/imgs/h_slider_right.png"); - qproperty-HandleLeftGrayPixmap: url("qss/gray_072/imgs/h_slider_left_disabled.png"); - qproperty-HandleRightGrayPixmap: url("qss/gray_072/imgs/h_slider_right_disabled.png"); + qproperty-HandleLeftPixmap: url("imgs/h_slider_left.png"); + qproperty-HandleRightPixmap: url("imgs/h_slider_right.png"); + qproperty-HandleLeftGrayPixmap: url("imgs/h_slider_left_disabled.png"); + qproperty-HandleRightGrayPixmap: url("imgs/h_slider_right_disabled.png"); } #FxSettingsLabel { color: #a0e680; diff --git a/stuff/config/qss/gray_128/gray_128.less b/stuff/config/qss/gray_128/gray_128.less index 0834fb1..c43b67a 100644 --- a/stuff/config/qss/gray_128/gray_128.less +++ b/stuff/config/qss/gray_128/gray_128.less @@ -1,8 +1,7 @@ /* LESS Definitions */ /*Image URL*/ -@base_url: "qss/gray_128"; -@image_url: "@{base_url}/imgs"; +@image_url: "imgs"; @m_baseBG: rgb(128,128,128); @m_base_lightH: rgb(230,230,230); diff --git a/stuff/config/qss/gray_128/gray_128.qss b/stuff/config/qss/gray_128/gray_128.qss index ba70e14..d383a66 100644 --- a/stuff/config/qss/gray_128/gray_128.qss +++ b/stuff/config/qss/gray_128/gray_128.qss @@ -80,10 +80,10 @@ QToolBar::separator:horizontal { margin_top: 1px; margin_left: 2px; margin_right: 2px; - image: url("qss/gray_128/imgs/bottomseparator.png"); + image: url("imgs/bottomseparator.png"); } QToolBar::separator:vertical { - image: url("qss/gray_128/imgs/separator.png"); + image: url("imgs/separator.png"); } QToolBar QToolButton { background-color: #808080; @@ -94,11 +94,11 @@ QToolBar QToolButton { border-image: none; } QToolBar QToolButton:hover { - border-image: url("qss/gray_128/imgs/over.png") 2; + border-image: url("imgs/over.png") 2; } QToolBar QToolButton:checked, QToolBar QToolButton:pressed { - border-image: url("qss/gray_128/imgs/click.png") 2; + border-image: url("imgs/click.png") 2; } QToolBar QToolButton:disabled { border-image: none; @@ -210,13 +210,13 @@ PaletteViewer #ToolBarContainer #keyFrameNavigator { /* if there is only one tab, we don't want overlapping margins */ } #PaletteLockButton:hover { - border-image: url("qss/gray_128/imgs/over_yellow.png") 2; + border-image: url("imgs/over_yellow.png") 2; } #PaletteLockButton:checked { - border-image: url("qss/gray_128/imgs/click_pink.png") 2; + border-image: url("imgs/click_pink.png") 2; } #PaletteLockButton:checked:hover { - border-image: url("qss/gray_128/imgs/over_pressed_yellow.png") 2; + border-image: url("imgs/over_pressed_yellow.png") 2; } #PageViewer { qproperty-TextColor: black; @@ -286,23 +286,23 @@ PaletteViewer #ToolBarContainer #keyFrameNavigator { } #colorSliderAddButton, #colorSliderSubButton { - border-image: url("qss/gray_128/imgs/colorslider_button_bg.png") 2; + border-image: url("imgs/colorslider_button_bg.png") 2; padding: 0px; margin: 0px; border: 2px; image-position: center center; } #colorSliderAddButton { - image: url("qss/gray_128/imgs/colorslider_add.png"); + image: url("imgs/colorslider_add.png"); } #colorSliderAddButton:pressed { - image: url("qss/gray_128/imgs/colorslider_add_pressed.png"); + image: url("imgs/colorslider_add_pressed.png"); } #colorSliderSubButton { - image: url("qss/gray_128/imgs/colorslider_sub.png"); + image: url("imgs/colorslider_sub.png"); } #colorSliderSubButton:pressed { - image: url("qss/gray_128/imgs/colorslider_sub_pressed.png"); + image: url("imgs/colorslider_sub_pressed.png"); } #PlainColorPageParts { border-width: 0px; @@ -336,19 +336,19 @@ DvScrollWidget > QPushButton:pressed { max-width: 15px; } #ScrollLeftButton { - image: url("qss/gray_128/imgs/left_arrow_black.png"); + image: url("imgs/left_arrow_black.png"); border-right: 1px solid black; } #ScrollRightButton { - image: url("qss/gray_128/imgs/right_arrow_black.png"); + image: url("imgs/right_arrow_black.png"); border-left: 1px solid black; } #ScrollUpButton { - image: url("qss/gray_128/imgs/up_arrow_black.png"); + image: url("imgs/up_arrow_black.png"); border-bottom: 1px solid black; } #ScrollDownButton { - image: url("qss/gray_128/imgs/down_arrow_black.png"); + image: url("imgs/down_arrow_black.png"); border-top: 1px solid black; } /* ------ Viewer, Flipbook ------ */ @@ -382,30 +382,30 @@ FlipBook #ToolBarContainer { height: 21px; } #ViewerFpsSlider::handle { - border-image: url("qss/gray_128/imgs/handle_border.png") 6; + border-image: url("imgs/handle_border.png") 6; border-width: 6px; image: none; min-width: 5px; } #ViewerFpsSlider::add-line { - image: url("qss/gray_128/imgs/fpssb_g_rarrow.png"); + image: url("imgs/fpssb_g_rarrow.png"); width: 20px; subcontrol-position: right; subcontrol-origin: margin; margin: 0px; } #ViewerFpsSlider::add-line:pressed { - image: url("qss/gray_128/imgs/fpssb_g_rarrow_pressed.png"); + image: url("imgs/fpssb_g_rarrow_pressed.png"); } #ViewerFpsSlider::sub-line { - image: url("qss/gray_128/imgs/fpssb_g_larrow.png"); + image: url("imgs/fpssb_g_larrow.png"); width: 20px; subcontrol-position: left; subcontrol-origin: margin; margin: 0px; } #ViewerFpsSlider::sub-line:pressed { - image: url("qss/gray_128/imgs/fpssb_g_larrow_pressed.png"); + image: url("imgs/fpssb_g_larrow_pressed.png"); } #FlipConsolePlayToolBar { border: none; @@ -415,8 +415,8 @@ FlipBook #ToolBarContainer { } FlipSlider { qproperty-PBHeight: 20; - qproperty-PBOverlay: url("qss/gray_128/imgs/flipslider.png"); - qproperty-PBMarker: url("qss/gray_128/imgs/flipmarker.png"); + qproperty-PBOverlay: url("imgs/flipslider.png"); + qproperty-PBMarker: url("imgs/flipmarker.png"); qproperty-PBColorMarginLeft: 1; qproperty-PBColorMarginTop: 1; qproperty-PBColorMarginRight: 1; @@ -457,29 +457,29 @@ Ruler { margin: 0px; } #DirTreeView::branch:adjoins-item { - border-image: url("qss/gray_128/imgs/tree_branch-end.png") 0; + border-image: url("imgs/tree_branch-end.png") 0; } #DirTreeView::branch:has-siblings { - border-image: url("qss/gray_128/imgs/tree_vline.png") 0; + border-image: url("imgs/tree_vline.png") 0; } #DirTreeView::branch:has-siblings:adjoins-item { - border-image: url("qss/gray_128/imgs/tree_branch-more.png") 0; + border-image: url("imgs/tree_branch-more.png") 0; } #DirTreeView::branch:has-children:closed { border-image: none; - image: url("qss/gray_128/imgs/tree_branch-closed_nosib.png"); + image: url("imgs/tree_branch-closed_nosib.png"); } #DirTreeView::branch:has-children:open { border-image: none; - image: url("qss/gray_128/imgs/tree_branch-open_nosib.png"); + image: url("imgs/tree_branch-open_nosib.png"); } #DirTreeView::branch:has-children:has-siblings:closed { border-image: none; - image: url("qss/gray_128/imgs/tree_branch-closed.png"); + image: url("imgs/tree_branch-closed.png"); } #DirTreeView::branch:has-children:has-siblings:open { border-image: none; - image: url("qss/gray_128/imgs/tree_branch-open.png"); + image: url("imgs/tree_branch-open.png"); } DvItemViewerPanel { qproperty-TextColor: black; @@ -523,14 +523,14 @@ DvDirTreeView { border-width: 2px; padding: 0px; margin: 0px; - border-image: url("qss/gray_128/imgs/handle_border.png") 5; - image: url("qss/gray_128/imgs/plus.png"); + border-image: url("imgs/handle_border.png") 5; + image: url("imgs/plus.png"); image-position: center center; } #CleanupSettingsShowButton:checked, #LoadLevelShowButton:checked, #FxSettingsPreviewShowButton:checked { - image: url("qss/gray_128/imgs/minus.png"); + image: url("imgs/minus.png"); } ParamsPage { qproperty-TextColor: black; @@ -592,52 +592,52 @@ ParamsPage { image-position: center center; } #XsheetScrollBar::handle:vertical { - border-image: url("qss/gray_128/imgs/sb_g_vhandle.png") 4; - image: url("qss/gray_128/imgs/sb_g_vline.png"); + border-image: url("imgs/sb_g_vhandle.png") 4; + image: url("imgs/sb_g_vline.png"); min-height: 40px; } #XsheetScrollBar::handle:horizontal { - border-image: url("qss/gray_128/imgs/sb_g_hhandle.png") 4; - image: url("qss/gray_128/imgs/sb_g_hline.png"); + border-image: url("imgs/sb_g_hhandle.png") 4; + image: url("imgs/sb_g_hline.png"); min-width: 40px; } #XsheetScrollBar::add-line { subcontrol-origin: margin; } #XsheetScrollBar::add-line:vertical { - image: url("qss/gray_128/imgs/sb_g_downarrow.png"); + image: url("imgs/sb_g_downarrow.png"); height: 20px; subcontrol-position: bottom; } #XsheetScrollBar::add-line:vertical:pressed { - image: url("qss/gray_128/imgs/sb_g_downarrow_pressed.png"); + image: url("imgs/sb_g_downarrow_pressed.png"); } #XsheetScrollBar::add-line:horizontal { - image: url("qss/gray_128/imgs/sb_g_rarrow.png"); + image: url("imgs/sb_g_rarrow.png"); width: 20px; subcontrol-position: right; } #XsheetScrollBar::add-line:horizontal:pressed { - image: url("qss/gray_128/imgs/sb_g_rarrow_pressed.png"); + image: url("imgs/sb_g_rarrow_pressed.png"); } #XsheetScrollBar::sub-line { subcontrol-origin: margin; } #XsheetScrollBar::sub-line:vertical { - image: url("qss/gray_128/imgs/sb_g_uparrow.png"); + image: url("imgs/sb_g_uparrow.png"); height: 20px; subcontrol-position: top; } #XsheetScrollBar::sub-line:vertical:pressed { - image: url("qss/gray_128/imgs/sb_g_uparrow_pressed.png"); + image: url("imgs/sb_g_uparrow_pressed.png"); } #XsheetScrollBar::sub-line:horizontal { - image: url("qss/gray_128/imgs/sb_g_larrow.png"); + image: url("imgs/sb_g_larrow.png"); width: 20px; subcontrol-position: left; } #XsheetScrollBar::sub-line:horizontal:pressed { - image: url("qss/gray_128/imgs/sb_g_larrow_pressed.png"); + image: url("imgs/sb_g_larrow_pressed.png"); } #XsheetScrollBar::add-page { background: none; @@ -704,35 +704,35 @@ XsheetViewer { } #FunctionEditorTree::branch:adjoins-item, #ShortcutTree::branch:adjoins-item { - border-image: url("qss/gray_128/imgs/tree17_branch-end.png") 0; + border-image: url("imgs/tree17_branch-end.png") 0; } #FunctionEditorTree::branch:has-siblings, #ShortcutTree::branch:has-siblings { - border-image: url("qss/gray_128/imgs/tree17_vline.png") 0; + border-image: url("imgs/tree17_vline.png") 0; } #FunctionEditorTree::branch:has-siblings:adjoins-item, #ShortcutTree::branch:has-siblings:adjoins-item { - border-image: url("qss/gray_128/imgs/tree17_branch-more.png") 0; + border-image: url("imgs/tree17_branch-more.png") 0; } #FunctionEditorTree::branch:has-children:closed, #ShortcutTree::branch:has-children:closed { border-image: none; - image: url("qss/gray_128/imgs/tree17_branch-closed_nosib.png"); + image: url("imgs/tree17_branch-closed_nosib.png"); } #FunctionEditorTree::branch:has-children:open, #ShortcutTree::branch:has-children:open { border-image: none; - image: url("qss/gray_128/imgs/tree17_branch-open_nosib.png"); + image: url("imgs/tree17_branch-open_nosib.png"); } #FunctionEditorTree::branch:has-children:has-siblings:closed, #ShortcutTree::branch:has-children:has-siblings:closed { border-image: none; - image: url("qss/gray_128/imgs/tree17_branch-closed.png"); + image: url("imgs/tree17_branch-closed.png"); } #FunctionEditorTree::branch:has-children:has-siblings:open, #ShortcutTree::branch:has-children:has-siblings:open { border-image: none; - image: url("qss/gray_128/imgs/tree17_branch-open.png"); + image: url("imgs/tree17_branch-open.png"); } FunctionPanel { qproperty-BGColor: #e1e1e1; @@ -784,7 +784,7 @@ SpreadsheetViewer { #FunctionSegmentViewerLinkButton { border: 2px; margin: 0px; - image: url("qss/gray_128/imgs/segment_unlinked.png"); + image: url("imgs/segment_unlinked.png"); background-color: #b3b3b3; border-style: outset; border-left-color: #ffffff; @@ -793,7 +793,7 @@ SpreadsheetViewer { border-bottom-color: #737373; } #FunctionSegmentViewerLinkButton:checked { - image: url("qss/gray_128/imgs/segment_linked.png"); + image: url("imgs/segment_linked.png"); background-color: #b3b3b3; border-style: inset; border-left-color: #737373; @@ -802,7 +802,7 @@ SpreadsheetViewer { border-bottom-color: #ffffff; } #FunctionSegmentViewerLinkButton:disabled { - image: url("qss/gray_128/imgs/segment_disabled.png"); + image: url("imgs/segment_disabled.png"); background-color: #9a9a9a; border-style: outset; border-left-color: #ffffff; @@ -844,13 +844,13 @@ SpreadsheetViewer { height: 21px; } #CameraSettingsRadioButton::indicator:checked { - image: url("qss/gray_128/imgs/cam_lock.png"); + image: url("imgs/cam_lock.png"); } #CameraSettingsRadioButton::indicator:unchecked { - image: url("qss/gray_128/imgs/cam_unlock.png"); + image: url("imgs/cam_unlock.png"); } #CameraSettingsRadioButton::indicator:unchecked:hover { - image: url("qss/gray_128/imgs/cam_lock_hover.png"); + image: url("imgs/cam_lock_hover.png"); } #CameraSettingsDPI { color: #004000; @@ -863,25 +863,25 @@ SpreadsheetViewer { height: 21px; } #CameraSettingsRadioButton_Small::indicator:checked { - image: url("qss/gray_128/imgs/cam_lock_small.png"); + image: url("imgs/cam_lock_small.png"); } #CameraSettingsRadioButton_Small::indicator:unchecked { - image: url("qss/gray_128/imgs/cam_unlock_small.png"); + image: url("imgs/cam_unlock_small.png"); } #CameraSettingsRadioButton_Small::indicator:unchecked:hover { - image: url("qss/gray_128/imgs/cam_lock_hover_small.png"); + image: url("imgs/cam_lock_hover_small.png"); } #ForceSquaredPixelButton { border: none; border-radius: 0px; padding: 0px; - image: url("qss/gray_128/imgs/fsp_released.png"); + image: url("imgs/fsp_released.png"); } #ForceSquaredPixelButton:hover { - image: url("qss/gray_128/imgs/fsp_hover.png"); + image: url("imgs/fsp_hover.png"); } #ForceSquaredPixelButton:checked { - image: url("qss/gray_128/imgs/fsp_pressed.png"); + image: url("imgs/fsp_pressed.png"); } /*------ Tool Options Bar------*/ #EditToolLockButton { @@ -894,16 +894,16 @@ SpreadsheetViewer { height: 21px; } #EditToolLockButton::indicator:unchecked { - image: url("qss/gray_128/imgs/cam_unlock.png"); + image: url("imgs/cam_unlock.png"); } #EditToolLockButton::indicator:unchecked:hover { - image: url("qss/gray_128/imgs/cam_unlock_hover.png"); + image: url("imgs/cam_unlock_hover.png"); } #EditToolLockButton::indicator:checked { - image: url("qss/gray_128/imgs/cam_lock.png"); + image: url("imgs/cam_lock.png"); } #EditToolLockButton::indicator:checked:hover { - image: url("qss/gray_128/imgs/cam_lock_hover.png"); + image: url("imgs/cam_lock_hover.png"); } /*------ Topbar and Menubar of the MainWindow ------*/ #TopBar { @@ -920,7 +920,7 @@ SpreadsheetViewer { padding: 0px; } #TopBarTab { - border-image: url("qss/gray_128/imgs/topbar_bg.png") 0 0 0 0 stretch stretch; + border-image: url("imgs/topbar_bg.png") 0 0 0 0 stretch stretch; /*background: qlineargradient(x1: 0,y1: 0, x2: 1, y2: 0, stop: 0 #a0a0a0, stop: 0.5 #404040);*/ border: 0px; padding: 0px; @@ -1004,21 +1004,21 @@ QDialog #dialogButtonFrame { #OutputSettingsShowButton { border: 2px; padding: 0px; - border-image: url("qss/gray_128/imgs/handle_border.png") 5; - image: url("qss/gray_128/imgs/plus.png"); + border-image: url("imgs/handle_border.png") 5; + image: url("imgs/plus.png"); image-position: center center; } #OutputSettingsShowButton:checked { - image: url("qss/gray_128/imgs/minus.png"); + image: url("imgs/minus.png"); } #IntPairField, #DoublePairField { qproperty-LightLineColor: white; qproperty-DarkLineColor: #808080; - qproperty-HandleLeftPixmap: url("qss/gray_128/imgs/h_slider_left.png"); - qproperty-HandleRightPixmap: url("qss/gray_128/imgs/h_slider_right.png"); - qproperty-HandleLeftGrayPixmap: url("qss/gray_128/imgs/h_slider_left_disabled.png"); - qproperty-HandleRightGrayPixmap: url("qss/gray_128/imgs/h_slider_right_disabled.png"); + qproperty-HandleLeftPixmap: url("imgs/h_slider_left.png"); + qproperty-HandleRightPixmap: url("imgs/h_slider_right.png"); + qproperty-HandleLeftGrayPixmap: url("imgs/h_slider_left_disabled.png"); + qproperty-HandleRightGrayPixmap: url("imgs/h_slider_right_disabled.png"); } #FxSettingsLabel { color: #004000; diff --git a/stuff/config/qss/gray_128/gray_128_mac.qss b/stuff/config/qss/gray_128/gray_128_mac.qss index ba70e14..d383a66 100644 --- a/stuff/config/qss/gray_128/gray_128_mac.qss +++ b/stuff/config/qss/gray_128/gray_128_mac.qss @@ -80,10 +80,10 @@ QToolBar::separator:horizontal { margin_top: 1px; margin_left: 2px; margin_right: 2px; - image: url("qss/gray_128/imgs/bottomseparator.png"); + image: url("imgs/bottomseparator.png"); } QToolBar::separator:vertical { - image: url("qss/gray_128/imgs/separator.png"); + image: url("imgs/separator.png"); } QToolBar QToolButton { background-color: #808080; @@ -94,11 +94,11 @@ QToolBar QToolButton { border-image: none; } QToolBar QToolButton:hover { - border-image: url("qss/gray_128/imgs/over.png") 2; + border-image: url("imgs/over.png") 2; } QToolBar QToolButton:checked, QToolBar QToolButton:pressed { - border-image: url("qss/gray_128/imgs/click.png") 2; + border-image: url("imgs/click.png") 2; } QToolBar QToolButton:disabled { border-image: none; @@ -210,13 +210,13 @@ PaletteViewer #ToolBarContainer #keyFrameNavigator { /* if there is only one tab, we don't want overlapping margins */ } #PaletteLockButton:hover { - border-image: url("qss/gray_128/imgs/over_yellow.png") 2; + border-image: url("imgs/over_yellow.png") 2; } #PaletteLockButton:checked { - border-image: url("qss/gray_128/imgs/click_pink.png") 2; + border-image: url("imgs/click_pink.png") 2; } #PaletteLockButton:checked:hover { - border-image: url("qss/gray_128/imgs/over_pressed_yellow.png") 2; + border-image: url("imgs/over_pressed_yellow.png") 2; } #PageViewer { qproperty-TextColor: black; @@ -286,23 +286,23 @@ PaletteViewer #ToolBarContainer #keyFrameNavigator { } #colorSliderAddButton, #colorSliderSubButton { - border-image: url("qss/gray_128/imgs/colorslider_button_bg.png") 2; + border-image: url("imgs/colorslider_button_bg.png") 2; padding: 0px; margin: 0px; border: 2px; image-position: center center; } #colorSliderAddButton { - image: url("qss/gray_128/imgs/colorslider_add.png"); + image: url("imgs/colorslider_add.png"); } #colorSliderAddButton:pressed { - image: url("qss/gray_128/imgs/colorslider_add_pressed.png"); + image: url("imgs/colorslider_add_pressed.png"); } #colorSliderSubButton { - image: url("qss/gray_128/imgs/colorslider_sub.png"); + image: url("imgs/colorslider_sub.png"); } #colorSliderSubButton:pressed { - image: url("qss/gray_128/imgs/colorslider_sub_pressed.png"); + image: url("imgs/colorslider_sub_pressed.png"); } #PlainColorPageParts { border-width: 0px; @@ -336,19 +336,19 @@ DvScrollWidget > QPushButton:pressed { max-width: 15px; } #ScrollLeftButton { - image: url("qss/gray_128/imgs/left_arrow_black.png"); + image: url("imgs/left_arrow_black.png"); border-right: 1px solid black; } #ScrollRightButton { - image: url("qss/gray_128/imgs/right_arrow_black.png"); + image: url("imgs/right_arrow_black.png"); border-left: 1px solid black; } #ScrollUpButton { - image: url("qss/gray_128/imgs/up_arrow_black.png"); + image: url("imgs/up_arrow_black.png"); border-bottom: 1px solid black; } #ScrollDownButton { - image: url("qss/gray_128/imgs/down_arrow_black.png"); + image: url("imgs/down_arrow_black.png"); border-top: 1px solid black; } /* ------ Viewer, Flipbook ------ */ @@ -382,30 +382,30 @@ FlipBook #ToolBarContainer { height: 21px; } #ViewerFpsSlider::handle { - border-image: url("qss/gray_128/imgs/handle_border.png") 6; + border-image: url("imgs/handle_border.png") 6; border-width: 6px; image: none; min-width: 5px; } #ViewerFpsSlider::add-line { - image: url("qss/gray_128/imgs/fpssb_g_rarrow.png"); + image: url("imgs/fpssb_g_rarrow.png"); width: 20px; subcontrol-position: right; subcontrol-origin: margin; margin: 0px; } #ViewerFpsSlider::add-line:pressed { - image: url("qss/gray_128/imgs/fpssb_g_rarrow_pressed.png"); + image: url("imgs/fpssb_g_rarrow_pressed.png"); } #ViewerFpsSlider::sub-line { - image: url("qss/gray_128/imgs/fpssb_g_larrow.png"); + image: url("imgs/fpssb_g_larrow.png"); width: 20px; subcontrol-position: left; subcontrol-origin: margin; margin: 0px; } #ViewerFpsSlider::sub-line:pressed { - image: url("qss/gray_128/imgs/fpssb_g_larrow_pressed.png"); + image: url("imgs/fpssb_g_larrow_pressed.png"); } #FlipConsolePlayToolBar { border: none; @@ -415,8 +415,8 @@ FlipBook #ToolBarContainer { } FlipSlider { qproperty-PBHeight: 20; - qproperty-PBOverlay: url("qss/gray_128/imgs/flipslider.png"); - qproperty-PBMarker: url("qss/gray_128/imgs/flipmarker.png"); + qproperty-PBOverlay: url("imgs/flipslider.png"); + qproperty-PBMarker: url("imgs/flipmarker.png"); qproperty-PBColorMarginLeft: 1; qproperty-PBColorMarginTop: 1; qproperty-PBColorMarginRight: 1; @@ -457,29 +457,29 @@ Ruler { margin: 0px; } #DirTreeView::branch:adjoins-item { - border-image: url("qss/gray_128/imgs/tree_branch-end.png") 0; + border-image: url("imgs/tree_branch-end.png") 0; } #DirTreeView::branch:has-siblings { - border-image: url("qss/gray_128/imgs/tree_vline.png") 0; + border-image: url("imgs/tree_vline.png") 0; } #DirTreeView::branch:has-siblings:adjoins-item { - border-image: url("qss/gray_128/imgs/tree_branch-more.png") 0; + border-image: url("imgs/tree_branch-more.png") 0; } #DirTreeView::branch:has-children:closed { border-image: none; - image: url("qss/gray_128/imgs/tree_branch-closed_nosib.png"); + image: url("imgs/tree_branch-closed_nosib.png"); } #DirTreeView::branch:has-children:open { border-image: none; - image: url("qss/gray_128/imgs/tree_branch-open_nosib.png"); + image: url("imgs/tree_branch-open_nosib.png"); } #DirTreeView::branch:has-children:has-siblings:closed { border-image: none; - image: url("qss/gray_128/imgs/tree_branch-closed.png"); + image: url("imgs/tree_branch-closed.png"); } #DirTreeView::branch:has-children:has-siblings:open { border-image: none; - image: url("qss/gray_128/imgs/tree_branch-open.png"); + image: url("imgs/tree_branch-open.png"); } DvItemViewerPanel { qproperty-TextColor: black; @@ -523,14 +523,14 @@ DvDirTreeView { border-width: 2px; padding: 0px; margin: 0px; - border-image: url("qss/gray_128/imgs/handle_border.png") 5; - image: url("qss/gray_128/imgs/plus.png"); + border-image: url("imgs/handle_border.png") 5; + image: url("imgs/plus.png"); image-position: center center; } #CleanupSettingsShowButton:checked, #LoadLevelShowButton:checked, #FxSettingsPreviewShowButton:checked { - image: url("qss/gray_128/imgs/minus.png"); + image: url("imgs/minus.png"); } ParamsPage { qproperty-TextColor: black; @@ -592,52 +592,52 @@ ParamsPage { image-position: center center; } #XsheetScrollBar::handle:vertical { - border-image: url("qss/gray_128/imgs/sb_g_vhandle.png") 4; - image: url("qss/gray_128/imgs/sb_g_vline.png"); + border-image: url("imgs/sb_g_vhandle.png") 4; + image: url("imgs/sb_g_vline.png"); min-height: 40px; } #XsheetScrollBar::handle:horizontal { - border-image: url("qss/gray_128/imgs/sb_g_hhandle.png") 4; - image: url("qss/gray_128/imgs/sb_g_hline.png"); + border-image: url("imgs/sb_g_hhandle.png") 4; + image: url("imgs/sb_g_hline.png"); min-width: 40px; } #XsheetScrollBar::add-line { subcontrol-origin: margin; } #XsheetScrollBar::add-line:vertical { - image: url("qss/gray_128/imgs/sb_g_downarrow.png"); + image: url("imgs/sb_g_downarrow.png"); height: 20px; subcontrol-position: bottom; } #XsheetScrollBar::add-line:vertical:pressed { - image: url("qss/gray_128/imgs/sb_g_downarrow_pressed.png"); + image: url("imgs/sb_g_downarrow_pressed.png"); } #XsheetScrollBar::add-line:horizontal { - image: url("qss/gray_128/imgs/sb_g_rarrow.png"); + image: url("imgs/sb_g_rarrow.png"); width: 20px; subcontrol-position: right; } #XsheetScrollBar::add-line:horizontal:pressed { - image: url("qss/gray_128/imgs/sb_g_rarrow_pressed.png"); + image: url("imgs/sb_g_rarrow_pressed.png"); } #XsheetScrollBar::sub-line { subcontrol-origin: margin; } #XsheetScrollBar::sub-line:vertical { - image: url("qss/gray_128/imgs/sb_g_uparrow.png"); + image: url("imgs/sb_g_uparrow.png"); height: 20px; subcontrol-position: top; } #XsheetScrollBar::sub-line:vertical:pressed { - image: url("qss/gray_128/imgs/sb_g_uparrow_pressed.png"); + image: url("imgs/sb_g_uparrow_pressed.png"); } #XsheetScrollBar::sub-line:horizontal { - image: url("qss/gray_128/imgs/sb_g_larrow.png"); + image: url("imgs/sb_g_larrow.png"); width: 20px; subcontrol-position: left; } #XsheetScrollBar::sub-line:horizontal:pressed { - image: url("qss/gray_128/imgs/sb_g_larrow_pressed.png"); + image: url("imgs/sb_g_larrow_pressed.png"); } #XsheetScrollBar::add-page { background: none; @@ -704,35 +704,35 @@ XsheetViewer { } #FunctionEditorTree::branch:adjoins-item, #ShortcutTree::branch:adjoins-item { - border-image: url("qss/gray_128/imgs/tree17_branch-end.png") 0; + border-image: url("imgs/tree17_branch-end.png") 0; } #FunctionEditorTree::branch:has-siblings, #ShortcutTree::branch:has-siblings { - border-image: url("qss/gray_128/imgs/tree17_vline.png") 0; + border-image: url("imgs/tree17_vline.png") 0; } #FunctionEditorTree::branch:has-siblings:adjoins-item, #ShortcutTree::branch:has-siblings:adjoins-item { - border-image: url("qss/gray_128/imgs/tree17_branch-more.png") 0; + border-image: url("imgs/tree17_branch-more.png") 0; } #FunctionEditorTree::branch:has-children:closed, #ShortcutTree::branch:has-children:closed { border-image: none; - image: url("qss/gray_128/imgs/tree17_branch-closed_nosib.png"); + image: url("imgs/tree17_branch-closed_nosib.png"); } #FunctionEditorTree::branch:has-children:open, #ShortcutTree::branch:has-children:open { border-image: none; - image: url("qss/gray_128/imgs/tree17_branch-open_nosib.png"); + image: url("imgs/tree17_branch-open_nosib.png"); } #FunctionEditorTree::branch:has-children:has-siblings:closed, #ShortcutTree::branch:has-children:has-siblings:closed { border-image: none; - image: url("qss/gray_128/imgs/tree17_branch-closed.png"); + image: url("imgs/tree17_branch-closed.png"); } #FunctionEditorTree::branch:has-children:has-siblings:open, #ShortcutTree::branch:has-children:has-siblings:open { border-image: none; - image: url("qss/gray_128/imgs/tree17_branch-open.png"); + image: url("imgs/tree17_branch-open.png"); } FunctionPanel { qproperty-BGColor: #e1e1e1; @@ -784,7 +784,7 @@ SpreadsheetViewer { #FunctionSegmentViewerLinkButton { border: 2px; margin: 0px; - image: url("qss/gray_128/imgs/segment_unlinked.png"); + image: url("imgs/segment_unlinked.png"); background-color: #b3b3b3; border-style: outset; border-left-color: #ffffff; @@ -793,7 +793,7 @@ SpreadsheetViewer { border-bottom-color: #737373; } #FunctionSegmentViewerLinkButton:checked { - image: url("qss/gray_128/imgs/segment_linked.png"); + image: url("imgs/segment_linked.png"); background-color: #b3b3b3; border-style: inset; border-left-color: #737373; @@ -802,7 +802,7 @@ SpreadsheetViewer { border-bottom-color: #ffffff; } #FunctionSegmentViewerLinkButton:disabled { - image: url("qss/gray_128/imgs/segment_disabled.png"); + image: url("imgs/segment_disabled.png"); background-color: #9a9a9a; border-style: outset; border-left-color: #ffffff; @@ -844,13 +844,13 @@ SpreadsheetViewer { height: 21px; } #CameraSettingsRadioButton::indicator:checked { - image: url("qss/gray_128/imgs/cam_lock.png"); + image: url("imgs/cam_lock.png"); } #CameraSettingsRadioButton::indicator:unchecked { - image: url("qss/gray_128/imgs/cam_unlock.png"); + image: url("imgs/cam_unlock.png"); } #CameraSettingsRadioButton::indicator:unchecked:hover { - image: url("qss/gray_128/imgs/cam_lock_hover.png"); + image: url("imgs/cam_lock_hover.png"); } #CameraSettingsDPI { color: #004000; @@ -863,25 +863,25 @@ SpreadsheetViewer { height: 21px; } #CameraSettingsRadioButton_Small::indicator:checked { - image: url("qss/gray_128/imgs/cam_lock_small.png"); + image: url("imgs/cam_lock_small.png"); } #CameraSettingsRadioButton_Small::indicator:unchecked { - image: url("qss/gray_128/imgs/cam_unlock_small.png"); + image: url("imgs/cam_unlock_small.png"); } #CameraSettingsRadioButton_Small::indicator:unchecked:hover { - image: url("qss/gray_128/imgs/cam_lock_hover_small.png"); + image: url("imgs/cam_lock_hover_small.png"); } #ForceSquaredPixelButton { border: none; border-radius: 0px; padding: 0px; - image: url("qss/gray_128/imgs/fsp_released.png"); + image: url("imgs/fsp_released.png"); } #ForceSquaredPixelButton:hover { - image: url("qss/gray_128/imgs/fsp_hover.png"); + image: url("imgs/fsp_hover.png"); } #ForceSquaredPixelButton:checked { - image: url("qss/gray_128/imgs/fsp_pressed.png"); + image: url("imgs/fsp_pressed.png"); } /*------ Tool Options Bar------*/ #EditToolLockButton { @@ -894,16 +894,16 @@ SpreadsheetViewer { height: 21px; } #EditToolLockButton::indicator:unchecked { - image: url("qss/gray_128/imgs/cam_unlock.png"); + image: url("imgs/cam_unlock.png"); } #EditToolLockButton::indicator:unchecked:hover { - image: url("qss/gray_128/imgs/cam_unlock_hover.png"); + image: url("imgs/cam_unlock_hover.png"); } #EditToolLockButton::indicator:checked { - image: url("qss/gray_128/imgs/cam_lock.png"); + image: url("imgs/cam_lock.png"); } #EditToolLockButton::indicator:checked:hover { - image: url("qss/gray_128/imgs/cam_lock_hover.png"); + image: url("imgs/cam_lock_hover.png"); } /*------ Topbar and Menubar of the MainWindow ------*/ #TopBar { @@ -920,7 +920,7 @@ SpreadsheetViewer { padding: 0px; } #TopBarTab { - border-image: url("qss/gray_128/imgs/topbar_bg.png") 0 0 0 0 stretch stretch; + border-image: url("imgs/topbar_bg.png") 0 0 0 0 stretch stretch; /*background: qlineargradient(x1: 0,y1: 0, x2: 1, y2: 0, stop: 0 #a0a0a0, stop: 0.5 #404040);*/ border: 0px; padding: 0px; @@ -1004,21 +1004,21 @@ QDialog #dialogButtonFrame { #OutputSettingsShowButton { border: 2px; padding: 0px; - border-image: url("qss/gray_128/imgs/handle_border.png") 5; - image: url("qss/gray_128/imgs/plus.png"); + border-image: url("imgs/handle_border.png") 5; + image: url("imgs/plus.png"); image-position: center center; } #OutputSettingsShowButton:checked { - image: url("qss/gray_128/imgs/minus.png"); + image: url("imgs/minus.png"); } #IntPairField, #DoublePairField { qproperty-LightLineColor: white; qproperty-DarkLineColor: #808080; - qproperty-HandleLeftPixmap: url("qss/gray_128/imgs/h_slider_left.png"); - qproperty-HandleRightPixmap: url("qss/gray_128/imgs/h_slider_right.png"); - qproperty-HandleLeftGrayPixmap: url("qss/gray_128/imgs/h_slider_left_disabled.png"); - qproperty-HandleRightGrayPixmap: url("qss/gray_128/imgs/h_slider_right_disabled.png"); + qproperty-HandleLeftPixmap: url("imgs/h_slider_left.png"); + qproperty-HandleRightPixmap: url("imgs/h_slider_right.png"); + qproperty-HandleLeftGrayPixmap: url("imgs/h_slider_left_disabled.png"); + qproperty-HandleRightGrayPixmap: url("imgs/h_slider_right_disabled.png"); } #FxSettingsLabel { color: #004000; diff --git a/stuff/config/qss/production/Thumbs.db b/stuff/config/qss/production/Thumbs.db deleted file mode 100644 index ef05441..0000000 Binary files a/stuff/config/qss/production/Thumbs.db and /dev/null differ diff --git a/stuff/config/qss/production/bottomseparator.png b/stuff/config/qss/production/bottomseparator.png deleted file mode 100644 index 2461174..0000000 Binary files a/stuff/config/qss/production/bottomseparator.png and /dev/null differ diff --git a/stuff/config/qss/production/but.png b/stuff/config/qss/production/but.png deleted file mode 100644 index ad31be9..0000000 Binary files a/stuff/config/qss/production/but.png and /dev/null differ diff --git a/stuff/config/qss/production/butdis.png b/stuff/config/qss/production/butdis.png deleted file mode 100644 index 9f3ed2c..0000000 Binary files a/stuff/config/qss/production/butdis.png and /dev/null differ diff --git a/stuff/config/qss/production/buthover.png b/stuff/config/qss/production/buthover.png deleted file mode 100644 index 9f3ed2c..0000000 Binary files a/stuff/config/qss/production/buthover.png and /dev/null differ diff --git a/stuff/config/qss/production/chk_chk.png b/stuff/config/qss/production/chk_chk.png deleted file mode 100644 index b7723b7..0000000 Binary files a/stuff/config/qss/production/chk_chk.png and /dev/null differ diff --git a/stuff/config/qss/production/chk_unchk.png b/stuff/config/qss/production/chk_unchk.png deleted file mode 100644 index 46f9a4d..0000000 Binary files a/stuff/config/qss/production/chk_unchk.png and /dev/null differ diff --git a/stuff/config/qss/production/click.png b/stuff/config/qss/production/click.png deleted file mode 100644 index c8a1fe9..0000000 Binary files a/stuff/config/qss/production/click.png and /dev/null differ diff --git a/stuff/config/qss/production/current.png b/stuff/config/qss/production/current.png deleted file mode 100644 index 7559bd5..0000000 Binary files a/stuff/config/qss/production/current.png and /dev/null differ diff --git a/stuff/config/qss/production/down_arrow.png b/stuff/config/qss/production/down_arrow.png deleted file mode 100644 index 31da5d7..0000000 Binary files a/stuff/config/qss/production/down_arrow.png and /dev/null differ diff --git a/stuff/config/qss/production/down_arrow_black.png b/stuff/config/qss/production/down_arrow_black.png deleted file mode 100644 index d9fbc98..0000000 Binary files a/stuff/config/qss/production/down_arrow_black.png and /dev/null differ diff --git a/stuff/config/qss/production/down_arrow_disabled.png b/stuff/config/qss/production/down_arrow_disabled.png deleted file mode 100644 index 98c55c3..0000000 Binary files a/stuff/config/qss/production/down_arrow_disabled.png and /dev/null differ diff --git a/stuff/config/qss/production/flipmarker.png b/stuff/config/qss/production/flipmarker.png deleted file mode 100644 index 7e0c0de..0000000 Binary files a/stuff/config/qss/production/flipmarker.png and /dev/null differ diff --git a/stuff/config/qss/production/flipslider.png b/stuff/config/qss/production/flipslider.png deleted file mode 100644 index cfa191e..0000000 Binary files a/stuff/config/qss/production/flipslider.png and /dev/null differ diff --git a/stuff/config/qss/production/frame.png b/stuff/config/qss/production/frame.png deleted file mode 100644 index a3da918..0000000 Binary files a/stuff/config/qss/production/frame.png and /dev/null differ diff --git a/stuff/config/qss/production/framedisable.png b/stuff/config/qss/production/framedisable.png deleted file mode 100644 index 1b897bc..0000000 Binary files a/stuff/config/qss/production/framedisable.png and /dev/null differ diff --git a/stuff/config/qss/production/framehover.png b/stuff/config/qss/production/framehover.png deleted file mode 100644 index 1c14fec..0000000 Binary files a/stuff/config/qss/production/framehover.png and /dev/null differ diff --git a/stuff/config/qss/production/ftab.png b/stuff/config/qss/production/ftab.png deleted file mode 100644 index 155d4a8..0000000 Binary files a/stuff/config/qss/production/ftab.png and /dev/null differ diff --git a/stuff/config/qss/production/ftbtab.png b/stuff/config/qss/production/ftbtab.png deleted file mode 100644 index 834b0f7..0000000 Binary files a/stuff/config/qss/production/ftbtab.png and /dev/null differ diff --git a/stuff/config/qss/production/fuptab.png b/stuff/config/qss/production/fuptab.png deleted file mode 100644 index aefec60..0000000 Binary files a/stuff/config/qss/production/fuptab.png and /dev/null differ diff --git a/stuff/config/qss/production/fuptbtab.png b/stuff/config/qss/production/fuptbtab.png deleted file mode 100644 index 0e3b303..0000000 Binary files a/stuff/config/qss/production/fuptbtab.png and /dev/null differ diff --git a/stuff/config/qss/production/h_chandle.png b/stuff/config/qss/production/h_chandle.png deleted file mode 100644 index 59cbcb2..0000000 Binary files a/stuff/config/qss/production/h_chandle.png and /dev/null differ diff --git a/stuff/config/qss/production/h_handle.png b/stuff/config/qss/production/h_handle.png deleted file mode 100644 index 995138c..0000000 Binary files a/stuff/config/qss/production/h_handle.png and /dev/null differ diff --git a/stuff/config/qss/production/h_slider_left.png b/stuff/config/qss/production/h_slider_left.png deleted file mode 100644 index a7bc1ce..0000000 Binary files a/stuff/config/qss/production/h_slider_left.png and /dev/null differ diff --git a/stuff/config/qss/production/h_slider_right.png b/stuff/config/qss/production/h_slider_right.png deleted file mode 100644 index a05ba8f..0000000 Binary files a/stuff/config/qss/production/h_slider_right.png and /dev/null differ diff --git a/stuff/config/qss/production/hsplitter_handle.png b/stuff/config/qss/production/hsplitter_handle.png deleted file mode 100644 index ad93550..0000000 Binary files a/stuff/config/qss/production/hsplitter_handle.png and /dev/null differ diff --git a/stuff/config/qss/production/left_arrow_black.png b/stuff/config/qss/production/left_arrow_black.png deleted file mode 100644 index b89cdcc..0000000 Binary files a/stuff/config/qss/production/left_arrow_black.png and /dev/null differ diff --git a/stuff/config/qss/production/ltab.png b/stuff/config/qss/production/ltab.png deleted file mode 100644 index 7fe6408..0000000 Binary files a/stuff/config/qss/production/ltab.png and /dev/null differ diff --git a/stuff/config/qss/production/ltbtab.png b/stuff/config/qss/production/ltbtab.png deleted file mode 100644 index 834b0f7..0000000 Binary files a/stuff/config/qss/production/ltbtab.png and /dev/null differ diff --git a/stuff/config/qss/production/menuseparator.PNG b/stuff/config/qss/production/menuseparator.PNG deleted file mode 100644 index 0a44fae..0000000 Binary files a/stuff/config/qss/production/menuseparator.PNG and /dev/null differ diff --git a/stuff/config/qss/production/oouptab.png b/stuff/config/qss/production/oouptab.png deleted file mode 100644 index 6faf3fb..0000000 Binary files a/stuff/config/qss/production/oouptab.png and /dev/null differ diff --git a/stuff/config/qss/production/out_sb_h.png b/stuff/config/qss/production/out_sb_h.png deleted file mode 100644 index 8ea48c5..0000000 Binary files a/stuff/config/qss/production/out_sb_h.png and /dev/null differ diff --git a/stuff/config/qss/production/over.png b/stuff/config/qss/production/over.png deleted file mode 100644 index 7525799..0000000 Binary files a/stuff/config/qss/production/over.png and /dev/null differ diff --git a/stuff/config/qss/production/production.qss b/stuff/config/qss/production/production.qss deleted file mode 100644 index e8b8e45..0000000 --- a/stuff/config/qss/production/production.qss +++ /dev/null @@ -1,963 +0,0 @@ -/* TOONZ 6.2 (SP1) Qt Style Test - Digital Video 2011 -*/ - -/*---------------------------------------------------------------------------*/ -QMainWindow #MainStackedWidget { - border: 6px solid rgb(60,60,60); - background-color: rgb(60,60,60); -} -/*---------------------------------------------------------------------------*/ -TPanel { - qproperty-BGColor: rgb(140,140,140); - background-color: rgb(140,140,140); -} -/*---------------------------------------------------------------------------*/ -.QWidget { -} -/*---------------------------------------------------------------------------*/ -/* QMenuBar */ -QMenuBar { - background-image: url(qss/production/topfade.png) 10; - background-color: rgb(180,180,180); -} -/*---------------------------------------------------------------------------*/ -/*Menu*/ -#fxMenu::item:checked, #fxMenu::item:unchecked { - padding: 2px 25px 2px 20px; - border: 1px solid transparent; - background-color: rgb(140,140,140); - color: black; - font-weight: bold; -} -#fxMenu::indicator:unchecked { - image: url(); -} -#fxMenu::indicator:checked { - image: url(); -} -#fxMenu::item:selected { - background-color: rgb(49,106,197); - color: white; - border-color: darkblue; -} -#fxMenu::item:disabled { - color: grey; - background-color: rgb(140,140,140); -} -QMenu { - margin: 0px; - background-color: rgb(140,140,140); - border: 4px solid black; -} -QMenu::item { - padding: 2px 25px 2px 20px; - border: 1px solid transparent; - color: black; -} -QMenu::separator { - background-image: url(qss/production/menuseparator.png) 1; - height: 2px; - margin-bottom: 2px; - margin-top: 2px; - margin-left: 5px; - margin-right: 5px; -} -QMenu::item:selected { - background-color: rgb(49,106,197); - color: white; - border-color: darkblue; -} -QMenu::item:disabled { - color: rgb(90,90,90); - background-color: rgb(140,140,140); - border: 1px solid transparent; -} -QMenu::indicator { - width: 13px; - height: 13px; -} -QMenu::indicator:unchecked { - image: url(qss/production/chk_unchk.png); -} -QMenu::indicator:checked { - image: url(qss/production/chk_chk.png); -} -/*---------------------------------------------------------------------------*/ -/*PopupButton*/ -PopupButton { - padding-left:-8px; - padding-right:4px; -} -PopupButton QMenu { - margin:2px; - background-color: rgb(140,140,140); - border: 0px; - padding: -1px; -} -PopupButton QMenu::item { - border: 1px solid transparent; - color: black; -} -PopupButton::menu-indicator { - image: url(qss/standard/down_arrow.png); - width: 10px; - height: 17px; - border-left: 1px solid grey; -} -PopupButton::menu-indicator:disabled { - image: url(qss/standard/down_arrow_disabled.png); -} -/*---------------------------------------------------------------------------*/ -/*Outline Style PopupButtons*/ -PopupButton#Cap { - min-width: 32px; max-width: 32px; -} -PopupButton#Cap QMenu { - min-width: 18px; max-width: 18px; -} -PopupButton#Cap QMenu::item { - min-width: 16px; max-width: 16px; - padding: 0px; -} -PopupButton#Join { - min-width: 32px; max-width: 32px; -} -PopupButton#Join QMenu { - min-width: 18px; max-width: 18px; -} -PopupButton#Join QMenu::item { - min-width: 16px; max-width: 16px; - padding: 0px; -} -/*---------------------------------------------------------------------------*/ -/* Generic QFrame */ -QFrame { - border: 0px; - margin: 0px; - background: rgb(140,140,140); -} -/*Text disable color*/ -QFrame:disabled { - color: rgb(140,140,140); -} -#OnePixelMarginFrame { - margin: 1px; -} -/*---------------------------------------------------------------------------*/ -/* QDialog */ -QDialog #dialogButtonFrame { - border-top: 1px solid rgb(90,90,90); - background-color: rgb(115,115,115); -} -QDialog #dialogButtonFrame QLabel { - background-color: rgb(115,115,115); -} -QDialog #dialogMainFrame { - background-color: rgb(140,140,140); - border: none; -} -/*---------------------------------------------------------------------------*/ -/* Special setting for the styleEditor */ -StyleEditor .QScrollArea { - margin: 0px; - border-right: 1px solid rgb(90,90,90); -} -StyleEditor QToolBar { - border-right: 1px solid rgb(90,90,90); -} -/*---------------------------------------------------------------------------*/ -/*Panel title bar*/ -#HorizontalPanelTitleBar { - background-color: transparent; - border-width: 8px; - border-image: url(qss/production/titlebar_horizontal.png) 8; -} -#VerticalPanelTitleBar[Active="true"] { - background-color: transparent; - border-width: 8px; - border-image: url(qss/production/titlebar_vertical.png) 8; -} -#VerticalPanelTitleBar[Active="false"] { - background-color: transparent; - border-width: 8px; - border-image: url(qss/production/titlebar_vertical_inactive.png) 8; -} -/*---------------------------------------------------------------------------*/ -#SchematicSceneViewer { - background: rgb(100,100,100); -} -/*---------------------------------------------------------------------------*/ -/*SceneViewer Ruler*/ -Ruler { - qproperty-ParentBGColor: rgb(145,145,145); -} -/*---------------------------------------------------------------------------*/ -/* Menu bar */ -#subXsheetTabBarContainer { - background: rgb(120,120,120); -} -SubSheetBar { - qproperty-ParentBGColor: rgb(140,140,140); -} -#dvTopBar { - background-color: rgb(115,115,115); -} -/*---------------------------------------------------------------------------*/ -/* Tool bar */ -#ToolBarContainer { - background: rgb(140,140,140); -} -/*---------------------------------------------------------------------------*/ -/* Tab bar */ -#TabBarContainer { - border: none; - background: rgb(140,140,140); -} -/*---------------------------------------------------------------------------*/ -/* File Browser Tree and Cast Tree background*/ -#BrowserTreeView { - background-color: rgb(120,120,120); -} -/*---------------------------------------------------------------------------*/ -/* Customize sheet scrollArea */ -/* Sheet scrollAreas. - NB.: SpreadsheetViewer e XsheetViewer va reso un unico oggetto - una volta che si e' uniformato completamente l'xsheet alle colonne numeriche.*/ -SpreadsheetViewer { - background: rgb(140,140,140); - qproperty-LightLightBGColor: rgb(200,200,200); - qproperty-LightBGColor: rgb(155,155,155); - qproperty-BGColor: rgb(125,125,125); - qproperty-DarkBGColor: rgb(160,160,160); - qproperty-LightLineColor: rgb(135,135,135 ); - qproperty-DarkLineColor: rgb(90,90,90); -} -#ScrollArea { - border:1px solid rgb(95,95,95); -} -#CellScrollArea { - border-top:1px solid rgb(95,95,95); - border-left:1px solid rgb(95,95,95); -} -XsheetViewer { - background: rgb(140,140,140); - qproperty-LightLightBGColor: rgb(200,200,200); - qproperty-LightBGColor: rgb(155,155,155); - qproperty-BGColor: rgb(125,125,125); - qproperty-DarkBGColor: rgb(160,160,160); - qproperty-LightLineColor: rgb(135,135,135); - qproperty-DarkLineColor: rgb(90,90,90); -} -#xsheetScrollArea { - background: rgb(140,140,140); - margin: 1px; -} -#cornerWidget { - background: rgb(140,140,140); -} -#XshColumnChangeObjectWidget { - background-color: rgb(155,155,155); - selection-background-color: rgb(49,106,197); - border: 1px solid black; -} -/*---------------------------------------------------------------------------*/ -/* Customize Function Area */ -FunctionPanel { - qproperty-BGColor: rgb(140,140,140); - qproperty-ValueLineColor: rgb(160,160,160); - qproperty-FrameLineColor: rgb(150,150,150); - qproperty-OtherCurvesColor: rgb(95,95,95); - qproperty-RulerBackground: rgb(160,160,160); -} -/*---------------------------------------------------------------------------*/ -/* Customize FilmStrip color */ -FilmstripFrames { - qproperty-BGColor: rgb(140,140,140); - qproperty-LightLineColor: rgb(100,100,100); - qproperty-DarkLineColor: rgb(95,95,95); -} -/*---------------------------------------------------------------------------*/ -/* Main toolbar */ -QToolBar { - /* top right bottom left */ - margin: 0px; - padding: 0px; - border-top: 1px solid rgb(90,90,90); - background-color: rgb(140,140,140); - border-image: none; -} -QToolBar::separator { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 0px; - image: url(qss/production/bottomseparator.png); - width: 3px; -} -QToolBar QToolButton[checkable=false] { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 2px solid transparent; - padding-right: 2px; - border-image: none; - background-color: rgb(140,140,140); -} -QToolBar QToolButton:disabled { - border-image: none; -} -QToolBar QToolButton[checkable=false]:hover { - border-width: 2; - border-image: url(qss/production/over.png) 2; -} -QToolBar QToolButton[checkable=false]:checked, -QToolBar QToolButton[checkable=false]:pressed { - border-width: 2; - border-image: url(qss/production/click.png) 2; -} -/*Chackable buttons: NO border image*/ -QToolBar QToolButton[checkable=true] { - /* top right bottom left */ - margin: 1px -3px 0px -3px; - border: 0px solid transparent; - border-image: none; -} -QToolBar QToolButton[checkable=true]:hover { - image: none; -} -QToolBar QToolButton[checkable=true]:checked, -QToolBar QToolButton[checkable=true]:pressed { - border-image: none; -} -QToolBar QToolButton#chackableButtonWithImageBorder { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 2px solid transparent; - padding-right: 2px; - border-image: none; - background-color: rgb(140,140,140); -} -QToolBar QToolButton#chackableButtonWithImageBorder:hover { - border-width: 2; - border-image: url(qss/production/over.png) 2; -} -QToolBar QToolButton#chackableButtonWithImageBorder:checked, -QToolBar QToolButton#chackableButtonWithImageBorder:pressed { - border-width: 2; - border-image: url(qss/production/click.png) 2; -} -QToolBar QToolButton::menu-button { - margin-top: 1px; - border-image: none; - background-color: rgb(140,140,140); -} -QToolBar QLabel { - margin-top: 1px; - background-color: rgb(140,140,140); - border-width: 2; -} -/* To hide Arrow !! */ -QToolBar QToolButton::menu-indicator { - image: none; -} -/*---------------------------------------------------------------------------*/ -/* Tool Bar */ -#toolBar { - margin: 1px; - background-color: rgb(140,140,140); -} -#toolBar QToolBar { - border: none; - margin: 1px; -} -#toolBar QToolBar::separator { - image: none; - margin: 0px 1px 0px 1px; - background-color: rgb(90,90,90); - height: 1px; -} -#toolBar QToolButton { - margin: 0px; - border: 2px solid transparent; - border-image: none; - background-color: rgb(140,140,140); -} -#toolBar QToolButton:pressed { - border-image: url(qss/production/click.png) 2; - border-width: 2; -} -#toolBar QToolButton:checked { - border-image: url(qss/production/current.png) 2; - border-width: 2; -} -#toolBar QPushButton { - border: 1px solid black; -} -/*---------------------------------------------------------------------------*/ -/* ToolOptionPanel ToolBar */ -#toolOptionBar { - border: 0px; - margin: 0px; - background-color: rgb(140,140,140); -} -#toolOptionBar::separator { - image: none; - margin-top: 0px; - margin-bottom: 0px; - margin-left: 1px; - margin-right: 1px; - background-color: rgb(90,90,90); - height: 30px; - width: 1px; -} -#toolOptionBar QWidget { - background-color: rgb(140,140,140); -} -/*---------------------------------------------------------------------------*/ -/*Key frame navigator*/ -#keyFrameNavigator QToolButton { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 2px solid transparent; - padding-right: 1px; - border-image: none; - background-color: rgb(140,140,140); -} -#keyFrameNavigator QToolButton:hover { - margin: 1px 0px 0px 0px; - border-width: 2; - border-image: url(qss/production/over.png) 2; -} -#keyFrameNavigator QToolButton:checked, -#keyFrameNavigator QToolButton:pressed { - border-width: 2; - border-image: url(qss/production/click.png) 2; -} -/*---------------------------------------------------------------------------*/ -QMessageBox { - background-color: rgb(140,140,140); - border: 1px solid rgb(90,90,90); -} -/*---------------------------------------------------------------------------*/ -/* Customize arrows. */ -QComboBox::down-arrow, QComboBox::menu-indicator { - image: url(qss/production/down_arrow.png); - width: 7px; - height: 7px; -} -QComboBox::down-arrow:disabled, QComboBox::down-arrow:off { - image: url(qss/production/down_arrow_disabled.png); -} -QComboBox::up-arrow { - image: url(qss/production/up_arrow.png); - width: 7px; - height: 7px; -} -QComboBox::up-arrow:disabled, QComboBox::up-arrow:off { - image: url(qss/production/up_arrow_disabled.png); -} -/*---------------------------------------------------------------------------*/ -QPushButton { - border-image: url(qss/production/but.png) 2; - border-width: 2; - color: black; -} -/*---------------------------------------------------------------------------*/ -QComboBox[editable="false"] { - border-image: url(qss/production/but.png) 2; - border-width: 2; -} -QComboBox[editable="true"] { - border-image: url(qss/production/but.png) 2; - border-width: 2; -} -QComboBox:disabled, QPushButton:disabled { - border-image: url(qss/production/butdis.png) 2; - border-width: 2; - height: 22px; - color: rgb(90,90,90); -} -QComboBox:hover, QPushButton:hover { - border-image: url(qss/production/buthover.png) 2; - border-width: 2; - height: 22px; -} -QComboBox:pressed, QPushButton:pressed { - border-image: url(qss/production/but.png) 2; - border-width: 2; - height: 22px; -} -/* Customize non-editable comboboxes drop-down */ -QComboBox[editable="false"] { - padding-left: 3px; - padding-right: 2px; -} -QComboBox[editable="false"]::drop-down { - width: 20px; - border-left-style: solid; - border-left-color: darkgray; - border-left-width: 1px; -} -/* Customize editable comboboxes.*/ -QComboBox[editable="true"] { - padding-right: 16px; -} -QComboBox[editable="true"]::drop-down { - subcontrol-origin: border; - subcontrol-position: top right; - width: 13px; - position: absolute; - top: 2px; - bottom: 2px; - right: 2px; -} -QComboBox[editable="true"]::drop-down, -QComboBox[editable="true"]::drop-down:hover, -QComboBox[editable="true"]::drop-down:on { - border-width: 0px; - border-left-width: 3px; /* we need only left and center part */ -} -/*---------------------------------------------------------------------------*/ -DvScrollWidget > QPushButton { - border-image: none; - border: 0px solid black; - background-color: rgb(160,160,160); -} -DvScrollWidget > QPushButton:hover { - border-image: none; - border: 0px solid black; - background-color: rgb(180,180,180); -} -DvScrollWidget > QPushButton:pressed { - border-image: none; - border: 0px solid black; - background-color: rgb(150,150,150); -} -/*---------------------------------------------------------------------------*/ -#ScrollLeftButton { - image: url(qss/production/left_arrow_black.png); - border-right: 1px solid black; - min-width: 15px; - max-width: 15px; -} -#ScrollRightButton { - image: url(qss/production/right_arrow_black.png); - border-left: 1px solid black; - min-width: 15px; - max-width: 15px; -} -#ScrollUpButton { - image: url(qss/production/up_arrow_black.png); - border-bottom: 1px solid black; - min-height: 15px; - max-height: 15px; -} -#ScrollDownButton { - image: url(qss/production/down_arrow_black.png); - border-top: 1px solid black; - min-height: 15px; - max-height: 15px; -} -/*---------------------------------------------------------------------------*/ -#ToolBarContainer #ScrollLeftButton { - margin-top: 1px; -} -#ToolBarContainer #ScrollRightButton { - margin-top: 1px; -} -/*---------------------------------------------------------------------------*/ -/* QToolButton */ -QToolButton { - border-image: url(qss/production/but.png) 2; - border-width: 2; -} -QToolButton:disabled { - border-image: url(qss/production/butdis.png) 2; - border-width: 2; -} -QToolButton:hover { - border-image: url(qss/production/buthover.png) 2; - border-width: 2; -} -QToolButton:disabled:hover { - margin-top: 1px; - border-image: none; - border-width: 0px; -} -QToolButton:pressed { - border-image: url(qss/production/but.png) 2; - border-width: 2; -} -QToolButton:checked { - border-image: url(qss/production/buthover.png) 2; - border-width: 2; -} -/*---------------------------------------------------------------------------*/ -#ToolbarToolButton { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 2px solid transparent; - padding-right: 1px; - border-image: none; -} -#ToolbarToolButton:hover { - margin: 1px 0px 0px 0px; - border-width: 2; - border-image: url(qss/production/over.png) 2; -} -#ToolbarToolButton:checked, -#ToolbarToolButton:pressed { - border-width: 2; - border-image: url(qss/production/click.png) 2; -} -/*---------------------------------------------------------------------------*/ -#StyleEditorArrowButton { - margin: 0px 0px 0px 0px; - border: 1px solid transparent; - border-image: none; - background-color: rgb(145,145,145); -} -#StyleEditorArrowButton:hover { - border-width: 1; - border-image: url(qss/production/over.png) 1; -} -#StyleEditorArrowButton:checked, -#StyleEditorArrowButton:pressed { - border-width: 1; - border-image: url(qss/production/click.png) 1; -} -/*---------------------------------------------------------------------------*/ -/* QLineEdit */ -QLineEdit { - border-image: url(qss/production/frame.png) 3; - border-width: 3; -} -QLineEdit::focus { - border-image: url(qss/production/framehover.png) 3; - border-width: 3; -} -QLineEdit:disabled { - color: rgb(40,40,40); - border-image: url(qss/production/framedisable.png) 3; -} -/*---------------------------------------------------------------------------*/ -/* QPlainTextEdit & QTextEdit */ -QPlainTextEdit, QTexEdit { - border-image: url(qss/production/frame.png) 3; - border-width: 3; -} -QPlainTextEdit::focus, QTextEdit::focus { - border-image: url(qss/production/framehover.png) 3; - border-width: 3; -} -QPlainTextEdit:disabled, QTextEdit:disabled { - color: rgb(90,90,90); - border-image: url(qss/production/framedisable.png) 3; -} -/*---------------------------------------------------------------------------*/ -/* QGroupBox */ -QGroupBox -{ - background-color: none; - margin-top: 5px; - padding-top: 5px; - border: 1px solid; - border-radius: 3px; -} -QGroupBox:enabled -{ - border-color: rgb(90, 90, 90); -} -QGroupBox:disabled -{ - border-color: rgb(140, 140, 140); -} -QGroupBox::title { - subcontrol-origin: border; - top: -6px; - left: 6px; -} -/*---------------------------------------------------------------------------*/ -/* QStatusBar */ -QStatusBar { - background-color: rgb(140,140,140); -} -/*---------------------------------------------------------------------------*/ -/* Customize Horizontal QSlider. */ -QSlider { - height: 20; -} -QSlider::groove:horizontal { - border-image: url(qss/production/sl_groove.png) 1; - border-width: 1; - height: 1px; -} -QSlider::handle:horizontal { - image: url(qss/production/h_handle.png); - width: 16px; - margin: -16px -4px; -} -/* Customize Horizontal QSlider that have name "colorSlider" */ -#colorSlider::groove:horizontal { - border-image: none; -} -#colorSlider::handle:horizontal { - image: url(qss/production/h_chandle.png); - width: 16px; - margin: -16px -3px -16px -4px; -} - -/*---------------------------------------------------------------------------*/ - -#IntPairField { - qproperty-HandleLeftPixmap: url(qss/production/h_slider_left.png); - qproperty-HandleRightPixmap: url(qss/production/h_slider_right.png); - qproperty-HandleLeftGrayPixmap: url(qss/production/h_slider_left.png); - qproperty-HandleRightGrayPixmap: url(qss/production/h_slider_right.png); -} - -/*---------------------------------------------------------------------------*/ - -#DoublePairField { - qproperty-HandleLeftPixmap: url(qss/production/h_slider_left.png); - qproperty-HandleRightPixmap: url(qss/production/h_slider_right.png); - qproperty-HandleLeftGrayPixmap: url(qss/production/h_slider_left.png); - qproperty-HandleRightGrayPixmap: url(qss/production/h_slider_right.png); -} - -/*---------------------------------------------------------------------------*/ - -/* Flipbook Slider. */ -FlipSlider { - qproperty-PBHeight: 10; - - qproperty-PBOverlay: url(qss/production/flipslider.png); - qproperty-PBMarker: url(qss/production/flipmarker.png); - - qproperty-PBColorMarginLeft: 2; - qproperty-PBColorMarginTop: 2; - qproperty-PBColorMarginRight: 2; - qproperty-PBColorMarginBottom: 3; - - qproperty-PBMarkerMarginLeft: 2; - qproperty-PBMarkerMarginRight: 2; - - qproperty-baseColor: rgb(235,235,235); - qproperty-notStartedColor: rgb(210,40,40); - qproperty-startedColor: rgb(220,160,160); - qproperty-finishedColor: rgb(235,235,235); -} - -/*---------------------------------------------------------------------------*/ - -/* Customize QTabBar */ -QTabBar { - height: 22px; - border: 0px; -} -QTabBar::tab { - top: -1px; - min-width: 54px; - min-height: 15px; -} -QTabBar::tab:selected { - padding-top: 2px; - border-image: url(qss/production/uptab.png) 4; - border-width: 4; -} -QTabBar::tab:only-one { - padding-top: 2px; - border-image: url(qss/production/oouptab.png) 4; - border-width: 4; -} -QTabBar::tab:first:selected { - border-image: url(qss/production/fuptab.png) 4; - border-width: 4; -} -QTabBar::tab:!selected { - margin-top: 2px; - border-image: url(qss/production/tab.png) 4; - border-width: 4; -} -QTabBar::tab:first:!selected { - border-image: url(qss/production/ftab.png) 4; - border-width: 4; -} -QTabBar::tab:last:!selected { - border-image: url(qss/production/ltab.png) 4; - border-width: 4; -} -/* Customize RoomTabWidget */ -/* ATTENTION: These declarations must be putted after the QTabBar ones */ -RoomTabWidget { - height: 22px; - background-color: rgb(120,120,120); - color: white; -} -RoomTabWidget::tab { - top: 1px; - min-width: 54px; - min-height: 15px; -} -RoomTabWidget::tab:selected { - border-image: url(qss/production/uptbtab.png) 4; - border-width: 4; - font: bold; -} -RoomTabWidget::tab:first:selected, RoomTabWidget::tab:only-one { - border-image: url(qss/production/fuptbtab.png) 4; - border-width: 4; - font: bold; -} -RoomTabWidget::tab:!selected { - margin-top: 2px; - border-image: url(qss/production/tbtab.png) 4; - border-width: 4; - font: normal; -} -RoomTabWidget::tab:first:!selected { - border-image: url(qss/production/ftbtab.png) 4; - border-width: 4; -} -RoomTabWidget::tab:last:!selected { - border-image: url(qss/production/ltbtab.png) 4; - border-width: 4; -} -/*---------------------------------------------------------------------------*/ -/* Customize QScrollBar horizontal*/ -QScrollBar:horizontal { - background-image: url(qss/production/sb_h.png); - height: 16px; - margin-top: 0px; - margin-bottom: 0px; - margin-right:15px; - margin-left:15px; -} -QScrollBar::handle:horizontal { - border-image: url(qss/production/sb_hhandle.png)3; - border-width: 3; - image: url(qss/production/sb_hline.png); - image-position: center center; -} -QScrollBar::add-line:horizontal { - image: url(qss/production/sb_rarrow.png); - width: 15px; - subcontrol-position: right; - subcontrol-origin: margin; -} -QScrollBar::sub-line:horizontal { - image: url(qss/production/sb_larrow.png); - width: 15px; - subcontrol-position: left; - subcontrol-origin: margin; -} -QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal { - background: none; -} -/* Customize QScrollBar vertical*/ -QScrollBar:vertical { - background-image: url(qss/production/sb_v.png); - width: 16px; - margin-left: 0px; - margin-right: 0px; - margin-top:15px; - margin-bottom:15px; -} -QScrollBar::handle:vertical { - border-image: url(qss/production/sb_vhandle.png)3; - border-width: 3; - image: url(qss/production/sb_vline.png); - image-position: center center; -} -QScrollBar::add-line:vertical { - image: url(qss/production/sb_downarrow.png); - height: 15px; - subcontrol-position: bottom; - subcontrol-origin: margin; -} -QScrollBar::sub-line:vertical { - image: url(qss/production/sb_uparrow.png); - height: 15px; - subcontrol-position: top; - subcontrol-origin: margin; -} -QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { - background: none; -} -/*---------------------------------------------------------------------------*/ -/* Customize check boxes. */ -QCheckBox { - spacing: 1px; -} -QCheckBox::indicator { - width: 13px; - height: 13px; -} -QCheckBox::indicator:unchecked, QTreeView::indicator:unchecked { - image: url(qss/production/chk_unchk.png); -} -QCheckBox::indicator:checked, QTreeView::indicator:checked { - image: url(qss/production/chk_chk.png); -} -/*---------------------------------------------------------------------------*/ -/* Customize radio buttons. */ -QRadioButton { - spacing: 5px; -} -QRadioButton::indicator { - width: 13px; - height: 13px; -} -QRadioButton::indicator::unchecked { - image: url(qss/production/radio.png); -} -QRadioButton::indicator::checked { - image: url(qss/production/radio_p.png); -} -/*---------------------------------------------------------------------------*/ -/* QSplitter (Un pochettino assumo che sono tutti verticali) */ -QSplitter { - background-color: rgb(120,120,120); -} -QSplitter::handle { - margin: 0px; - background-color: rgb(120,120,120); -} -QSplitter::handle:horizontal { - image: url(qss/production/hsplitter_handle.png); - border-left: 1px solid rgb(90,90,90); - border-right: 1px solid rgb(90,90,90); - image-position: center center; -} -QSplitter::handle:vertical { - image: url(qss/production/vsplitter_handle.png); - border-top: 1px solid rgb(90,90,90); - border-bottom: 1px solid rgb(90,90,90); - padding-left: 1px; - padding-right: 1px; - image-position: center center; -} -/*---------------------------------------------------------------------------*/ -/* QToolTip */ -QToolTip { - border: 1px solid black; - background-color: rgb(255,255,225); -} -/*---------------------------------------------------------------------------*/ -/* Generic Separators with inscribed name */ -DVGui--Separator { - alternate-background-color: rgb(120, 120, 120); /* line color */ -} -/*---------------------------------------------------------------------------*/ -/* Export Level Popup Options */ -#ExportLevelOptions -{ - background-color: rgb(115,115,115); -} -#ExportLevelOptions QWidget -{ - background-color: none; -} -ExportLevelPopup DVGui--Separator { - padding: 0px 5px 0px 5px; - alternate-background-color: rgb(90, 90, 90); -} diff --git a/stuff/config/qss/production/production_mac.qss b/stuff/config/qss/production/production_mac.qss deleted file mode 100644 index 2397de1..0000000 --- a/stuff/config/qss/production/production_mac.qss +++ /dev/null @@ -1,998 +0,0 @@ -/* TOONZ 6.2 (SP1) Qt Style Test - Digital Video 2011 -*/ - -/*---------------------------------------------------------------------------*/ -QMainWindow #MainStackedWidget { - border: 6px solid rgb(60,60,60); - background-color: rgb(60,60,60); -} -/*---------------------------------------------------------------------------*/ -/*------------ Mac OS ------------*/ -TPanel { - qproperty-BGColor: rgb(140,140,140); - background-color: rgb(140,140,140); - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -/*---------------------------------------------------------------------------*/ -.QWidget { -} -/*---------------------------------------------------------------------------*/ -/* QMenuBar */ -QMenuBar { - background-color: rgb(180,180,180); - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -/*---------------------------------------------------------------------------*/ -/*Menu*/ -#fxMenu::item:checked, #fxMenu::item:unchecked { - padding: 2px 25px 2px 20px; - border: 1px solid transparent; - background-color: rgb(140,140,140); - color: black; - font-weight: bold; -} -#fxMenu::indicator:unchecked { - image: url(); -} -#fxMenu::indicator:checked { - image: url(); -} -#fxMenu::item:selected { - background-color: rgb(49,106,197); - color: white; - border-color: darkblue; -} -#fxMenu::item:disabled { - color: gray; - background-color: rgb(140,140,140); -} -QMenu { - margin: 2px; - background-color: rgb(140,140,140); - border: 4px solid black; - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -QMenu::item { - padding: 2px 25px 2px 20px; - border: 1px solid transparent; - color: black; -} -QMenu::separator { - background-image: url(qss/production/menuseparator.png) 1; - height: 2px; - margin-bottom: 2px; - margin-top: 2px; - margin-left: 5px; - margin-right: 5px; -} -QMenu::item:selected { - color: white; -} -QMenu::item:disabled { - color: rgb(90,90,90); - background-color: rgb(140,140,140); - border: 1px solid transparent; -} -QMenu::indicator { - width: 13px; - height: 13px; -} -QMenu::indicator:unchecked { - image: url(qss/production/chk_unchk.png); -} -QMenu::indicator:checked { - image: url(qss/production/chk_chk.png); -} -/*---------------------------------------------------------------------------*/ -/*PopupButton*/ -PopupButton { - padding-left:-8px; - padding-right:4px; -} -PopupButton QMenu { - margin:2px; - background-color: rgb(140,140,140); - border: 0px; - padding: -1px; -} -PopupButton QMenu::item { - border: 1px solid transparent; - color: black; -} -PopupButton::menu-indicator { - image: url(qss/standard/down_arrow.png); - width: 10px; - height: 17px; - border-left: 1px solid grey; -} -PopupButton::menu-indicator:disabled { - image: url(qss/standard/down_arrow_disabled.png); -} -/*---------------------------------------------------------------------------*/ -/*Outline Style PopupButtons*/ -PopupButton#Cap { - min-width: 32px; max-width: 32px; -} -PopupButton#Cap QMenu { - min-width: 18px; max-width: 18px; -} -PopupButton#Cap QMenu::item { - min-width: 16px; max-width: 16px; - padding: 0px; -} -PopupButton#Join { - min-width: 32px; max-width: 32px; -} -PopupButton#Join QMenu { - min-width: 18px; max-width: 18px; -} -PopupButton#Join QMenu::item { - min-width: 16px; max-width: 16px; - padding: 0px; -} -/*---------------------------------------------------------------------------*/ -/* Generic QFrame */ -QFrame { - border: 0px; - margin: 0px; - background: rgb(140,140,140); - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -/*Text disable color*/ -QFrame:disabled { - color: rgb(120,120,120); -} -#OnePixelMarginFrame { - margin: 1px; -} -/*---------------------------------------------------------------------------*/ -/* QDialog */ -QDialog #dialogButtonFrame { - border-top: 1px solid rgb(90,90,90); - background-color: rgb(115,115,115); -} -QDialog #dialogButtonFrame QLabel { - background-color: rgb(115,115,115); -} -QDialog #dialogMainFrame { - background-color: rgb(140,140,140); - border: none; -} -/*---------------------------------------------------------------------------*/ -/* Special setting for the styleEditor */ -StyleEditor .QScrollArea { - margin: 0px; - border-right: 1px solid rgb(90,90,90); -} -StyleEditor QToolBar { - border-right: 1px solid rgb(90,90,90); -} -/*---------------------------------------------------------------------------*/ -/*Panel title bar*/ -#HorizontalPanelTitleBar { - background-color: transparent; - border-width: 8px; - border-image: url(qss/production/titlebar_horizontal.png) 8; -} -#VerticalPanelTitleBar[Active="true"] { - background-color: transparent; - border-width: 8px; - border-image: url(qss/production/titlebar_vertical.png) 8; -} -#VerticalPanelTitleBar[Active="false"] { - background-color: transparent; - border-width: 8px; - border-image: url(qss/production/titlebar_vertical_inactive.png) 8; -} -/*---------------------------------------------------------------------------*/ -#SchematicSceneViewer { - background: rgb(100,100,100); -} -/*---------------------------------------------------------------------------*/ -/*SceneViewer Ruler*/ -Ruler { - qproperty-ParentBGColor: rgb(145,145,145); -} -/*---------------------------------------------------------------------------*/ -/* Menu bar */ -#subXsheetTabBarContainer { - background: rgb(120,120,120); -} -SubSheetBar { - qproperty-ParentBGColor: rgb(140,140,140); -} -#dvTopBar { - background-image: url(qss/production/topfade.png) 10; -} -/*---------------------------------------------------------------------------*/ -/* Tool bar */ -#ToolBarContainer { - background: rgb(140,140,140); -} -/*---------------------------------------------------------------------------*/ -/* Tab bar */ -#TabBarContainer { - border: none; - background: rgb(140,140,140); -} -/*---------------------------------------------------------------------------*/ -/* File Browser Tree and Cast Tree background*/ -#BrowserTreeView { - background-color: rgb(120,120,120); -} -/*---------------------------------------------------------------------------*/ -/* Customize sheet scrollArea */ -/* Sheet scrollAreas. - NB.: SpreadsheetViewer e XsheetViewer va reso un unico oggetto - una volta che si e' uniformato completamente l'xsheet alle colonne numeriche.*/ -SpreadsheetViewer { - background: rgb(140,140,140); - qproperty-LightLightBGColor: rgb(200,200,200); - qproperty-LightBGColor: rgb(155,155,155); - qproperty-BGColor: rgb(125,125,125); - qproperty-DarkBGColor: rgb(160,160,160); - qproperty-LightLineColor: rgb(135,135,135 ); - qproperty-DarkLineColor: rgb(90,90,90); -} -#ScrollArea { - border:1px solid rgb(95,95,95); -} -#CellScrollArea { - border-top:1px solid rgb(95,95,95); - border-left:1px solid rgb(95,95,95); -} -XsheetViewer { - background: rgb(140,140,140); - qproperty-LightLightBGColor: rgb(200,200,200); - qproperty-LightBGColor: rgb(155,155,155); - qproperty-BGColor: rgb(125,125,125); - qproperty-DarkBGColor: rgb(160,160,160); - qproperty-LightLineColor: rgb(135,135,135); - qproperty-DarkLineColor: rgb(90,90,90); -} -#xsheetScrollArea { - background: rgb(140,140,140); - margin: 1px; -} -#cornerWidget { - background: rgb(140,140,140); -} -#XshColumnChangeObjectWidget { - background-color: rgb(155,155,155); - selection-background-color: rgb(49,106,197); - border: 1px solid black -} -/*---------------------------------------------------------------------------*/ -/* Customize Function Area */ -FunctionPanel { - qproperty-BGColor: rgb(140,140,140); - qproperty-ValueLineColor: rgb(160,160,160); - qproperty-FrameLineColor: rgb(150,150,150); - qproperty-OtherCurvesColor: rgb(95,95,95); - qproperty-RulerBackground: rgb(160,160,160); -} -/*---------------------------------------------------------------------------*/ -/* Customize FilmStrip color */ -FilmstripFrames { - qproperty-BGColor: rgb(140,140,140); - qproperty-LightLineColor: rgb(100,100,100); - qproperty-DarkLineColor: rgb(95,95,95); -} -/*---------------------------------------------------------------------------*/ -/* Main toolbar */ -QToolBar { - /* top right bottom left */ - margin: 0px; - padding: 0px; - border-top: 1px solid rgb(90,90,90); - background-color: rgb(140,140,140); - border-image: none; -} -QToolBar::separator { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 0px; - image: url(qss/production/bottomseparator.png); - width: 3px; -} -QToolBar QToolButton[checkable=false] { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 2px solid transparent; - padding-right: 2px; - border-image: none; - background-color: rgb(140,140,140); -} -QToolBar QToolButton:disabled { - border-image: none; -} -QToolBar QToolButton[checkable=false]:hover { - border-width: 2; - border-image: url(qss/production/over.png) 2; -} -QToolBar QToolButton[checkable=false]:checked, -QToolBar QToolButton[checkable=false]:pressed { - border-width: 2; - border-image: url(qss/production/click.png) 2; -} -/*Chackable buttons: NO border image*/ -QToolBar QToolButton[checkable=true] { - /* top right bottom left */ - margin: 1px -3px 0px -3px; - border: 0px solid transparent; - border-image: none; -} -QToolBar QToolButton[checkable=true]:hover { - image: none; -} -QToolBar QToolButton[checkable=true]:checked, -QToolBar QToolButton[checkable=true]:pressed { - border-image: none; -} -QToolBar QToolButton#chackableButtonWithImageBorder { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 2px solid transparent; - padding-right: 2px; - border-image: none; - background-color: rgb(140,140,140); -} -QToolBar QToolButton#chackableButtonWithImageBorder:hover { - border-width: 2; - border-image: url(qss/production/over.png) 2; -} -QToolBar QToolButton#chackableButtonWithImageBorder:checked, -QToolBar QToolButton#chackableButtonWithImageBorder:pressed { - border-width: 2; - border-image: url(qss/production/click.png) 2; -} -QToolBar QToolButton::menu-button { - margin-top: 1px; - border-image: none; - background-color: rgb(140,140,140); -} -QToolBar QLabel { - margin-top: 1px; - background-color: rgb(140,140,140); - border-width: 2; -} -/* To hide Arrow !! */ -QToolBar QToolButton::menu-indicator { - image: none; -} -/*---------------------------------------------------------------------------*/ -/* Tool Bar */ -#toolBar { - margin: 1px; - background-color: rgb(140,140,140); -} -#toolBar QToolBar { - border: none; - margin: 1px; -} -#toolBar QToolBar::separator { - image: none; - margin: 0px 1px 0px 1px; - background-color: rgb(90,90,90); - height: 1px; -} -#toolBar QToolButton { - margin: 0px; - border: 2px solid transparent; - border-image: none; - background-color: rgb(140,140,140); -} -#toolBar QToolButton:pressed { - border-image: url(qss/production/click.png) 2; - border-width: 2; -} -#toolBar QToolButton:checked { - border-image: url(qss/production/current.png) 2; - border-width: 2; -} -#toolBar QPushButton { - border: 1px solid black; -} -/*---------------------------------------------------------------------------*/ -/* ToolOptionPanel ToolBar */ -#toolOptionBar { - border: 0px; - margin: 0px; - background-color: rgb(140,140,140); -} -#toolOptionBar::separator { - image: none; - margin-top: 0px; - margin-bottom: 0px; - margin-left: 1px; - margin-right: 1px; - background-color: rgb(90,90,90); - height: 30px; - width: 1px; -} -#toolOptionBar QWidget { - background-color: rgb(140,140,140); -} -/*---------------------------------------------------------------------------*/ -/*Key frame navigator*/ -#keyFrameNavigator QToolButton { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 2px solid transparent; - padding-right: 1px; - border-image: none; - background-color: rgb(140,140,140); -} -#keyFrameNavigator QToolButton:hover { - margin: 1px 0px 0px 0px; - border-width: 2; - border-image: url(qss/production/over.png) 2; -} -#keyFrameNavigator QToolButton:checked, -#keyFrameNavigator QToolButton:pressed { - border-width: 2; - border-image: url(qss/production/click.png) 2; -} -/*---------------------------------------------------------------------------*/ -QMessageBox { - background-color: rgb(140,140,140); - border: 1px solid rgb(90,90,90); -} -/*---------------------------------------------------------------------------*/ -/* Customize arrows. */ -QComboBox::down-arrow, QComboBox::menu-indicator { - image: url(qss/production/down_arrow.png); - width: 7px; - height: 7px; -} -QComboBox::down-arrow:disabled, QComboBox::down-arrow:off { - image: url(qss/production/down_arrow_disabled.png); -} -QComboBox::up-arrow { - image: url(qss/production/up_arrow.png); - width: 7px; - height: 7px; -} -QComboBox::up-arrow:disabled, QComboBox::up-arrow:off { - image: url(qss/production/up_arrow_disabled.png); -} -/*---------------------------------------------------------------------------*/ -QPushButton { - border-image: url(qss/production/but.png) 2; - border-width: 2; - color: black; - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -/*---------------------------------------------------------------------------*/ -QComboBox { - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -QComboBox[editable="false"] { - border-image: url(qss/production/but.png) 2; - border-width: 2; -} -QComboBox[editable="true"] { - border-image: url(qss/production/but.png) 2; - border-width: 2; -} -QComboBox:disabled, QPushButton:disabled { - border-image: url(qss/production/butdis.png) 2; - border-width: 2; - height: 22px; - color: rgb(90,90,90); -} -QComboBox:hover, QPushButton:hover { - border-image: url(qss/production/buthover.png) 2; - border-width: 2; - height: 22px; -} -QComboBox:pressed, QPushButton:pressed { - border-image: url(qss/production/but.png) 2; - border-width: 2; - height: 22px; -} -/* Customize non-editable comboboxes drop-down */ -QComboBox[editable="false"] { - padding-left: 3px; - padding-right: 2px; -} -QComboBox[editable="false"]::drop-down { - width: 15px; - border-left-style: solid; - border-left-color: darkgray; - border-left-width: 1px; -} -/* Customize editable comboboxes.*/ -QComboBox[editable="true"] { - padding-right: 16px; -} -QComboBox[editable="true"]::drop-down { - subcontrol-origin: border; - subcontrol-position: top right; - width: 13px; - position: absolute; - top: 2px; - bottom: 2px; - right: 2px; -} -QComboBox[editable="true"]::drop-down, -QComboBox[editable="true"]::drop-down:hover, -QComboBox[editable="true"]::drop-down:on { - border-width: 0px; - border-left-width: 3px; /* we need only left and center part */ -} -/*---------------------------------------------------------------------------*/ -DvScrollWidget > QPushButton { - border-image: none; - border: 0px solid black; - background-color: rgb(160,160,160); -} -DvScrollWidget > QPushButton:hover { - border-image: none; - border: 0px solid black; - background-color: rgb(180,180,180); -} -DvScrollWidget > QPushButton:pressed { - border-image: none; - border: 0px solid black; - background-color: rgb(150,150,150); -} -/*---------------------------------------------------------------------------*/ -#ScrollLeftButton { - image: url(qss/production/left_arrow_black.png); - border-right: 1px solid black; - min-width: 15px; - max-width: 15px; -} -#ScrollRightButton { - image: url(qss/production/right_arrow_black.png); - border-left: 1px solid black; - min-width: 15px; - max-width: 15px; -} -#ScrollUpButton { - image: url(qss/production/up_arrow_black.png); - border-bottom: 1px solid black; - min-height: 15px; - max-height: 15px; -} -#ScrollDownButton { - image: url(qss/production/down_arrow_black.png); - border-top: 1px solid black; - min-height: 15px; - max-height: 15px; -} -/*---------------------------------------------------------------------------*/ -#ToolBarContainer #ScrollLeftButton { - margin-top: 1px; -} -#ToolBarContainer #ScrollRightButton { - margin-top: 1px; -} -/*---------------------------------------------------------------------------*/ -/* QToolButton */ -QToolButton { - border-image: url(qss/production/but.png) 2; - border-width: 2; - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -QToolButton:disabled { - border-image: url(qss/production/butdis.png) 2; - border-width: 2; -} -QToolButton:hover { - border-image: url(qss/production/buthover.png) 2; - border-width: 2; -} -QToolButton:disabled:hover { - margin-top: 1px; - border-image: none; - border-width: 0px; -} -QToolButton:pressed { - border-image: url(qss/production/but.png) 2; - border-width: 2; -} -QToolButton:checked { - border-image: url(qss/production/buthover.png) 2; - border-width: 2; -} -/*---------------------------------------------------------------------------*/ -#ToolbarToolButton { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 2px solid transparent; - padding-right: 1px; - border-image: none; -} -#ToolbarToolButton:hover { - margin: 1px 0px 0px 0px; - border-width: 2; - border-image: url(qss/production/over.png) 2; -} -#ToolbarToolButton:checked, -#ToolbarToolButton:pressed { - border-width: 2; - border-image: url(qss/production/click.png) 2; -} -/*---------------------------------------------------------------------------*/ -#StyleEditorArrowButton { - margin: 0px 0px 0px 0px; - border: 1px solid transparent; - border-image: none; - background-color: rgb(145,145,145); -} -#StyleEditorArrowButton:hover { - border-width: 1; - border-image: url(qss/production/over.png) 1; -} -#StyleEditorArrowButton:checked, -#StyleEditorArrowButton:pressed { - border-width: 1; - border-image: url(qss/production/click.png) 1; -} -/*---------------------------------------------------------------------------*/ -/* QLineEdit */ -QLineEdit { - border-image: url(qss/production/frame.png) 3; - border-width: 3; - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -QLineEdit::focus { - border-image: url(qss/production/framehover.png) 3; - border-width: 3; -} -QLineEdit:disabled { - color: rgb(40,40,40); - border-image: url(qss/production/framedisable.png) 3; -} -/*---------------------------------------------------------------------------*/ -/* QPlainTextEdit & QTextEdit */ -QPlainTextEdit, QTexEdit { - border-image: url(qss/production/frame.png) 3; - border-width: 3; -} -QPlainTextEdit::focus, QTextEdit::focus { - border-image: url(qss/production/framehover.png) 3; - border-width: 3; -} -QPlainTextEdit:disabled, QTextEdit:disabled { - color: rgb(135,135,135); - border-image: url(qss/production/framedisable.png) 3; -} -/*---------------------------------------------------------------------------*/ -/* QGroupBox */ -QGroupBox -{ - background-color: none; - margin-top: 5px; - padding-top: 5px; - border: 1px solid; - border-radius: 3px; - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -QGroupBox:enabled -{ - border-color: rgb(90, 90, 90); -} -QGroupBox:disabled -{ - border-color: rgb(140, 140, 140); -} -QGroupBox::title { - subcontrol-origin: border; - top: -6px; - left: 6px; -} -/*---------------------------------------------------------------------------*/ -/* QStatusBar */ -QStatusBar { - background-color: rgb(140,140,140); -} -/*---------------------------------------------------------------------------*/ -/* Customize Horizontal QSlider. */ -QSlider { - height: 20; -} -QSlider::groove:horizontal { - border-image: url(qss/production/sl_groove.png) 1; - border-width: 1; - height: 1px; -} -QSlider::handle:horizontal { - image: url(qss/production/h_handle.png); - width: 16px; - margin: -16px -4px; -} -/* Customize Horizontal QSlider that have name "colorSlider" */ -#colorSlider::groove:horizontal { - border-image: none; -} -#colorSlider::handle:horizontal { - image: url(qss/production/h_chandle.png); - width: 16px; - margin: -16px -3px -16px -4px; -} - -/*---------------------------------------------------------------------------*/ - -#IntPairField { - qproperty-HandleLeftPixmap: url(qss/production/h_slider_left.png); - qproperty-HandleRightPixmap: url(qss/production/h_slider_right.png); - qproperty-HandleLeftGrayPixmap: url(qss/production/h_slider_left.png); - qproperty-HandleRightGrayPixmap: url(qss/production/h_slider_right.png); -} - -/*---------------------------------------------------------------------------*/ - -#DoublePairField { - qproperty-HandleLeftPixmap: url(qss/production/h_slider_left.png); - qproperty-HandleRightPixmap: url(qss/production/h_slider_right.png); - qproperty-HandleLeftGrayPixmap: url(qss/production/h_slider_left.png); - qproperty-HandleRightGrayPixmap: url(qss/production/h_slider_right.png); -} - -/*---------------------------------------------------------------------------*/ - -/* Flipbook Slider. */ -FlipSlider { - qproperty-PBHeight: 10; - - qproperty-PBOverlay: url(qss/production/flipslider.png); - qproperty-PBMarker: url(qss/production/flipmarker.png); - - qproperty-PBColorMarginLeft: 2; - qproperty-PBColorMarginTop: 2; - qproperty-PBColorMarginRight: 2; - qproperty-PBColorMarginBottom: 3; - - qproperty-PBMarkerMarginLeft: 2; - qproperty-PBMarkerMarginRight: 2; - - qproperty-baseColor: rgb(235,235,235); - qproperty-notStartedColor: rgb(210,40,40); - qproperty-startedColor: rgb(220,160,160); - qproperty-finishedColor: rgb(235,235,235); -} - -/*---------------------------------------------------------------------------*/ -/* Customize QTabBar */ -QTabBar { - height: 22px; - border: 0px; -} -QTabBar::tab { - top: -1px; - min-width: 54px; - min-height: 15px; -} -QTabBar::tab:selected { - padding-top: 2px; - border-image: url(qss/production/uptab.png) 4; - border-width: 4; -} -QTabBar::tab:only-one { - padding-top: 2px; - border-image: url(qss/production/oouptab.png) 4; - border-width: 4; -} -QTabBar::tab:first:selected { - border-image: url(qss/production/fuptab.png) 4; - border-width: 4; -} -QTabBar::tab:!selected { - margin-top: 2px; - border-image: url(qss/production/tab.png) 4; - border-width: 4; -} -QTabBar::tab:first:!selected { - border-image: url(qss/production/ftab.png) 4; - border-width: 4; -} -QTabBar::tab:last:!selected { - border-image: url(qss/production/ltab.png) 4; - border-width: 4; -} -/* Customize RoomTabWidget */ -/* ATTENTION: These declarations must be putted after the QTabBar ones */ -RoomTabWidget { - height: 22px; - background-color: rgb(120,120,120); - color: white; -} -RoomTabWidget::tab { - top: 1px; - min-width: 54px; - min-height: 15px; -} -RoomTabWidget::tab:selected { - border-image: url(qss/production/uptbtab.png) 4; - border-width: 4; - font: bold; -} -RoomTabWidget::tab:first:selected, RoomTabWidget::tab:only-one { - border-image: url(qss/production/fuptbtab.png) 4; - border-width: 4; - font: bold; -} -RoomTabWidget::tab:!selected { - margin-top: 2px; - border-image: url(qss/production/tbtab.png) 4; - border-width: 4; - font: normal; -} -RoomTabWidget::tab:first:!selected { - border-image: url(qss/production/ftbtab.png) 4; - border-width: 4; -} -RoomTabWidget::tab:last:!selected { - border-image: url(qss/production/ltbtab.png) 4; - border-width: 4; -} -/*---------------------------------------------------------------------------*/ -/* Customize QScrollBar horizontal*/ -QScrollBar:horizontal { - background-image: url(qss/production/sb_h.png); - height: 16px; - margin-top: 0px; - margin-bottom: 0px; - margin-right:15px; - margin-left:15px; -} -QScrollBar::handle:horizontal { - border-image: url(qss/production/sb_hhandle.png)3; - border-width: 3; - image: url(qss/production/sb_hline.png); - image-position: center center; -} -QScrollBar::add-line:horizontal { - image: url(qss/production/sb_rarrow.png); - width: 15px; - subcontrol-position: right; - subcontrol-origin: margin; -} -QScrollBar::sub-line:horizontal { - image: url(qss/production/sb_larrow.png); - width: 15px; - subcontrol-position: left; - subcontrol-origin: margin; -} -QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal { - background: none; -} -/* Customize QScrollBar vertical*/ -QScrollBar:vertical { - background-image: url(qss/production/sb_v.png); - width: 16px; - margin-left: 0px; - margin-right: 0px; - margin-top:15px; - margin-bottom:15px; -} -QScrollBar::handle:vertical { - border-image: url(qss/production/sb_vhandle.png)3; - border-width: 3; - image: url(qss/production/sb_vline.png); - image-position: center center; -} -QScrollBar::add-line:vertical { - image: url(qss/production/sb_downarrow.png); - height: 15px; - subcontrol-position: bottom; - subcontrol-origin: margin; -} -QScrollBar::sub-line:vertical { - image: url(qss/production/sb_uparrow.png); - height: 15px; - subcontrol-position: top; - subcontrol-origin: margin; -} -QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { - background: none; -} -/*---------------------------------------------------------------------------*/ -/* Customize check boxes. */ -QCheckBox { - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; - spacing: 1px; -} -QCheckBox::indicator { - width: 13px; - height: 13px; -} -QCheckBox::indicator:unchecked, QTreeView::indicator:unchecked { - image: url(qss/production/chk_unchk.png); -} -QCheckBox::indicator:checked, QTreeView::indicator:checked { - image: url(qss/production/chk_chk.png); -} -/*---------------------------------------------------------------------------*/ -/* Customize radio buttons. */ -QRadioButton { - spacing: 5px; - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -QRadioButton::indicator { - width: 13px; - height: 13px; -} -QRadioButton::indicator::unchecked { - image: url(qss/production/radio.png); -} -QRadioButton::indicator::checked { - image: url(qss/production/radio_p.png); -} -/*---------------------------------------------------------------------------*/ -/* QSplitter (Un pochettino assumo che sono tutti verticali) */ -QSplitter { - background-color: rgb(120,120,120); -} -QSplitter::handle { - margin: 0px; - background-color: rgb(120,120,120); -} -QSplitter::handle:horizontal { - image: url(qss/production/hsplitter_handle.png); - border-left: 1px solid rgb(90,90,90); - border-right: 1px solid rgb(90,90,90); - image-position: center center; -} -QSplitter::handle:vertical { - image: url(qss/production/vsplitter_handle.png); - border-top: 1px solid rgb(90,90,90); - border-bottom: 1px solid rgb(90,90,90); - padding-left: 1px; - padding-right: 1px; - image-position: center center; -} -/*---------------------------------------------------------------------------*/ -/* QToolTip */ -QToolTip { - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; - border: 1px solid black; - background-color: rgb(255,255,225); -} -/*---------------------------------------------------------------------------*/ -/* Generic Separators with inscribed name */ -DVGui--Separator { - alternate-background-color: rgb(120, 120, 120); /* line color */ -} -/*---------------------------------------------------------------------------*/ -/* Export Level Popup Options */ -#ExportLevelOptions -{ - background-color: rgb(115,115,115); -} -#ExportLevelOptions QWidget -{ - background-color: none; -} -ExportLevelPopup DVGui--Separator { - padding: 0px 5px 0px 5px; - alternate-background-color: rgb(90, 90, 90); -} diff --git a/stuff/config/qss/production/radio.png b/stuff/config/qss/production/radio.png deleted file mode 100644 index 11b3d03..0000000 Binary files a/stuff/config/qss/production/radio.png and /dev/null differ diff --git a/stuff/config/qss/production/radio_p.png b/stuff/config/qss/production/radio_p.png deleted file mode 100644 index f85b433..0000000 Binary files a/stuff/config/qss/production/radio_p.png and /dev/null differ diff --git a/stuff/config/qss/production/right_arrow_black.png b/stuff/config/qss/production/right_arrow_black.png deleted file mode 100644 index 8878c62..0000000 Binary files a/stuff/config/qss/production/right_arrow_black.png and /dev/null differ diff --git a/stuff/config/qss/production/sb_downarrow.png b/stuff/config/qss/production/sb_downarrow.png deleted file mode 100644 index 8590401..0000000 Binary files a/stuff/config/qss/production/sb_downarrow.png and /dev/null differ diff --git a/stuff/config/qss/production/sb_h.png b/stuff/config/qss/production/sb_h.png deleted file mode 100644 index 13d8d42..0000000 Binary files a/stuff/config/qss/production/sb_h.png and /dev/null differ diff --git a/stuff/config/qss/production/sb_hhandle.png b/stuff/config/qss/production/sb_hhandle.png deleted file mode 100644 index 8a54c49..0000000 Binary files a/stuff/config/qss/production/sb_hhandle.png and /dev/null differ diff --git a/stuff/config/qss/production/sb_hline.png b/stuff/config/qss/production/sb_hline.png deleted file mode 100644 index a94e491..0000000 Binary files a/stuff/config/qss/production/sb_hline.png and /dev/null differ diff --git a/stuff/config/qss/production/sb_larrow.png b/stuff/config/qss/production/sb_larrow.png deleted file mode 100644 index f7d81ed..0000000 Binary files a/stuff/config/qss/production/sb_larrow.png and /dev/null differ diff --git a/stuff/config/qss/production/sb_rarrow.png b/stuff/config/qss/production/sb_rarrow.png deleted file mode 100644 index b032c92..0000000 Binary files a/stuff/config/qss/production/sb_rarrow.png and /dev/null differ diff --git a/stuff/config/qss/production/sb_uparrow.png b/stuff/config/qss/production/sb_uparrow.png deleted file mode 100644 index 89dcd79..0000000 Binary files a/stuff/config/qss/production/sb_uparrow.png and /dev/null differ diff --git a/stuff/config/qss/production/sb_v.png b/stuff/config/qss/production/sb_v.png deleted file mode 100644 index 9c60cab..0000000 Binary files a/stuff/config/qss/production/sb_v.png and /dev/null differ diff --git a/stuff/config/qss/production/sb_vhandle.png b/stuff/config/qss/production/sb_vhandle.png deleted file mode 100644 index 388d0e0..0000000 Binary files a/stuff/config/qss/production/sb_vhandle.png and /dev/null differ diff --git a/stuff/config/qss/production/sb_vline.png b/stuff/config/qss/production/sb_vline.png deleted file mode 100644 index 2ac4415..0000000 Binary files a/stuff/config/qss/production/sb_vline.png and /dev/null differ diff --git a/stuff/config/qss/production/sl_groove.png b/stuff/config/qss/production/sl_groove.png deleted file mode 100644 index 81b2865..0000000 Binary files a/stuff/config/qss/production/sl_groove.png and /dev/null differ diff --git a/stuff/config/qss/production/tab.png b/stuff/config/qss/production/tab.png deleted file mode 100644 index 8a437d3..0000000 Binary files a/stuff/config/qss/production/tab.png and /dev/null differ diff --git a/stuff/config/qss/production/tbtab.png b/stuff/config/qss/production/tbtab.png deleted file mode 100644 index 834b0f7..0000000 Binary files a/stuff/config/qss/production/tbtab.png and /dev/null differ diff --git a/stuff/config/qss/production/titlebar_horizontal.png b/stuff/config/qss/production/titlebar_horizontal.png deleted file mode 100644 index 962f0cc..0000000 Binary files a/stuff/config/qss/production/titlebar_horizontal.png and /dev/null differ diff --git a/stuff/config/qss/production/titlebar_vertical _inactive.png b/stuff/config/qss/production/titlebar_vertical _inactive.png deleted file mode 100644 index f365f9e..0000000 Binary files a/stuff/config/qss/production/titlebar_vertical _inactive.png and /dev/null differ diff --git a/stuff/config/qss/production/titlebar_vertical.png b/stuff/config/qss/production/titlebar_vertical.png deleted file mode 100644 index f365f9e..0000000 Binary files a/stuff/config/qss/production/titlebar_vertical.png and /dev/null differ diff --git a/stuff/config/qss/production/topfade.png b/stuff/config/qss/production/topfade.png deleted file mode 100644 index e021e97..0000000 Binary files a/stuff/config/qss/production/topfade.png and /dev/null differ diff --git a/stuff/config/qss/production/up_arrow.png b/stuff/config/qss/production/up_arrow.png deleted file mode 100644 index 749c418..0000000 Binary files a/stuff/config/qss/production/up_arrow.png and /dev/null differ diff --git a/stuff/config/qss/production/up_arrow_black.png b/stuff/config/qss/production/up_arrow_black.png deleted file mode 100644 index 6c27909..0000000 Binary files a/stuff/config/qss/production/up_arrow_black.png and /dev/null differ diff --git a/stuff/config/qss/production/up_arrow_disabled.png b/stuff/config/qss/production/up_arrow_disabled.png deleted file mode 100644 index 365da38..0000000 Binary files a/stuff/config/qss/production/up_arrow_disabled.png and /dev/null differ diff --git a/stuff/config/qss/production/uptab.png b/stuff/config/qss/production/uptab.png deleted file mode 100644 index b470ef8..0000000 Binary files a/stuff/config/qss/production/uptab.png and /dev/null differ diff --git a/stuff/config/qss/production/uptbtab.png b/stuff/config/qss/production/uptbtab.png deleted file mode 100644 index 0e3b303..0000000 Binary files a/stuff/config/qss/production/uptbtab.png and /dev/null differ diff --git a/stuff/config/qss/production/vsplitter_handle.png b/stuff/config/qss/production/vsplitter_handle.png deleted file mode 100644 index a1e7564..0000000 Binary files a/stuff/config/qss/production/vsplitter_handle.png and /dev/null differ diff --git a/stuff/config/qss/standard/bottomseparator.png b/stuff/config/qss/standard/bottomseparator.png deleted file mode 100644 index 2461174..0000000 Binary files a/stuff/config/qss/standard/bottomseparator.png and /dev/null differ diff --git a/stuff/config/qss/standard/but.png b/stuff/config/qss/standard/but.png deleted file mode 100644 index b683f77..0000000 Binary files a/stuff/config/qss/standard/but.png and /dev/null differ diff --git a/stuff/config/qss/standard/butdis.png b/stuff/config/qss/standard/butdis.png deleted file mode 100644 index 1318fa8..0000000 Binary files a/stuff/config/qss/standard/butdis.png and /dev/null differ diff --git a/stuff/config/qss/standard/buthover.png b/stuff/config/qss/standard/buthover.png deleted file mode 100644 index 8e96909..0000000 Binary files a/stuff/config/qss/standard/buthover.png and /dev/null differ diff --git a/stuff/config/qss/standard/chk_chk.png b/stuff/config/qss/standard/chk_chk.png deleted file mode 100644 index c8b9cc4..0000000 Binary files a/stuff/config/qss/standard/chk_chk.png and /dev/null differ diff --git a/stuff/config/qss/standard/chk_chk_disabled.png b/stuff/config/qss/standard/chk_chk_disabled.png deleted file mode 100644 index cf08a05..0000000 Binary files a/stuff/config/qss/standard/chk_chk_disabled.png and /dev/null differ diff --git a/stuff/config/qss/standard/chk_unchk.png b/stuff/config/qss/standard/chk_unchk.png deleted file mode 100644 index ab9e9b6..0000000 Binary files a/stuff/config/qss/standard/chk_unchk.png and /dev/null differ diff --git a/stuff/config/qss/standard/chk_unchk_disabled.png b/stuff/config/qss/standard/chk_unchk_disabled.png deleted file mode 100644 index cfa015d..0000000 Binary files a/stuff/config/qss/standard/chk_unchk_disabled.png and /dev/null differ diff --git a/stuff/config/qss/standard/click.png b/stuff/config/qss/standard/click.png deleted file mode 100644 index 6e42b1c..0000000 Binary files a/stuff/config/qss/standard/click.png and /dev/null differ diff --git a/stuff/config/qss/standard/current.png b/stuff/config/qss/standard/current.png deleted file mode 100644 index dca53d5..0000000 Binary files a/stuff/config/qss/standard/current.png and /dev/null differ diff --git a/stuff/config/qss/standard/down_arrow.png b/stuff/config/qss/standard/down_arrow.png deleted file mode 100644 index f37e972..0000000 Binary files a/stuff/config/qss/standard/down_arrow.png and /dev/null differ diff --git a/stuff/config/qss/standard/down_arrow_black.png b/stuff/config/qss/standard/down_arrow_black.png deleted file mode 100644 index d9fbc98..0000000 Binary files a/stuff/config/qss/standard/down_arrow_black.png and /dev/null differ diff --git a/stuff/config/qss/standard/down_arrow_disabled.png b/stuff/config/qss/standard/down_arrow_disabled.png deleted file mode 100644 index d9eefed..0000000 Binary files a/stuff/config/qss/standard/down_arrow_disabled.png and /dev/null differ diff --git a/stuff/config/qss/standard/flipmarker.png b/stuff/config/qss/standard/flipmarker.png deleted file mode 100644 index a35bfd9..0000000 Binary files a/stuff/config/qss/standard/flipmarker.png and /dev/null differ diff --git a/stuff/config/qss/standard/flipslider.png b/stuff/config/qss/standard/flipslider.png deleted file mode 100644 index f402f30..0000000 Binary files a/stuff/config/qss/standard/flipslider.png and /dev/null differ diff --git a/stuff/config/qss/standard/frame.png b/stuff/config/qss/standard/frame.png deleted file mode 100644 index 32e171f..0000000 Binary files a/stuff/config/qss/standard/frame.png and /dev/null differ diff --git a/stuff/config/qss/standard/framedisable.png b/stuff/config/qss/standard/framedisable.png deleted file mode 100644 index e81e80a..0000000 Binary files a/stuff/config/qss/standard/framedisable.png and /dev/null differ diff --git a/stuff/config/qss/standard/framehover.png b/stuff/config/qss/standard/framehover.png deleted file mode 100644 index 38fc3a5..0000000 Binary files a/stuff/config/qss/standard/framehover.png and /dev/null differ diff --git a/stuff/config/qss/standard/ftab.png b/stuff/config/qss/standard/ftab.png deleted file mode 100644 index 155d4a8..0000000 Binary files a/stuff/config/qss/standard/ftab.png and /dev/null differ diff --git a/stuff/config/qss/standard/ftbtab.png b/stuff/config/qss/standard/ftbtab.png deleted file mode 100644 index a16865f..0000000 Binary files a/stuff/config/qss/standard/ftbtab.png and /dev/null differ diff --git a/stuff/config/qss/standard/fuptab.png b/stuff/config/qss/standard/fuptab.png deleted file mode 100644 index 5e11539..0000000 Binary files a/stuff/config/qss/standard/fuptab.png and /dev/null differ diff --git a/stuff/config/qss/standard/fuptbtab.png b/stuff/config/qss/standard/fuptbtab.png deleted file mode 100644 index 66dd2a6..0000000 Binary files a/stuff/config/qss/standard/fuptbtab.png and /dev/null differ diff --git a/stuff/config/qss/standard/h_chandle.png b/stuff/config/qss/standard/h_chandle.png deleted file mode 100644 index aff3e52..0000000 Binary files a/stuff/config/qss/standard/h_chandle.png and /dev/null differ diff --git a/stuff/config/qss/standard/h_handle.png b/stuff/config/qss/standard/h_handle.png deleted file mode 100644 index d8bdf6f..0000000 Binary files a/stuff/config/qss/standard/h_handle.png and /dev/null differ diff --git a/stuff/config/qss/standard/h_handle_disabled.png b/stuff/config/qss/standard/h_handle_disabled.png deleted file mode 100644 index 57ba8e0..0000000 Binary files a/stuff/config/qss/standard/h_handle_disabled.png and /dev/null differ diff --git a/stuff/config/qss/standard/h_slider_left.png b/stuff/config/qss/standard/h_slider_left.png deleted file mode 100644 index 20afa79..0000000 Binary files a/stuff/config/qss/standard/h_slider_left.png and /dev/null differ diff --git a/stuff/config/qss/standard/h_slider_left_disabled.png b/stuff/config/qss/standard/h_slider_left_disabled.png deleted file mode 100644 index d592b52..0000000 Binary files a/stuff/config/qss/standard/h_slider_left_disabled.png and /dev/null differ diff --git a/stuff/config/qss/standard/h_slider_right.png b/stuff/config/qss/standard/h_slider_right.png deleted file mode 100644 index f5525ef..0000000 Binary files a/stuff/config/qss/standard/h_slider_right.png and /dev/null differ diff --git a/stuff/config/qss/standard/h_slider_right_disabled.png b/stuff/config/qss/standard/h_slider_right_disabled.png deleted file mode 100644 index 63103af..0000000 Binary files a/stuff/config/qss/standard/h_slider_right_disabled.png and /dev/null differ diff --git a/stuff/config/qss/standard/hsplitter_handle.png b/stuff/config/qss/standard/hsplitter_handle.png deleted file mode 100644 index ad93550..0000000 Binary files a/stuff/config/qss/standard/hsplitter_handle.png and /dev/null differ diff --git a/stuff/config/qss/standard/left_arrow_black.png b/stuff/config/qss/standard/left_arrow_black.png deleted file mode 100644 index b89cdcc..0000000 Binary files a/stuff/config/qss/standard/left_arrow_black.png and /dev/null differ diff --git a/stuff/config/qss/standard/ltab.png b/stuff/config/qss/standard/ltab.png deleted file mode 100644 index 7fe6408..0000000 Binary files a/stuff/config/qss/standard/ltab.png and /dev/null differ diff --git a/stuff/config/qss/standard/ltbtab.png b/stuff/config/qss/standard/ltbtab.png deleted file mode 100644 index f99cb00..0000000 Binary files a/stuff/config/qss/standard/ltbtab.png and /dev/null differ diff --git a/stuff/config/qss/standard/menuseparator.PNG b/stuff/config/qss/standard/menuseparator.PNG deleted file mode 100644 index 0a44fae..0000000 Binary files a/stuff/config/qss/standard/menuseparator.PNG and /dev/null differ diff --git a/stuff/config/qss/standard/oouptab.png b/stuff/config/qss/standard/oouptab.png deleted file mode 100644 index 69df8e4..0000000 Binary files a/stuff/config/qss/standard/oouptab.png and /dev/null differ diff --git a/stuff/config/qss/standard/over.png b/stuff/config/qss/standard/over.png deleted file mode 100644 index 5ea84de..0000000 Binary files a/stuff/config/qss/standard/over.png and /dev/null differ diff --git a/stuff/config/qss/standard/radio.png b/stuff/config/qss/standard/radio.png deleted file mode 100644 index ef901a8..0000000 Binary files a/stuff/config/qss/standard/radio.png and /dev/null differ diff --git a/stuff/config/qss/standard/radio_p.png b/stuff/config/qss/standard/radio_p.png deleted file mode 100644 index 277940f..0000000 Binary files a/stuff/config/qss/standard/radio_p.png and /dev/null differ diff --git a/stuff/config/qss/standard/right_arrow_black.png b/stuff/config/qss/standard/right_arrow_black.png deleted file mode 100644 index 8878c62..0000000 Binary files a/stuff/config/qss/standard/right_arrow_black.png and /dev/null differ diff --git a/stuff/config/qss/standard/sb_downarrow.png b/stuff/config/qss/standard/sb_downarrow.png deleted file mode 100644 index cc9e76b..0000000 Binary files a/stuff/config/qss/standard/sb_downarrow.png and /dev/null differ diff --git a/stuff/config/qss/standard/sb_h.png b/stuff/config/qss/standard/sb_h.png deleted file mode 100644 index 8ea48c5..0000000 Binary files a/stuff/config/qss/standard/sb_h.png and /dev/null differ diff --git a/stuff/config/qss/standard/sb_hhandle.png b/stuff/config/qss/standard/sb_hhandle.png deleted file mode 100644 index d17bdc3..0000000 Binary files a/stuff/config/qss/standard/sb_hhandle.png and /dev/null differ diff --git a/stuff/config/qss/standard/sb_hline.png b/stuff/config/qss/standard/sb_hline.png deleted file mode 100644 index a94e491..0000000 Binary files a/stuff/config/qss/standard/sb_hline.png and /dev/null differ diff --git a/stuff/config/qss/standard/sb_larrow.png b/stuff/config/qss/standard/sb_larrow.png deleted file mode 100644 index eb9904e..0000000 Binary files a/stuff/config/qss/standard/sb_larrow.png and /dev/null differ diff --git a/stuff/config/qss/standard/sb_rarrow.png b/stuff/config/qss/standard/sb_rarrow.png deleted file mode 100644 index c13720c..0000000 Binary files a/stuff/config/qss/standard/sb_rarrow.png and /dev/null differ diff --git a/stuff/config/qss/standard/sb_uparrow.png b/stuff/config/qss/standard/sb_uparrow.png deleted file mode 100644 index 64f2da3..0000000 Binary files a/stuff/config/qss/standard/sb_uparrow.png and /dev/null differ diff --git a/stuff/config/qss/standard/sb_v.png b/stuff/config/qss/standard/sb_v.png deleted file mode 100644 index 5822808..0000000 Binary files a/stuff/config/qss/standard/sb_v.png and /dev/null differ diff --git a/stuff/config/qss/standard/sb_vhandle.png b/stuff/config/qss/standard/sb_vhandle.png deleted file mode 100644 index a1147e0..0000000 Binary files a/stuff/config/qss/standard/sb_vhandle.png and /dev/null differ diff --git a/stuff/config/qss/standard/sb_vline.png b/stuff/config/qss/standard/sb_vline.png deleted file mode 100644 index 2ac4415..0000000 Binary files a/stuff/config/qss/standard/sb_vline.png and /dev/null differ diff --git a/stuff/config/qss/standard/sl_groove.png b/stuff/config/qss/standard/sl_groove.png deleted file mode 100644 index 37c82ed..0000000 Binary files a/stuff/config/qss/standard/sl_groove.png and /dev/null differ diff --git a/stuff/config/qss/standard/standard.qss b/stuff/config/qss/standard/standard.qss deleted file mode 100644 index 9796129..0000000 --- a/stuff/config/qss/standard/standard.qss +++ /dev/null @@ -1,1020 +0,0 @@ -/* TOONZ 6.1 Qt Style Test - Digital Video 2007 -*/ - -/*---------------------------------------------------------------------------*/ -QMainWindow #MainStackedWidget { - border: 6px solid rgb(90,90,90); - background-color: rgb(90,90,90); -} -/*---------------------------------------------------------------------------*/ -TPanel { - qproperty-BGColor: rgb(235,235,235); - background-color: rgb(235,235,235); -} -/*---------------------------------------------------------------------------*/ -.QWidget { -} -/*---------------------------------------------------------------------------*/ -/* QMenuBar */ -QMenuBar { - background-color: rgb(225,225,225); -} -/*---------------------------------------------------------------------------*/ -/*Menu*/ -#fxMenu::item:checked, #fxMenu::item:unchecked { - padding: 2px 25px 2px 20px; - border: 1px solid transparent; - background-color: rgb(225,225,225); - color: black; - font-weight: bold; -} -#fxMenu::indicator:unchecked { - image: url(); -} -#fxMenu::indicator:checked { - image: url(); -} -#fxMenu::item:selected { - background-color: rgb(49,106,197); - color: white; - border-color: darkblue; -} -#fxMenu::item:disabled { - color: gray; - background-color: rgb(225,225,225); -} -QMenu { - margin: 2px; - background-color: rgb(225,225,225); - border: 1px solid black; -} -QMenu::item { - padding: 2px 25px 2px 20px; - border: 1px solid transparent; - color: black; -} -QMenu::separator { - background-image: url(qss/standard/menuseparator.png) 1; - height: 2px; - margin-bottom: 2px; - margin-top: 2px; - margin-left: 5px; - margin-right: 5px; -} -QMenu::item:selected { - background-color: rgb(49,106,197); - color: white; - border-color: darkblue; -} -QMenu::item:disabled { - color: gray; - background-color: rgb(225,225,225); - border: 1px solid transparent; -} -QMenu::indicator { - width: 13px; - height: 13px; -} -QMenu::indicator:unchecked { - image: url(qss/standard/chk_unchk.png); -} -QMenu::indicator:unchecked:disabled { - image: url(qss/standard/chk_unchk_disabled.png); -} -QMenu::indicator:checked { - image: url(qss/standard/chk_chk.png); -} -QMenu::indicator:checked:disabled { - image: url(qss/standard/chk_chk_disabled.png); -} -/*---------------------------------------------------------------------------*/ -/*PopupButton*/ -PopupButton { - padding-left:-8px; - padding-right:4px; -} -PopupButton QMenu { - background-color: rgb(225,225,225); - border: 0px; - padding: -1px; -} -PopupButton QMenu::item { - border: 1px solid transparent; - color: black; -} -PopupButton::menu-indicator { - image: url(qss/standard/down_arrow.png); - width: 10px; - height: 17px; - border-left: 1px solid grey; -} -PopupButton::menu-indicator:disabled { - image: url(qss/standard/down_arrow_disabled.png); -} -/*---------------------------------------------------------------------------*/ -/*Outline Style PopupButtons*/ -PopupButton#Cap { - min-width: 32px; max-width: 32px; -} -PopupButton#Cap QMenu { - min-width: 18px; max-width: 18px; -} -PopupButton#Cap QMenu::item { - min-width: 16px; max-width: 16px; - padding: 0px; -} -PopupButton#Join { - min-width: 32px; max-width: 32px; -} -PopupButton#Join QMenu { - min-width: 18px; max-width: 18px; -} -PopupButton#Join QMenu::item { - min-width: 16px; max-width: 16px; - padding: 0px; -} -/*---------------------------------------------------------------------------*/ -/* Generic QFrame */ -QFrame { - border: 0px; - margin: 0px; - background-color: rgb(235,235,235); -} -QFrame:disabled { -} -#OnePixelMarginFrame { - margin: 1px; -} -/*---------------------------------------------------------------------------*/ -/* QDialog */ -QDialog #dialogButtonFrame { - border-top: 1px solid rgb(120,120,120); - background-color: rgb(225,225,225); -} -QDialog #dialogButtonFrame QLabel { - background-color: rgb(225,225,225); -} -QDialog #dialogMainFrame { - background-color: rgb(235,235,235); - border: none; -} -/*---------------------------------------------------------------------------*/ -/* Special setting for the styleEditor */ -StyleEditor .QScrollArea { - margin: 0px; - border-right: 1px solid rgb(120,120,120); -} -#styleEditorPage { - border: 0px; -} -StyleEditor QToolBar { - border-right: 1px solid rgb(120,120,120); -} -/*---------------------------------------------------------------------------*/ -/*Panel title bar*/ -#HorizontalPanelTitleBar { - background-color: transparent; - border-width: 8px; - border-image: url(qss/standard/titlebar_horizontal.png) 8; -} -#VerticalPanelTitleBar[Active="true"] { - background-color: transparent; - border-width: 8px; - border-image: url(qss/standard/titlebar_vertical.png) 8; -} -#VerticalPanelTitleBar[Active="false"] { - background-color: transparent; - border-width: 8px; - border-image: url(qss/standard/titlebar_vertical_inactive.png) 8; -} -/*---------------------------------------------------------------------------*/ -#SchematicSceneViewer { - background-color: rgb(210,210,210); -} -/*---------------------------------------------------------------------------*/ -/*SceneViewer Ruler*/ -Ruler { - qproperty-ParentBGColor: rgb(235,235,235); -} -/*---------------------------------------------------------------------------*/ -/* Menu bar */ -#subXsheetTabBarContainer { - background-color: rgb(160,160,160); -} -SubSheetBar { - qproperty-ParentBGColor: rgb(225,225,225); -} -#dvTopBar { - background-color: rgb(225,225,225); -} -/*---------------------------------------------------------------------------*/ -/* Tool bar */ -#ToolBarContainer { - background-color: rgb(225,225,225); -} -/*---------------------------------------------------------------------------*/ -/* Tab bar */ -#TabBarContainer { - border: none; - background-color: rgb(235,235,235); -} -/*---------------------------------------------------------------------------*/ -/* File Browser Tree and Cast Tree background*/ -#BrowserTreeView { - background-color: white; -} -/*---------------------------------------------------------------------------*/ -/* Customize sheet scrollArea */ -/* Sheet scrollAreas. - NB.: SheetViewer e XsheetViewer va reso un unico oggetto - una volta che si e' uniformato completamente l'xsheet alle colonne numeriche.*/ -SpreadsheetViewer { - background-color: rgb(210,210,210); - qproperty-LightLightBGColor: rgb(250,250,250); - qproperty-LightBGColor: rgb(240,240,240); - qproperty-BGColor: rgb(230,230,230); - qproperty-DarkBGColor: rgb(225,225,225); - qproperty-LightLineColor: rgb(210,210,210); - qproperty-DarkLineColor: rgb(150,150,150); -} -#ScrollArea { - border:1px solid rgb(150, 150, 150); -} -#CellScrollArea { - border-top:1px solid rgb(150, 150, 150); - border-left:1px solid rgb(150, 150, 150); -} -/* XSheet scrollAreas (row, column and cell) */ -XsheetViewer { - background-color: rgb(210,210,210); - qproperty-LightLightBGColor: rgb(250,250,250); - qproperty-LightBGColor: rgb(240,240,240); - qproperty-BGColor: rgb(230,230,230); - qproperty-DarkBGColor: rgb(225,225,225); - qproperty-LightLineColor: rgb(210,210,210); - qproperty-DarkLineColor: rgb(150,150,150); -} -#xsheetScrollArea { - background-color: rgb(210,210,210); - margin: 1px; -} -#cornerWidget { - background-color: rgb(210,210,210); -} -#XshColumnChangeObjectWidget { - background-color: rgb(235,235,235); - selection-background-color: rgb(49,106,197); - border: 1px solid black -} -/*---------------------------------------------------------------------------*/ -/* Customize Function Area */ -FunctionPanel { - qproperty-BGColor: rgb(225,225,225); - qproperty-ValueLineColor: rgb(186,186,186); - qproperty-FrameLineColor: rgb(210,210,210); - qproperty-OtherCurvesColor: rgb(150,150,150); - qproperty-RulerBackground: rgb(255,255,255); -} -/*---------------------------------------------------------------------------*/ -/* Customize FilmStrip color */ -FilmstripFrames { - qproperty-BGColor: rgb(225,225,225); - qproperty-LightLineColor: rgb(210,210,210); - qproperty-DarkLineColor: rgb(150,150,150); -} -/*---------------------------------------------------------------------------*/ -/* Main toolbar */ -QToolBar { - /* top right bottom left */ - margin: 0px; - padding: 0px; - border-top: 1px solid rgb(120,120,120); - background-color: rgb(225,225,225); - border-image: none; -} -QToolBar::separator { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 0px; - image: url(qss/standard/bottomseparator.png); - width: 3px; -} -QToolBar QToolButton[checkable=false] { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 2px solid transparent; - padding-right: 2px; - border-image: none; - background-color: rgb(225,225,225); -} -QToolBar QToolButton:disabled { - border-image: none; -} -QToolBar QToolButton[checkable=false]:hover { - border-width: 2; - border-image: url(qss/standard/over.png) 2; -} -QToolBar QToolButton[checkable=false]:checked, -QToolBar QToolButton[checkable=false]:pressed { - border-width: 2; - border-image: url(qss/standard/click.png) 2; -} -/*Chackable buttons: NO border image*/ -QToolBar QToolButton[checkable=true] { - /* top right bottom left */ - margin: 1px -3px 0px -3px; - border: 0px solid transparent; - border-image: none; -} -QToolBar QToolButton[checkable=true]:hover { - image: none; -} -QToolBar QToolButton[checkable=true]:checked, -QToolBar QToolButton[checkable=true]:pressed { - border-image: none; -} -QToolBar QToolButton#chackableButtonWithImageBorder { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 2px solid transparent; - padding-right: 2px; - border-image: none; - background-color: rgb(225,225,225); -} -QToolBar QToolButton#chackableButtonWithImageBorder:hover { - border-width: 2; - border-image: url(qss/standard/over.png) 2; -} -QToolBar QToolButton#chackableButtonWithImageBorder:checked, -QToolBar QToolButton#chackableButtonWithImageBorder:pressed { - border-width: 2; - border-image: url(qss/standard/click.png) 2; -} -QToolBar QToolButton::menu-button { - margin-top: 1px; - border-image: none; - background-color: rgb(225,225,225); -} -QToolBar QLabel { - margin-top: 1px; - background-color: rgb(225,225,225); - border-width: 2; -} -/* To hide Arrow !! */ -QToolBar QToolButton::menu-indicator { - image: none; -} -/*---------------------------------------------------------------------------*/ -/* Tool Bar (vertical)*/ -/* 6.4: #toolBar is now a scrollable container of the actual QToolBar */ -#toolBar { - margin: 1px; - background-color: rgb(225,225,225); -} -#toolBar QToolBar { - border: none; - margin: 1px; -} -#toolBar QToolBar::separator { - image: none; - margin: 0px 1px 0px 1px; - background-color: rgb(120,120,120); - height: 1px; -} -#toolBar QToolButton { - margin: 0px; - border: 2px solid transparent; - border-image: none; - background-color: rgb(225,225,225); -} -#toolBar QToolButton:pressed { - border-image: url(qss/standard/click.png) 2; - border-width: 2; -} -#toolBar QToolButton:checked { - border-image: url(qss/standard/current.png) 2; - border-width: 2; -} -#toolBar QPushButton { - border: 1px solid black; -} -/*---------------------------------------------------------------------------*/ -/* ToolOptionPanel ToolBar */ -#toolOptionBar { - border: 0px; - margin: 0px; - background-color: rgb(235,235,235); -} -#toolOptionBar::separator { - image: none; - margin-top: 0px; - margin-bottom: 0px; - margin-left: 1px; - margin-right: 1px; - background-color: rgb(120,120,120); - height: 30px; - width: 1px; -} -#toolOptionBar QWidget { - background-color: rgb(235,235,235); -} -/*---------------------------------------------------------------------------*/ -/*Key frame navigator*/ -#keyFrameNavigator QToolButton { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 2px solid transparent; - padding-right: 1px; - border-image: none; - background-color: rgb(225,225,225); -} -#keyFrameNavigator QToolButton:hover { - margin: 1px 0px 0px 0px; - border-width: 2; - border-image: url(qss/standard/over.png) 2; -} -#keyFrameNavigator QToolButton:checked, -#keyFrameNavigator QToolButton:pressed { - border-width: 2; - border-image: url(qss/standard/click.png) 2; -} -/*---------------------------------------------------------------------------*/ -QMessageBox { - background-color: rgb(235,235,235); - border: 1px solid rgb(120,120,120); -} -/*---------------------------------------------------------------------------*/ -/* Customize arrows. */ -QComboBox::down-arrow, QComboBox::menu-indicator { - image: url(qss/standard/down_arrow.png); - width: 7px; - height: 7px; -} -QComboBox::down-arrow:disabled, QComboBox::down-arrow:off { - image: url(qss/standard/down_arrow_disabled.png); -} -QComboBox::up-arrow { - image: url(qss/standard/up_arrow.png); - width: 7px; - height: 7px; -} -QComboBox::up-arrow:disabled, QComboBox::up-arrow:off { - image: url(qss/standard/up_arrow_disabled.png); -} -/*---------------------------------------------------------------------------*/ -QPushButton { - border-image: url(qss/standard/but.png) 2; - border-width: 2; - color: black; -} -/*---------------------------------------------------------------------------*/ -#PeggingWidget { - background-color: rgb(0,0,0); -} -/*---------------------------------------------------------------------------*/ -#PeggingButton { - border-image: none; - background-color: rgb(228,228,228); - border: 0px solid black; -} -#PeggingButton:hover { - border-image: url(qss/standard/over.png) 2; - border-width: 2; -} -#PeggingButton:pressed { - border-image: url(qss/standard/click.png) 2; - border-width: 2; -} -#PeggingButton:checked { - border-image: none; - background-color: rgb(255,255,255); - border-left-color: lightgray; - border-left-width: 2px; - border-top-color: lightgray; - border-top-width: 2px; - border-right-width: 0px; - border-bottom-width: 0px; -} -/*---------------------------------------------------------------------------*/ -QComboBox[editable="false"] { - border-image: url(qss/standard/but.png) 2; - border-width: 2; -} -QComboBox[editable="true"] { - border-image: url(qss/standard/but.png) 2; - border-width: 2; -} -QComboBox:disabled, QPushButton:disabled { - border-image: url(qss/standard/butdis.png) 2; - border-width: 2; - height: 22px; - color: rgb(120,120,120); -} -QComboBox:hover, QPushButton:hover { - border-image: url(qss/standard/buthover.png) 2; - border-width: 2; - height: 22px; -} -QComboBox:pressed, QPushButton:pressed { - border-image: url(qss/standard/but.png) 2; - border-width: 2; - height: 22px; -} -/* Customize non-editable comboboxes drop-down */ -QComboBox[editable="false"] { - padding-left: 3px; - padding-right: 2px; -} -QComboBox[editable="false"]::drop-down { - width: 15px; - border-left-style: solid; - border-left-color: darkgray; - border-left-width: 1px; -} -/* Customize editable comboboxes.*/ -QComboBox[editable="true"] { - padding-right: 16px; -} -QComboBox[editable="true"]::drop-down { - subcontrol-origin: border; - subcontrol-position: top right; - width: 13px; - position: absolute; - top: 2px; - bottom: 2px; - right: 2px; -} -QComboBox[editable="true"]::drop-down, -QComboBox[editable="true"]::drop-down:hover, -QComboBox[editable="true"]::drop-down:on { - border-width: 0px; - border-left-width: 3px; /* we need only left and center part */ -} -/*---------------------------------------------------------------------------*/ -/* The animated, scrollable toolbar containers */ -DvScrollWidget > QPushButton { - border-image: none; - border: 0px solid black; - background-color: rgb(225,225,225); -} -DvScrollWidget > QPushButton:hover { - border-image: none; - border: 0px solid black; - background-color: rgb(245,245,245); -} -DvScrollWidget > QPushButton:pressed { - border-image: none; - border: 0px solid black; - background-color: rgb(215,215,215); -} -#ScrollLeftButton { - image: url(qss/standard/left_arrow_black.png); - border-right: 1px solid black; - min-width: 15px; - max-width: 15px; -} -#ScrollRightButton { - image: url(qss/standard/right_arrow_black.png); - border-left: 1px solid black; - min-width: 15px; - max-width: 15px; -} -#ScrollUpButton { - image: url(qss/standard/up_arrow_black.png); - border-bottom: 1px solid black; - min-height: 15px; - max-height: 15px; -} -#ScrollDownButton { - image: url(qss/standard/down_arrow_black.png); - border-top: 1px solid black; - min-height: 15px; - max-height: 15px; -} -/* Flipbook toolbar-specific */ -#ToolBarContainer #ScrollLeftButton { - margin-top: 1px; -} -#ToolBarContainer #ScrollRightButton { - margin-top: 1px; -} -/*---------------------------------------------------------------------------*/ -/* QToolButton */ -QToolButton { - border-image: url(qss/standard/but.png) 2; - border-width: 2; -} -QToolButton:disabled { - border-image: url(qss/standard/butdis.png) 2; - border-width: 2; -} -QToolButton:hover { - border-image: url(qss/standard/buthover.png) 2; - border-width: 2; -} -QToolButton:disabled:hover { - margin-top: 1px; - border-image: none; - border-width: 0px; -} -QToolButton:pressed { - border-image: url(qss/standard/but.png) 2; - border-width: 2; -} -QToolButton:checked { - border-image: url(qss/standard/buthover.png) 2; - border-width: 2; -} -/*---------------------------------------------------------------------------*/ -#ToolbarToolButton { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 2px solid transparent; - padding-right: 1px; - border-image: none; -} -#ToolbarToolButton:hover { - margin: 1px 0px 0px 0px; - border-width: 2; - border-image: url(qss/standard/over.png) 2; -} -#ToolbarToolButton:checked, -#ToolbarToolButton:pressed { - border-width: 2; - border-image: url(qss/standard/click.png) 2; -} -/*---------------------------------------------------------------------------*/ -#StyleEditorArrowButton { - margin: 0px 0px 0px 0px; - border: 1px solid transparent; - border-image: none; - background-color: rgb(235,235,235); -} -#StyleEditorArrowButton:hover { - border-width: 1; - border-image: url(qss/standard/over.png) 1; -} -#StyleEditorArrowButton:checked, -#StyleEditorArrowButton:pressed { - border-width: 1; - border-image: url(qss/standard/click.png) 1; -} -/*---------------------------------------------------------------------------*/ -/* QLineEdit */ -QLineEdit { - border-image: url(qss/standard/frame.png) 3; - border-width: 3; -} -QLineEdit::focus { - border-image: url(qss/standard/framehover.png) 3; - border-width: 3; -} -QLineEdit:disabled { - color: rgb(128,128,128); - border-image: url(qss/standard/framedisable.png) 3; -} -/*---------------------------------------------------------------------------*/ -/* QPlainTextEdit & QTextEdit*/ -QPlainTextEdit, QTextEdit { - border-image: url(qss/standard/frame.png) 3; - border-width: 3; -} -QPlainTextEdit::focus, QTextEdit::focus { - border-image: url(qss/standard/framehover.png) 3; - border-width: 3; -} -QPlainTextEdit:disabled, QTextEdit::disabled { - color: rgb(128,128,128); - border-image: url(qss/standard/framedisable.png) 3; -} -/*---------------------------------------------------------------------------*/ -/* QGroupBox */ -QGroupBox -{ - background-color: none; - margin-top: 5px; - padding-top: 5px; - border: 1px solid; - border-radius: 3px; -} -QGroupBox:enabled -{ - border-color: rgb(120, 120, 120); -} -QGroupBox:disabled -{ - border-color: rgb(180, 180, 180); -} -QGroupBox::title { - subcontrol-origin: border; - top: -6px; - left: 6px; -} -/*---------------------------------------------------------------------------*/ -/* QStatusBar */ -QStatusBar { - background-color: rgb(235,235,235); -} -/*---------------------------------------------------------------------------*/ -/* Customize Horizontal QSlider. */ -QSlider { - height: 20; -} -QSlider::groove:horizontal { - border-image: url(qss/standard/sl_groove.png) 1; - border-width: 1; - height: 1px; -} -QSlider::handle:horizontal:enabled { - image: url(qss/standard/h_handle.png); - width: 16px; - margin: -16px -4px; -} -QSlider::handle:horizontal:disabled { - image: url(qss/standard/h_handle_disabled.png); - width: 16px; - margin: -16px -4px; -} - - -/* Customize Horizontal QSlider that have name "colorSlider" */ -#colorSlider::groove:horizontal { - border-image: none; -} -#colorSlider::handle:horizontal { - image: url(qss/standard/h_chandle.png); - width: 16px; - margin: -16px -3px -16px -4px; -} - -/*---------------------------------------------------------------------------*/ - -#IntPairField { - qproperty-HandleLeftPixmap: url(qss/standard/h_slider_left.png); - qproperty-HandleRightPixmap: url(qss/standard/h_slider_right.png); - qproperty-HandleLeftGrayPixmap: url(qss/standard/h_slider_left_disabled.png); - qproperty-HandleRightGrayPixmap: url(qss/standard/h_slider_right_disabled.png); -} - -/*---------------------------------------------------------------------------*/ - -#DoublePairField { - qproperty-HandleLeftPixmap: url(qss/standard/h_slider_left.png); - qproperty-HandleRightPixmap: url(qss/standard/h_slider_right.png); - qproperty-HandleLeftGrayPixmap: url(qss/standard/h_slider_left_disabled.png); - qproperty-HandleRightGrayPixmap: url(qss/standard/h_slider_right_disabled.png); -} - -/*---------------------------------------------------------------------------*/ - -/* Flipbook Slider. */ -FlipSlider { - - /*Fixed height of the slider. It's a Q_PROPERTY since on mac the min-height/max-height trick seems - to be not working*/ - qproperty-PBHeight: 10; - - /*Overlay and marker appearences*/ - qproperty-PBOverlay: url(qss/standard/flipslider.png); - qproperty-PBMarker: url(qss/standard/flipmarker.png); - - /*Margins for the colored frame indicators and the marker. - NOTE: The above images are cut in 3 pieces according to the left-right margin components. The margin - parts are reproduced identically at the sides of the slider colorbar. - The middle part is stretched to cover the slider width.*/ - qproperty-PBColorMarginLeft: 2; - qproperty-PBColorMarginTop: 2; - qproperty-PBColorMarginRight: 2; - qproperty-PBColorMarginBottom: 3; - - /*The marker margins are shown at the sides of the colorbar rect corresponding to a frame.*/ - qproperty-PBMarkerMarginLeft: 2; - qproperty-PBMarkerMarginRight: 2; - - /*Colors shown for the colorbar. The base color is commonly used outside render contexts. - The others refer to the status of the render for single frames.*/ - qproperty-baseColor: rgb(235,235,235); - qproperty-notStartedColor: rgb(210,40,40); - qproperty-startedColor: rgb(220,160,160); - qproperty-finishedColor: rgb(235,235,235); -} - -/*---------------------------------------------------------------------------*/ -/* Customize QTabBar */ -QTabBar { - height: 22px; - border: 0px; -} -QTabBar::tab { - top: -1px; - min-width: 54px; - min-height: 15px; -} -QTabBar::tab:selected { - padding-top: 2px; - border-image: url(qss/standard/uptab.png) 4; - border-width: 4; -} -QTabBar::tab:only-one { - padding-top: 2px; - border-image: url(qss/standard/oouptab.png) 4; - border-width: 4; -} -QTabBar::tab:first:selected { - border-image: url(qss/standard/fuptab.png) 4; - border-width: 4; -} -QTabBar::tab:!selected { - margin-top: 2px; - border-image: url(qss/standard/tab.png) 4; - border-width: 4; -} -QTabBar::tab:first:!selected { - border-image: url(qss/standard/ftab.png) 4; - border-width: 4; -} -QTabBar::tab:last:!selected { - border-image: url(qss/standard/ltab.png) 4; - border-width: 4; -} -/* Customize RoomTabWidget */ -/* ATTENTION: These declarations must be putted after the QTabBar ones */ -RoomTabWidget { - height: 22px; - background-color: rgb(160,160,160); - color: white; -} -RoomTabWidget::tab { - top: 1px; - min-width: 54px; - min-height: 15px; -} -RoomTabWidget::tab:selected { - border-image: url(qss/standard/uptbtab.png) 4; - border-width: 4; - font: bold; -} -RoomTabWidget::tab:first:selected, RoomTabWidget::tab:only-one { - border-image: url(qss/standard/fuptbtab.png) 4; - border-width: 4; - font: bold; -} -RoomTabWidget::tab:!selected { - margin-top: 2px; - border-image: url(qss/standard/tbtab.png) 4; - border-width: 4; - font: normal; -} -RoomTabWidget::tab:first:!selected { - border-image: url(qss/standard/ftbtab.png) 4; - border-width: 4; -} -RoomTabWidget::tab:last:!selected { - border-image: url(qss/standard/ltbtab.png) 4; - border-width: 4; -} -/*---------------------------------------------------------------------------*/ -/* Customize QScrollBar horizontal*/ -QScrollBar:horizontal { - background-image: url(qss/standard/sb_h.png); - height: 16px; - margin-top: 0px; - margin-bottom: 0px; - margin-right:15px; - margin-left:15px; -} -QScrollBar::handle:horizontal { - border-image: url(qss/standard/sb_hhandle.png)3; - border-width: 3; - image: url(qss/standard/sb_hline.png); - image-position: center center; -} -QScrollBar::add-line:horizontal { - image: url(qss/standard/sb_rarrow.png); - width: 15px; - subcontrol-position: right; - subcontrol-origin: margin; -} -QScrollBar::sub-line:horizontal { - image: url(qss/standard/sb_larrow.png); - width: 15px; - subcontrol-position: left; - subcontrol-origin: margin; -} -QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal { - background: none; -} -/* Customize QScrollBar vertical*/ -QScrollBar:vertical { - background-image: url(qss/standard/sb_v.png); - width: 16px; - margin-left: 0px; - margin-right: 0px; - margin-top:15px; - margin-bottom:15px; -} -QScrollBar::handle:vertical { - border-image: url(qss/standard/sb_vhandle.png)3; - border-width: 3; - image: url(qss/standard/sb_vline.png); - image-position: center center; -} -QScrollBar::add-line:vertical { - image: url(qss/standard/sb_downarrow.png); - height: 15px; - subcontrol-position: bottom; - subcontrol-origin: margin; -} -QScrollBar::sub-line:vertical { - image: url(qss/standard/sb_uparrow.png); - height: 15px; - subcontrol-position: top; - subcontrol-origin: margin; -} -QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { - background: none; -} -/*---------------------------------------------------------------------------*/ -/* Customize check boxes. */ -QCheckBox { - spacing: 1px; -} -QCheckBox::indicator { - width: 13px; - height: 13px; -} -QCheckBox::indicator:unchecked, QTreeView::indicator:unchecked { - image: url(qss/standard/chk_unchk.png); -} -QCheckBox::indicator:unchecked:disabled, QTreeView::indicator:unchecked:disabled { - image: url(qss/standard/chk_unchk_disabled.png); -} -QCheckBox::indicator:checked, QTreeView::indicator:checked { - image: url(qss/standard/chk_chk.png); -} -QCheckBox::indicator:checked:disabled, QTreeView::indicator:checked:disabled { - image: url(qss/standard/chk_chk_disabled.png); -} -/*---------------------------------------------------------------------------*/ -/* Customize radio buttons. */ -QRadioButton { - spacing: 5px; -} -QRadioButton::indicator { - width: 13px; - height: 13px; -} -QRadioButton::indicator::unchecked { - image: url(qss/standard/radio.png); -} -QRadioButton::indicator::checked { - image: url(qss/standard/radio_p.png); -} -/*---------------------------------------------------------------------------*/ -/* QSplitter (Un pochettino assumo che sono tutti verticali) */ -QSplitter { - background-color: rgb(235,235,235); -} -QSplitter::handle { - margin: 0px; - background-color: rgb(225,225,225); -} -QSplitter::handle:horizontal { - image: url(qss/standard/hsplitter_handle.png); - border-left: 1px solid rgb(120,120,120); - border-right: 1px solid rgb(120,120,120); - image-position: center center; -} -QSplitter::handle:vertical { - image: url(qss/standard/vsplitter_handle.png); - border-top: 1px solid rgb(120,120,120); - border-bottom: 1px solid rgb(120,120,120); - padding-left: 1px; - padding-right: 1px; - image-position: center center; -} -/*---------------------------------------------------------------------------*/ -/* QToolTip */ -QToolTip { - border: 1px solid black; - background-color: rgb(255,255,225); -} -/*---------------------------------------------------------------------------*/ -/* Generic Separators with inscribed name */ -DVGui--Separator { - alternate-background-color: rgb(120, 120, 120); /* line color */ -} -/*---------------------------------------------------------------------------*/ -/* Export Level Popup Options */ -#ExportLevelOptions -{ - background-color: rgb(225,225,225); -} -#ExportLevelOptions QWidget -{ - background-color: none; -} -ExportLevelPopup DVGui--Separator { - padding: 0px 5px 0px 5px; -} diff --git a/stuff/config/qss/standard/standard_mac.qss b/stuff/config/qss/standard/standard_mac.qss deleted file mode 100644 index d784a0c..0000000 --- a/stuff/config/qss/standard/standard_mac.qss +++ /dev/null @@ -1,1054 +0,0 @@ -/* TOONZ 6.1 Qt Style Test - Digital Video 2007 -*/ - -/*---------------------------------------------------------------------------*/ -QMainWindow #MainStackedWidget { - border: 6px solid rgb(90,90,90); - background-color: rgb(90,90,90); -} -/*---------------------------------------------------------------------------*/ -/*------------ Mac OS ------------*/ -TPanel { - qproperty-BGColor: rgb(235,235,235); - background-color: rgb(235,235,235); - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -/*---------------------------------------------------------------------------*/ -.QWidget { -} -/*---------------------------------------------------------------------------*/ -/* QMenuBar */ -QMenuBar { - background-color: rgb(225,225,225); - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -/*---------------------------------------------------------------------------*/ -/*Menu*/ -#fxMenu::item:checked, #fxMenu::item:unchecked { - padding: 2px 25px 2px 20px; - border: 1px solid transparent; - background-color: rgb(225,225,225); - color: black; - font-weight: bold; -} -#fxMenu::indicator:unchecked { - image: url(); -} -#fxMenu::indicator:checked { - image: url(); -} -#fxMenu::item:selected { - background-color: rgb(49,106,197); - color: white; - border-color: darkblue; -} -#fxMenu::item:disabled { - color: gray; - background-color: rgb(225,225,225); -} -QMenu { - margin: 2px; - background-color: rgb(225,225,225); - border: 1px solid black; - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -QMenu::item { - padding: 2px 25px 2px 20px; - border: 1px solid transparent; - color: black; -} -QMenu::separator { - background-image: url(qss/standard/menuseparator.png) 1; - height: 2px; - margin-bottom: 2px; - margin-top: 2px; - margin-left: 5px; - margin-right: 5px; -} -QMenu::item:selected { - background-color: rgb(49,106,197); - color: white; - border-color: darkblue; -} -QMenu::item:disabled { - color: gray; - background-color: rgb(225,225,225); - border: 1px solid transparent; -} -QMenu::indicator { - width: 13px; - height: 13px; -} -QMenu::indicator:unchecked { - image: url(qss/standard/chk_unchk.png); -} -QMenu::indicator:unchecked:disabled { - image: url(qss/standard/chk_unchk_disabled.png); -} -QMenu::indicator:checked { - image: url(qss/standard/chk_chk.png); -} -QMenu::indicator:checked:disabled { - image: url(qss/standard/chk_chk_disabled.png); -} -/*---------------------------------------------------------------------------*/ -QPushButton { - margin-bottom: -1px; - border-image: url(qss/standard/but.png) 2; - border-width: 2; - color: black; - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -/*---------------------------------------------------------------------------*/ -/* Generic QFrame */ -QFrame { - border: 0px; - margin: 0px; - background-color: rgb(235,235,235); - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; - -} -QFrame:disabled { -} -#OnePixelMarginFrame { - margin: 1px; -} -/*---------------------------------------------------------------------------*/ -/* QDialog */ -QDialog #dialogButtonFrame { - border-top: 1px solid rgb(120,120,120); - background-color: rgb(225,225,225); -} -QDialog #dialogButtonFrame QLabel { - background-color: rgb(225,225,225); -} -QDialog #dialogMainFrame { - background-color: rgb(235,235,235); - border: none; -} -/*---------------------------------------------------------------------------*/ -/* Special setting for the styleEditor */ -StyleEditor .QScrollArea { - margin: 0px; - border-right: 1px solid rgb(120,120,120); -} -#styleEditorPage { - border: 0px; -} -StyleEditor QToolBar { - border-right: 1px solid rgb(120,120,120); -} -/*---------------------------------------------------------------------------*/ -/*Panel title bar*/ -#HorizontalPanelTitleBar { - background-color: transparent; - border-width: 8px; - border-image: url(qss/standard/titlebar_horizontal.png) 8; -} -#VerticalPanelTitleBar[Active="true"] { - background-color: transparent; - border-width: 8px; - border-image: url(qss/standard/titlebar_vertical.png) 8; -} -#VerticalPanelTitleBar[Active="false"] { - background-color: transparent; - border-width: 8px; - border-image: url(qss/standard/titlebar_vertical_inactive.png) 8; -} -/*---------------------------------------------------------------------------*/ -#SchematicSceneViewer { - background-color: rgb(210,210,210); -} -/*---------------------------------------------------------------------------*/ -/*SceneViewer Ruler*/ -Ruler { - qproperty-ParentBGColor: rgb(235,235,235); -} -/*---------------------------------------------------------------------------*/ -/* Menu bar */ -#subXsheetTabBarContainer { - background-color: rgb(160,160,160); -} -SubSheetBar { - qproperty-ParentBGColor: rgb(225,225,225); -} -#dvTopBar { - background-color: rgb(225,225,225); -} -/*---------------------------------------------------------------------------*/ -/* Tool bar */ -#ToolBarContainer { - background-color: rgb(225,225,225); -} -/*---------------------------------------------------------------------------*/ -/* Tab bar */ -#TabBarContainer { - border: none; - background-color: rgb(235,235,235); -} -/*---------------------------------------------------------------------------*/ -/* File Browser Tree and Cast Tree background*/ -#BrowserTreeView { - background-color: white; -} -/*---------------------------------------------------------------------------*/ -/* Customize sheet scrollArea */ -/* Sheet scrollAreas. - NB.: SheetViewer e XsheetViewer va reso un unico oggetto - una volta che si e' uniformato completamente l'xsheet alle colonne numeriche.*/ -SpreadsheetViewer { - background-color: rgb(210,210,210); - qproperty-LightLightBGColor: rgb(250,250,250); - qproperty-LightBGColor: rgb(240,240,240); - qproperty-BGColor: rgb(230,230,230); - qproperty-DarkBGColor: rgb(225,225,225); - qproperty-LightLineColor: rgb(210,210,210); - qproperty-DarkLineColor: rgb(150,150,150); -} -#ScrollArea { - border:1px solid rgb(150, 150, 150); -} -#CellScrollArea { - border-top:1px solid rgb(150, 150, 150); - border-left:1px solid rgb(150, 150, 150); -} -/* XSheet scrollAreas (row, column and cell) */ -XsheetViewer { - background-color: rgb(210,210,210); - qproperty-LightLightBGColor: rgb(250,250,250); - qproperty-LightBGColor: rgb(240,240,240); - qproperty-BGColor: rgb(230,230,230); - qproperty-DarkBGColor: rgb(225,225,225); - qproperty-LightLineColor: rgb(210,210,210); - qproperty-DarkLineColor: rgb(150,150,150); -} -#xsheetScrollArea { - background-color: rgb(210,210,210); - margin: 1px; -} -#cornerWidget { - background-color: rgb(210,210,210); -} -#XshColumnChangeObjectWidget { - background-color: rgb(235,235,235); - selection-background-color: rgb(49,106,197); - border: 1px solid black -} -/*---------------------------------------------------------------------------*/ -/* Customize Function Area */ -FunctionPanel { - qproperty-BGColor: rgb(225,225,225); - qproperty-ValueLineColor: rgb(186,186,186); - qproperty-FrameLineColor: rgb(210,210,210); - qproperty-OtherCurvesColor: rgb(150,150,150); - qproperty-RulerBackground: rgb(255,255,255); -} -/*---------------------------------------------------------------------------*/ -/* Customize FilmStrip color */ -FilmstripFrames { - qproperty-BGColor: rgb(225,225,225); - qproperty-LightLineColor: rgb(210,210,210); - qproperty-DarkLineColor: rgb(150,150,150); -} -/*---------------------------------------------------------------------------*/ -/* Main toolbar */ -QToolBar { - /* top right bottom left */ - margin: 0px; - padding: 0px; - border-top: 1px solid rgb(120,120,120); - background-color: rgb(225,225,225); - border-image: none; -} -QToolBar::separator { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 0px; - image: url(qss/standard/bottomseparator.png); - width: 3px; -} -QToolBar QToolButton[checkable=false] { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 2px solid transparent; - padding-right: 2px; - border-image: none; - background-color: rgb(225,225,225); -} -QToolBar QToolButton:disabled { - border-image: none; -} -QToolBar QToolButton[checkable=false]:hover { - border-width: 2; - border-image: url(qss/standard/over.png) 2; -} -QToolBar QToolButton[checkable=false]:checked, -QToolBar QToolButton[checkable=false]:pressed { - border-width: 2; - border-image: url(qss/standard/click.png) 2; -} -/*Chackable buttons: NO border image*/ -QToolBar QToolButton[checkable=true] { - /* top right bottom left */ - margin: 1px -3px 0px -3px; - border: 0px solid transparent; - border-image: none; -} -QToolBar QToolButton[checkable=true]:hover { - image: none; -} -QToolBar QToolButton[checkable=true]:checked, -QToolBar QToolButton[checkable=true]:pressed { - border-image: none; -} -QToolBar QToolButton#chackableButtonWithImageBorder { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 2px solid transparent; - padding-right: 2px; - border-image: none; - background-color: rgb(225,225,225); -} -QToolBar QToolButton#chackableButtonWithImageBorder:hover { - border-width: 2; - border-image: url(qss/standard/over.png) 2; -} -QToolBar QToolButton#chackableButtonWithImageBorder:checked, -QToolBar QToolButton#chackableButtonWithImageBorder:pressed { - border-width: 2; - border-image: url(qss/standard/click.png) 2; -} -QToolBar QToolButton::menu-button { - margin-top: 1px; - border-image: none; - background-color: rgb(225,225,225); -} -QToolBar QLabel { - margin-top: 1px; - background-color: rgb(225,225,225); - border-width: 2; -} -/* To hide Arrow !! */ -QToolBar QToolButton::menu-indicator { - image: none; -} -/*---------------------------------------------------------------------------*/ -/* Tool Bar (vertical)*/ -/* 6.4: #toolBar is now a scrollable container of the actual QToolBar */ -#toolBar { - margin: 1px; - background-color: rgb(225,225,225); -} -#toolBar QToolBar { - border: none; - margin: 1px; -} -#toolBar QToolBar::separator { - image: none; - margin: 0px 1px 0px 1px; - background-color: rgb(120,120,120); - height: 1px; -} -#toolBar QToolButton { - margin: 0px; - border: 2px solid transparent; - border-image: none; - background-color: rgb(225,225,225); -} -#toolBar QToolButton:pressed { - border-image: url(qss/standard/click.png) 2; - border-width: 2; -} -#toolBar QToolButton:checked { - border-image: url(qss/standard/current.png) 2; - border-width: 2; -} -#toolBar QPushButton { - margin: 0px; - border: 1px solid black; -} -/*---------------------------------------------------------------------------*/ -/* ToolOptionPanel ToolBar */ -#toolOptionBar { - border: 0px; - margin: 0px; - background-color: rgb(235,235,235); -} -#toolOptionBar::separator { - image: none; - margin-top: 0px; - margin-bottom: 0px; - margin-left: 1px; - margin-right: 1px; - background-color: rgb(120,120,120); - height: 30px; - width: 1px; -} -#toolOptionBar QWidget { - background-color: rgb(235,235,235); -} -/*---------------------------------------------------------------------------*/ -/*Key frame navigator*/ -#keyFrameNavigator QToolButton { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 2px solid transparent; - padding-right: 1px; - border-image: none; - background-color: rgb(225,225,225); -} -#keyFrameNavigator QToolButton:hover { - margin: 1px 0px 0px 0px; - border-width: 2; - border-image: url(qss/standard/over.png) 2; -} -#keyFrameNavigator QToolButton:checked, -#keyFrameNavigator QToolButton:pressed { - border-width: 2; - border-image: url(qss/standard/click.png) 2; -} -/*---------------------------------------------------------------------------*/ -QMessageBox { - background-color: rgb(235,235,235); - border: 1px solid rgb(120,120,120); -} -/*---------------------------------------------------------------------------*/ -/* Customize arrows. */ -QComboBox::down-arrow, QComboBox::menu-indicator { - image: url(qss/standard/down_arrow.png); - width: 7px; - height: 7px; -} -QComboBox::down-arrow:disabled, QComboBox::down-arrow:off { - image: url(qss/standard/down_arrow_disabled.png); -} -QComboBox::up-arrow { - image: url(qss/standard/up_arrow.png); - width: 7px; - height: 7px; -} -QComboBox::up-arrow:disabled, QComboBox::up-arrow:off { - image: url(qss/standard/up_arrow_disabled.png); -} -/*---------------------------------------------------------------------------*/ -/*PopupButton*/ -PopupButton { - margin: 0px; - padding-left:-8px; - padding-right:4px; -} -PopupButton QMenu { - background-color: rgb(225,225,225); - border: 0px; - padding: -1px; -} -PopupButton QMenu::item { - border: 1px solid transparent; - color: black; -} -PopupButton::menu-indicator { - image: url(qss/standard/down_arrow.png); - width: 10px; - height: 17px; - border-left: 1px solid grey; -} -PopupButton::menu-indicator:disabled { - image: url(qss/standard/down_arrow_disabled.png); -} -/*---------------------------------------------------------------------------*/ -/*Outline Style PopupButtons*/ -PopupButton#Cap { - min-width: 32px; max-width: 32px; -} -PopupButton#Cap QMenu { - min-width: 18px; max-width: 18px; -} -PopupButton#Cap QMenu::item { - min-width: 16px; max-width: 16px; - padding: 0px; -} -PopupButton#Join { - min-width: 32px; max-width: 32px; -} -PopupButton#Join QMenu { - min-width: 18px; max-width: 18px; -} -PopupButton#Join QMenu::item { - min-width: 16px; max-width: 16px; - padding: 0px; -} -/*---------------------------------------------------------------------------*/ -#PeggingWidget { - background-color: rgb(0,0,0); -} -/*---------------------------------------------------------------------------*/ -#PeggingButton { - border-image: none; - background-color: rgb(228,228,228); - border: 0px solid black; -} -#PeggingButton:hover { - border-image: url(qss/standard/over.png) 2; - border-width: 2; -} -#PeggingButton:pressed { - border-image: url(qss/standard/click.png) 2; - border-width: 2; -} -#PeggingButton:checked { - border-image: none; - background-color: rgb(255,255,255); - border-left-color: lightgray; - border-left-width: 2px; - border-top-color: lightgray; - border-top-width: 2px; - border-right-width: 0px; - border-bottom-width: 0px; -} -/*---------------------------------------------------------------------------*/ -QComboBox { - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -QComboBox[editable="false"] { - border-image: url(qss/standard/but.png) 2; - border-width: 2; -} -QComboBox[editable="true"] { - border-image: url(qss/standard/but.png) 2; - border-width: 2; -} -QComboBox:disabled, QPushButton:disabled { - border-image: url(qss/standard/butdis.png) 2; - border-width: 2; - height: 22px; - color: rgb(120,120,120); -} -QComboBox:hover, QPushButton:hover { - border-image: url(qss/standard/buthover.png) 2; - border-width: 2; - height: 22px; -} -QComboBox:pressed, QPushButton:pressed { - border-image: url(qss/standard/but.png) 2; - border-width: 2; - height: 22px; -} -/* Customize non-editable comboboxes drop-down */ -QComboBox[editable="false"] { - padding-left: 3px; - padding-right: 2px; -} -QComboBox[editable="false"]::drop-down { - width: 15px; - border-left-style: solid; - border-left-color: darkgray; - border-left-width: 1px; -} -/* Customize editable comboboxes.*/ -QComboBox[editable="true"] { - padding-right: 16px; -} -QComboBox[editable="true"]::drop-down { - subcontrol-origin: border; - subcontrol-position: top right; - width: 13px; - position: absolute; - top: 2px; - bottom: 2px; - right: 2px; -} -QComboBox[editable="true"]::drop-down, -QComboBox[editable="true"]::drop-down:hover, -QComboBox[editable="true"]::drop-down:on { - border-width: 0px; - border-left-width: 3px; /* we need only left and center part */ -} -/*---------------------------------------------------------------------------*/ -/* The animated, scrollable toolbar containers */ -DvScrollWidget > QPushButton { - border-image: none; - border: 0px solid black; - background-color: rgb(225,225,225); -} -DvScrollWidget > QPushButton:hover { - border-image: none; - border: 0px solid black; - background-color: rgb(245,245,245); -} -DvScrollWidget > QPushButton:pressed { - border-image: none; - border: 0px solid black; - background-color: rgb(215,215,215); -} -#ScrollLeftButton { - image: url(qss/standard/left_arrow_black.png); - border-right: 1px solid black; - min-width: 15px; - max-width: 15px; -} -#ScrollRightButton { - image: url(qss/standard/right_arrow_black.png); - border-left: 1px solid black; - min-width: 15px; - max-width: 15px; -} -#ScrollUpButton { - image: url(qss/standard/up_arrow_black.png); - border-bottom: 1px solid black; - min-height: 15px; - max-height: 15px; -} -#ScrollDownButton { - image: url(qss/standard/down_arrow_black.png); - border-top: 1px solid black; - min-height: 15px; - max-height: 15px; -} -/* Flipbook toolbar-specific */ -#ToolBarContainer #ScrollLeftButton { - margin-top: 1px; -} -#ToolBarContainer #ScrollRightButton { - margin-top: 1px; -} -/*---------------------------------------------------------------------------*/ -/* QToolButton */ -QToolButton { - border-image: url(qss/standard/but.png) 2; - border-width: 2; - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -QToolButton:disabled { - border-image: url(qss/standard/butdis.png) 2; - border-width: 2; -} -QToolButton:hover { - border-image: url(qss/standard/buthover.png) 2; - border-width: 2; -} -QToolButton:disabled:hover { - margin-top: 1px; - border-image: none; - border-width: 0px; -} -QToolButton:pressed { - border-image: url(qss/standard/but.png) 2; - border-width: 2; -} -QToolButton:checked { - border-image: url(qss/standard/buthover.png) 2; - border-width: 2; -} -/*---------------------------------------------------------------------------*/ -#ToolbarToolButton { - /* top right bottom left */ - margin: 1px 0px 0px 0px; - border: 2px solid transparent; - padding-right: 1px; - border-image: none; -} -#ToolbarToolButton:hover { - margin: 1px 0px 0px 0px; - border-width: 2; - border-image: url(qss/standard/over.png) 2; -} -#ToolbarToolButton:checked, -#ToolbarToolButton:pressed { - border-width: 2; - border-image: url(qss/standard/click.png) 2; -} -/*---------------------------------------------------------------------------*/ -#StyleEditorArrowButton { - margin: 0px 0px 0px 0px; - border: 1px solid transparent; - border-image: none; - background-color: rgb(235,235,235); -} -#StyleEditorArrowButton:hover { - border-width: 1; - border-image: url(qss/standard/over.png) 1; -} -#StyleEditorArrowButton:checked, -#StyleEditorArrowButton:pressed { - border-width: 1; - border-image: url(qss/standard/click.png) 1; -} -/*---------------------------------------------------------------------------*/ -/* QLineEdit */ -QLineEdit { - margin-bottom: 1px; - margin-right: 1px; - border-image: url(qss/standard/frame.png) 3; - border-width: 3; - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -QLineEdit::focus { - border-image: url(qss/standard/framehover.png) 3; - border-width: 3; -} -QLineEdit:disabled { - color: rgb(128,128,128); - border-image: url(qss/standard/framedisable.png) 3; -} -/*---------------------------------------------------------------------------*/ -/* QPlainTextEdit & QTextEdit*/ -QPlainTextEdit, QTextEdit { - border-image: url(qss/standard/frame.png) 3; - border-width: 3; -} -QPlainTextEdit::focus, QTextEdit::focus { - border-image: url(qss/standard/framehover.png) 3; - border-width: 3; -} -QPlainTextEdit:disabled, QTextEdit::disabled { - color: rgb(128,128,128); - border-image: url(qss/standard/framedisable.png) 3; -} -/*---------------------------------------------------------------------------*/ -/* QGroupBox */ -QGroupBox -{ - background-color: none; - margin-top: 5px; - padding-top: 5px; - border: 1px solid; - border-radius: 3px; - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -QGroupBox:enabled -{ - border-color: rgb(120, 120, 120); -} -QGroupBox:disabled -{ - border-color: rgb(180, 180, 180); -} -QGroupBox::title { - subcontrol-origin: border; - top: -6px; - left: 6px; -} -/*---------------------------------------------------------------------------*/ -/* QStatusBar */ -QStatusBar { - background-color: rgb(235,235,235); -} -/*---------------------------------------------------------------------------*/ -/* Customize Horizontal QSlider. */ -QSlider { - height: 20; -} -QSlider::groove:horizontal { - border-image: url(qss/standard/sl_groove.png) 1; - border-width: 1; - height: 1px; -} -QSlider::handle:horizontal:enabled { - image: url(qss/standard/h_handle.png); - width: 16px; - margin: -16px -4px; -} -QSlider::handle:horizontal:disabled { - image: url(qss/standard/h_handle_disabled.png); - width: 16px; - margin: -16px -4px; -} - - -/* Customize Horizontal QSlider that have name "colorSlider" */ -#colorSlider::groove:horizontal { - border-image: none; -} -#colorSlider::handle:horizontal { - image: url(qss/standard/h_chandle.png); - width: 16px; - margin: -16px -3px -16px -4px; -} - -/*---------------------------------------------------------------------------*/ - -#IntPairField { - qproperty-HandleLeftPixmap: url(qss/standard/h_slider_left.png); - qproperty-HandleRightPixmap: url(qss/standard/h_slider_right.png); - qproperty-HandleLeftGrayPixmap: url(qss/standard/h_slider_left_disabled.png); - qproperty-HandleRightGrayPixmap: url(qss/standard/h_slider_right_disabled.png); -} - -/*---------------------------------------------------------------------------*/ - -#DoublePairField { - qproperty-HandleLeftPixmap: url(qss/standard/h_slider_left.png); - qproperty-HandleRightPixmap: url(qss/standard/h_slider_right.png); - qproperty-HandleLeftGrayPixmap: url(qss/standard/h_slider_left_disabled.png); - qproperty-HandleRightGrayPixmap: url(qss/standard/h_slider_right_disabled.png); -} - -/*---------------------------------------------------------------------------*/ - -/* Flipbook Slider. */ -FlipSlider { - qproperty-PBHeight: 10; - - qproperty-PBOverlay: url(qss/standard/flipslider.png); - qproperty-PBMarker: url(qss/standard/flipmarker.png); - - qproperty-PBColorMarginLeft: 2; - qproperty-PBColorMarginTop: 2; - qproperty-PBColorMarginRight: 2; - qproperty-PBColorMarginBottom: 3; - - qproperty-PBMarkerMarginLeft: 2; - qproperty-PBMarkerMarginRight: 2; - - qproperty-baseColor: rgb(235,235,235); - qproperty-notStartedColor: rgb(210,40,40); - qproperty-startedColor: rgb(220,160,160); - qproperty-finishedColor: rgb(235,235,235); -} - -/*---------------------------------------------------------------------------*/ -/* Customize QTabBar */ -QTabBar { - height: 22px; - border: 0px; -} -QTabBar::tab { - top: -1px; - min-width: 54px; - min-height: 15px; -} -QTabBar::tab:selected { - padding-top: 2px; - border-image: url(qss/standard/uptab.png) 4; - border-width: 4; -} -QTabBar::tab:only-one { - padding-top: 2px; - border-image: url(qss/standard/oouptab.png) 4; - border-width: 4; -} -QTabBar::tab:first:selected { - border-image: url(qss/standard/fuptab.png) 4; - border-width: 4; -} -QTabBar::tab:!selected { - margin-top: 2px; - border-image: url(qss/standard/tab.png) 4; - border-width: 4; -} -QTabBar::tab:first:!selected { - border-image: url(qss/standard/ftab.png) 4; - border-width: 4; -} -QTabBar::tab:last:!selected { - border-image: url(qss/standard/ltab.png) 4; - border-width: 4; -} -/* Customize RoomTabWidget */ -/* ATTENTION: These declarations must be putted after the QTabBar ones */ -RoomTabWidget { - height: 22px; - background-color: rgb(160,160,160); - color: white; -} -RoomTabWidget::tab { - top: 1px; - min-width: 54px; - min-height: 15px; -} -RoomTabWidget::tab:selected { - border-image: url(qss/standard/uptbtab.png) 4; - border-width: 4; - font: bold; -} -RoomTabWidget::tab:first:selected, RoomTabWidget::tab:only-one { - border-image: url(qss/standard/fuptbtab.png) 4; - border-width: 4; - font: bold; -} -RoomTabWidget::tab:!selected { - margin-top: 2px; - border-image: url(qss/standard/tbtab.png) 4; - border-width: 4; - font: normal; -} -RoomTabWidget::tab:first:!selected { - border-image: url(qss/standard/ftbtab.png) 4; - border-width: 4; -} -RoomTabWidget::tab:last:!selected { - border-image: url(qss/standard/ltbtab.png) 4; - border-width: 4; -} -/*---------------------------------------------------------------------------*/ -/* Customize QScrollBar horizontal*/ -QScrollBar:horizontal { - background-image: url(qss/standard/sb_h.png); - height: 16px; - margin-top: 0px; - margin-bottom: 0px; - margin-right:15px; - margin-left:15px; -} -QScrollBar::handle:horizontal { - border-image: url(qss/standard/sb_hhandle.png)3; - border-width: 3; - image: url(qss/standard/sb_hline.png); - image-position: center center; -} -QScrollBar::add-line:horizontal { - image: url(qss/standard/sb_rarrow.png); - width: 15px; - subcontrol-position: right; - subcontrol-origin: margin; -} -QScrollBar::sub-line:horizontal { - image: url(qss/standard/sb_larrow.png); - width: 15px; - subcontrol-position: left; - subcontrol-origin: margin; -} -QScrollBar::add-page:horizontal, QScrollBar::sub-page:horizontal { - background: none; -} -/* Customize QScrollBar vertical*/ -QScrollBar:vertical { - background-image: url(qss/standard/sb_v.png); - width: 16px; - margin-left: 0px; - margin-right: 0px; - margin-top:15px; - margin-bottom:15px; -} -QScrollBar::handle:vertical { - border-image: url(qss/standard/sb_vhandle.png)3; - border-width: 3; - image: url(qss/standard/sb_vline.png); - image-position: center center; -} -QScrollBar::add-line:vertical { - image: url(qss/standard/sb_downarrow.png); - height: 15px; - subcontrol-position: bottom; - subcontrol-origin: margin; -} -QScrollBar::sub-line:vertical { - image: url(qss/standard/sb_uparrow.png); - height: 15px; - subcontrol-position: top; - subcontrol-origin: margin; -} -QScrollBar::add-page:vertical, QScrollBar::sub-page:vertical { - background: none; -} -/*---------------------------------------------------------------------------*/ -/* Customize check boxes. */ -QCheckBox { - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; - spacing: 1px; -} -QCheckBox::indicator { - width: 13px; - height: 13px; -} -QCheckBox::indicator:unchecked, QTreeView::indicator:unchecked { - image: url(qss/standard/chk_unchk.png); -} -QCheckBox::indicator:unchecked:disabled, QTreeView::indicator:unchecked:disabled { - image: url(qss/standard/chk_unchk_disabled.png); -} -QCheckBox::indicator:checked, QTreeView::indicator:checked { - image: url(qss/standard/chk_chk.png); -} -QCheckBox::indicator:checked:disabled, QTreeView::indicator:checked:disabled { - image: url(qss/standard/chk_chk_disabled.png); -} -/*---------------------------------------------------------------------------*/ -/* Customize radio buttons. */ -QRadioButton { - spacing: 5px; - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; -} -QRadioButton::indicator { - width: 13px; - height: 13px; -} -QRadioButton::indicator::unchecked { - image: url(qss/standard/radio.png); -} -QRadioButton::indicator::checked { - image: url(qss/standard/radio_p.png); -} -/*---------------------------------------------------------------------------*/ -/* QSplitter (Un pochettino assumo che sono tutti verticali) */ -QSplitter { - background-color: rgb(235,235,235); -} -QSplitter::handle { - margin: 0px; - background-color: rgb(225,225,225); -} -QSplitter::handle:horizontal { - image: url(qss/standard/hsplitter_handle.png); - border-left: 1px solid rgb(120,120,120); - border-right: 1px solid rgb(120,120,120); - image-position: center center; -} -QSplitter::handle:vertical { - image: url(qss/standard/vsplitter_handle.png); - border-top: 1px solid rgb(120,120,120); - border-bottom: 1px solid rgb(120,120,120); - padding-left: 1px; - padding-right: 1px; - image-position: center center; -} -/*---------------------------------------------------------------------------*/ -/* QToolTip */ -QToolTip { - /*Mac OS font style*/ - font-family: "Lucida Grande"; - font-size: 12px; - border: 1px solid black; - background-color: rgb(255,255,225); -} -/*---------------------------------------------------------------------------*/ -/* Generic Separators with inscribed name */ -DVGui--Separator { - alternate-background-color: rgb(120, 120, 120); /* line color */ -} -/*---------------------------------------------------------------------------*/ -/* Export Level Popup Options */ -#ExportLevelOptions -{ - background-color: rgb(225,225,225); -} -#ExportLevelOptions QWidget -{ - background-color: none; -} -ExportLevelPopup DVGui--Separator { - padding: 0px 5px 0px 5px; -} diff --git a/stuff/config/qss/standard/tab.png b/stuff/config/qss/standard/tab.png deleted file mode 100644 index 8a437d3..0000000 Binary files a/stuff/config/qss/standard/tab.png and /dev/null differ diff --git a/stuff/config/qss/standard/tbtab.png b/stuff/config/qss/standard/tbtab.png deleted file mode 100644 index 2ba38e7..0000000 Binary files a/stuff/config/qss/standard/tbtab.png and /dev/null differ diff --git a/stuff/config/qss/standard/titlebar_horizontal.png b/stuff/config/qss/standard/titlebar_horizontal.png deleted file mode 100644 index 5fe4bea..0000000 Binary files a/stuff/config/qss/standard/titlebar_horizontal.png and /dev/null differ diff --git a/stuff/config/qss/standard/titlebar_vertical.png b/stuff/config/qss/standard/titlebar_vertical.png deleted file mode 100644 index d2d9ad8..0000000 Binary files a/stuff/config/qss/standard/titlebar_vertical.png and /dev/null differ diff --git a/stuff/config/qss/standard/titlebar_vertical_inactive.png b/stuff/config/qss/standard/titlebar_vertical_inactive.png deleted file mode 100644 index 2ceee58..0000000 Binary files a/stuff/config/qss/standard/titlebar_vertical_inactive.png and /dev/null differ diff --git a/stuff/config/qss/standard/up_arrow.png b/stuff/config/qss/standard/up_arrow.png deleted file mode 100644 index 142e60d..0000000 Binary files a/stuff/config/qss/standard/up_arrow.png and /dev/null differ diff --git a/stuff/config/qss/standard/up_arrow_black.png b/stuff/config/qss/standard/up_arrow_black.png deleted file mode 100644 index 6c27909..0000000 Binary files a/stuff/config/qss/standard/up_arrow_black.png and /dev/null differ diff --git a/stuff/config/qss/standard/up_arrow_disabled.png b/stuff/config/qss/standard/up_arrow_disabled.png deleted file mode 100644 index 4d2c277..0000000 Binary files a/stuff/config/qss/standard/up_arrow_disabled.png and /dev/null differ diff --git a/stuff/config/qss/standard/uptab.png b/stuff/config/qss/standard/uptab.png deleted file mode 100644 index d8e2b0f..0000000 Binary files a/stuff/config/qss/standard/uptab.png and /dev/null differ diff --git a/stuff/config/qss/standard/uptbtab.png b/stuff/config/qss/standard/uptbtab.png deleted file mode 100644 index aa7826a..0000000 Binary files a/stuff/config/qss/standard/uptbtab.png and /dev/null differ diff --git a/stuff/config/qss/standard/vsplitter_handle.png b/stuff/config/qss/standard/vsplitter_handle.png deleted file mode 100644 index a1e7564..0000000 Binary files a/stuff/config/qss/standard/vsplitter_handle.png and /dev/null differ diff --git a/stuff/plugins/.gitkeep b/stuff/plugins/.gitkeep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/stuff/plugins/.gitkeep diff --git a/stuff/toonzfarm/.gitkeep b/stuff/toonzfarm/.gitkeep new file mode 100644 index 0000000..e69de29 --- /dev/null +++ b/stuff/toonzfarm/.gitkeep diff --git a/toonz/sources/common/flash/F3SDK.h b/toonz/sources/common/flash/F3SDK.h deleted file mode 100644 index 0ee0296..0000000 --- a/toonz/sources/common/flash/F3SDK.h +++ /dev/null @@ -1,32 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. - -/**************************************************************************************** - - File Summary: F3SDK.h - - This header-file includes all the header-files of Flash File Format SDK - low-level manager. - -****************************************************************************************/ - -#ifndef F3SDK_INCLUDED -#define F3SDK_INCLUDED - -#include "Macromedia.h" -#include "FObj.h" -#include "FAction.h" -#include "FCT.h" -#include "FDT.h" -#include "FDTBitmaps.h" -#include "FDTButtons.h" -#include "FDTFonts.h" -#include "FDTShapes.h" -#include "FDTSounds.h" -#include "FDTSprite.h" -#include "FDTText.h" -#include "FPrimitive.h" - -#endif diff --git a/toonz/sources/common/flash/FAction.cpp b/toonz/sources/common/flash/FAction.cpp deleted file mode 100644 index b153a1d..0000000 --- a/toonz/sources/common/flash/FAction.cpp +++ /dev/null @@ -1,842 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. - -/**************************************************************************************** - - File Summary: FAction.cpp - - This source file contains the definition for the low-level action-related functions, - grouped by classes, which are all derived from class FAction (except FActionCondition): - - - Class Member Function - - FActionGetURL FActionGetURL(FString*, FString*); - ~FActionGetURL(); - void WriteToSWFStream(FSWFStream*); - - FActionGetURL2 FActionGetURL2(U8); - void WriteToSWFStream(FSWFStream*); - - FActionGotoFrame FActionGotoFrame(U16); - void WriteToSWFStream(FSWFStream*); - - FActionGotoFrame2 FActionGotoFrame2(U8); - void WriteToSWFStream(FSWFStream*); - - FActionGotoLabel FActionGotoLabel(FString*); - ~FActionGotoLabel(); - void WriteToSWFStream(FSWFStream*); - - FActionIf FActionIf(S16); - void WriteToSWFStream(FSWFStream*); - - FActionJump FActionJump(S16); - void WriteToSWFStream(FSWFStream*); - - FActionPush FActionPush(FString*); - FActionPush(FLOAT); - void WriteToSWFStream(FSWFStream*); - - FActionSetTarget FActionSetTarget(FString*); - ~FActionSetTarget(); - void WriteToSWFStream(FSWFStream*); - - FActionWaitForFrame FActionWaitForFrame(U16, U16); - void WriteToSWFStream(FSWFStream*); - - FActionWaitForFrame2 FActionWaitForFrame2(U8); - void WriteToSWFStream(FSWFStream*); - - FActionCondition FActionCondition(); - ~FActionCondition(); - Clear(); - AddActionRecord(FActionRecord*); - AddKeyCode(U32); - AddCondition(U16); - void WriteToSWFStream(FSWFStream*); - void WriteToSWFStream(FSWFStream*, int); - - - Functions of these classes have not been implemented yet: - - class FActionAdd; - class FActionAnd; - class FActionAsciiToChar; - class FActionCall; - class FActionCharToAscii; - class FActionCloneSprite; - class FActionDivide; - class FActionEndDrag; - class FActionEquals; - class FActionGetProperty; - class FActionGetTime; - class FActionGetVariable; - class FActionLess; - class FActionMBAsciiToChar; - class FActionMBCharToAscii; - class FActionMBStringExtract; - class FActionMBStringLength; - class FActionMultiply; - class FActionNextFrame; - class FActionNot; - class FActionOr; - class FActionPlay; - class FActionPop; - class FActionPrevFrame; - class FActionRandomNumber; - class FActionRemoveSprite; - class FActionSetProperty; - class FActionSetTarget2; - class FActionSetVariable; - class FActionStartDrag; - class FActionStop; - class FActionStopSounds; - class FActionStringAdd; - class FActionStringEquals; - class FActionStringExtract; - class FActionStringLength; - class FActionStringLess; - class FActionSubtract; - class FActionToggleQuality; - class FActionToInteger; - class FActionTrace. - - -****************************************************************************************/ - -#include "FPrimitive.h" -#include "FAction.h" - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FActionUnparsed ---------------------------------------------------------- - -FActionUnparsed::FActionUnparsed(UCHAR _code, USHORT _length, UCHAR *_data) : code(_code) -{ - if (code >= 0x80) - length = _length, data = _data; - else - length = 0, data = 0; -} - -void FActionUnparsed::WriteToSWFStream(FSWFStream *_SWFStream) -{ - _SWFStream->WriteByte(code); - if (code >= 0x80) { - _SWFStream->WriteWord(length); - for (int i = 0; i < length; i++) - _SWFStream->WriteByte(data[i]); - } -} -////////////////////////////////////////////////////////////////////////////////////// - -FActionGetURL::FActionGetURL(FString *_url, FString *_window) -{ - url = _url; - window = _window; -} - -FActionGetURL::~FActionGetURL() -{ - delete url; - delete window; -} - -void FActionGetURL::WriteToSWFStream(FSWFStream *_SWFStream) -{ - FSWFStream body; - - url->WriteToSWFStream(&body, true); - - window->WriteToSWFStream(&body, true); - - _SWFStream->WriteByte(sactionGetURL); - _SWFStream->WriteWord(body.Size()); - - _SWFStream->Append(&body); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FActionGetURL2 --------------------------------------------------------- - -FActionGetURL2::FActionGetURL2(U8 _method) -{ - method = _method; -} - -void FActionGetURL2::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - //sactionEquals: enumerated in "Macromedia.h" - _SWFStream->WriteByte(sactionGetURL2); - - //write the length since the high bit is set in the action tag - _SWFStream->WriteWord(1); - - //write the method - _SWFStream->WriteByte(method); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FActionGotoFrame ------------------------------------------------------- - -FActionGotoFrame::FActionGotoFrame(U16 _frameIndex) -{ - frameIndex = _frameIndex; -} - -void FActionGotoFrame::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - //enumerated constant (see "Macromedia.h") - _SWFStream->WriteByte(sactionGotoFrame); - - _SWFStream->WriteWord(2); - - _SWFStream->WriteWord((U32)frameIndex); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FActionGotoFrame2 ------------------------------------------------------ - -// Constructor takes in play flag. - -FActionGotoFrame2::FActionGotoFrame2(U8 _play) -{ - - play = _play; -} - -void FActionGotoFrame2::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - //sactionGotoFrame2: enumerated in "Macromedia.h" - _SWFStream->WriteByte(sactionGotoFrame2); - - //write the length since the high bit is set in the action tag - _SWFStream->WriteWord(1); - - //write the play flag - _SWFStream->WriteByte(play); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FActionGotoLabel ------------------------------------------------------- - -FActionGotoLabel::FActionGotoLabel(FString *_label) -{ - label = _label; -} - -FActionGotoLabel::~FActionGotoLabel() -{ - - delete label; -} - -void FActionGotoLabel::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - //enumerated type (see "Macromedia.h") - _SWFStream->WriteByte(sactionGotoLabel); - - label->WriteToSWFStream(_SWFStream, true); -} - -/////////////////////////////////////////////////////////////////////////////// -// -------- FActionIf ------------------------------------------------------- - -// Constructor records the branch offset. - -FActionIf::FActionIf(S16 _branchOffset) -{ - - branchOffset = _branchOffset; -} - -void FActionIf::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - //enumerations in "Macromedia.h" - _SWFStream->WriteByte(sactionIf); - - //write the length since the high bit is set in the action tag - _SWFStream->WriteWord(2); - - //write the offset - _SWFStream->WriteWord((U32)branchOffset); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FActionJump ------------------------------------------------------- - -// Constructor records the branch offset. - -FActionJump::FActionJump(S16 _branchOffset) -{ - - branchOffset = _branchOffset; -} - -void FActionJump::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - //enumerations in "Macromedia.h" - _SWFStream->WriteByte(sactionJump); - - //write the length since the high bit is set in the action tag - _SWFStream->WriteWord(2); - - //write the offset - _SWFStream->WriteWord((U32)branchOffset); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FActionPush ------------------------------------------------------- -// Constructor for string push. - -FActionPush::FActionPush(FString *_string) -{ - - string = _string; - number = 0; - cValue = 0; - dValue = 0; - type = 0; -} - -FActionPush::FActionPush(FLOAT _number) -{ - - number = _number; - string = 0; - cValue = 0; - dValue = 0; - type = 1; -} - -// Constructor for float push. - -FActionPush::FActionPush(U8 _type, FLOAT _number) -{ - - number = _number; - string = 0; - cValue = 0; - dValue = 0; - type = _type; -} - -FActionPush::FActionPush(double _number) -{ - number = 0; - string = 0; - cValue = 0; - dValue = _number; - type = 6; -} - -FActionPush::FActionPush(U8 _type, U8 _value) -{ - number = 0; - string = 0; - cValue = _value; - dValue = 0; - type = _type; -} - -void FActionPush::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - //sactionPush: enumerated in "Macromedia.h" - _SWFStream->WriteByte(sactionPush); - - U16 size = 0; - FSWFStream temp; - // un byte c'e' sempre per memorizzare il tipo - switch (type) { - case 0: - size = 1 + string->Length() + 1; //bisogna tener conto che la deve essere null terminated - string->WriteToSWFStream(&temp, true); - break; - case 1: - case 7: - size = 5; - temp.WriteDWord((U32)number); - break; - case 4: - case 5: - case 8: - size = 2; - temp.WriteByte(cValue); - break; - case 6: { - size = 9; - U8 *bPtr = (U8 *)&dValue; -#ifndef __LP64__ - temp.WriteByte((U32)(bPtr + 4)); - temp.WriteByte((U32)(bPtr + 5)); - temp.WriteByte((U32)(bPtr + 6)); - temp.WriteByte((U32)(bPtr + 7)); - temp.WriteByte((U32)bPtr); - temp.WriteByte((U32)(bPtr + 1)); - temp.WriteByte((U32)(bPtr + 2)); - temp.WriteByte((U32)(bPtr + 3)); -#else - typedef unsigned long U64; - temp.WriteByte((U64)(bPtr + 4)); - temp.WriteByte((U64)(bPtr + 5)); - temp.WriteByte((U64)(bPtr + 6)); - temp.WriteByte((U64)(bPtr + 7)); - temp.WriteByte((U64)bPtr); - temp.WriteByte((U64)(bPtr + 1)); - temp.WriteByte((U64)(bPtr + 2)); - temp.WriteByte((U64)(bPtr + 3)); -#endif - break; - } - default: - break; - } - _SWFStream->WriteWord(size); - - //write the type - _SWFStream->WriteByte((U32)type); - - //write the object to be pushed - _SWFStream->Append(&temp); -} - -/*//originale -// Writes to the given FSWFStream. -void FActionPush::WriteToSWFStream(FSWFStream *_SWFStream){ - - //sactionPush: enumerated in "Macromedia.h" - _SWFStream->WriteByte(sactionPush); - - // un byte c'e' sempre per memorizzare il tipo - //since tag's high bit is set, must write the length - if ( type == 0 ) { - _SWFStream->WriteWord( 1 + (U32)string->Length() + 1); //bisogna tener conto che la deve essere null terminated - } else { - _SWFStream->WriteWord( 1 + 4 ); //scrive una Dword => 4 bytes - } - - //write the type - _SWFStream->WriteByte((U32)type); - - //write the object to be pushed - if ( type == 0 ) { - string->WriteToSWFStream(_SWFStream, true); - } else { - _SWFStream->WriteDWord( (U32)number ); - } -} -*/ - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FActionSetTarget ------------------------------------------------------- -FActionSetTarget::FActionSetTarget(FString *_targetName) -{ - targetName = _targetName; -} - -FActionSetTarget::~FActionSetTarget() -{ - delete targetName; -} - -void FActionSetTarget::WriteToSWFStream(FSWFStream *_SWFStream) -{ - _SWFStream->WriteByte(sactionSetTarget); - _SWFStream->WriteWord(targetName->Length() + 1); - targetName->WriteToSWFStream(_SWFStream, true); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FActionWaitForFrame ---------------------------------------------------- -FActionWaitForFrame::FActionWaitForFrame(U16 index, U16 count) -{ - // frameIndex = frameIndex; - // skipCount = skipCount; - frameIndex = index; // fixed from DV - skipCount = count; -} - -void FActionWaitForFrame::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - // enumerations in "Macromedia.h" - _SWFStream->WriteByte(sactionWaitForFrame); - - _SWFStream->WriteWord(3); - _SWFStream->WriteWord((U32)frameIndex); - _SWFStream->WriteByte((U32)skipCount); -} - -/////////////////////////////////////////////////////////////////////////////////////// -// -------- FActionWaitForFrame2 ---------------------------------------------------- - -FActionWaitForFrame2::FActionWaitForFrame2(U8 _skipCount) -{ - - skipCount = _skipCount; -} - -void FActionWaitForFrame2::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - // enumerations in "Macromedia.h" - _SWFStream->WriteByte(sactionWaitForFrame2); - - //write the length since high bit in tag id is set - _SWFStream->WriteWord(1); - - //write the skip count - _SWFStream->WriteByte(skipCount); -} - -// Constructor. Initially, there are no actions or conditions so the conditions flag -// equals zero, and the action record list is empty. - -FActionCondition::FActionCondition() -{ - - conditionFlags = 0; -} - -// Deletes all of the action records in the action record list. - -FActionCondition::~FActionCondition() -{ - - while (!actionRecordList.empty()) { - - delete actionRecordList.front(); - actionRecordList.pop_front(); - } -} - -void FActionCondition::Clear() -{ - while (!actionRecordList.empty()) { - - delete actionRecordList.front(); - actionRecordList.pop_front(); - } -} - -// Adds an action record to the action record list - -void FActionCondition::AddActionRecord(FActionRecord *_ActionRecord) -{ - - actionRecordList.push_back(_ActionRecord); -} - -// Adds the key code information to the action condition (Flash 4). - -void FActionCondition::AddKeyCode(U32 keyCode) -{ - - conditionFlags |= (keyCode << 9); -} - -// Adds a condition to the list of conditions for which the actions in the action record list -// will be taken. Sees what condition is passed, and sets the bit which corresponds to the -// condition in the conditionFlags field to 1. - -void FActionCondition::AddCondition(U16 _condition) -{ - - switch (_condition) - - { - - case OverDownToIdle: - conditionFlags = conditionFlags | 256; //this bitwise OR has the same effect as making the 8th bit a "1" - break; - case IdleToOverDown: - conditionFlags = conditionFlags | 128; //makes 9th bit a "1" ... etc. - break; - case OutDownToIdle: - conditionFlags = conditionFlags | 64; - break; - case OutDownToOverDown: - conditionFlags = conditionFlags | 32; - break; - case OverDownToOutDown: - conditionFlags = conditionFlags | 16; - break; - case OverDownToOverUp: - conditionFlags = conditionFlags | 8; - break; - case OverUpToOverDown: - conditionFlags = conditionFlags | 4; - break; - case OverUpToIdle: - conditionFlags = conditionFlags | 2; - break; - case IdleToOverUp: - conditionFlags = conditionFlags | 1; - } -} - -// Writes the action condition to the given FSWFStream. Since the action condition contains -// an offset field to the next action condition, the body of the action condition must first -// be written to a temporary stream so that size can be calculated for the offset. - -void FActionCondition::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - FSWFStream temp; - - temp.WriteWord((U32)conditionFlags); - int boh = temp.Size(); - - std::list::iterator cursor; - for (cursor = actionRecordList.begin(); cursor != actionRecordList.end(); cursor++) { - - (*cursor)->WriteToSWFStream(&temp); - boh = temp.Size(); - } - - //add 2 to the size because the offset is actually to the beginning of the - //next action condition's conditionFlags - _SWFStream->WriteWord(2 + temp.Size()); - - _SWFStream->Append(&temp); -} - -// Writes the action condition to the given stream. The lastFlag indicates that this is the -// last action condition so the offset is set to 0 by default. - -void FActionCondition::WriteToSWFStream(FSWFStream *_SWFStream, int /*lastFlag*/) -{ - - _SWFStream->WriteWord(0); //the offset - - _SWFStream->WriteWord((U32)conditionFlags); - - std::list::iterator cursor; - for (cursor = actionRecordList.begin(); cursor != actionRecordList.end(); cursor++) { - - (*cursor)->WriteToSWFStream(_SWFStream); - } - - //_SWFStream->FlushBits(); - - _SWFStream->WriteByte((U32)0); -} - -/* -FActionConditionList::FActionConditionList(){ -} - - -FActionConditionList::~FActionConditionList(){ - - while (!conditionList.empty()){ - - delete conditionList.front(); - - conditionList.pop_front(); - - } - -} - - -void FActionConditionList::AddActionCondition(FActionCondition* _ActionCondition){ - - conditionList.push_back(_ActionCondition); - -} - -U32 FActionConditionList::Size(){ - - return conditionList.size(); - - } - - - void FActionConditionList::WriteToSWFStream(FSWFStream* _SWFStream){ - - std::list::iterator cursor; - std::list::iterator cursor2; - cursor2 = (conditionList.end()); - cursor2--; - - for (cursor = conditionList.begin(); cursor != cursor2; cursor++) { - - (*cursor)->WriteToSWFStream(_SWFStream); - - } - - (*cursor)->WriteToSWFStream(_SWFStream, 1); //flag indicating it is the last action condition - -} -*/ - -//============================================================================= -// ALCUNE AZIONI FLASH 5 -//============================================================================= - -FActionConstantPool::FActionConstantPool(FString *string) -{ - constantList.push_back(string); -} - -FActionConstantPool::~FActionConstantPool() -{ - while (!constantList.empty()) { - delete constantList.front(); - constantList.pop_front(); - } -} - -void FActionConstantPool::addConstant(FString *string) -{ - constantList.push_back(string); -} - -void FActionConstantPool::WriteToSWFStream(FSWFStream *_SWFStream) -{ - FSWFStream temp; - std::list::iterator it = constantList.begin(); - while (it != constantList.end()) { - (*it)->WriteToSWFStream(&temp, true); - ++it; - } - - _SWFStream->WriteByte(sactionConstantPool); - _SWFStream->WriteWord(temp.FullSize() + 2); - _SWFStream->WriteWord(constantList.size()); - _SWFStream->Append(&temp); -} - -//============================================================================= -// CLIP ACTION / CLIP ACTION RECORD -//============================================================================= - -FClipAction::FClipAction() -{ - eventFlags = 0; -} - -FClipAction::~FClipAction() -{ - Clear(); -} - -void FClipAction::Clear() -{ - while (!clipActionRecordList.empty()) { - delete clipActionRecordList.front(); - clipActionRecordList.pop_front(); - } -} - -void FClipAction::AddClipActionRecord(FClipActionRecord *_clipActionRecord) -{ - clipActionRecordList.push_back(_clipActionRecord); -} - -void FClipAction::AddFlags(U32 _flags) -{ - //e' meglio definire i flags come enumerazione che sono gia' i valori da - // mettere in OR per settare l'abilitazione del particolare evento - eventFlags |= _flags; -} - -void FClipAction::WriteToSWFStream(FSWFStream *_SWFStream) -{ - FSWFStream temp; - - //Reserved - temp.WriteWord(0); - - //allEvent - temp.WriteDWord(eventFlags); - - //tutti i clip - std::list::iterator it = clipActionRecordList.begin(); - int i = 0; - while (it != clipActionRecordList.end()) { - (*it)->WriteToSWFStream(&temp); //, i);//prova zozza - ++it; - ++i; - } - - //end clipAction - temp.WriteDWord(0); - _SWFStream->Append(&temp); -} - -//============================================================================= - -FClipActionRecord::FClipActionRecord() -{ - eventFlags = 0; - keyCode = 0; -} - -FClipActionRecord::~FClipActionRecord() -{ - Clear(); -} - -void FClipActionRecord::Clear() -{ - while (!actionRecordList.empty()) { - delete actionRecordList.front(); - actionRecordList.pop_front(); - } -} - -void FClipActionRecord::AddActionRecord(FActionRecord *_actionRecord) -{ - actionRecordList.push_back(_actionRecord); -} - -void FClipActionRecord::AddKeyCode(U8 _keyCode) -{ - keyCode |= _keyCode; -} - -void FClipActionRecord::AddFlags(U32 _flags) -{ - //e' meglio definire i flags come enumerazione che sono gia' i valori da - // mettere in OR per settare l'abilitazione del particolare evento - eventFlags |= _flags; -} - -void FClipActionRecord::WriteToSWFStream(FSWFStream *_SWFStream) -{ - FSWFStream temp; - //metto tutte le azioni su per sapere la size - std::list::iterator it = actionRecordList.begin(); - while (it != actionRecordList.end()) { - (*it)->WriteToSWFStream(&temp); - ++it; - } - temp.WriteByte(sactionNone); - - //e' un offset deve andare a quello dopo - U32 size = temp.FullSize(); - - FSWFStream temp1; - temp1.WriteDWord(eventFlags); - - if ((eventFlags & ClipEventKeyPress) == ClipEventKeyPress) { - temp1.WriteDWord(size + 1); - temp1.WriteByte(keyCode); - } else - temp1.WriteDWord(size); - - temp1.Append(&temp); - - _SWFStream->Append(&temp1); -} diff --git a/toonz/sources/common/flash/FAction.h b/toonz/sources/common/flash/FAction.h deleted file mode 100644 index bc4c2a6..0000000 --- a/toonz/sources/common/flash/FAction.h +++ /dev/null @@ -1,1346 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. - -/**************************************************************************************** - - File Summary: FAction.h - - This header-file contains the declarations of the low-level action-related classes: - - 1) class FActionRecord; - 2) all the derived classes of class FAction: - - class FActionAdd; - class FActionAnd; - class FActionAsciiToChar; - class FActionCall; - class FActionCharToAscii; - class FActionCloneSprite; - class FActionDivide; - class FActionEndDrag; - class FActionEquals; - class FActionGetProperty; - class FActionGetTime; - class FActionGetURL; - class FActionGetURL2; - class FActionGetVariable; - class FActionGotoFrame; - class FActionGotoFrame2; - class FActionGotoLabel; - class FActionIf; - class FActionJump; - class FActionLess; - class FActionMBAsciiToChar; - class FActionMBCharToAscii; - class FActionMBStringExtract; - class FActionMBStringLength; - class FActionMultiply; - class FActionNextFrame; - class FActionNot; - class FActionOr; - class FActionPlay; - class FActionPop; - class FActionPrevFrame; - class FActionPush; - class FActionRandomNumber; - class FActionRemoveSprite; - class FActionSetProperty; - class FActionSetTarget; - class FActionSetTarget2; - class FActionSetVariable; - class FActionStartDrag; - class FActionStop; - class FActionStopSounds; - class FActionStringAdd; - class FActionStringEquals; - class FActionStringExtract; - class FActionStringLength; - class FActionStringLess; - class FActionSubtract; - class FActionToggleQuality; - class FActionToInteger; - class FActionTrace; - class FActionWaitForFrame; - class FActionWaitForFrame2; - and, - - 3) class FActionCondition. - -****************************************************************************************/ - -#ifndef _F_ACTION_H_ -#define _F_ACTION_H_ - -#include "Macromedia.h" -#include "FSWFStream.h" - -#ifdef WIN32 // added from DV -#pragma warning(push) -#pragma warning(disable : 4786) -#pragma warning(disable : 4251) - -#endif - -#include "tcommon.h" - -#undef DVAPI -#undef DVVAR -#ifdef TFLASH_EXPORTS -#define DVAPI DV_EXPORT_API -#define DVVAR DV_EXPORT_VAR -#else -#define DVAPI DV_IMPORT_API -#define DVVAR DV_IMPORT_VAR -#endif -class FString; - -//! A general class specifying an action to be performed by the Flash player -/*! -Buttons and DoAction tags utilize FActionRecords. -When encountered in a button tag, the Flash player adds action to a list to be processed when a button state has changed. -When encountered in a DoAction tag, the Flash player adds the action to a list to be processed when a FCTShowframe tag is encountered. -FActionRecords specifiy actions such as: starting and stoping movie play, toggling display quality, performing stack arithmetic... etc. -Many actions involve the use of a last-on/first-off stack machine (Flash 4.0) that stores string values. -\sa FCTDoAction, FDTDefineButton, FDTDefineButton2 -*/ - -class DVAPI FActionRecord -{ -public: - virtual ~FActionRecord() {} - - //! A general function that will write its object out to a FSWFStream - /*! - All FActionRecords contain the WriteToSWFStream member function, a function that will writes out its Object's data out to a FSWFStream - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) = 0; -}; - -class DVAPI FActionUnparsed : public FActionRecord -{ - UCHAR code; - USHORT length; - UCHAR *data; - -public: - FActionUnparsed(UCHAR _code, USHORT _length, UCHAR *_data); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); -}; - -//! An action that adds two numbers -/*! \verbatim -1. pops value A off the stack machine -2. pops value B off the stack machine -3. A and B are converted to floating-point (if non-numeric,converts to 0) -4. A and B are added -5. Result, A + B, is pushed back onto stack -\endverbatim */ - -class FActionAdd : public FActionRecord -{ -public: - FActionAdd() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionAdd); } -}; - -//! An action that performs a logical AND of two numbers -/*! \verbatim -1. pops value A off the stack -2. pops value B off the stack -3. A nd B are converted to floating-point(if non-numeric, converts to 0) -4. If both A and B are non-zero, a 1 is pushed onto the stack; otherwise a 0 is pushed -\endverbatim */ - -class FActionAnd : public FActionRecord -{ -public: - FActionAnd() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionAnd); } -}; - -//! An action that converts ASCII to character code -/*! \verbatim -1. pops value A off the stack -2. the value is converted from a number to the corresponding ASCII character -3. the resulting character is pushed to the stack -\endverbatim */ - -class FActionAsciiToChar : public FActionRecord -{ -public: - FActionAsciiToChar() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionAsciiToChar); } -}; - -//! An action that calls a subroutine -/*! \verbatim -1. pops value A off the stack -2. this value should be either a string matching a frame label, or a number indicating a frame number -3. The value may be prefixed by a target string identifying the movie clip that contains the frame being called -4. If the frame is successfully located, the actions in the target frame are executed. After the actions in the target frame are executed, execution resumes at the instruction after the ActionCall instruction. -5. If the frame cannot be found, nothing happens -6. NOTE: This action's tag (0x9e) has the high bit set, this is a bug -\endverbatim */ -class FActionCall : public FActionRecord -{ -public: - FActionCall() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) - { - _SWFStream->WriteByte(sactionCall); - // Write the length since the high bit is set in the action tag - _SWFStream->WriteWord(0); - } -}; - -//! An action that converts character code to ASCII -/*! \verbatim -1. pops value A off the stack -2. The first character of value a is converted to a numeric ASCII character code -3. The resulting character code is pushed to the stack -\endverbatim */ -class FActionCharToAscii : public FActionRecord -{ -public: - FActionCharToAscii() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionCharToAscii); } -}; - -//! An action that clones a sprite -/*! \verbatim -1. pops value DEPTH (new sprite depth) off the stack -2. pops value TARGET (name of new sprite) off the stack -3. pops value SOURCE (souce sprite) off stack -4. duplicate the movie SOURCE, giving the new movie the name TARGET at z-order depth DEPTH -\endverbatim */ -class FActionCloneSprite : public FActionRecord -{ -public: - FActionCloneSprite() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionCloneSprite); } -}; - -//! An action that divides two numbers -/*! \verbatim -1. pops value A off the stack -2. pops value B off stack -3. A and B are converted to floating-point (if non-numeric convert to 0) -4. Result B divided by A is pushed to stack -5. If A is 0, the result is the string "#ERROR#" -\endverbatim */ -class FActionDivide : public FActionRecord -{ -public: - FActionDivide() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionDivide); } -}; - -//! An action that ends drag operation -/*! \verbatim -1. ends the drag operation in progress (if any) -\endverbatim */ -class FActionEndDrag : public FActionRecord -{ -public: - FActionEndDrag() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionEndDrag); } -}; - -//! An action that tests two numbers for equality -/*! \verbatim -1. pops value A off the stack -2. pops value B off stack -3. A and B converted to floating-point (if non-numeric, converted to 0) -4. A and B compared for equality -5. If equal, a 1 is pushed to stack -6. Otherwise, 0 is pushed -\endverbatim */ -class FActionEquals : public FActionRecord -{ -public: - FActionEquals() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionEquals); } -}; - -//! An action that gets a movie property -/*! \verbatim -1. pops value INDEX off the stack -2. pops TARGET off the stack -3. retrieve the value of the property enumerated as INDEX from the movie clip with target path TARGET and push this value onto stack -\endverbatim */ -class FActionGetProperty : public FActionRecord -{ - -public: - FActionGetProperty() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionGetProperty); } -}; - -//! An action that reports milliseconds since player started -/*! \verbatim -1. an integer representing the number of minutes since the player was started is pushed onto stack -\endverbatim */ -class FActionGetTime : public FActionRecord -{ -public: - FActionGetTime() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionGetTime); } -}; - -//! An action that opens the given URL in a given window -/*! \verbatim -An action record specifying that the player open the given URL in a given window -\endverbatim */ -class FActionGetURL : public FActionRecord -{ -public: - //! FActionGetURL constructor - /*! - \param _url a pointer to an FString representing a URL address - \param _window a pointer to an FString identifying a window to open the URL in (empty FString indicates current window) - */ - FActionGetURL(FString *_url, FString *_window); - - virtual ~FActionGetURL(); - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - FString *url; - FString *window; -}; - -//! An action that opens a URL in an indicated window (stack based) -/*! \verbatim -1. pops value WINDOW off stack, window specifies the target window, empty string indicates current -2. pops URL off stack, specifies which URL to retrieve -3. retrieve URL in WINDOW using given HTTP request method - - if method is "HTTP GET" or "HTTP POST", variables in movie clip are sent using standard "x-www-urlencoded" encoding -\endverbatim */ -class FActionGetURL2 : public FActionRecord -{ -public: - //! FActionGetURL2 constructor - /*! - \param _method a number indicating an HTTP request method (value 0 indicates that it is not a request method, 1 indicates HTTP GET, 2 indicates HTTP POST) - */ - FActionGetURL2(U8 _method); - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U8 method; -}; - -//! An action that gets a variable's value -/*! \verbatim -1. pops value NAME off the stack -2. retrieves value of variable NAME -3. pushes NAME's associated value back onto stack -Variables in other execution contexts may be referenced by prefixing a variable name with a target path followed by a colon -\endverbatim */ -class FActionGetVariable : public FActionRecord -{ -public: - FActionGetVariable() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionGetVariable); } -}; - -//! An action that goes to the specified frame -/*! \verbatim -An action record specifying that the player goto the frame specified by the given frame index -\endverbatim */ -class DVAPI FActionGotoFrame : public FActionRecord -{ -public: - //! FActionGotoFrame constructor - /*! - \param frameIndex a number specifying the frame index of a frame to go to - */ - FActionGotoFrame(U16 frameIndex); - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U16 frameIndex; -}; - -//! An action that goes to a identified frame (stack based) -/*! \verbatim -1. pops value FRAME off the stack -2. if frame is a number, the next movie frame displayed will be FRAME'th frame in the current movie -3. if frame is a string, the next movie frame displayed will be the frame designated by label "FRAME" (if no such label exists, action is ignored) -4. FRAME may be prefixed by a target path -5. if given "play" flag is set, the movie begins playing the goto frame, otherwise movie play is stopped on goto frame -\endverbatim */ -class FActionGotoFrame2 : public FActionRecord -{ -public: - //! FActionGotoFrame2 constructor - /*! - \param _play a true or false value indicating whether or not goto frame should be played - */ - - FActionGotoFrame2(U8 _play); - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U8 play; -}; - -//! An action that goes to the frame indicated by the given label -/*! \verbatim -An action record specifying that the player goto the frame with the given label -\endverbatim */ -class FActionGotoLabel : public FActionRecord -{ -public: - //! FActionLabel constructor - /*! - \param _label a FString pointer indicating the label of the frame to go to - */ - FActionGotoLabel(FString *_label); - - virtual ~FActionGotoLabel(); - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - FString *label; -}; - -//! An action that test a condition and branches -/*! \verbatim -1. pops value CONDITION off the stack -2. if CONDITION is non-zero, branch to a given number of offset bytes following FActionIf record (a 0 value points to action directly following FActionIf; offset is a signed integer quantity enabling forward and backward branching) -\endverbatim */ -class DVAPI FActionIf : public FActionRecord -{ -public: - //!FActionIf constructor - /*! - \param _branchOffset a value representing a number of bytes (pos or neg) following the current tag to brach off to - */ - FActionIf(S16 _branchOffset); - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - S16 branchOffset; -}; - -//! An action that performs an unconditional branch -/*! \verbatim -An action record specifying that the player branch to a given number of bytes following the FActionJump record(a 0 value points to the action record immediately following) -Can branch either forward or backward -\endverbatim */ -class FActionJump : public FActionRecord -{ -public: - //! FActionJump constructor - /*! - \param _branchOffset a value representing a number of bytes (pos or neg) following the current tagto branch off to - */ - FActionJump(S16 _branchOffset); - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - S16 branchOffset; -}; - -//! An action that tests if a number is less than another number -/*! \verbatim -1. pops value A off the stack -2. pops value B off the stack -3. A and B converted to floating-point (non-numeric converted to 0) -4. if B < A, a 1 is pushed onto stack, otherwise a 0 is pushed -\endverbatim */ -class FActionLess : public FActionRecord -{ -public: - FActionLess() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionLess); } -}; - -//! An action that converts ASCII to character code (multi-byte aware) -/*! \verbatim -1. pops value VALUE off the stack -2. the value is converted from a number to the corresponding character. If 16bit value, double byte character constructed -3. resulting character pushed back onto stack -\endverbatim */ -class FActionMBAsciiToChar : public FActionRecord -{ -public: - FActionMBAsciiToChar() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionMBAsciiToChar); } -}; - -//! An action that converts character code to ASCII (multi-byte aware) -/*! \verbatim -1. pops value VALUE off the stack -2. the first character of VALUE is converted to a numeric character code. If the first character of VALUE is a double-byte character, a 16bit code value is constructed -3. resulting code is pushed to stack -\endverbatim */ -class FActionMBCharToAscii : public FActionRecord -{ -public: - FActionMBCharToAscii() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionMBCharToAscii); } -}; - -//! An action that extracts a substring from a string (multi-byte aware) -/*! \verbatim -1. pops number COUNT off the stack -2. pops number INDEX off stack -3. pops string STRING off stack -4. push to stack, the string of length LENGTH starting at the INDEX'th character of STRING -5. if INDEX or COUNT are non-numeric, push empty string to stack -\endverbatim */ -class FActionMBStringExtract : public FActionRecord -{ -public: - FActionMBStringExtract() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionMBStringExtract); } -}; - -//! An action that computes the length of a string (multi-byte aware) -/*! \verbatim -1. pops value STRING off stack -2. push length of STRING onto stack -\endverbatim */ -class FActionMBStringLength : public FActionRecord -{ -public: - FActionMBStringLength() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionMBStringLength); } -}; - -//! An action that multiplies two numbers -/*! \verbatim -1. pops value A off stack -2. pops value B off stack -3. A and B are converted to floating-point (non-numeric converted to 0) -4. result of A multiply B is pushed to stack -\endverbatim */ -class FActionMultiply : public FActionRecord -{ -public: - FActionMultiply() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionMultiply); } -}; - -//! An action that goes to next frame -/*! \verbatim -An action specifying that the Flash player goto the next frame -\endverbatim */ -class FActionNextFrame : public FActionRecord -{ -public: - FActionNextFrame() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionNextFrame); } -}; - -//! An action that performs the logical NOT of a number -/*! \verbatim -An action specifying that the Flash player: -1. pops value A off stack -2. A is converted to floating-point (non-numeric is converted to zero) -3. if A is zero, 1 pushed to stack -4. otherwise 0 pushed to stack -\endverbatim */ -class FActionNot : public FActionRecord -{ -public: - FActionNot() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionNot); } -}; - -//! An action that performs the logical OR of two numbers -/*! \verbatim -1. pops value A off stack -2. pops value B off stack -3. A and B converted to floating-point (non-numeric converted to zero) -4. if either A or B are non-zero, 1 is pushed to stack, otherwise 0 pushed to stack -\endverbatim */ -class FActionOr : public FActionRecord -{ -public: - FActionOr() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionOr); } -}; - -//! An action that starts playing the movie at the current frame -/*! \verbatim -An action specifying that the Flash player to start playing the movie at the current frame -\endverbatim */ -class FActionPlay : public FActionRecord -{ -public: - FActionPlay() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionPlay); } -}; - -//! An action that pops a value off the stack -/*! \verbatim -1. pops value A off stack and discards the value -\endverbatim */ -class FActionPop : public FActionRecord -{ -public: - FActionPop() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionPop); } -}; - -//! An action that goes to the previous frame -/*! \verbatim -\endverbatim */ -class FActionPrevFrame : public FActionRecord -{ -public: - FActionPrevFrame() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionPrevFrame); } -}; - -//! An action that pushes a given value onto the stack -/*! \verbatim -Pushes either a string or floating-point number onto the stack -\endverbatim */ -class DVAPI FActionPush : public FActionRecord -{ -public: - //! FActionPush constructor for pushing strings - /*! - \param _string a pointer to the FString that will be pushed onto stack - */ - FActionPush(FString *_string); - - //! FActionPush constructor for pushing numbers - /*! - \param _number a pointer to the FLOAT that will be pushed onto stack - */ - FActionPush(FLOAT _number); - - FActionPush(U8 _type, FLOAT _number); - FActionPush(double _number); - FActionPush(U8 _type, U8 _value); - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - FString *string; - FLOAT number; - U8 cValue; - double dValue; - U8 type; -}; - -//! An action that constructs a random number -/*! \verbatim -1. pop MAXIMUM off stack -2. constructs a random integer in the range 0... (MAXIMUM -1) -3. pushes this random value to stack -\endverbatim */ -class FActionRandomNumber : public FActionRecord -{ -public: - FActionRandomNumber() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionRandomNumber); } -}; - -//! An action that removes a cloned sprite -/*! \verbatim -1. pops value TARGET off stack -2. Removes the cloned clip identifiesd by target TARGET -\endverbatim */ -class FActionRemoveSprite : public FActionRecord -{ -public: - FActionRemoveSprite() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionRemoveSprite); } -}; - -//! An action that sets a movie property -/*! \verbatim -1. pops value VALUE off stack -2. pops value INDEX off stack -3. pops value TARGET off stack -4. sets property enumerated as INDEX in the movie clip TARGET to the value VALUE -\endverbatim */ -class FActionSetProperty : public FActionRecord -{ -public: - FActionSetProperty() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionSetProperty); } -}; - -//! An action that sets the context of action -/*! \verbatim -Sets context of action to target named by given string -\endverbatim */ -class FActionSetTarget : public FActionRecord -{ -public: - //! FActionSetTarget constructor - /*! - \param _targetName a pointer to the FString naming the target to set action context to - */ - FActionSetTarget(FString *_targetName); - - virtual ~FActionSetTarget(); - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - FString *targetName; -}; - -//! An action that sets the context of action (stack based) -/*! \verbatim -1. pops value TARGET off stack -2. sets current context of action to object identified by TARGET -\endverbatim */ -class FActionSetTarget2 : public FActionRecord -{ -public: - FActionSetTarget2() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionSetTarget2); } -}; - -//! An action that sets a variable -/*! \verbatim -1. pops value VALUE off stack -2. pops string NAME off stack -3. sets NAME to VALUE in the current execution context -\endverbatim */ -class FActionSetVariable : public FActionRecord -{ -public: - FActionSetVariable() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionSetVariable); } -}; - -//! An action that starts dragging a movie clip -/*! \verbatim -1. pops value TARGET off stack -2. pops LOCKCENTER off stack -3. pops CONSTRAIN -4. if CONSTRAIN is non-zero: - - pops y2 - - pops x2 - - pops y1 - - pops x1 -5. starts dragging of movie clip identified by TARGET -6. if LOCKCENTER is non-zero, the center of clip is locked to the mouse position, otherwise clip moves relative to starting mouse position -7. if CONSTRAIN, draged clip is constrained coordinates x1, y1, x2, y2 -\endverbatim */ -class FActionStartDrag : public FActionRecord -{ -public: - FActionStartDrag() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionStartDrag); } -}; - -//! An action that stops movie play at the current frame -/*! \verbatim -\endverbatim */ -class FActionStop : public FActionRecord -{ -public: - FActionStop() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionStop); } -}; - -//! An action that stops playing all sounds in movie -/*! \verbatim -\endverbatim */ -class FActionStopSounds : public FActionRecord -{ -public: - FActionStopSounds() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionStopSounds); } -}; - -//! An action that concatenates two strings -/*! \verbatim -1. pops string A off stack -2. pops string B off stack -3. the concatenation of BA is pushed to stack -\endverbatim */ -class FActionStringAdd : public FActionRecord -{ -public: - FActionStringAdd() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionStringAdd); } -}; - -//! An action that tests two strings for equality -/*! \verbatim -1. pops string A off stack -2. pops string B off stack -3. A and B are compared (case-sensitive) -4. if strings are equal, a 1 is pushed to stack, otherwise 0 pushed -\endverbatim */ -class FActionStringEquals : public FActionRecord -{ -public: - FActionStringEquals() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionStringEquals); } -}; - -//! An action that extracts a substring from a string -/*! \verbatim -1. pops number COUNT off stack -2. pops number INDEX off stack -3. pops string STRING off stack -4. the substring of length COUNT starting at the INDEX'th index of string STRING is pushed to stack -5. if COUNT or INDEX non-numeric, push empty string -\endverbatim */ -class FActionStringExtract : public FActionRecord -{ -public: - FActionStringExtract() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionStringExtract); } -}; - -//! An action that computes the length of a string -/*! \verbatim -1. pops string STRING off stack -2. the length of string STRING is pushed to stack -\endverbatim */ -class FActionStringLength : public FActionRecord -{ -public: - FActionStringLength() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionStringLength); } -}; - -//! An action that test if a string is less than another string -/*! \verbatim -1. pops string A off stack -2. pops string B off stack -3. if B < A using a byte to byte comparison, a 1 is pushed to the stack, otherwise 0 is pushed to stack -\endverbatim */ -class FActionStringLess : public FActionRecord -{ -public: - FActionStringLess() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionStringLess); } -}; - -//! An action that subtracts a number from another number -/*! \verbatim -1. pops value A off stack -2. pops value B off stack -3. converts values A and B to floating-point (non-numeric converts to zero) -4. the result, B-A, is pushed to stack -\endverbatim */ -class FActionSubtract : public FActionRecord -{ -public: - FActionSubtract() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionSubtract); } -}; - -//! An action that toggles screen quality between high and low -/*! \verbatim -\endverbatim */ -class FActionToggleQuality : public FActionRecord -{ -public: - FActionToggleQuality() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionToggleQuality); } -}; - -//! An action that converts a value to an integer -/*! \verbatim -1. pops value A off stack -2. A is converted to a floating-point number -3. A is truncated to an integer value -4. truncated A is pushed to stack -\endverbatim */ -class FActionToInteger : public FActionRecord -{ -public: - FActionToInteger() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionToInteger); } -}; - -//! An action that sends debugging output string -/*! \verbatim -1. pops value VALUE off stack -2. in the "Test Movie" mode of the Flash editor, appends VALUE to the output window if the debugging level is set to "None" -3. ignored by Flash Player -\endverbatim */ -class FActionTrace : public FActionRecord -{ -public: - FActionTrace(); - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionTrace); } -}; - -//! An action that waits for a specified frame, otherwise skips a specified number of actions -/*! \verbatim -\endverbatim */ -class FActionWaitForFrame : public FActionRecord -{ -public: - //! FActionWaitForFrame constructor - /*! - \param _frameIndex a number indexing the frame to wait for - \param skipCount a number indicating the number of frames to skip - */ - FActionWaitForFrame(U16 _frameIndex, U16 skipCount); - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U16 frameIndex; - U16 skipCount; -}; - -//! An action that waits for a frame to be loaded -/*! \verbatim -1. pops value FRAME off stack -2. frame is evaluated in the same manner as in FActionGotoFrame2 -3. if the frame identified by FRAME has been loaded, skip a specified number of actions following the current one -\endverbatim */ -class FActionWaitForFrame2 : public FActionRecord -{ -public: - //! FActionWaitForFrame2 constructor - /*! - \param _skipCount a number of actions to skip - */ - FActionWaitForFrame2(U8 _skipCount); - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U8 skipCount; -}; - -//! A class specifying a set of conditions and a set of subsequent actions to perform -/*! \verbatim -Buttons contain a set of FActionConditions. -An FActionCondition conatins a set of conditions and a set of actions to perform when the set of conditions is met - \sa FDTDefineButton, FDTDefineButton2 -*/ -class DVAPI FActionCondition -{ -public: - FActionCondition(); - - ~FActionCondition(); - - void Clear(); - - //! A member function that adds another action to the ActionCondition - /*! - Appends an FActionRecord to the list of FActionRecords. - These actions will be performed when the set of conditions is met - \param _ActionRecord any FActionRecord pointer - */ - void AddActionRecord(FActionRecord *_ActionRecord); - - //! A member function that adds a key-stroke condition to the set of conditions in an ActionCondition - /*! - \param keyCode one of the enumerated key-codes found in "Macromedia.h" - */ - void AddKeyCode(U32 keyCode); - - //! A member function that adds a button condition to the set of conditions in an ActionCondition - /*! - \param _condition one of the enumerated action-conditions found in "Macromedia.h" - */ - void AddCondition(U16 _condition); - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - \sa WriteToSWFStream(FSWFStream* _SWFStream, int lastFlag), FSWFStream - */ - void WriteToSWFStream(FSWFStream *_SWFStream); - - //! Writes the object out to a FSWFStream and writes the terminating record to the FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - \param lastFlag a flag that, if true, indicates that this ActionCondition is the last record to be writen - \sa WriteToSWFStream(FSWFStream* _SWFStream), FSWFStream - */ - void WriteToSWFStream(FSWFStream *_SWFStream, int lastFlag); - -private: - std::list actionRecordList; - U16 conditionFlags; -}; - -/* -class FActionConditionList -{ -public: - FActionConditionList(); - ~FActionConditionList(); - - void AddActionCondition(FActionCondition* _ActionCondition); - U32 Size(); - void WriteToSWFStream(FSWFStream* _SWFStream); - -private: - std::list conditionList; -}; -*/ -//============================================================================= -// ALCUNE AZIONI FLASH 5 -//============================================================================= - -class FActionConstantPool : public FActionRecord -{ -public: - FActionConstantPool(FString *string); - ~FActionConstantPool(); - - void addConstant(FString *string); - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - std::list constantList; - FActionConstantPool(); -}; - -class FActionLess2 : public FActionRecord -{ -public: - FActionLess2() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionLess2); } -}; - -class FActionEquals2 : public FActionRecord -{ -public: - FActionEquals2() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionEquals2); } -}; - -class FActionCallMethod : public FActionRecord -{ -public: - FActionCallMethod() {} - - //! Writes the object out to a FSWFStream - /*! - \param _SWFStream any FSWFStream pointer, though usually the FSWFStream given as an argument to the appendTag function of the FSWFStream representing the .swf file being created - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) { _SWFStream->WriteByte(sactionCallMethod); } -}; - -//============================================================================= -// CLIP ACTION / CLIP ACTION RECORD -//============================================================================= - -class FClipActionRecord; - -class DVAPI FClipAction -{ -public: - FClipAction(); - ~FClipAction(); - - void Clear(); - void AddClipActionRecord(FClipActionRecord *_clipActionRecord); - void AddFlags(U32 _flags); - void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - std::list clipActionRecordList; - U32 eventFlags; -}; - -//============================================================================= - -class DVAPI FClipActionRecord -{ -public: - FClipActionRecord(); - ~FClipActionRecord(); - - void Clear(); - void AddActionRecord(FActionRecord *_actionRecord); - void AddKeyCode(U8 _keyCode); - void AddFlags(U32 _flags); - void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - std::list actionRecordList; - U32 eventFlags; - U8 keyCode; -}; -#endif diff --git a/toonz/sources/common/flash/FCT.cpp b/toonz/sources/common/flash/FCT.cpp deleted file mode 100644 index db1546c..0000000 --- a/toonz/sources/common/flash/FCT.cpp +++ /dev/null @@ -1,502 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. - -/**************************************************************************************** - - File Summary: FCT.cpp - - This source file contains the definition for the low-level Control-Tag related functions, - grouped by classes, which are all derived from class FCT: - - - Class Member Function - - FCTDoAction FCTDoAction(void); - ~FCTDoAction(); - void AddAction(FActionRecord*); - void WriteToSWFStream(FSWFStream*); - - FCTFrameLabel FCTFrameLabel(FString*); - ~FCTFrameLabel(); - void WriteToSWFStream(FSWFStream*); - - FCTPlaceObject FCTPlaceObject(U16, U16, FMatrix*, FCXForm*); - ~FCTPlaceObject(); - void WriteToSWFStream(FSWFStream*); - - FCTPlaceObject2 FCTPlaceObject2(U16, U16, U16, U16, U16, U16, FMatrix*, - FCXForm*, U16, FString*, U16); - ~FCTPlaceObject2(); - void WriteToSWFStream(FSWFStream*); - - FCTProtect FCTProtect(); - void WriteToSWFStream(FSWFStream*); - - FCTRemoveObject FCTRemoveObject(U16, U16); - void WriteToSWFStream(FSWFStream*); - - FCTRemoveObject2 FCTRemoveObject2(U16); - void WriteToSWFStream(FSWFStream*); - - FCTSetBackgroundColor FCTSetBackgroundColor(FColor*); - ~FCTSetBackgroundColor(); - void WriteToSWFStream(FSWFStream*); - - FCTShowFrame FCTShowFrame(); - U32 IsShowFrame(); - void WriteToSWFStream(FSWFStream*); - - FCTStartSound FCTStartSound(U16, FSoundInfo*); - ~FCTStartSound(); - void WriteToSWFStream(FSWFStream*); - - -****************************************************************************************/ - -#include "FCT.h" -#include "FDTShapes.h" -#include "FDTSounds.h" - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FCTDoAction ------------------------------------------------------------ - -FCTDoAction::FCTDoAction(void) -{ -} - -FCTDoAction::~FCTDoAction() -{ - - while (!actionRecordList.empty()) { - - delete actionRecordList.front(); - - actionRecordList.pop_front(); - } -} - -void FCTDoAction::AddAction(FActionRecord *_actionRecord) -{ - - actionRecordList.push_back(_actionRecord); -} - -void FCTDoAction::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - FSWFStream body; - - std::list::iterator cursor; - for (cursor = actionRecordList.begin(); cursor != actionRecordList.end(); cursor++) { - - (*cursor)->WriteToSWFStream(&body); - } - - body.WriteByte(0); - - _SWFStream->AppendTag(stagDoAction, body.Size(), &body); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FCTFrameLabel ---------------------------------------------------------- - -FCTFrameLabel::FCTFrameLabel(FString *_frameName) -{ - frameName = _frameName; -} - -FCTFrameLabel::~FCTFrameLabel() -{ - delete frameName; -} - -void FCTFrameLabel::WriteToSWFStream(FSWFStream *_SWFStream) -{ - FSWFStream body; - frameName->WriteToSWFStream(&body, true); - - _SWFStream->AppendTag(stagFrameLabel, body.Size(), &body); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FCTPlaceObject ---------------------------------------------------------- - -FCTPlaceObject::FCTPlaceObject(U16 _characterID, - U16 _depth, - FMatrix *_matrix, - FCXForm *_colorTransform) -{ - characterID = _characterID; - depth = _depth; - matrix = _matrix; - colorTransform = _colorTransform; - - FLASHASSERT(_colorTransform); -} - -FCTPlaceObject::~FCTPlaceObject() -{ - delete matrix; - delete colorTransform; -} -void FCTPlaceObject::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - FSWFStream body; - ; - - body.WriteWord((U32)characterID); - - body.WriteWord((U32)depth); - - matrix->WriteToSWFStream(&body); - - if (colorTransform) { - colorTransform->WriteToSWFStream(&body); - } - - _SWFStream->AppendTag(stagPlaceObject, body.Size(), &body); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FCTPlaceObject2 -------------------------------------------------------- - -FCTPlaceObject2::FCTPlaceObject2(U16 _hasClipDepth, - U16 _hasRatio, - U16 _hasChar, - U16 _hasMove, - U16 _depth, - U16 _characterID, - FMatrix *_matrix, - FCXFormWAlpha *_colorTransform, - U16 _ratio, - FString *_name, - U16 _clipDepth) -{ - SetParameters(_hasClipDepth, _hasRatio, _hasChar, _hasMove, _depth, _characterID, - _matrix, _colorTransform, _ratio, _name, _clipDepth); -} - -FCTPlaceObject2::FCTPlaceObject2(const FCTPlaceObject2 &obj) -{ - SetParameters(obj.hasClipDepth, obj.hasRatio, obj.hasCharID, obj.hasMove, - obj.depth, obj.characterID, 0, obj.colorTransform, - obj.ratio, 0, obj.clipDepth); - matrix = obj.matrix ? new FMatrix(*(obj.matrix)) : 0; - name = obj.name ? new FString(*(obj.name)) : 0; -} - -void FCTPlaceObject2::SetParameters(U16 _hasClipDepth, - U16 _hasRatio, - U16 _hasChar, - U16 _hasMove, - U16 _depth, - U16 _characterID, - FMatrix *_matrix, - FCXFormWAlpha *_colorTransform, - U16 _ratio, - FString *_name, - U16 _clipDepth) -{ - hasClipAction = 0; - hasClipDepth = _hasClipDepth; - hasRatio = _hasRatio; - hasCharID = _hasChar; - hasMove = _hasMove; - depth = _depth; - characterID = _characterID; - matrix = _matrix; - colorTransform = _colorTransform; - ratio = _ratio; - name = _name; - clipDepth = _clipDepth; - clipAction = NULL; -} - -FCTPlaceObject2::FCTPlaceObject2(U16 _hasClipAction, - U16 _hasClipDepth, - U16 _hasRatio, - U16 _hasChar, - U16 _hasMove, - U16 _depth, - U16 _characterID, - FMatrix *_matrix, - FCXFormWAlpha *_colorTransform, - U16 _ratio, - FString *_name, - U16 _clipDepth, - FClipAction *_clipAction) -{ - hasClipAction = _hasClipAction; - hasClipDepth = _hasClipDepth; - hasRatio = _hasRatio; - hasCharID = _hasChar; - hasMove = _hasMove; - depth = _depth; - characterID = _characterID; - matrix = _matrix; - colorTransform = _colorTransform; - ratio = _ratio; - name = _name; - clipDepth = _clipDepth; - clipAction = _clipAction; -} - -FCTPlaceObject2::~FCTPlaceObject2() -{ - - delete name; - delete matrix; - delete colorTransform; - delete clipAction; -} - -U32 FCTPlaceObject2::IsPlaceObject() -{ - - return 1; -} - -int FCTPlaceObject2::GetPlacedId() -{ - return hasCharID ? characterID : -1; -} - -void FCTPlaceObject2::SetId(U16 id) -{ - characterID = id; - hasMove = 0; - hasCharID = 1; -} - -void FCTPlaceObject2::ChangePlacedId(U16 id) -{ - if (hasCharID) { - characterID = id; - //hasMove=0; - } -} - -void FCTPlaceObject2::SetMatrix(FMatrix *_matrix) -{ - matrix = _matrix; -} - -void FCTPlaceObject2::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - FSWFStream body; - - body.WriteBits(hasClipAction, 1); /*DM*/ - body.WriteBits(hasClipDepth, 1); /*DM*/ - body.WriteBits((name != 0), 1); - body.WriteBits(hasRatio, 1); - body.WriteBits((colorTransform != 0), 1); - body.WriteBits((matrix != 0), 1); - body.WriteBits(hasCharID, 1); - body.WriteBits(hasMove, 1); - - body.WriteWord(depth); - - if (hasCharID) - body.WriteWord((U32)characterID); - if (matrix) - matrix->WriteToSWFStream(&body); - if (colorTransform) - colorTransform->WriteToSWFStream(&body); - if (hasRatio) - body.WriteWord((U32)ratio); - if (name) - name->WriteToSWFStream(&body, true); - if (hasClipDepth) /*DM*/ - body.WriteWord((U32)clipDepth); /*DM*/ - if (hasClipAction) - clipAction->WriteToSWFStream(&body); - - body.FlushBits(); - - _SWFStream->AppendTag(stagPlaceObject2, body.Size(), &body); -} - -///////////////////////////////////////////////////////////////////////////////// -// -------- FCTProtect -------------------------------------------------------- - -FCTProtect::FCTProtect() -{ -} - -void FCTProtect::WriteToSWFStream(FSWFStream *_SWFStream) -{ - _SWFStream->AppendTag(stagProtect, 0, 0); -} - -///////////////////////////////////////////////////////////////////////////////// -// -------- FCTRemoveObject --------------------------------------------------- - -FCTRemoveObject::FCTRemoveObject(U16 _characterID, U16 _depth) -{ - characterID = _characterID; - depth = _depth; -} - -void FCTRemoveObject::WriteToSWFStream(FSWFStream *_SWFStream) -{ - FSWFStream body; - - body.WriteWord((U32)characterID); - body.WriteWord((U32)depth); - - _SWFStream->AppendTag(stagRemoveObject, body.Size(), &body); -} - -///////////////////////////////////////////////////////////////////////////////// -// -------- FCTRemoveObject2 -------------------------------------------------- - -FCTRemoveObject2::FCTRemoveObject2(U16 _depth) -{ - depth = _depth; -} - -void FCTRemoveObject2::WriteToSWFStream(FSWFStream *_SWFStream) -{ - FSWFStream body; - body.WriteWord((U32)depth); - - _SWFStream->AppendTag(stagRemoveObject2, body.Size(), &body); -} - -///////////////////////////////////////////////////////////////////////////////// -// -------- FCTSetBackgroundColor -------------------------------------------------- - -FCTSetBackgroundColor::FCTSetBackgroundColor(FColor *_color) -{ - color = _color; - // here changed. - // Background color is always opaque, i.e. no alpha channel. - color->AlphaChannel(false); -} - -FCTSetBackgroundColor::~FCTSetBackgroundColor() -{ - delete (color); -} - -void FCTSetBackgroundColor::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - FSWFStream body; - // here changed. - color->WriteToSWFStream(&body); - - _SWFStream->AppendTag(stagSetBackgroundColor, body.Size(), &body); -} - -///////////////////////////////////////////////////////////////////////////////// -// -------- FCTUnparsedTag -------------------------------------------------- - -FCTUnparsedTag::FCTUnparsedTag(U16 _tagId, U32 _lenght, U8 *_data) -{ - lenght = _lenght; - if (lenght > 0) { - data = new U8[lenght]; - memcpy(data, _data, lenght); - } else - data = 0; - - tagId = _tagId; -} - -FCTUnparsedTag::~FCTUnparsedTag() -{ - delete data; -} - -void FCTUnparsedTag::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - FSWFStream body; - // here changed. - if (lenght > 0) - body.WriteLargeData(data, lenght); - - _SWFStream->AppendTag(tagId, body.Size(), &body); -} - -USHORT FCTUnparsedTag::GetID() -{ - if (tagId == stagDefineButton2 || - tagId == stagDefineButton || - tagId == stagDefineText || - tagId == stagDefineText2 || - tagId == stagDefineEditText || - tagId == stagDefineMorphShape || - tagId == stagDefineBitsLossless2 || - tagId == stagDefineBitsLossless || - tagId == stagDefineBitsJPEG3) - return (USHORT)(data[0] | (data[1] << 8)); - return 0; -} - -void FCTUnparsedTag::SetID(USHORT id) -{ - if (tagId == stagDefineButton2 || - tagId == stagDefineButton || - tagId == stagDefineText || - tagId == stagDefineText2 || - tagId == stagDefineEditText || - tagId == stagDefineMorphShape || - tagId == stagDefineBitsLossless2 || - tagId == stagDefineBitsLossless || - tagId == stagDefineBitsJPEG3) { - data[0] = (id & 0xff); - data[1] = (id >> 8); - } -} - -///////////////////////////////////////////////////////////////////////////// -// -------- FCTShowFrame -------------------------------------------------- - -FCTShowFrame::FCTShowFrame() -{ -} - -U32 FCTShowFrame::IsShowFrame() -{ - - return 1; -} - -void FCTShowFrame::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - _SWFStream->AppendTag(stagShowFrame, 0, 0); -} - -///////////////////////////////////////////////////////////////////////////// -// -------- FCTStartSound -------------------------------------------------- - -FCTStartSound::FCTStartSound(U16 _soundID, FSoundInfo *_soundInfo) -{ - - soundID = _soundID; - soundInfo = _soundInfo; -} - -FCTStartSound::~FCTStartSound() -{ - - delete soundInfo; -} - -void FCTStartSound::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - FSWFStream body; - - body.WriteWord((U32)soundID); - soundInfo->WriteToSWFStream(&body); - - _SWFStream->AppendTag(stagStartSound, body.Size(), &body); -} diff --git a/toonz/sources/common/flash/FCT.h b/toonz/sources/common/flash/FCT.h deleted file mode 100644 index f503ec6..0000000 --- a/toonz/sources/common/flash/FCT.h +++ /dev/null @@ -1,302 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. - -/**************************************************************************************** - - File Summary: FCT.h - - This header-file contains the declarations of the low-level Control-Tag related classes: - - 1) class FCT; - 2) all the derived classes of class FCT: - - class FCTDoAction; - class FCTFrameLabel; - class FCTPlaceObject; - class FCTPlaceObject2; - class FCTProtect; - class FCTRemoveObject; - class FCTRemoveObject2; - class FCTSetBackgroundColor; - class FCTShowFrame; - class FCTStartSound; - - -****************************************************************************************/ - -#ifdef WIN32 // added from DV -#pragma warning(push) -#pragma warning(disable : 4786) -#pragma warning(disable : 4251) - -#endif - -#include "tcommon.h" - -#undef DVAPI -#undef DVVAR -#ifdef TNZCORE_EXPORTS -#define DVAPI DV_EXPORT_API -#define DVVAR DV_EXPORT_VAR -#else -#define DVAPI DV_IMPORT_API -#define DVVAR DV_IMPORT_VAR -#endif -#ifndef _F_C_T_H_ -#define _F_C_T_H_ - -#include "Macromedia.h" -#include "FObj.h" -#include "FAction.h" -#include "FPrimitive.h" - -class FCXForm; -class FCXFormWAlpha; - -class FSoundInfo; - -// A "control tag" type of flash object - -class DVAPI FCT : public FObj -{ -public: - virtual ~FCT() {} - virtual void WriteToSWFStream(FSWFStream * /*_SWFStream*/) {} -}; - -// flash object that directs the flash player to complete a given set of actions at frame completion - -class DVAPI FCTDoAction : public FCT -{ -public: - FCTDoAction(); - virtual ~FCTDoAction(); - - void AddAction(FActionRecord *_actionRecord); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - std::list actionRecordList; -}; - -// Associates a label with the frame. This label can then be used -// in the Go to Label Action. - -class DVAPI FCTFrameLabel : public FCT -{ - -public: - FCTFrameLabel(FString *_frameName); - virtual ~FCTFrameLabel(); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - FString *frameName; -}; - -// a flash object that directs the player to add an object to the display list (flash 1.0) - -class DVAPI FCTPlaceObject : public FCT -{ -public: - // if no color transform then _colorTransform argument must be null - FCTPlaceObject(U16 _characterID, - U16 _depth, - FMatrix *_matrix, // always present - FCXForm *_colorTransform); // NULL if there is not a color transform - virtual ~FCTPlaceObject(); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U16 characterID; - U16 depth; - FMatrix *matrix; - FCXForm *colorTransform; -}; - -class DVAPI FCTPlaceObject2 : public FCT -{ -public: - // if a certain flag is not true, you must provide a NULL value for its associated argument(s) - FCTPlaceObject2(U16 _hasClipDepth, /*DM*/ - U16 _hasRatio, - U16 _hasCharID, - U16 _hasMove, - U16 _depth, - U16 _characterID, - FMatrix *_matrix, // NULL if the object does not have a matrix - FCXFormWAlpha *_colorTransform, // NULL if there is no color transform - U16 _ratio, - FString *_name, // NULL if there is no name - U16 _clipDepth); /*DM*/ - - //now is possible to give a clip action - // if a certain flag is not true, you must provide a NULL value for its associated argument(s) - FCTPlaceObject2(U16 _hasClipAction, - U16 _hasClipDepth, /*DM*/ - U16 _hasRatio, - U16 _hasCharID, - U16 _hasMove, - U16 _depth, - U16 _characterID, - FMatrix *_matrix, // NULL if the object does not have a matrix - FCXFormWAlpha *_colorTransform, // NULL if there is no color transform - U16 _ratio, - FString *_name, // NULL if there is no name - U16 _clipDepth, - FClipAction *_clipAction); /*DM*/ - - FCTPlaceObject2(const FCTPlaceObject2 &_obj); - - void SetParameters(U16 _hasClipDepth, /*DM*/ - U16 _hasRatio, - U16 _hasCharID, - U16 _hasMove, - U16 _depth, - U16 _characterID, - FMatrix *_matrix, // NULL if the object does not have a matrix - FCXFormWAlpha *_colorTransform, // NULL if there is no color transform - U16 _ratio, - FString *_name, // NULL if there is no name - U16 _clipDepth); /*DM*/ - - // Used to fix the high level manager depth sorting problem. - int GetDepth() { return depth; } - void SetDepth(int d) { depth = d; } - - virtual ~FCTPlaceObject2(); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - U32 IsPlaceObject(); - int GetPlacedId(); - std::string GetName() { return name ? name->GetString() : string(); } - void SetId(U16 id); - void ChangePlacedId(U16 id); - - void SetMatrix(FMatrix *matrix); - void ApplyMatrix(const FMatrix &_matrix) - { - if (matrix) - (*matrix) = (*matrix) * _matrix; - else - matrix = new FMatrix(_matrix); - } - -private: - //flags - U16 hasClipAction; - U16 hasClipDepth; /*DM*/ - U16 hasRatio; - U16 hasCharID; - U16 hasMove; - - U16 depth; - U16 characterID; - FMatrix *matrix; - FCXFormWAlpha *colorTransform; - U16 ratio; - FString *name; - U16 clipDepth; /*DM*/ - FClipAction *clipAction; -}; - -// a flash control tag object which marks a SWF movie as uneditable - -class DVAPI FCTProtect : public FCT -{ -public: - FCTProtect(); - - virtual void WriteToSWFStream(FSWFStream *_SWFStream); -}; - -// a Flash control tag object which indicates to the flash player to remove an object from the display list (flash 1.0) - -class DVAPI FCTRemoveObject : public FCT -{ - -public: - FCTRemoveObject(U16 _characterID, U16 _depth); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - - // Used to fix the high level manager depth sorting problem. - int GetDepth() { return depth; } - void SetDepth(int d) { depth = d; } - -private: - U16 characterID; - U16 depth; -}; - -// a Flash control tag object which indicates to the flash player to remove an object from the display list (flash 1.0) - -class DVAPI FCTRemoveObject2 : public FCT -{ - -public: - FCTRemoveObject2(U16 _depth); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U16 depth; -}; - -// A flash object which sets a movie's background color - -class DVAPI FCTSetBackgroundColor : public FCT -{ -public: - FCTSetBackgroundColor(FColor *_color); - virtual ~FCTSetBackgroundColor(); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - FColor *color; -}; - -class DVAPI FCTUnparsedTag : public FCT -{ -public: - FCTUnparsedTag(U16 _tagId, U32 _lenght, U8 *_data); - virtual ~FCTUnparsedTag(); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - USHORT GetID(); - void SetID(USHORT id); - -private: - U8 *data; - U32 lenght; - U16 tagId; -}; - -//a control tag that indicates end of the current frame - -class DVAPI FCTShowFrame : public FCT -{ - -public: - FCTShowFrame(); - U32 IsShowFrame(); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); -}; - -// A flash object that instructs flash player to start a sound - -class DVAPI FCTStartSound : public FCT -{ -public: - FCTStartSound(U16 _soundID, FSoundInfo *_soundInfo); - virtual ~FCTStartSound(); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U16 soundID; - FSoundInfo *soundInfo; -}; - -#ifdef WIN32 // added from DV -#pragma warning(pop) -#endif - -#endif diff --git a/toonz/sources/common/flash/FDT.cpp b/toonz/sources/common/flash/FDT.cpp deleted file mode 100644 index 6a59a01..0000000 --- a/toonz/sources/common/flash/FDT.cpp +++ /dev/null @@ -1,20 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. - -/**************************************************************************************** - - File Summary: FDT.cpp - - This source file is empty, since class FDT is an low-level abstract class for all - Definition-Tags, and all the derived classes of class FDT are defined in other - FDTxxx.cpp files. - -****************************************************************************************/ - -#include "FDT.h" - -// return 1; -// -// } diff --git a/toonz/sources/common/flash/FDT.h b/toonz/sources/common/flash/FDT.h deleted file mode 100644 index 37e459a..0000000 --- a/toonz/sources/common/flash/FDT.h +++ /dev/null @@ -1,68 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. - -/**************************************************************************************** - - File Summary: FDT.h - - This header-file contains the declaration of low-level class FDT. It is derived from - low-level class FObj, and also an abstract class from which all other low-level - FDTxxxx classes are derived. - -****************************************************************************************/ - -#ifndef F_D_T_H_ -#define F_D_T_H_ - -#include "FObj.h" - -// A "define type" flash object -// Flash objects are separated into define and control types -// distinction neccecary because in a flash frame, all define objects must come before control objects - -#ifdef WIN32 // added from DV -#pragma warning(push) -#pragma warning(disable : 4786) -#pragma warning(disable : 4251) - -#endif - -#include "tcommon.h" - -#undef DVAPI -#undef DVVAR -#ifdef TFLASH_EXPORTS -#define DVAPI DV_EXPORT_API -#define DVVAR DV_EXPORT_VAR -#else -#define DVAPI DV_IMPORT_API -#define DVVAR DV_IMPORT_VAR -#endif - -class DVAPI FDT : public FObj -{ -public: - virtual ~FDT() {} - virtual void WriteToSWFStream(FSWFStream * /*_SWFStream*/) {} - // Defines, used by the font system. Perhaps not the best place for them, but better than - // the global situation. lee@middlesoft - enum { - ShiftJIS = 1, - Unicode = 2, - ANSI = 3 - }; - - virtual U16 ID(void) - { - FLASHASSERT(0); - return 0; - } - virtual void SetId(U16 id) { FLASHASSERT(0); } -}; - -#ifdef WIN32 // added from DV -#pragma warning(pop) -#endif -#endif diff --git a/toonz/sources/common/flash/FDTBitmaps.cpp b/toonz/sources/common/flash/FDTBitmaps.cpp deleted file mode 100644 index ded1425..0000000 --- a/toonz/sources/common/flash/FDTBitmaps.cpp +++ /dev/null @@ -1,295 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. - -/**************************************************************************************** - - File Summary: FDTBitmaps.cpp - - This source file contains the definition for all low-level bitmap-related functions, - grouped by classes, which are all derived from class FDT, and related to bitmaps: - - - Class Member Function - - FDTDefineBits FDTDefineBits(U32, U8*); - U16 ID(void); - void WriteToSWFStream(FSWFStream*); - - FDTDefineBitsJPEG2 FDTDefineBitsJPEG2(U8*, U32); - U16 FDTDefineBitsJPEG2::ID(void); - void WriteToSWFStream(FSWFStream*); - - FDTDefineBitsJPEG3 FDTDefineBitsJPEG3(U8*, U32, U8*, U32); - U16 FDTDefineBitsJPEG3::ID(void); - void WriteToSWFStream(FSWFStream*); - - FDTDefineBitsLosslessBase FDTDefineBitsLosslessBase(U8, U8, U16, int, - void*, void*, bool); - void WriteToSWFStream(FSWFStream*); - - FDTDefineBitsLossless FDTDefineBitsLossless(U8, U16, U16, int, FRGB*, void*); - - FDTDefineBitsLossless2 FDTDefineBitsLossless(U8, U16, U16, int, FRGBA*, void*); - - FDTJPEGTables FDTJPEGTables(U32, U8*); - void WriteToSWFStream(FSWFStream*); - - - -****************************************************************************************/ - -#ifdef WIN32 -#pragma warning(disable : 4786) -#endif - -#include "FSWFStream.h" -#include "FObj.h" -#include "FDTBitmaps.h" -#include "zlib.h" - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTDefineBits ---------------------------------------------------------- - -FDTDefineBits::FDTDefineBits(U32 _size, U8 *_image) -{ - size = _size; - image = _image; - characterID = FObjCollection::Increment(); -} - -U16 FDTDefineBits::ID(void) -{ - return characterID; -} - -void FDTDefineBits::WriteToSWFStream(FSWFStream *_SWFStream) -{ - FSWFStream body; - - body.WriteWord((U32)characterID); - body.WriteLargeData(image, size); - - _SWFStream->AppendTag(stagDefineBits, body.Size(), &body); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTDefineBitsJPEG2 ----------------------------------------------------- - -FDTDefineBitsJPEG2::FDTDefineBitsJPEG2(U8 *_JPEGStream, U32 _JPEGSize) -{ - - JPEGStream = new U8[_JPEGSize]; - memcpy(JPEGStream, _JPEGStream, _JPEGSize); - JPEGSize = _JPEGSize; - characterID = FObjCollection::Increment(); -} - -U16 FDTDefineBitsJPEG2::ID(void) -{ - - return characterID; -} - -FDTDefineBitsJPEG2::~FDTDefineBitsJPEG2() -{ -} - -void FDTDefineBitsJPEG2::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - FSWFStream body; - - body.WriteWord((U32)characterID); - - // 2 bytes indicating end of encoding stream - // no encoding data is written here because it is an empty stream - body.WriteByte(0xff); - body.WriteByte(0xd9); - - //2 bytes indicating beginning of JPEG stream - body.WriteByte(0xff); - body.WriteByte(0xd8); - - //the entire JPEG stream - body.WriteLargeData(JPEGStream, JPEGSize); - - //2 bytes indicating end of JPEG stream - body.WriteByte(0xff); - body.WriteByte(0xd9); - - _SWFStream->AppendTag(stagDefineBitsJPEG2, body.Size(), &body); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTDefineBitsJPEG3 ----------------------------------------------------- - -FDTDefineBitsJPEG3::FDTDefineBitsJPEG3(U8 *_JPEGStream, U32 _JPEGSize, - U8 *_alphaStream, U32 _alphaSize) -{ - JPEGStream = _JPEGStream; - JPEGSize = _JPEGSize; - alphaStream = _alphaStream; - alphaSize = _alphaSize; - characterID = FObjCollection::Increment(); -} - -U16 FDTDefineBitsJPEG3::ID(void) -{ - return characterID; -} - -void FDTDefineBitsJPEG3::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - FSWFStream body; - - body.WriteWord((U32)characterID); - - //offset includes the 2 end of stream tags and the 1 beginning stream tag - U32 offset = JPEGSize + 6; - body.WriteDWord(offset); - - // 2 bytes indicating end of encoding stream - // no encoding data is written here - // an empty stream is written - body.WriteByte(0xff); - body.WriteByte(0xd9); - - //2 bytes indicating begining of JPEG stream - body.WriteByte(0xff); - body.WriteByte(0xd8); - - //the entire JPEG stream - body.WriteLargeData(JPEGStream, JPEGSize); - - //2 bytes indicating end of JPEG steam - body.WriteByte(0xff); - body.WriteByte(0xd9); - - // alpha data - body.WriteLargeData(alphaStream, alphaSize); - - _SWFStream->AppendTag(stagDefineBitsJPEG3, body.Size(), &body); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTDefineBitsLosslessBase ---------------------------------------------- - -FDTDefineBitsLosslessBase::FDTDefineBitsLosslessBase(U8 _format, - U16 _width, - U16 _height, - int _colorTableCount, - const void *_colorTableData, - const void *_imageData, - bool _alpha) -{ - format = _format; - width = _width; - height = _height; - colorTableCount = _colorTableCount; - alpha = _alpha; - characterID = FObjCollection::Increment(); - - // copy the memory to another block to be compressed - int rgbBytes = (alpha) ? 4 : 3; - int tableBytes = colorTableCount * rgbBytes; - - int bits = (1 << format); // how many bits does this format have? - - int imageBytes = (width * height * bits + 7) / 8; - TUINT32 totalBytes = imageBytes + tableBytes; - - // copy the image and the table to a new buffer - unsigned char *raw = new unsigned char[totalBytes]; - if (tableBytes) { - memcpy(raw, _colorTableData, tableBytes); - } - memcpy(&raw[tableBytes], _imageData, imageBytes); - - // a compressed buffer - the allocated size is based on a zlib formula - compressedSize = totalBytes + totalBytes / 100 + 12; - compressed = new unsigned char[compressedSize]; - - // now compress the raw data - note this will change compressedSize - int ret = compress2(compressed, (uLongf *)&compressedSize, raw, totalBytes, Z_BEST_COMPRESSION); - - FLASHASSERT(ret == Z_OK); - - delete[] raw; -} - -FDTDefineBitsLosslessBase::~FDTDefineBitsLosslessBase() -{ - delete[] compressed; -} - -void FDTDefineBitsLosslessBase::WriteToSWFStream(FSWFStream *_SWFStream) -{ - FSWFStream body; - - body.WriteWord((U32)characterID); - body.WriteByte((U32)format); - body.WriteWord((U32)width); - body.WriteWord((U32)height); - - if (format <= bm8Bit) { - body.WriteByte((U32)(colorTableCount - 1)); - } - - body.WriteLargeData(compressed, compressedSize); - - if (alpha) - _SWFStream->AppendTag(stagDefineBitsLossless2, body.Size(), &body); - else - _SWFStream->AppendTag(stagDefineBitsLossless, body.Size(), &body); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTDefineBitsLossless -------------------------------------------------- - -FDTDefineBitsLossless::FDTDefineBitsLossless(U8 _format, - U16 _width, - U16 _height, - int _colorTableCount, - const FRGB *_colorTableData, - const void *_imageData) - : FDTDefineBitsLosslessBase(_format, _width, _height, _colorTableCount, _colorTableData, _imageData, false) -{ -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTDefineBitsLossless2 ------------------------------------------------- - -FDTDefineBitsLossless2::FDTDefineBitsLossless2(U8 _format, - U16 _width, - U16 _height, - int _colorTableCount, - const FRGBA *_colorTableData, - const void *_imageData) - : FDTDefineBitsLosslessBase(_format, _width, _height, _colorTableCount, _colorTableData, _imageData, true) -{ -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTJPEGTables ---------------------------------------------------------- - -// Constructor. Currently takes in a U32 indicating the size of the data in bytes, and -// a pointer to the beginning of the stream of data. -FDTJPEGTables::FDTJPEGTables(U32 encodingDataSize, U8 *encodingData) -{ - this->encodingData = encodingData; - this->encodingDataSize = encodingDataSize; -} - -// Writes to the given _SWFStream. - -void FDTJPEGTables::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - FSWFStream body; - body.WriteLargeData(encodingData, encodingDataSize); - - _SWFStream->AppendTag(stagJPEGTables, body.Size(), &body); -} diff --git a/toonz/sources/common/flash/FDTBitmaps.h b/toonz/sources/common/flash/FDTBitmaps.h deleted file mode 100644 index f6afb61..0000000 --- a/toonz/sources/common/flash/FDTBitmaps.h +++ /dev/null @@ -1,196 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. - -/**************************************************************************************** - - File Summary: FDTBitmaps.h - - This header-file contains the declarations of all low-level bitmap-related classes, - which are all derived from class FDT: - - class FDTDefineBits; - class FDTDefineBitsJPEG2; - class FDTDefineBitsJPEG3; - class FDTDefineBitsLosslessBase; - class FDTDefineBitsLossless : public FDTDefineBitsLosslessBase; - class FDTDefineBitsLossless2 : public FDTDefineBitsLosslessBase; - class FDTJPEGTables; - -****************************************************************************************/ - -#ifndef _F_DEFINE_BITMAPS_H_ -#define _F_DEFINE_BITMAPS_H_ - -#ifdef WIN32 // added from DV -#pragma warning(push) -#pragma warning(disable : 4786) -#pragma warning(disable : 4251) - -#endif - -#include "FDT.h" - -#include "tcommon.h" - -#undef DVAPI -#undef DVVAR -#ifdef TFLASH_EXPORTS -#define DVAPI DV_EXPORT_API -#define DVVAR DV_EXPORT_VAR -#else -#define DVAPI DV_IMPORT_API -#define DVVAR DV_IMPORT_VAR -#endif - -struct FRGB; -struct FRGBA; - -// A flash object which defines a jpeg bitmap image (flash 1.0) - -class DVAPI FDTDefineBits : public FDT -{ - -public: - // constructed with image size and a pointer to the actual jpeg stream - FDTDefineBits(U32 _size, U8 *_image); - U16 ID(void); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U16 characterID; - U32 size; - U8 *image; -}; - -// A flash object which defines a jpeg bitmap image (flash 2.0) -// Differs from FDTDefineBits in that the encoding data and image data are contained in the object separately, but this DefineBitsJPEG2 doesn't really do this (as does not flash)... -// An empty stream is writen where encoding data should normally be encountered and all the JPEG and encoding data is written within the JPEG stream - -class DVAPI FDTDefineBitsJPEG2 : public FDT -{ - -public: - FDTDefineBitsJPEG2(U8 *_JPEGStream, U32 _JPEGSize); - U16 ID(void); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - ~FDTDefineBitsJPEG2(); - -private: - U16 characterID; - U32 JPEGSize; - U8 *JPEGStream; -}; - -// A flash object which defines a jpeg bitmap image (flash 3.0) -// Differs from FDTDefineBitsJPEG2 in that Alpha transparency data is contained in this object - -class DVAPI FDTDefineBitsJPEG3 : public FDT -{ - -public: - FDTDefineBitsJPEG3(U8 *_JPEGStream, U32 _JPEGSize, - U8 *_alphaStream, U32 _alphaSize); - U16 ID(void); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U16 characterID; - U32 alphaSize; - U32 JPEGSize; - U8 *JPEGStream; - U8 *alphaStream; -}; - -// Base class for FDTDefineBitsLossless (below) and FDTDefineBitsLossless2. -// Please see those two classes for descripion of parameters. -// Note this class can be constructed - it will write the correct tag when -// WriteToSWFStream is called. Or one of the child classes can be used. - -class DVAPI FDTDefineBitsLosslessBase : public FDT -{ - -public: - enum { - bm1Bit, // 2 color - bm2Bit, // 4 color - bm4Bit, // 16 color - bm8Bit, // 256 color - bm16Bit, // high - bm32Bit // true - }; - - virtual U16 ID() { return characterID; } - - FDTDefineBitsLosslessBase(U8 _format, - U16 _width, - U16 _height, - int _colorTableCount, - const void *_colorTableData, - const void *_imageData, - bool alpha); - virtual ~FDTDefineBitsLosslessBase(); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U16 characterID; - U8 format; - U16 width; - U16 height; - int colorTableCount; - bool alpha; - TUINT32 compressedSize; // a count of how many bytes are in the compressed buffer - unsigned char *compressed; // pointer to the compressed data -}; - -// Defines a loss-less bitmap object, like a GIF, BMP, or PCT. -// This version does not accept alpha channel data - FDTDefineBitsLossless2 does. -// Accepts raw bitmap data and compresses it. - -class DVAPI FDTDefineBitsLossless : public FDTDefineBitsLosslessBase -{ - -public: - FDTDefineBitsLossless(U8 _format, // format, from FDTDefineBitsLosslessBase. - U16 _width, // size of the image - U16 _height, - int _colorTableCount, // how many entries in the color table - consistent - // with format. May be 0. - const FRGB *_colorTableData, // Null if no color cable. RGB data - const void *_imageData // Pointer to the image. (byte aligned.) - ); -}; - -// Defines a loss-less bitmap object, like a GIF, BMP, or PCT. -// This version requires alpha channel data. Note the color table is RGBA. -// Accepts raw bitmap data and compresses it. - -class DVAPI FDTDefineBitsLossless2 : public FDTDefineBitsLosslessBase -{ - -public: - FDTDefineBitsLossless2(U8 _format, // format, from FDTDefineBitsLosslessBase. - U16 _width, // size of the image - U16 _height, - int _colorTableCount, // how many entries in the color table - consistent - // with format. May be 0. - const FRGBA *_colorTableData, // Null if no color cable. RGB data - const void *_imageData // Pointer to the image. (byte aligned.) - ); -}; - -//the JPEGTable structure (contains the encoding scheme for all JPEGs defined using DefineBits - -class DVAPI FDTJPEGTables : public FDT -{ - -public: - FDTJPEGTables(U32 encodingDataSize, U8 *encodingData); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U32 encodingDataSize; - U8 *encodingData; -}; -#endif diff --git a/toonz/sources/common/flash/FDTButtons.cpp b/toonz/sources/common/flash/FDTButtons.cpp deleted file mode 100644 index df6b692..0000000 --- a/toonz/sources/common/flash/FDTButtons.cpp +++ /dev/null @@ -1,411 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. - -/**************************************************************************************** - - File Summary: FDTButtons.cpp - - This source file contains the definition for all low-level button-related functions, - grouped by classes: - - Class Member Function - - FButtonRecord1 FButtonRecord1(U8, U8, U8, U8, U16, FMatrix*); - FButtonRecord1 ~FButtonRecord1(); - void WriteToSWFStream(FSWFStream*); - - FButtonRecord2 FButtonRecord2(U8, U8, U8, U8, U16, U16, FMatrix*, FACXForm*); - ~FButtonRecord2(); - void WriteToSWFStream(FSWFStream*); - - FButtonRecordList FButtonRecordList(); - ~FButtonRecordList(); - void AddRecord(FAButtonRecord*); - int Size(); - void WriteToSWFStream(FSWFStream*); - - FDTDefineButton FDTDefineButton(void); - ~FDTDefineButton(); - U16 ID(void); - void AddButtonRecord(FButtonRecord1*); - void AddActionRecord(FActionRecord*); - void WriteToSWFStream(FSWFStream*); - - FDTDefineButton2 FDTDefineButton2(U8); - ~FDTDefineButton2(void); - U16 ID(void); - void AddButtonRecord(FButtonRecord2*); - void AddActionCondition(FActionCondition*); - void WriteToSWFStream(FSWFStream*); - - FDTDefineButtonCXForm FDTDefineButtonCXForm(U16, FCXForm*); - ~FDTDefineButtonCXForm(); - void WriteToSWFStream(FSWFStream*); - - FDTDefineButtonSound FDTDefineButtonSound(U16, U16, FSoundInfo*, U16, FSoundInfo*, - U16, FSoundInfo*, U16, FSoundInfo*); - ~FDTDefineButtonSound(); - void WriteToSWFStream(FSWFStream*); - -****************************************************************************************/ -#ifdef WIN32 -#pragma warning(disable : 4786) -#endif - -#include "FPrimitive.h" -#include "FDTButtons.h" -#include "FAction.h" -#include "FDTShapes.h" -#include "FDTSounds.h" - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FButtonRecord1 --------------------------------------------------------- - -FButtonRecord1::FButtonRecord1(U8 _hit, U8 _down, U8 _over, U8 _up, U16 _layer, FMatrix *_matrix) -{ - hit = _hit; - down = _down; - over = _over; - up = _up; - layer = _layer; - matrix = _matrix; - characterID = FObjCollection::Increment(); -} - -FButtonRecord1::~FButtonRecord1() -{ - delete matrix; -} - -void FButtonRecord1::WriteToSWFStream(FSWFStream *_SWFStream) -{ - _SWFStream->WriteBits(0, 4); - _SWFStream->WriteBits(hit, 1); - _SWFStream->WriteBits(down, 1); - _SWFStream->WriteBits(over, 1); - _SWFStream->WriteBits(up, 1); - _SWFStream->WriteWord(characterID); - _SWFStream->WriteWord(layer); - matrix->WriteToSWFStream(_SWFStream); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FButtonRecord2 --------------------------------------------------------- - -FButtonRecord2::FButtonRecord2(U8 _hit, U8 _down, U8 _over, U8 _up, U16 _characterID, U16 _layer, FMatrix *_matrix, FACXForm *_colorTransform) -{ - hit = _hit; - down = _down; - over = _over; - up = _up; - characterID = _characterID; - layer = _layer; - matrix = _matrix; - colorTransform = _colorTransform; -} - -FButtonRecord2::~FButtonRecord2() -{ - delete matrix; - delete colorTransform; -} - -void FButtonRecord2::WriteToSWFStream(FSWFStream *_SWFStream) -{ - _SWFStream->FlushBits(); - _SWFStream->WriteBits(0, 4); - _SWFStream->WriteBits(hit, 1); - _SWFStream->WriteBits(down, 1); - _SWFStream->WriteBits(over, 1); - _SWFStream->WriteBits(up, 1); - _SWFStream->WriteWord(characterID); - _SWFStream->WriteWord(layer); - - matrix->WriteToSWFStream(_SWFStream); - _SWFStream->FlushBits(); - colorTransform->WriteToSWFStream(_SWFStream); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FButtonRecordList ------------------------------------------------------ - -FButtonRecordList::FButtonRecordList() {} - -FButtonRecordList::~FButtonRecordList() -{ - while (!listOfButtonRecords.empty()) { - - delete listOfButtonRecords.front(); - - listOfButtonRecords.pop_front(); - } -} - -void FButtonRecordList::AddRecord(FAButtonRecord *_buttonRecord) -{ - - listOfButtonRecords.push_back(_buttonRecord); -} - -int FButtonRecordList::Size() -{ - - return listOfButtonRecords.size(); -} - -void FButtonRecordList::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - std::list::iterator cursor; - - for (cursor = listOfButtonRecords.begin(); cursor != listOfButtonRecords.end(); cursor++) { - - (*cursor)->WriteToSWFStream(_SWFStream); - } -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTDefineButton -------------------------------------------------------- - -FDTDefineButton::FDTDefineButton(void) -{ - - characterID = FObjCollection::Increment(); -} - -FDTDefineButton::~FDTDefineButton() -{ - - // delete all entries in action record list - while (!listOfActionRecords.empty()) { - - delete listOfActionRecords.front(); - listOfActionRecords.pop_front(); - } - - //delete all entries in button record list - while (!listOfButtonRecords.empty()) { - - delete listOfButtonRecords.front(); - - listOfButtonRecords.pop_front(); - } -} - -U16 FDTDefineButton::ID(void) -{ - - return characterID; -} - -void FDTDefineButton::AddButtonRecord(FButtonRecord1 *_buttonRecord) -{ - - listOfButtonRecords.push_back(_buttonRecord); -} - -void FDTDefineButton::AddActionRecord(FActionRecord *_actionRecord) -{ - - listOfActionRecords.push_back(_actionRecord); -} - -void FDTDefineButton::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - FSWFStream body; - body.WriteWord((U32)characterID); - - //write the button record list to the body - std::list::iterator cursor; - - for (cursor = listOfButtonRecords.begin(); cursor != listOfButtonRecords.end(); cursor++) { - - (*cursor)->WriteToSWFStream(&body); - } - - //write the end of button record flag - body.WriteByte(0); - - //write the action record list to the body - std::list::iterator cursor2; - for (cursor2 = listOfActionRecords.begin(); cursor2 != listOfActionRecords.end(); cursor2++) { - - (*cursor2)->WriteToSWFStream(&body); - } - - //write the action end flag - body.WriteByte(0); - - _SWFStream->AppendTag(stagDefineButton2, body.Size(), &body); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTDefineButton2 ------------------------------------------------------- - -FDTDefineButton2::FDTDefineButton2(U8 _menuFlag) -{ - - characterID = FObjCollection::Increment(); - menuFlag = _menuFlag; -} - -FDTDefineButton2::~FDTDefineButton2(void) -{ - - //delete all entries in conditionsList - while (!conditionList.empty()) { - - delete conditionList.front(); - - conditionList.pop_front(); - } - - //delete all entries in listOfButtonRecords - while (!listOfButtonRecords.empty()) { - - delete listOfButtonRecords.front(); - - listOfButtonRecords.pop_front(); - } -} - -U16 FDTDefineButton2::ID(void) -{ - - return characterID; -} - -void FDTDefineButton2::AddButtonRecord(FButtonRecord2 *_buttonRecord) -{ - - listOfButtonRecords.push_back(_buttonRecord); -} - -void FDTDefineButton2::AddActionCondition(FActionCondition *_actionCondition) -{ - - conditionList.push_back(_actionCondition); -} - -void FDTDefineButton2::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - FSWFStream body; - - body.WriteWord((U32)characterID); - - body.WriteByte((U32)menuFlag); - - FSWFStream buttonRecordStream; - - //write the list of button records to button record stream - std::list::iterator cursor; - - for (cursor = listOfButtonRecords.begin(); cursor != listOfButtonRecords.end(); cursor++) { - - (*cursor)->WriteToSWFStream(&buttonRecordStream); - } - - buttonRecordStream.WriteByte((U32)0); - U32 offset = 0; - if (!conditionList.empty()) - offset = buttonRecordStream.Size() + 2; //have to count the action offset also - body.WriteWord(offset); - body.Append(&buttonRecordStream); - - //write the list of action records - if (!conditionList.empty()) { - std::list::iterator cursor1; - std::list::iterator cursor2; - cursor2 = (conditionList.end()); - cursor2--; - - for (cursor1 = conditionList.begin(); cursor1 != cursor2; cursor1++) { - - (*cursor1)->WriteToSWFStream(&body); - } - - (*cursor1)->WriteToSWFStream(&body, 1); //flag indicating it is the last action condition - } - - _SWFStream->AppendTag(stagDefineButton2, body.Size(), &body); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTDefineButtonCXForm -------------------------------------------------- - -FDTDefineButtonCXForm::FDTDefineButtonCXForm(U16 _characterID, FCXForm *_colorTransform) -{ - characterID = _characterID; - colorTransform = _colorTransform; -} - -FDTDefineButtonCXForm::~FDTDefineButtonCXForm() -{ - - delete colorTransform; -} - -void FDTDefineButtonCXForm::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - FSWFStream body; - - body.WriteWord((U32)characterID); - colorTransform->WriteToSWFStream(&body); - - _SWFStream->AppendTag(stagDefineButtonCxform, body.Size(), &body); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTDefineButtonSound --------------------------------------------------- - -FDTDefineButtonSound::FDTDefineButtonSound(U16 _buttonID, U16 _soundID0, FSoundInfo *_soundInfo0, - U16 _soundID1, FSoundInfo *_soundInfo1, - U16 _soundID2, FSoundInfo *_soundInfo2, - U16 _soundID3, FSoundInfo *_soundInfo3) -{ - buttonID = _buttonID; - soundID0 = _soundID0; - soundInfo0 = _soundInfo0; - soundID1 = _soundID1; - soundInfo1 = _soundInfo1; - soundID2 = _soundID2; - soundInfo2 = _soundInfo2; - soundID3 = _soundID3; - soundInfo3 = _soundInfo3; -} - -FDTDefineButtonSound::~FDTDefineButtonSound() -{ - - delete soundInfo0; - delete soundInfo1; - delete soundInfo2; - delete soundInfo3; -} - -void FDTDefineButtonSound::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - FSWFStream body; - - body.WriteWord((U32)buttonID); - - body.WriteWord((U32)soundID0); - soundInfo0->WriteToSWFStream(&body); - - body.WriteWord((U32)soundID1); - soundInfo1->WriteToSWFStream(&body); - - body.WriteWord((U32)soundID2); - soundInfo2->WriteToSWFStream(&body); - - body.WriteWord((U32)soundID3); - soundInfo3->WriteToSWFStream(&body); - - _SWFStream->AppendTag(stagDefineButtonSound, body.Size(), &body); -} diff --git a/toonz/sources/common/flash/FDTButtons.h b/toonz/sources/common/flash/FDTButtons.h deleted file mode 100644 index d2d2c3e..0000000 --- a/toonz/sources/common/flash/FDTButtons.h +++ /dev/null @@ -1,201 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. - -/**************************************************************************************** - - File Summary: FDTButtons.h - - This header-file contains the declarations of all low-level button-related classes. - Their parent classes are in the parentheses: - - class FAButtonRecord; - class FButtonRecord1; (public FAButtonRecord) - class FButtonRecord2; (public FAButtonRecord) - class FButtonRecordList; - class FDTDefineButton; (public FDT) - class FDTDefineButton2; (public FDT) - class FDTDefineButtonCXForm; (public FDT) - class FDTDefineButtonSound. (public FDT) - -****************************************************************************************/ - -#ifndef _F_DTBUTTONS_H_ -#define _F_DTBUTTONS_H_ - -#include "FDT.h" - -#ifdef WIN32 // added from DV -#pragma warning(push) -#pragma warning(disable : 4786) -#pragma warning(disable : 4251) - -#endif - -#include "tcommon.h" - -#undef DVAPI -#undef DVVAR -#ifdef TFLASH_EXPORTS -#define DVAPI DV_EXPORT_API -#define DVVAR DV_EXPORT_VAR -#else -#define DVAPI DV_IMPORT_API -#define DVVAR DV_IMPORT_VAR -#endif - -class FMatrix; -class FACXForm; -class FActionRecord; -class FActionCondition; -class FCXForm; -class FSoundInfo; - -// Specifies appearance aspects for a button definition - -class DVAPI FAButtonRecord -{ - -public: - virtual void WriteToSWFStream(FSWFStream *_SWFStream) = 0; - - virtual ~FAButtonRecord() {} -}; - -// Specifies appearance aspects for a button definition (flash 1.0) - -class DVAPI FButtonRecord1 : public FAButtonRecord -{ - -public: - FButtonRecord1(U8 _hit, U8 _down, U8 _over, U8 _up, U16 _layer, FMatrix *_matrix); - virtual ~FButtonRecord1(); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U8 hit; - U8 down; - U8 over; - U8 up; - U16 layer; - FMatrix *matrix; - U16 characterID; -}; - -// Specifies appearance aspects for a button definition (flash 3.0) - -class DVAPI FButtonRecord2 : public FAButtonRecord -{ - -public: - FButtonRecord2(U8 _hit, U8 _down, U8 _over, U8 _up, U16 _characterID, U16 _layer, FMatrix *_matrix, FACXForm *_colorTransform); - virtual ~FButtonRecord2(); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U8 hit; - U8 down; - U8 over; - U8 up; - U16 layer; - FMatrix *matrix; - FACXForm *colorTransform; - U16 characterID; -}; - -// a list of button records - -class DVAPI FButtonRecordList -{ - -public: - FButtonRecordList(); - virtual ~FButtonRecordList(); - void AddRecord(FAButtonRecord *_buttonRecord); - int Size(); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - std::list listOfButtonRecords; -}; - -// a flash object that defines a button in a SWF movie (flash 1.0) - -class DVAPI FDTDefineButton : public FDT -{ - -public: - FDTDefineButton(void); - virtual ~FDTDefineButton(); - U16 ID(void); - void AddButtonRecord(FButtonRecord1 *_buttonRecord); - void AddActionRecord(FActionRecord *_actionRecord); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U16 characterID; - std::list listOfActionRecords; - std::list listOfButtonRecords; -}; - -// a flash object that defines a button in a SWF movie (flash 3.0) - -class DVAPI FDTDefineButton2 : public FDT -{ - -public: - FDTDefineButton2(U8 _menuFlag); - virtual ~FDTDefineButton2(void); - U16 ID(void); - void AddButtonRecord(FButtonRecord2 *_buttonRecord); - void AddActionCondition(FActionCondition *_actionCondition); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - virtual void SetID(U16 id) { characterID = id; } - -private: - U16 characterID; - U8 menuFlag; - std::list conditionList; - std::list listOfButtonRecords; -}; - -//A flash object that defines a color transformation on a button - -class DVAPI FDTDefineButtonCXForm : public FDT -{ - -public: - FDTDefineButtonCXForm(U16 _characterID, FCXForm *_colorTransform); - virtual ~FDTDefineButtonCXForm(); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U16 characterID; - FCXForm *colorTransform; -}; - -class DVAPI FDTDefineButtonSound : public FDT -{ - -public: - FDTDefineButtonSound(U16 _buttonID, U16 _soundID0, FSoundInfo *_soundInfo0, - U16 _soundID1, FSoundInfo *_soundInfo1, - U16 _soundID2, FSoundInfo *_soundInfo2, - U16 _soundID3, FSoundInfo *_soundInfo3); - virtual ~FDTDefineButtonSound(); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U16 buttonID; - U16 soundID0; - U16 soundID1; - U16 soundID2; - U16 soundID3; - FSoundInfo *soundInfo0; - FSoundInfo *soundInfo1; - FSoundInfo *soundInfo2; - FSoundInfo *soundInfo3; -}; - -#endif diff --git a/toonz/sources/common/flash/FDTFonts.cpp b/toonz/sources/common/flash/FDTFonts.cpp deleted file mode 100644 index c03af60..0000000 --- a/toonz/sources/common/flash/FDTFonts.cpp +++ /dev/null @@ -1,486 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. - -/**************************************************************************************** - - File Summary: FDTFonts.cpp - - This source file contains the definition for all low-level font-related functions, - grouped by classes: - - Class Member Function - - FDTDefineFont FDTDefineFont(); - ~FDTDefineFont(); - U16 ID(); - void AddShapeGlyph(FShape*); - void WriteToSWFStream(FSWFStream*); - - FDTDefineFont2 FDTDefineFont2(char*, U16, U16, U16); - FDTDefineFont2(char*, U16, U16, U16, S16, S16, S16); - ~FDTDefineFont2(); - void AddShapeGlyph(FShape*, U16, S16, FRect*); - void AddKerningRec(FKerningRec*); - U16 nIndexBits(); - U16 ID(void); - void WriteToSWFStream(FSWFStream*); - - FDTDefineFontInfo FDTDefineFontInfo(const char*, U16, U16, U16, U16); - void FDTDefineFontInfo::AddCode(U16); - U16 FDTDefineFontInfo::ID(); - void WriteToSWFStream(FSWFStream*); - -// FGlyphEntry FGlyphEntry(U16, S16); -// S16 AdvanceValue(); -// void IncludeNBitInfo(U16, U16); -// void WriteToSWFStream(FSWFStream*); - - FKerningRec FKerningRec (U16, U16, short); - void CodesWide (U16); - void WriteToSWFStream(FSWFStream*); - - - Note: All member functions of FGlyphEntry have been commented out. Need to fix. - -****************************************************************************************/ -#ifdef WIN32 -#pragma warning(disable : 4786) -#endif - -#include "FDTFonts.h" -#include "FDTShapes.h" - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FButtonRecord1 --------------------------------------------------------- - -FDTDefineFont::FDTDefineFont() -{ - - characterID = FObjCollection::Increment(); - - nFillBits = 1; - nLineBits = 0; -} - -FDTDefineFont::~FDTDefineFont() -{ - - while (!shapeGlyphs.empty()) { - - delete shapeGlyphs.front(); - shapeGlyphs.pop_front(); - } -} - -U16 FDTDefineFont::ID() -{ - - return (U8)characterID; -} - -void FDTDefineFont::AddShapeGlyph(FShape *_shape) -{ - - _shape->SetFillBits(nFillBits); - _shape->SetLineBits(nLineBits); - shapeGlyphs.push_back(_shape); -} - -void FDTDefineFont::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - U32 offsetsBufferSize = shapeGlyphs.size() * 2; - - FSWFStream body; - FSWFStream shapeBuffer; - std::list offsetsList; - - // get values for offsets and place them in a list - // write list of shapeGlyphs to shape buffer - offsetsList.push_back(offsetsBufferSize); - - std::list::iterator cursor; - std::list::iterator nextToLast = shapeGlyphs.end(); - nextToLast--; - for (cursor = shapeGlyphs.begin(); cursor != nextToLast; cursor++) { - - (*cursor)->WriteToSWFStream(&shapeBuffer); - offsetsList.push_back(offsetsBufferSize + shapeBuffer.Size()); - } - - (*cursor)->WriteToSWFStream(&shapeBuffer); - - body.WriteWord((U32)characterID); - - // write offsetsList to body - while (!offsetsList.empty()) { - - body.WriteWord((U32)offsetsList.front()); - offsetsList.pop_front(); - } - - //write shape buffer to body - body.Append(&shapeBuffer); - - //put tag on body and write to stream - _SWFStream->AppendTag(stagDefineFont, body.Size(), &body); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTDefineFont2 --------------------------------------------------------- - -FDTDefineFont2::FDTDefineFont2(const char *_fontName, U16 _encodeType, U16 _italicFlag, U16 _boldFlag) -{ - fontID = FObjCollection::Increment(); - hasLayoutFlag = 1; - encodeType = _encodeType; - italicFlag = _italicFlag; - boldFlag = _boldFlag; - fontName = new FString((U8 *)_fontName); - nFillBits = 1; - nLineBits = 0; - ascenderHeight = 0; - descenderHeight = 0; - leadingHeight = 0; -} - -FDTDefineFont2::FDTDefineFont2(const char *_fontName, U16 _encodeType, U16 _italicFlag, - U16 _boldFlag, S16 _ascenderHeight, - S16 _descenderHeight, S16 _leadingHeight) -{ - - fontID = FObjCollection::Increment(); - hasLayoutFlag = 1; - encodeType = _encodeType; - italicFlag = _italicFlag; - boldFlag = _boldFlag; - fontName = new FString((U8 *)_fontName); - - ascenderHeight = _ascenderHeight; - descenderHeight = _descenderHeight; - leadingHeight = _leadingHeight; - - nFillBits = 1; - nLineBits = 0; -} - -FDTDefineFont2::~FDTDefineFont2() -{ - - delete fontName; - - while (!glyphs.empty()) { - delete glyphs.front().shape; - delete glyphs.front().bounds; - glyphs.pop_front(); - } - - while (!kerningTable.empty()) { - - delete kerningTable.front(); - kerningTable.pop_front(); - } -} - -void FDTDefineFont2::AddShapeGlyph(FShape *_shape, U16 _shapeCode, S16 _shapeAdvance, - FRect *_shapeBounds) -{ - // FIXME, don't know what nFillBits and nLineBits are - _shape->SetFillBits(nFillBits); - _shape->SetLineBits(nLineBits); - Glyph g; - g.advance = _shapeAdvance; - g.bounds = _shapeBounds; - g.code = _shapeCode; - g.shape = _shape; - glyphs.push_back(g); -} - -void FDTDefineFont2::AddKerningRec(FKerningRec *_kerningRecord) -{ - - if (hasLayoutFlag) - kerningTable.push_back(_kerningRecord); -} - -U16 FDTDefineFont2::nIndexBits() -{ - - return (U16)FSWFStream::MinBits(glyphs.size() - 1, false); -} - -U16 FDTDefineFont2::ID(void) -{ - - return fontID; -} - -void FDTDefineFont2::WriteToSWFStream(FSWFStream *_SWFStream) -{ - // U32 offsetsSize = (glyphs.size() * 2); - // U32 offsetsSizeWide = glyphs.size() * 4; - // U16 wideOffsetsFlag = 0; - // U16 wideCodesFlag = 0; - // std::list offsetsList; - - // FIXME: add wide offset later - S16 *offsetTable; - if (glyphs.size() > 0) - offsetTable = new S16[glyphs.size()]; - else - offsetTable = 0; - - int i; - - FSWFStream body; - FSWFStream shapeBuffer; - - std::list::iterator glyphCursor; - for (glyphCursor = glyphs.begin(), i = 0; glyphCursor != glyphs.end(); glyphCursor++, i++) { - offsetTable[i] = (S8)shapeBuffer.Size(); - glyphCursor->shape->WriteToSWFStream(&shapeBuffer); - } - - body.WriteWord((U32)fontID); - //write flags to body - body.WriteBits((U32)hasLayoutFlag, 1); - - switch (encodeType) { - - case ShiftJIS: - body.WriteBits((U32)1, 1); - body.WriteBits((U32)0, 1); - body.WriteBits((U32)0, 1); - break; - case Unicode: - body.WriteBits((U32)0, 1); - body.WriteBits((U32)1, 1); - body.WriteBits((U32)0, 1); - break; - case ANSI: - body.WriteBits((U32)0, 1); - body.WriteBits((U32)0, 1); - body.WriteBits((U32)1, 1); - break; - } - body.WriteBits((U32)0, 1); // 0 for narrowOffsetFlag - body.WriteBits((U32)0, 1); // 0 for narrowOffsetCode - body.WriteBits((U32)italicFlag, 1); - body.WriteBits((U32)boldFlag, 1); - body.WriteByte(0); // FontFlagsReserved UB[8] - - body.WriteByte((U32)fontName->Length()); - fontName->WriteToSWFStream(&body, false); // write the name - - body.WriteWord((U32)glyphs.size()); - - // write offsetsList to body - if (glyphs.size() > 0) - body.WriteLargeData((U8 *)offsetTable, 2 * glyphs.size()); - - //write shape glyph buffer to body - body.Append(&shapeBuffer); - - for (glyphCursor = glyphs.begin(), i = 0; glyphCursor != glyphs.end(); glyphCursor++, i++) { - body.WriteWord(glyphCursor->code); - } - - // write layout information to body - if (hasLayoutFlag) { - body.WriteWord((U32)ascenderHeight); - body.WriteWord((U32)descenderHeight); - body.WriteWord((U32)leadingHeight); - - for (glyphCursor = glyphs.begin(), i = 0; glyphCursor != glyphs.end(); glyphCursor++, i++) { - body.WriteWord(glyphCursor->advance); - } - - for (glyphCursor = glyphs.begin(), i = 0; glyphCursor != glyphs.end(); glyphCursor++, i++) { - glyphCursor->bounds->WriteToSWFStream(&body); - } - - body.WriteWord((U32)kerningTable.size()); - - std::list::iterator kernCursor; - - for (kernCursor = kerningTable.begin(); kernCursor != kerningTable.end(); kernCursor++) { - - (*kernCursor)->CodesWide(0); // 0 is narraw offset flag - (*kernCursor)->WriteToSWFStream(&body); - } - } - - // create entire tag with record header - _SWFStream->AppendTag(stagDefineFont2, body.Size(), &body); - delete[] offsetTable; -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FButtonRecord1 --------------------------------------------------------- - -FDTDefineFontInfo::FDTDefineFontInfo(const char *_fontName, U16 _fontID, - U16 _encodeType, U16 _italicFlag, - U16 _boldFlag) -{ - - characterID = FObjCollection::Increment(); - encodeType = _encodeType; - italicFlag = _italicFlag; - boldFlag = _boldFlag; - - fontID = _fontID; - - fontName = new FString((U8 *)_fontName); -} - -FDTDefineFontInfo::~FDTDefineFontInfo() -{ - delete fontName; -} - -void FDTDefineFontInfo::AddCode(U16 _someCode) -{ - - codeTable.push_back(_someCode); -} - -U16 FDTDefineFontInfo::ID() -{ - return (U8)characterID; -} - -void FDTDefineFontInfo::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - U16 wideCodesFlag = 0; - FSWFStream body; - - //determine whether 8 or 16 bit code fields are needed - std::list::iterator cursor; - for (cursor = codeTable.begin(); (cursor != codeTable.end()) && (wideCodesFlag == 0) // fixed from DV - ; - cursor++) { - if ((*cursor) > 65530) - wideCodesFlag = 1; - } - - body.WriteWord((U32)fontID); - - body.WriteByte((U32)fontName->Length()); - - fontName->WriteToSWFStream(&body, false); - - // body.WriteBits((U32) reservedFlags, 2); - body.WriteBits((U32)0, 2); - - switch (encodeType) { - - case ShiftJIS: - body.WriteBits((U32)0, 1); - body.WriteBits((U32)1, 1); - body.WriteBits((U32)0, 1); - break; - case Unicode: - body.WriteBits((U32)1, 1); - body.WriteBits((U32)0, 1); - body.WriteBits((U32)0, 1); - break; - case ANSI: - body.WriteBits((U32)0, 1); - body.WriteBits((U32)0, 1); - body.WriteBits((U32)1, 1); - break; - } - - body.WriteBits((U32)italicFlag, 1); - body.WriteBits((U32)boldFlag, 1); - - body.WriteBits((U32)wideCodesFlag, 1); - - //write code table to body - while (!codeTable.empty()) { - if (wideCodesFlag) { - body.WriteWord((U32)codeTable.front()); - codeTable.pop_front(); - } else { - body.WriteByte((U32)codeTable.front()); - codeTable.pop_front(); - } - } - - // create entire tag with record header - _SWFStream->AppendTag(stagDefineFontInfo, body.Size(), &body); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FGlyphEntry ------------------------------------------------------------ - -// FGlyphEntry::FGlyphEntry(U16 index, S16 advance) -// { -// -// glyphIndex = index; -// glyphAdvance = advance; -// -// } -// -// -// S16 FGlyphEntry::AdvanceValue() -// { -// -// return glyphAdvance; -// -// } - -// Used to specify the nBit info for the entries. This is determined and passed to -// the glyph entry just before write time. - -// void FGlyphEntry::IncludeNBitInfo(U16 _nIndexBits, U16 _nAdvanceBits) -// { -// -// nIndexBits = _nIndexBits; -// nAdvanceBits = _nAdvanceBits; -// } -// -// void FGlyphEntry::WriteToSWFStream(FSWFStream *_SWFStream) -// { -// -// _SWFStream->WriteBits((U32) glyphIndex, nIndexBits); -// _SWFStream->WriteBits((U32) glyphAdvance, nAdvanceBits); -// -// } - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FKerningRec ------------------------------------------------------------ - -FKerningRec::FKerningRec(U16 cd1, U16 cd2, short krnAdj) -{ - - wideCodesFlag = 0; // default not wide - code1 = cd1; - code2 = cd2; - kerningAdjust = krnAdj; -} - -void FKerningRec::CodesWide(U16 _flag) -{ - - if (_flag) - wideCodesFlag = 1; - else - wideCodesFlag = 0; -} - -void FKerningRec::WriteToSWFStream(FSWFStream *b) -{ - if (wideCodesFlag) { - b->WriteWord((U32)code1); - b->WriteWord((U32)code2); - } else { - b->WriteByte((U32)code1); - b->WriteByte((U32)code2); - } - - b->WriteWord((U32)kerningAdjust); -} diff --git a/toonz/sources/common/flash/FDTFonts.h b/toonz/sources/common/flash/FDTFonts.h deleted file mode 100644 index 5b64924..0000000 --- a/toonz/sources/common/flash/FDTFonts.h +++ /dev/null @@ -1,189 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. - -/**************************************************************************************** - - File Summary: FDTFonts.h - - This header-file contains the declarations of all low-level font-related classes. - Their parent classes are in the parentheses: - - class FKerningRec; - class FDTDefineFont; (public FDT) - class FDTDefineFont2; (public FDT) - class FDTDefineFontInfo; (public FDT) -// class FGlyphEntry; - - Note: Class FGlyphEntry has been commented out. Need to fix. - -****************************************************************************************/ - -#ifndef _FDT_FONTS_H_ -#define _FDT_FONTS_H_ - -#ifdef WIN32 // added from DV -#pragma warning(push) -#pragma warning(disable : 4786) -#pragma warning(disable : 4251) - -#endif - -#include "tcommon.h" -#include "FDT.h" -#include "FPrimitive.h" - -#undef DVAPI -#undef DVVAR -#ifdef TFLASH_EXPORTS -#define DVAPI DV_EXPORT_API -#define DVVAR DV_EXPORT_VAR -#else -#define DVAPI DV_IMPORT_API -#define DVVAR DV_IMPORT_VAR -#endif - -class FShape; - -// A kerning record - -class FKerningRec -{ - -public: - FKerningRec(U16 _code1, U16 _code2, S16 _kerningAdjust); - void CodesWide(U16 _flag); - virtual void WriteToSWFStream(FSWFStream *b); - - virtual ~FKerningRec() {} - -private: - U16 wideCodesFlag; - U16 code1; - U16 code2; - S16 kerningAdjust; -}; - -// A flash object that defines a font's appearance - -class DVAPI FDTDefineFont : public FDT -{ - -public: - FDTDefineFont(void); - virtual ~FDTDefineFont(); - - U16 ID(void); - void AddShapeGlyph(FShape *_shape); - int NumberOfGlyphs() { return shapeGlyphs.size(); } - - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U32 characterID; - std::list shapeGlyphs; - U32 nFillBits; - U32 nLineBits; -}; - -// A flash object that defines a font's appearance (flash 3.0) - -class DVAPI FDTDefineFont2 : public FDT -{ -public: - FDTDefineFont2(const char *_fontName, - U16 _encodeType, // ShiftJIS, Unicode, ANSI - U16 _italicFlag, - U16 _boldFlag); - - FDTDefineFont2(const char *_fontName, - U16 _encodeType, - U16 _italicFlag, - U16 _boldFlag, - S16 _ascenderHeight, - S16 _descenderHeight, - S16 _leadingHeight); - virtual ~FDTDefineFont2(); - - void AddShapeGlyph(FShape *_shape, U16 _shapeCode, S16 _shapeAdvance = 0, - FRect *_shapeBounds = 0); - void AddKerningRec(FKerningRec *_kerningRecord); - U16 nIndexBits(); - U16 ID(void); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U16 fontID; - int hasLayoutFlag; - U16 encodeType; - int italicFlag; - int boldFlag; - - FString *fontName; - struct Glyph { - FShape *shape; - U16 code; - S16 advance; - FRect *bounds; - }; - S16 ascenderHeight; - S16 descenderHeight; - S16 leadingHeight; - - std::list glyphs; - - std::list kerningTable; - U32 nFillBits; - U32 nLineBits; -}; - -// A flash object that defines the mapping from a flash font object to a TrueType or ATM font so that a player can optionally use them - -class DVAPI FDTDefineFontInfo : public FDT -{ - -public: - FDTDefineFontInfo(const char *_fontName, - U16 _fontID, - U16 _encodeType, - U16 _italicFlag, - U16 _boldFlag); - virtual ~FDTDefineFontInfo(); - void AddCode(U16 _someCode); - U16 ID(void); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U32 characterID; - FString *fontName; - U16 encodeType; - U16 italicFlag; - U16 boldFlag; - std::list codeTable; - U16 fontID; -}; - -// Found in DefineText. Used to describe the glyph index and X advance value to use for a -// particular character in the currently selected font for the text record. - -// class FGlyphEntry { -// -// public: -// -// FGlyphEntry (U16 index, S16 advance); -// S16 AdvanceValue(); -// void IncludeNBitInfo(U16 _nIndexBits, U16 _nAdvanceBits); -// void WriteToSWFStream(FSWFStream *_SWFStream); -// -// -// private: -// -// U16 glyphIndex; -// S16 glyphAdvance; -// U16 nIndexBits; -// U16 nAdvanceBits; -// -// }; - -#endif diff --git a/toonz/sources/common/flash/FDTShapes.cpp b/toonz/sources/common/flash/FDTShapes.cpp deleted file mode 100644 index 381f692..0000000 --- a/toonz/sources/common/flash/FDTShapes.cpp +++ /dev/null @@ -1,1771 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. - -/**************************************************************************************** - - File Summary: FDTShapes.cpp - - This source file contains the definition for all low-level shape-related functions, - grouped by classes: - - Class Member Function - - FCXForm FCXForm(U32, U32, S32, S32, S32, S32, S32, S32); - U32 FCXForm::MinBits(); - void WriteToSWFStream(FSWFStream*); - - FCXFormWAlpha FCXFormWAlpha(U32, U32, S32, S32, S32, S32, S32, S32, S32, S32); - U32 MinBits(); - void WriteToSWFStream(FSWFStream*); - - FDTDefineMorphShape FDTDefineMorphShape (FRect*, FRect*); - ~FDTDefineMorphShape(); - U32 AddFillStyle(FMorphFillStyle*); - U32 AddLineStyle(U32, FColor*, - U32, FColor*); - void FinishStyleArrays(); - void AddShapeRec_1(FShapeRec*); - void AddEdgeRec_2(FShapeRec*); - U16 ID(); - void WriteToSWFStream(FSWFStream*); - - FDTDefineShape FDTDefineShape(FRect*); - ~FDTDefineShape(); - void AddShapeRec(FShapeRec*); - U32 AddFillStyle(FFillStyle*); - U32 AddSolidFillStyle(FColor*); - U32 AddLineStyle(U32, FColor*); - void FinishStyleArrays(); - U16 ID(); - void WriteToSWFStream(FSWFStream*); - - FDTDefineShape2 FDTDefineShape2(FRect*); - ~FDTDefineShape2(); - void AddShapeRec(FShapeRec*); - U32 AddFillStyle(FFillStyle*); - U32 AddSolidFillStyle(FColor*); - U32 AddLineStyle(U32, FColor*); - void FinishStyleArrays(); - U16 ID(); - void WriteToSWFStream(FSWFStream*); - - FDTDefineShape3 FDTDefineShape3(FRect*); - ~FDTDefineShape3(); - void AddShapeRec(FShapeRec*); - U32 AddFillStyle(FFillStyle*); - U32 AddSolidFillStyle(FColor*); - U32 AddLineStyle(U32, FColor*); - void FinishStyleArrays(); - U16 ID(); - void WriteToSWFStream(FSWFStream*); - - FFillStyleArray U32 Size(); - U32 Add(FAFillStyle*); - void WriteToSWFStream(FSWFStream*); - - FFillStyleBitmap FFillStyleBitmap(int, U16, FMatrix*); - ~FFillStyleBitmap(); - void WriteToSWFStream(FSWFStream*); - - FFillStyleGradient FFillStyleGradient(int, FMatrix*, FGradient*); - ~FFillStyleGradient(); - void WriteToSWFStream(FSWFStream*); - - FFillStyleSolid FFillStyleSolid(FColor*); - ~FFillStyleSolid(); - void WriteToSWFStream(FSWFStream*); - - FGradient FGradient(void); - ~FGradient(void); - void Add(FAGradRecord*); - void WriteToSWFStream(FSWFStream*); - - FGradRecord FGradRecord(U32, FColor*); - ~FGradRecord(); - void WriteToSWFStream(FSWFStream*); - - FLineStyle FLineStyle(U32, FColor*); - ~FLineStyle(); - void WriteToSWFStream(FSWFStream*); - - FLineStyleArray FLineStyleArray(); - ~FLineStyleArray(); - U32 Size(); - U32 Add(FALineStyle *); - void WriteToSWFStream(FSWFStream *); - - FMorphFillStyleBitmap FMorphFillStyleBitmap(int, U16, FMatrix*, FMatrix*); - ~FMorphFillStyleBitmap(); - void WriteToSWFStream(FSWFStream *); - - FMorphFillStyleGradient FMorphFillStyleGradient(int, FMatrix*, FMatrix*, FGradient*); - ~FMorphFillStyleGradient(); - void WriteToSWFStream(FSWFStream *); - - FMorphFillStyleSolid FMorphFillStyleSolid( FColor*, FColor*); - ~FMorphFillStyleSolid() - void WriteToSWFStream(FSWFStream *); - - FMorphGradRecord FMorphGradRecord(U32, FColor*, U32, FColor*); - ~FMorphGradRecord(); - void WriteToSWFStream(FSWFStream*); - - FMorphLineStyle FMorphLineStyle(U32, U32, FColor*, FColor*); - ~FMorphLineStyle(); - void WriteToSWFStream(FSWFStream *); - - FShape FShape(); - ~FShape(); - SetFillBits(U32); - SetLineBits(U32); - AddShapeRec(FShapeRec *); - void WriteToSWFStream(FSWFStream *); - - FShapeRecChange FShapeRecChange(U32, U32, U32, U32, U32, - S32, S32, U32, U32, U32, - FFillStyleArray*, FLineStyleArray*); - ~FShapeRecChange(); - void IncludeNFillBitInfo(U32); - void IncludeNLineBitInfo(U32); - U32 MinBits(); - void WriteToSWFStream(FSWFStream*); - - FShapeRecEdgeStraight FShapeRecEdgeStraight(S32, S32); - U32 MinBits(void); - void IncludeNFillBitInfo(U32); - void IncludeNLineBitInfo(U32); - void WriteToSWFStream(FSWFStream*); - - FShapeRecEdgeCurved FShapeRecEdgeCurved(S32, S32, S32, S32); - U32 MinBits(void); - void IncludeNFillBitInfo(U32 ); - void IncludeNLineBitInfo(U32 ); - void WriteToSWFStream(FSWFStream*); - - FShapeRecEnd FShapeRecEnd(); - void IncludeNFillBitInfo(U32 ); - void IncludeNLineBitInfo(U32 ); - void WriteToSWFStream(FSWFStream*); - - FShapeWStyle FShapeWStyle(FFillStyleArray*, FLineStyleArray*); - ~FShapeWStyle() ; - void AddShapeRec(FShapeRec*); - U32 NumFillBits(); - U32 NumLineBits(); - void WriteToSWFStream(FSWFStream*); - -****************************************************************************************/ - -#include "tpixel.h" -#include "FDTShapes.h" - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FCXForm ---------------------------------------------------------------- - -FCXForm::FCXForm(U32 _hasAdd, U32 _hasMult, S32 _redMultTerm, S32 _greenMultTerm, S32 _blueMultTerm, S32 _redAddTerm, S32 _greenAddTerm, S32 _blueAddTerm) -{ - hasAdd = _hasAdd; - hasMult = _hasMult; - redMultTerm = _redMultTerm; - greenMultTerm = _greenMultTerm; - blueMultTerm = _blueMultTerm; - redAddTerm = _redAddTerm; - greenAddTerm = _greenAddTerm; - blueAddTerm = _blueAddTerm; - nBits = MinBits(); -} - -// -U32 FCXForm::MinBits() -{ - - // two step process to find maximum value of 6 numbers because "FSWFStream::MaxNum" takes only 4 arguments - U32 maxValue = FSWFStream::MaxNum(redMultTerm, greenMultTerm, blueMultTerm, redAddTerm); - maxValue = FSWFStream::MaxNum(greenAddTerm, blueAddTerm, (S32)maxValue, 0); - - return FSWFStream::MinBits(maxValue, 1) + 1; -} - -// -void FCXForm::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - _SWFStream->WriteBits(hasMult, 1); - _SWFStream->WriteBits(hasAdd, 1); - _SWFStream->WriteBits(nBits, 4); - - if (hasMult) { - _SWFStream->WriteBits((S32)redMultTerm, nBits); - _SWFStream->WriteBits((S32)greenMultTerm, nBits); - _SWFStream->WriteBits((S32)blueMultTerm, nBits); - } - if (hasAdd) { - _SWFStream->WriteBits((S32)redAddTerm, nBits); - _SWFStream->WriteBits((S32)greenAddTerm, nBits); - _SWFStream->WriteBits((S32)blueAddTerm, nBits); - } - - _SWFStream->FlushBits(); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FCXFormWAlpha ---------------------------------------------------------- - -FCXFormWAlpha::FCXFormWAlpha(U32 _hasAdd, U32 _hasMult, S32 _redMultTerm, S32 _greenMultTerm, S32 _blueMultTerm, S32 _alphaMultTerm, - S32 _redAddTerm, S32 _greenAddTerm, S32 _blueAddTerm, S32 _alphaAddTerm) - : FCXForm(_hasAdd, _hasMult, _redMultTerm, _greenMultTerm, _blueMultTerm, - _redAddTerm, _greenAddTerm, _blueAddTerm) -{ - alphaMultTerm = _alphaMultTerm; - - alphaAddTerm = _alphaAddTerm; - - nBits = MinBits(); -} - -U32 FCXFormWAlpha::MinBits() -{ - - // FFileWrite's MaxNum method takes only 4 arguments, so finding maximum value of 8 arguments takes three steps: - U32 maxMult = FSWFStream::MaxNum(redMultTerm, greenMultTerm, blueMultTerm, alphaMultTerm); - U32 maxAdd = FSWFStream::MaxNum(redAddTerm, greenAddTerm, blueAddTerm, alphaAddTerm); - U32 maxValue = FSWFStream::MaxNum((S32)maxMult, (S32)maxAdd, 0, 0); - - return FSWFStream::MinBits(maxValue, 1) + 1; -} - -void FCXFormWAlpha::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - //fill? I think so - _SWFStream->FlushBits(); - - _SWFStream->WriteBits(hasMult, 1); - _SWFStream->WriteBits(hasAdd, 1); - _SWFStream->WriteBits(nBits, 4); - - if (hasMult) { - _SWFStream->WriteBits((S32)redMultTerm, nBits); - _SWFStream->WriteBits((S32)greenMultTerm, nBits); - _SWFStream->WriteBits((S32)blueMultTerm, nBits); - _SWFStream->WriteBits((S32)alphaMultTerm, nBits); - } - if (hasAdd) { - _SWFStream->WriteBits((S32)redAddTerm, nBits); - _SWFStream->WriteBits((S32)greenAddTerm, nBits); - _SWFStream->WriteBits((S32)blueAddTerm, nBits); - _SWFStream->WriteBits((S32)alphaAddTerm, nBits); - } -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTDefineMorphShape ---------------------------------------------------- - -FDTDefineMorphShape::FDTDefineMorphShape(FRect *_rect1, FRect *_rect2) -{ - - characterID = FObjCollection::Increment(); - shapeBounds_1 = _rect1; - shapeBounds_2 = _rect2; - morphFillStyleArray = new FFillStyleArray(); - morphLineStyleArray = new FLineStyleArray(); - styleArraysFinished = false; -} - -FDTDefineMorphShape::~FDTDefineMorphShape() -{ - - delete shapeBounds_1; - delete shapeBounds_2; - delete morphFillStyleArray; - delete morphLineStyleArray; -} - -U32 FDTDefineMorphShape::AddFillStyle(FMorphFillStyle *fillStyle) -{ - - assert(!styleArraysFinished); - return morphFillStyleArray->Add(fillStyle); -} - -U32 FDTDefineMorphShape::AddLineStyle(U32 startLineWidth, FColor *startLineColor, - U32 finalLineWidth, FColor *finalLineColor) -{ - assert(!styleArraysFinished); - - // here changed. - // morph shape always has RGBA color. - startLineColor->AlphaChannel(true); - finalLineColor->AlphaChannel(true); - - // Create a morph line style (one which contains both "morph from" and "morph to" line style information - FMorphLineStyle *startToFinalLine = new FMorphLineStyle(startLineWidth, finalLineWidth, - startLineColor, finalLineColor); - return morphLineStyleArray->Add(startToFinalLine); -} - -void FDTDefineMorphShape::FinishStyleArrays(void) -{ - - styleArraysFinished = true; - nFillBits = FSWFStream::MinBits(morphFillStyleArray->Size(), 0); - nLineBits = FSWFStream::MinBits(morphLineStyleArray->Size(), 0); - - shape1.SetFillBits(nFillBits); - shape1.SetLineBits(nLineBits); - - // asumption: shape2 will never contain fill or line syle info and this means no need - // for fill or line style bits -} - -void FDTDefineMorphShape::AddShapeRec_1(FShapeRec *_shapeRec) -{ - - assert(styleArraysFinished); - shape1.AddShapeRec(_shapeRec); -} - -void FDTDefineMorphShape::AddEdgeRec_2(FShapeRec *_shapeRec) -{ - - assert(styleArraysFinished); - _shapeRec->IncludeNFillBitInfo(0); // Always Zero - _shapeRec->IncludeNLineBitInfo(0); - shape2.AddShapeRec(_shapeRec); -} - -U16 FDTDefineMorphShape::ID(void) -{ - - return characterID; -} - -void FDTDefineMorphShape::WriteToSWFStream(FSWFStream *_SWFStream) -{ - FSWFStream body; - - body.WriteWord((U32)characterID); - - shapeBounds_1->WriteToSWFStream(&body); - - shapeBounds_2->WriteToSWFStream(&body); - - FSWFStream temp; - - morphFillStyleArray->WriteToSWFStream(&temp); - morphLineStyleArray->WriteToSWFStream(&temp); - - shape1.WriteToSWFStream(&temp); - - body.WriteDWord(temp.Size()); - - body.Append(&temp); - - shape2.WriteToSWFStream(&body); - - _SWFStream->AppendTag(stagDefineMorphShape, body.Size(), &body); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTDefineShape --------------------------------------------------------- - -FDTDefineShape::FDTDefineShape(FRect *_rect) -{ - - characterID = FObjCollection::Increment(); - shapeBounds = _rect; - fillStyleArray = new FFillStyleArray(); - lineStyleArray = new FLineStyleArray(); - shapeWithStyle = NULL; - styleArraysFinished = false; -} - -FDTDefineShape::~FDTDefineShape() -{ - - delete fillStyleArray; - delete lineStyleArray; - delete shapeBounds; - delete shapeWithStyle; -} - -void FDTDefineShape::AddShapeRec(FShapeRec *_shapeRec) -{ - - //you must be done creating the fill style and line style arrays - //before you can begin adding shape records - assert(styleArraysFinished); - - //Change rec doesn't know how many bits for saving the FillStyle0 - //and FillStyle1. It gets this from the ShapeWithStyle which contains - //it. What happens when the change Rec also contains Fill and Line - //Syles??? The other types of ShapeRecs just use the "current style" - //and don't need this info so their methods don't actually do anything. - //Why not just go to the container when writing? - _shapeRec->IncludeNFillBitInfo(shapeWithStyle->NumFillBits()); - _shapeRec->IncludeNLineBitInfo(shapeWithStyle->NumLineBits()); - //now have the shapeWithStyle add the ShapeRec - shapeWithStyle->AddShapeRec(_shapeRec); -} - -//This shapes internal fillStyleArray adds a fillStyle to itself. -U32 FDTDefineShape::AddFillStyle(FFillStyle *fillStyle) -{ - - assert(!styleArraysFinished); //once complete, cannot change - return fillStyleArray->Add(fillStyle); -} -// here changed. -U32 FDTDefineShape::AddSolidFillStyle(FColor *fillColor) -{ - fillColor->AlphaChannel(false); - FFillStyle *fillStyle = new FFillStyleSolid(fillColor); - - assert(!styleArraysFinished); //once complete, cannot change - return fillStyleArray->Add(fillStyle); -} - -U32 FDTDefineShape::AddLineStyle(U32 lineWidth, FColor *lineColor) -{ - - assert(!styleArraysFinished); //once complete, cannot change - - // here changed. - lineColor->AlphaChannel(false); - FLineStyle *lineStyle = new FLineStyle(lineWidth, lineColor); - - //add line style to rectangle, remembering to store the position of the line style - //just as in the fill style - return lineStyleArray->Add(lineStyle); -} - -/*! Creates the shape with style. Can only do this once the fill style - and line style arrays are complete because the shapeWithStyle constructor - takes in complete fill and line style arrays. -*/ -void FDTDefineShape::FinishStyleArrays(void) -{ - - styleArraysFinished = true; - shapeWithStyle = new FShapeWStyle(fillStyleArray, lineStyleArray); - fillStyleArray = NULL; /*AMM*/ - lineStyleArray = NULL; -} - -U16 FDTDefineShape::ID(void) -{ - - return characterID; -} - -//Called by the FObjCollection when writing to the stream -//In turn, it calls the WriteToSWFStream methods of its embedded objects. - -void FDTDefineShape::WriteToSWFStream(FSWFStream *_SWFStream) -{ - FSWFStream tempBuffer; - - tempBuffer.WriteWord((U32)characterID); - shapeBounds->WriteToSWFStream(&tempBuffer); - shapeWithStyle->WriteToSWFStream(&tempBuffer); - - _SWFStream->AppendTag(stagDefineShape, tempBuffer.Size(), &tempBuffer); -} - -bool FDTDefineShape::IsDefineShape() -{ - return true; -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTDefineShape2 -------------------------------------------------------- -FDTDefineShape2::FDTDefineShape2(FRect *_rect) -{ - - characterID = FObjCollection::Increment(); - shapeBounds = _rect; - fillStyleArray = new FFillStyleArray(); - lineStyleArray = new FLineStyleArray(); - shapeWithStyle = NULL; - styleArraysFinished = false; -} - -FDTDefineShape2::~FDTDefineShape2() -{ - - delete fillStyleArray; - delete lineStyleArray; - delete shapeBounds; - delete shapeWithStyle; -} - -void FDTDefineShape2::AddShapeRec(FShapeRec *_shapeRec) -{ - - //you must be done creating the fill style and line style arrays - //before you can begin adding shape records - assert(styleArraysFinished); - - _shapeRec->IncludeNFillBitInfo(shapeWithStyle->NumFillBits()); - _shapeRec->IncludeNLineBitInfo(shapeWithStyle->NumLineBits()); - shapeWithStyle->AddShapeRec(_shapeRec); -} - -U32 FDTDefineShape2::AddFillStyle(FFillStyle *fillStyle) -{ - - assert(!styleArraysFinished); //once complete, cannot change - return fillStyleArray->Add(fillStyle); -} -// here changed. -U32 FDTDefineShape2::AddSolidFillStyle(FColor *fillColor) -{ - fillColor->AlphaChannel(false); - FFillStyle *fillStyle = new FFillStyleSolid(fillColor); - - assert(!styleArraysFinished); //once complete, cannot change - return fillStyleArray->Add(fillStyle); -} - -U32 FDTDefineShape2::AddLineStyle(U32 lineWidth, FColor *lineColor) -{ - - assert(!styleArraysFinished); //once complete, cannot change - - // here changed. - lineColor->AlphaChannel(false); - FLineStyle *lineStyle = new FLineStyle(lineWidth, lineColor); - - //add line style to rectangle, remembering to store the position of the line style - //just as in the fill style - return lineStyleArray->Add(lineStyle); -} - -// Creates the shape with style. Can only do this once the fill style -// and line style arrays are complete because the shapeWithStyle constructor -// takes in complete fill and line style arrays. - -void FDTDefineShape2::FinishStyleArrays(void) -{ - - styleArraysFinished = true; - shapeWithStyle = new FShapeWStyle(fillStyleArray, lineStyleArray); - fillStyleArray = NULL; /*AMM*/ - lineStyleArray = NULL; -} - -U16 FDTDefineShape2::ID(void) -{ - - return characterID; -} - -bool FDTDefineShape2::IsDefineShape() -{ - assert(false); - return true; -} - -void FDTDefineShape2::WriteToSWFStream(FSWFStream *_SWFStream) -{ - FSWFStream body; - - body.WriteWord((U32)characterID); - shapeBounds->WriteToSWFStream(&body); - shapeWithStyle->WriteToSWFStream(&body); - - _SWFStream->AppendTag(stagDefineShape2, body.Size(), &body); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTDefineShape3 -------------------------------------------------------- - -FDTDefineShape3::FDTDefineShape3(FRect *_rect) -{ - characterID = FObjCollection::Increment(); - shapeBounds = _rect; - fillStyleArray = new FFillStyleArray(); - lineStyleArray = new FLineStyleArray(); - shapeWithStyle = NULL; - styleArraysFinished = false; -} - -////////////////////////////////////////////////////////////////////////////////////// - -FDTDefineShape3::FDTDefineShape3() -{ - - characterID = FObjCollection::Increment(); - shapeBounds = 0; - fillStyleArray = new FFillStyleArray(); - lineStyleArray = new FLineStyleArray(); - shapeWithStyle = NULL; - styleArraysFinished = false; -} - -FDTDefineShape3::~FDTDefineShape3() -{ - - delete fillStyleArray; - delete lineStyleArray; - delete shapeBounds; - delete shapeWithStyle; -} - -void FDTDefineShape3::setBounds(FRect *_rect) -{ - if (shapeBounds) - delete shapeBounds; - shapeBounds = _rect; -} - -////////////////////////////////////////////////////////////////////////////////////// - -bool FDTDefineShape3::IsDefineShape() -{ - return true; -} - -////////////////////////////////////////////////////////////////////////////////////// - -inline FColor tpixel2fcolor(const TPixel &color) -{ - return FColor(color.r, color.g, color.b, color.m); -} - -////////////////////////////////////////////////////////////////////////////////////// - -inline TPixel fcolor2tpixel(FColor &color) -{ - return TPixel(color.Red(), color.Green(), color.Blue(), color.Alpha()); -} - -////////////////////////////////////////////////////////////////////////////////////// - -void FDTDefineShape3::changeColor(const std::map &table) -{ - unsigned int i; - if (fillStyleArray) - for (i = 0; i < fillStyleArray->Size(); i++) { - FAFillStyle *style = fillStyleArray->get(i); - if (style->IsSolidStyle()) { - TPixel oldColor = fcolor2tpixel(*(((FFillStyleSolid *)style)->getColor())); - std::map::const_iterator it = table.find(oldColor); - if (it != table.end()) - ((FFillStyleSolid *)style)->setColor(new FColor(tpixel2fcolor(it->second))); - } - } - - shapeWithStyle->changeColor(table); -} - -////////////////////////////////////////////////////////////////////////////////////// - -void FDTDefineShape3::changeColor(const FColor &oldColor, const FColor &newColor) -{ - unsigned int i; - if (fillStyleArray) - for (i = 0; i < fillStyleArray->Size(); i++) { - FAFillStyle *style = fillStyleArray->get(i); - if (style->IsSolidStyle() && (*((FFillStyleSolid *)style)->getColor()) == oldColor) - ((FFillStyleSolid *)style)->setColor(new FColor(newColor)); - } - - shapeWithStyle->changeColor(oldColor, newColor); -} - -////////////////////////////////////////////////////////////////////////////////////// - -void FDTDefineShape3::AddShapeRec(FShapeRec *_shapeRec) -{ - - //you must be done creating the fill style and line style arrays - //before you can begin adding shape records - assert(styleArraysFinished); - - _shapeRec->IncludeNFillBitInfo(shapeWithStyle->NumFillBits()); - _shapeRec->IncludeNLineBitInfo(shapeWithStyle->NumLineBits()); - shapeWithStyle->AddShapeRec(_shapeRec); -} - -U32 FDTDefineShape3::AddFillStyle(FFillStyle *fillStyle) -{ - - assert(!styleArraysFinished); //once complete, cannot change - return fillStyleArray->Add(fillStyle); -} - -// here changed. -U32 FDTDefineShape3::AddSolidFillStyle(FColor *fillColor) -{ - fillColor->AlphaChannel(true); - FFillStyle *fillStyle = new FFillStyleSolid(fillColor); - - assert(!styleArraysFinished); //once complete, cannot change - return fillStyleArray->Add(fillStyle); -} - -U32 FDTDefineShape3::AddLineStyle(U32 lineWidth, FColor *lineColor) -{ - - assert(!styleArraysFinished); //once complete, cannot change - - // here changed. - lineColor->AlphaChannel(true); - FLineStyle *lineStyle = new FLineStyle(lineWidth, lineColor); - - //add line style to rectangle, remembering to store the position of the line style - //just as in the fill style - return lineStyleArray->Add(lineStyle); -} - -// Creates the shape with style. Can only do this once the fill style -// and line style arrays are complete because the shapeWithStyle constructor -// takes in complete fill and line style arrays. - -void FDTDefineShape3::FinishStyleArrays(void) -{ - - styleArraysFinished = true; - shapeWithStyle = new FShapeWStyle(fillStyleArray, lineStyleArray); - fillStyleArray = NULL; - lineStyleArray = NULL; -} - -U16 FDTDefineShape3::ID(void) -{ - - return characterID; -} - -void FDTDefineShape3::WriteToSWFStream(FSWFStream *_SWFStream) -{ - FSWFStream body; - - body.WriteWord((U32)characterID); - shapeBounds->WriteToSWFStream(&body); - shapeWithStyle->WriteToSWFStream(&body); - - _SWFStream->AppendTag(stagDefineShape3, body.Size(), &body); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FFillStyleArray -------------------------------------------------------- - -FFillStyleArray::~FFillStyleArray() -{ - while (!fillStyleArray.empty()) { - delete fillStyleArray.back(); - fillStyleArray.pop_back(); - } -} - -// Returns the size of the fill style list. -U32 FFillStyleArray::Size(void) -{ - return (U32)fillStyleArray.size(); -} - -// The given fill style is added to the end of the fill style array. The position of -// the added fill style is returned so that the fill style can later be referenced. - -U32 FFillStyleArray::Add(FAFillStyle *fillStyle) -{ - FLASHASSERT(fillStyle); - - fillStyleArray.push_back(fillStyle); - return ((U32)fillStyleArray.size()); -} - -////////////////////////////////////////////////////////////////////////////////////// - -FAFillStyle *FFillStyleArray::get(unsigned int index) -{ - return fillStyleArray[index]; -} - -// Writes to the stream by travelling through all of the nodes in the array and writing -// their fill styles. First has to write the count of fill style arrays. See's if count -// is small enough to fit in to an 8 bit field, and either writes the count into an 8 bit -// field, or writes all 1's into an 8 bit field and writes the real count into a 16 bit -// field. - -void FFillStyleArray::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - //write the size - U32 size = fillStyleArray.size(); - - if (size >= 0xff) { - - _SWFStream->WriteByte(0xff); - _SWFStream->WriteWord(size); - - } else { - - _SWFStream->WriteByte(size); - } - - //write the fill styles - std::vector::iterator cursor; - - for (cursor = fillStyleArray.begin(); cursor != fillStyleArray.end(); cursor++) { - (*cursor)->WriteToSWFStream(_SWFStream); - } -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FFillStyleBitmap ------------------------------------------------------- - -// The tiledFlag indicates if the Bitmap fill style is tiled (tiledFlag==1) or -// clipped (tiledFlag==0). -FFillStyleBitmap::FFillStyleBitmap(int tiled, U16 ID, FMatrix *matrix) -{ - - tiledFlag = tiled; - bitmapID = ID; - bitmapMatrix = matrix; -} - -// Deletes the matrix. - -FFillStyleBitmap::~FFillStyleBitmap(void) -{ - - delete bitmapMatrix; - bitmapMatrix = NULL; -} - -// Writes the bitmap fill style to the given FSWFStream. - -void FFillStyleBitmap::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - //write the type - if (tiledFlag) - _SWFStream->WriteByte(fillTiledBits); - else - _SWFStream->WriteByte(fillClippedBits); - - //write the bitmap id - _SWFStream->WriteWord(bitmapID); - - //write the matrix - bitmapMatrix->WriteToSWFStream(_SWFStream); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FFillStyleGradient ----------------------------------------------------- - -// The linearFlag indicates if the gradient fill style is linear (linearFlag==1) or -// radial (linearFlag==0). -FFillStyleGradient::FFillStyleGradient(int linear, FMatrix *matrix, FGradient *gradient) -{ - linearFlag = linear; - gradFillMatrix = matrix; - gradFill = gradient; -} - -// Deletes the matrix and gradient. - -FFillStyleGradient::~FFillStyleGradient(void) -{ - delete gradFillMatrix; - delete gradFill; -} - -// Writes the Gradient fill style to the given FSWFStream. - -void FFillStyleGradient::WriteToSWFStream(FSWFStream *_SWFStream) -{ - //write the type - if (linearFlag) - _SWFStream->WriteByte(fillLinearGradient); - else - _SWFStream->WriteByte(fillRadialGradient); - - //write the matrix - gradFillMatrix->WriteToSWFStream(_SWFStream); - - //write the gradient - gradFill->WriteToSWFStream(_SWFStream); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FFillStyleSolid -------------------------------------------------------- - -// Stores the color of the solid fill style. -FFillStyleSolid::FFillStyleSolid(FColor *_color) : color(_color) {} - -FFillStyleSolid::~FFillStyleSolid() -{ - delete color; -} - -// Writes the solid fill style to the given FSWFStream. - -void FFillStyleSolid::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - //write the type - _SWFStream->WriteByte(fillSolid); //cast to U32? - - //write the color - color->WriteToSWFStream(_SWFStream); //, FColor::WRITE_SMALLEST ); changed here. -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FGradient -------------------------------------------------------------- - -// Constructor. The grad record list is automatically constructed. -FGradient::FGradient(void) {} - -// Removes and deletes all the grad records from the grad record list. - -FGradient::~FGradient(void) -{ - - while (!gradRecords.empty()) { - - delete gradRecords.front(); - - gradRecords.pop_front(); - } -} - -// Adds the given grad record to the end of the grad record list. - -void FGradient::Add(FAGradRecord *gradRec) -{ - - gradRecords.push_back(gradRec); -} - -// Writes the grad records to the given _SWFStream. - -void FGradient::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - //write the size - - _SWFStream->WriteByte((U32)gradRecords.size()); - - //write the grad records - - std::list::iterator cursor; - - for (cursor = gradRecords.begin(); cursor != gradRecords.end(); cursor++) { - - (*cursor)->WriteToSWFStream(_SWFStream); - } -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FGradientRecord -------------------------------------------------------- - -// FGradRecord class constructor. -FGradRecord::FGradRecord(U32 _ratio, FColor *_color) -{ - color = _color; - ratio = _ratio; -} - -FGradRecord::~FGradRecord() -{ - delete color; -} - -// Writes the grad record to the given buffer. - -void FGradRecord::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - _SWFStream->WriteByte((U32)ratio); - - color->WriteToSWFStream(_SWFStream); //, FColor::WRITE_SMALLEST ); changed here. -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FLineStyle ------------------------------------------------------------- - -// LineStyle class constructor. -FLineStyle::FLineStyle(U32 _width, FColor *_color) -{ - color = _color; - width = _width; //in TWIPS -} - -FLineStyle::~FLineStyle() -{ - delete color; -} - -// Writes the object to the given _SWFStream. - -void FLineStyle::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - _SWFStream->WriteWord(width); - color->WriteToSWFStream(_SWFStream); //, FColor::WRITE_SMALLEST ); changed here. -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FLineStyleArray -------------------------------------------------------- - -// The line style array is automatically constructed -FLineStyleArray::FLineStyleArray(void) {} - -// Removes and deletes every element in the list. - -FLineStyleArray::~FLineStyleArray(void) -{ - - while (!lineStyleArray.empty()) { - - delete lineStyleArray.front(); - lineStyleArray.pop_front(); - } -} - -// Returns the size of the line style list. - -U32 FLineStyleArray::Size(void) -{ - - return (U32)lineStyleArray.size(); -} - -// The given line style is added to the end of the line style array. The position of -// the added line style is returned so that the line style can later be referenced. - -U32 FLineStyleArray::Add(FALineStyle *lineStyle) -{ - - lineStyleArray.push_back(lineStyle); - return ((U32)lineStyleArray.size()); -} - -// Writes to the stream by travelling through all of the nodes in the array and writing -// their line styles. First has to write the count of line style arrays. See's if count -// is small enough to fit in to an 8 bit field, and either writes the count into an 8 bit -// field, or writes all 1's into an 8 bit field and writes the real count into a 16 bit -// field. - -void FLineStyleArray::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - //write the size - U32 size = lineStyleArray.size(); - - if (size >= 0xff) { - - _SWFStream->WriteByte(0xff); - _SWFStream->WriteWord(size); - - } else { - - _SWFStream->WriteByte(size); - } - - //write the line styles - std::list::iterator cursor; - - for (cursor = lineStyleArray.begin(); cursor != lineStyleArray.end(); cursor++) { - - (*cursor)->WriteToSWFStream(_SWFStream); - } -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FMorphFillStyleBitmap -------------------------------------------------- - -// The tiledFlag indicates if the Bitmap fill style is tiled (tiledFlag==1) or -// clipped (tiledFlag==0). -FMorphFillStyleBitmap::FMorphFillStyleBitmap(int tiled, U16 ID, - FMatrix *matrix1, FMatrix *matrix2) -{ - - tiledFlag = tiled; - bitmapID = ID; - bitmapMatrix1 = matrix1; - bitmapMatrix2 = matrix2; -} - -// Deletes the matrices. - -FMorphFillStyleBitmap::~FMorphFillStyleBitmap(void) -{ - - delete bitmapMatrix1; - bitmapMatrix1 = NULL; - - delete bitmapMatrix2; - bitmapMatrix2 = NULL; -} - -// Writes the bitmap fill style to the given FSWFStream. - -void FMorphFillStyleBitmap::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - //write the type - if (tiledFlag) - _SWFStream->WriteByte(fillTiledBits); - else - _SWFStream->WriteByte(fillClippedBits); - - //write the bitmap id - _SWFStream->WriteWord(bitmapID); - - //write the matrices - bitmapMatrix1->WriteToSWFStream(_SWFStream); - bitmapMatrix2->WriteToSWFStream(_SWFStream); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FMorphFillStyleGradient ------------------------------------------------ - -// The linearFlag indicates if the gradient fill style is linear (linearFlag==1) or -// radial (linearFlag==0). -FMorphFillStyleGradient::FMorphFillStyleGradient(int linear, FMatrix *matrix1, FMatrix *matrix2, - FGradient *gradient) -{ - - linearFlag = linear; - gradFillMatrix1 = matrix1; - gradFillMatrix2 = matrix2; - gradFill = gradient; -} - -// Deletes the matrices and gradient. - -FMorphFillStyleGradient::~FMorphFillStyleGradient(void) -{ - - delete gradFillMatrix1; - gradFillMatrix1 = NULL; - delete gradFillMatrix2; - gradFillMatrix2 = NULL; - delete gradFill; - gradFill = NULL; -} - -// Writes the Gradient fill style to the given FSWFStream. - -void FMorphFillStyleGradient::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - //write the type - if (linearFlag) - _SWFStream->WriteByte(fillLinearGradient); - else - _SWFStream->WriteByte(fillRadialGradient); - - //write the matrices - gradFillMatrix1->WriteToSWFStream(_SWFStream); - gradFillMatrix2->WriteToSWFStream(_SWFStream); - - //write the gradient - gradFill->WriteToSWFStream(_SWFStream); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FMorphFillStyleSolid --------------------------------------------------- - -// Stores the colors of the solid fill style. -FMorphFillStyleSolid::FMorphFillStyleSolid(FColor *_color1, FColor *_color2) -{ - color1 = _color1; - color2 = _color2; -} - -FMorphFillStyleSolid::~FMorphFillStyleSolid() -{ - delete color1; - delete color2; -} - -// Writes the solid fill style to the given FSWFStream. - -void FMorphFillStyleSolid::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - //write the type - _SWFStream->WriteByte(fillSolid); //cast to U32? - - //write the colors - color1->WriteToSWFStream(_SWFStream); //, FColor::WRITE_SMALLEST ); changed here. - color2->WriteToSWFStream(_SWFStream); //, FColor::WRITE_SMALLEST ); changed here. -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FMorphGradRecord ------------------------------------------------------- - -// Constructor. -FMorphGradRecord::FMorphGradRecord(U32 _ratio1, FColor *_color1, U32 _ratio2, FColor *_color2) -{ - - ratio1 = _ratio1; - ratio2 = _ratio2; - - color1 = _color1; - color2 = _color2; -} - -FMorphGradRecord::~FMorphGradRecord() -{ - delete color1; - delete color2; -} - -// Writes to the given _SWFStream. - -void FMorphGradRecord::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - _SWFStream->WriteByte((U32)ratio1); - color1->WriteToSWFStream(_SWFStream); //, FColor::WRITE_SMALLEST ); changed here. - - _SWFStream->WriteByte((U32)ratio2); - color2->WriteToSWFStream(_SWFStream); //, FColor::WRITE_SMALLEST ); changed here. -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FMorphLineStyle -------------------------------------------------------- - -//The line style used by morph shapes -FMorphLineStyle::FMorphLineStyle(U32 _width1, U32 _width2, FColor *_color1, - FColor *_color2) : color1(_color1), color2(_color2) -{ - width1 = _width1; - width2 = _width2; - - color1 = _color1; - color2 = _color2; -} - -FMorphLineStyle::~FMorphLineStyle() -{ - delete color1; - delete color2; -} - -// Writes to the given _SWFStream. - -void FMorphLineStyle::WriteToSWFStream(FSWFStream *_SWFStream) -{ - //write the widths - _SWFStream->WriteWord(width1); - _SWFStream->WriteWord(width2); - - //write the colors - color1->WriteToSWFStream(_SWFStream); //, FColor::WRITE_SMALLEST ); changed here. - color2->WriteToSWFStream(_SWFStream); //, FColor::WRITE_SMALLEST ); changed here. -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FShape ----------------------------------------------------------------- - -// Shape class constructor. The shape record list is automatically constructed -FShape::FShape(void) -{ - - nFillBits = 0; - nLineBits = 0; -} - -// Removes and deletes every element in the list. - -FShape::~FShape(void) -{ - - while (!shapeRecs.empty()) { - - delete shapeRecs.back(); - shapeRecs.pop_back(); - } -} - -// Sets the nFillBits field. - -void FShape::SetFillBits(U32 _nFillBits) -{ - - nFillBits = _nFillBits; -} - -// Sets the nLineBits field. - -void FShape::SetLineBits(U32 _nLineBits) -{ - - nLineBits = _nLineBits; -} - -// Adds a shape record to the end of the shape record list. - -void FShape::AddShapeRec(FShapeRec *shapeRec) -{ - - shapeRecs.push_back(shapeRec); -} - -// Writes the object to the given buffer. - -void FShape::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - _SWFStream->WriteBits(nFillBits, 4); - _SWFStream->WriteBits(nLineBits, 4); - - std::vector::iterator cursor; - - for (cursor = shapeRecs.begin(); cursor != shapeRecs.end(); cursor++) { - //the shape rec might be referring to a fillor line style arry - //external (ShapesWStyle) and will need the # of fillBits. - (*cursor)->IncludeNFillBitInfo(nFillBits); //enter fillbits - (*cursor)->IncludeNLineBitInfo(nLineBits); //enter linebits - (*cursor)->WriteToSWFStream(_SWFStream); - } -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FShapeRecChange -------------------------------------------------------- - -// FShapeRecChange class constructor. It is passed the nFillBits and nLineBits values. -FShapeRecChange::FShapeRecChange(U32 _stateNewStyles, - U32 _stateLineStyle, - U32 _stateFillStyle1, - U32 _stateFillStyle0, - U32 _stateMoveTo, - S32 _moveDeltaX, - S32 _moveDeltaY, - U32 _fill0Style, - U32 _fill1Style, - U32 _lineStyle, - FFillStyleArray *_fillStyles, - FLineStyleArray *_lineStyles) -{ - stateNewStyles = _stateNewStyles; - stateLineStyle = _stateLineStyle; - stateFillStyle1 = _stateFillStyle1; - stateFillStyle0 = _stateFillStyle0; - stateMoveTo = _stateMoveTo; - - moveDeltaX = _moveDeltaX; - moveDeltaY = _moveDeltaY; - fill0Style = _fill0Style; - fill1Style = _fill1Style; - lineStyle = _lineStyle; - fillStyles = _fillStyles; - lineStyles = _lineStyles; - nMoveBits = MinBits(); -} - -FFillStyleArray *FShapeRecChange::GetFillStyles() -{ - return fillStyles; -} - -// Deletes fillStyles and lineStyles if they exist. - -FShapeRecChange::~FShapeRecChange(void) -{ - - if (fillStyles) { //if fillStyles isn't NULL - - delete fillStyles; - fillStyles = NULL; - } - - if (lineStyles) { //if lineStyles isn't NULL - - delete lineStyles; - lineStyles = NULL; - } -} - -//!Change Rec needs to know how many bits to write for the Fill and Line Styles -/*!Change Rec doesn't actually store the nLineBits or nFillBits, but needs to know - them when it writes the active style fields so that it knows how many bits - to write - \param _nFillBits the size in bits of the index into the FillStyleArray -*/ -void FShapeRecChange::IncludeNFillBitInfo(U32 _nFillBits) -{ - - nFillBits = _nFillBits; -} - -//!Change Rec needs to know how many bits to write for the Fill and Line Styles -/*!Change Rec doesn't actually store the nLineBits or nFillBits, but needs to know - them when it writes the active style fields so that it knows how many bits - to write - \param _nLineBits the size in bits of the index into the LineStyleArray -*/ -void FShapeRecChange::IncludeNLineBitInfo(U32 _nLineBits) -{ - - nLineBits = _nLineBits; -} - -// Calculates nMoveBits by returning the number of bits needed to store the larger of -// moveDeltaX and moveDeltaY. - -U32 FShapeRecChange::MinBits(void) -{ - - U32 max = FSWFStream::MaxNum(moveDeltaX, moveDeltaY, 0, 0); - return FSWFStream::MinBits(max, 1); -} - -// Writes the shape record to the given _SWFStream. - -void FShapeRecChange::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - //non-edge record flag - _SWFStream->WriteBits(NOT_EDGE_REC, 1); - - _SWFStream->WriteBits(stateNewStyles, 1); - _SWFStream->WriteBits(stateLineStyle, 1); - _SWFStream->WriteBits(stateFillStyle1, 1); - _SWFStream->WriteBits(stateFillStyle0, 1); - _SWFStream->WriteBits(stateMoveTo, 1); - - if (stateMoveTo) { - - _SWFStream->WriteBits(nMoveBits, 5); - _SWFStream->WriteBits(moveDeltaX, nMoveBits); - _SWFStream->WriteBits(moveDeltaY, nMoveBits); - } - - if (stateFillStyle0) { - - _SWFStream->WriteBits(fill0Style, nFillBits); - } - - if (stateFillStyle1) { - - _SWFStream->WriteBits(fill1Style, nFillBits); - } - - if (stateLineStyle) { - - _SWFStream->WriteBits(lineStyle, nLineBits); - } - - if (stateNewStyles) { - - fillStyles->WriteToSWFStream(_SWFStream); - lineStyles->WriteToSWFStream(_SWFStream); - - nFillBits = FSWFStream::MinBits(fillStyles->Size(), 0); - nLineBits = FSWFStream::MinBits(lineStyles->Size(), 0); - - _SWFStream->WriteBits(nFillBits, 4); //li mortacci loro!!! "dimenticavano" di mettere questi... - _SWFStream->WriteBits(nLineBits, 4); - } - - //NO FILLING IN BETWEEN SHAPE RECORDS -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FShapeRecEdgeStraight -------------------------------------------------- - -FShapeRecEdgeStraight::FShapeRecEdgeStraight(S32 dx, S32 dy) -{ - generalLineFlag = 0; - generalDeltaX = 0; - generalDeltaY = 0; - verticalLineFlag = 0; - horizontalDeltaX = 0; - verticalDeltaY = 0; - - edgeFlag = 1; - - // is this a general line? - if (dx != 0 && dy != 0) { - generalLineFlag = true; - generalDeltaX = dx; - generalDeltaY = dy; - } else if (dx == 0) // not general, is it vertical? - { - verticalLineFlag = true; - verticalDeltaY = dy; - } else { - verticalLineFlag = false; - horizontalDeltaX = dx; - } - nBits = MinBits(); - assert(nBits < 16 + 2); //vincenzo: se no non entra nei quattro bits riservati per scrivere questo valore... -} - -U32 FShapeRecEdgeStraight::MinBits(void) -{ - - U32 maxDelta = FSWFStream::MaxNum(generalDeltaX, generalDeltaY, - horizontalDeltaX, verticalDeltaY); - - return FSWFStream::MinBits(maxDelta, 1); -} - -void FShapeRecEdgeStraight::IncludeNFillBitInfo(U32 /*_nFillBits*/) -{ -} - -void FShapeRecEdgeStraight::IncludeNLineBitInfo(U32 /*_nLineBits*/) -{ -} - -void FShapeRecEdgeStraight::WriteToSWFStream(FSWFStream *_SWFStream) -{ - //edge record flag - _SWFStream->WriteBits(EDGE_REC, 1); - - _SWFStream->WriteBits(STRAIGHT_EDGE, 1); //This is a Straight edge record - _SWFStream->WriteBits(nBits - 2, 4); - _SWFStream->WriteBits(generalLineFlag, 1); - - if (generalLineFlag) { - - _SWFStream->WriteBits((U32)generalDeltaX, nBits); - _SWFStream->WriteBits((U32)generalDeltaY, nBits); - - } else { - - _SWFStream->WriteBits(verticalLineFlag, 1); //verticalFlag is supposed to be signed but don't think it matters - - if (!verticalLineFlag) - _SWFStream->WriteBits((U32)horizontalDeltaX, nBits); - - else - _SWFStream->WriteBits((U32)verticalDeltaY, nBits); - } - - //NO FILLING IN BETWEEN SHAPE RECORDS -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FShapeRecEdgeCurved --------------------------------------------------- - -// FShapeRecEdge class constructor. -FShapeRecEdgeCurved::FShapeRecEdgeCurved(S32 controlDX, S32 controlDY, S32 anchorDX, S32 anchorDY) -{ - edgeFlag = 0; - - controlDeltaX = controlDX; - controlDeltaY = controlDY; - anchorDeltaX = anchorDX; - anchorDeltaY = anchorDY; - - nBits = MinBits(); -} -// Finds the min bits necessary to represent the 4 fields, by seeing how many bits are -// necessary to represent the largest field of the four. - -U32 FShapeRecEdgeCurved::MinBits(void) -{ - - U32 maxDelta = FSWFStream::MaxNum(controlDeltaX, controlDeltaY, anchorDeltaX, anchorDeltaY); - - return FSWFStream::MinBits(maxDelta, 1); -} - -void FShapeRecEdgeCurved::IncludeNFillBitInfo(U32 /*_nFillBits*/) -{ -} - -void FShapeRecEdgeCurved::IncludeNLineBitInfo(U32 /*_nLineBits*/) -{ -} - -// Writes the shape record to the given _SWFStream. - -void FShapeRecEdgeCurved::WriteToSWFStream(FSWFStream *_SWFStream) -{ - //edge record flag - _SWFStream->WriteBits(EDGE_REC, 1); - - _SWFStream->WriteBits(CURVED_EDGE, 1); //This is a curved edge record - - _SWFStream->WriteBits(nBits - 2, 4); - - _SWFStream->WriteBits((U32)controlDeltaX, nBits); - _SWFStream->WriteBits((U32)controlDeltaY, nBits); - _SWFStream->WriteBits((U32)anchorDeltaX, nBits); - _SWFStream->WriteBits((U32)anchorDeltaY, nBits); - - //NO FILLING IN BETWEEN SHAPE RECORDS -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FShapeRecEnd ---------------------------------------------------------- - -// ShapeRecEnd class constructor. Doesn't take in anything because the -// object serves as an end tag and has no details. -FShapeRecEnd::FShapeRecEnd(void) {} - -void FShapeRecEnd::IncludeNFillBitInfo(U32 /*_nFillBits*/) -{ - // does nothing - //virtual method needed for shape rec change -} - -void FShapeRecEnd::IncludeNLineBitInfo(U32 /*_nLineBits*/) -{ - //same deal -} - -// Writes the object to the given buffer. - -void FShapeRecEnd::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - //stream of 0's signifies the end - _SWFStream->WriteBits(0, 6); - - //need to fill to end shape rec array structure. - _SWFStream->FlushBits(); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FShapeWStyle ---------------------------------------------------------- - -// FShapeWStyle class constructor. The shape record list is automatically constructed. -FShapeWStyle::FShapeWStyle(FFillStyleArray *_fillStyles, FLineStyleArray *_lineStyles) -{ - - fillStyles = _fillStyles; - lineStyles = _lineStyles; - - nFillBits = FSWFStream::MinBits(fillStyles->Size(), 0); - nLineBits = FSWFStream::MinBits(lineStyles->Size(), 0); -} - -// Deleted the fill style array, line style array, and shape records. - -FShapeWStyle::~FShapeWStyle(void) -{ - - delete fillStyles; - fillStyles = NULL; - - delete lineStyles; - lineStyles = NULL; - - while (!shapeRecs.empty()) { - - delete shapeRecs.back(); - shapeRecs.pop_back(); - } -} - -// Adds a shape record to the end of the shape record list. - -void FShapeWStyle::AddShapeRec(FShapeRec *shapeRec) -{ - - shapeRecs.push_back(shapeRec); -} - -U32 FShapeWStyle::NumFillBits() -{ - - return nFillBits; -} - -U32 FShapeWStyle::NumLineBits() -{ - - return nLineBits; -} - -////////////////////////////////////////////////////////////////////// - -void FShapeWStyle::changeColor(const std::map &table) -{ - unsigned int i, j; - if (fillStyles) - for (i = 0; i < fillStyles->Size(); i++) { - FAFillStyle *style = fillStyles->get(i); - //FColor* color = ((FFillStyleSolid*)style)->getColor(); - if (style->IsSolidStyle()) { - TPixel oldColor = fcolor2tpixel(*(((FFillStyleSolid *)style)->getColor())); - std::map::const_iterator it = table.find(oldColor); - if (it != table.end()) - ((FFillStyleSolid *)style)->setColor(new FColor(tpixel2fcolor(it->second))); - } - } - - for (i = 0; i < shapeRecs.size(); i++) { - FShapeRec *rec = shapeRecs[i]; - if (rec->isFShapeRecChange() && ((FShapeRecChange *)rec)->GetFillStyles()) - for (j = 0; j < ((FShapeRecChange *)rec)->GetFillStyles()->Size(); j++) { - FAFillStyle *style = ((FShapeRecChange *)rec)->GetFillStyles()->get(j); - //FColor* color = ((FFillStyleSolid*)style)->getColor(); - if (style->IsSolidStyle()) { - TPixel oldColor = fcolor2tpixel(*(((FFillStyleSolid *)style)->getColor())); - std::map::const_iterator it = table.find(oldColor); - if (it != table.end()) - ((FFillStyleSolid *)style)->setColor(new FColor(tpixel2fcolor(it->second))); - } - } - } -} - -///////////////////////////////////////////////////////////////////// - -void FShapeWStyle::changeColor(const FColor &oldColor, const FColor &newColor) -{ - unsigned int i, j; - if (fillStyles) - for (i = 0; i < fillStyles->Size(); i++) { - FAFillStyle *style = fillStyles->get(i); - FColor *color = ((FFillStyleSolid *)style)->getColor(); - if (style->IsSolidStyle() && *color == oldColor) - ((FFillStyleSolid *)style)->setColor(new FColor(newColor)); - color = ((FFillStyleSolid *)style)->getColor(); - } - - for (i = 0; i < shapeRecs.size(); i++) { - FShapeRec *rec = shapeRecs[i]; - if (rec->isFShapeRecChange() && ((FShapeRecChange *)rec)->GetFillStyles()) - for (j = 0; j < ((FShapeRecChange *)rec)->GetFillStyles()->Size(); j++) { - FAFillStyle *style = ((FShapeRecChange *)rec)->GetFillStyles()->get(j); - FColor *color = ((FFillStyleSolid *)style)->getColor(); - if (style->IsSolidStyle() && *color == oldColor) - ((FFillStyleSolid *)style)->setColor(new FColor(newColor)); - color = ((FFillStyleSolid *)style)->getColor(); - } - } -} - -///////////////////////////////////////////////////////////////////// - -// Writes the shape with style to the given _SWFStream. - -void FShapeWStyle::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - fillStyles->WriteToSWFStream(_SWFStream); - lineStyles->WriteToSWFStream(_SWFStream); - - _SWFStream->WriteBits(nFillBits, 4); - _SWFStream->WriteBits(nLineBits, 4); - - //write the shape records - std::vector::iterator cursor; - - for (cursor = shapeRecs.begin(); cursor != shapeRecs.end(); cursor++) { - (*cursor)->IncludeNFillBitInfo(nFillBits); //vincenzo - (*cursor)->IncludeNLineBitInfo(nLineBits); //vincenzo - - (*cursor)->WriteToSWFStream(_SWFStream); - if ((*cursor)->isFShapeRecChange()) //vincenzo - ((FShapeRecChange *)(*cursor))->getFillLineBits(nFillBits, nLineBits); //vincenzo - } - _SWFStream->FlushBits(); -} diff --git a/toonz/sources/common/flash/FDTShapes.h b/toonz/sources/common/flash/FDTShapes.h deleted file mode 100644 index 488c62d..0000000 --- a/toonz/sources/common/flash/FDTShapes.h +++ /dev/null @@ -1,1278 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. - -/**************************************************************************************** - - File Summary: FDTShapes.h - - This header-file contains the declarations of all low-level shape-related classes. - Their parent classes are in the parentheses: - - class FShape; - class FACXForm; - class FALineStyle; - class FAGradRecord; - class FCXForm; (public FACXForm) - class FCXFormWAlpha; (public FACXForm) - class FDTDefineMorphShape; (public FDT) - class FDTDefineShape; (public FDT) - class FDTDefineShape2; (public FDT) - class FDTDefineShape3; (public FDT) - class FAFillStyle; - class FFillStyle; (public FAFillStyle) - class FFillStyleArray; - class FFillStyleBitmap; (public FFillStyle) - class FFillStyleGradient; (public FFillStyle) - class FFillStyleSolid; (public FFillStyle) - class FGradient; - class FGradRecord; (public FAGradRecord) - class FLineStyle; (public FALineStyle) - class FLineStyleArray; - class FMorphFillStyle; (public FAFillStyle) - class FMorphFillStyleBitmap; (public FMorphFillStyle) - class FMorphFillStyleGradient; (public FMorphFillStyle) - class FMorphFillStyleSolid; (public FMorphFillStyle) - class FMorphGradRecord; (public FAGradRecord) - class FMorphLineStyle; (public FALineStyle) - class FShapeRec; - class FShapeRecChange; (public FShapeRec) - class FShapeRecEdgeStraight; (public FShapeRec) - class FShapeRecEdgeCurved; (public FShapeRec) - class FShapeRecEnd; (public FShapeRec) - class FShapeWStyle; - -****************************************************************************************/ - -#ifndef _FDT_SHAPES_H_ -#define _FDT_SHAPES_H_ - -#include "Macromedia.h" -#include "FDT.h" -#include "FSWFStream.h" -#include "FPrimitive.h" -#include "tpixel.h" - -class FMorphFillStyle; -class FMorphLineStyle; -class FShapeRec; -class FFillStyle; -class FLineStyle; -class FFillStyleArray; -class FLineStyleArray; -class FShapeWStyle; -class FGradient; - -#ifdef WIN32 // added from DV -#pragma warning(push) -#pragma warning(disable : 4786) -#pragma warning(disable : 4251) - -#endif - -#include "tcommon.h" - -#undef DVAPI -#undef DVVAR -#ifdef TFLASH_EXPORTS -#define DVAPI DV_EXPORT_API -#define DVVAR DV_EXPORT_VAR -#else -#define DVAPI DV_IMPORT_API -#define DVVAR DV_IMPORT_VAR -#endif - -//! Holds an array of ShapeRec's -/*! The ShapeRecs are written to a SWFStream in - the order they are added to the array. Normally used to store Font - Glyphs in a Definefont tag. An array of ShapeRec'sThis should probably - be called FShapeArray or such. FShapeWStyle is an expanded version. - \sa FShapeRec, FShapeRecChange, -*/ -class DVAPI FShape -{ -public: - FShape(); - virtual ~FShape(); - - //! Sets the number of bits necessary to index a Fill Style array into the SWF field nFillBits. - /*! The SWF SHAPE tag needs the number of bits necessary to index a - fillstyle array However, what Fill Style Array is it referring to ??? - Put 0 for now. - \param _nFillBits - */ - void SetFillBits(U32 _nFillBits); - //! Sets the number of bits necessary to index a Line Style array into theSWF field nFillBits. - /*! The SWF SHAPE tag also needs the number of bits necessary to index a - linestyle array. Again, what Line Style Array is it referring to ??? - Put 0 for now. - \param _nLineBits - */ - void SetLineBits(U32 _nLineBits); - - //! Add a ShapeRec (of type curve, line, or ChangeRec) to this Shape - /*! Add a ShapeRec which could be a ChangeRec, or an EdgeRec (curve or line) - to this Shape. The first is always a ChangeRec to set drawing position. - - \param shapeRec - */ - void AddShapeRec(FShapeRec *shapeRec); - - //! Stream the ShapeRecs out to the temporary buffer - /*! For each ShapeRec, tell it the # of fill bits, line bits, - and tell it to write itself to the temp stream. - - \param _SWFStream: the temporary output stream - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream); //not Complete, see comments - -private: - U32 nFillBits; - U32 nLineBits; - std::vector shapeRecs; -}; - -//! Abstract Base class of FCXForm and FCXFormWAlpha -/*! Specifies a color transform for certain objects - - \sa FCXForm, FCXFormWAlpha - */ -class DVAPI FACXForm -{ -public: - //! Virtual method. Write the color transform out to stream. - /*! Implemented by FCXForm, FCXFormWAlpha - - \param _SWFStream - */ - virtual ~FACXForm() {} - virtual void WriteToSWFStream(FSWFStream *_SWFStream) = 0; -}; - -//! Abstract Base class of FLineStyle, FMorphLineStyle -/*! All line styles fall into this category (morph or regular) - - \sa FLineStyle, FMorphLineStyle - */ -class DVAPI FALineStyle -{ -public: - virtual ~FALineStyle() {} - //! Virtual Method for writing LineStyles out to a stream - /*! Virtual Method for writing LineStyles out to a stream - - \param _SWFStream - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) = 0; -}; - -// - -//! Virtual Base Class of FGradRecord,FMorphGradRecord -/*! All grad records fall into this category - - \sa FGradRecord,FMorphGradRecord - */ -class DVAPI FAGradRecord -{ -public: - virtual ~FAGradRecord() {} - - //! Virtual Method for writing a Gradient out to a stream - - /*! - \param _SWFStream - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream) = 0; -}; - -// - -//! Color Transform -/*! Specifies a color transformation for some object without transparency information - - \sa - */ -class DVAPI FCXForm : public FACXForm -{ -public: - //! Set the values of the transform - no alpha channel - /*! Do we need the _has parameters? - Is 0 a valid value for each of these mult or add params? - - \param U32 _hasAdd: Has color addition values if equal to 1 - \param U32 _hasMult: Has color multipy values if equal to 1 - \param S32 _redMultTerm: Red multiply value - \param S32 _greenMultTerm: Green multiply value - \param S32 _blueMultiTerm: Blue multiply value - \param S32 _redAddTerm: Red addition value - \param S32 _greenAddTerm: Green addition value - \param S32 _blueAddTerm: Blue addition value - - */ - FCXForm( - U32 _hasAdd, U32 _hasMult, S32 _redMultTerm, S32 _greenMultTerm, - S32 _blueMultiTerm, S32 _redAddTerm, S32 _greenAddTerm, S32 _blueAddTerm); - - //! Write a SWF Color Transform without Alpha to Stream - /*! Writes the _has bits, and depending on their values, the multiply and add - color values. Computes the SWF nBits field from color values passed. - - \param _SWFStream - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -protected: - //flags - U32 hasAdd; - U32 hasMult; - - // bits in each term field - U32 nBits; - - S32 redMultTerm; - S32 greenMultTerm; - S32 blueMultTerm; - S32 redAddTerm; - S32 greenAddTerm; - S32 blueAddTerm; - - // finds minimum number of bits needed to represent the largest term - U32 MinBits(void); -}; - -// Specifies a color transformation for some object with transparency information - -//! Set the values of the transform - same as FCXForm with alpha channel -/*! Do we need the _has parameters? - Is 0 a valid value for each of these mult or add params? - - \param U32 _hasAdd: Has color addition values if equal to 1 - \param U32 _hasMult: Has color multipy values if equal to 1 - \param S32 _redMultTerm: Red multiply value - \param S32 _greenMultTerm: Green multiply value - \param S32 _blueMultiTerm: Blue multiply value - \param S32 _alphaMultTerm: Alpha transparency multiply value - \param S32 _redAddTerm: Red addition value - \param S32 _greenAddTerm: Green addition value - \param S32 _blueAddTerm: Blue addition value - \param S32 _alphaAddTerm: Alpha transparency addition value - - */ -class DVAPI FCXFormWAlpha : public FCXForm -{ - -public: - FCXFormWAlpha(U32 _hasAdd, U32 _hasMult, S32 _redMultTerm, S32 _greenMultTerm, S32 _blueMultTerm, S32 _alphaMultTerm, - S32 _redAddTerm, S32 _greenAddTerm, S32 _blueAddTerm, S32 _alphaAddTerm); - //! Write a SWF Color Transform with Alpha to Stream - /*! Writes the _has bits, and depending on their values, the multiply and add - color values. Computes the SWF nBits field from color values passed. - - \param _SWFStream - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - //flags - // U32 hasAdd; - // U32 hasMult; - - //bits in each term field - U32 nBits; - - // S32 redMultTerm; - // S32 greenMultTerm; - // S32 blueMultTerm; - S32 alphaMultTerm; - - // S32 redAddTerm; - // S32 greenAddTerm; - // S32 blueAddTerm; - S32 alphaAddTerm; - - //returns minimum number of bits needed to represent largest term value - U32 MinBits(void); -}; - -// - -//! a flash object which defines a morphing shape. It contains appearance information about an original shape and a shape being morphed into -/*! Note: this is the SWF info and should be rewritten. I would have expected that a - morph would take two character IDs instead of defining everything here. ??? - Defines the metamorphosis of one shape (Shape1) into another (Shape2). - The ShapeBounds1 specifies the boundaries of the original shape, - while ShapeBounds2 specifies the boundaries of the shape into which - Shape1 changes. The data specified in MorphFillStyles and MorphLineStyles - are for both shapes. For example, the fill style for Shape1 is specified, - then the corresponding fill style for Shape2 is specified. Edges1 - specifies the edges for Shape1 as well as the morph style data for - both shapes. Edges2 specifies the edges for Shape2, and contains no - style data. The number of edges specified in Edges1 must equal the - number of edges in Edges2. - - Should point to example code here. - */ - -class DVAPI FDTDefineMorphShape : public FDT -{ - -public: - //! Constructor just takes the before and after bounds RECTs - /*! - \param _rect1, _rect2 rects of before and after shapes - */ - FDTDefineMorphShape(FRect *_rect1, FRect *_rect2); - virtual ~FDTDefineMorphShape(); - //! Add Fill style to array and record its index - /*! You should have used FMorphFillStyles (solid, gradient, bitmap) - to create a morph fill style - \param fillStyle - */ - U32 AddFillStyle(FMorphFillStyle *fillStyle); - - // here changed. - //! Add line style to array and record its index. - /*! You need a pair of line styles (lineWidth + lineColor), - which contains both "morph from" and "morph to" line style information. - \param startLineWidth Line thickness of starting shape in twips. - \param startLineColor Line color of starting shape. (should be RGBA type). - \param finalLineWidth Line thickness of ending shape in twips. - \param finalLineColor Line color of ending shape. (should be RGBA type). - \return the position in the array. - */ - U32 AddLineStyle(U32 startLineWidth, FColor *startLineColor, - U32 finalLineWidth, FColor *finalLineColor); - - //! Cleans up the internal representation of the fill and line style arrays. - void FinishStyleArrays(void); - - //! Add a Shape Record to the first morph object definition - /*! The AddShapeRec_1 method takes style information for both shapes and edge - information for the "morph from" shape - \param _shapeRec the change, straight, curve record, or end record - */ - void AddShapeRec_1(FShapeRec *_shapeRec); - //! Add a Shape Record to the second morph object - /*! The AddEdgeRec_2 method takes edge information for just the "morph to" - \param _shapeRec the change, straight, curve record, or end record - */ - void AddEdgeRec_2(FShapeRec *_shapeRec); - - //! Record morphing objects's ID for later reference - U16 ID(void); - - //! Called by the FObj to write to the output stream - /*! \param _SWFStream - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U16 characterID; - FRect *shapeBounds_1; // 1 subscript denotes original shape - FRect *shapeBounds_2; // and 2 subscript denotes shape being morphed to - FShape shape1; - FShape shape2; - U32 offset; - FFillStyleArray *morphFillStyleArray; - FLineStyleArray *morphLineStyleArray; - U32 nFillBits; - U32 nLineBits; - U8 styleArraysFinished; -}; - -//! Create a DefineShape tag -/*! Creates a Flash 1.0 Define Shape tag. You should use DefineShape3. - All the DefineShape tags only differ in the fill/line style arrays - and fill/line style records - - \sa FFillStyle, FLineStyle, FShapeRec, FShapeWStyle, - see also FExampleRectangle.cpp - */ -class DVAPI FDTDefineShape : public FDT -{ - -public: - //! Create the basic empty shell of a DefineShape tag - /*! Only the bounds rect is passed. Fills, Lines, and - Shapes must be added. - - \param _rect the bounds rectangle - */ - FDTDefineShape(FRect *_rect); - virtual ~FDTDefineShape(); - - //! Add a Shape record to the internal ShapeRec array - /*! Use FShapeRecChange, FShapeRecEdgeStraight, FShapeRecEdgeStraight - to create edges to add to this shape - \param _shapeRec - */ - void AddShapeRec(FShapeRec *_shapeRec); - - //! Cleans up the internal representation of the fill and line style arrays. - void FinishStyleArrays(void); - //! Add fill style to shape, - /*! Remember to store the position of the fill style. Use this when - creating the shape change record later, to indicate which style - to use for the fill. - \param fillStyle - \return the position in the array. when creating the shape change record later. - */ - U32 AddFillStyle(FFillStyle *fillStyle); - - // changed here. - //! Add solid fill style to shape, - /*! Remember to store the position of the fill style. Use this when - creating the shape change record later, to indicate which style - to use for the fill. - \param fillColor - \return the position in the array. when creating the shape change record later. - */ - U32 AddSolidFillStyle(FColor *fillColor); - - // here changed. - //! Add line style to array and record its index. - /*! Remember to store the position of the fill style. Use this - when creating the shape change record later, to indicate which style - to use for the next edges. - \param lineWidth Line thickness in twips. - \param lineColor Line color. (should be RGB type). - \return the position in the array. - */ - U32 AddLineStyle(U32 lineWidth, FColor *lineColor); - - //! Record objects's ID for when you do a PlaceObject - U16 ID(void); - //! Called by the FObj to write to the output stream - /*! \param _SWFStream - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - virtual void SetId(U16 id) { characterID = id; } - bool IsDefineShape(); - -private: - U16 characterID; - FRect *shapeBounds; - FShapeWStyle *shapeWithStyle; - FFillStyleArray *fillStyleArray; - FLineStyleArray *lineStyleArray; - //U32 nFillBits; - //U32 nLineBits; - U8 styleArraysFinished; -}; - -//! Create a DefineShape2 tag -/*! Creates a Flash 2.0 Define Shape tag. You should use DefineShape3. - All the DefineShape tags only differ in the fill/line style arrays - and fill/line style records - - \sa FFillStyle, FLineStyle, FShapeRec, FShapeWStyle, - see also FExampleRectangle.cpp - */ -class DVAPI FDTDefineShape2 : public FDT -{ - -public: - //! Create the basic empty shell of a DefineShape tag - /*! Only the bounds rect is passed. Fills, Lines, and - Shapes must be added. - - \param _rect the bounds rectangle - */ - FDTDefineShape2(FRect *_rect); - virtual ~FDTDefineShape2(); - //! Add a Shape record to the internal ShapeRec array - /*! Use FShapeRecChange, FShapeRecEdgeStraight, FShapeRecEdgeStraight - to create edges to add to this shape - \param _shapeRec - */ - void AddShapeRec(FShapeRec *_shapeRec); - - //! Cleans up the internal representation of the fill and line style arrays. - void FinishStyleArrays(void); - - //! Add fill style to shape, - /*! Remember to store the position of the fill style. Use this when - creating the shape change record later, to indicate which style - to use for the fill. Remember, DefineShape2s don't support Alpha. - \param fillStyle - \return the position in the array. When creating the shape change record later. - */ - U32 AddFillStyle(FFillStyle *fillStyle); - - // here changed. - //! Add solid fill style to shape, - /*! Remember to store the position of the fill style. Use this when - creating the shape change record later, to indicate which style - to use for the fill. Remember, DefineShape2s don't support Alpha. - \param fillColor - \return the position in the array. When creating the shape change record later. - */ - U32 AddSolidFillStyle(FColor *fillColor); - - // here changed. - //! Add line style to rectangle, - /*! Remember to store the position of the fill style. Use this - when creating the shape change record later, to indicate which style - to use for the next edges. - \param lineWidth Line thickness in twips. - \param lineColor Line color. (should be RGB type). - \return the position in the array. - */ - U32 AddLineStyle(U32 lineWidth, FColor *lineColor); - - //! Record objects's ID for when you do a PlaceObject - U16 ID(void); - //! Called by the FObj to write to the output stream - /*! \param _SWFStream - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - virtual void SetId(U16 id) { characterID = id; } - bool IsDefineShape(); - -private: - U16 characterID; - FRect *shapeBounds; - FShapeWStyle *shapeWithStyle; - FFillStyleArray *fillStyleArray; - FLineStyleArray *lineStyleArray; - U32 nFillBits; - U32 nLineBits; - U8 styleArraysFinished; -}; - -//! Create a DefineShape3 tag -/*! Creates a Flash 3.0 Define Shape tag. - All the DefineShape tags only differ in the fill/line style arrays - and fill/line style records (accepts alpha color values). - - \sa FFillStyle, FLineStyle, FShapeRec, FShapeWStyle, - see also FExampleRectangle.cpp - */ - -class DVAPI FDTDefineShape3 : public FDT -{ - -public: - //! Create the basic empty shell of a DefineShape tag - /*! Only the bounds rect is passed. Fills, Lines, and - Shapes must be added. - - \param _rect the bounds rectangle - */ - FDTDefineShape3(); - FDTDefineShape3(FRect *_rect); - void setBounds(FRect *_rect); - virtual ~FDTDefineShape3(); - //! Add a Shape record to the internal ShapeRec array - /*! Use FShapeRecChange, FShapeRecEdgeStraight, FShapeRecEdgeStraight - to create edges to add to this shape - \param _shapeRec - */ - void AddShapeRec(FShapeRec *_shapeRec); - //! Cleans up the internal representation of the fill and line style arrays. - void FinishStyleArrays(void); - - //! Add fill style to shape, - /*! Remember to store the position of the fill style. Use this when - creating the shape change record later, to indicate which style - to use for the fill. - \param fillStyle - \return the position in the array. When creating the shape change record later. - */ - U32 AddFillStyle(FFillStyle *fillStyle); - - //! Add solid fill style to shape, - /*! Remember to store the position of the fill style. Use this when - creating the shape change record later, to indicate which style - to use for the fill. - \param fillColor - \return the position in the array. When creating the shape change record later. - */ - U32 AddSolidFillStyle(FColor *fillColor); - - //! Add line style to array and record its index. - /*! Remember to store the position of the fill style. Use this - when creating the shape change record later, to indicate which style - to use for the next edges. - \param lineWidth Line thickness in twips. - \param lineColor Line color. (should be RGBA type). - \return the position in the array. - */ - U32 AddLineStyle(U32 lineWidth, FColor *lineColor); - - //! Record objects's ID for when you do a PlaceObject - U16 ID(void); - //! Called by the FObj to write to the output stream - /*! \param _SWFStream - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - virtual void SetId(U16 id) { characterID = id; } - bool IsDefineShape(); - void changeColor(const FColor &oldColor, const FColor &newColor); - void changeColor(const std::map &table); - - FRect GetBBox() const { return *shapeBounds; } -private: - U16 characterID; - FRect *shapeBounds; - FShapeWStyle *shapeWithStyle; - FFillStyleArray *fillStyleArray; - FLineStyleArray *lineStyleArray; - U32 nFillBits; - U32 nLineBits; - U8 styleArraysFinished; -}; - -//! Abstract Base Class. All edge records fall into this category -/*! The fill classes from the solid, gradient, bitmap are children. - - \sa FFillStyleGradient, FFillStyleBitmap, FFillStyleSolid - */ -class DVAPI FAFillStyle -{ -public: - virtual bool IsSolidStyle() { return false; }; - - virtual ~FAFillStyle() {} - virtual void WriteToSWFStream(FSWFStream *_SWFStream) = 0; -}; - -//The fill style used by regular non-morph shapes - -//! Why does this exist? -/*! It is used as a parameter to other functions but I don't know why. - - \sa FFillStyleGradient, FFillStyleBitmap, FFillStyleSolid - */ -class DVAPI FFillStyle : public FAFillStyle -{ -public: - virtual ~FFillStyle() {} -}; - -//!An array of fill styles. -/*! - - \sa FFillStyleGradient, FFillStyleBitmap, FFillStyleSolid, FAFillStyle -*/ -class DVAPI FFillStyleArray -{ - -public: - FFillStyleArray(void) {} - virtual ~FFillStyleArray(void); - //! The given fill style is added to the end of the fill style array. - /*! The position of the added fill style is returned so that the fill style can later be referenced. - - \param fillStyle the style to add - */ - - U32 Add(FAFillStyle *fillStyle); - //! Returns the size of the fill style list. - U32 Size(); - FAFillStyle *get(unsigned int index); - - //! Writes the array to the stream - /*! Travels through all of the nodes in the array and writing - their fill styles. First has to write the count of fill style arrays. See's if count - is small enough to fit in to an 8 bit field, and either writes the count into an 8 bit - field, or writes all 1's into an 8 bit field and writes the real count into a 16 bit - field. - - \param _SWFStream - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - //the list which contains all of the fill styles - std::vector fillStyleArray; -}; - -//! The Bitmap fill style used by regular non-morph shapes -/*! Can be tiled or clipped, depending on the flag. - - \sa FFillStyleArray, FFillStyleGradient, FFillStyleBitmap, FFillStyleSolid, FAFillStyle - */ -// -// - -class DVAPI FFillStyleBitmap : public FFillStyle -{ - -public: - /*! - - \param tiled indicates if the Bitmap fill style is tiled (tiledFlag==1) or - clipped (tiledFlag==0). - \param matrix translation matrix for offsetting, rotating, scaleing etc. the bitmap - */ - FFillStyleBitmap(int tiled, U16 ID, FMatrix *matrix); - virtual ~FFillStyleBitmap(void); - //! Writes the bitmap fill style to the given FSWFStream. - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - int tiledFlag; - U16 bitmapID; - FMatrix *bitmapMatrix; -}; - -//! The Gradient fill style used by regular non-morph shapes -/*! Can be linear or radial, depending on the flag. - - \sa FFillStyleArray, FGradient - */ -class DVAPI FFillStyleGradient : public FFillStyle -{ - -public: - //! Create a Gradient fill style - /*! - \param linear indicates if the gradient fill style is linear (linearFlag==1) or - radial (linearFlag==0). - \param matrix matrix translation matrix for placing the gradient in the fill area - Not sure what each of the matrix fields do??? - \param gradient a pre-build gradient object. See FGradient - */ - FFillStyleGradient(int linear, FMatrix *matrix, FGradient *gradient); - virtual ~FFillStyleGradient(void); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - int linearFlag; - FMatrix *gradFillMatrix; - FGradient *gradFill; -}; - -//The solid fill style used by regular non-morph shapes - -//! Creates a Solid Fill object -/*! Basically just contains a color - - \sa FFillStyleArray, FFillStyleGradient, FFillStyleBitmap - */ -class DVAPI FFillStyleSolid : public FFillStyle -{ -public: - //! Create a style object - /*! Whether or not FColor contains alpha information is not - important until the color is written out. - - \param Fcolor which can contain alpha or not - */ - FFillStyleSolid(FColor *_color); - - virtual ~FFillStyleSolid(); - - //! Write the color to the file stream - /*! When this object is serialized, it automatically handles the case of - including the alpha information if its there. - \param *_SWFStream the output stream - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - bool IsSolidStyle() { return true; }; - void setColor(FColor *_color) - { - delete color; - color = _color; - } - FColor *getColor() { return color; } - -private: - FColor *color; -}; - -//! Gradient information is stored in an array of Gradient Records -/*! This is that array. This style of gradient records is used with - non-morphing objects. - - \sa FGradRecord - */ -class DVAPI FGradient -{ - -public: - FGradient(void); - ~FGradient(void); - //! Add a Gradient Record to the internal list - /*! Up to 8 gradient records may be added to this list - The ratio field within each GradientRec determines what percentage - of a gradient is a particular color. - \param FAGradRecord* pointer to a gradient record - */ - void Add(FAGradRecord *g); - void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - //the list which contains all of the grad records - std::list gradRecords; -}; - -// used by non-morph shapes - -//! A non morph gradient record. -/*! Note that ostensibly the ratio parameter is the percentage complete aTLong - the gradient that this color should be but it's really not known what this - field is. - \sa FGradient, FFillStyleGradient - */ -class DVAPI FGradRecord : public FAGradRecord -{ -public: - //!Create the Gradient record with the mysterious ration parm. - /*! - - \param U_ratio know one knows for sure - \param FColor one of the colors to shift through - */ - FGradRecord(U32 _ratio, FColor *color); - - virtual ~FGradRecord(); - - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U32 ratio; - FColor *color; -}; - -// - -//! The line style used by regular non-morph shapes -/*! LineStyles are held in arrays of LineStyles which are held - in DefineShape Tags. - - \sa FExampleRectangle.cpp, FLineStyleArray - */ -class DVAPI FLineStyle : public FALineStyle -{ - -public: - //!Line Style is just a thickness and color - /*! - - \param width U32 - \param _color FColor - */ - FLineStyle(U32 _width, FColor *_color); - virtual ~FLineStyle(); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U32 width; - FColor *color; -}; - -// -//! An array of line styles. -/*! LineStyles are held in arrays of LineStyles which are held - in DefineShape Tags. - - \sa FLineStyle, FExampleRectangle.cpp -*/ -class DVAPI FLineStyleArray -{ - -public: - //!Create an empty initialized array - FLineStyleArray(void); - ~FLineStyleArray(void); - //!Add the line style to the array. - /*! Automatically handles the case of packing the corresponding SWF object - properly when you go over 255 styles. Not that we can see why you'd do - this. - - \param lineStyle the style object to add to the internal array - */ - U32 Add(FALineStyle *lineStyle); - //! The number of items in the list - /*! This is needed when a containing DefineShape needs to know how how - many styles there are and therefore how many bits are needed for an index. - The given line style is added to the end of the line style array. The position of - the added line style is returned so that the line style can later be referenced. - */ - U32 Size(void); - //! Write the array to the output stream. - /*! Writes to the stream by travelling through all of the nodes in - the array and writing their line styles. First has to write the count - of line style arrays. Sees if count is small enough to fit in to an - 8 bit field, and either writes the count into an 8 bit field, or writes - all 1's into an 8 bit field and writes the real count into a 16 bit field. - - \param *_SWFStream - */ - void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - //the list which contains all of the line styles - std::list lineStyleArray; -}; - -//! The Base class of fill style objects used by morph shapes -/*! - - \sa FMorphFillStyleGradient, FMorphFillStyleBitmap, FMorphFillStyleSolid - */ -class DVAPI FMorphFillStyle : public FAFillStyle -{ -public: - virtual ~FMorphFillStyle() {} - virtual void WriteToSWFStream(FSWFStream * /* _SWFStream */) {} -}; - -// -// - -//!The Bitmap fill style used by morph shapes -/*! Note that all Morph fill styles are documented in SWF as a single overloaded - data structure. It's simplier to have three separate routiens. - - This can be tiled or clipped, depending on the flag. - - \sa FMorphFillStyleGradient, FMorphFillStyleBitmap, FMorphFillStyleSolid, FMatrix - */ -class DVAPI FMorphFillStyleBitmap : public FMorphFillStyle -{ - -public: - // The tiledFlag indicates if the Bitmap fill style is tiled (tiledFlag==1) or - // clipped (tiledFlag==0). - - //! Bitmap fill style for a morph - /*! - - \param tiled The tiledFlag indicates if the Bitmap fill style is tiled (tiledFlag==1) or - clipped (tiledFlag==0) - \param ID Character ID of bitmap - \param matrix1 rotation/translation Matrix for first state - \param matrix2 for the second state - */ - FMorphFillStyleBitmap(int tiled, U16 ID, FMatrix *matrix1, FMatrix *matrix2); - virtual ~FMorphFillStyleBitmap(void); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - int tiledFlag; - U16 bitmapID; - FMatrix *bitmapMatrix1; - FMatrix *bitmapMatrix2; -}; - -//!The Gradient fill style used by morph shapes -/*! Note that all Morph fill styles are documented in SWF as a single overloaded - data structure. It's simplier to have three separate routines. - - Can be linear or radial, depending on the flag, depending on the flag. - - \sa FMorphFillStyleGradient, FMorphFillStyleBitmap, FMorphFillStyleSolid, FGradient, FMatrix, FFillStyleArray - */ -class DVAPI FMorphFillStyleGradient : public FMorphFillStyle -{ - -public: - //!Construct a Gradient Fill Style - /*! Ultimatly to go in a MorphFillStyles Array and then get - added to a DefineMorphShape - - \param linear The linearFlag indicates if the gradient fill - style is linear (linearFlag==1) or radial (linearFlag==0) - \param matrix1 - \param matrix2 translation matrix for the gradient before and after. - \param gradient an FGradient fill - */ - FMorphFillStyleGradient(int linear, FMatrix *matrix1, FMatrix *matrix2, FGradient *gradient); - virtual ~FMorphFillStyleGradient(void); - //!Writes the Gradient fill style to the given FSWFStream. - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - int linearFlag; - FMatrix *gradFillMatrix1; - FMatrix *gradFillMatrix2; - FGradient *gradFill; -}; - -//!The solid fill style used by morph shapes -/*! Each Fill style has two colors for the two objects being morphed. The FillStyles are -in a FFillStyle array. In this case the fill styles object 1 and 2 are interleaved. The -FillStyleArray is then stored in a DefineMorphShape. - - \sa FMorphFillStyleGradient, FMorphFillStyleBitmap, FMorphFillStyleSolid, FGradient, FMatrix,FFillStyleArray - */ -class DVAPI FMorphFillStyleSolid : public FMorphFillStyle -{ - -public: - /*! - \param _color1 Solid fill color with transparency information for first shape - \param _color2 Same for second - */ - FMorphFillStyleSolid(FColor *_color1, FColor *_color2); - virtual ~FMorphFillStyleSolid(); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - FColor *color1; - FColor *color2; -}; - -//!The grad record used by morph shapes -/*! The Morph Gradient store an array of these records. Each is like a double -of the regular Gradient fill record. Each Morph Gradient Record has two colors -and two ratio numbers for the two objects being morphed. Theses Gradient Records -possibly 8 of them, are stored in an FAGradient array, the base of all gradient records. -Normally the Colors in a gradient array store the colors aTLong the gradient. These -store pairs of colors, one for each of the two objects aTLong with the mysterious ratio number. - The FMorphFillStyleGradient is then stored in a DefineMorphShape. - - \sa FMorphFillStyleGradient, FMorphFillStyleBitmap, FMorphFillStyleSolid, FAGradient, FMatrix,FFillStyleArray - */ -class DVAPI FMorphGradRecord : public FAGradRecord -{ - -public: - //!Create a Morph Gradient record - /*! - \param _ratio1 for the first object - \param _color1 - \param _ratio2 for the second object - \param _color2 - */ - FMorphGradRecord(U32 _ratio1, FColor *_color1, U32 _ratio2, FColor *_color2); - virtual ~FMorphGradRecord(); - - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U32 ratio1; - U32 ratio2; - - FColor *color1; - FColor *color2; -}; - -//! Morph line styles to go in the DefineMorph Object -/*! MorphLineStyle is an FALineStyle. These get put into - FLineStyleArrays which in turn are put in the Define Morph Object. - These are just line regular line styles, except that they - carry a pair of line styles, one for the morph from object - and the corresponding one in the Morphe to object. - - \sa FLineStyleArray - */ -class FMorphLineStyle : public FALineStyle -{ - -public: - //!create the pair of styles, width/color - /*! - - \param width1 - \param width2 - \param _color1 - \param _color2 - - */ - FMorphLineStyle(U32 _width1, U32 _width2, FColor *_color1, FColor *_color2); - virtual ~FMorphLineStyle(); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - FColor *color1; - FColor *color2; - U32 width1; - U32 width2; -}; - -//! Virtual Base class for the change, straight, and curved Shape records -/*! - - \sa FShapeRecChange, FShapeRecEdgeStraight, FShapeRecEdgeCurved - */ -class DVAPI FShapeRec -{ - -public: - virtual ~FShapeRec() {} - virtual bool isFShapeRecChange() { return false; } - virtual void WriteToSWFStream(FSWFStream *_SWFStream) = 0; - virtual void IncludeNFillBitInfo(U32 _nFillBits) = 0; - virtual void IncludeNLineBitInfo(U32 _nLineBits) = 0; - virtual bool IsRecChange() { return false; } -}; - -// shape record that defines changes in line style, fill style, position, or a new set of styles - -class DVAPI FShapeRecChange : public FShapeRec -{ - -public: - FShapeRecChange(U32 _stateNewStyles, - U32 _stateLineStyle, - U32 _stateFillStyle1, - U32 _stateFillStyle0, - U32 _stateMoveTo, - S32 _moveDeltaX, - S32 _moveDeltaY, - U32 _fill0Style, - U32 _fill1Style, - U32 _lineStyle, - FFillStyleArray *_fillStyles, - FLineStyleArray *_lineStyles); - - virtual ~FShapeRecChange(void); - - virtual bool isFShapeRecChange() { return true; } - void getFillLineBits(U32 &_nFillBits, U32 &_nLineBits) - { - _nFillBits = nFillBits; - _nLineBits = nLineBits; - } - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - virtual void IncludeNFillBitInfo(U32 _nFillBits); - virtual void IncludeNLineBitInfo(U32 _nLineBits); - bool IsRecChange() { return true; } - FFillStyleArray *GetFillStyles(); - -private: - U32 stateNewStyles; - U32 stateLineStyle; - U32 stateFillStyle0; - U32 stateFillStyle1; - U32 stateMoveTo; - U32 nMoveBits; - U32 nFillBits; // these two values are stored in the Shape field - U32 nLineBits; // they are passed to each ShapeRec - S32 moveDeltaX; - S32 moveDeltaY; - U32 fill0Style; - U32 fill1Style; - U32 lineStyle; - FFillStyleArray *fillStyles; - FLineStyleArray *lineStyles; - U32 MinBits(void); -}; - -//! Create a straight edge -/*! The XY values are passed as delta values from the previous XY points. - Creating and adding several straight edges in a row will create a set - of connected edges. - - This may change to absolution positions in the future. ??? - - See also FExampleRectangle.cpp - - */ -class DVAPI FShapeRecEdgeStraight : public FShapeRec -{ -public: - //! Create a straight edge from the previous point - /*! This is the equivalent of a "LineTo" command - - \param generalDX - \param generalDY - */ - FShapeRecEdgeStraight(S32 dx, S32 dy); - virtual ~FShapeRecEdgeStraight(){}; - - //!Write out as Vertical, Horizontal or general line SWF Record automatically - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - //!dummy in this object. This call only makes sense for a Change Rec, here for historical - virtual void IncludeNFillBitInfo(U32 _nFillBits); - //!dummy in this object. This call only makes sense for a Change Rec, here for historical - virtual void IncludeNLineBitInfo(U32 _nLineBits); - -private: - U32 edgeFlag; - U32 nBits; - U32 generalLineFlag; - S32 generalDeltaX; - S32 generalDeltaY; - U32 verticalLineFlag; - S32 horizontalDeltaX; - S32 verticalDeltaY; - U32 MinBits(void); -}; - -//! Create a bezier edge -/*! The control points are passed as delta values from the previous control points. - This may change to absolution positions in the future. ??? - - See also [example file], [bezier info file] - - */ -class DVAPI FShapeRecEdgeCurved : public FShapeRec -{ -public: - //! Create a bezier - /*! All values expressed in twips ??? - \param controlDX delta from the last X control value - \param controlDY delta from the last Y control value - \param anchorDX delta from the last X anchor value - \param anchorDY delta from the last Y anchor value - */ - FShapeRecEdgeCurved(S32 controlDX, S32 controlDY, S32 anchorDX, S32 anchorDY); - virtual ~FShapeRecEdgeCurved(void) {} - //! Called by containing Shape when file is serialized - /*! Writes the anchor, control, pts, as well as the minBits and edgeFlag - \param _SWFStream - */ - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - //!dummy in this object. This call only makes sense for a Change Rec, here for historical - virtual void IncludeNFillBitInfo(U32 _nFillBits); - //!dummy in this object. This call only makes sense for a Change Rec, here for historical - virtual void IncludeNLineBitInfo(U32 _nLineBits); - -private: - U32 edgeFlag; - U32 nBits; - S32 controlDeltaX; - S32 controlDeltaY; - S32 anchorDeltaX; - S32 anchorDeltaY; - U32 MinBits(void); -}; - -//The shape record which signifies the end of a shape record array. - -class DVAPI FShapeRecEnd : public FShapeRec -{ - -public: - FShapeRecEnd(void); - //!Write an EndRecord. Signifies the last ShapeRecord in the ShapeRecArray - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - //!dummy in this object. This call only makes sense for a Change Rec, here for historical - virtual void IncludeNFillBitInfo(U32 _nFillBits); - //!dummy in this object. This call only makes sense for a Change Rec, here for historical - virtual void IncludeNLineBitInfo(U32 _nLineBits); -}; - -class DVAPI FShapeWStyle -{ - -public: - FShapeWStyle(FFillStyleArray *_fillStyles, FLineStyleArray *_lineStyles); - ~FShapeWStyle(void); - void AddShapeRec(FShapeRec *shapeRec); - void WriteToSWFStream(FSWFStream *_SWFStream); - U32 NumFillBits(); - U32 NumLineBits(); - FFillStyleArray *GetFillStyles() { return fillStyles; } - void changeColor(const FColor &oldColor, const FColor &newColor); - void changeColor(const std::map &table); - -private: - FFillStyleArray *fillStyles; - FLineStyleArray *lineStyles; - U32 nFillBits; - U32 nLineBits; - std::vector shapeRecs; //see comments, will need to be changed -}; - -#ifdef WIN32 // added from DV -#pragma warning(pop) -#endif -#endif diff --git a/toonz/sources/common/flash/FDTSounds.cpp b/toonz/sources/common/flash/FDTSounds.cpp deleted file mode 100644 index 67617ab..0000000 --- a/toonz/sources/common/flash/FDTSounds.cpp +++ /dev/null @@ -1,483 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. - -/**************************************************************************************** - - File Summary: FDTSounds.cpp - - This source file contains the definition for all low-level sound-related functions, - grouped by classes: - - Class Member Function - - FDTDefineSound FDTDefineSound() - void WriteToSWFStream(FSWFStream*); - - FDTDefineSoundADPCM FDTDefineSoundADPCM(U8, U8, U8, U32, U8*, U32, int); - - FDTDefineSoundWAV FDTDefineSoundWAV(FILE*, int); - bool loadWavFile(FILE*, SSound*, U8**, int*); - FDTSoundStreamBlock FDTSoundStreamBlock(U32, U8*); - void WriteToSWFStream(FSWFStream*); - - FDTSoundStreamHead FDTSoundStreamHead(U8, U8, U16); - void WriteToSWFStream(FSWFStream*); - - FDTSoundStreamHead2 FDTSoundStreamHead2(U8, U8, U8, U8, U16); - void WriteToSWFStream(FSWFStream*); - - FSndEnv FSndEnv(U32, U16, U16); - void WriteToSWFStream(FSWFStream*); - - FSoundInfo FSoundInfo(U8, U8, U8, U8, U8, U32, U32, U16, U8, FSndEnv*); - ~FSoundInfo(); - void WriteToSWFStream(FSWFStream*); - -****************************************************************************************/ - -#include "FDTSounds.h" -#include "FSound.h" -#include "FSWFStream.h" - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTDefineSound -------------------------------------------------------- - -FDTDefineSound::FDTDefineSound() -{ - soundID = FObjCollection::Increment(); - memset(&soundData, 0, sizeof(soundData)); -} - -void FDTDefineSound::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - FSWFStream tempBuffer; - - tempBuffer.WriteWord((U32)soundID); - tempBuffer.WriteBits((U32)soundData.format, 4); - tempBuffer.WriteBits((U32)soundData.rate, 2); - tempBuffer.WriteBits((U32)soundData.size, 1); - tempBuffer.WriteBits((U32)soundData.type, 1); - tempBuffer.WriteDWord(soundData.sampleCount); - tempBuffer.WriteLargeData(soundData.sound, soundData.soundSize); - - _SWFStream->AppendTag(stagDefineSound, tempBuffer.Size(), &tempBuffer); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTDefineSoundADPCM --------------------------------------------------- - -FDTDefineSoundADPCM::FDTDefineSoundADPCM(U8 rate, - U8 size, - U8 type, - U32 sampleCount, - const U8 *wavData, - U32 wavDataSize, - int compression) -{ - // clear the vector to write to - pcmData.clear(); - - soundData.format = 1; //a 1 indicates ADPCM - soundData.rate = rate; - soundData.size = size; - soundData.type = type; - soundData.sampleCount = sampleCount; - - // Construct a FSound object - FSound sound; - sound.format = Format(); - - sound.nSamples = (S16)soundData.sampleCount; - sound.samples = const_cast(wavData); // it won't change it - so we cast (lee) - sound.dataLen = (S16)wavDataSize; - sound.delay = 0; - - FSoundComp compress(&sound, compression); - - compress.Compress(const_cast(wavData), sound.nSamples, &pcmData); // it won't change it - so we cast (lee) - compress.Flush(&pcmData); - - // store the compressed data to the sound structure - soundData.sound = &pcmData[0]; - soundData.soundSize = pcmData.size(); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTDefineSoundWAV ----------------------------------------------------- - -FDTDefineSoundWAV::FDTDefineSoundWAV(FILE *fp, int comp) -{ - U8 *wavData; // memory where the WAV file is stored - int wavDataSize; // the number of bytes in the WAV file - - // clear the vector to write to - pcmData.clear(); - - // fp = fopen( waveFile, "rb" ); - if (!fp) { - return; - } - - if (loadWavFile(fp, &soundData, &wavData, &wavDataSize) == false) { - // there was an error - return; - } - - // Construct a FSound object - FSound sound; - sound.format = Format(); - - sound.nSamples = (S16)soundData.sampleCount; - sound.samples = wavData; - sound.dataLen = wavDataSize; - sound.delay = 0; - - FSoundComp compress(&sound, comp); - - compress.Compress(wavData, sound.nSamples, &pcmData); - compress.Flush(&pcmData); - - // fclose( fp ); - - // store the compressed data to the sound structure - soundData.sound = &pcmData[0]; - soundData.soundSize = pcmData.size(); - - // delete the wav data - delete[] wavData; -} - -//------------------------------------------------------------------------------ -bool FDTDefineSoundWAV::loadWavFile(FILE *fp, SSound *soundData, U8 **wavData, int *wavDataSize) -{ - TUINT32 nextseek; - TUINT32 filesize; - TUINT32 fileTag; - TUINT32 typeTag; - TUINT32 chunkSize; - TUINT32 chunkId; - TUINT32 formatTag = 0; - - assert(fp); - memset(soundData, 0, sizeof(SSound)); - - soundData->format = 1; // ADPCM compressed - - fileTag = read32(fp); - if (fileTag != 0x46464952) { - FLASHOUTPUT("Not a RIFF format file\n"); - return false; - } - - filesize = read32(fp); - filesize += ftell(fp); - - typeTag = read32(fp); - if (typeTag != 0x45564157) { - FLASHOUTPUT("Not a WAVE file\n"); - return false; - } - - nextseek = ftell(fp); - while (nextseek < filesize) { - fseek(fp, (TINT32)nextseek, 0); - chunkId = read32(fp); - chunkSize = read32(fp); - nextseek = chunkSize + ftell(fp); - -#ifndef __LP64__ - FLASHOUTPUT("\n----- Chunk ID %d, Size %d -----\n", chunkId, chunkSize); -#else - FLASHOUTPUT("\n----- Chunk ID %d, Size %d -----\n", chunkId, chunkSize); -#endif - - switch (chunkId) { - case 0x20746D66: //Format Chunk - { - FLASHOUTPUT("Format Chunk\n"); - FLASHOUTPUT("Common Fields:\n"); - - formatTag = read16(fp); -#ifndef __LP64__ - FLASHOUTPUT(" Format Tag %04lXh: ", (long unsigned int)formatTag); -#else - FLASHOUTPUT(" Format Tag %04Xh: ", formatTag); -#endif - switch (formatTag) { - default: - case 0x0000: - FLASHOUTPUT("WAVE_FORMAT_UNKNOWN"); - break; - case 0x0001: - FLASHOUTPUT("WAVE_FORMAT_PCM\n"); - break; - case 0x0002: - FLASHOUTPUT("WAVE_FORMAT_ADPCM\n"); - break; - case 0x0005: - FLASHOUTPUT("WAVE_FORMAT_IBM_CVSD\n"); - break; - case 0x0006: - FLASHOUTPUT("WAVE_FORMAT_ALAW\n"); - break; - case 0x0007: - FLASHOUTPUT("WAVE_FORMAT_MULAW\n"); - break; - case 0x0010: - FLASHOUTPUT("WAVE_FORMAT_OKI_ADPCM"); - break; - case 0x0011: - FLASHOUTPUT("WAVE_FORMAT_DVI_ADPCM or WAVE_FORMAT_IMA_ADPCM\n"); - break; - case 0x0015: - FLASHOUTPUT("WAVE_FORMAT_DIGISTD\n"); - break; - case 0x0016: - FLASHOUTPUT("WAVE_FORMAT_DIGIFIX\n"); - break; - case 0x0020: - FLASHOUTPUT("WAVE_FORMAT_YAMAHA_ADPCM\n"); - break; - case 0x0021: - FLASHOUTPUT("WAVE_FORMAT_SONARC\n"); - break; - case 0x0022: - FLASHOUTPUT("WAVE_FORMAT_DSPGROUP_TRUESPEECH\n"); - break; - case 0x0023: - FLASHOUTPUT("WAVE_FORMAT_ECHOSC1\n"); - break; - case 0x0024: - FLASHOUTPUT("WAVE_FORMAT_AUDIOFILE_AF18\n"); - break; - case 0x0101: - FLASHOUTPUT("IBM_FORMAT_MULAW\n"); - break; - case 0x0102: - FLASHOUTPUT("IBM_FORMAT_ALAW\n"); - break; - case 0x0103: - FLASHOUTPUT("IBM_FORMAT_ADPCM\n"); - break; - case 0x0200: - FLASHOUTPUT("WAVE_FORMAT_CREATIVE_ADPCM\n"); - break; - } - int channels = (int)read16(fp); - soundData->type = channels - 1; - FLASHOUTPUT(" %u Channels\n", channels); - - int samplesPerSec = (int)read32(fp); - FLASHOUTPUT(" %u Samples Per Second\n", samplesPerSec); - switch (samplesPerSec / 5000) { - case 1: // 5k - soundData->rate = Snd5k; - break; - case 2: // 11k - soundData->rate = Snd11k; - break; - case 4: // 22k - soundData->rate = Snd22k; - break; - case 8: // 44k - soundData->rate = Snd44k; - break; - default: - FLASHOUTPUT("Sample rate %d unsupported\n", samplesPerSec); - return false; - } - - int bytesPerSec = (int)read32(fp); - FLASHOUTPUT(" %u Average Bytes Per Second\n", bytesPerSec); - - int blockAlign = read16(fp); - FLASHOUTPUT(" Block Align %u\n", blockAlign); - - FLASHOUTPUT("Format Specific Fields:\n"); - int bits = read16(fp); - FLASHOUTPUT(" %u Bits Per Sample\n", bits); - - //store the size of the chunks of data (8v16 bit) - if (bits == 8) - soundData->size = 0; - else if (bits == 16) - soundData->size = 1; - else - FLASHASSERT(0); - - if (formatTag != 0x0001) { - int extra = read16(fp); - FLASHOUTPUT(" %d Bytes of extra information\n", extra); - FLASHOUTPUT(" NOT YET SUPPORTED\n"); - return false; - } - } break; - - case 0x61746164: //Data Chunk - { - FLASHOUTPUT("Data Chunk\n"); - if (!formatTag) { - FLASHOUTPUT("Warning Format Chunk not defined before Data Chunk\n"); - return false; - } - *wavDataSize = (int)chunkSize; - soundData->sampleCount = chunkSize / (soundData->size + 1); - *wavData = new U8[chunkSize]; - int read = fread(*wavData, 1, *wavDataSize, fp); - - if (read != (*wavDataSize)) { - FLASHOUTPUT("Warning Read %d of %d bytes\n", read, (*wavDataSize)); - return false; - } - return true; - } - - default: - FLASHOUTPUT("Unknown Chunk\n"); - return false; - } - } - return false; -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTSoundStreamBlock --------------------------------------------------- - -FDTSoundStreamBlock::FDTSoundStreamBlock(U32 _size, U8 *_data) -{ - size = _size; - data = _data; -} - -void FDTSoundStreamBlock::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - FSWFStream body; - body.WriteLargeData(data, size); - - _SWFStream->AppendTag(stagSoundStreamBlock, body.Size(), &body); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTSoundStreamHead ---------------------------------------------------- - -FDTSoundStreamHead::FDTSoundStreamHead(U8 _mixFormat, U8 _soundType, U16 _count) -{ - mixFormat = _mixFormat; - soundType = _soundType; - count = _count; -} - -void FDTSoundStreamHead::WriteToSWFStream(FSWFStream *_SWFStream) -{ - FSWFStream body; - - body.WriteByte((U32)mixFormat); - body.WriteBits(1, 4); - body.WriteBits(0, 2); - body.WriteBits(1, 1); - body.WriteBits((U32)soundType, 1); - body.WriteWord((U32)count); - _SWFStream->AppendTag(stagSoundStreamHead, body.Size(), &body); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTSoundStreamHead2 --------------------------------------------------- - -FDTSoundStreamHead2::FDTSoundStreamHead2(U8 _mixFormat, U8 _compression, U8 _size, U8 _soundType, U16 _count) -{ - mixFormat = _mixFormat; - compression = _compression; - rate = 0; - size = _size; - soundType = _soundType; - count = _count; -} - -FDTSoundStreamHead2::FDTSoundStreamHead2(U8 _mixFormat, U8 _compression, U8 _rate, U8 _size, U8 _soundType, U16 _count) -{ - mixFormat = _mixFormat; - compression = _compression; - rate = _rate; - size = _size; - soundType = _soundType; - count = _count; -} - -void FDTSoundStreamHead2::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - FSWFStream body; - - body.WriteByte((U32)mixFormat); - body.WriteBits((U32)compression, 4); - body.WriteBits((U32)rate, 2); - body.WriteBits((U32)size, 1); - body.WriteBits((U32)soundType, 1); - body.WriteWord((U32)count); - - _SWFStream->AppendTag(stagSoundStreamHead2, body.Size(), &body); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FSndEnv --------------------------------------------------------------- -FSndEnv::FSndEnv(U32 mark44, U16 level0, U16 level1) -{ - mark44 = mark44; - level0 = level0; - level1 = level1; -} - -void FSndEnv::WriteToSWFStream(FSWFStream *_SWFStream) -{ - _SWFStream->WriteDWord(mark44); - _SWFStream->WriteWord((U32)level0); - _SWFStream->WriteWord((U32)level1); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FSoundInfo ------------------------------------------------------------ -FSoundInfo::FSoundInfo(U8 _syncFlags, U8 _hasEnvelope, U8 _hasLoops, U8 _hasOutPoint, - U8 _hasInPoint, U32 _inPoint, U32 _outPoint, U16 _loopCount, - U8 _nPoints, FSndEnv *_soundEnvelope) -{ - - syncFlags = _syncFlags; - hasEnvelope = _hasEnvelope; - hasLoops = _hasLoops; - hasOutPoint = _hasOutPoint; - hasInPoint = _hasInPoint; - inPoint = _inPoint; - outPoint = _outPoint; - loopCount = _loopCount; - nPoints = _nPoints; - soundEnvelope = _soundEnvelope; -} - -FSoundInfo::~FSoundInfo() -{ - - delete soundEnvelope; -} - -void FSoundInfo::WriteToSWFStream(FSWFStream *_SWFStream) -{ - _SWFStream->WriteBits((U32)syncFlags, 4); - _SWFStream->WriteBits((U32)hasEnvelope, 1); - _SWFStream->WriteBits((U32)hasLoops, 1); - _SWFStream->WriteBits((U32)hasOutPoint, 1); - _SWFStream->WriteBits((U32)hasInPoint, 1); - if (hasInPoint) - _SWFStream->WriteDWord(inPoint); - if (hasOutPoint) - _SWFStream->WriteDWord(outPoint); - if (hasLoops) - _SWFStream->WriteWord(loopCount); - if (hasEnvelope) { - _SWFStream->WriteByte(nPoints); - soundEnvelope->WriteToSWFStream(_SWFStream); - } -} diff --git a/toonz/sources/common/flash/FDTSounds.h b/toonz/sources/common/flash/FDTSounds.h deleted file mode 100644 index 655f334..0000000 --- a/toonz/sources/common/flash/FDTSounds.h +++ /dev/null @@ -1,216 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. - -/**************************************************************************************** - - File Summary: FDTSounds.h - - This header-file contains the declarations of all low-level sound-related classes. - Their parent classes are in the parentheses: - - class FDTDefineSound; (public FDT) - class FDTDefineSoundADPCM; (public FDTDefineSound) - class FDTDefineSoundWAV; (public FDTDefineSound) - class FDTSoundStreamBlock; (public FDT) - class FDTSoundStreamHead; (public FDT) - class FDTSoundStreamHead2; (public FDT) - class FSndEnv; - class FSoundInfo; - -****************************************************************************************/ - -#ifndef _F_DEFINE_SOUNDS_H_ -#define _F_DEFINE_SOUNDS_H_ - -#include "Macromedia.h" -#include "FDT.h" - -#include - -// A flash object that defines a sound - -class FDTDefineSound : public FDT -{ -public: - // Compression Type - enum { - NO_COMPRESSION, - PCM - }; - - // Compression Level - enum { - Comp2 = 2, - Comp3, - Comp4, - Comp5 - }; - - // Sound Rate - enum { - Snd5k, - Snd11k, - Snd22k, - Snd44k - }; - - // Sound Size - enum { - Snd8Bit, - Snd16Bit - }; - - // Sound Type - enum { - Snd16Mono, - Snd16Stereo - }; - - FDTDefineSound(); - virtual ~FDTDefineSound() {} - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - - U16 ID() { return soundID; } - int NumSamples() { return (U8)soundData.sampleCount; } - int Format() { return 4 * (soundData.rate) + (soundData.size) * 2 + (soundData.type); } - int SoundType() { return soundData.type; } - -protected: - U16 soundID; - SSound soundData; - std::vector pcmData; -}; - -// A flash object that defines a sound - -class FDTDefineSoundADPCM : public FDTDefineSound -{ -public: - FDTDefineSoundADPCM(U8 rate, U8 size, U8 type, U32 sampleCount, - const U8 *data, U32 dataSize, int compression); -}; - -// A flash object that defines a sound -class FDTDefineSoundWAV : public FDTDefineSound -{ - -public: - FDTDefineSoundWAV(FILE *wavFile, int compression); - -private: - bool loadWavFile(FILE *fp, - SSound *soundData, - U8 **wavData, - int *wavDataSize); - U32 read32(FILE *fp) - { - U32 val; - fread(&val, 1, 4, fp); - return val; - } - U16 read16(FILE *fp) - { - U16 val; - fread(&val, 1, 2, fp); - return val; - } -}; - -// A Flash object that defines sound data that is interleaved with frame data -//enables sound streaming - -class FDTSoundStreamBlock : public FDT -{ - -public: - FDTSoundStreamBlock(U32 _size, U8 *_data); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U32 size; - U8 *data; -}; - -// A flash object that defines the start of sound data that will be interleaved within flash frames -// This is how sound streaming of networks is possible. -// Doesn't support compressed sound (flash 2.0) - -class FDTSoundStreamHead : public FDT -{ - -public: - FDTSoundStreamHead(U8 _mixFormat, // mixer format (?) set to 6 - U8 _soundType, // 0 mono, 1 stereo - U16 _count // number of sound samples - ); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U8 mixFormat; - U8 soundType; - U16 count; -}; - -class FDTSoundStreamHead2 : public FDT -{ - -public: - FDTSoundStreamHead2(U8 _mixFormat, U8 _compression, U8 _size, U8 _soundType, U16 _count); - FDTSoundStreamHead2(U8 _mixFormat, U8 _compression, U8 _rate, U8 _size, U8 _soundType, U16 _count); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U8 mixFormat; - U8 compression; - U8 rate; - U8 size; - U8 soundType; - U16 count; -}; - -class FSndEnv -{ - -public: - FSndEnv(U32 mark44, U16 level0, U16 level1); - void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U32 mark44; - U16 level0; - U16 level1; -}; - -// specifies how a sound character is player - -class FSoundInfo -{ - -public: - FSoundInfo(U8 _syncFlags, U8 _hasEnvelope, U8 _hasLoops, U8 _hasOutPoint, - U8 _hasInPoint, U32 _inPoint, U32 _outPoint, U16 _loopCount, - U8 _nPoints, FSndEnv *_soundEnvelope); - ~FSoundInfo(); - void WriteToSWFStream(FSWFStream *_SWFStream); - - enum { - SyncNoMultiple = 0x01, - SyncStor = 0x02 - }; - -private: - U8 syncFlags; - U8 hasEnvelope; - U8 hasLoops; - U8 hasOutPoint; - U8 hasInPoint; - U32 inPoint; - U32 outPoint; - U16 loopCount; - U8 nPoints; - FSndEnv *soundEnvelope; -}; - -#endif diff --git a/toonz/sources/common/flash/FDTSprite.cpp b/toonz/sources/common/flash/FDTSprite.cpp deleted file mode 100644 index 88db2b8..0000000 --- a/toonz/sources/common/flash/FDTSprite.cpp +++ /dev/null @@ -1,74 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. - -/**************************************************************************************** - - File Summary: FDTSprite.cpp - - This source file contains the definition for all low-level sprite-related functions, - grouped by classes: - - Class Member Function - - FDTSprite FDTSprite(); - ~FDTSprite(); - void AddFObj(FObj* ); - void WriteToSWFStream(FSWFStream* ); - - -****************************************************************************************/ -#ifdef WIN32 -#pragma warning(disable : 4786) -#endif -#include "FSWFStream.h" -#include "FDTSprite.h" - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTSprite ------------------------------------------------------------- - -FDTSprite::FDTSprite() -{ - characterID = FObjCollection::Increment(); - numOfFrames = 0; -} - -FDTSprite::~FDTSprite() -{ - while (!objectList.empty()) { - - delete objectList.front(); - objectList.pop_front(); - } -} - -void FDTSprite::AddFObj(FObj *_object) -{ - if (_object->IsShowFrame()) - numOfFrames++; - - objectList.push_back(_object); -} - -void FDTSprite::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - FSWFStream body; - - body.WriteWord((U32)characterID); - - body.WriteWord(numOfFrames); - - std::list::iterator cursor; - for (cursor = objectList.begin(); cursor != objectList.end(); cursor++) { - - (*cursor)->WriteToSWFStream(&body); - } - - // Put an end tag on the end of the temporary buffer: - body.AppendTag(stagEnd, 0, 0); - - // put the buffer into the main stream - _SWFStream->AppendTag(stagDefineSprite, body.Size(), &body); -} diff --git a/toonz/sources/common/flash/FDTSprite.h b/toonz/sources/common/flash/FDTSprite.h deleted file mode 100644 index 6b7b5b4..0000000 --- a/toonz/sources/common/flash/FDTSprite.h +++ /dev/null @@ -1,54 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. - -/**************************************************************************************** - - File Summary: FDTSprite.h - - This header-file contains the declarations of low-level sprite-related class. - Its parent class is in the parentheses: - - class FDTSprite; (public FDT) - -****************************************************************************************/ - -#ifndef _SPRITE_H_ -#define _SPRITE_H_ - -#include -#include "Macromedia.h" -#include "FDT.h" - -//! Defines a low-level sprite object. -/*! A sprite is a flash object that acts as a "movie within a movie". - \sa FDT -*/ -class FDTSprite : public FDT -{ -public: - //! Construct a low-level sprite object. - /*! */ - FDTSprite(); - - //! Destruct a low-level sprite object. - /*! */ - virtual ~FDTSprite(); - - // Method for internal use. - void AddFObj(FObj *_object); - - // Method for internal use. - U16 ID() { return characterID; } - - // Method for internal use. - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U16 characterID; - std::list objectList; - U32 numOfFrames; -}; - -#endif diff --git a/toonz/sources/common/flash/FDTText.cpp b/toonz/sources/common/flash/FDTText.cpp deleted file mode 100644 index c404b46..0000000 --- a/toonz/sources/common/flash/FDTText.cpp +++ /dev/null @@ -1,448 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. - -/**************************************************************************************** - - File Summary: FDTText.cpp - - This source file contains the definition for all low-level text-related functions, - grouped by classes: - - Class Member Function - - FDTDefineEditText FDTDefineEditText(FRect*, U8, U8, U8, U8, U8, U8, U8, U8, - U8, U8, U8, U8, U16, U16, FColor*, U16, U8, U16, U16, - U16, U16, FString*, FString*); - ~FDTDefineEditText(); - void WriteToSWFStream(FSWFStream*); - - FDTDefineText FDTDefineText(FRect*, FMatrix*, int); - ~FDTDefineText(); - void AddTextRecord(FTextRecord*); - U16 ID(); - void WriteToSWFStream( FSWFStream*); - - FDTDefineText2 FDTDefineText2(FRect*, FMatrix*, int); - ~FDTDefineText2(); - void AddTextRecord(FTextRecord*); - U16 ID(); - void WriteToSWFStream(FSWFStream*); - - FTextChangeRecord FTextChangeRecord(U16, U16, U16, U16, U16, U16, FColor*, - S16, S16); - ~FTextChangeRecord() - -// FTextChangeRecord void IncludeNBitInfo(U16, U16); - void WriteToSWFStream(FSWFStream* , int, int); - - FTextGlyphRecord FTextGlyphRecord(); - ~FTextGlyphRecord(); - void AddGlyphEntry(U16, U16); - U32 MinAdvanceBits(); - U32 MinCodeBits(); - void WriteToSWFStream(FSWFStream*, int, int); - - -****************************************************************************************/ - -#include "FDTText.h" -#include "FDTFonts.h" - -// Constructor. - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTDefineEditText ----------------------------------------------------- - -FDTDefineEditText::FDTDefineEditText(FRect *_bounds, U8 _hasFont, U8 _hasMaxLength, U8 _hasTextColor, - U8 _readOnly, U8 _password, U8 _multiline, U8 _wordWrap, U8 _hasText, - U8 _useOutlines, U8 _border, U8 _noSelect, U8 _hasLayout, U16 _fontID, - U16 _fontHeight, FColor *_textColor, U16 _maxLength, U8 _alignment, - U16 _leftMargin, U16 _rightMargin, U16 _indent, U16 _leading, - FString *_variableName, FString *_initialText) : textColor(_textColor) -{ - - bounds = _bounds; - hasFont = _hasFont; - hasMaxLength = _hasMaxLength; - hasTextColor = _hasTextColor; - readOnly = _readOnly; - password = _password; - multiline = _multiline; - wordWrap = _wordWrap; - hasText = _hasText; - useOutlines = _useOutlines; - border = _border; - noSelect = _noSelect; - hasLayout = _hasLayout; - fontID = _fontID; - fontHeight = _fontHeight; - textColor = _textColor; - maxLength = _maxLength; - alignment = _alignment; - leftMargin = _leftMargin; - rightMargin = _rightMargin; - indent = _indent; - leading = _leading; - variableName = _variableName; - initialText = _initialText; - - characterID = FObjCollection::Increment(); -} - -// deletes the FRECT and 2 FString's if they exist. - -FDTDefineEditText::~FDTDefineEditText(void) -{ - - delete bounds; - delete variableName; - delete initialText; - delete textColor; -} - -// Writes to the given FSWFStream. - -void FDTDefineEditText::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - FSWFStream tempBuffer; - - tempBuffer.WriteWord((U32)characterID); - //character ID - - //write the bounds, it's an object that knows how to write itself - bounds->WriteToSWFStream(&tempBuffer); - - //write all flags - - tempBuffer.WriteBits(hasText, 1); - tempBuffer.WriteBits(wordWrap, 1); - tempBuffer.WriteBits(multiline, 1); - tempBuffer.WriteBits(password, 1); - tempBuffer.WriteBits(readOnly, 1); - tempBuffer.WriteBits(hasTextColor, 1); - tempBuffer.WriteBits(hasMaxLength, 1); - tempBuffer.WriteBits(hasFont, 1); - - tempBuffer.WriteBits(0, 2); //unknown flags - tempBuffer.WriteBits(hasLayout, 1); - tempBuffer.WriteBits(noSelect, 1); - tempBuffer.WriteBits(border, 1); - tempBuffer.WriteBits(0, 2); //unknown flags - tempBuffer.WriteBits(useOutlines, 1); - - //tempBuffer.WriteBits(hasFont, 1); - //tempBuffer.WriteBits(hasMaxLength, 1); - //tempBuffer.WriteBits(hasTextColor, 1); - //tempBuffer.WriteBits(readOnly, 1); - //tempBuffer.WriteBits(password, 1); - //tempBuffer.WriteBits(multiline, 1); - //tempBuffer.WriteBits(wordWrap, 1); - //tempBuffer.WriteBits(hasText, 1); - //tempBuffer.WriteBits(useOutlines, 1); - //tempBuffer.WriteBits(border, 1); - //tempBuffer.WriteBits(noSelect, 1); - //tempBuffer.WriteBits(hasLayout, 1); - //tempBuffer.WriteBits(0, 4); //check on this, 3 in docs but 4 gives 16 bits - - if (hasFont) { - tempBuffer.WriteWord((U32)fontID); - tempBuffer.WriteWord((U32)fontHeight); - } - - if (hasTextColor) { // here changed. - textColor->AlphaChannel(true); - textColor->WriteToSWFStream(&tempBuffer); - } - - if (hasMaxLength) { - tempBuffer.WriteWord((U32)maxLength); - } - - if (hasLayout) { - tempBuffer.WriteByte(alignment); - tempBuffer.WriteWord(leftMargin); - tempBuffer.WriteWord(rightMargin); - tempBuffer.WriteWord(indent); - tempBuffer.WriteWord(leading); - } - - variableName->WriteToSWFStream(&tempBuffer, true); - - if (hasText) { - initialText->WriteToSWFStream(&tempBuffer, true); - } - - _SWFStream->AppendTag(stagDefineEditText, tempBuffer.Size(), &tempBuffer); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTDefineText --------------------------------------------------------- - -FDTDefineText::FDTDefineText(FRect *_textBounds, FMatrix *_textMatrix, int glyhpsInFont) -{ - - characterID = FObjCollection::Increment(); - textBounds = _textBounds; - textMatrix = _textMatrix; - nIndexBits = (U8)FSWFStream::MinBits(glyhpsInFont, 0); -} - -FDTDefineText::~FDTDefineText() -{ - - delete textBounds; - - delete textMatrix; - - while (!textRecords.empty()) { - - delete textRecords.front(); - - textRecords.pop_front(); - } -} - -void FDTDefineText::AddTextRecord(FTextRecord *_textRec) -{ - - textRecords.push_back(_textRec); -} - -U16 FDTDefineText::ID(void) -{ - - return (U16)characterID; -} - -void FDTDefineText::WriteToSWFStream(FSWFStream *_SWFStream) -{ - U16 nAdvanceBits = 0; - U16 nCodeBits = 0; - FSWFStream body; - - body.WriteWord((U32)characterID); - - textBounds->WriteToSWFStream(&body); - textMatrix->WriteToSWFStream(&body); - - // Get the bits needed to write the advance and character codes - std::list::iterator cursor1; - for (cursor1 = textRecords.begin(); cursor1 != textRecords.end(); cursor1++) { - nAdvanceBits = (U16)std::max((*cursor1)->MinAdvanceBits(), (U32)nAdvanceBits); - nCodeBits = (U16)std::max((*cursor1)->MinCodeBits(), (U32)nCodeBits); - } - body.WriteByte((U32)nCodeBits); - body.WriteByte((U32)nAdvanceBits); - - std::list::iterator cursor; - for (cursor = textRecords.begin(); cursor != textRecords.end(); cursor++) { - (*cursor)->WriteToSWFStream(&body, nCodeBits, nAdvanceBits); - } - - body.FlushBits(); - body.WriteByte((U32)0); - - _SWFStream->AppendTag(stagDefineText, body.Size(), &body); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FDTDefineText2 -------------------------------------------------------- - -FDTDefineText2::FDTDefineText2(FRect *_textBounds, FMatrix *_textMatrix, int glyhpsInFont) -{ - characterID = FObjCollection::Increment(); - textBounds = _textBounds; - textMatrix = _textMatrix; - nIndexBits = (int)FSWFStream::MinBits(glyhpsInFont, 0); -} - -FDTDefineText2::~FDTDefineText2() -{ - - delete textBounds; - - delete textMatrix; - - while (!textRecords.empty()) { - - delete textRecords.front(); - - textRecords.pop_front(); - } -} - -void FDTDefineText2::AddTextRecord(FTextRecord *_textRec) -{ - - textRecords.push_back(_textRec); -} - -U16 FDTDefineText2::ID(void) -{ - - return (U16)characterID; -} - -void FDTDefineText2::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - U16 nAdvanceBits = 0; - U16 nCodeBits = 0; - FSWFStream body; - - body.WriteWord((U32)characterID); - - textBounds->WriteToSWFStream(&body); - - textMatrix->WriteToSWFStream(&body); - - // Get the bits needed to write the advance and character codes - std::list::iterator cursor1; - for (cursor1 = textRecords.begin(); cursor1 != textRecords.end(); cursor1++) { - nAdvanceBits = (U16)std::max((*cursor1)->MinAdvanceBits(), (U32)nAdvanceBits); - nCodeBits = (U16)std::max((*cursor1)->MinCodeBits(), (U32)nCodeBits); - } - - body.WriteByte((U32)nCodeBits); - body.WriteByte((U32)nAdvanceBits); - - std::list::iterator cursor; - for (cursor = textRecords.begin(); cursor != textRecords.end(); cursor++) { - (*cursor)->WriteToSWFStream(&body, nCodeBits, nAdvanceBits); - } - - body.FlushBits(); - - body.WriteByte((U32)0); - - _SWFStream->AppendTag(stagDefineText2, body.Size(), &body); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FTextChangeRecord ----------------------------------------------------- - -FTextChangeRecord::FTextChangeRecord(U16 _hasFontFlag, U16 _hasColorFlag, - U16 _hasXOffsetFlag, U16 _hasYOffsetFlag, - U16 _fontID, U16 _fontHeight, FColor *_fontColor, - S16 _xOffset, S16 _yOffset) -{ - hasFontFlag = _hasFontFlag; - hasColorFlag = _hasColorFlag; - hasXOffsetFlag = _hasXOffsetFlag; - hasYOffsetFlag = _hasYOffsetFlag; - fontID = _fontID; - fontColor = _fontColor; - xOffset = _xOffset; - yOffset = _yOffset; - fontHeight = _fontHeight; -} - -FTextChangeRecord::~FTextChangeRecord() -{ - delete fontColor; -} - -// void FTextChangeRecord::IncludeNBitInfo(U16 _nIndexBits, U16 _nAdvanceBits){ -// Does absolutely nothing -// TextGlyphRecord needs this method -// Had to be virtual so it could be called on any TextRecord -// } - -void FTextChangeRecord::WriteToSWFStream(FSWFStream *_SWFStream, int /*codeBits*/, int /*advanceBits */) -{ - - _SWFStream->WriteBits((U32)1, 1); - - // _SWFStream->WriteBits((U32) reserved, 3); - _SWFStream->WriteBits((U32)0, 3); - - _SWFStream->WriteBits((U32)hasFontFlag, 1); - _SWFStream->WriteBits((U32)hasColorFlag, 1); - _SWFStream->WriteBits((U32)hasYOffsetFlag, 1); - _SWFStream->WriteBits((U32)hasXOffsetFlag, 1); - - if (hasFontFlag) - _SWFStream->WriteWord((U32)fontID); - - if (hasColorFlag) { // here changed. - fontColor->AlphaChannel(true); - fontColor->WriteToSWFStream(_SWFStream); - } - - if (hasXOffsetFlag) - _SWFStream->WriteWord((U32)xOffset); - - if (hasYOffsetFlag) - _SWFStream->WriteWord((U32)yOffset); - - if (hasFontFlag) - _SWFStream->WriteWord((U32)fontHeight); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FTextGlyphRecord ------------------------------------------------------ - -FTextGlyphRecord::FTextGlyphRecord() -{ -} - -FTextGlyphRecord::~FTextGlyphRecord() -{ - while (!glyphEntries.empty()) { - glyphEntries.pop_front(); - } -} - -void FTextGlyphRecord::AddGlyphEntry(U16 code, U16 advance) -{ - GlyphEntry glyph = {code, advance}; - - glyphEntries.push_back(glyph); -} - -U32 FTextGlyphRecord::MinAdvanceBits() -{ - std::list::iterator it; - - int maxBit = 0; - for (it = glyphEntries.begin(); it != glyphEntries.end(); ++it) { - maxBit = (int)std::max(FSWFStream::MinBits(it->advance, 1), (U32)maxBit); - } - return maxBit; -} - -U32 FTextGlyphRecord::MinCodeBits() -{ - // return FSWFStream::MinBits( glyphEntries.size(), 0 ); - std::list::iterator it; - - int maxBit = 0; - for (it = glyphEntries.begin(); it != glyphEntries.end(); ++it) { - int code = it->code; - maxBit = (int)std::max(FSWFStream::MinBits(code, 1), (U32)maxBit); - } - return maxBit; -} - -void FTextGlyphRecord::WriteToSWFStream(FSWFStream *_SWFStream, int codeBits, int advanceBits) -{ - FLASHASSERT((int)MinAdvanceBits() <= advanceBits); - FLASHASSERT((int)MinCodeBits() <= codeBits); - - // Bug: The number of glyphs used to limit the the max code size, but this changes with - // DefineFont2, where we could use glyph 38 as our sole glyph. So the re-write begins.... - int numberOfGlyphs = glyphEntries.size(); - - _SWFStream->WriteBits((U32)0, 1); - _SWFStream->WriteBits((U32)numberOfGlyphs, 7); - - std::list::iterator cursor; - - for (cursor = glyphEntries.begin(); cursor != glyphEntries.end(); cursor++) { - _SWFStream->WriteBits((U32)cursor->code, codeBits); - _SWFStream->WriteBits((U32)cursor->advance, advanceBits); - } -} diff --git a/toonz/sources/common/flash/FDTText.h b/toonz/sources/common/flash/FDTText.h deleted file mode 100644 index b9a7263..0000000 --- a/toonz/sources/common/flash/FDTText.h +++ /dev/null @@ -1,202 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. - -/**************************************************************************************** - - File Summary: FDTText.h - - This header-file contains the declarations of low-level text-related classes. - All parent classes are in the parentheses: - - class FTextRecord; - class FDTDefineEditText; (public FDT) - class FDTDefineText; (public FDT) - class FDTDefineText2; (public FDT) - class FTextChangeRecord; (public FTextRecord) - class FTextGlyphRecord; (public FTextRecord) - -****************************************************************************************/ - -#ifndef _F_DEFINE_TEXT_H_ -#define _F_DEFINE_TEXT_H_ - -#ifdef WIN32 // added from DV -#pragma warning(push) -#pragma warning(disable : 4786) -#pragma warning(disable : 4251) - -#endif - -#include "tcommon.h" -#include "Macromedia.h" -#include "FDT.h" -#include "FSWFStream.h" -#include "FPrimitive.h" - -#undef DVAPI -#undef DVVAR -#ifdef TFLASH_EXPORTS -#define DVAPI DV_EXPORT_API -#define DVVAR DV_EXPORT_VAR -#else -#define DVAPI DV_IMPORT_API -#define DVVAR DV_IMPORT_VAR -#endif - -class FGlyphEntry; - -class DVAPI FTextRecord -{ -public: - virtual U32 MinAdvanceBits() = 0; // the computed minimum # of bits to record the advance values - virtual U32 MinCodeBits() = 0; // the computed minimum # of bits to record the character code values - virtual ~FTextRecord() {} - - // Because of multiple text records, the DefineText will specify the code and advance bits - // when it writes. - virtual void WriteToSWFStream(FSWFStream *_SWFStream, int codeBits, int advanceBits) = 0; -}; - -// A flash object that defines a font's appearance - -class DVAPI FDTDefineEditText : public FDT -{ - -public: - FDTDefineEditText(FRect *_bounds, U8 _hasFont, U8 _hasMaxLength, U8 _hasTextColor, - U8 _readOnly, U8 _password, U8 _multiline, U8 _wordWrap, U8 _hasText, - U8 _useOutlines, U8 _border, U8 _noSelect, U8 _hasLayout, U16 _fontID, - U16 _fontHeight, FColor *_textColor, U16 _maxLength, U8 _alignment, - U16 _leftMargin, U16 _rightMargin, U16 _indent, U16 _leading, - FString *_variableName, FString *_initialText); - virtual ~FDTDefineEditText(void); - U16 ID(void) { return characterID; } - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - FRect *bounds; - U8 hasFont; - U8 hasMaxLength; - U8 hasTextColor; - U8 readOnly; - U8 password; - U8 multiline; - U8 wordWrap; - U8 hasText; - U8 useOutlines; - U8 border; - U8 noSelect; - U8 hasLayout; - U16 fontID; - U16 fontHeight; - FColor *textColor; - U16 maxLength; - U8 alignment; - U16 leftMargin; - U16 rightMargin; - U16 indent; - U16 leading; - FString *variableName; - FString *initialText; - U16 characterID; -}; - -// A flash object that defines the font and formating of text characters in the record (flash 1.0) -// takes only RGB color values - -class DVAPI FDTDefineText : public FDT -{ - -public: - FDTDefineText(FRect *_textBounds, - FMatrix *_textMatrix, - int glyhpsInFont); // glyhpsInFont: how many characters are in the font? - virtual ~FDTDefineText(); - void AddTextRecord(FTextRecord *_textRec); - U16 ID(void); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U32 characterID; - FRect *textBounds; - FMatrix *textMatrix; - std::list textRecords; - U16 nIndexBits; -}; - -// A flash object that defines the font and formating of text characters in the record (flash 1.0) -// takes RGBA color values - -class DVAPI FDTDefineText2 : public FDT -{ - -public: - FDTDefineText2(FRect *_textBounds, FMatrix *_textMatrix, - int glyhpsInFont); - virtual ~FDTDefineText2(); - void AddTextRecord(FTextRecord *_textRec); - U16 ID(void); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U32 characterID; - FRect *textBounds; - FMatrix *textMatrix; - std::list textRecords; - U16 nIndexBits; -}; - -// specifies text format changes in a flash DefineText object - -class DVAPI FTextChangeRecord : public FTextRecord -{ - -public: - FTextChangeRecord(U16 _hasFontFlag, U16 _hasColorFlag, - U16 _hasXOffsetFlag, U16 _hasYOffsetFlag, - U16 _fontID, U16 _fontHeight, FColor *_fontColor, - S16 _xOffset, S16 _yOffset); - virtual ~FTextChangeRecord(); - - virtual U32 MinAdvanceBits() { return 0; } - virtual U32 MinCodeBits() { return 0; } - - virtual void WriteToSWFStream(FSWFStream *_SWFStream, int advanceBits, int codeBits); - -private: - U16 reserved; - U16 hasFontFlag; - U16 hasColorFlag; - U16 hasYOffsetFlag; - U16 hasXOffsetFlag; - U16 fontID; - FColor *fontColor; - S16 xOffset; - S16 yOffset; - U16 fontHeight; -}; - -class DVAPI FTextGlyphRecord : public FTextRecord -{ - -public: - FTextGlyphRecord(); - virtual ~FTextGlyphRecord(); - - void AddGlyphEntry(U16 code, U16 advance); - virtual void WriteToSWFStream(FSWFStream *_SWFStream, int advanceBits, int codeBits); - - virtual U32 MinAdvanceBits(); // number of bits needed to write the advance data - virtual U32 MinCodeBits(); // number of bits needed to write the character code data - -private: - struct GlyphEntry { - U16 code; - U16 advance; - }; - std::list glyphEntries; -}; - -#endif diff --git a/toonz/sources/common/flash/FFixed.h b/toonz/sources/common/flash/FFixed.h deleted file mode 100644 index b95489b..0000000 --- a/toonz/sources/common/flash/FFixed.h +++ /dev/null @@ -1,56 +0,0 @@ -#ifndef FIXED_INCLUDED -#define FIXED_INCLUDED - -#define fixed_1 0x00010000L - -// fixed 2.0 -#define fixed2 0x00020000L -// fixed 0.5 -#define fixedHalf 0x00008000L -#define infinity 0x7FFFFFFFL -#define negInfinity 0x80000000L -#define fixedStdErr 0x0000003FL -// fixed sqrt(2) -#define fixedSqrt2 0x00016A0AL - -#define FixedRound(a) ((S16)((SFIXED)(a) + 0x8000L >> 16)) -#define FixedTrunc(a) ((S16)((SFIXED)(a) >> 16)) - -#define FixedCeiling(a) ((S16)(((SFIXED)(a) + 0x8000L) >> 16)) -#define FixedFloor(a) ((S16)((SFIXED)(a) >> 16)) - -#define FixedToInt(a) ((S16)((SFIXED)(a) + 0x8000L >> 16)) -#define IntToFixed(a) ((SFIXED)(a) << 16) -// Fixed integer constant -#define FC(a) IntToFixed(a) - -#define FixedToFloat(a) ((float)(a) / fixed_1) -#define FloatToFixed(a) ((SFIXED)((float)(a)*fixed_1)) - -#define FixedToDouble(a) ((double)(a) / fixed_1) -#define DoubleToFixed(a) ((SFIXED)((double)(a)*fixed_1)) - -#define FixedAverage(a, b) (((a) + (b)) >> 1) - -#define FixedAbs(x) ((x) < 0 ? -(x) : (x)) -#define FixedMin(a, b) ((a) < (b) ? (a) : (b)) -#define FixedMax(a, b) ((a) > (b) ? (a) : (b)) -#define FixedEqual(a, b, err) (FixedAbs((a) - (b)) <= err) - -SFIXED FixedNearestMultiple(SFIXED x, SFIXED factor); - -// Note that all angles are handled in Fixed point degrees to simplify rounding issues -// they are kept in the range of 0 to 360 degrees - -// Generic Floating point routines for quick porting not fast enough for shipping code -SFIXED FixedMul(SFIXED, SFIXED); -SFIXED FixedDiv(SFIXED, SFIXED); -SFIXED FixedSin(SFIXED); -SFIXED FixedCos(SFIXED); -SFIXED FixedTan(SFIXED); -SFIXED FixedAtan2(SFIXED dy, SFIXED dx); - -int _FPMul(int a, int b, int shift); -int _FPDiv(int a, int b, int rshift); - -#endif diff --git a/toonz/sources/common/flash/FObj.cpp b/toonz/sources/common/flash/FObj.cpp deleted file mode 100644 index a099a5e..0000000 --- a/toonz/sources/common/flash/FObj.cpp +++ /dev/null @@ -1,246 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. - -/**************************************************************************************** - - File Summary: FObj.cpp - - This source file contains the definition for all low-level FObj-related functions, - grouped by classes: - - Class Member Function - - FObj U32 IsShowFrame(); - - FObjCollection FObjCollection(); - ~FObjCollection(); - void AddFObj(FObj*); - void WriteToSWFStream(FSWFStream*); - void CreateMovie(char*, SCOORD, SCOORD, U32); - void WriteFileHeader(U32, SCOORD, SCOORD, U32, FILE*); - void WriteEndTag(FSWFStream*); - U16 Increment(); - - FFragment FFragment(void*, int); - void WriteToSWFStream(FSWFStream*); - -****************************************************************************************/ - -#ifdef WIN32 -#pragma warning(disable : 4786) -#endif - -#include "FPrimitive.h" -#include "FObj.h" -#include "FSWFStream.h" - -//#include "tfilepath_io.h" - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FObj ------------------------------------------------------------------ - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FObjCollection -------------------------------------------------------- - -// When constructor is called, the empty FObjList is automatically created. -FObjCollection::FObjCollection(void) -{ - - numOfFrames = 0; -} - -// Removes and deletes every element in the list. - -FObjCollection::~FObjCollection(void) -{ - - while (!FObjList.empty()) { - - delete FObjList.front(); - FObjList.pop_front(); - } -} - -// The given FObj is added to the end of FObjList - -void FObjCollection::AddFObj(FObj *fobj) -{ - - if (fobj->IsShowFrame()) //increment numFrames then store the tag - numOfFrames++; - - FObjList.push_back(fobj); -} - -void FObjCollection::EraseFObj(int tagindex) -{ - - std::list::iterator it = FObjList.begin(); - std::advance(it, tagindex); - FObjList.erase(it); -} - -void FObjCollection::InsertFObj(int beforeTag, FObj *fobj) -{ - - if (fobj->IsShowFrame()) //increment numFrames then store the tag - numOfFrames++; - - std::list::iterator it = FObjList.begin(); - std::advance(it, beforeTag); - FObjList.insert(it, fobj); -} - -int FObjCollection::GetFObjCount() const -{ - return FObjList.size(); -} - -FObj *FObjCollection::GetFObj(int i) const -{ - if (i >= (int)FObjList.size()) - return 0; - std::list::const_iterator it = FObjList.begin(); - std::advance(it, i); - - return *it; -} - -// Uses a cursor to loop through the entire list and write all of the -// list's FObjs to the given SWFStream - -void FObjCollection::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - std::list::iterator cursor; - - for (cursor = FObjList.begin(); cursor != FObjList.end(); cursor++) { - - (*cursor)->WriteToSWFStream(_SWFStream); - } -} - -void FObjCollection::CreateMovie(FILE *fp, FRect cameraBox, U32 _frameRate, U8 _version) -{ - //FILE* fp = fopen( fileName, "wb" ); - if (fp) { - FSWFStream stream; - - CreateMovie(&stream, cameraBox, _frameRate, _version); - stream.WriteToFile(fp); - } -} - -void FObjCollection::CreateCompressedMovie(FILE *fp, FRect cameraBox, U32 _frameRate) -{ - //FILE* fp = fopen( fileName, "wb" ); - if (fp) { - FSWFStream stream; - - CreateMovie(&stream, cameraBox, _frameRate); - stream.WriteToFileVersion6(fp); - } -} - -// creates a Flash Movie -void FObjCollection::CreateMovie(FSWFStream *swfStream, FRect cameraBox, U32 _frameRate, U8 _version) -{ - // Carve out space for the header -- always 21 bytes - for (int i = 0; i < HEADER_SIZE; i++) - swfStream->WriteByte(0); - - // This FObjCollection is dumped into swfFileBody - WriteToSWFStream(swfStream); - - //swfFileBody Terminated with a FCTEnd tag - WriteEndTag(swfStream); - - // write file header into file - WriteFileHeader(swfStream->Memory(), swfStream->Size(), cameraBox, _frameRate, _version); - - characterID = 0; -} - -// creates a Flash Movie -void FObjCollection::CreateSprite(FSWFStream *swfStream, FRect cameraBox, U32 /*_frameRate*/) -{ - // Sprites do not have headers. - - // This FObjCollection is dumped into swfFileBody - WriteToSWFStream(swfStream); - - //swfFileBody Terminated with a FCTEnd tag - WriteEndTag(swfStream); - - characterID = 0; -} - -// This works differently than the other calls, because it hacks the header information back -// into the beginning of an existing SWF stream. -void FObjCollection::WriteFileHeader(U8 *target, - U32 _fileLengthNoHeader, - FRect cameraBox, - U32 _frameRate, - U8 _version) -{ - FSWFStream header; - - header.WriteByte('F'); - header.WriteByte('W'); - header.WriteByte('S'); - header.WriteByte(_version); - - header.WriteDWord(_fileLengthNoHeader); - - // Write the movie dimensions "by hand" so they will have the correct bit size to fill the 21 bytes header - int nBits = 16; - header.WriteBits(nBits, 5); - - header.WriteBits((U32)cameraBox.Xmin(), nBits); - header.WriteBits((U32)cameraBox.Xmax(), nBits); - header.WriteBits((U32)cameraBox.Ymin(), nBits); - header.WriteBits((U32)cameraBox.Ymax(), nBits); - - header.FlushBits(); - - // The frame rate is 8.8 - we currently support 8.0 - header.WriteByte(0); - header.WriteByte(_frameRate); - - header.WriteWord(numOfFrames); - - // Copy this buffer to the target - memcpy(target, header.Memory(), HEADER_SIZE); -} - -void FObjCollection::WriteEndTag(FSWFStream *_SWFStream) -{ - - _SWFStream->AppendTag(stagEnd, 0, 0); -} - -// stores the number of flash objects created -U16 FObjCollection::characterID = 0; - -// increments the number of flash objects created -U16 FObjCollection::Increment(void) -{ - assert(characterID != 0xffff); - return ++characterID; -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FFragment ------------------------------------------------------------- - -FFragment::FFragment(const void *_data, int _size) -{ - data = _data; - size = _size; -} - -void FFragment::WriteToSWFStream(FSWFStream *_SWFStream) -{ - _SWFStream->WriteLargeData((U8 *)data, size); -} diff --git a/toonz/sources/common/flash/FObj.h b/toonz/sources/common/flash/FObj.h deleted file mode 100644 index 0baa804..0000000 --- a/toonz/sources/common/flash/FObj.h +++ /dev/null @@ -1,120 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. -// Last Modified On 18/06/2002 by DV for Fixes. -/**************************************************************************************** - - File Summary: FObj.h - - This header-file contains the declarations of low-level FObj-related classes. - All parent classes are in the parentheses: - - class FObj; - class FFragment; (public FObj) - class FObjCollection; - -****************************************************************************************/ - -#ifndef _FOBJ_H_ -#define _FOBJ_H_ - -#include "tcommon.h" -#include -#include - -#ifdef WIN32 // added from DV -#pragma warning(push) -#pragma warning(disable : 4786) -#pragma warning(disable : 4251) - -#endif - -#include "Macromedia.h" -#include "FPrimitive.h" - -#undef DVAPI -#undef DVVAR -#ifdef TFLASH_EXPORTS -#define DVAPI DV_EXPORT_API -#define DVVAR DV_EXPORT_VAR -#else -#define DVAPI DV_IMPORT_API -#define DVVAR DV_IMPORT_VAR -#endif - -//All Flash tagged data block objects fall into this category - -class DVAPI FObj -{ -public: - virtual ~FObj() {} // Doesn't do anything, just makes all the other destructors virtual - - virtual void WriteToSWFStream(FSWFStream *_SWFStream) = 0; - virtual U32 IsShowFrame() { return false; } - virtual U32 IsPlaceObject() { return false; } - virtual bool IsDefineShape() { return false; } - virtual bool IsSprite() { return false; } - - virtual void SetId(U16 id) { FLASHASSERT(0); } - virtual void SetMatrix(FMatrix *matrix) { FLASHASSERT(0); } -}; - -/*! A class for writing an arbitrary block of data (a SWF fragment, perhaps) to - * the SWFStream. The data is assumed to be large, so it is not changed. - */ -class FFragment : public FObj -{ -public: - FFragment(const void *data, int size); - virtual void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - const void *data; - int size; -}; - -// Holds a collection of FObj's so that they can be dumped in a SWF format -//Writes tags in the same order as they appear in the collection - -//using namespace std; - -class DVAPI FObjCollection -{ - -public: - FObjCollection(void); - ~FObjCollection(void); - void AddFObj(FObj *fobj); - void InsertFObj(int beforeTag, FObj *fobj); - void EraseFObj(int tagindex); - - void WriteToSWFStream(FSWFStream *_SWFStream); - //void CreateCompressedMovie( const TFilePath &_fileName, FRect cameraBox, U32 _frameRate = 12 ); - //void CreateMovie( const TFilePath &_fileName, FRect cameraBox, U32 _frameRate = 12, U8 _version = 6); - void CreateCompressedMovie(FILE *fp, FRect cameraBox, U32 _frameRate = 12); - void CreateMovie(FILE *fp, FRect cameraBox, U32 _frameRate = 12, U8 _version = 6); - void CreateMovie(FSWFStream *stream, FRect cameraBox, U32 _frameRate = 12, U8 _version = 6); - void CreateSprite(FSWFStream *stream, FRect cameraBox, U32 _frameRate = 12); - static U16 Increment(void); - int GetFObjCount() const; - FObj *GetFObj(int i) const; - -private: - enum { - HEADER_SIZE = 21 - }; - - U32 numOfFrames; - std::list FObjList; - void WriteFileHeader(U8 *target, U32 _fileLengthNoHeader, FRect cameraBox, - U32 _frameRate, U8 _version); - void WriteEndTag(FSWFStream *_SWFStream); - static U16 characterID; -}; - -#ifdef WIN32 // added from DV -#pragma warning(pop) -#endif - -#endif diff --git a/toonz/sources/common/flash/FPrimitive.cpp b/toonz/sources/common/flash/FPrimitive.cpp deleted file mode 100644 index f6505af..0000000 --- a/toonz/sources/common/flash/FPrimitive.cpp +++ /dev/null @@ -1,268 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. - -/**************************************************************************************** - - File Summary: FPrimitive.cpp - - This source file contains the definition for all low-level primitive-related functions, - grouped by classes: - - Class Member Function - - FColor FColor(U32, U32, U32); - FColor(U32, U32, U32, U32); - FColor(FRGB); - FColor(FRGBA); - void WriteToSWFStream(FSWFStream*, int); - - FMatrix FMatrix(U32, SFIXED, SFIXED, - U32, SFIXED, SFIXED, - SCOORD , SCOORD); - Matrix(); - U32 MinBits(S32, S32); - void WriteToSWFStream(FSWFStream*); - - FRect FRect(SCOORD, SCOORD, SCOORD, SCOORD); - TUINT32 MinBits(); - void WriteToSWFStream(FSWFStream *); - - FString FString(const U8*); - void WriteToSWFStream(FSWFStream*, bool); - -****************************************************************************************/ - -#include "FPrimitive.h" -#include "FSWFStream.h" - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FColor ---------------------------------------------------------------- - -FColor::FColor(U32 _red, U32 _green, U32 _blue) - : red(_red), - green(_green), - blue(_blue), - alpha(0xff), - alphaT(false) -{ -} - -FColor::FColor(U32 _red, U32 _green, U32 _blue, U32 _alpha) - : red(_red), - green(_green), - blue(_blue), - alpha(_alpha), - alphaT(true) -{ -} - -FColor::FColor(FRGB rgb) - : red(rgb.red), - green(rgb.green), - blue(rgb.blue), - alpha(0xff), - alphaT(false) -{ -} - -FColor::FColor(FRGBA rgba) - : red(rgba.red), - green(rgba.green), - blue(rgba.blue), - alpha(rgba.alpha), - alphaT(true) -{ -} - -void FColor::WriteToSWFStream(FSWFStream *_SWFStream) -{ - //no filling, everything should already be byte aligned - _SWFStream->WriteByte(red); - _SWFStream->WriteByte(green); - _SWFStream->WriteByte(blue); - if (alphaT) { - _SWFStream->WriteByte(alpha); - } -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FMatrix --------------------------------------------------------------- - -// The Matrix class constructor -FMatrix::FMatrix(U32 _hasScale, SFIXED _scaleX, SFIXED _scaleY, U32 _hasRotate, SFIXED - _rotateSkew0, - SFIXED _rotateSkew1, SCOORD _translateX, SCOORD _translateY) -{ - - hasScale = _hasScale; - - scaleX = _scaleX; - scaleY = _scaleY; - - hasRotate = _hasRotate; - rotateSkew0 = _rotateSkew0; - rotateSkew1 = _rotateSkew1; - - translateX = _translateX; - translateY = _translateY; - - nScaleBits = MinBits(scaleX, scaleY); - nRotateBits = MinBits(rotateSkew0, rotateSkew1); - nTranslateBits = MinBits(translateX, translateY); - - identity = false; -} - -// Creates an identity matrix. - -FMatrix::FMatrix(void) -{ - - identity = true; - hasScale = false; - scaleX = 1; - scaleY = 1; - - hasRotate = false; - rotateSkew0 = 0; - rotateSkew1 = 0; -} - -// Calculates the minimum number of bits necessary to represent the given 2 signed numbers. -// This is used to calculate the 3 nbit fields in the Matrix class. Takes two signed -// numbers, sees which has the greatest magnitude, and calls FileWrite::MinBits with the -// unsigned magnitude of the larger number and the sign flag equal to 1 to account for the -// fact that the numbers are signed. - -U32 FMatrix::MinBits(S32 x, S32 y) -{ - - int xAbs = abs(x); - int yAbs = abs(y); - - if (xAbs > yAbs) - return FSWFStream::MinBits((U32)xAbs, 1); - - else - return FSWFStream::MinBits((U32)yAbs, 1); -} - -FMatrix FMatrix::operator*(const FMatrix &b) const -{ - SFIXED _scaleX = scaleX * b.scaleX + rotateSkew0 * b.rotateSkew1; - SFIXED _scaleY = scaleY * b.scaleY + rotateSkew0 * b.rotateSkew1; - SFIXED _rot0 = scaleX * b.rotateSkew0 + rotateSkew0 * b.scaleY; - SFIXED _rot1 = rotateSkew1 * b.scaleX + scaleY * b.rotateSkew1; - - return FMatrix( - _scaleX != 1 || scaleY != 1, _scaleX, _scaleY, - _rot0 != 0 || _rot1 != 0, _rot0, _rot1, - scaleX * b.translateX + rotateSkew0 * b.translateY + translateX, - rotateSkew1 * b.translateX + scaleY * b.translateY + translateY); -} - -// Writes the Matrix to the given _SWFStream. - -void FMatrix::WriteToSWFStream(FSWFStream *_SWFStream) -{ - - if (identity) { - - _SWFStream->WriteByte(0); - - } - - else { - _SWFStream->FlushBits(); - - _SWFStream->WriteBits(hasScale, 1); - - if (hasScale) { - - _SWFStream->WriteBits(nScaleBits, 5); - _SWFStream->WriteBits((U32)scaleX, nScaleBits); - _SWFStream->WriteBits((U32)scaleY, nScaleBits); - } - - _SWFStream->WriteBits(hasRotate, 1); - - if (hasRotate) { - - _SWFStream->WriteBits(nRotateBits, 5); - _SWFStream->WriteBits((U32)rotateSkew0, nRotateBits); - _SWFStream->WriteBits((U32)rotateSkew1, nRotateBits); - } - if (translateX == 0 && translateY == 0) - _SWFStream->WriteBits(0, 5); - else { - _SWFStream->WriteBits(nTranslateBits, 5); - - _SWFStream->WriteBits((U32)translateX, nTranslateBits); - _SWFStream->WriteBits((U32)translateY, nTranslateBits); - } - } -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FRect ------------------------------------------------------------------ - -// Rectangle class constructor. -FRect::FRect(SCOORD _xmin, SCOORD _ymin, SCOORD _xmax, SCOORD _ymax) -{ - - xmin = _xmin; - xmax = _xmax; - ymin = _ymin; - ymax = _ymax; -} - -// FRect's MinBits function. Calls MinBits with number being the absolute value of the -// rectangle coordinate with the greatest magnitude, and sign being 1 since a rectangle -// coord is signed. - -TUINT32 FRect::MinBits(void) -{ - TUINT32 maxCoord = FSWFStream::MaxNum(xmin, xmax, ymin, ymax); - - return FSWFStream::MinBits(maxCoord, 1); -} - -// Writes the rectangle to the given buffer. - -void FRect::WriteToSWFStream(FSWFStream *_SWFStream) -{ - int nBits = (int)MinBits(); - _SWFStream->WriteBits(nBits, 5); - - _SWFStream->WriteBits((U32)xmin, nBits); - _SWFStream->WriteBits((U32)xmax, nBits); - _SWFStream->WriteBits((U32)ymin, nBits); - _SWFStream->WriteBits((U32)ymax, nBits); - - _SWFStream->FlushBits(); -} - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FString --------------------------------------------------------------- - -FString::FString(const U8 *_string) -{ - text = (const char *)_string; -} - -FString::FString(const char *_string) -{ - text = _string; -} - -void FString::WriteToSWFStream(FSWFStream *_SWFStream, bool null_end) -{ - U16 i = 0; - for (i = 0; i < text.length(); i++) { - _SWFStream->WriteByte((U32)text[i]); - } - if (null_end) - _SWFStream->WriteByte(0); -} diff --git a/toonz/sources/common/flash/FPrimitive.h b/toonz/sources/common/flash/FPrimitive.h deleted file mode 100644 index 4cd2b69..0000000 --- a/toonz/sources/common/flash/FPrimitive.h +++ /dev/null @@ -1,235 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/18/1999. -// Mostly about FRGB, FRGBA, and FColor. -// Additionally, there is some brain-dump on how color should be implemented in low and -// high level manager. - -/**************************************************************************************** - - File Summary: FPrmitive.h - - This header-file contains the declarations of low-level prmitive-related structs and - classes. - - struct FRGB; - struct FRGBA; - - class FColor; - class FMatrix; - class FRect; - class FString; - -****************************************************************************************/ - -#ifndef FPRIMITIVE_INCLUDED -#define FPRIMITIVE_INCLUDED -#include "tcommon.h" -#include "Macromedia.h" -#include -class FSWFStream; - -#ifdef WIN32 // added from DV -#pragma warning(push) -#pragma warning(disable : 4786) -#pragma warning(disable : 4251) - -#endif - -#undef DVAPI -#undef DVVAR -#ifdef TFLASH_EXPORTS -#define DVAPI DV_EXPORT_API -#define DVVAR DV_EXPORT_VAR -#else -#define DVAPI DV_IMPORT_API -#define DVVAR DV_IMPORT_VAR -#endif - -// color structures - -struct FRGB { - U8 red; - U8 green; - U8 blue; -}; - -struct FRGBA { - // FRGBA( U8 r, U8 g, U8 b, U8 a ) { red = r; green = g; blue = b; alpha = a; } - // FRGBA() { red = 0; green = 0; blue = 0; alpha = 255; } - // void Set( U8 r, U8 g, U8 b, U8 a ) { red = r; green = g; blue = b; alpha = a; } - // - U8 red; - U8 green; - U8 blue; - U8 alpha; -}; - -//! This object specifies a color object. -/*! FColor is used (copied) as a structure. Do not add dynamic memory or virtual functions. - - There are two types of FColor, i.e. one with alpha channel on and the other with alpha channel.off. - When you construct an instance of FColor, if you provide three parameters, the alpha channel is off; - if you provide four, the alpha channel is on. - - Each color-related SWF tag requires the correct color type, either RGB or RGBA. For example, - DefineShape, DefineShape2, SetBackgroundColor need RGB (alpha off); - DefineShape3, DefineMorphShape, DefineEditText need RGBA (alpha on). - - The low-level manager can correct some errors of wrong color type, but not all. So don't rely on it. - If the wrong one got over low-level manager, the flash play might crash on that. - - We recommend you use RGBA whenever reasonable. The reason? Using RGBA is very consistent - and worth the sacrifice of some file space (in SWF, it's one more byte for each occurance of color info, and some - additional for color transformation.) - - Actually, we only provide RGBA interface for colors in high-level manager because this solution is much more elegant - in terms of consistency and compatibility. -*/ -class DVAPI FColor -{ -public: - //! Default FColor is white (0xff, 0xff, 0xff), construct a FColor with Alpha channel off. - FColor(U32 _red = 0xff, U32 _green = 0xff, U32 _blue = 0xff); - - //! Construct a FColor with Alpha channel on. - FColor(U32 _red, U32 _green, U32 _blue, U32 _alpha); - - //! Construct a FColor with Alpha channel off. - FColor(FRGB rgb); - - //! Construct a FColor with Alpha channel on. - FColor(FRGBA rgba); - - //! Returns red component. - int Red() { return (int)red; } - - //! Returns green component. - int Green() { return (int)green; } - - //! Returns blue component. - int Blue() { return (int)blue; } - - //! Returns alpha value. - int Alpha() { return (int)alpha; } - - bool HasAlpha() { return alphaT; } - - //! Alpha switch: turn on/off alpha channel. - void AlphaChannel(bool on) { alphaT = on; } - - bool operator==(const FColor &color) { return (red == color.red && - green == color.green && - blue == color.blue && - alpha == color.alpha); } - - /* - enum { - WRITE_SMALLEST, - WRITE_3BYTE, - WRITE_4BYTE - }; -*/ - // Method for internal use. - void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - U32 red; // should be U8 - U32 green; // should be U8 - U32 blue; // should be U8 - U32 alpha; // should be U8 - bool alphaT; //alpha type flag -}; - -class DVAPI FMatrix -{ - -public: - FMatrix(void); - - FMatrix(U32 _hasScale, - SFIXED _scaleX, - SFIXED _scaleY, - U32 _hasRotate, - SFIXED _rotateSkew0, - SFIXED _rotateSkew1, - SCOORD _translateX, - SCOORD _translateY); - - void WriteToSWFStream(FSWFStream *_SWFStream); - - FMatrix operator*(const FMatrix &b) const; - -public: - U32 hasScale; - U32 nScaleBits; - - SFIXED scaleX; - SFIXED scaleY; - - U32 hasRotate; - U32 nRotateBits; - SFIXED rotateSkew0; - SFIXED rotateSkew1; - - U32 nTranslateBits; - SCOORD translateX; - SCOORD translateY; - - U32 MinBits(S32 x, S32 y); - U16 identity; -}; - -//rectangle class - -class DVAPI FRect -{ -public: - FRect() { xmin = ymin = xmax = ymax = 0; } - FRect(SCOORD xmin, SCOORD ymin, SCOORD xmax, SCOORD ymax); - - SCOORD Xmin() { return xmin; } - SCOORD Ymin() { return ymin; } - SCOORD Xmax() { return xmax; } - SCOORD Ymax() { return ymax; } - SCOORD Width() { return xmax - xmin + 1; } - SCOORD Height() { return ymax - ymin + 1; } - - void SetXmin(SCOORD val) { xmin = val; } - void SetYmin(SCOORD val) { ymin = val; } - void SetXmax(SCOORD val) { xmax = val; } - void SetYmax(SCOORD val) { ymax = val; } - - void WriteToSWFStream(FSWFStream *_SWFStream); - -private: - SCOORD xmin; - SCOORD xmax; - SCOORD ymin; - SCOORD ymax; - - U32 MinBits(void); -}; - -// a flash string - -class DVAPI FString -{ - -public: - FString(const U8 *_string); - FString(const char *_string); - std::string GetString() { return text; } - - void WriteToSWFStream(FSWFStream *_SWFStream, bool writeNull); - U16 Length() { return text.length(); } - -private: - std::string text; -}; - -#ifdef WIN32 // added from DV -#pragma warning(pop) -#endif -#endif diff --git a/toonz/sources/common/flash/FSWFStream.cpp b/toonz/sources/common/flash/FSWFStream.cpp deleted file mode 100644 index b8a15e6..0000000 --- a/toonz/sources/common/flash/FSWFStream.cpp +++ /dev/null @@ -1,494 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. - -/**************************************************************************************** - - File Summary: FSWFStream.cpp - - This source file contains the definition for all low-level SWF-stream functions: - - Class Member Function - - FSWFStream FSWFStream(); - void WriteBits(U32, U32); - void WriteLargeData(U8*, U32); - void FlushBits(); - void WriteDWord(U32); - void WriteWord(U32); - void WriteByte(U32); - U32 Size(); - void Append(FSWFStream *); - void WriteToFile( FILE*); - void AppendTag(U16, U32, FSWFStream*); - U32 MinBits(U32, U16); - U32 MaxNum(S32, S32, S32, S32); - -****************************************************************************************/ -#ifdef WIN32 -#pragma warning(disable : 4786) -#endif - -#ifndef _DEBUG -#undef _STLP_DEBUG -#else -#define _STLP_DEBUG 1 -#endif - -#include "zlib.h" -#include "FObj.h" -#include "FSWFStream.h" - -////////////////////////////////////////////////////////////////////////////////////// -// -------- FSWFStream ------------------------------------------------------------ - -// FSWFStream is the object used to store a string of bytes, an SWF file "in memory" -// before being written to the disk. It handles bit packing and endian issues. - -// SWF uses bit packing a lot to reduce the size of the data going over the Net. -// The issue here of course is how to pack and unpack the bits correctly. - -FSWFStream::FSWFStream() -{ - streamPos = 0; //the position in the FSWFStream(how many bytes you have put in) - bytePos = 8; //the number of bits left to fill in the current byte - currentByte = 0; //the value of the current byte being created - -#ifndef DEBUG - stream.reserve(1024); // start out at 1k to make faster - - // if it is a debug build, don't reserve, as we wish to stress the system -#endif - stream.push_back(0); -} - -// Adds 'size' bits from 'data' to the stream FSWFStream. Data is in the form of -// a U32. Size indicates how many of the 32 bits are significant and should -// be output. It checks how many bits are available in the current output byte -// and works by repeatedly stuffing it with the next bits from 'data' -// and then adding currentByte to the stream until all "size" bits have been output. - -void FSWFStream::WriteBits(U32 data, U32 size) //adds individual bits -{ - FLASHASSERT(((int)data <= (0x01 << size) - 1) || (-(S32)(data) <= (0x01 << size) - 1)); - while (size != 0) { - if (size > bytePos) { - //if more bits left to write than shift out what will fit - currentByte |= data << (32 - size) >> (32 - bytePos); - - // shift all the way left, then right to right - // justify the data to be or'ed in - stream[streamPos] = currentByte; - streamPos++; - stream.push_back(0); - size -= bytePos; - currentByte = 0; - bytePos = 8; - } else if (size <= bytePos) { - currentByte |= data << (32 - size) >> (32 - bytePos); - bytePos -= size; - size = 0; - - if (!bytePos) { //if current byte is filled - stream[streamPos] = currentByte; - streamPos++; - stream.push_back(0); - currentByte = 0; - bytePos = 8; - } - } - } -} - -// For adding large data that is pointed to by a pointer. The data is only -// integrated into the stream when it is actually written to disk. -// E. G. a large JPEG. This is to avoid storing it twice. -// Stores the current streamPos, data pointer and size in the OutDataList. - -void FSWFStream::WriteLargeData(const U8 *data, U32 size) -{ - LargeData large; - - large.position = streamPos; - large.data = data; - large.size = size; - - outDataList.push_back(large); -} - -// Kick out the current partially filled byte to the stream. -// If there is a byte currently being built for addition to the stream, then the end of that -// byte is filled with zeroes and the byte is added to the stream. - -void FSWFStream::FlushBits() -{ - - if (bytePos != 8) { - - stream[streamPos] = currentByte; - streamPos++; - stream.push_back(0); - currentByte = 0; - bytePos = 8; - } -} - -// - -// Writes a 32 bit stream of data to given FSWFStream in the proper form (reversed byte order), -// so B1B2B3B4 is written as B4B3B2B1. The function does this by sending a byte at a time -// of the data to the FSWFStream in the appropriate order. - -void FSWFStream::WriteDWord(U32 data) -{ - //declare variable used to output the bytes - U32 v; - - FlushBits(); //vincenzo: l'ho messo io!! col cazzo che era "no bit swapping"! stronzi! - - //output the rightmost byte - v = data << 24 >> 24; - WriteBits(v, 8); - - //output the center right byte - v = data << 16 >> 24; - WriteBits(v, 8); - - //output the center left byte - v = data << 8 >> 24; - WriteBits(v, 8); - - //output the leftmost byte - v = data >> 24; - WriteBits(v, 8); -} - -// Writes a 16 bit stream of data to the FSWFStream in the proper form, so B1B2 is written as -// B2B1. - -void FSWFStream::WriteWord(U32 data) -{ - - //declare the variable used to output the bytes - U32 v; - FlushBits(); //vincenzo: l'ho messo io!! col cazzo che era "no bit swapping"! stronzi! - - //output the rightmost byte - v = data << 24 >> 24; - WriteBits(v, 8); - - //output the leftmost byte - v = data << 16 >> 24; - WriteBits(v, 8); -} - -// Writes an 8 bit stream of data to the FSWFStream. There is no bit swapping!! A byte is -// written as a byte. - -void FSWFStream::WriteByte(U32 data) -{ - - //declare the variable used to output the byte - U32 v = 0; - FlushBits(); //vincenzo: l'ho messo io!! col cazzo che era "no bit swapping"! stronzi! - - //output the byte - v = data << 24 >> 24; - - WriteBits(v, 8); -} - -// Returns the size of the FSWFStream. For purposes of denoting size in tags and headers. - -U32 FSWFStream::Size(void) -{ - int size = (int)streamPos; - std::list::iterator it; - - for (it = outDataList.begin(); it != outDataList.end(); it++) { - LargeData &data = (*it); - size += data.size; - } - return size; -} - -//------------------------------------------------------------------ -U32 FSWFStream::FullSize(void) -{ - U32 currentStreamPos = 0; //the current position in the FSWFStream for writing - - std::list::iterator it = outDataList.begin(), it_e = outDataList.end(); - U32 size = 0; - - for (; it != it_e; it++) { - - FLASHASSERT((*it).position >= currentStreamPos); - - if ((*it).position - currentStreamPos > 0) - size += (*it).position - currentStreamPos; - - currentStreamPos = (*it).position; - - //currentStreamPos should now equal currentDataPosition - FLASHASSERT((*it).size > 0); - - size += (*it).size; - } - - if (streamPos > currentStreamPos) - size += streamPos - currentStreamPos; - return size; -} - -//------------------------------------------------------------------- -// Appends the stream FSWFStream to this. Doesn't actually write the bitmaps, -// jpegs ... Instead it just writes their file name with a note that the actual file -// should go there. - -void FSWFStream::Append(FSWFStream *add) -{ - int addStreamPos = 0; // this functions position in the "add" stream, - // remembering that add->streamPos is the END - // of the "add" stream. - - // remove all the large data from the other stream - while (add->outDataList.size()) { - LargeData data = add->outDataList.front(); - add->outDataList.pop_front(); - - for (; addStreamPos < (int)data.position; addStreamPos++) { - WriteBits(add->stream[addStreamPos], 8); - } - //addStreamPos should now equal data.position - WriteLargeData(data.data, data.size); - } - - // Write the remainder of the stream data, after the last outData. - for (; addStreamPos < (int)add->streamPos; addStreamPos++) { - WriteBits(add->stream[addStreamPos], 8); - } -} - -// Writes the stream FSWFStream to the given file. -//--------------------------------------------------------------------- - -void FSWFStream::WriteToFileVersion6(FILE *swfFile) -{ - U32 size = FullSize(); - U8 *buf = new U8[size]; - WriteToMemory(buf); - - assert(buf[0] == 'F'); - assert(buf[1] == 'W'); - assert(buf[2] == 'S'); - //assert(buf[3]==4); - assert(((U32)(buf[4] + (buf[5] << 8) + (buf[6] << 16) + (buf[7] << 24))) == size); - - buf[3] = 6; //version 6 - - U32 sizeOut = (U32)(2 * ((size * 1.1) + 12)); - U8 *bufOut = new U8[sizeOut]; - - compress(bufOut, (uLongf *)&sizeOut, buf + 8, size - 8); - - if (size > sizeOut + 8) //meglio non comprimere altrimenti!!! - { - buf[0] = 'C'; - fwrite(buf, 1, 8, swfFile); - fwrite(bufOut, 1, sizeOut, swfFile); - } else - fwrite(buf, 1, size, swfFile); - - delete[] bufOut; - delete[] buf; -} - -//------------------------------------------------------------------------------------- - -void FSWFStream::WriteToFile(FILE *swfFile) -{ - U32 currentStreamPos = 0; //the current position in the FSWFStream for writing - const U8 *currentData; - U32 currentDataSize; - U32 currentDataPosition; - U32 outDataListSize = outDataList.size(); - - int wrote = 0; - - if (outDataListSize) { - - for (U32 i = 0; i < outDataListSize; i++) { - currentDataPosition = outDataList.front().position; - currentData = outDataList.front().data; - currentDataSize = outDataList.front().size; - outDataList.pop_front(); - - FLASHASSERT(currentDataPosition >= currentStreamPos); - - if (currentDataPosition - currentStreamPos > 0) { - fwrite(&stream[currentStreamPos], 1, (currentDataPosition - currentStreamPos), swfFile); - } - wrote += currentDataPosition - currentStreamPos; - currentStreamPos = currentDataPosition; - - //currentStreamPos should now equal currentDataPosition - FLASHASSERT(currentDataSize > 0); - - fwrite(currentData, 1, currentDataSize, swfFile); - wrote += currentDataSize; - } - } - - if (streamPos > currentStreamPos) { - fwrite(&stream[currentStreamPos], 1, streamPos - currentStreamPos, swfFile); - } - wrote += streamPos - currentStreamPos; -} - -void FSWFStream::WriteToMemory(U8 *memory) -{ - U32 currentStreamPos = 0; //the current position in the FSWFStream for writing - const U8 *currentData; - U32 currentDataSize; - U32 currentDataPosition; - U32 outDataListSize = outDataList.size(); - - int wrote = 0; - - if (outDataListSize) { - - for (U32 i = 0; i < outDataListSize; i++) { - currentDataPosition = outDataList.front().position; - currentData = outDataList.front().data; - currentDataSize = outDataList.front().size; - outDataList.pop_front(); - - FLASHASSERT(currentDataPosition >= currentStreamPos); - - if (currentDataPosition - currentStreamPos > 0) { - memcpy(memory, &stream[currentStreamPos], (currentDataPosition - currentStreamPos)); - memory += currentDataPosition - currentStreamPos; - } - wrote += currentDataPosition - currentStreamPos; - currentStreamPos = currentDataPosition; - - //currentStreamPos should now equal currentDataPosition - FLASHASSERT(currentDataSize > 0); - - memcpy(memory, currentData, currentDataSize); - memory += currentDataSize; - wrote += currentDataSize; - } - } - - if (streamPos > currentStreamPos) { - // fwrite( &stream[currentStreamPos], 1, streamPos - currentStreamPos, swfFile ); - memcpy(memory, &stream[currentStreamPos], streamPos - currentStreamPos); - memory += streamPos - currentStreamPos; - } - wrote += streamPos - currentStreamPos; -} - -void FSWFStream::AppendTag(U16 tagID, U32 length, FSWFStream *buffer) -{ - U32 longLength = 0; - bool longHead = false; - - if (length > 62 || (tagID == 32 && length == 29) || (tagID == 2 && length == 28) || (tagID == 26 && length == 19)) //If long type tag: - { - longHead = true; - longLength = length; //The actual length is here. - length = 0x3f; //This field's length becomes 63 to indicate a TLong tag. - } else { //Else short type tag: - longHead = false; //It is not a TLong header, so the length is valid. - } - - U16 firstPartOfTag = (U16)((tagID << 6) | length); // Build up the first 2 bytes of the tag: - // 10bits for tag ID - // 6bits for tag length - - WriteWord((U32)firstPartOfTag); - - if (longHead) { - WriteDWord(longLength); - } - - if (buffer) // If there is not a buffer, don't write any more. - { - Append(buffer); // Copy the buffer passed in to this object. - } -} - -// Calculates the minimum number of bits necessary to represent the given number. The -// number should be given in its unsigned form with the flag sign equal to 1 if it is -// signed. Repeatedly compares number to another unsigned int called x. -// x is initialized to 1. The value of x is shifted left i times until x is greater -// than number. Now i is equal to the number of bits the UNSIGNED value of number needs. -// The signed value will need one more bit for the sign so i+1 is returned if the number -// is signed, and i is returned if the number is unsigned. - -U32 FSWFStream::MinBits(U32 number, U16 sign) -{ - //If the number == 0, then 0 bits are necessary for unsigned, and 1 for signed. - //Sign should either have a value of 0 or 1. - if (number == 0) { - return sign; - } - - //declare and initialize the variable for comparison - U32 x = 1; - U32 i; - - //keep increasing the value of x and i until s is greater than the given number - for (i = 1; i < 33; i++) { - x <<= 1; - if (x > number) { - break; - } - } - - FLASHASSERT(sign + i <= 32); - - //return the calculated value and account for the number being signed or not - return i + sign; -} - -// Compares the absolute values of 4 signed integers and returns the unsigned magnitude of -// the number with the greatest absolute value. - -U32 FSWFStream::MaxNum(S32 a, S32 b, S32 c, S32 d) -{ - - //take the absolute values of the given numbers - int aAbs = abs(a); - int bAbs = abs(b); - int cAbs = abs(c); - int dAbs = abs(d); - - //compare the numbers and return the unsigned value of the one with the greatest magnitude - if (aAbs > bAbs) { - if (aAbs > cAbs) { - if (aAbs > dAbs) { - return (U32)aAbs; - } else { - return (U32)dAbs; - } - } else if (cAbs > dAbs) { - return (U32)cAbs; - } else { - return (U32)dAbs; - } - } else { - if (bAbs > cAbs) { - if (bAbs > dAbs) { - return (U32)bAbs; - } else { - return (U32)dAbs; - } - } else if (cAbs > dAbs) { - return (U32)cAbs; - } else { - return (U32)dAbs; - } - } -} diff --git a/toonz/sources/common/flash/FSWFStream.h b/toonz/sources/common/flash/FSWFStream.h deleted file mode 100644 index eef08b1..0000000 --- a/toonz/sources/common/flash/FSWFStream.h +++ /dev/null @@ -1,103 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. - -/**************************************************************************************** - - File Summary: FSWFStream.h - - This header-file contains the declarations of low-level SWF-stream class, i.e. - - class FSWFStream; - -****************************************************************************************/ - -#ifndef SWFSTREAM_INCLUDED -#define SWFSTREAM_INCLUDED - -#ifdef WIN32 // added from DV -#pragma warning(push) -#pragma warning(disable : 4786) -#pragma warning(disable : 4251) - -#endif - -#include "Macromedia.h" - -// #include -// #include -#include -#include - -#include "tcommon.h" - -#undef DVAPI -#undef DVVAR -#ifdef TFLASH_EXPORTS -#define DVAPI DV_EXPORT_API -#define DVVAR DV_EXPORT_VAR -#else -#define DVAPI DV_IMPORT_API -#define DVVAR DV_IMPORT_VAR -#endif - -// class used to store data before it is written to a .swf file - -class DVAPI FSWFStream -{ -public: - FSWFStream(); - - U32 Size(); - U32 FullSize(); - - U8 *Memory() { return &stream[0]; } // Useful to get the origin of the stream memory. - // Used by CreateMovie to write the header information. - - void WriteBits(U32 data, U32 size); // Writes # of bits size, that has value data - void WriteLargeData(const U8 *data, U32 size); // Stores the pointer to a large block of data - // to be written. Ownership of the data is NOT passed - // to this stream. - - // NOTE: These functions all take in U32's even though in some situations a smaller data - // type can suffice. This is for the sake of simplicity. - void WriteDWord(U32 data); - void WriteWord(U32 data); - void WriteByte(U32 data); - - void FlushBits(); // Kick out the current partially filled byte to the stream. - - void AppendTag(U16 _tagID, U32 _length, FSWFStream *_tagBody); // Copies the stream, adding tag id - // and length information. - void Append(FSWFStream *_SWFStream); // Copies another stream to the end - // of this without any changes. The stream - // will be empty but still needs to be deleted - // by the caller. - - // Utility functions - void WriteToFile(FILE *out); // writes this data to file - void WriteToFileVersion6(FILE *out); // writes this data to file, compressing with zlib(flash 6) - void WriteToMemory(U8 *memory); // copy this data to a memory buffer (use Size() to make sure it is large enough) - - //functions used to calculate optimal size for fields - static U32 MinBits(U32 number, U16 sign); - static U32 MaxNum(S32 a, S32 b, S32 c, S32 d); - -private: - struct LargeData { - U32 position; - const U8 *data; - U32 size; - }; - - std::vector stream; - - U32 streamPos; - U32 bytePos; - U8 currentByte; - - std::list outDataList; // stores pointer data - the overhead is not as bad as it seems -}; - -#endif diff --git a/toonz/sources/common/flash/FSound.cpp b/toonz/sources/common/flash/FSound.cpp deleted file mode 100644 index 01e184a..0000000 --- a/toonz/sources/common/flash/FSound.cpp +++ /dev/null @@ -1,232 +0,0 @@ -#include "Macromedia.h" -#include "FSound.h" - -// -// The Low Level sound object -// - -const S32 FSound::kRateTable[4] = {sndRate5K, sndRate11K, sndRate22K, sndRate44K}; -const int FSound::kRateShiftTable[4] = {3, 2, 1, 0}; - -void FSound::Init() -{ - format = 0; - nSamples = 0; - samples = 0; - dataLen = 0; - delay = 0; -} - -void FSound::Set(WaveFormat *wfmt) -{ - wfmt->wFormatTag = 1; //WAVE_FORMAT_PCM; - wfmt->nSamplesPerSec = Rate(); - wfmt->nChannels = NChannels(); - wfmt->wBitsPerSample = BitsPerSample(); - wfmt->nBlockAlign = (wfmt->wBitsPerSample * wfmt->nChannels) / 8; - wfmt->nAvgBytesPerSec = wfmt->nBlockAlign * wfmt->nSamplesPerSec; - - //wfmt->cbSize = 0; -} - -// -// ADPCM tables -// - -static const int indexTable2[2] = { - -1, 2, -}; - -// Is this ok? -static const int indexTable3[4] = { - -1, -1, 2, 4, -}; - -static const int indexTable4[8] = { - -1, -1, -1, -1, 2, 4, 6, 8, -}; - -static const int indexTable5[16] = { - -1, -1, -1, -1, -1, -1, -1, -1, 1, 2, 4, 6, 8, 10, 13, 16, -}; - -static const int *indexTables[] = { - indexTable2, - indexTable3, - indexTable4, - indexTable5}; - -static const int stepsizeTable[89] = { - 7, 8, 9, 10, 11, 12, 13, 14, 16, 17, - 19, 21, 23, 25, 28, 31, 34, 37, 41, 45, - 50, 55, 60, 66, 73, 80, 88, 97, 107, 118, - 130, 143, 157, 173, 190, 209, 230, 253, 279, 307, - 337, 371, 408, 449, 494, 544, 598, 658, 724, 796, - 876, 963, 1060, 1166, 1282, 1411, 1552, 1707, 1878, 2066, - 2272, 2499, 2749, 3024, 3327, 3660, 4026, 4428, 4871, 5358, - 5894, 6484, 7132, 7845, 8630, 9493, 10442, 11487, 12635, 13899, - 15289, 16818, 18500, 20350, 22385, 24623, 27086, 29794, 32767}; - -// -// The Compressor -// - -FSoundComp::FSoundComp(FSound *snd, S32 nb) -{ - // assert(snd->CompressFormat() == sndCompressADPCM); - isStereo = snd->Stereo(); - is8Bit = snd->Is8Bit(); - - nBits = nb; - nSamples = 0; - - len = 0; - - bitBuf = 0; - bitPos = 0; -} - -void FSoundComp::WriteBits(std::vector *stream) -{ - if (stream) { - // Actually write the bits... - while (bitPos >= 8) { - // May need to rewrite this line - // recorder->PutByte((U8)(bitBuf >> (bitPos-8))); - stream->push_back((U8)(bitBuf >> (bitPos - 8))); - - bitPos -= 8; - len++; - } - } else { - // Just counting... - len += bitPos / 8; - bitPos &= 0x7; - } -} - -void FSoundComp::Flush(std::vector *stream) -{ - WriteBits(stream); - if (bitPos > 0) { - PutBits(0, 8 - bitPos, stream); - WriteBits(stream); - } -} - -void FSoundComp::Compress16(S16 *src, S32 n, std::vector *stream) -{ - if (nSamples == 0) { - // Emit the compression settings - PutBits(nBits - 2, 2, stream); - } - - int sn = isStereo ? 2 : 1; - const int *indexTable = indexTables[nBits - 2]; - while (n-- > 0) { - nSamples++; - if ((nSamples & 0xfff) == 1) { - // We emit a header every 4096 samples so we can seek quickly - for (int i = 0; i < sn; i++) { - // Pick an initial index value - S32 d = abs(src[sn] - src[0]); - int k = 0; - while (k < 63 && stepsizeTable[k] < d) - k++; - - PutBits(valpred[i] = *src++, 16, stream); - PutBits(index[i] = k, 6, stream); - } - - } else { - // Generate a delta value - for (int i = 0; i < sn; i++) { - /* Step 1 - compute difference with previous value */ - S32 diff = *src++ - valpred[i]; /* Difference between val and valprev */ - int sign; - if (diff < 0) { - sign = 1 << (nBits - 1); - diff = -diff; - } else { - sign = 0; - } - - /* Step 2 - Divide and clamp */ - /* Note: - ** This code *approximately* computes: - ** delta = diff*4/step; - ** vpdiff = (delta+0.5)*step/4; - ** but in shift step bits are dropped. The net result of this is - ** that even if you have fast mul/div hardware you cannot put it to - ** good use since the fixup would be too expensive. - */ - int step = stepsizeTable[index[i]]; /* Stepsize */ - S32 delta = 0; /* Current adpcm output value */ - S32 vpdiff = 0; /* Current change to valpred */ - - int k = 1 << (nBits - 2); - do { - if (diff >= step) { - delta |= k; - diff -= step; - vpdiff += step; - } - step >>= 1; - k >>= 1; - } while (k); - vpdiff += step; // add the 0.5 - - /* Step 3 - Update previous value */ - if (sign) - valpred[i] -= vpdiff; - else - valpred[i] += vpdiff; - - /* Step 4 - Clamp previous value to 16 bits */ - if (valpred[i] != (S16)valpred[i]) - valpred[i] = valpred[i] < 0 ? -32768 : 32767; - assert(valpred[i] <= 32767 && valpred[i] >= -32768); - - /* Step 5 - Assemble value, update index and step values */ - index[i] += indexTable[delta]; - if (index[i] < 0) - index[i] = 0; - else if (index[i] > 88) - index[i] = 88; - - delta |= sign; - - /* Step 6 - Output value */ - PutBits(delta, nBits, stream); - } - } - } -} - -inline void Filter8to16(U8 *src, S16 *dst, S32 n) -// Can work in place -{ - src += n; - dst += n; - while (n--) - *(--dst) = ((S16) * (--src) - 128) << 8; -} - -void FSoundComp::Compress(void *src, S32 n, std::vector *stream) -{ - if (is8Bit) { - S16 buf[4096]; - U8 *s = (U8 *)src; - while (n > 0) { - // Expand to 16 bit and compress - S32 nb = std::min((S32)4096, n); - Filter8to16(s, buf, nb); - Compress16(buf, nb, stream); - n -= nb; - s += nb; - } - - } else { - Compress16((S16 *)src, n, stream); - } -} diff --git a/toonz/sources/common/flash/FSound.h b/toonz/sources/common/flash/FSound.h deleted file mode 100644 index 127ef26..0000000 --- a/toonz/sources/common/flash/FSound.h +++ /dev/null @@ -1,146 +0,0 @@ -#ifndef SNDMIX_INCLUDED -#define SNDMIX_INCLUDED - -// #include -// #include -#include -#include -#include - -#include "Macromedia.h" -#include "FFixed.h" - -struct WaveFormat { - U16 wFormatTag; /* format type */ - U16 nChannels; /* number of channels (i.e. mono, stereo...) */ - U32 nSamplesPerSec; /* sample rate */ - U32 nAvgBytesPerSec; /* for buffer estimation */ - U16 nBlockAlign; /* block size of data */ - U16 wBitsPerSample; /* number of bits per sample of mono data */ - U16 cbSize; /* the count in bytes of the size of */ -}; - -// Our supported sample rates -// Note that sndRate5K is really 5512.5khz -// Use defines instead of an enum since these must be 32 bits on all platforms -#define sndRate5K 5512L -#define sndRate11K 11025L -#define sndRate22K 22050L -#define sndRate44K 44100L - -const int sndMono = 0x0; -const int sndStereo = 0x1; - -const int snd8Bit = 0x0; -const int snd16Bit = 0x2; - -const int snd5K = 0 << 2; -const int snd11K = 1 << 2; -const int snd22K = 2 << 2; -const int snd44K = 3 << 2; - -const int sndCompressNone = 0x00; // we could add 14 more compression types here... -const int sndCompressADPCM = 0x10; -const int sndCompressMP3 = 0x20; -const int sndCompressNoneI = 0x30; // save out in intel byte order -const int sndRateMask = 0x3 << 2; -const int sndCompressMask = 0xF0; - -enum { // Sound format types - snd5K8Mono = 0, - snd5K8Stereo, - snd5K16Mono, - snd5K16Stereo, - snd11K8Mono, - snd11K8Stereo, - snd11K16Mono, - snd11K16Stereo, - snd22K8Mono, - snd22K8Stereo, - snd22K16Mono, - snd22K16Stereo, - snd44K8Mono, - snd44K8Stereo, - snd44K16Mono, - snd44K16Stereo -}; - -// This object defines a sound sample -class FSound -{ -public: - int format; - S32 nSamples; // the number of samples - duration = nSamples/Rate() - void *samples; // this should probably be a handle on Mac - S32 dataLen; // length in bytes of samples - set only if needed - S32 delay; // MP3 compression has a delay before the real sound data - - static const S32 kRateTable[4]; - static const int kRateShiftTable[4]; - -public: - void Init(); - - S32 Rate() { return kRateTable[(format >> 2) & 0x3]; } - int RateShift() { return kRateShiftTable[(format >> 2) & 0x3]; } - bool Stereo() { return (format & sndStereo) != 0; } - int NChannels() { return (format & sndStereo) ? 2 : 1; } - bool Is8Bit() { return (format & snd16Bit) == 0; } - int BitsPerSample() { return (format & snd16Bit) ? 16 : 8; } - int BytesPerSample() { return (format & snd16Bit) ? 2 : 1; } - int CompressFormat() { return format & sndCompressMask; } - bool Compressed() { return (format & sndCompressMask) != 0; } - - // Manage the duration in 44kHz units - S32 GetDuration44() { return nSamples << RateShift(); } - void SetDuration44(S32 d) { nSamples = d >> RateShift(); } - - int BytesPerBlock() { return BytesPerSample() * NChannels(); } - S32 SizeBytes() { return nSamples * BytesPerBlock(); } - - void Set(WaveFormat *); -}; - -class FSoundComp -{ -private: - BOOL isStereo; - BOOL is8Bit; - int nBits; // number of bits in each sample - - S32 nSamples; // samples compressed so far - - S32 valpred[2]; // ADPCM state - int index[2]; - - // The Destination - S32 len; // default is to just calculate the size - - // State for writing bits - unsigned int bitBuf; - int bitPos; - -public: - FSoundComp(FSound *snd, S32 numberBits); // numberBits from 2-5 - ~FSoundComp() { assert(bitPos == 0); } - - void Compress(void *src, S32 n, std::vector *stream); - void Flush(std::vector *stream); - -private: - void Compress16(S16 *src, S32 n, std::vector *stream); - - // Write variable width bit fields - void WriteBits(std::vector *stream); // empty the buffer of whole bytes - - void PutBits(S32 v, int n, std::vector *stream) - { - assert(n <= 16); - if (bitPos + n > 32) - WriteBits(stream); - bitBuf = (bitBuf << n) | (v & ~(0xFFFFFFFFL << n)); - bitPos += n; - } -}; - -#endif diff --git a/toonz/sources/common/flash/Macromedia.h b/toonz/sources/common/flash/Macromedia.h deleted file mode 100644 index 566ef05..0000000 --- a/toonz/sources/common/flash/Macromedia.h +++ /dev/null @@ -1,514 +0,0 @@ -// Copyright © 1999 Middlesoft, Inc. All rights reserved. -// First Created By Lee Thomason. -// First Created On 09/08/1999. -// Last Modified On 11/09/1999. -// Last Modified On 18/06/2002 by DV for Fixes -/**************************************************************************************** - - File Summary: Macromedia.h - - This header file defines various structs and enums used by Flash File Format SDK - low-level manager. - -****************************************************************************************/ - -#ifndef _MACROMEDIA_H_ -#define _MACROMEDIA_H_ - -#ifdef WIN32 // added by DV -#pragma warning(disable : 4786) -#endif - -#include "tcommon.h" -#include -#include -#include - -class FSWFStream; - -#ifdef _DEBUG -#ifndef DEBUG -#define DEBUG -#endif -#endif - -// Some basic defines for debugging: -#ifdef DEBUG -#define FLASHOUTPUT printf -#define FLASHASSERT assert -#define FLASHPRINT printf -// -// #define FLASHOUTPUT ((void)0) -// #define FLASHASSERT ((void)0) -// #define FLASHPRINT ((void)0) -#else -inline void nothing(...) -{ -} -#define FLASHOUTPUT nothing //((void)0) -#define FLASHASSERT nothing //((void)0) -#define FLASHPRINT printf -#endif - -/* // removed by DV -#ifndef min - #define min( a, b ) ( ( a < b ) ? a : b ) -#endif -#ifndef max - #define max( a, b ) ( ( a > b ) ? a : b ) -#endif -*/ - -// Global Types -typedef float FLOAT; -typedef TUINT32 U32, *P_U32, **PP_U32; -typedef TINT32 S32, *P_S32, **PP_S32; -typedef unsigned short U16, *P_U16, **PP_U16; -typedef signed short S16, *P_S16, **PP_S16; -typedef unsigned char U8, *P_U8, **PP_U8; -typedef signed char S8, *P_S8, **PP_S8; -typedef TINT32 SFIXED, *P_SFIXED; -typedef TINT32 SCOORD, *P_SCOORD; -typedef int BOOL; - -const SFIXED Fixed1 = 0x00010000; -const SCOORD SCoord1 = 20; - -typedef struct SRECT { - SCOORD xmin; - SCOORD xmax; - SCOORD ymin; - SCOORD ymax; -} SRECT, *P_SRECT; - -const U8 Snd5k = 0; -const U8 Snd11k = 1; -const U8 Snd22k = 2; -const U8 Snd44k = 3; - -const U8 Snd8Bit = 0; -const U8 Snd16Bit = 1; - -const U8 SndMono = 0; -const U8 SndStereo = 1; - -typedef struct SSound { - U8 format; // 0 none, 1 PCM - U8 rate; // Snd5k...Snd44k - U8 size; // 0 8bit, 1 16bit - U8 type; // 0 mono, 1 stereo - U32 sampleCount; // the number of samples - U32 soundSize; // the number of bytes in the sample - U8 *sound; // pointer to the sound data -} SSound, *P_SSound; - -typedef struct SPOINT { - SCOORD x; - SCOORD y; -} SPOINT, *P_SPOINT; - -// Start Sound Flags -enum { - soundHasInPoint = 0x01, - soundHasOutPoint = 0x02, - soundHasLoops = 0x04, - soundHasEnvelope = 0x08 - - // the upper 4 bits are reserved for synchronization flags -}; - -enum { - fillSolid = 0x00, - fillGradient = 0x10, - fillLinearGradient = 0x10, - fillRadialGradient = 0x12, - fillMaxGradientColors = 8, - // Texture/bitmap fills - fillTiledBits = 0x40, // if this bit is set, must be a bitmap pattern - fillClippedBits = 0x41 -}; - -enum { - CURVED_EDGE = 0, - STRAIGHT_EDGE = 1 -}; - -enum { - NOT_EDGE_REC = 0, - EDGE_REC = 1 -}; - -// Flags for defining a shape character -enum { - // These flag codes are used for state changes - and as return values from ShapeParser::GetEdge() - eflagsMoveTo = 0x01, - eflagsFill0 = 0x02, - eflagsFill1 = 0x04, - eflagsLine = 0x08, - eflagsNewStyles = 0x10, - - eflagsEnd = 0x80 // a state change with no change marks the end -}; - -#ifndef NULL -#define NULL 0 -#endif - -// Tag values that represent actions or data in a Flash script. -enum { - stagEnd = 0, - stagShowFrame = 1, - stagDefineShape = 2, - stagFreeCharacter = 3, - stagPlaceObject = 4, - stagRemoveObject = 5, - stagDefineBits = 6, - stagDefineButton = 7, - stagJPEGTables = 8, - stagSetBackgroundColor = 9, - stagDefineFont = 10, - stagDefineText = 11, - stagDoAction = 12, - stagDefineFontInfo = 13, - stagDefineSound = 14, // Event sound tags. - stagStartSound = 15, - stagDefineButtonSound = 17, - stagSoundStreamHead = 18, - stagSoundStreamBlock = 19, - stagDefineBitsLossless = 20, // A bitmap using lossless zlib compression. - stagDefineBitsJPEG2 = 21, // A bitmap using an internal JPEG compression table. - stagDefineShape2 = 22, - stagDefineButtonCxform = 23, - stagProtect = 24, // This file should not be importable for editing. - - stagPathsArePostScript = 25, // assume shapes are filled as PostScript style paths - - // These are the new tags for Flash 3. - stagPlaceObject2 = 26, // The new style place w/ alpha color transform and name. - stagRemoveObject2 = 28, // A more compact remove object that omits the character tag (just depth). - - // This tag is used for RealMedia only - stagSyncFrame = 29, // Handle a synchronization of the display list - - stagFreeAll = 31, // Free all of the characters - - stagDefineShape3 = 32, // A shape V3 includes alpha values. - stagDefineText2 = 33, // A text V2 includes alpha values. - stagDefineButton2 = 34, // A button V2 includes color transform, alpha and multiple actions - stagDefineBitsJPEG3 = 35, // A JPEG bitmap with alpha info. - stagDefineBitsLossless2 = 36, // A lossless bitmap with alpha info. - stagDefineSprite = 39, // Define a sequence of tags that describe the behavior of a sprite. - stagNameCharacter = 40, // Name a character definition, character id and a string, (used for buttons, bitmaps, sprites and sounds). - - stagSerialNumber = 41, // a tag command for the Flash Generator customer serial id and cpu information - stagDefineTextFormat = 42, // define the contents of a text block with formating information - - stagFrameLabel = 43, // A string label for the current frame. - stagSoundStreamHead2 = 45, // For lossless streaming sound, should not have needed this... - stagDefineMorphShape = 46, // A morph shape definition - - stagFrameTag = 47, // a tag command for the Flash Generator (WORD duration, STRING label) - stagDefineFont2 = 48, // a tag command for the Flash Generator Font information - stagGenCommand = 49, // a tag command for the Flash Generator intrinsic - stagDefineCommandObj = 50, // a tag command for the Flash Generator intrinsic Command - stagCharacterSet = 51, // defines the character set used to store strings - stagFontRef = 52, // defines a reference to an external font source - - // Flash 4 tags - stagDefineEditText = 37, // an edit text object (bounds, width, font, variable name) - stagDefineVideo = 38, // a reference to an external video stream - - // NOTE: If tag values exceed 255 we need to expand SCharacter::tagCode from a BYTE to a WORD - stagDefineBitsPtr = 1023 // a special tag used only in the editor -}; - -// PlaceObject2 Flags -enum { - splaceMove = 0x01, // this place moves an exisiting object - splaceCharacter = 0x02, // there is a character tag (if no tag, must be a move) - splaceMatrix = 0x04, // there is a matrix (matrix) - splaceColorTransform = 0x08, // there is a color transform (cxform with alpha) - splaceRatio = 0x10, // there is a blend ratio (word) - splaceName = 0x20, // there is an object name (string) - splaceDefineClip = 0x40, // this shape should open or close a clipping bracket (character != 0 to open, character == 0 to close) - splaceCloneExternalSprite = 0x80 // cloning a movie which was loaded externally - // one bit left for expansion -}; - -//ActionConditions -enum { - OverDownToIdle = 1, - IdleToOverDown = 2, - OutDownToIdle = 3, - OutDownToOverDown = 4, - OverDownToOutDown = 5, - OverDownToOverUp = 6, - OverUpToOverDown = 7, - OverUpToIdle = 8, - IdleToOverUp = 9 -}; - -//Clip Action -enum { - //Flash 5- - ClipEventLoad = 0x00000001, - ClipEventEnterFrame = 0x00000002, - ClipEventUnload = 0x00000004, - ClipEventMouseMove = 0x00000008, - ClipEventMouseDown = 0x00000010, - ClipEventMouseUp = 0x00000020, - ClipEventKeyDown = 0x00000040, - ClipEventKeyUp = 0x00000080, - ClipEventData = 0x00000100, - - //Flash 6+ - ClipEventInitialize = 0x00000200, - ClipEventPress = 0x00000400, - ClipEventRelease = 0x00000800, - ClipEventReleaseOutside = 0x00001000, - ClipEventRollOver = 0x00002000, - ClipEventRollOut = 0x00004000, - ClipEventDragOver = 0x00008000, - ClipEventDragOut = 0x00010000, - ClipEventKeyPress = 0x00020000, -}; - -//Key Codes -enum { - ID_KEY_LEFT = 0x01, - ID_KEY_RIGHT = 0x02, - ID_KEY_HOME = 0x03, - ID_KEY_END = 0x04, - ID_KEY_INSERT = 0x05, - ID_KEY_DELETE = 0x06, - ID_KEY_CLEAR = 0x07, - ID_KEY_BACKSPACE = 0x08, - ID_KEY_ENTER = 0x0D, - ID_KEY_UP = 0x0E, - ID_KEY_DOWN = 0x0F, - ID_KEY_PAGE_UP = 0x10, - ID_KEY_PAGE_DOWN = 0x11, - ID_KEY_TAB = 0x12 -}; - -// Action codes -enum { - // Flash 1 and 2 actions - sactionHasLength = 0x80, - sactionNone = 0x00, - sactionGotoFrame = 0x81, // frame num (WORD) - sactionGetURL = 0x83, // url (STR), window (STR) - sactionNextFrame = 0x04, - sactionPrevFrame = 0x05, - sactionPlay = 0x06, - sactionStop = 0x07, - sactionToggleQuality = 0x08, - sactionStopSounds = 0x09, - sactionWaitForFrame = 0x8A, // frame needed (WORD), actions to skip (BYTE) - - // Flash 3 Actions - sactionSetTarget = 0x8B, // name (STR) - sactionGotoLabel = 0x8C, // name (STR) - - // Flash 4 Actions - sactionAdd = 0x0A, // Stack IN: number, number, OUT: number - sactionSubtract = 0x0B, // Stack IN: number, number, OUT: number - sactionMultiply = 0x0C, // Stack IN: number, number, OUT: number - sactionDivide = 0x0D, // Stack IN: dividend, divisor, OUT: number - sactionEquals = 0x0E, // Stack IN: number, number, OUT: bool - sactionLess = 0x0F, // Stack IN: number, number, OUT: bool - sactionAnd = 0x10, // Stack IN: bool, bool, OUT: bool - sactionOr = 0x11, // Stack IN: bool, bool, OUT: bool - sactionNot = 0x12, // Stack IN: bool, OUT: bool - sactionStringEquals = 0x13, // Stack IN: string, string, OUT: bool - sactionStringLength = 0x14, // Stack IN: string, OUT: number - sactionStringAdd = 0x21, // Stack IN: string, strng, OUT: string - sactionStringExtract = 0x15, // Stack IN: string, index, count, OUT: substring - sactionPush = 0x96, // type (BYTE), value (STRING or FLOAT) - sactionPop = 0x17, // no arguments - sactionToInteger = 0x18, // Stack IN: number, OUT: integer - sactionJump = 0x99, // offset (WORD) - sactionIf = 0x9D, // offset (WORD) Stack IN: bool - sactionCall = 0x9E, // Stack IN: name - sactionGetVariable = 0x1C, // Stack IN: name, OUT: value - sactionSetVariable = 0x1D, // Stack IN: name, value - sactionGetURL2 = 0x9A, // method (BYTE) Stack IN: url, window - sactionGotoFrame2 = 0x9F, // flags (BYTE) Stack IN: frame - sactionSetTarget2 = 0x20, // Stack IN: target - sactionGetProperty = 0x22, // Stack IN: target, property, OUT: value - sactionSetProperty = 0x23, // Stack IN: target, property, value - sactionCloneSprite = 0x24, // Stack IN: source, target, depth - sactionRemoveSprite = 0x25, // Stack IN: target - sactionTrace = 0x26, // Stack IN: message - sactionStartDrag = 0x27, // Stack IN: no constraint: 0, center, target - // constraint: x1, y1, x2, y2, 1, center, target - sactionEndDrag = 0x28, // no arguments - sactionStringLess = 0x29, // Stack IN: string, string, OUT: bool - sactionWaitForFrame2 = 0x8D, // skipCount (BYTE) Stack IN: frame - sactionRandomNumber = 0x30, // Stack IN: maximum, OUT: result - sactionMBStringLength = 0x31, // Stack IN: string, OUT: length - sactionCharToAscii = 0x32, // Stack IN: character, OUT: ASCII code - sactionAsciiToChar = 0x33, // Stack IN: ASCII code, OUT: character - sactionGetTime = 0x34, // Stack OUT: milliseconds since Player start - sactionMBStringExtract = 0x35, // Stack IN: string, index, count, OUT: substring - sactionMBCharToAscii = 0x36, // Stack IN: character, OUT: ASCII code - sactionMBAsciiToChar = 0x37, // Stack IN: ASCII code, OUT: character - - // Flash 5 Actions - sactionConstantPool = 0x88, // create a set of constant - sactionLess2 = 0x48, // Stack IN: number, number, OUT: bool - sactionEquals2 = 0x49, // Stack IN: number, number, OUT: bool - sactionCallMethod = 0x52, // Stack IN: string, string, number, [number] OUT: return value or undefined - - // Reserved for Quicktime - sactionQuickTime = 0xAA // I think this is what they are using... -}; - -enum { - kStringType = 0, - kFloatType = 1 -}; - -enum { - kSpritePosX = 0, - kSpritePosY, - kSpriteScaleX, - kSpriteScaleY, - kSpriteCurFrame, // (can only get but not set) - kSpriteTotalframes, // (can only get but not set) - kSpriteAlpha, // (a value between 0 and 100 %) - kSpriteVisible, // (if zero this means we don't hit test the object) - kSpriteWidth, // (can only get, but not set) - kSpriteHeight, // (can only get, but not set), - kSpriteRotate, - kSpriteTarget, - kSpriteLastFrameLoaded, - kSpriteName, - kSpriteDropTarget, - kSpriteURL, - kSpriteHighQuality, // (global) - kSpriteFocusRect, // (global) - kSpriteSoundBufferTime // (global) -}; - -// Mouse target conditions -enum { - stargetMouseEnter = 1, - stargetMouseExit = 2, - stargetMouseDown = 3, - stargetMouseUp = 4 -}; - -// Bitmap Alpha types -enum { - sbitsAlphaFlag = 0, // just a flag that the alpha channel is valid - sbitsAlphaCTab = 1, // alpha values for a color table - sbitsAlphaMask = 2 // a complete alpha mask for a jpeg image -}; - -// Server Packet Flags -enum { - spktObject = 0x00, // packet types - spktFrame = 0x01, - spktMask = 0x03, - - spktResend = 0x04, // flags for object packets - - spktSeekPoint = 0x04, // flags for frame packets - spktKeyFrame = 0x08 - - // Upper 4 bits are reserved for a sequence number -}; - -// Template Text Flags. -enum { - stextEnd = 0x00, // end of text flag - stextStyle = 0x80, // font style: followed by 8-bit flags (bold, italic, etc...) - stextFont = 0x81, // font identifier: followed by 16-bit font identifier - stextSize = 0x82, // font size: followed by 16-bit value in twips - stextColor = 0x83, // font color: followed by 32-bit RGB value - stextPosition = 0x84, // font position: followed by 8-bit position (normal, super or subscript) - stextKerning = 0x85, // font kerning: followed by 16-bit kerning value in twips - stextReserved1 = 0x86, // reserved value - stextReserved2 = 0x87, // reserved value - stextAlignment = 0x88, // paragraph alignment: followed by 8-bit alignment value - stextIndent = 0x89, // paragraph alignment: followed by 16-bit indent value in twips - stextLMargin = 0x8a, // paragraph left margin: followed by 16-bit left margin value in twips - stextRMargin = 0x8b, // paragraph right margin: followed by 16-bit right margin value in twips - stextLeading = 0x8c, // paragraph leading: followed by 16-bit leading value in twips - stextReserved3 = 0x8d, // reserved value - stextReserved4 = 0x8e, // reserved value - stextReserved5 = 0x8f // reserved value -}; - -// Template Text Style Flags -enum { - stextStyleNone = 0x00, - stextStyleBold = 0x01, - stextStyleItalic = 0x02 - // 6 bits left for expansion -}; - -// Template Text Position Values -enum { - stextPosNormal = 0x00, - stextPosSuperScript = 0x01, - stextPosSubScript = 0x02 -}; - -// Template Text Alignment Values -enum { - stextAlignLeft = 0x00, - stextAlignRight = 0x01, - stextAlignCenter = 0x02, - stextAlignJustify = 0x03 -}; - -// Template Text Flags -enum { - sfontFlagsBold = 0x01, - sfontFlagsItalic = 0x02, - sfontFlagsWideCodes = 0x04, - sfontFlagsWideOffsets = 0x08, - sfontFlagsANSI = 0x10, - sfontFlagsUnicode = 0x20, - sfontFlagsShiftJIS = 0x40, - sfontFlagsHasLayout = 0x80 -}; - -// GetURL2 methods -enum { - kHttpDontSend = 0, - kHttpSendUseGet = 1, - kHttpSendUsePost = 2, - kHttpLoadTarget = 0x40, - kHttpLoadVariables = 0x80 -}; - -// Edit Text Flags -enum { - seditTextFlagsHasFont = 0x0001, - seditTextFlagsHasMaxLength = 0x0002, - seditTextFlagsHasTextColor = 0x0004, - seditTextFlagsReadOnly = 0x0008, - seditTextFlagsPassword = 0x0010, - seditTextFlagsMultiline = 0x0020, - seditTextFlagsWordWrap = 0x0040, - seditTextFlagsHasText = 0x0080, - seditTextFlagsUseOutlines = 0x0100, - seditTextFlagsBorder = 0x0800, - seditTextFlagsNoSelect = 0x1000, - seditTextFlagsHasLayout = 0x2000 -}; - -// Drag constrants -enum { - sdragFromPoint = 0, - sdragFromCenter = 1 -}; -enum { - sdragNoConstraint = 0, - sdragRectConstraint = 1 -}; - -#endif diff --git a/toonz/sources/common/tvrender/tflash.cpp b/toonz/sources/common/tvrender/tflash.cpp index 67f2973..bb5d752 100644 --- a/toonz/sources/common/tvrender/tflash.cpp +++ b/toonz/sources/common/tvrender/tflash.cpp @@ -13,8 +13,6 @@ #include "trasterimage.h" #include "tsimplecolorstyles.h" #include "tcolorfunctions.h" -#include "F3SDK.h" -#include "FFixed.h" #include "tsop.h" #include "tropcm.h" #include "tsweepboundary.h" @@ -165,243 +163,6 @@ public: TImageP m_img; }; -class FlashColorStyle -{ -public: - TPixel m_color; - double m_thickness; - U32 m_id; - FlashColorStyle(TPixel color, double thickness, U32 id) - : m_color(color), m_thickness(thickness), m_id(id) {} -}; - -class TFlash::Imp -{ -public: - //double m_totMem; - bool m_supportAlpha; - int m_tw; - UCHAR m_version; - SCOORD m_sCoord1; - bool m_loaderAdded; - TAffine m_globalScale; - //typedef triple FlashImageData; - typedef vector FrameData; - FObjCollection m_tags; - FDTSprite *m_currSprite; - int m_currDepth; - int m_frameRate; - int m_currFrameIndex; - int m_lx, m_ly; - //ouble cameradpix, cameradpiy, inchFactor; - const TPalette *m_currPalette; - int m_soundRate; - Tiio::SwfWriterProperties m_properties; - - bool m_maskEnabled; - bool m_isMask; - - bool m_keepImages; - - std::list m_polylinesArray; - //std::set m_currentEdgeArray; - - TPixel32 m_lineColor; - double m_thickness; - - PolyStyle m_polyData; - //vector m_currentBgStyle; - int m_regionDepth; - int m_strokeCount; - /*TPixel32 m_fillColor; - TAffine m_fillMatrix; - TRaster32P m_texture; - GradientType m_gradientType; - TPixel32 m_gradientColor1, m_gradientColor2;*/ - //std::ofstream m_of; - - TAffine m_affine; - vector m_matrixStack; - map m_imagesMap; - map m_imagesScaleMap; - map m_edgeMap; - map m_texturesMap; - map m_autocloseMap; - map> m_strokeMap; - - vector m_outlines; - TPixel m_currStrokeColor; - //std::set m_outlineColors; - - FrameData *m_frameData; - FrameData *m_oldFrameData; - //bool m_notClipped; - vector m_sound; - int m_soundSize; - vector m_soundBuffer; - int m_soundOffset; - TVectorImageP m_currMask; - - vector *> m_toBeDeleted; - vector m_quadsToBeDeleted; - vector m_strokesToBeDeleted; - void drawPolygon(const vector &poly, bool isOutline); - int setFill(FDTDefineShape3 *shape); - inline FMatrix *affine2Matrix(const TAffine &aff); - void drawHangedObjects(); - void setStyles(const list &polylines, - vector &lineStyleID, vector &fillStyle1ID, vector &fillStyle2ID, - FDTDefineShape3 *polygon); - - U32 findStyle(const PolyStyle &p, std::map &idMap, FDTDefineShape3 *polygon); - void addEdge(const TEdge &e, TPointD &p0, TPointD &p1); - void addNewEdge(const TEdge &e); - //void closeRegion(int numEdges); - - void drawHangedOutlines(); - - void addAutoclose(biPoint &bp, int edgeIndex); - - inline TPoint toTwips(const TPointD &p) { return TPoint((int)(m_tw * p.x), (int)(m_tw * (-p.y))); } - - ~Imp() - { - clearPointerContainer(m_toBeDeleted); - clearPointerContainer(m_quadsToBeDeleted); - clearPointerContainer(m_strokesToBeDeleted); - if (m_oldFrameData) - delete m_oldFrameData; - - while (!m_soundBuffer.empty()) { - delete[] * m_soundBuffer.rbegin(); - m_soundBuffer.pop_back(); - } - } - - //=================================================================== - - /* - l'inizializzazione di m_currDepth e' 3 poiche' si riservanola depth 1 - per la clipcamera e la depth 2 per l'eventuale bottone (non visibile) - del play non automatico -*/ - Imp(int lx, int ly, int frameCount, int frameRate, TPropertyGroup *properties, bool keepImages) - : m_version(4), m_tags(), m_currSprite(0), m_currDepth(3), m_frameRate(frameRate), m_currFrameIndex(-1), m_lx(lx), m_ly(ly), m_currPalette(0), m_maskEnabled(false), m_isMask(false), m_polylinesArray(), m_lineColor(TPixel32::Black), m_thickness(0), m_polyData(), m_regionDepth(0), m_strokeCount(0), m_affine(), m_matrixStack(), m_imagesMap(), m_imagesScaleMap(), m_edgeMap(), m_texturesMap(), m_autocloseMap(), m_strokeMap(), m_outlines(), m_currStrokeColor(0, 0, 0, 0), m_frameData(0), m_oldFrameData(0) - //, m_notClipped(true) - , - m_sound(), m_soundSize(0), m_soundBuffer(), m_currMask(), m_toBeDeleted(), m_quadsToBeDeleted(), m_strokesToBeDeleted(), m_soundOffset(0), m_loaderAdded(false), m_globalScale(), m_keepImages(keepImages), m_supportAlpha(true), m_soundRate(c_soundRate) - //, m_totMem(0) - - //, m_of("c:\\temp\\boh.txt") - - { - m_tags.AddFObj(new FCTFrameLabel(new FString("DigitalVideoRm"))); - - if (properties) - m_properties.setProperties(properties); - //m_currentBgStyle.push_back(PolyStyle()); - - m_tw = 16384 / tmax(m_lx, m_ly); - if (m_tw > 20) - m_tw = 20; - Tw = m_tw; - m_sCoord1 = m_tw; - //addCameraClip(); - if (!m_properties.m_autoplay.getValue() && !m_properties.m_preloader.getValue()) - addPause(); - } - - void drawSubregions(TFlash *tf, const TRegion *r, const TPalette *palette); - void doDrawPolygon(list &polylines, int clippedShapes = 0); - int drawSegments(const vector segmentArray, bool isGradientColor); - int drawquads(const vector quadsArray); - int drawRectangle(const TRectD &rect); - int drawPolyline(vector &poly); - int drawEllipse(const TPointD ¢er, double radiusX, double radiusY); - void drawDot(const TPointD ¢er, double radius); - - void buildRegion(TFlash *tf, const TVectorImageP &vi, int regionIndex); - void buildStroke(TFlash *tf, const TVectorImageP &vi, int strokeIndex); - - //void addCameraClip(int index); - void writeFrame(TFlash *tf, bool isLast, int frameCountLoader, bool lastScene); - U16 getTexture(const PolyStyle &p, int &lx, int &ly); - - void addSoundToFrame(bool isLast); - - void addActionStop(); - void addLoader(); - void addSkipLoader(int jumpToFrame); - void addPause(); - void beginMask(); - void endMask(); - void addUrlLink(string url); - USHORT buildImage(const TImageP vi, TFlash *tf, double &scaleFactor, bool isMask); - USHORT buildVectorImage(const TVectorImageP &img, TFlash *tf, double &scaleFactor, bool isMask); - USHORT buildRasterImage(const TImageP rimg, TFlash *tf); - bool drawOutline(TStroke *s, bool separeDifferentColors = true); - inline void addEdgeStraightToShape(FDTDefineShape3 *shape, int x, int y); - inline void addEdgeStraightToShape(FDTDefineShape3 *shape, const TPoint &p); -}; - -//=================================================================== - -void TFlash::setSoundRate(int soundrate) -{ - m_imp->m_soundRate = soundrate; -} - -//=================================================================== - -void TFlash::enableAlphaChannelForRaster(bool supportAlpha) -{ - m_imp->m_supportAlpha = supportAlpha; -} - -//=================================================================== -namespace -{ -inline void addShape(FDTDefineShape3 *polygon, bool newStyle, bool lStyle, - bool fillStyle1, bool fillStyle0, bool move, int x, int y, - int style0, int style1, int lineStyle) -{ - polygon->AddShapeRec(new FShapeRecChange(newStyle, lStyle, fillStyle1, fillStyle0, move, - x, y, style0, style1, lineStyle, 0, 0)); -} - -inline void addShape(FDTDefineShape3 *polygon, bool newStyle, bool lStyle, - bool fillStyle1, bool fillStyle0, bool move, TPoint *p, - int style0, int style1, int lineStyle) -{ - polygon->AddShapeRec(new FShapeRecChange(newStyle, lStyle, fillStyle1, fillStyle0, move, - p ? p->x : 0, p ? p->y : 0, style0, style1, lineStyle, 0, 0)); -} -} - -//=================================================================== - -inline void TFlash::Imp::addEdgeStraightToShape(FDTDefineShape3 *shape, int x, int y) -{ - if (x == 0 && y == 0) - return; - - //m_of<< "ADD STRAIGHT LINE: "< 65535 || abs(y) > 65535) //flash non sa scrivere segmenti piu' lunghi di cosi', spezzo - { - shape->AddShapeRec(new FShapeRecEdgeStraight((x + 1) / 2, (y + 1) / 2)); - shape->AddShapeRec(new FShapeRecEdgeStraight(x / 2, y / 2)); - } else - shape->AddShapeRec(new FShapeRecEdgeStraight(x, y)); -} - -inline void TFlash::Imp::addEdgeStraightToShape(FDTDefineShape3 *shape, const TPoint &p) -{ - addEdgeStraightToShape(shape, p.x, p.y); -} - -//------------------------------------------------------------------- - double computeAverageThickness(const TStroke *s) { int count = s->getControlPointCount(); @@ -419,148 +180,6 @@ double computeAverageThickness(const TStroke *s) return resThick / (s->getControlPointCount() - 4); } -//------------------------------------------------------------------- - -inline FMatrix *TFlash::Imp::affine2Matrix(const TAffine &aff) -{ - if (aff != TAffine()) { - bool hasA11OrA22, hasA12OrA21; - - hasA11OrA22 = hasA12OrA21 = (aff.a12 != 0 || aff.a21 != 0); - if (!hasA12OrA21) - hasA11OrA22 = !areAlmostEqual(aff.det(), 1.0, 1e-3); - return new FMatrix(hasA11OrA22, FloatToFixed(aff.a11), FloatToFixed(aff.a22), - hasA12OrA21, FloatToFixed(-aff.a21), FloatToFixed(-aff.a12), - (TINT32)tround(aff.a13 * m_tw), -(TINT32)tround(aff.a23 * m_tw)); - } else - return 0; -} - -//------------------------------------------------------------------- - -int TFlash::Imp::drawSegments(const vector segmentArray, bool isGradientColor) -{ - int i; - assert(m_currSprite); - - if (segmentArray.empty()) - return 0; - - TPointD firstPoint = segmentArray[0].getP0(); - - FDTDefineShape3 *polygon = new FDTDefineShape3(); - - U32 lineStyleID1, lineStyleID2, lineStyleID4; - lineStyleID1 = polygon->AddLineStyle((int)m_thickness * m_tw, new FColor(m_lineColor.r, m_lineColor.g, m_lineColor.b, m_lineColor.m)); - if (isGradientColor) { - lineStyleID2 = polygon->AddLineStyle((int)m_thickness * m_tw, new FColor(m_lineColor.r, m_lineColor.g, m_lineColor.b, int(0.50 * (m_lineColor.m)))); - //U32 lineStyleID3 = polygon->AddLineStyle(m_tw, new FColor(m_color.r, m_color.g, m_color.b, int(0.25*(m_color.m)))); - lineStyleID4 = polygon->AddLineStyle((int)m_thickness * m_tw, new FColor(m_lineColor.r, m_lineColor.g, m_lineColor.b, int(0.125 * (m_lineColor.m)))); - } - polygon->FinishStyleArrays(); - - TRectD box; - box.x0 = firstPoint.x; - box.x1 = firstPoint.x; - box.y0 = firstPoint.y; - box.y1 = firstPoint.y; - - for (i = 0; i < (int)segmentArray.size(); i++) { - box += segmentArray[i].getBBox(); - TPoint p0 = convert(segmentArray[i].getP0()); - TPoint dp = convert(segmentArray[i].getP1()) - p0; - TPoint p((int)(m_tw * p0.x), (int)(-m_tw * p0.y)); - addShape(polygon, false, isGradientColor || (i == 0), false, false, true, &p, 0, - 0, (isGradientColor || (i == 0)) ? lineStyleID1 : 0); - - if (isGradientColor) - addEdgeStraightToShape(polygon, 5 * dp.x, -5 * dp.y); - else { - addEdgeStraightToShape(polygon, (int)(m_tw * dp.x), (int)(m_tw * -dp.y)); - continue; - } - - addShape(polygon, false, true, false, false, false, 0, 0, 0, lineStyleID2); - - addEdgeStraightToShape(polygon, 5 * dp.x, -5 * dp.y); - - addShape(polygon, false, true, false, false, false, 0, 0, 0, lineStyleID4); - - addEdgeStraightToShape(polygon, 5 * dp.x, -5 * dp.y); - } - - polygon->AddShapeRec(new FShapeRecEnd()); - polygon->setBounds(new FRect((int)(m_tw * box.x0), -(int)(m_tw * box.y0), (int)(m_tw * box.x1), -(int)(m_tw * box.y1))); - - m_tags.AddFObj(polygon); - - FCTPlaceObject2 *placePolygon = new FCTPlaceObject2(false, // ~ _hasClipDepth - false, true, false, - m_currDepth++, polygon->ID(), affine2Matrix(m_affine), 0, 0, 0, 0 /**/); - - m_currSprite->AddFObj(placePolygon); - return polygon->ID(); -} - -//------------------------------------------------------------------- - -int TFlash::Imp::drawquads(const vector quadsArray) -{ - int i; - assert(m_currSprite); - if (quadsArray.empty()) - return 0; - - TPointD firstPoint = quadsArray[0].getP0(); - - TRectD box; - box.x0 = firstPoint.x; - box.x1 = firstPoint.x; - box.y0 = firstPoint.y; - box.y1 = firstPoint.y; - - for (i = 0; i < (int)quadsArray.size(); i++) - box += quadsArray[i].getBBox(); - - FDTDefineShape3 *polygon = new FDTDefineShape3(new FRect((int)(m_tw * box.x0), -(int)(m_tw * box.y0), (int)(m_tw * box.x1), -(int)(m_tw * box.y1))); - - U32 lineStyleID; - lineStyleID = polygon->AddLineStyle(m_tw, new FColor(m_lineColor.r, m_lineColor.g, m_lineColor.b, m_lineColor.m)); - - polygon->FinishStyleArrays(); - - for (i = 0; i < (int)quadsArray.size(); i++) { - TPoint p0 = toTwips(quadsArray[i].getP0()); - - addShape(polygon, false, i == 0, false, false, true, &p0, 0, 0, (i == 0) ? lineStyleID : 0); - - TPoint dp1 = convert((quadsArray[i].getP1() - quadsArray[i].getP0())); - TPoint dp2 = convert((quadsArray[i].getP2() - quadsArray[i].getP1())); - - if ((dp1 == TPoint())) { - if (dp2 == TPoint()) - continue; - addEdgeStraightToShape(polygon, (int)(m_tw * dp2.x), (int)(m_tw * -dp2.y)); - } else if ((dp2 == TPoint())) - addEdgeStraightToShape(polygon, (int)(m_tw * dp1.x), (int)(m_tw * -dp1.y)); - else - polygon->AddShapeRec(new FShapeRecEdgeCurved((int)(m_tw * dp1.x), (int)(m_tw * -dp1.y), (int)(m_tw * dp2.x), (int)(m_tw * -dp2.y))); - } - - polygon->AddShapeRec(new FShapeRecEnd()); - - m_tags.AddFObj(polygon); - - FCTPlaceObject2 *placePolygon = new FCTPlaceObject2(false, // ~ _hasClipDepth - false, true, false, - m_currDepth++, polygon->ID(), affine2Matrix(m_affine), 0, 0, 0, 0 /**/); - - m_currSprite->AddFObj(placePolygon); - return polygon->ID(); -} - -//------------------------------------------------------------------- - void putquads(const TStroke *s, double w0, double w1, vector &quads) { int chunkIndex0, chunkIndex1, i; @@ -602,248 +221,15 @@ void computeOutlineBoundary(vector &outlines, list &po //------------------------------------------------------------------- -void TFlash::Imp::drawHangedObjects() -{ - //int i=0; - - if (!m_outlines.empty()) - computeOutlineBoundary(m_outlines, m_polylinesArray, m_currStrokeColor); - - m_currStrokeColor = TPixel::Transparent; - //m_outlineColors.clear(); - - if (!m_polylinesArray.empty()) { - doDrawPolygon(m_polylinesArray, false); - - std::list::iterator it; - for (it = m_polylinesArray.begin(); it != m_polylinesArray.end(); ++it) - if (it->m_toBeDeleted) - clearPointerContainer(it->m_quads); - m_polylinesArray.clear(); - m_edgeMap.clear(); - m_autocloseMap.clear(); - m_strokeMap.clear(); - } - - clearPointerContainer(m_strokesToBeDeleted); -} - -//------------------------------------------------------------------- - -int TFlash::Imp::drawPolyline(vector &poly) -{ - TRect box(1000, 1000, -1000, -1000); - - int i; - - FDTDefineShape3 *polyLine = new FDTDefineShape3(); - U16 id = polyLine->ID(); - - U32 fillID = setFill(polyLine); - - U32 lineStyleID = 0; - - if (m_thickness > 0) - lineStyleID = polyLine->AddLineStyle((int)(m_thickness * m_tw), new FColor(m_lineColor.r, m_lineColor.g, m_lineColor.b, m_lineColor.m)); - - polyLine->FinishStyleArrays(); - - TPointD currP = TPointD(m_tw * poly[0].x, -m_tw * poly[0].y); - TPoint oldIntCurrP, intCurrP = convert(currP); - - addShape(polyLine, false, lineStyleID != 0, false, fillID != 0, true, - &intCurrP, fillID, 0, lineStyleID); - - poly.push_back(poly.front()); //con le approssimazioni,le poly chiuse potrebbero non esserlo - for (i = 0; i < (int)poly.size() - 1; i++) { - currP += TPointD(m_tw * (+poly[i + 1].x - poly[i].x), m_tw * (-poly[i + 1].y + poly[i].y)); - oldIntCurrP = intCurrP; - intCurrP = convert(currP); - if (intCurrP != oldIntCurrP) - addEdgeStraightToShape(polyLine, intCurrP.x - oldIntCurrP.x, intCurrP.y - oldIntCurrP.y); - - if (intCurrP.x > box.x1) - box.x1 = intCurrP.x; - if (intCurrP.x < box.x0) - box.x0 = intCurrP.x; - if (intCurrP.y > box.y1) - box.y1 = intCurrP.y; - if (intCurrP.y < box.y0) - box.y0 = intCurrP.y; - } - poly.pop_back(); //ritolgo, per non alterare il vettore in ingresso alla funzione - - polyLine->AddShapeRec(new FShapeRecEnd()); - polyLine->setBounds(new FRect(box.x0, box.y0, box.x1, box.y1)); - m_tags.AddFObj(polyLine); - - FCTPlaceObject2 *placePoly = new FCTPlaceObject2(false, false, true, false, - m_currDepth++, id, affine2Matrix(m_affine), 0, 0, 0, 0); - - m_currSprite->AddFObj(placePoly); - return id; -} - -//------------------------------------------------------------------- - -int TFlash::Imp::drawRectangle(const TRectD &rect) -{ - TRect box = convert(TRectD(rect.x0 * m_tw, rect.y0 * m_tw, rect.x1 * m_tw, rect.y1 * m_tw)); - - FDTDefineShape3 *rectangle = new FDTDefineShape3(new FRect(box.x0, box.y0, box.x1, box.y1)); - U16 id = rectangle->ID(); - - U32 fillID = setFill(rectangle); - - U32 lineStyleID = 0; - - if (m_thickness > 0) - lineStyleID = rectangle->AddLineStyle((int)(m_thickness * m_tw), new FColor(m_lineColor.r, m_lineColor.g, m_lineColor.b, m_lineColor.m)); - - rectangle->FinishStyleArrays(); - - addShape(rectangle, false, true, false, fillID != 0, true, - box.x0, -box.y0, fillID, 0, lineStyleID); - - addEdgeStraightToShape(rectangle, box.x1 - box.x0, 0); - addEdgeStraightToShape(rectangle, 0, -box.y1 + box.y0); - addEdgeStraightToShape(rectangle, -box.x1 + box.x0, 0); - addEdgeStraightToShape(rectangle, 0, box.y1 - box.y0); - rectangle->AddShapeRec(new FShapeRecEnd()); - - m_tags.AddFObj(rectangle); - - FCTPlaceObject2 *placeRectangle = new FCTPlaceObject2(false, false, true, false, - m_currDepth++, id, affine2Matrix(m_affine), 0, 0, 0, 0); - - m_currSprite->AddFObj(placeRectangle); - return id; -} - -//------------------------------------------------------------------- - -//------------------------------------------------------------------- - -U16 TFlash::Imp::getTexture(const PolyStyle &p, int &lx, int &ly) -{ - assert(p.m_type == Texture); - assert(p.m_texture->getPixelSize() == 4); - lx = p.m_texture->getLx(), ly = p.m_texture->getLy(); - - std::map::iterator it = m_texturesMap.find(p.m_texture.getPointer()); - if (it != m_texturesMap.end()) - return (*it).second; - - assert(p.m_texture->getWrap() == lx); - - std::vector *buffer = new std::vector(); - m_toBeDeleted.push_back(buffer); - Tiio::createJpg(*buffer, p.m_texture, m_properties.m_jpgQuality.getValue()); - FDTDefineBitsJPEG2 *bitmap = new FDTDefineBitsJPEG2((UCHAR *)&(*buffer)[0], buffer->size()); - - m_tags.AddFObj(bitmap); - m_texturesMap[p.m_texture.getPointer()] = bitmap->ID(); - //delete bufout; - return bitmap->ID(); -} - -//------------------------------------------------------------------- +// TFlash::drawSegments and TFlash::drawquads cannot be inline defined +// since size of TSegment and TQuadratic are unkown in the header -void TFlash::Imp::drawDot(const TPointD ¢er, double radius) +void TFlash::drawSegments(const vector segmentArray, bool isGradientColor) { - FlashPolyline quads; - quads.m_lineStyle.m_type = Centerline; - quads.m_lineStyle.m_thickness = radius * 1.5; - quads.m_lineStyle.m_color1 = (m_polyData.m_color1 == TPixel::Transparent) ? m_lineColor : m_polyData.m_color1; - - //quads.m_lineStyle.m_isRegion = false; - //quads.m_lineStyle.m_isHole = false; - - int x = (int)((m_tw * center.x) + 0.5); - x += 3; - TPointD aux = TPointD((double)x / m_tw, center.y); - - quads.m_quads.push_back((TQuadratic *)new TQuadratic(center, 0.5 * (center + aux), aux)); - m_polylinesArray.push_back(quads); } -//------------------------------------------------------------------- - -int TFlash::Imp::drawEllipse(const TPointD ¢er, double radiusX, double radiusY) -{ - int xmin = (int)(m_tw * (center.x - radiusX)); // x coordinate of the upper left corner of the bounding rectangle - int ymin = (int)(m_tw * (-center.y - radiusY)); // y coordinate of the upper left corner of the bounding rectangle - int xmax = (int)(m_tw * (center.x + radiusX)); // x coordinate of the bottom right corner of the bounding rectangle - int ymax = (int)(m_tw * (-center.y + radiusY)); // y coordinate of the bottom right corner of the bounding rectangle - int dx = xmax - xmin; // dx is width diameter - int dy = ymax - ymin; // dy is height diameter - - // connect a serie of curves to draw the circle - int c1dx = (int)(0.1465 * dx); - int c1dy = (int)(0.1465 * dy); - int c2dx = (int)(0.2070 * dx); - int c2dy = (int)(0.2070 * dy); - - if (c1dx == 0 || c1dy == 0 || c2dx == 0 || c2dy == 0) - return 0; - - FDTDefineShape3 *ellipse = new FDTDefineShape3(new FRect(xmin, ymin, xmax, ymax)); - - U16 ellipseID = ellipse->ID(); - U32 fillID = setFill(ellipse); - - U32 lineStyleID = 0; - if (m_thickness > 0) - lineStyleID = ellipse->AddLineStyle((int)(2 * m_thickness * m_tw), - new FColor(m_lineColor.r, m_lineColor.g, m_lineColor.b, m_lineColor.m)); - - ellipse->FinishStyleArrays(); - - addShape(ellipse, false, lineStyleID > 0, false, fillID != 0, true, - xmax, -(int)(m_tw * center.y), fillID, 0, lineStyleID); - - ellipse->AddShapeRec(new FShapeRecEdgeCurved(0, -c2dy, -c1dx, -c1dy)); - ellipse->AddShapeRec(new FShapeRecEdgeCurved(-c1dx, -c1dy, -c2dx, 0)); - ellipse->AddShapeRec(new FShapeRecEdgeCurved(-c2dx, 0, -c1dx, c1dy)); - ellipse->AddShapeRec(new FShapeRecEdgeCurved(-c1dx, c1dy, 0, c2dy)); - ellipse->AddShapeRec(new FShapeRecEdgeCurved(0, c2dy, c1dx, c1dy)); - ellipse->AddShapeRec(new FShapeRecEdgeCurved(c1dx, c1dy, c2dx, 0)); - ellipse->AddShapeRec(new FShapeRecEdgeCurved(c2dx, 0, c1dx, -c1dy)); - ellipse->AddShapeRec(new FShapeRecEdgeCurved(c1dx, -c1dy, 0, -c2dy)); - - //TPoint dp1 = convert(m_tw*(outPolyline[0]->getP0()-outPolyline.back()->getP2())); - - ellipse->AddShapeRec(new FShapeRecEnd()); - - m_tags.AddFObj(ellipse); - FCTPlaceObject2 *placePolygon = new FCTPlaceObject2(false, // ~ _hasClipDepth - false, true, false, - m_currDepth++, ellipseID, affine2Matrix(m_affine), 0, 0, 0, 0 /**/); - - m_currSprite->AddFObj(placePolygon); - return ellipseID; -} -//------------------------------------------------------------------- -int TFlash::Imp::setFill(FDTDefineShape3 *shape) +void TFlash::drawquads(const vector quadsArray) { - if (m_polyData.m_type == Texture) { - int lx, ly; - U16 texId = getTexture(m_polyData, lx, ly); - - FMatrix *app = affine2Matrix(m_polyData.m_matrix * TScale(2048.0 / lx, 2048.0 / ly)); - return shape->AddFillStyle(new FFillStyleBitmap(true, texId, app)); - } else if (m_polyData.m_type == LinearGradient || m_polyData.m_type == RadialGradient) { - FGradient *grad = new FGradient(); - FGradRecord *gradRec1 = new FGradRecord(0, new FColor(m_polyData.m_color1.r, m_polyData.m_color1.g, m_polyData.m_color1.b, m_polyData.m_color1.m)); - FGradRecord *gradRec2 = new FGradRecord(255, new FColor(m_polyData.m_color2.r, m_polyData.m_color2.g, m_polyData.m_color2.b, m_polyData.m_color2.m)); - grad->Add(gradRec1); - grad->Add(gradRec2); - return shape->AddFillStyle(new FFillStyleGradient(m_polyData.m_type == LinearGradient, affine2Matrix(m_polyData.m_matrix * TScale(10.0)), grad)); - } else if (m_polyData.m_type == Solid) { - FColor *color1 = new FColor(m_polyData.m_color1.r, m_polyData.m_color1.g, m_polyData.m_color1.b, m_polyData.m_color1.m); - return shape->AddSolidFillStyle(color1); - } - return 0; } //------------------------------------------------------------------- @@ -908,432 +294,59 @@ bool PolyStyle::operator<(const PolyStyle &p) const //------------------------------------------------------------------- -U32 TFlash::Imp::findStyle(const PolyStyle &p, std::map &idMap, - FDTDefineShape3 *polygon) +void computeQuadChain(const TEdge &e, + vector &quadArray, vector &toBeDeleted) { - U32 styleID = 0; - std::map::iterator it; - it = idMap.find(p); + int chunk_b, chunk_e, chunk = -1; + double t_b, t_e, w0, w1; + TThickQuadratic *q_b = 0, *q_e = 0; + TThickQuadratic dummy; + bool reversed = false; + + if (e.m_w0 > e.m_w1) { + reversed = true; + w0 = e.m_w1; + w1 = e.m_w0; + } else { + w0 = e.m_w0; + w1 = e.m_w1; + } + + if (w0 == 0.0) + chunk_b = 0; + else { + if (e.m_s->getChunkAndT(w0, chunk, t_b)) + assert(false); + q_b = new TThickQuadratic(); + toBeDeleted.push_back(q_b); + e.m_s->getChunk(chunk)->split(t_b, dummy, *q_b); + chunk_b = chunk + 1; + } - if (it != idMap.end()) - return (*it).second; + if (w1 == 1.0) + chunk_e = e.m_s->getChunkCount() - 1; else { - switch (p.m_type) { - case Centerline: { - FColor *color = new FColor(p.m_color1.r, p.m_color1.g, - p.m_color1.b, p.m_color1.m); - int thickness = (int)(2 * p.m_thickness * m_tw); - if (p.m_thickness > 0 && thickness == 0) - thickness = 1; + if (e.m_s->getChunkAndT(w1, chunk_e, t_e)) + assert(false); + q_e = new TThickQuadratic(); + toBeDeleted.push_back(q_e); + if (chunk_e == chunk) { + if (q_b) { + t_e = q_b->getT(e.m_s->getChunk(chunk)->getPoint(t_e)); + q_b->split(t_e, *q_e, dummy); + } else + e.m_s->getChunk(0)->split(t_e, *q_e, dummy); - styleID = polygon->AddLineStyle(thickness, color); - } - CASE Solid: - { - if (p.m_color1.m == 0) - styleID = 0; - else { - FColor *color = new FColor(p.m_color1.r, p.m_color1.g, - p.m_color1.b, p.m_color1.m); - styleID = polygon->AddSolidFillStyle(color); - } - } - CASE Texture: - { - try { - int lx, ly; - U16 texId = getTexture(p, lx, ly); - FMatrix *app = affine2Matrix(p.m_matrix * TScale(2048.0 / lx, 2048.0 / ly)); - styleID = polygon->AddFillStyle(new FFillStyleBitmap(true, texId, app)); - } catch (TException &) { - FColor *color = new FColor(0, 0, 0, 255); - styleID = polygon->AddSolidFillStyle(color); - } - } - CASE RadialGradient: - { - FGradient *grad = new FGradient(); - //FGradRecord *gradRec1 = new FGradRecord(0, new FColor(p.m_color1.r, p.m_color1.g, p.m_color1.b, p.m_color1.m)); - //FGradRecord *gradRec2 = new FGradRecord(255, new FColor(p.m_color2.r, p.m_color2.g, p.m_color2.b, p.m_color2.m)); - int fac = (int)(127.0 - 0.56 * p.m_smooth); - assert(fac >= 0 && fac < 128); - FGradRecord *gradRec1 = new FGradRecord(fac, new FColor(p.m_color1.r, p.m_color1.g, p.m_color1.b, p.m_color1.m)); - FGradRecord *gradRec2 = new FGradRecord(255 - fac, new FColor(p.m_color2.r, p.m_color2.g, p.m_color2.b, p.m_color2.m)); - grad->Add(gradRec1); - grad->Add(gradRec2); - styleID = polygon->AddFillStyle(new FFillStyleGradient(false, affine2Matrix(p.m_matrix * TScale(15.0)), grad)); - } - CASE LinearGradient: - { - FGradient *grad = new FGradient(); - FGradRecord *gradRec1 = new FGradRecord(0, new FColor(p.m_color1.r, p.m_color1.g, p.m_color1.b, p.m_color1.m)); - FGradRecord *gradRec2 = new FGradRecord(255, new FColor(p.m_color2.r, p.m_color2.g, p.m_color2.b, p.m_color2.m)); - grad->Add(gradRec1); - grad->Add(gradRec2); - styleID = polygon->AddFillStyle(new FFillStyleGradient(true, affine2Matrix(p.m_matrix * TScale(10.0)), grad)); + if (!reversed) + quadArray.push_back(q_e); + else { + quadArray.push_back(new TQuadratic(q_e->getP2(), q_e->getP1(), q_e->getP0())); + toBeDeleted.push_back(quadArray.back()); } - DEFAULT: - assert(false); + return; } - idMap[p] = styleID; - return styleID; - } -} - -//------------------------------------------------------------------- - -void TFlash::Imp::setStyles(const list &polylines, - vector &lineStyleID, vector &fillStyle1ID, vector &fillStyle2ID, FDTDefineShape3 *polygon) -{ - int i; - std::list::const_iterator it, itOld; - - std::map idMap; - - for (i = 0, it = polylines.begin(); it != polylines.end(); ++i, itOld = it, ++it) { - if (it->m_lineStyle.m_type == None) - lineStyleID[i] = 0; - else if (i > 0 && it->m_lineStyle == itOld->m_lineStyle) - lineStyleID[i] = lineStyleID[i - 1]; - else - lineStyleID[i] = findStyle(it->m_lineStyle, idMap, polygon); - - if (it->m_fillStyle1.m_type == None) - fillStyle1ID[i] = 0; - else if (i > 0 && it->m_fillStyle1 == itOld->m_fillStyle1) - fillStyle1ID[i] = fillStyle1ID[i - 1]; - else - fillStyle1ID[i] = findStyle(it->m_fillStyle1, idMap, polygon); - - if (it->m_fillStyle2.m_type == None) - fillStyle2ID[i] = 0; - else if (i > 0 && it->m_fillStyle2 == itOld->m_fillStyle2) - fillStyle2ID[i] = fillStyle2ID[i - 1]; - else - fillStyle2ID[i] = findStyle(it->m_fillStyle2, idMap, polygon); - } -} - -//------------------------------------------------------------------- - -TPoint drawPoint(const TQuadratic *poly, FDTDefineShape3 *polygon, double radius, TRect &box) -{ - TPointD center = poly->getP0(); - int xmin = (int)(Tw * (center.x - radius)); // x coordinate of the upper left corner of the bounding rectangle - int ymin = (int)(Tw * (-center.y - radius)); // y coordinate of the upper left corner of the bounding rectangle - int xmax = (int)(Tw * (center.x + radius)); // x coordinate of the bottom right corner of the bounding rectangle - int ymax = (int)(Tw * (-center.y + radius)); // y coordinate of the bottom right corner of the bounding rectangle - int dx = xmax - xmin; // dx is width diameter - int dy = ymax - ymin; // dy is height diameter - - // connect a serie of curves to draw the circle - int c1dx = (int)(0.1465 * dx); - int c1dy = (int)(0.1465 * dy); - int c2dx = (int)(0.2070 * dx); - int c2dy = (int)(0.2070 * dy); - - if (c1dx == 0 || c1dy == 0 || c2dx == 0 || c2dy == 0) - return TPoint(); - - if (xmax > box.x1) - box.x1 = xmax; - if (xmin < box.x0) - box.x0 = xmin; - if (ymax > box.y1) - box.y1 = ymax; - if (ymin < box.y0) - box.y0 = ymin; - - //polygon->AddShapeRec(new FShapeRecEdgeCurved(dp1.x, -dp1.y, dp2.x, -dp2.y)); - // - - addShape(polygon, false, true, false, false, true, - xmax, (int)(Tw * -center.y), 0, 0, 0); - - polygon->AddShapeRec(new FShapeRecEdgeCurved(0, -c2dy, -c1dx, -c1dy)); - polygon->AddShapeRec(new FShapeRecEdgeCurved(-c1dx, -c1dy, -c2dx, 0)); - polygon->AddShapeRec(new FShapeRecEdgeCurved(-c2dx, 0, -c1dx, c1dy)); - polygon->AddShapeRec(new FShapeRecEdgeCurved(-c1dx, c1dy, 0, c2dy)); - polygon->AddShapeRec(new FShapeRecEdgeCurved(0, c2dy, c1dx, c1dy)); - polygon->AddShapeRec(new FShapeRecEdgeCurved(c1dx, c1dy, c2dx, 0)); - polygon->AddShapeRec(new FShapeRecEdgeCurved(c2dx, 0, c1dx, -c1dy)); - polygon->AddShapeRec(new FShapeRecEdgeCurved(c1dx, -c1dy, 0, -c2dy)); - - return TPoint(xmax, (int)(Tw * -center.y)); -} - -//------------------------------------------------------------------- -inline void updateBBox(TRect &box, const TPoint &p) -{ - if (p.x > box.x1) - box.x1 = p.x; - if (p.x < box.x0) - box.x0 = p.x; - if (p.y > box.y1) - box.y1 = p.y; - if (p.y < box.y0) - box.y0 = p.y; -} - -void TFlash::Imp::doDrawPolygon(list &polylines, int clippedShapes) -{ - assert(m_currSprite); - assert(!polylines.empty()); - - FDTDefineShape3 *polygon = new FDTDefineShape3(); - U16 polygonID = polygon->ID(); - - //U32 fillID = 0; - - /* -if (isOutline || isRegion) - fillID = ((clippedShapes>0)?polygon->AddSolidFillStyle( new FColor(0, 0, 0)):setFill(polygon)); -*/ - - std::map> idMap; - - vector fillStyle1ID(polylines.size()); - vector fillStyle2ID(polylines.size()); - vector lineStyleID(polylines.size()); - - int i, j; - setStyles(polylines, lineStyleID, fillStyle1ID, fillStyle2ID, polygon); - polygon->FinishStyleArrays(); - - std::list::iterator itOld, it = polylines.begin(), it_e = polylines.end(); - - for (i = 0; it != it_e; ++i, ++it) //le maschere non vengono bene con regioni con fill2 opaco e fill1 trasparente. le giro - if (fillStyle2ID[i] != 0 && fillStyle1ID[i] == 0) { - fillStyle1ID[i] = fillStyle2ID[i]; - fillStyle2ID[i] = 0; - vector &v = (*it).m_quads; - std::reverse(v.begin(), v.end()); - for (j = 0; j < (int)v.size(); j++) { - v[j] = new TQuadratic(v[j]->getP2(), v[j]->getP1(), v[j]->getP0()); - m_quadsToBeDeleted.push_back(v[j]); - } - } - - TPoint lastPoint, firstPoint = toTwips(polylines.front().m_quads[0]->getP0()); - - TPoint currP = TPoint(firstPoint.x, firstPoint.y); - TRect box; - box.x0 = firstPoint.x; - box.x1 = firstPoint.x; - box.y0 = firstPoint.y; - box.y1 = firstPoint.y; - - //const PolyStyle& p = polylines.front().m_fillStyle1; - - //assert(firstPoint.x!=0 && firstPoint.y!=0); - - U32 currLineStyle = 0, currFillStyle1 = 0, currFillStyle2 = 0; - - //if (lineStyleID[0]!=0 && (isOutline||p.m_isRegion)) - currLineStyle = lineStyleID[0]; - - //if (fillStyle1ID[0]!=0 && (isOutline||p.m_isRegion)) - currFillStyle1 = fillStyle1ID[0]; - //if (fillStyle2ID[0]!=0 && p.m_isRegion) - currFillStyle2 = fillStyle2ID[0]; - - //m_of << "DRAW POLYGON da (" << firstPoint.x<< ", "<m_skip) //m_of << " SKIPPOOOOO! " < &poly = it->m_quads; - firstPoint = toTwips(poly[0]->getP0()); - lastPoint = toTwips(poly.back()->getP2()); - /* m_of << " POLYLINE # da ( " - < 0) { - //faccio una move se il salto e' sensato...evito di mettere inutili addShapeRec nell'swf per renderlo piu' piccolo... - - bool isMove = (currP != firstPoint); - - //bool isMove = (currP.x-firstPoint.x)<-20 || (currP.x-firstPoint.x)>20||(currP.y-firstPoint.y)<-20||(currP.y-firstPoint.y)>20; - currP = firstPoint; - - updateBBox(box, currP); - - bool isLineStyle = (lineStyleID[j] != currLineStyle); - - if (isLineStyle) - currLineStyle = lineStyleID[j]; - - bool isFillStyle1 = (fillStyle1ID[j] != currFillStyle1); //se sto passando da una regione a una linea, devo mettere a zero lo stile di fill! - if (isFillStyle1) - currFillStyle1 = fillStyle1ID[j]; - - bool isFillStyle2 = (fillStyle2ID[j] != currFillStyle2); //se sto passando da una regione a una linea, devo mettere a zero lo stile di fill! - if (isFillStyle2) - currFillStyle2 = fillStyle2ID[j]; - assert(firstPoint.x != 0 || firstPoint.y != 0); - - if (isMove || isLineStyle || isFillStyle1 || isFillStyle2) - addShape(polygon, false, isLineStyle, isFillStyle2, isFillStyle1, isMove, &firstPoint, - currFillStyle1, currFillStyle2, currLineStyle); - } - - for (i = 0; i < (int)poly.size(); i++) { - if (i > 0) { - TPoint dp = toTwips(poly[i]->getP0()) - toTwips(poly[i - 1]->getP2()); - if (dp.x != 0 || dp.y != 0) { - addEdgeStraightToShape(polygon, dp); - currP.x += dp.x; - currP.y += dp.y; - } - } - - if (!it->m_isPoint) { - TPoint dp1 = toTwips(poly[i]->getP1()) - toTwips(poly[i]->getP0()); - TPoint dp2 = toTwips(poly[i]->getP2()) - toTwips(poly[i]->getP1()); - if (dp1 == dp2) - addEdgeStraightToShape(polygon, dp1 + dp2); - else if (dp1 == TPoint(0, 0)) - addEdgeStraightToShape(polygon, dp2); - else if (dp2 == TPoint(0, 0)) - addEdgeStraightToShape(polygon, dp1); - else - polygon->AddShapeRec(new FShapeRecEdgeCurved(dp1.x, dp1.y, dp2.x, dp2.y)); - - currP.x += dp1.x + dp2.x; - currP.y += dp1.y + dp2.y; - //m_of<<"CURRPOINT: ("<m_lineStyle.m_thickness, box); - currLineStyle = 0; - } - - updateBBox(box, currP); - } - - if (poly.size() != 1 && currP != lastPoint) { - addEdgeStraightToShape(polygon, lastPoint - currP); - currP.x += lastPoint.x - currP.x; - currP.y += lastPoint.y - currP.y; - //m_of<<"AGGIUNTO RACCORDO!CURRPOINT: ("<AddShapeRec(new FShapeRecEnd()); - - box = box.enlarge((int)(m_thickness * m_tw) + 1000); - - polygon->setBounds(new FRect(box.x0, box.y0, box.x1, box.y1)); - m_tags.AddFObj(polygon); - //m_of<< "aggiungo poly " <ID()<< " a depth "< 0, // ~ _hasClipDepth - false, true, false, - m_currDepth, polygonID, - affine2Matrix(m_affine), 0, 0, 0, - (clippedShapes > 0) ? m_currDepth + clippedShapes : 0 /**/); - - m_currDepth++; - m_currSprite->AddFObj(placePolygon); -} - -//------------------------------------------------------------------- -#ifdef LEVO -void TFlash::Imp::addCameraClip(int index) -{ - m_notClipped = false; - FRect *clipRectBounds = new FRect(0, 0, m_lx * m_tw, m_ly * m_tw); //coordinate values are in TWIPS - - FDTDefineShape3 *clipRectangle = new FDTDefineShape3(clipRectBounds); - - FColor black = FColor(0, 0, 0); - - U32 blackfillID = clipRectangle->AddSolidFillStyle(new FColor(black)); - clipRectangle->FinishStyleArrays(); - addShape(clipRectangle, false, true, true, false, true, 0, 0, blackfillID, 0); - - addEdgeStraightToShape(clipRectangle, 0, m_ly * m_tw); - addEdgeStraightToShape(clipRectangle, m_lx * m_tw, 0); - addEdgeStraightToShape(clipRectangle, 0, -m_ly * m_tw); - addEdgeStraightToShape(clipRectangle, -m_lx * m_tw, 0); - clipRectangle->AddShapeRec(new FShapeRecEnd()); - - // la depth e' 1 perche' riservata per la camera - m_tags.InsertFObj(index, new FCTPlaceObject2(true, false, true, false, 1, - clipRectangle->ID(), 0, 0, 0, 0, (U16)60000 /**/)); - m_tags.InsertFObj(index, clipRectangle); -} -#endif -//------------------------------------------------------------------- - -void computeQuadChain(const TEdge &e, - vector &quadArray, vector &toBeDeleted) -{ - int chunk_b, chunk_e, chunk = -1; - double t_b, t_e, w0, w1; - TThickQuadratic *q_b = 0, *q_e = 0; - TThickQuadratic dummy; - bool reversed = false; - - if (e.m_w0 > e.m_w1) { - reversed = true; - w0 = e.m_w1; - w1 = e.m_w0; - } else { - w0 = e.m_w0; - w1 = e.m_w1; - } - - if (w0 == 0.0) - chunk_b = 0; - else { - if (e.m_s->getChunkAndT(w0, chunk, t_b)) - assert(false); - q_b = new TThickQuadratic(); - toBeDeleted.push_back(q_b); - e.m_s->getChunk(chunk)->split(t_b, dummy, *q_b); - chunk_b = chunk + 1; - } - - if (w1 == 1.0) - chunk_e = e.m_s->getChunkCount() - 1; - else { - if (e.m_s->getChunkAndT(w1, chunk_e, t_e)) - assert(false); - q_e = new TThickQuadratic(); - toBeDeleted.push_back(q_e); - if (chunk_e == chunk) { - if (q_b) { - t_e = q_b->getT(e.m_s->getChunk(chunk)->getPoint(t_e)); - q_b->split(t_e, *q_e, dummy); - } else - e.m_s->getChunk(0)->split(t_e, *q_e, dummy); - - if (!reversed) - quadArray.push_back(q_e); - else { - quadArray.push_back(new TQuadratic(q_e->getP2(), q_e->getP1(), q_e->getP0())); - toBeDeleted.push_back(quadArray.back()); - } - return; - } - e.m_s->getChunk(chunk_e)->split(t_e, *q_e, dummy); - chunk_e--; + e.m_s->getChunk(chunk_e)->split(t_e, *q_e, dummy); + chunk_e--; } int i; @@ -1366,1441 +379,4 @@ void computeQuadChain(const TEdge &e, //------------------------------------------------------------------- -namespace -{ -inline bool isOuterEdge(const FlashPolyline &p) -{ - bool isTrasp1 = p.m_fillStyle1.m_type == None || (p.m_fillStyle1.m_type == Solid && p.m_fillStyle1.m_color1.m == 0); - bool isTrasp2 = p.m_fillStyle2.m_type == None || (p.m_fillStyle2.m_type == Solid && p.m_fillStyle2.m_color1.m == 0); - return (isTrasp1 ^ isTrasp2); -} -} - -//------------------------------------------------------------------- - -void TFlash::Imp::addAutoclose(biPoint &bp, int edgeIndex) -{ - std::map::iterator it = m_autocloseMap.end(); - - bp.revert(); - it = m_autocloseMap.find(bp); - bp.revert(); - if (it != m_autocloseMap.end()) - (*it).second->m_fillStyle2 = m_polyData; - else if ((it = m_autocloseMap.find(bp)) != m_autocloseMap.end()) - (*it).second->m_fillStyle1 = m_polyData; - else { - FlashPolyline quadArray1; - quadArray1.m_depth = m_regionDepth * m_strokeCount + edgeIndex + 1; - quadArray1.m_fillStyle1 = m_polyData; - quadArray1.m_quads.push_back(new TQuadratic(bp.p0, .5 * (bp.p0 + bp.p1), bp.p1)); - m_quadsToBeDeleted.push_back(quadArray1.m_quads.back()); - - m_polylinesArray.push_back(quadArray1); - m_autocloseMap[bp] = &m_polylinesArray.back(); - } - - if (m_isMask && it != m_autocloseMap.end()) - (*it).second->m_skip = !isOuterEdge(*(*it).second); -} - -//------------------------------------------------------------------- - -void TFlash::Imp::addNewEdge(const TEdge &e) -{ - m_polylinesArray.push_back(FlashPolyline()); - FlashPolyline &quadArray = m_polylinesArray.back(); - m_edgeMap[e] = &m_polylinesArray.back(); - - computeQuadChain(e, quadArray.m_quads, m_quadsToBeDeleted); - - quadArray.m_fillStyle1 = m_polyData; - quadArray.m_depth = m_regionDepth * m_strokeCount + e.m_index + 1; - - if (e.m_s->getAverageThickness() > 0) { - assert(m_currPalette); - - TStrokeProp *prop = e.m_s->getProp(); - /////questo codice stava dentro tstroke::getprop///////// - TColorStyle *style = m_currPalette->getStyle(e.m_s->getStyle()); - if (!style->isStrokeStyle() || style->isEnabled() == false) - prop = 0; - else { - if (!prop || style != prop->getColorStyle()) { - e.m_s->setProp(style->makeStrokeProp(e.m_s)); - prop = e.m_s->getProp(); - } - } - - /////////// - if (prop) { - OutlineStrokeProp *aux = dynamic_cast(prop); - - if (aux) { - const TSolidColorStyle *st = dynamic_cast(aux->getColorStyle()); - if (st) { - quadArray.m_lineStyle.m_color1 = st->getMainColor(); - quadArray.m_lineStyle.m_type = Centerline; - quadArray.m_lineStyle.m_thickness = e.m_s->getAverageThickness(); - } - } - } - //quadArray.m_lineStyle.m_color1 = e.m_s->getStyle(); - } - if (quadArray.m_fillStyle1.m_type == None) { - //assert(clippedShapes>0); - quadArray.m_fillStyle1.m_type = Solid; - quadArray.m_fillStyle1.m_color1 = TPixel::Black; - } -} - -//------------------------------------------------------------------- - -void TFlash::Imp::addEdge(const TEdge &e, TPointD &pBegin, TPointD &pEnd) -{ - TPointD auxP = pEnd; - - TEdge aux = e; - tswap(aux.m_w0, aux.m_w1); - std::map::iterator it; - //PolyStyle style = m_polyData; - std::stack auxs; - - if ((it = m_edgeMap.find(aux)) != m_edgeMap.end()) { - (*it).second->m_fillStyle2 = m_polyData; - - pBegin = (*it).second->m_quads.back()->getP2(); - pEnd = (*it).second->m_quads.front()->getP0(); - } else if ((it = m_edgeMap.find(e)) != m_edgeMap.end()) { - (*it).second->m_fillStyle1 = m_polyData; - - pBegin = (*it).second->m_quads.front()->getP0(); - pEnd = (*it).second->m_quads.back()->getP2(); - } else { - addNewEdge(e); - pBegin = m_polylinesArray.back().m_quads[0]->getP0(); - pEnd = m_polylinesArray.back().m_quads.back()->getP2(); - } - - if (m_isMask && it != m_edgeMap.end()) //per fare le maschere, non metto gli edge che hanno entrambe le sponde non trasparenti - (*it).second->m_skip = !isOuterEdge(*(*it).second); - - if (!areTwEqual(auxP, pBegin)) { - biPoint tmp(auxP, pBegin); - addAutoclose(tmp, e.m_index); - } - - if (m_properties.m_lineQuality.getValue() == ConstantLines) { - std::map>::iterator it; - - it = m_strokeMap.find(e.m_s); - if (it != m_strokeMap.end()) { - std::set::iterator it1; - wChunk wc(tmin(e.m_w0, e.m_w1), tmax(e.m_w0, e.m_w1)); - - it1 = it->second.find(wc); - if (it1 == it->second.end()) - it->second.insert(wc); - } else { - std::set chunkSet; - chunkSet.insert(wChunk(tmin(e.m_w0, e.m_w1), tmax(e.m_w0, e.m_w1))); - m_strokeMap[e.m_s] = chunkSet; - } - } -} - -//------------------------------------------------------------------- - -void TFlash::Imp::drawSubregions(TFlash *tf, const TRegion *r, const TPalette *palette) -{ - int i; - - //m_currentBgStyle.push_back(m_polyData); - m_regionDepth++; - - for (i = 0; i < (int)r->getSubregionCount(); i++) { - TRegion *region = r->getSubregion(i); - TRegionProp *prop = region->getProp(/*palette*/); - ////prima questo codice stava dentro tregion::getprop//// - int styleId = region->getStyle(); - //if (styleId) - { - TColorStyle *style = palette->getStyle(styleId); - if (!style->isRegionStyle() || style->isEnabled() == false) - prop = 0; - else if (!prop || style != prop->getColorStyle()) { - region->setProp(style->makeRegionProp(region)); - prop = region->getProp(); - } - - //////// - if (prop) - prop->draw(*tf); - - //m_currentBgStyle.push_back(m_polyData); - drawSubregions(tf, region, palette); - //m_currentBgStyle.pop_back(); - } - } - m_regionDepth--; - - //m_currentBgStyle.pop_back(); -} -//------------------------------------------------------------------- - -bool comparevector(const FlashPolyline &p1, const FlashPolyline &p2) -{ - return p2.m_depth > p1.m_depth; -} - -//------------------------------------------------------------------- - -void TFlash::Imp::buildRegion(TFlash *tf, const TVectorImageP &vi, int regionIndex) -{ - TRegion *region = vi->getRegion(regionIndex); - TRectD rect = region->getBBox(); - double lx = rect.x1 - rect.x0; - double ly = rect.y1 - rect.y0; - if (lx < 0.5 || ly < 0.5) - return; - - TRegionProp *prop = region->getProp(); - - int styleId = region->getStyle(); - - TColorStyle *style = vi->getPalette()->getStyle(styleId); - - if (!style->isRegionStyle() || style->isEnabled() == false) - prop = 0; - else if (!prop || style != prop->getColorStyle()) { - region->setProp(style->makeRegionProp(region)); - prop = region->getProp(); - } - - tf->setThickness(0); - if (prop) - prop->draw(*tf); - - drawSubregions(tf, region, m_currPalette); -} - -//------------------------------------------------------------------- - -void TFlash::Imp::buildStroke(TFlash *tf, const TVectorImageP &vi, int strokeIndex) -{ - TStroke *stroke = vi->getStroke(strokeIndex); - if (stroke->getBBox().isEmpty()) - return; - - TStrokeProp *prop = stroke->getProp(); - /////questo codice stava dentro tstroke::getprop///////// - TColorStyle *style = vi->getPalette()->getStyle(stroke->getStyle() /*m_imp->m_styleId*/); - if (!style->isStrokeStyle() || style->isEnabled() == false) - prop = 0; - else if (!prop || style != prop->getColorStyle()) { - stroke->setProp(style->makeStrokeProp(stroke)); - prop = stroke->getProp(); - } - - if (prop) - prop->draw(*tf); -} - -//------------------------------------------------------------------- - -USHORT TFlash::Imp::buildVectorImage(const TVectorImageP &_vi, TFlash *tf, double &scaleFactor, bool isMask) -{ - USHORT id; - int i; - const TPalette *oldPalette; - - assert(m_regionDepth == 0); - - m_strokeCount = _vi->getStrokeCount(); - - std::vector strokes; - for (i = 0; i < m_strokeCount; i++) - strokes.push_back(i); - - _vi->enableMinimizeEdges(false); - _vi->notifyChangedStrokes(strokes, vector()); - _vi->enableMinimizeEdges(true); - - TRectD box = _vi->getBBox(); - int dim = tmax(convert(box).getLx(), convert(box).getLy()); - - TVectorImageP vi; - if (dim * m_tw > 32767.0) { - scaleFactor = dim * m_tw / 32767.0; - vi = _vi->clone(); - vi->transform(TScale(1.0 / scaleFactor), true); - } else - vi = _vi; - - oldPalette = m_currPalette; - m_currPalette = vi->getPalette(); - - bool newSprite = false; - - if (m_currSprite == 0) //non e' un image pattern!!! - { - m_currSprite = new FDTSprite(); - m_currDepth = 1; - newSprite = true; - } - /*assert(m_currSprite==0); -m_currSprite = new FDTSprite(); -m_currDepth = 1;*/ - - tf->setThickness(0); - m_isMask = isMask; - if (!isMask) - for (i = 0; i < (int)vi->getStrokeCount(); i++) - vi->getStroke(i)->setAverageThickness((m_properties.m_lineQuality.getValue() == ConstantLines) ? computeAverageThickness(vi->getStroke(i)) : 0); - - UINT strokeIndex = 0; - int parentDepth = 0; - while (strokeIndex < vi->getStrokeCount()) // ogni ciclo di while fa un gruppo - { - FDTSprite *parentSprite = 0; - int currStrokeIndex = strokeIndex; - if (vi->isStrokeGrouped(currStrokeIndex) != 0) { - parentSprite = m_currSprite; - parentDepth = m_currDepth; - m_currSprite = new FDTSprite(); - m_currDepth = 0; - } - for (UINT regionIndex = 0; regionIndex < vi->getRegionCount(); regionIndex++) - if (vi->sameGroupStrokeAndRegion(currStrokeIndex, regionIndex)) - buildRegion(tf, vi, regionIndex); - - if (m_properties.m_lineQuality.getValue() != ConstantLines) - tf->drawHangedObjects(); - //else - m_polylinesArray.sort(comparevector); - - while (strokeIndex < vi->getStrokeCount() && vi->sameGroup(strokeIndex, currStrokeIndex)) { - if (!isMask) - buildStroke(tf, vi, strokeIndex); - strokeIndex++; - } - - if (isMask && vi->getRegionCount() == 0) //pezza:se non ci sono regioni, la maschera - //deve mostrare il nulla; per fare cio', metto - //un poligono posticcio(non mascherante, puro stroke - //centerline) nella sprite, altrimenti - //invece di non vedersi nulla si vede l' - //immagine mascherata completa.. - { - FlashPolyline quads; - TQuadratic qaux(TPointD(0, 0), TPointD(10, 10), TPointD(20, 20)); - quads.m_quads.push_back(&qaux); - m_polylinesArray.push_back(quads); - } - tf->drawHangedObjects(); - if (parentSprite) { - m_tags.AddFObj(m_currSprite); - parentSprite->AddFObj(new FCTPlaceObject2(false, // hasClipDepth - false, // hasRatio, - true, // hasCharId, - false, // hasMove, - parentDepth++, //depth - m_currSprite->ID(), //id - affine2Matrix(TAffine()), //matrix - 0, 0, 0, 0)); - - m_currSprite = parentSprite; - m_currDepth = parentDepth; - parentSprite = 0; - } - } - - id = m_currSprite->ID(); - - if (newSprite) { - m_currSprite->AddFObj(new FCTShowFrame()); - m_tags.AddFObj(m_currSprite); - m_currSprite = 0; - } - m_currPalette = oldPalette; - - return id; -} - -//------------------------------------------------------------------- - -USHORT TFlash::Imp::buildRasterImage(const TImageP img, TFlash *tf) -{ - if (m_currSprite) //e' un custom style - { - std::map::iterator it; - if (m_keepImages && (it = m_imagesMap.find(img.getPointer())) != m_imagesMap.end()) { - m_currSprite->AddFObj(new FCTPlaceObject2(false, // hasClipDepth - false, // hasRatio, - true, // hasCharId, - false, //i!=0, // hasMove, - m_currDepth++, it->second, affine2Matrix(m_affine), - 0, 0, 0, 0)); - - return 0; - } - } - - TToonzImageP tim = (TToonzImageP)img; - TRasterImageP rim = (TRasterImageP)img; - TRasterP ri; - - if (tim) { - TRaster32P raux(tim->getSize()); - TRop::convert(raux, tim->getRaster(), img->getPalette(), TRect(0, 0, tim->getSize().lx - 1, tim->getSize().ly - 1), false, true); - ri = raux; - } else if (!((TRaster32P)rim->getRaster())) { - TRaster32P raux(rim->getRaster()->getSize()); - TRop::convert(raux, rim->getRaster()); - ri = raux; - } else - ri = rim->getRaster(); - - //TImageWriter::save(TFilePath("C:\\temp\\flame.tif"), ri); - - int lx = ri->getLx(), ly = ri->getLy(), wrap = ri->getWrap(); - - /* -double dpix=72.,dpiy=72.; - -if (rim) - rim->getDpi(dpix,dpiy); -else - tim->getDpi(dpix,dpiy); - -if (dpix==0 && dpiy==0) -{ -dpix=cameradpix; -dpiy=cameradpiy; -} -*/ - - //const double factor = Stage::inch; - - //double unit = 100; - //int realLx = lx;//(int)(cameradpix * lx / dpix); - //int realLy = ly;//(int)(cameradpiy * ly / dpiy); - - std::vector *buffer = new std::vector(); - - //TRaster32P newRaster= TRop::copyAndSwapRBChannels(ri); - - //#ifdef TNZ_MACHINE_CHANNEL_ORDER_MRGB - - //TRaster32P newRaster= TRop::copyAndSwapRBChannels(ri); - //Tiio::createJpg(*buffer, newRaster, m_properties.m_jpgQuality.getValue()); - //#else - - Tiio::createJpg(*buffer, ri, m_properties.m_jpgQuality.getValue()); - m_toBeDeleted.push_back(buffer); - - //#endif - - int bitmapId; - if (m_supportAlpha) { - std::vector alphachannel(lx * ly); - - ri->lock(); - TPixel *auxin, *bufin = (TPixel *)ri->getRawData(); - - int i, j, count = 0; - for (i = 0; i < ly; i++) { - auxin = bufin + (ly - i - 1) * wrap; - for (j = 0; j < lx; j++, auxin++) - alphachannel[count++] = auxin->m; - } - ri->unlock(); - - U32 zippedAlphaSizeOut = (U32)(2 * ((alphachannel.size() * 1.1) + 12)); - std::vector *zippedAlphaChannel = new std::vector(zippedAlphaSizeOut); - compress(&(*zippedAlphaChannel)[0], (uLongf *)&zippedAlphaSizeOut, (const UCHAR *)&alphachannel[0], alphachannel.size()); - zippedAlphaChannel->resize(zippedAlphaSizeOut); - m_toBeDeleted.push_back(zippedAlphaChannel); - FDTDefineBitsJPEG3 *bitmap = new FDTDefineBitsJPEG3((U8 *)&(*buffer)[0], buffer->size(), &(*zippedAlphaChannel)[0], zippedAlphaSizeOut); - m_tags.AddFObj(bitmap); - bitmapId = bitmap->ID(); - } else { - FDTDefineBitsJPEG2 *bitmap = new FDTDefineBitsJPEG2((U8 *)&(*buffer)[0], buffer->size()); - m_tags.AddFObj(bitmap); - bitmapId = bitmap->ID(); - } - - // - //m_totMem += (buffer->size()/*+zippedAlphaChannel->size()*/)/1024.0; - - FRect *rectBounds = new FRect(-lx * m_sCoord1 / 2, -ly * m_sCoord1 / 2, lx * m_sCoord1 / 2, ly * m_sCoord1 / 2); - FDTDefineShape3 *rectangle = new FDTDefineShape3(rectBounds); - - FMatrix *matrix1 = new FMatrix(true, m_tw * Fixed1, m_tw * Fixed1, false, 0, 0, -(lx / 2) * m_sCoord1, -(ly / 2) * m_sCoord1); - FFillStyle *fill1 = new FFillStyleBitmap(false, bitmapId, matrix1); - - U32 fillStyle1_ID = rectangle->AddFillStyle(fill1); - - rectangle->FinishStyleArrays(); - addShape(rectangle, false, false, true, false, true, (lx / 2) * m_sCoord1, (ly / 2) * m_sCoord1, 0, - fillStyle1_ID, 0); - - addEdgeStraightToShape(rectangle, -lx * m_sCoord1, 0); - addEdgeStraightToShape(rectangle, 0, -ly * m_sCoord1); - addEdgeStraightToShape(rectangle, lx * m_sCoord1, 0); - addEdgeStraightToShape(rectangle, 0, ly * m_sCoord1); - rectangle->AddShapeRec(new FShapeRecEnd()); - - m_tags.AddFObj(rectangle); - - if (m_currSprite) { - //e' un custom style - - m_imagesMap[img.getPointer()] = rectangle->ID(); - - m_currSprite->AddFObj(new FCTPlaceObject2(false, // hasClipDepth - false, // hasRatio, - true, // hasCharId, - false, //i!=0, // hasMove, - m_currDepth++, rectangle->ID(), affine2Matrix(m_affine), - 0, 0, 0, 0)); - } - - return rectangle->ID(); - //delete bufout; -} - -//------------------------------------------------------------------- - -USHORT TFlash::Imp::buildImage(const TImageP img, TFlash *tf, double &scaleFactor, bool isMask) -{ - scaleFactor = 1.0; - - if (img->getType() == TImage::VECTOR) - return buildVectorImage((TVectorImageP)img, tf, scaleFactor, isMask); - else - return buildRasterImage(img, tf); -} - -//------------------------------------------------------------------- - -void TFlash::Imp::addSoundToFrame(bool isLast) -{ - if (!m_sound.empty()) { - TSoundTrackP sound = *m_sound.begin(); - if ((int)m_sound.size() == m_soundSize) { - bool is16Bit = (sound->getBitPerSample() == 16); - bool isStereo = (sound->getChannelCount() == 2); - UCHAR rate; - switch (sound->getSampleRate() / 5000) { - case 1: // 5k - rate = 0; - break; - case 2: // 11k - rate = 1; - break; - case 4: // 22k - rate = 2; - break; - case 8: // 44k - rate = 3; - break; - default: - rate = 0; - } - UCHAR format = 4 * (rate) + is16Bit * 2 + isStereo; - FDTSoundStreamHead2 *head = new FDTSoundStreamHead2( - format, c_soundCompression, rate, is16Bit, isStereo, (USHORT)sound->getSampleCount()); - m_tags.AddFObj(head); - } - int bytes = sound->getSampleCount() * sound->getSampleSize(); - U8 *aux = new U8[bytes]; - -#if TNZ_LITTLE_ENDIAN - memcpy(aux, sound->getRawData(), bytes); -#else //su mac, gli short vanno girati!! - int ii; - assert(c_soundBps == 16); - const U8 *buf = sound->getRawData(); - for (ii = 0; ii < (bytes & (~0x1)); ii += 2) - aux[ii] = buf[ii + 1], aux[ii + 1] = buf[ii]; -#endif - m_tags.AddFObj(new FDTSoundStreamBlock(bytes, aux)); - - m_soundBuffer.push_back(aux); - m_sound.erase(m_sound.begin()); - if (isLast) - m_sound.erase(m_sound.begin(), m_sound.end()); - } -} - -//------------------------------------------------------------------- -void TFlash::setGlobalScale(const TAffine &aff) -{ - m_imp->m_globalScale = aff; -} - -//------------------------------------------------------------------- - -void TFlash::Imp::writeFrame(TFlash *tf, bool isLast, int frameCountLoader, bool lastScene) -{ - if (!m_frameData) - return; - int oldSize = m_oldFrameData ? (int)m_oldFrameData->size() : -1; - int depth; - //bool firstTime = true; - - static bool loaderAdded = false; - bool insiderLoader = (frameCountLoader == 1); - int currTagIndex = m_tags.GetFObjCount() - 1; - //bool putCameraClip = false; - //aggiungo l'istruzione per evitare preloader se e' gia - //caricato - if (m_currFrameIndex == 1) { - if (m_properties.m_preloader.getValue() && frameCountLoader >= 1) - addSkipLoader(frameCountLoader + 1); - - if (m_properties.m_url.getValue().length() > 0) - addUrlLink(toString(m_properties.m_url.getValue())); - } - - if (m_currFrameIndex > m_soundOffset) - addSoundToFrame(isLast); - - double scaleFactor; - - std::map::iterator it; - bool lastOneIsNotMasked = true; - TImageP currMask = 0; - int currMaskDepth; - bool animatedPalette = false; - - for (depth = 0; depth < tmax((int)m_frameData->size(), oldSize); depth++) { - - FCXFormWAlpha *form = 0; - - if (depth < (int)m_frameData->size()) { - TImageP img = (*m_frameData)[depth].m_img; - - if ((*m_frameData)[depth].m_isMask) { - currMask = img; - currMaskDepth = depth; - lastOneIsNotMasked = true; - continue; - } else if ((*m_frameData)[depth].m_isMasked && lastOneIsNotMasked) { - //assert(currMask); - lastOneIsNotMasked = false; - int numMasked = 1; - while (depth + numMasked < (int)m_frameData->size() && (*m_frameData)[depth + numMasked].m_isMasked) - numMasked++; - if (m_oldFrameData && currMaskDepth < (int)m_oldFrameData->size()) - m_tags.AddFObj(new FCTRemoveObject2(currMaskDepth + 3)); - if (currMaskDepth < (int)m_frameData->size() && currMask) //&& - //(currMask->getType()!=TImage::VECTOR || ((TVectorImage*)currMask)->getRegionCount()>0)) - { - UINT id = buildImage(currMask, tf, scaleFactor, true); - assert(scaleFactor >= 1.0); - TAffine aff = TTranslation(0.5 * m_lx, -0.5 * m_ly) * m_globalScale * TScale(scaleFactor); - m_tags.AddFObj(new FCTPlaceObject2(true, // hasClipDepth - false, // hasRatio, - true, // hasCharId, - false, //i!=0, // hasMove, - currMaskDepth + 3, id, affine2Matrix(aff), - 0, 0, 0, currMaskDepth + 3 + numMasked)); - } - - } else if (!(*m_frameData)[depth].m_isMasked) - lastOneIsNotMasked = true; - TVectorImageP vimg = (TVectorImageP)img; - if (vimg) { - assert(vimg->getPalette()); - animatedPalette = vimg->getPalette()->isAnimated(); - } - } - - if (m_oldFrameData && depth < (int)m_oldFrameData->size() && depth < (int)m_frameData->size() && - (*m_frameData)[depth].m_img.getPointer() == (*m_oldFrameData)[depth].m_img.getPointer() && !animatedPalette) { - TImageP img = (*m_frameData)[depth].m_img; - const TColorFunction *ct = (*m_frameData)[depth].m_cf; - TColorFunction::Parameters p; - if (ct && ct->getParameters(p)) - form = new FCXFormWAlpha(1, 1, (TINT32)(p.m_mR * 256), (TINT32)(p.m_mG * 256), (TINT32)(p.m_mB * 256), (TINT32)(p.m_mM * 256), - (TINT32)(p.m_cR), (TINT32)(p.m_cG), (TINT32)(p.m_cB), (TINT32)(p.m_cM)); - - if ((*m_frameData)[depth].m_aff != (*m_oldFrameData)[depth].m_aff) { - std::map::iterator it1; - it1 = m_imagesScaleMap.find(img.getPointer()); - assert(it1 != m_imagesScaleMap.end()); - scaleFactor = (*it1).second; - - TAffine aff = TTranslation(0.5 * m_lx, -0.5 * m_ly) * m_globalScale * (*m_frameData)[depth].m_aff * TScale(scaleFactor); - /*if (m_notClipped && !putCameraClip) - { - TRectD box = aff*img->getBBox(); - if (box.x0<0 || -box.y1<0 || box.x1>m_lx || -box.y0>m_ly) - putCameraClip = true; - }*/ - m_tags.AddFObj(new FCTPlaceObject2(false, // hasClipDepth - false, // hasRatio, - false, // hasCharId, - true, //i!=0, // hasMove, - depth + 3, 0, affine2Matrix(aff), - form, 0, 0, 0)); - } - } else { - if (m_oldFrameData && depth < (int)m_oldFrameData->size()) - m_tags.AddFObj(new FCTRemoveObject2(depth + 3)); - if (depth < (int)m_frameData->size()) { - TImageP img = (*m_frameData)[depth].m_img; - const TColorFunction *cf = (*m_frameData)[depth].m_cf; - TColorFunction::Parameters p; - if (cf && cf->getParameters(p)) - form = new FCXFormWAlpha(1, 1, (TINT32)(p.m_mR * 256), (TINT32)(p.m_mG * 256), (TINT32)(p.m_mB * 256), (TINT32)(p.m_mM * 256), - (TINT32)(p.m_cR), (TINT32)(p.m_cG), (TINT32)(p.m_cB), (TINT32)(p.m_cM)); - it = m_keepImages ? m_imagesMap.find(img.getPointer()) : m_imagesMap.end(); - USHORT id; - if (it == m_imagesMap.end()) { - id = buildImage(img, tf, scaleFactor, false); - if (!animatedPalette) { - m_imagesMap[img.getPointer()] = id; - m_imagesScaleMap[img.getPointer()] = scaleFactor; - } - } else { - id = (*it).second; - std::map::iterator it1; - it1 = m_imagesScaleMap.find(img.getPointer()); - assert(it1 != m_imagesScaleMap.end()); - scaleFactor = (*it1).second; - } - assert(scaleFactor >= 1.0); - TAffine aff = TTranslation(0.5 * m_lx, -0.5 * m_ly) * m_globalScale * (*m_frameData)[depth].m_aff * TScale(scaleFactor); - /*if (m_notClipped && !putCameraClip) - { - TRectD box = img->getBBox(); - - box = aff*box; - - if (box.x0<0 || -box.y1<0 || box.x1>m_lx || -box.y0>m_ly) - putCameraClip = true; - }*/ - - /*Commento al seguente if: - questa cosa e' davvero FOLLE. C'era un baco per cui se facevi rewind - nel flash player mentre era in play restavano appese alcune immagini. - Dopo indagini e confronti con gli swf generati da flash mx, ho scoperto che , quando si fa place di una sprite - ad una certa depth, sostituendo un'altra sprite alla stessa depth, mx mette hasRatio=true con un valore - di ratio pari a 0x8!!!! Non capisco, ma lo faccio anch'io e funziona, don't ask me why. Vincenzo. */ - - int ratioVal = 0; - if (m_oldFrameData && (int)m_oldFrameData->size() > depth && ((*m_oldFrameData)[depth].m_img)) - ratioVal = 0x8; - - m_tags.AddFObj(new FCTPlaceObject2(false, // hasClipDepth - ratioVal > 0, // hasRatio, - true, // hasCharId, - false, //i!=0, // hasMove, - depth + 3, id, affine2Matrix(aff), - form, ratioVal, 0, 0)); - } - } - } - - //inserisce lo stop sull'ultimo frame - if (isLast && lastScene && !m_properties.m_looping.getValue()) { - addActionStop(); - //loaderAdded = false; - } - - m_tags.AddFObj(new FCTShowFrame()); - - //if (putCameraClip) - //addCameraClip(currTagIndex); - - //ho una sola scena => loader interno I frame oppure - //ci sono piu' scene => la I fa da loader - if (m_properties.m_preloader.getValue() && !m_loaderAdded && (insiderLoader || (isLast && frameCountLoader > 1))) { - for (depth = 0; depth < (int)m_frameData->size(); depth++) - m_tags.AddFObj(new FCTRemoveObject2(depth + 3)); - if (m_oldFrameData) - delete m_oldFrameData; - m_oldFrameData = m_frameData; - m_frameData = 0; - addLoader(); - m_tags.AddFObj(new FCTShowFrame()); - m_currFrameIndex++; - //inserisce lo stop al primo frame che segue il loader - if (!m_properties.m_autoplay.getValue() && loaderAdded && m_currFrameIndex == frameCountLoader + 1) - addPause(); - //m_properties.m_preloader = false; - m_loaderAdded = true; - } - //else if (!m_properties.m_autoplay.getValue()) - // addPauseAtStart(); - - if (m_frameData && isLast && m_currFrameIndex != 1) - for (depth = 0; depth < (int)m_frameData->size(); depth++) - m_tags.AddFObj(new FCTRemoveObject2(depth + 3)); -} - -//------------------------------------------------------------------- - -void TFlash::Imp::addActionStop() -{ - //construct an empty CTDoAction tag object - FCTDoAction *doAction = new FCTDoAction(); - - //add the stop action to the CTDoAction tag object - doAction->AddAction(new FActionStop()); - - //add the CTDoAction object to allTags - m_tags.AddFObj(doAction); -} - -//------------------------------------------------------------------- -void TFlash::Imp::addLoader() -{ - string target = ""; - //construct an empty CTDoAction tag object - FCTDoAction *doAction = new FCTDoAction(); - - doAction->AddAction(new FActionGotoFrame((U16)0)); - doAction->AddAction(new FActionPlay()); - - //add the CTDoAction object to allTags - m_tags.AddFObj(doAction); -} - -//------------------------------------------------------------------- - -void TFlash::Imp::addSkipLoader(int jumpToFrame) -{ - string target = ""; - //construct an empty CTDoAction tag object - FCTDoAction *doAction = new FCTDoAction(); - - //controlla se il file e' stato tutto caricato - doAction->AddAction(new FActionPush(new FString((U8 *)target.c_str()))); - doAction->AddAction(new FActionPush(7, FLOAT(12))); - doAction->AddAction(new FActionGetProperty()); - - doAction->AddAction(new FActionPush(new FString((U8 *)target.c_str()))); - doAction->AddAction(new FActionPush(7, FLOAT(5))); - doAction->AddAction(new FActionGetProperty()); - - doAction->AddAction(new FActionEquals2()); - doAction->AddAction(new FActionNot()); - doAction->AddAction(new FActionIf(5 + 1)); - doAction->AddAction(new FActionGotoFrame((U16)jumpToFrame)); - doAction->AddAction(new FActionPlay()); - - //add the CTDoAction object to allTags - m_tags.AddFObj(doAction); -} - -//------------------------------------------------------------------- - -void TFlash::Imp::addPause() -{ - addActionStop(); - - FRect *clipRectBounds = new FRect(0, 0, m_lx * m_tw, m_ly * m_tw); //coordinate values are in TWIPS - - FDTDefineShape3 *clipRectangle = new FDTDefineShape3(clipRectBounds); - - FColor black = FColor(0, 0, 0); - - U32 blackfillID = clipRectangle->AddSolidFillStyle(new FColor(black)); - clipRectangle->FinishStyleArrays(); - addShape(clipRectangle, false, true, true, false, true, 0, 0, blackfillID, 0); - - addEdgeStraightToShape(clipRectangle, 0, m_ly * m_tw); - addEdgeStraightToShape(clipRectangle, m_lx * m_tw, 0); - addEdgeStraightToShape(clipRectangle, 0, -m_ly * m_tw); - addEdgeStraightToShape(clipRectangle, -m_lx * m_tw, 0); - clipRectangle->AddShapeRec(new FShapeRecEnd()); - - m_tags.AddFObj(clipRectangle); - - FDTDefineButton2 *theButton = new FDTDefineButton2(0); //flag is 0 to indicate a push button - FMatrix *mx = new FMatrix(); - FCXFormWAlpha *cxf = new FCXFormWAlpha(false, false, 0, 0, 0, 0, 0, 0, 0, 0); - FButtonRecord2 *bRec = new FButtonRecord2(true, false, false, false, clipRectangle->ID(), 1, mx, cxf); - theButton->AddButtonRecord(bRec); - - //the button action - FActionCondition *ac = new FActionCondition(); - ac->AddCondition(OverDownToOverUp); - ac->AddActionRecord(new FActionPlay()); - theButton->AddActionCondition(ac); - - m_tags.AddFObj(theButton); - - FMatrix *matrix = new FMatrix(); - // la depth e' 2 perche' riservata per il bottone - FCTPlaceObject2 *placeButton = new FCTPlaceObject2(false, // ~ _hasClipDepth - true, true, false, - 2, theButton->ID(), matrix, 0, 0, 0, 0); - m_tags.AddFObj(placeButton); -} - -//------------------------------------------------------------------- - -void TFlash::Imp::addUrlLink(const string _url) -{ - //addActionStop(); - - string url; - if (url.find("http") == -1) - url = "http://" + _url; - else - url = _url; - - FRect *clipRectBounds = new FRect(0, 0, m_lx * m_tw, m_ly * m_tw); //coordinate values are in TWIPS - - FDTDefineShape3 *clipRectangle = new FDTDefineShape3(clipRectBounds); - - FColor black = FColor(0, 0, 0, 0); - - U32 blackfillID = clipRectangle->AddSolidFillStyle(new FColor(black)); - clipRectangle->FinishStyleArrays(); - addShape(clipRectangle, false, true, true, false, true, 0, 0, blackfillID, 0); - - addEdgeStraightToShape(clipRectangle, 0, m_ly * m_tw); - addEdgeStraightToShape(clipRectangle, m_lx * m_tw, 0); - addEdgeStraightToShape(clipRectangle, 0, -m_ly * m_tw); - addEdgeStraightToShape(clipRectangle, -m_lx * m_tw, 0); - clipRectangle->AddShapeRec(new FShapeRecEnd()); - - m_tags.AddFObj(clipRectangle); - - FDTDefineButton2 *theButton = new FDTDefineButton2(0); //flag is 0 to indicate a push button - FMatrix *mx = new FMatrix(); - FCXFormWAlpha *cxf = new FCXFormWAlpha(false, false, 0, 0, 0, 0, 0, 0, 0, 0); - FButtonRecord2 *bRec = new FButtonRecord2(true, false, false, false, clipRectangle->ID(), 1, mx, cxf); - theButton->AddButtonRecord(bRec); - - //the button action - FActionCondition *ac = new FActionCondition(); - ac->AddCondition(OverDownToOverUp); - ac->AddActionRecord(new FActionGetURL(new FString(url.c_str()), new FString(""))); - theButton->AddActionCondition(ac); - - m_tags.AddFObj(theButton); - - FMatrix *matrix = new FMatrix(); - // la depth e' 2 perche' riservata per il bottone - FCTPlaceObject2 *placeButton = new FCTPlaceObject2(false, // ~ _hasClipDepth - true, true, false, - 2, theButton->ID(), matrix, 0, 0, 0, 0); - m_tags.AddFObj(placeButton); -} - -//------------------------------------------------------------------- - -void TFlash::Imp::beginMask() -{ - //m_currMask = TVectorImageP(); - - m_currMask = new TVectorImage(); - m_currMask->setPalette(new TPalette()); -} - -//------------------------------------------------------------------- - -void TFlash::Imp::endMask() -{ - m_frameData->push_back(FlashImageData(TAffine(), m_currMask, 0, true, false)); - m_currMask = TVectorImageP(); -} - -//------------------------------------------------------------------- - -bool TFlash::Imp::drawOutline(TStroke *s, bool separeDifferentColors) -{ - if (m_polyData.m_color1 != m_currStrokeColor) { - //bool inserted = m_outlineColors.insert(m_polyData.m_color1).second; - if (!m_outlines.empty()) { - computeOutlineBoundary(m_outlines, m_polylinesArray, m_currStrokeColor); - } - if (!m_polylinesArray.empty() && (separeDifferentColors /* || !inserted*/)) //non posso accorpare strokes di colore diverso....flash macromedia non le importa bene! lo stronzo. - drawHangedObjects(); - m_currStrokeColor = m_polyData.m_color1; - } - m_outlines.push_back(s); - return true; -} - -//=================================================================== -TFlash::TFlash(int lx, int ly, int frameCount, int frameRate, TPropertyGroup *properties, bool keepImages) - : m_imp(new Imp(lx, ly, frameCount, frameRate, properties, keepImages)) -{ -} - -//------------------------------------------------------------------- - -TFlash::~TFlash() -{ - delete m_imp; -} - -//------------------------------------------------------------------- - -void TFlash::setBackgroundColor(const TPixel32 &bgColor) -{ - FCTSetBackgroundColor *background = - new FCTSetBackgroundColor(new FColor(bgColor.r, bgColor.g, bgColor.b)); - m_imp->m_tags.AddFObj(background); -} - -//------------------------------------------------------------------- - -void TFlash::setThickness(double thickness) -{ - m_imp->m_thickness = thickness; -} - -//------------------------------------------------------------------- - -void TFlash::setFillColor(const TPixel32 &color) -{ - m_imp->m_polyData.m_color1 = color; - m_imp->m_polyData.m_type = Solid; -} - -//------------------------------------------------------------------- - -void TFlash::setLineColor(const TPixel32 &color) -{ - m_imp->m_lineColor = color; -} - -//------------------------------------------------------------------- - -void TFlash::setTexture(const TRaster32P &texture) -{ - m_imp->m_polyData.m_type = Texture; - m_imp->m_polyData.m_texture = texture; -} - -//------------------------------------------------------------------- - -void TFlash::setGradientFill(bool isLinear, const TPixel &color1, const TPixel &color2, double smooth) -{ - m_imp->m_polyData.m_type = (isLinear) ? LinearGradient : RadialGradient; - m_imp->m_polyData.m_color1 = color1; - m_imp->m_polyData.m_color2 = color2; - m_imp->m_polyData.m_smooth = smooth; -} - -//------------------------------------------------------------------- - -void TFlash::setFillStyleMatrix(const TAffine &aff) -{ - m_imp->m_polyData.m_matrix = aff; -} - -//------------------------------------------------------------------- - -void TFlash::drawSegments(const vector segmentArray, bool isGradientColor) -{ - m_imp->drawSegments(segmentArray, isGradientColor); -} - -//------------------------------------------------------------------- - -void TFlash::drawquads(const vector quadArray) -{ - m_imp->drawquads(quadArray); -} - -//------------------------------------------------------------------- - -void TFlash::cleanCachedImages() -{ - m_imp->m_imagesMap.clear(); - m_imp->m_imagesScaleMap.clear(); - m_imp->m_texturesMap.clear(); -} - -//=================================================================== - -void TFlash::drawCenterline(const TStroke *s, bool drawAll) -{ - //vector quads; - int i; - double thickness; - - if (m_imp->m_thickness > 0) - thickness = m_imp->m_thickness; - else if (m_imp->m_properties.m_lineQuality.getValue() != ConstantLines) - thickness = computeAverageThickness(s); - else - thickness = s->getAverageThickness(); - - if (m_imp->m_lineColor.m == 0 || thickness == 0) - return; - - if (m_imp->m_properties.m_lineQuality.getValue() != ConstantLines && m_imp->m_lineColor != m_imp->m_currStrokeColor) { - drawHangedObjects(); - //m_imp->m_outlineColors.insert(m_imp->m_lineColor).second; - m_imp->m_currStrokeColor = m_imp->m_lineColor; - } - - FlashPolyline quads; - if (s->getChunkCount() == 1 && - norm2(m_imp->toTwips(s->getChunk(0)->getP2()) - m_imp->toTwips(s->getChunk(0)->getP0())) <= 4 //metto lo stile di fill: i punti si disegnano come cerchi - && thickness > 0) { - quads.m_isPoint = true; - quads.m_fillStyle1.m_type = Solid; - quads.m_fillStyle1.m_color1 = m_imp->m_lineColor; - } - - quads.m_lineStyle.m_type = Centerline; - quads.m_lineStyle.m_thickness = thickness; - quads.m_lineStyle.m_color1 = m_imp->m_lineColor; - - //quads.m_lineStyle.m_isRegion = false; - //quads.m_lineStyle.m_isHole = false; - - std::map>::iterator it = m_imp->m_strokeMap.end(); - - if (!drawAll) - it = m_imp->m_strokeMap.find(s); - - if (it == m_imp->m_strokeMap.end()) { - for (i = 0; i < s->getChunkCount(); i++) - quads.m_quads.push_back((TQuadratic *)s->getChunk(i)); - m_imp->m_polylinesArray.push_back(quads); - } else { - std::set::iterator it1; - double oldW1 = 0; - for (it1 = it->second.begin(); it1 != it->second.end(); it1++) { - if (it1->w0 > oldW1) { - putquads(s, oldW1, it1->w0, quads.m_quads); - m_imp->m_polylinesArray.push_back(quads); - quads.m_quads.clear(); - } - oldW1 = it1->w1; - } - if (oldW1 < 1.0) { - putquads(s, oldW1, 1.0, quads.m_quads); - m_imp->m_polylinesArray.push_back(quads); - quads.m_quads.clear(); - } - } -} -void TFlash::drawHangedObjects() -{ - m_imp->drawHangedObjects(); -} -//------------------------------------------------------------------- - -int TFlash::drawRectangle(const TRectD &rect) -{ - m_imp->drawHangedObjects(); - - vector v; - - v.push_back(rect.getP00()); - v.push_back(rect.getP01()); - v.push_back(rect.getP11()); - v.push_back(rect.getP10()); - - return m_imp->drawPolyline(v); -} - -//------------------------------------------------------------------- - -int TFlash::drawPolyline(vector &poly) -{ - m_imp->drawHangedObjects(); - - return m_imp->drawPolyline(poly); -} - -//------------------------------------------------------------------- - -void TFlash::drawPolygon(vector> &quads, int clippedShapes) -{ - m_imp->drawHangedObjects(); - - //std::list::iterator it = polylines.begin(), it_e = polylines.end(); - list polylines; - - for (int i = 0; i < (int)quads.size(); i++) { - polylines.push_back(FlashPolyline()); - polylines.back().m_quads = quads[i]; - polylines.back().m_fillStyle1 = m_imp->m_polyData; - } - - m_imp->doDrawPolygon(polylines, clippedShapes); -} - -//------------------------------------------------------------------- -void TFlash::drawDot(const TPointD ¢er, double radius) -{ - m_imp->drawDot(center, radius); -} - -//------------------------------------------------------------------- - -int TFlash::drawEllipse(const TPointD ¢er, double radiusX, double radiusY) -{ - m_imp->drawHangedObjects(); - - return m_imp->drawEllipse(center, radiusX, radiusY); -} - -//------------------------------------------------------------------- - -void TFlash::pushMatrix() -{ - m_imp->m_matrixStack.push_back(m_imp->m_affine); -} - -//------------------------------------------------------------------- - -void TFlash::popMatrix() -{ - assert(!m_imp->m_matrixStack.empty()); - m_imp->m_affine = m_imp->m_matrixStack.back(); - m_imp->m_matrixStack.pop_back(); -} - -//------------------------------------------------------------------- - -void TFlash::multMatrix(const TAffine &aff) -{ - m_imp->m_affine *= aff; -} - -//------------------------------------------------------------------- - -void TFlash::putSound(TSoundTrackP st, int offset) -{ - m_imp->m_soundSize = 0; - m_imp->m_sound.clear(); - - TSoundTrackP st1 = st; - - if (st1->getBitPerSample() != c_soundBps || - st1->isSampleSigned() != c_soundIsSigned || - st1->getChannelCount() != c_soundChannelNum) - st1 = TSop::convert(st, TSoundTrackFormat(m_imp->m_soundRate, c_soundBps, c_soundChannelNum, c_soundIsSigned)); - else if (st1->getSampleRate() != (UINT)m_imp->m_soundRate) - st1 = TSop::resample(st1, m_imp->m_soundRate); - - int frameCount = st1->getSampleCount() / (st1->getSampleRate() / m_imp->m_frameRate); - if (!frameCount) - return; - int averagePerFrame = st1->getSampleCount() / frameCount; - int sampleCount = st1->getSampleCount(); - TINT32 firstSample = 0; - m_imp->m_soundOffset = offset; - - while (sampleCount > 0) { - sampleCount -= averagePerFrame; - if (sampleCount >= 0) { - TSoundTrackP snd = st1->extract(firstSample, firstSample + averagePerFrame - 1); - m_imp->m_sound.push_back(snd); - firstSample += averagePerFrame; - } else { - //deversamente dalla documentazione anche x il raw data deve essere - //sempre lo stesso il numero di campioni per ogni blocco aggiunto - //allo streaming audio - TSoundTrackP snd = st1->extract(firstSample, st1->getSampleCount() - 1); - snd = TSop::insertBlank(snd, snd->getSampleCount(), abs(sampleCount)); - m_imp->m_sound.push_back(snd); - } - } - m_imp->m_soundSize = m_imp->m_sound.size(); -} - -//------------------------------------------------------------------- - -void TFlash::writeMovie(FILE *fp) -{ - //m_imp->writeFrame(this, true); - - //if (m_imp->m_putCameraClip) - // m_imp->addCameraClip(); - - if (m_imp->m_properties.m_isCompressed.getValue()) - m_imp->m_tags.CreateCompressedMovie(fp, - FRect(0, 0, m_imp->m_lx * m_imp->m_tw, - m_imp->m_ly * m_imp->m_tw), - m_imp->m_frameRate); - else - m_imp->m_tags.CreateMovie(fp, - FRect(0, 0, m_imp->m_lx * m_imp->m_tw, - m_imp->m_ly * m_imp->m_tw), - m_imp->m_frameRate, - m_imp->m_version); -} - -//------------------------------------------------------------------- -void TFlash::drawRegion(const TRegion &r, int clippedShapes) -{ - int i; - vector polylines; - TPointD firstPoint, lastPoint; - - if (clippedShapes > 0 || m_imp->m_isMask) { - if (clippedShapes > 0) - m_imp->drawHangedObjects(); - - //setFillColor(TPixel::Black); - } - - TPointD pBegin, pEnd, pBeginRegion; - - pEnd = r.getEdge(r.getEdgeCount() - 1)->m_s->getPoint(r.getEdge(r.getEdgeCount() - 1)->m_w1); - for (i = 0; i < (int)r.getEdgeCount(); i++) - m_imp->addEdge(*r.getEdge(i), pBegin, pEnd); - - //m_imp->closeRegion(r.getEdgeCount()); - - m_imp->m_regionDepth++; - - for (i = 0; i < (int)r.getSubregionCount(); i++) { - TRegion &rr = *r.getSubregion(i); - pEnd = rr.getEdge(0)->m_s->getPoint(rr.getEdge(0)->m_w0); - for (int j = rr.getEdgeCount() - 1; j >= 0; j--) { - TEdge *e = rr.getEdge(j); - tswap(e->m_w0, e->m_w1); - m_imp->addEdge(*e, pBegin, pEnd); - tswap(e->m_w0, e->m_w1); - } - } - - m_imp->m_regionDepth--; - - if (clippedShapes > 0) { - m_imp->doDrawPolygon(m_imp->m_polylinesArray, clippedShapes); - //clearPointerContainer(m_imp->m_polylinesArray); - m_imp->m_polylinesArray.clear(); - m_imp->m_edgeMap.clear(); - m_imp->m_strokeMap.clear(); - m_imp->m_autocloseMap.clear(); - } -} - -//------------------------------------------------------------------- - -USHORT TFlash::buildImage(const TImageP img, bool isMask) -{ - double scalefactor; - return m_imp->buildImage(img, this, scalefactor, isMask); - assert(scalefactor == 1.0); -} - -void TFlash::beginFrame(int frameIndex) -{ - m_imp->m_frameData = new TFlash::Imp::FrameData; - m_imp->m_currFrameIndex = frameIndex; - assert(m_imp->m_matrixStack.empty()); - m_imp->m_affine = TAffine(); -} - -//------------------------------------------------------------------- -int TFlash::endFrame(bool isLast, int frameCountLoader, bool lastScene) -{ - m_imp->writeFrame(this, isLast, frameCountLoader, lastScene); - if (m_imp->m_oldFrameData) - delete m_imp->m_oldFrameData; - m_imp->m_oldFrameData = m_imp->m_frameData; - m_imp->m_frameData = 0; - - //QString msg = "mem: " + QString::number(m_imp->m_totMem/1024.0)+"\n"; - //TSystem::outputDebug(msg.toStdString()); - return m_imp->m_currFrameIndex; -} - -//------------------------------------------------------------------- - -//void TFlash::addPauseAtStart() -//{ -// m_imp->addPauseAtStart(); -//} - -//------------------------------------------------------------------- - -void TFlash::enableMask() -{ - m_imp->m_maskEnabled = true; -} - -//------------------------------------------------------------------- - -void TFlash::disableMask() -{ - m_imp->m_maskEnabled = false; -} - -//------------------------------------------------------------------- - -void TFlash::beginMask() -{ - m_imp->beginMask(); -} - -//------------------------------------------------------------------- - -void TFlash::endMask() -{ - m_imp->endMask(); -} - -//------------------------------------------------------------------- -void TFlash::draw(const TImageP img, const TColorFunction *cf) -{ - //std::map::iterator it; - - if (m_imp->m_currMask) { - if (img->getType() == TImage::VECTOR) - m_imp->m_currMask->mergeImage((TVectorImageP)img, m_imp->m_affine); - } else if (img) - m_imp->m_frameData->push_back(FlashImageData(m_imp->m_affine, img, cf ? cf->clone() : 0, false, m_imp->m_maskEnabled)); -} - -//------------------------------------------------------------------- - -wstring TFlash::getLineQuality() -{ - return m_imp->m_properties.m_lineQuality.getValue(); -} - -//------------------------------------------------------------------- - -bool TFlash::drawOutline(TStroke *s) -{ - assert(m_imp->m_polyData.m_type == Solid); - - m_imp->drawHangedObjects(); - - TThickPoint p0 = s->getThickPoint(0.0), p1 = s->getThickPoint(1.0); - - if (tdistance(p0, p1) < (p0.thick + p1.thick)) //pezza infame!nelle curve che si autochiudono, lo sweepboundary fa casini. - //le splitto in due pezzi, e per poter metterli nello steso poligono - //senza vedere le sovrapposizioni cambio leggermente il colore al secondo....eh eh eh - { - TStroke *s0 = new TStroke(), *s1 = new TStroke(); - - s->split(0.5, *s0, *s1); - m_imp->drawOutline(s0, true); - int aux = m_imp->m_polyData.m_color1.b; - m_imp->m_polyData.m_color1.b = (m_imp->m_polyData.m_color1.b == 255) ? 254 : m_imp->m_polyData.m_color1.b + 1; - - //m_imp->drawHangedObjects(); - m_imp->drawOutline(s1, false); - m_imp->m_polyData.m_color1.b = aux; - //m_imp->drawHangedObjects(); - m_imp->m_strokesToBeDeleted.push_back(s0); - m_imp->m_strokesToBeDeleted.push_back(s1); - return true; - } - - return m_imp->drawOutline(s, true); -} -//------------------------------------------------------------- diff --git a/toonz/sources/include/tflash.h b/toonz/sources/include/tflash.h index 340a1da..911647c 100644 --- a/toonz/sources/include/tflash.h +++ b/toonz/sources/include/tflash.h @@ -50,254 +50,55 @@ public: }; } -//========================================================= -//! This class is an interface to Flash File Format (SWF) SDK. -/*! - Macromedia Flash File Format (SWF) SDK is an interface to write SWF files. - It includes a set of C++ classes that mirror the tag structure of SWF. - There is a C++ class for each tag that SWF defines. - There are classes for creating movies, frames, circles, rectangles, text and bitmaps. - */ + class DVAPI TFlash { - class Imp; - Imp *m_imp; - public: - static const wstring ConstantLines; - static const wstring MixedLines; - static const wstring VariableLines; - - //enum LineQuality{_ConstantLines=0, _MixedLines, _VariableLines}; - - /* - struct PropertiesForTab - { - LineQuality m_lineQuality; - bool m_isCompressed; - bool m_stopAtStart; - bool m_looping; - bool m_loader; - int m_jpgQuality; - std::wstring m_url; - PropertiesForTab() - : m_lineQuality(_ConstantLines), m_isCompressed(true), m_stopAtStart(false), m_looping(true) - , m_loader(false), m_jpgQuality(90), m_url(std::wstring()) {} - - PropertiesForTab(LineQuality q, - bool isCompr, - bool stopAtStart, - bool looping, - bool loader, - int m_jpgQ, - std::wstring url) - : m_lineQuality(q), m_isCompressed(isCompr), m_stopAtStart(stopAtStart), m_looping(looping) - , m_loader(loader), m_jpgQuality(m_jpgQ), m_url(url) {if (m_jpgQ>99) m_jpgQ=99; else if (m_jpgQ<1) m_jpgQ=1;} - }; - - void setProperties(const TFlash::PropertiesForTab& prop);*/ - - /*! - This constructor initialize internal main environment as follows: - \li frame index is set to -1, - \li line thickness is set to 0, - \li line color is set to black, - \li strokes, regions and polylines are set to 0, - \li sound environment is reset, - \li palette pointer is reset, - \li a new empty affine transformation is created. - - The object is associate with a drawing style wich have in general two colors, thickness of the stroke, - smoothness of the gradient if any and type of the style that can be a texture, a line ,a solid style, - and radial or linear gradient. - - - - \param lx x-measure of the scene where the measure units are twips (a twips is an absolute length measure - of about 1/1440 inch ). It is used passing it the camera width view. - \param ly y-measure of the scene where the measure units are twips. - It is used passing the camera height view. - \param frameCount number of frames in the scene. - \param frameRate number of frame per second. - \param properties vector of swf properties as line and jpeg quality; - compression, looping, autoplay and preloading capabilities. - - - */ - TFlash(int lx, int ly, int frameCount, int frameRate, TPropertyGroup *properties, bool keepImages = true); - /*! - Deletes \p this object. - */ - ~TFlash(); - /*! - Sets scene' background to \p bgColor. - */ - - //if set to false, it does not save the alpha channel; default is on true - void enableAlphaChannelForRaster(bool doSaveIt); - - //default soundrate is at 5512 - void setSoundRate(int soundrate); - - // Nota: per ora va chiamata una sola volta e prima di ogni altra cosa - void setBackgroundColor(const TPixel &bgColor); - //void setCameraDpi(double dpix, double dpiy, double inchFactor); - //void getCameraDpi(double &dpix, double &dpiy); - /*! - Sets the thickness pf the stroke for painting the object. - */ - void setThickness(double thickness); - /*! - Sets the fill color of the drawing object. - Sets the type of style to Solid. - */ - void setFillColor(const TPixel32 &color); - /*! - Sets the stroke color used to paint the object. - */ - void setLineColor(const TPixel32 &color); - /*! - Sets the style to Texture. - Sets texture of the object. - */ - void setTexture(const TRaster32P &texture); - /*! - Sets the affine transformation of the filling style with texture. - */ - void setFillStyleMatrix(const TAffine &aff); - /*! - Sets parameters for filling with a gradient style. - */ - void setGradientFill(bool isLinear, const TPixel &color1, const TPixel &color2, double smooth); - //void setProperties(TPropertyGroup* properties); - /*! - Draws a segment line. - */ - void drawLine(const TPointD &a, const TPointD &b); - /*! - Draws a polygon given the vertices. - */ - void drawPolygon(vector> &quads, int clippedShapes = 0); //first polyline outside, other are holes - /*! - Draws a raster image. - */ - int drawRaster(TRaster32P r); - /*! - Draws a closed region. - */ - void drawRegion(const TRegion &r, int clippedShapes = 0); - /*! - Draws a line given a stroke style. - */ - void drawCenterline(const TStroke *s, bool drawAll); - /*! - Draws the outline of the stroke \p s. - */ - bool drawOutline(TStroke *s); - /*! - Draws the vector of segment lines \p segmentArray. - */ + static const wstring ConstantLines; + static const wstring MixedLines; + static const wstring VariableLines; + + TFlash(int lx, int ly, int frameCount, int frameRate, TPropertyGroup *properties, bool keepImages = true) {} + ~TFlash() {} + void enableAlphaChannelForRaster(bool doSaveIt) {} + void setSoundRate(int soundrate) {} + void setBackgroundColor(const TPixel &bgColor) {} + void setThickness(double thickness) {} + void setFillColor(const TPixel32 &color) {} + void setLineColor(const TPixel32 &color) {} + void setTexture(const TRaster32P &texture) {} + void setFillStyleMatrix(const TAffine &aff) {} + void setGradientFill(bool isLinear, const TPixel &color1, const TPixel &color2, double smooth) {} + void drawLine(const TPointD &a, const TPointD &b) {} + void drawPolygon(vector> &quads, int clippedShapes = 0) {} + int drawRaster(TRaster32P r) { return 0; } + void drawRegion(const TRegion &r, int clippedShapes = 0) {} + void drawCenterline(const TStroke *s, bool drawAll) {} + bool drawOutline(TStroke *s) { return false; } void drawSegments(const vector segmentArray, bool isGradientColor); - /*! - Draws an array of boxes. - */ void drawquads(const vector quadsArray); - /*!this function puts objects in an image in current sprite; - useful for image patterns - */ - USHORT buildImage(const TImageP img, bool isMask); - /*! - Adds the image \p vi to the current data frame. - */ - void draw(const TImageP vi, const TColorFunction *cf); - /*! - Initialize flash frame data and egins with frame \e frameIndex. - */ - void beginFrame(int frameIndex); - /*! - Ends the flash frame data. - */ - int endFrame(bool isLast, int frameCountLoader, bool lastScene); - /*! - Draws a rectangle. - */ - int drawRectangle(const TRectD &rect); - /*! - Draws a polyline. - */ - int drawPolyline(vector &poly); - /*! - Draws an ellipse. - */ - int drawEllipse(const TPointD ¢er, double radiusX, double radiusY); - /*! - Draws a point. - */ - void drawDot(const TPointD ¢er, double radius); - /*! - Puts the current affine matrix on the stack of the affine tansformations. - This stacks contains the transfomation sequence. - */ - void pushMatrix(); - /*! - Gets the matrix transformation from the stack and puts it - in the current affine matrix. - */ - void popMatrix(); - /*! - Multiplies current affine matrix by \p aff. - */ - void multMatrix(const TAffine &aff); - /*! - Puts audio stream to the scene beginning from the frame \p offset. - */ - void putSound(TSoundTrackP st, int offset); - /*! - Write the flash movie to file. - */ - void writeMovie(FILE *fp); - - void drawPolygon(const list &poly, bool isOutline); // tolgo???? - /*! - Returns the quality of the line, i.e. - "Low: Constant Thickness", "Medium: Mixed Thickness", "High: Variable Thickness". - */ - wstring getLineQuality(); - //void addPauseAtStart(); - /*! - Clears the tables of images used in the drawing. - */ - void cleanCachedImages(); - /*! - Enables the mask layer. - */ - void enableMask(); - /*! - Disables the mask layer. - */ - void disableMask(); - /*! - Create a new vector image with new palette, used as a mask layer. - */ - void beginMask(); - /*! - Puts current mask layer to the frame data. - */ - void endMask(); - /*! - Draws appended polylines and clears the tables of temporary images. - */ - void drawHangedObjects(); - /*! - Sets a global scale factor. - */ - void setGlobalScale(const TAffine &aff); - -private: - // not implemented - TFlash(); - TFlash(const TFlash &); - TFlash &operator=(const TFlash &); + USHORT buildImage(const TImageP img, bool isMask) { return 0; } + void draw(const TImageP vi, const TColorFunction *cf) {} + void beginFrame(int frameIndex) {} + int endFrame(bool isLast, int frameCountLoader, bool lastScene) { return 0; } + int drawRectangle(const TRectD &rect) { return 0; } + int drawPolyline(vector &poly) { return 0; } + int drawEllipse(const TPointD ¢er, double radiusX, double radiusY) { return 0; } + void drawDot(const TPointD ¢er, double radius) {} + void pushMatrix() {} + void popMatrix() {} + void multMatrix(const TAffine &aff) {} + void putSound(TSoundTrackP st, int offset) {} + void writeMovie(FILE *fp) {} + void drawPolygon(const list &poly, bool isOutline) {} + wstring getLineQuality() { return nullptr; } + void cleanCachedImages() {} + void enableMask() {} + void disableMask() {} + void beginMask() {} + void endMask() {} + void drawHangedObjects() {} + void setGlobalScale(const TAffine &aff) {} }; #endif diff --git a/toonz/sources/tcomposer/CMakeLists.txt b/toonz/sources/tcomposer/CMakeLists.txt index dea9ca5..9d537fc 100644 --- a/toonz/sources/tcomposer/CMakeLists.txt +++ b/toonz/sources/tcomposer/CMakeLists.txt @@ -10,4 +10,5 @@ target_link_libraries(tcomposer tnzstdfx sound image - colorfx) + colorfx + toonzqt) diff --git a/toonz/sources/tcomposer/tcomposer.cpp b/toonz/sources/tcomposer/tcomposer.cpp index b6cd7dc..1cd3a5b 100644 --- a/toonz/sources/tcomposer/tcomposer.cpp +++ b/toonz/sources/tcomposer/tcomposer.cpp @@ -66,6 +66,9 @@ #include "tvectorbrushstyle.h" #include "tpalette.h" +// TnzQt includes +#include "toonzqt/pluginloader.h" + // Qt includes #include #include @@ -798,6 +801,9 @@ int main(int argc, char *argv[]) factory.create(FarmControllerName, FarmControllerPort, &FarmController); } + while (!PluginLoader::load_entries("")) + app.processEvents(); + std::pair framePair(1, 0); try { diff --git a/toonz/sources/tnzcore/CMakeLists.txt b/toonz/sources/tnzcore/CMakeLists.txt index b402795..2ef803d 100644 --- a/toonz/sources/tnzcore/CMakeLists.txt +++ b/toonz/sources/tnzcore/CMakeLists.txt @@ -19,23 +19,6 @@ set(HEADERS ${MOC_HEADERS} ../include/trastercm.h ../include/trasterfx.h ../include/ttile.h - ../common/flash/F3SDK.h - ../common/flash/FAction.h - ../common/flash/FCT.h - ../common/flash/FDT.h - ../common/flash/FDTBitmaps.h - ../common/flash/FDTButtons.h - ../common/flash/FDTFonts.h - ../common/flash/FDTShapes.h - ../common/flash/FDTSounds.h - ../common/flash/FDTSprite.h - ../common/flash/FDTText.h - ../common/flash/FFixed.h - ../common/flash/FObj.h - ../common/flash/FPrimitive.h - ../common/flash/FSound.h - ../common/flash/FSWFStream.h - ../common/flash/Macromedia.h ../common/psdlib/psd.h ../common/psdlib/psdutils.h ../common/trop/runsmap.h @@ -211,20 +194,6 @@ set(SOURCES ../common/tvrender/ttessellator.cpp ../common/tvrender/tvectorbrush.cpp ../common/tvrender/tvectorbrushstyle.cpp - ../common/flash/FAction.cpp - ../common/flash/FCT.cpp - ../common/flash/FDT.cpp - ../common/flash/FDTBitmaps.cpp - ../common/flash/FDTButtons.cpp - ../common/flash/FDTFonts.cpp - ../common/flash/FDTShapes.cpp - ../common/flash/FDTSounds.cpp - ../common/flash/FDTSprite.cpp - ../common/flash/FDTText.cpp - ../common/flash/FObj.cpp - ../common/flash/FPrimitive.cpp - ../common/flash/FSound.cpp - ../common/flash/FSWFStream.cpp ../common/psdlib/psd.cpp ../common/psdlib/psdutils.cpp ../common/trop/bbox.cpp diff --git a/toonz/sources/toonz/CMakeLists.txt b/toonz/sources/toonz/CMakeLists.txt index 9916b8a..0b114d1 100644 --- a/toonz/sources/toonz/CMakeLists.txt +++ b/toonz/sources/toonz/CMakeLists.txt @@ -326,7 +326,9 @@ qt5_wrap_cpp(SOURCES ${MOC_HEADERS}) if(WIN32) add_executable(OpenToonz_${VERSION} WIN32 ${HEADERS} ${SOURCES} ${OBJCSOURCES} ${RESOURCES} ${RC_FILE}) else() - add_executable(OpenToonz_${VERSION} MACOSX_BUNDLE ${HEADERS} ${SOURCES} ${OBJCSOURCES} ${RESOURCES} ${RC_FILE}) + set(MACOSX_BUNDLE_ICON_FILE "OpenToonz.icns") + set_source_files_properties(OpenToonz.icns PROPERTIES MACOSX_PACKAGE_LOCATION "Resources") + add_executable(OpenToonz_${VERSION} MACOSX_BUNDLE OpenToonz.icns ${HEADERS} ${SOURCES} ${OBJCSOURCES} ${RESOURCES} ${RC_FILE}) #add_definitions(-DTNZBASE_EXPORTS -DTPARAM_EXPORTS -DTXSHEET_EXPORTS -DTFX_EXPORTS -DTAPPTOOLS_EXPORTS -DTTEST_EXPORTS) endif() diff --git a/toonz/sources/toonz/OpenToonz.icns b/toonz/sources/toonz/OpenToonz.icns new file mode 100644 index 0000000..dbd6cfa Binary files /dev/null and b/toonz/sources/toonz/OpenToonz.icns differ diff --git a/toonz/sources/toonz/glext.h b/toonz/sources/toonz/glext.h deleted file mode 100644 index f2b1882..0000000 --- a/toonz/sources/toonz/glext.h +++ /dev/null @@ -1,7260 +0,0 @@ - - -#ifndef __glext_h_ -#define __glext_h_ - -#ifdef __cplusplus -extern "C" { -#endif - -/* -** Copyright (c) 2007 The Khronos Group Inc. -** -** Permission is hereby granted, free of charge, to any person obtaining a -** copy of this software and/or associated documentation files (the -** "Materials"), to deal in the Materials without restriction, including -** without limitation the rights to use, copy, modify, merge, publish, -** distribute, sublicense, and/or sell copies of the Materials, and to -** permit persons to whom the Materials are furnished to do so, subject to -** the following conditions: -** -** The above copyright notice and this permission notice shall be included -** in all copies or substantial portions of the Materials. -** -** THE MATERIALS ARE PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, -** EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF -** MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. -** IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY -** CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, -** TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE -** MATERIALS OR THE USE OR OTHER DEALINGS IN THE MATERIALS. -*/ - -#if defined(_WIN32) && !defined(APIENTRY) && !defined(__CYGWIN__) && !defined(__SCITECH_SNAP__) -#define WIN32_LEAN_AND_MEAN 1 -#include -#endif - -#ifndef APIENTRY -#define APIENTRY -#endif -#ifndef APIENTRYP -#define APIENTRYP APIENTRY * -#endif -#ifndef GLAPI -#define GLAPI extern -#endif - -/*************************************************************/ - -/* Header file version number, required by OpenGL ABI for Linux */ -/* glext.h last updated 2007/02/12 */ -/* Current version at http://www.opengl.org/registry/ */ -#define GL_GLEXT_VERSION 39 - -#ifndef GL_VERSION_1_2 -#define GL_UNSIGNED_BYTE_3_3_2 0x8032 -#define GL_UNSIGNED_SHORT_4_4_4_4 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1 0x8034 -#define GL_UNSIGNED_INT_8_8_8_8 0x8035 -#define GL_UNSIGNED_INT_10_10_10_2 0x8036 -#define GL_RESCALE_NORMAL 0x803A -#define GL_TEXTURE_BINDING_3D 0x806A -#define GL_PACK_SKIP_IMAGES 0x806B -#define GL_PACK_IMAGE_HEIGHT 0x806C -#define GL_UNPACK_SKIP_IMAGES 0x806D -#define GL_UNPACK_IMAGE_HEIGHT 0x806E -#define GL_TEXTURE_3D 0x806F -#define GL_PROXY_TEXTURE_3D 0x8070 -#define GL_TEXTURE_DEPTH 0x8071 -#define GL_TEXTURE_WRAP_R 0x8072 -#define GL_MAX_3D_TEXTURE_SIZE 0x8073 -#define GL_UNSIGNED_BYTE_2_3_3_REV 0x8362 -#define GL_UNSIGNED_SHORT_5_6_5 0x8363 -#define GL_UNSIGNED_SHORT_5_6_5_REV 0x8364 -#define GL_UNSIGNED_SHORT_4_4_4_4_REV 0x8365 -#define GL_UNSIGNED_SHORT_1_5_5_5_REV 0x8366 -#define GL_UNSIGNED_INT_8_8_8_8_REV 0x8367 -#define GL_UNSIGNED_INT_2_10_10_10_REV 0x8368 -#define GL_BGR 0x80E0 -#define GL_BGRA 0x80E1 -#define GL_MAX_ELEMENTS_VERTICES 0x80E8 -#define GL_MAX_ELEMENTS_INDICES 0x80E9 -#define GL_CLAMP_TO_EDGE 0x812F -#define GL_TEXTURE_MIN_LOD 0x813A -#define GL_TEXTURE_MAX_LOD 0x813B -#define GL_TEXTURE_BASE_LEVEL 0x813C -#define GL_TEXTURE_MAX_LEVEL 0x813D -#define GL_LIGHT_MODEL_COLOR_CONTROL 0x81F8 -#define GL_SINGLE_COLOR 0x81F9 -#define GL_SEPARATE_SPECULAR_COLOR 0x81FA -#define GL_SMOOTH_POINT_SIZE_RANGE 0x0B12 -#define GL_SMOOTH_POINT_SIZE_GRANULARITY 0x0B13 -#define GL_SMOOTH_LINE_WIDTH_RANGE 0x0B22 -#define GL_SMOOTH_LINE_WIDTH_GRANULARITY 0x0B23 -#define GL_ALIASED_POINT_SIZE_RANGE 0x846D -#define GL_ALIASED_LINE_WIDTH_RANGE 0x846E -#endif - -#ifndef GL_ARB_imaging -#define GL_CONSTANT_COLOR 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR 0x8002 -#define GL_CONSTANT_ALPHA 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA 0x8004 -#define GL_BLEND_COLOR 0x8005 -#define GL_FUNC_ADD 0x8006 -#define GL_MIN 0x8007 -#define GL_MAX 0x8008 -#define GL_BLEND_EQUATION 0x8009 -#define GL_FUNC_SUBTRACT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT 0x800B -#define GL_CONVOLUTION_1D 0x8010 -#define GL_CONVOLUTION_2D 0x8011 -#define GL_SEPARABLE_2D 0x8012 -#define GL_CONVOLUTION_BORDER_MODE 0x8013 -#define GL_CONVOLUTION_FILTER_SCALE 0x8014 -#define GL_CONVOLUTION_FILTER_BIAS 0x8015 -#define GL_REDUCE 0x8016 -#define GL_CONVOLUTION_FORMAT 0x8017 -#define GL_CONVOLUTION_WIDTH 0x8018 -#define GL_CONVOLUTION_HEIGHT 0x8019 -#define GL_MAX_CONVOLUTION_WIDTH 0x801A -#define GL_MAX_CONVOLUTION_HEIGHT 0x801B -#define GL_POST_CONVOLUTION_RED_SCALE 0x801C -#define GL_POST_CONVOLUTION_GREEN_SCALE 0x801D -#define GL_POST_CONVOLUTION_BLUE_SCALE 0x801E -#define GL_POST_CONVOLUTION_ALPHA_SCALE 0x801F -#define GL_POST_CONVOLUTION_RED_BIAS 0x8020 -#define GL_POST_CONVOLUTION_GREEN_BIAS 0x8021 -#define GL_POST_CONVOLUTION_BLUE_BIAS 0x8022 -#define GL_POST_CONVOLUTION_ALPHA_BIAS 0x8023 -#define GL_HISTOGRAM 0x8024 -#define GL_PROXY_HISTOGRAM 0x8025 -#define GL_HISTOGRAM_WIDTH 0x8026 -#define GL_HISTOGRAM_FORMAT 0x8027 -#define GL_HISTOGRAM_RED_SIZE 0x8028 -#define GL_HISTOGRAM_GREEN_SIZE 0x8029 -#define GL_HISTOGRAM_BLUE_SIZE 0x802A -#define GL_HISTOGRAM_ALPHA_SIZE 0x802B -#define GL_HISTOGRAM_LUMINANCE_SIZE 0x802C -#define GL_HISTOGRAM_SINK 0x802D -#define GL_MINMAX 0x802E -#define GL_MINMAX_FORMAT 0x802F -#define GL_MINMAX_SINK 0x8030 -#define GL_TABLE_TOO_LARGE 0x8031 -#define GL_COLOR_MATRIX 0x80B1 -#define GL_COLOR_MATRIX_STACK_DEPTH 0x80B2 -#define GL_MAX_COLOR_MATRIX_STACK_DEPTH 0x80B3 -#define GL_POST_COLOR_MATRIX_RED_SCALE 0x80B4 -#define GL_POST_COLOR_MATRIX_GREEN_SCALE 0x80B5 -#define GL_POST_COLOR_MATRIX_BLUE_SCALE 0x80B6 -#define GL_POST_COLOR_MATRIX_ALPHA_SCALE 0x80B7 -#define GL_POST_COLOR_MATRIX_RED_BIAS 0x80B8 -#define GL_POST_COLOR_MATRIX_GREEN_BIAS 0x80B9 -#define GL_POST_COLOR_MATRIX_BLUE_BIAS 0x80BA -#define GL_POST_COLOR_MATRIX_ALPHA_BIAS 0x80BB -#define GL_COLOR_TABLE 0x80D0 -#define GL_POST_CONVOLUTION_COLOR_TABLE 0x80D1 -#define GL_POST_COLOR_MATRIX_COLOR_TABLE 0x80D2 -#define GL_PROXY_COLOR_TABLE 0x80D3 -#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE 0x80D4 -#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE 0x80D5 -#define GL_COLOR_TABLE_SCALE 0x80D6 -#define GL_COLOR_TABLE_BIAS 0x80D7 -#define GL_COLOR_TABLE_FORMAT 0x80D8 -#define GL_COLOR_TABLE_WIDTH 0x80D9 -#define GL_COLOR_TABLE_RED_SIZE 0x80DA -#define GL_COLOR_TABLE_GREEN_SIZE 0x80DB -#define GL_COLOR_TABLE_BLUE_SIZE 0x80DC -#define GL_COLOR_TABLE_ALPHA_SIZE 0x80DD -#define GL_COLOR_TABLE_LUMINANCE_SIZE 0x80DE -#define GL_COLOR_TABLE_INTENSITY_SIZE 0x80DF -#define GL_CONSTANT_BORDER 0x8151 -#define GL_REPLICATE_BORDER 0x8153 -#define GL_CONVOLUTION_BORDER_COLOR 0x8154 -#endif - -#ifndef GL_VERSION_1_3 -#define GL_TEXTURE0 0x84C0 -#define GL_TEXTURE1 0x84C1 -#define GL_TEXTURE2 0x84C2 -#define GL_TEXTURE3 0x84C3 -#define GL_TEXTURE4 0x84C4 -#define GL_TEXTURE5 0x84C5 -#define GL_TEXTURE6 0x84C6 -#define GL_TEXTURE7 0x84C7 -#define GL_TEXTURE8 0x84C8 -#define GL_TEXTURE9 0x84C9 -#define GL_TEXTURE10 0x84CA -#define GL_TEXTURE11 0x84CB -#define GL_TEXTURE12 0x84CC -#define GL_TEXTURE13 0x84CD -#define GL_TEXTURE14 0x84CE -#define GL_TEXTURE15 0x84CF -#define GL_TEXTURE16 0x84D0 -#define GL_TEXTURE17 0x84D1 -#define GL_TEXTURE18 0x84D2 -#define GL_TEXTURE19 0x84D3 -#define GL_TEXTURE20 0x84D4 -#define GL_TEXTURE21 0x84D5 -#define GL_TEXTURE22 0x84D6 -#define GL_TEXTURE23 0x84D7 -#define GL_TEXTURE24 0x84D8 -#define GL_TEXTURE25 0x84D9 -#define GL_TEXTURE26 0x84DA -#define GL_TEXTURE27 0x84DB -#define GL_TEXTURE28 0x84DC -#define GL_TEXTURE29 0x84DD -#define GL_TEXTURE30 0x84DE -#define GL_TEXTURE31 0x84DF -#define GL_ACTIVE_TEXTURE 0x84E0 -#define GL_CLIENT_ACTIVE_TEXTURE 0x84E1 -#define GL_MAX_TEXTURE_UNITS 0x84E2 -#define GL_TRANSPOSE_MODELVIEW_MATRIX 0x84E3 -#define GL_TRANSPOSE_PROJECTION_MATRIX 0x84E4 -#define GL_TRANSPOSE_TEXTURE_MATRIX 0x84E5 -#define GL_TRANSPOSE_COLOR_MATRIX 0x84E6 -#define GL_MULTISAMPLE 0x809D -#define GL_SAMPLE_ALPHA_TO_COVERAGE 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE 0x809F -#define GL_SAMPLE_COVERAGE 0x80A0 -#define GL_SAMPLE_BUFFERS 0x80A8 -#define GL_SAMPLES 0x80A9 -#define GL_SAMPLE_COVERAGE_VALUE 0x80AA -#define GL_SAMPLE_COVERAGE_INVERT 0x80AB -#define GL_MULTISAMPLE_BIT 0x20000000 -#define GL_NORMAL_MAP 0x8511 -#define GL_REFLECTION_MAP 0x8512 -#define GL_TEXTURE_CUBE_MAP 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE 0x851C -#define GL_COMPRESSED_ALPHA 0x84E9 -#define GL_COMPRESSED_LUMINANCE 0x84EA -#define GL_COMPRESSED_LUMINANCE_ALPHA 0x84EB -#define GL_COMPRESSED_INTENSITY 0x84EC -#define GL_COMPRESSED_RGB 0x84ED -#define GL_COMPRESSED_RGBA 0x84EE -#define GL_TEXTURE_COMPRESSION_HINT 0x84EF -#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE 0x86A0 -#define GL_TEXTURE_COMPRESSED 0x86A1 -#define GL_NUM_COMPRESSED_TEXTURE_FORMATS 0x86A2 -#define GL_COMPRESSED_TEXTURE_FORMATS 0x86A3 -#define GL_CLAMP_TO_BORDER 0x812D -#define GL_COMBINE 0x8570 -#define GL_COMBINE_RGB 0x8571 -#define GL_COMBINE_ALPHA 0x8572 -#define GL_SOURCE0_RGB 0x8580 -#define GL_SOURCE1_RGB 0x8581 -#define GL_SOURCE2_RGB 0x8582 -#define GL_SOURCE0_ALPHA 0x8588 -#define GL_SOURCE1_ALPHA 0x8589 -#define GL_SOURCE2_ALPHA 0x858A -#define GL_OPERAND0_RGB 0x8590 -#define GL_OPERAND1_RGB 0x8591 -#define GL_OPERAND2_RGB 0x8592 -#define GL_OPERAND0_ALPHA 0x8598 -#define GL_OPERAND1_ALPHA 0x8599 -#define GL_OPERAND2_ALPHA 0x859A -#define GL_RGB_SCALE 0x8573 -#define GL_ADD_SIGNED 0x8574 -#define GL_INTERPOLATE 0x8575 -#define GL_SUBTRACT 0x84E7 -#define GL_CONSTANT 0x8576 -#define GL_PRIMARY_COLOR 0x8577 -#define GL_PREVIOUS 0x8578 -#define GL_DOT3_RGB 0x86AE -#define GL_DOT3_RGBA 0x86AF -#endif - -#ifndef GL_VERSION_1_4 -#define GL_BLEND_DST_RGB 0x80C8 -#define GL_BLEND_SRC_RGB 0x80C9 -#define GL_BLEND_DST_ALPHA 0x80CA -#define GL_BLEND_SRC_ALPHA 0x80CB -#define GL_POINT_SIZE_MIN 0x8126 -#define GL_POINT_SIZE_MAX 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE 0x8128 -#define GL_POINT_DISTANCE_ATTENUATION 0x8129 -#define GL_GENERATE_MIPMAP 0x8191 -#define GL_GENERATE_MIPMAP_HINT 0x8192 -#define GL_DEPTH_COMPONENT16 0x81A5 -#define GL_DEPTH_COMPONENT24 0x81A6 -#define GL_DEPTH_COMPONENT32 0x81A7 -#define GL_MIRRORED_REPEAT 0x8370 -#define GL_FOG_COORDINATE_SOURCE 0x8450 -#define GL_FOG_COORDINATE 0x8451 -#define GL_FRAGMENT_DEPTH 0x8452 -#define GL_CURRENT_FOG_COORDINATE 0x8453 -#define GL_FOG_COORDINATE_ARRAY_TYPE 0x8454 -#define GL_FOG_COORDINATE_ARRAY_STRIDE 0x8455 -#define GL_FOG_COORDINATE_ARRAY_POINTER 0x8456 -#define GL_FOG_COORDINATE_ARRAY 0x8457 -#define GL_COLOR_SUM 0x8458 -#define GL_CURRENT_SECONDARY_COLOR 0x8459 -#define GL_SECONDARY_COLOR_ARRAY_SIZE 0x845A -#define GL_SECONDARY_COLOR_ARRAY_TYPE 0x845B -#define GL_SECONDARY_COLOR_ARRAY_STRIDE 0x845C -#define GL_SECONDARY_COLOR_ARRAY_POINTER 0x845D -#define GL_SECONDARY_COLOR_ARRAY 0x845E -#define GL_MAX_TEXTURE_LOD_BIAS 0x84FD -#define GL_TEXTURE_FILTER_CONTROL 0x8500 -#define GL_TEXTURE_LOD_BIAS 0x8501 -#define GL_INCR_WRAP 0x8507 -#define GL_DECR_WRAP 0x8508 -#define GL_TEXTURE_DEPTH_SIZE 0x884A -#define GL_DEPTH_TEXTURE_MODE 0x884B -#define GL_TEXTURE_COMPARE_MODE 0x884C -#define GL_TEXTURE_COMPARE_FUNC 0x884D -#define GL_COMPARE_R_TO_TEXTURE 0x884E -#endif - -#ifndef GL_VERSION_1_5 -#define GL_BUFFER_SIZE 0x8764 -#define GL_BUFFER_USAGE 0x8765 -#define GL_QUERY_COUNTER_BITS 0x8864 -#define GL_CURRENT_QUERY 0x8865 -#define GL_QUERY_RESULT 0x8866 -#define GL_QUERY_RESULT_AVAILABLE 0x8867 -#define GL_ARRAY_BUFFER 0x8892 -#define GL_ELEMENT_ARRAY_BUFFER 0x8893 -#define GL_ARRAY_BUFFER_BINDING 0x8894 -#define GL_ELEMENT_ARRAY_BUFFER_BINDING 0x8895 -#define GL_VERTEX_ARRAY_BUFFER_BINDING 0x8896 -#define GL_NORMAL_ARRAY_BUFFER_BINDING 0x8897 -#define GL_COLOR_ARRAY_BUFFER_BINDING 0x8898 -#define GL_INDEX_ARRAY_BUFFER_BINDING 0x8899 -#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING 0x889A -#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING 0x889B -#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING 0x889C -#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING 0x889D -#define GL_WEIGHT_ARRAY_BUFFER_BINDING 0x889E -#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING 0x889F -#define GL_READ_ONLY 0x88B8 -#define GL_WRITE_ONLY 0x88B9 -#define GL_READ_WRITE 0x88BA -#define GL_BUFFER_ACCESS 0x88BB -#define GL_BUFFER_MAPPED 0x88BC -#define GL_BUFFER_MAP_POINTER 0x88BD -#define GL_STREAM_DRAW 0x88E0 -#define GL_STREAM_READ 0x88E1 -#define GL_STREAM_COPY 0x88E2 -#define GL_STATIC_DRAW 0x88E4 -#define GL_STATIC_READ 0x88E5 -#define GL_STATIC_COPY 0x88E6 -#define GL_DYNAMIC_DRAW 0x88E8 -#define GL_DYNAMIC_READ 0x88E9 -#define GL_DYNAMIC_COPY 0x88EA -#define GL_SAMPLES_PASSED 0x8914 -#define GL_FOG_COORD_SRC GL_FOG_COORDINATE_SOURCE -#define GL_FOG_COORD GL_FOG_COORDINATE -#define GL_CURRENT_FOG_COORD GL_CURRENT_FOG_COORDINATE -#define GL_FOG_COORD_ARRAY_TYPE GL_FOG_COORDINATE_ARRAY_TYPE -#define GL_FOG_COORD_ARRAY_STRIDE GL_FOG_COORDINATE_ARRAY_STRIDE -#define GL_FOG_COORD_ARRAY_POINTER GL_FOG_COORDINATE_ARRAY_POINTER -#define GL_FOG_COORD_ARRAY GL_FOG_COORDINATE_ARRAY -#define GL_FOG_COORD_ARRAY_BUFFER_BINDING GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING -#define GL_SRC0_RGB GL_SOURCE0_RGB -#define GL_SRC1_RGB GL_SOURCE1_RGB -#define GL_SRC2_RGB GL_SOURCE2_RGB -#define GL_SRC0_ALPHA GL_SOURCE0_ALPHA -#define GL_SRC1_ALPHA GL_SOURCE1_ALPHA -#define GL_SRC2_ALPHA GL_SOURCE2_ALPHA -#endif - -#ifndef GL_VERSION_2_0 -#define GL_BLEND_EQUATION_RGB GL_BLEND_EQUATION -#define GL_VERTEX_ATTRIB_ARRAY_ENABLED 0x8622 -#define GL_VERTEX_ATTRIB_ARRAY_SIZE 0x8623 -#define GL_VERTEX_ATTRIB_ARRAY_STRIDE 0x8624 -#define GL_VERTEX_ATTRIB_ARRAY_TYPE 0x8625 -#define GL_CURRENT_VERTEX_ATTRIB 0x8626 -#define GL_VERTEX_PROGRAM_POINT_SIZE 0x8642 -#define GL_VERTEX_PROGRAM_TWO_SIDE 0x8643 -#define GL_VERTEX_ATTRIB_ARRAY_POINTER 0x8645 -#define GL_STENCIL_BACK_FUNC 0x8800 -#define GL_STENCIL_BACK_FAIL 0x8801 -#define GL_STENCIL_BACK_PASS_DEPTH_FAIL 0x8802 -#define GL_STENCIL_BACK_PASS_DEPTH_PASS 0x8803 -#define GL_MAX_DRAW_BUFFERS 0x8824 -#define GL_DRAW_BUFFER0 0x8825 -#define GL_DRAW_BUFFER1 0x8826 -#define GL_DRAW_BUFFER2 0x8827 -#define GL_DRAW_BUFFER3 0x8828 -#define GL_DRAW_BUFFER4 0x8829 -#define GL_DRAW_BUFFER5 0x882A -#define GL_DRAW_BUFFER6 0x882B -#define GL_DRAW_BUFFER7 0x882C -#define GL_DRAW_BUFFER8 0x882D -#define GL_DRAW_BUFFER9 0x882E -#define GL_DRAW_BUFFER10 0x882F -#define GL_DRAW_BUFFER11 0x8830 -#define GL_DRAW_BUFFER12 0x8831 -#define GL_DRAW_BUFFER13 0x8832 -#define GL_DRAW_BUFFER14 0x8833 -#define GL_DRAW_BUFFER15 0x8834 -#define GL_BLEND_EQUATION_ALPHA 0x883D -#define GL_POINT_SPRITE 0x8861 -#define GL_COORD_REPLACE 0x8862 -#define GL_MAX_VERTEX_ATTRIBS 0x8869 -#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED 0x886A -#define GL_MAX_TEXTURE_COORDS 0x8871 -#define GL_MAX_TEXTURE_IMAGE_UNITS 0x8872 -#define GL_FRAGMENT_SHADER 0x8B30 -#define GL_VERTEX_SHADER 0x8B31 -#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS 0x8B49 -#define GL_MAX_VERTEX_UNIFORM_COMPONENTS 0x8B4A -#define GL_MAX_VARYING_FLOATS 0x8B4B -#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS 0x8B4C -#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS 0x8B4D -#define GL_SHADER_TYPE 0x8B4F -#define GL_FLOAT_VEC2 0x8B50 -#define GL_FLOAT_VEC3 0x8B51 -#define GL_FLOAT_VEC4 0x8B52 -#define GL_INT_VEC2 0x8B53 -#define GL_INT_VEC3 0x8B54 -#define GL_INT_VEC4 0x8B55 -#define GL_BOOL 0x8B56 -#define GL_BOOL_VEC2 0x8B57 -#define GL_BOOL_VEC3 0x8B58 -#define GL_BOOL_VEC4 0x8B59 -#define GL_FLOAT_MAT2 0x8B5A -#define GL_FLOAT_MAT3 0x8B5B -#define GL_FLOAT_MAT4 0x8B5C -#define GL_SAMPLER_1D 0x8B5D -#define GL_SAMPLER_2D 0x8B5E -#define GL_SAMPLER_3D 0x8B5F -#define GL_SAMPLER_CUBE 0x8B60 -#define GL_SAMPLER_1D_SHADOW 0x8B61 -#define GL_SAMPLER_2D_SHADOW 0x8B62 -#define GL_DELETE_STATUS 0x8B80 -#define GL_COMPILE_STATUS 0x8B81 -#define GL_LINK_STATUS 0x8B82 -#define GL_VALIDATE_STATUS 0x8B83 -#define GL_INFO_LOG_LENGTH 0x8B84 -#define GL_ATTACHED_SHADERS 0x8B85 -#define GL_ACTIVE_UNIFORMS 0x8B86 -#define GL_ACTIVE_UNIFORM_MAX_LENGTH 0x8B87 -#define GL_SHADER_SOURCE_LENGTH 0x8B88 -#define GL_ACTIVE_ATTRIBUTES 0x8B89 -#define GL_ACTIVE_ATTRIBUTE_MAX_LENGTH 0x8B8A -#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT 0x8B8B -#define GL_SHADING_LANGUAGE_VERSION 0x8B8C -#define GL_CURRENT_PROGRAM 0x8B8D -#define GL_POINT_SPRITE_COORD_ORIGIN 0x8CA0 -#define GL_LOWER_LEFT 0x8CA1 -#define GL_UPPER_LEFT 0x8CA2 -#define GL_STENCIL_BACK_REF 0x8CA3 -#define GL_STENCIL_BACK_VALUE_MASK 0x8CA4 -#define GL_STENCIL_BACK_WRITEMASK 0x8CA5 -#endif - -#ifndef GL_VERSION_2_1 -#define GL_CURRENT_RASTER_SECONDARY_COLOR 0x845F -#define GL_PIXEL_PACK_BUFFER 0x88EB -#define GL_PIXEL_UNPACK_BUFFER 0x88EC -#define GL_PIXEL_PACK_BUFFER_BINDING 0x88ED -#define GL_PIXEL_UNPACK_BUFFER_BINDING 0x88EF -#define GL_FLOAT_MAT2x3 0x8B65 -#define GL_FLOAT_MAT2x4 0x8B66 -#define GL_FLOAT_MAT3x2 0x8B67 -#define GL_FLOAT_MAT3x4 0x8B68 -#define GL_FLOAT_MAT4x2 0x8B69 -#define GL_FLOAT_MAT4x3 0x8B6A -#define GL_SRGB 0x8C40 -#define GL_SRGB8 0x8C41 -#define GL_SRGB_ALPHA 0x8C42 -#define GL_SRGB8_ALPHA8 0x8C43 -#define GL_SLUMINANCE_ALPHA 0x8C44 -#define GL_SLUMINANCE8_ALPHA8 0x8C45 -#define GL_SLUMINANCE 0x8C46 -#define GL_SLUMINANCE8 0x8C47 -#define GL_COMPRESSED_SRGB 0x8C48 -#define GL_COMPRESSED_SRGB_ALPHA 0x8C49 -#define GL_COMPRESSED_SLUMINANCE 0x8C4A -#define GL_COMPRESSED_SLUMINANCE_ALPHA 0x8C4B -#endif - -#ifndef GL_ARB_multitexture -#define GL_TEXTURE0_ARB 0x84C0 -#define GL_TEXTURE1_ARB 0x84C1 -#define GL_TEXTURE2_ARB 0x84C2 -#define GL_TEXTURE3_ARB 0x84C3 -#define GL_TEXTURE4_ARB 0x84C4 -#define GL_TEXTURE5_ARB 0x84C5 -#define GL_TEXTURE6_ARB 0x84C6 -#define GL_TEXTURE7_ARB 0x84C7 -#define GL_TEXTURE8_ARB 0x84C8 -#define GL_TEXTURE9_ARB 0x84C9 -#define GL_TEXTURE10_ARB 0x84CA -#define GL_TEXTURE11_ARB 0x84CB -#define GL_TEXTURE12_ARB 0x84CC -#define GL_TEXTURE13_ARB 0x84CD -#define GL_TEXTURE14_ARB 0x84CE -#define GL_TEXTURE15_ARB 0x84CF -#define GL_TEXTURE16_ARB 0x84D0 -#define GL_TEXTURE17_ARB 0x84D1 -#define GL_TEXTURE18_ARB 0x84D2 -#define GL_TEXTURE19_ARB 0x84D3 -#define GL_TEXTURE20_ARB 0x84D4 -#define GL_TEXTURE21_ARB 0x84D5 -#define GL_TEXTURE22_ARB 0x84D6 -#define GL_TEXTURE23_ARB 0x84D7 -#define GL_TEXTURE24_ARB 0x84D8 -#define GL_TEXTURE25_ARB 0x84D9 -#define GL_TEXTURE26_ARB 0x84DA -#define GL_TEXTURE27_ARB 0x84DB -#define GL_TEXTURE28_ARB 0x84DC -#define GL_TEXTURE29_ARB 0x84DD -#define GL_TEXTURE30_ARB 0x84DE -#define GL_TEXTURE31_ARB 0x84DF -#define GL_ACTIVE_TEXTURE_ARB 0x84E0 -#define GL_CLIENT_ACTIVE_TEXTURE_ARB 0x84E1 -#define GL_MAX_TEXTURE_UNITS_ARB 0x84E2 -#endif - -#ifndef GL_ARB_transpose_matrix -#define GL_TRANSPOSE_MODELVIEW_MATRIX_ARB 0x84E3 -#define GL_TRANSPOSE_PROJECTION_MATRIX_ARB 0x84E4 -#define GL_TRANSPOSE_TEXTURE_MATRIX_ARB 0x84E5 -#define GL_TRANSPOSE_COLOR_MATRIX_ARB 0x84E6 -#endif - -#ifndef GL_ARB_multisample -#define GL_MULTISAMPLE_ARB 0x809D -#define GL_SAMPLE_ALPHA_TO_COVERAGE_ARB 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_ARB 0x809F -#define GL_SAMPLE_COVERAGE_ARB 0x80A0 -#define GL_SAMPLE_BUFFERS_ARB 0x80A8 -#define GL_SAMPLES_ARB 0x80A9 -#define GL_SAMPLE_COVERAGE_VALUE_ARB 0x80AA -#define GL_SAMPLE_COVERAGE_INVERT_ARB 0x80AB -#define GL_MULTISAMPLE_BIT_ARB 0x20000000 -#endif - -#ifndef GL_ARB_texture_env_add -#endif - -#ifndef GL_ARB_texture_cube_map -#define GL_NORMAL_MAP_ARB 0x8511 -#define GL_REFLECTION_MAP_ARB 0x8512 -#define GL_TEXTURE_CUBE_MAP_ARB 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP_ARB 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_ARB 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_ARB 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_ARB 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_ARB 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_ARB 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_ARB 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP_ARB 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_ARB 0x851C -#endif - -#ifndef GL_ARB_texture_compression -#define GL_COMPRESSED_ALPHA_ARB 0x84E9 -#define GL_COMPRESSED_LUMINANCE_ARB 0x84EA -#define GL_COMPRESSED_LUMINANCE_ALPHA_ARB 0x84EB -#define GL_COMPRESSED_INTENSITY_ARB 0x84EC -#define GL_COMPRESSED_RGB_ARB 0x84ED -#define GL_COMPRESSED_RGBA_ARB 0x84EE -#define GL_TEXTURE_COMPRESSION_HINT_ARB 0x84EF -#define GL_TEXTURE_COMPRESSED_IMAGE_SIZE_ARB 0x86A0 -#define GL_TEXTURE_COMPRESSED_ARB 0x86A1 -#define GL_NUM_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A2 -#define GL_COMPRESSED_TEXTURE_FORMATS_ARB 0x86A3 -#endif - -#ifndef GL_ARB_texture_border_clamp -#define GL_CLAMP_TO_BORDER_ARB 0x812D -#endif - -#ifndef GL_ARB_point_parameters -#define GL_POINT_SIZE_MIN_ARB 0x8126 -#define GL_POINT_SIZE_MAX_ARB 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE_ARB 0x8128 -#define GL_POINT_DISTANCE_ATTENUATION_ARB 0x8129 -#endif - -#ifndef GL_ARB_vertex_blend -#define GL_MAX_VERTEX_UNITS_ARB 0x86A4 -#define GL_ACTIVE_VERTEX_UNITS_ARB 0x86A5 -#define GL_WEIGHT_SUM_UNITY_ARB 0x86A6 -#define GL_VERTEX_BLEND_ARB 0x86A7 -#define GL_CURRENT_WEIGHT_ARB 0x86A8 -#define GL_WEIGHT_ARRAY_TYPE_ARB 0x86A9 -#define GL_WEIGHT_ARRAY_STRIDE_ARB 0x86AA -#define GL_WEIGHT_ARRAY_SIZE_ARB 0x86AB -#define GL_WEIGHT_ARRAY_POINTER_ARB 0x86AC -#define GL_WEIGHT_ARRAY_ARB 0x86AD -#define GL_MODELVIEW0_ARB 0x1700 -#define GL_MODELVIEW1_ARB 0x850A -#define GL_MODELVIEW2_ARB 0x8722 -#define GL_MODELVIEW3_ARB 0x8723 -#define GL_MODELVIEW4_ARB 0x8724 -#define GL_MODELVIEW5_ARB 0x8725 -#define GL_MODELVIEW6_ARB 0x8726 -#define GL_MODELVIEW7_ARB 0x8727 -#define GL_MODELVIEW8_ARB 0x8728 -#define GL_MODELVIEW9_ARB 0x8729 -#define GL_MODELVIEW10_ARB 0x872A -#define GL_MODELVIEW11_ARB 0x872B -#define GL_MODELVIEW12_ARB 0x872C -#define GL_MODELVIEW13_ARB 0x872D -#define GL_MODELVIEW14_ARB 0x872E -#define GL_MODELVIEW15_ARB 0x872F -#define GL_MODELVIEW16_ARB 0x8730 -#define GL_MODELVIEW17_ARB 0x8731 -#define GL_MODELVIEW18_ARB 0x8732 -#define GL_MODELVIEW19_ARB 0x8733 -#define GL_MODELVIEW20_ARB 0x8734 -#define GL_MODELVIEW21_ARB 0x8735 -#define GL_MODELVIEW22_ARB 0x8736 -#define GL_MODELVIEW23_ARB 0x8737 -#define GL_MODELVIEW24_ARB 0x8738 -#define GL_MODELVIEW25_ARB 0x8739 -#define GL_MODELVIEW26_ARB 0x873A -#define GL_MODELVIEW27_ARB 0x873B -#define GL_MODELVIEW28_ARB 0x873C -#define GL_MODELVIEW29_ARB 0x873D -#define GL_MODELVIEW30_ARB 0x873E -#define GL_MODELVIEW31_ARB 0x873F -#endif - -#ifndef GL_ARB_matrix_palette -#define GL_MATRIX_PALETTE_ARB 0x8840 -#define GL_MAX_MATRIX_PALETTE_STACK_DEPTH_ARB 0x8841 -#define GL_MAX_PALETTE_MATRICES_ARB 0x8842 -#define GL_CURRENT_PALETTE_MATRIX_ARB 0x8843 -#define GL_MATRIX_INDEX_ARRAY_ARB 0x8844 -#define GL_CURRENT_MATRIX_INDEX_ARB 0x8845 -#define GL_MATRIX_INDEX_ARRAY_SIZE_ARB 0x8846 -#define GL_MATRIX_INDEX_ARRAY_TYPE_ARB 0x8847 -#define GL_MATRIX_INDEX_ARRAY_STRIDE_ARB 0x8848 -#define GL_MATRIX_INDEX_ARRAY_POINTER_ARB 0x8849 -#endif - -#ifndef GL_ARB_texture_env_combine -#define GL_COMBINE_ARB 0x8570 -#define GL_COMBINE_RGB_ARB 0x8571 -#define GL_COMBINE_ALPHA_ARB 0x8572 -#define GL_SOURCE0_RGB_ARB 0x8580 -#define GL_SOURCE1_RGB_ARB 0x8581 -#define GL_SOURCE2_RGB_ARB 0x8582 -#define GL_SOURCE0_ALPHA_ARB 0x8588 -#define GL_SOURCE1_ALPHA_ARB 0x8589 -#define GL_SOURCE2_ALPHA_ARB 0x858A -#define GL_OPERAND0_RGB_ARB 0x8590 -#define GL_OPERAND1_RGB_ARB 0x8591 -#define GL_OPERAND2_RGB_ARB 0x8592 -#define GL_OPERAND0_ALPHA_ARB 0x8598 -#define GL_OPERAND1_ALPHA_ARB 0x8599 -#define GL_OPERAND2_ALPHA_ARB 0x859A -#define GL_RGB_SCALE_ARB 0x8573 -#define GL_ADD_SIGNED_ARB 0x8574 -#define GL_INTERPOLATE_ARB 0x8575 -#define GL_SUBTRACT_ARB 0x84E7 -#define GL_CONSTANT_ARB 0x8576 -#define GL_PRIMARY_COLOR_ARB 0x8577 -#define GL_PREVIOUS_ARB 0x8578 -#endif - -#ifndef GL_ARB_texture_env_crossbar -#endif - -#ifndef GL_ARB_texture_env_dot3 -#define GL_DOT3_RGB_ARB 0x86AE -#define GL_DOT3_RGBA_ARB 0x86AF -#endif - -#ifndef GL_ARB_texture_mirrored_repeat -#define GL_MIRRORED_REPEAT_ARB 0x8370 -#endif - -#ifndef GL_ARB_depth_texture -#define GL_DEPTH_COMPONENT16_ARB 0x81A5 -#define GL_DEPTH_COMPONENT24_ARB 0x81A6 -#define GL_DEPTH_COMPONENT32_ARB 0x81A7 -#define GL_TEXTURE_DEPTH_SIZE_ARB 0x884A -#define GL_DEPTH_TEXTURE_MODE_ARB 0x884B -#endif - -#ifndef GL_ARB_shadow -#define GL_TEXTURE_COMPARE_MODE_ARB 0x884C -#define GL_TEXTURE_COMPARE_FUNC_ARB 0x884D -#define GL_COMPARE_R_TO_TEXTURE_ARB 0x884E -#endif - -#ifndef GL_ARB_shadow_ambient -#define GL_TEXTURE_COMPARE_FAIL_VALUE_ARB 0x80BF -#endif - -#ifndef GL_ARB_window_pos -#endif - -#ifndef GL_ARB_vertex_program -#define GL_COLOR_SUM_ARB 0x8458 -#define GL_VERTEX_PROGRAM_ARB 0x8620 -#define GL_VERTEX_ATTRIB_ARRAY_ENABLED_ARB 0x8622 -#define GL_VERTEX_ATTRIB_ARRAY_SIZE_ARB 0x8623 -#define GL_VERTEX_ATTRIB_ARRAY_STRIDE_ARB 0x8624 -#define GL_VERTEX_ATTRIB_ARRAY_TYPE_ARB 0x8625 -#define GL_CURRENT_VERTEX_ATTRIB_ARB 0x8626 -#define GL_PROGRAM_LENGTH_ARB 0x8627 -#define GL_PROGRAM_STRING_ARB 0x8628 -#define GL_MAX_PROGRAM_MATRIX_STACK_DEPTH_ARB 0x862E -#define GL_MAX_PROGRAM_MATRICES_ARB 0x862F -#define GL_CURRENT_MATRIX_STACK_DEPTH_ARB 0x8640 -#define GL_CURRENT_MATRIX_ARB 0x8641 -#define GL_VERTEX_PROGRAM_POINT_SIZE_ARB 0x8642 -#define GL_VERTEX_PROGRAM_TWO_SIDE_ARB 0x8643 -#define GL_VERTEX_ATTRIB_ARRAY_POINTER_ARB 0x8645 -#define GL_PROGRAM_ERROR_POSITION_ARB 0x864B -#define GL_PROGRAM_BINDING_ARB 0x8677 -#define GL_MAX_VERTEX_ATTRIBS_ARB 0x8869 -#define GL_VERTEX_ATTRIB_ARRAY_NORMALIZED_ARB 0x886A -#define GL_PROGRAM_ERROR_STRING_ARB 0x8874 -#define GL_PROGRAM_FORMAT_ASCII_ARB 0x8875 -#define GL_PROGRAM_FORMAT_ARB 0x8876 -#define GL_PROGRAM_INSTRUCTIONS_ARB 0x88A0 -#define GL_MAX_PROGRAM_INSTRUCTIONS_ARB 0x88A1 -#define GL_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A2 -#define GL_MAX_PROGRAM_NATIVE_INSTRUCTIONS_ARB 0x88A3 -#define GL_PROGRAM_TEMPORARIES_ARB 0x88A4 -#define GL_MAX_PROGRAM_TEMPORARIES_ARB 0x88A5 -#define GL_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A6 -#define GL_MAX_PROGRAM_NATIVE_TEMPORARIES_ARB 0x88A7 -#define GL_PROGRAM_PARAMETERS_ARB 0x88A8 -#define GL_MAX_PROGRAM_PARAMETERS_ARB 0x88A9 -#define GL_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AA -#define GL_MAX_PROGRAM_NATIVE_PARAMETERS_ARB 0x88AB -#define GL_PROGRAM_ATTRIBS_ARB 0x88AC -#define GL_MAX_PROGRAM_ATTRIBS_ARB 0x88AD -#define GL_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AE -#define GL_MAX_PROGRAM_NATIVE_ATTRIBS_ARB 0x88AF -#define GL_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B0 -#define GL_MAX_PROGRAM_ADDRESS_REGISTERS_ARB 0x88B1 -#define GL_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B2 -#define GL_MAX_PROGRAM_NATIVE_ADDRESS_REGISTERS_ARB 0x88B3 -#define GL_MAX_PROGRAM_LOCAL_PARAMETERS_ARB 0x88B4 -#define GL_MAX_PROGRAM_ENV_PARAMETERS_ARB 0x88B5 -#define GL_PROGRAM_UNDER_NATIVE_LIMITS_ARB 0x88B6 -#define GL_TRANSPOSE_CURRENT_MATRIX_ARB 0x88B7 -#define GL_MATRIX0_ARB 0x88C0 -#define GL_MATRIX1_ARB 0x88C1 -#define GL_MATRIX2_ARB 0x88C2 -#define GL_MATRIX3_ARB 0x88C3 -#define GL_MATRIX4_ARB 0x88C4 -#define GL_MATRIX5_ARB 0x88C5 -#define GL_MATRIX6_ARB 0x88C6 -#define GL_MATRIX7_ARB 0x88C7 -#define GL_MATRIX8_ARB 0x88C8 -#define GL_MATRIX9_ARB 0x88C9 -#define GL_MATRIX10_ARB 0x88CA -#define GL_MATRIX11_ARB 0x88CB -#define GL_MATRIX12_ARB 0x88CC -#define GL_MATRIX13_ARB 0x88CD -#define GL_MATRIX14_ARB 0x88CE -#define GL_MATRIX15_ARB 0x88CF -#define GL_MATRIX16_ARB 0x88D0 -#define GL_MATRIX17_ARB 0x88D1 -#define GL_MATRIX18_ARB 0x88D2 -#define GL_MATRIX19_ARB 0x88D3 -#define GL_MATRIX20_ARB 0x88D4 -#define GL_MATRIX21_ARB 0x88D5 -#define GL_MATRIX22_ARB 0x88D6 -#define GL_MATRIX23_ARB 0x88D7 -#define GL_MATRIX24_ARB 0x88D8 -#define GL_MATRIX25_ARB 0x88D9 -#define GL_MATRIX26_ARB 0x88DA -#define GL_MATRIX27_ARB 0x88DB -#define GL_MATRIX28_ARB 0x88DC -#define GL_MATRIX29_ARB 0x88DD -#define GL_MATRIX30_ARB 0x88DE -#define GL_MATRIX31_ARB 0x88DF -#endif - -#ifndef GL_ARB_fragment_program -#define GL_FRAGMENT_PROGRAM_ARB 0x8804 -#define GL_PROGRAM_ALU_INSTRUCTIONS_ARB 0x8805 -#define GL_PROGRAM_TEX_INSTRUCTIONS_ARB 0x8806 -#define GL_PROGRAM_TEX_INDIRECTIONS_ARB 0x8807 -#define GL_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x8808 -#define GL_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x8809 -#define GL_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x880A -#define GL_MAX_PROGRAM_ALU_INSTRUCTIONS_ARB 0x880B -#define GL_MAX_PROGRAM_TEX_INSTRUCTIONS_ARB 0x880C -#define GL_MAX_PROGRAM_TEX_INDIRECTIONS_ARB 0x880D -#define GL_MAX_PROGRAM_NATIVE_ALU_INSTRUCTIONS_ARB 0x880E -#define GL_MAX_PROGRAM_NATIVE_TEX_INSTRUCTIONS_ARB 0x880F -#define GL_MAX_PROGRAM_NATIVE_TEX_INDIRECTIONS_ARB 0x8810 -#define GL_MAX_TEXTURE_COORDS_ARB 0x8871 -#define GL_MAX_TEXTURE_IMAGE_UNITS_ARB 0x8872 -#endif - -#ifndef GL_ARB_vertex_buffer_object -#define GL_BUFFER_SIZE_ARB 0x8764 -#define GL_BUFFER_USAGE_ARB 0x8765 -#define GL_ARRAY_BUFFER_ARB 0x8892 -#define GL_ELEMENT_ARRAY_BUFFER_ARB 0x8893 -#define GL_ARRAY_BUFFER_BINDING_ARB 0x8894 -#define GL_ELEMENT_ARRAY_BUFFER_BINDING_ARB 0x8895 -#define GL_VERTEX_ARRAY_BUFFER_BINDING_ARB 0x8896 -#define GL_NORMAL_ARRAY_BUFFER_BINDING_ARB 0x8897 -#define GL_COLOR_ARRAY_BUFFER_BINDING_ARB 0x8898 -#define GL_INDEX_ARRAY_BUFFER_BINDING_ARB 0x8899 -#define GL_TEXTURE_COORD_ARRAY_BUFFER_BINDING_ARB 0x889A -#define GL_EDGE_FLAG_ARRAY_BUFFER_BINDING_ARB 0x889B -#define GL_SECONDARY_COLOR_ARRAY_BUFFER_BINDING_ARB 0x889C -#define GL_FOG_COORDINATE_ARRAY_BUFFER_BINDING_ARB 0x889D -#define GL_WEIGHT_ARRAY_BUFFER_BINDING_ARB 0x889E -#define GL_VERTEX_ATTRIB_ARRAY_BUFFER_BINDING_ARB 0x889F -#define GL_READ_ONLY_ARB 0x88B8 -#define GL_WRITE_ONLY_ARB 0x88B9 -#define GL_READ_WRITE_ARB 0x88BA -#define GL_BUFFER_ACCESS_ARB 0x88BB -#define GL_BUFFER_MAPPED_ARB 0x88BC -#define GL_BUFFER_MAP_POINTER_ARB 0x88BD -#define GL_STREAM_DRAW_ARB 0x88E0 -#define GL_STREAM_READ_ARB 0x88E1 -#define GL_STREAM_COPY_ARB 0x88E2 -#define GL_STATIC_DRAW_ARB 0x88E4 -#define GL_STATIC_READ_ARB 0x88E5 -#define GL_STATIC_COPY_ARB 0x88E6 -#define GL_DYNAMIC_DRAW_ARB 0x88E8 -#define GL_DYNAMIC_READ_ARB 0x88E9 -#define GL_DYNAMIC_COPY_ARB 0x88EA -#endif - -#ifndef GL_ARB_occlusion_query -#define GL_QUERY_COUNTER_BITS_ARB 0x8864 -#define GL_CURRENT_QUERY_ARB 0x8865 -#define GL_QUERY_RESULT_ARB 0x8866 -#define GL_QUERY_RESULT_AVAILABLE_ARB 0x8867 -#define GL_SAMPLES_PASSED_ARB 0x8914 -#endif - -#ifndef GL_ARB_shader_objects -#define GL_PROGRAM_OBJECT_ARB 0x8B40 -#define GL_SHADER_OBJECT_ARB 0x8B48 -#define GL_OBJECT_TYPE_ARB 0x8B4E -#define GL_OBJECT_SUBTYPE_ARB 0x8B4F -#define GL_FLOAT_VEC2_ARB 0x8B50 -#define GL_FLOAT_VEC3_ARB 0x8B51 -#define GL_FLOAT_VEC4_ARB 0x8B52 -#define GL_INT_VEC2_ARB 0x8B53 -#define GL_INT_VEC3_ARB 0x8B54 -#define GL_INT_VEC4_ARB 0x8B55 -#define GL_BOOL_ARB 0x8B56 -#define GL_BOOL_VEC2_ARB 0x8B57 -#define GL_BOOL_VEC3_ARB 0x8B58 -#define GL_BOOL_VEC4_ARB 0x8B59 -#define GL_FLOAT_MAT2_ARB 0x8B5A -#define GL_FLOAT_MAT3_ARB 0x8B5B -#define GL_FLOAT_MAT4_ARB 0x8B5C -#define GL_SAMPLER_1D_ARB 0x8B5D -#define GL_SAMPLER_2D_ARB 0x8B5E -#define GL_SAMPLER_3D_ARB 0x8B5F -#define GL_SAMPLER_CUBE_ARB 0x8B60 -#define GL_SAMPLER_1D_SHADOW_ARB 0x8B61 -#define GL_SAMPLER_2D_SHADOW_ARB 0x8B62 -#define GL_SAMPLER_2D_RECT_ARB 0x8B63 -#define GL_SAMPLER_2D_RECT_SHADOW_ARB 0x8B64 -#define GL_OBJECT_DELETE_STATUS_ARB 0x8B80 -#define GL_OBJECT_COMPILE_STATUS_ARB 0x8B81 -#define GL_OBJECT_LINK_STATUS_ARB 0x8B82 -#define GL_OBJECT_VALIDATE_STATUS_ARB 0x8B83 -#define GL_OBJECT_INFO_LOG_LENGTH_ARB 0x8B84 -#define GL_OBJECT_ATTACHED_OBJECTS_ARB 0x8B85 -#define GL_OBJECT_ACTIVE_UNIFORMS_ARB 0x8B86 -#define GL_OBJECT_ACTIVE_UNIFORM_MAX_LENGTH_ARB 0x8B87 -#define GL_OBJECT_SHADER_SOURCE_LENGTH_ARB 0x8B88 -#endif - -#ifndef GL_ARB_vertex_shader -#define GL_VERTEX_SHADER_ARB 0x8B31 -#define GL_MAX_VERTEX_UNIFORM_COMPONENTS_ARB 0x8B4A -#define GL_MAX_VARYING_FLOATS_ARB 0x8B4B -#define GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB 0x8B4C -#define GL_MAX_COMBINED_TEXTURE_IMAGE_UNITS_ARB 0x8B4D -#define GL_OBJECT_ACTIVE_ATTRIBUTES_ARB 0x8B89 -#define GL_OBJECT_ACTIVE_ATTRIBUTE_MAX_LENGTH_ARB 0x8B8A -#endif - -#ifndef GL_ARB_fragment_shader -#define GL_FRAGMENT_SHADER_ARB 0x8B30 -#define GL_MAX_FRAGMENT_UNIFORM_COMPONENTS_ARB 0x8B49 -#define GL_FRAGMENT_SHADER_DERIVATIVE_HINT_ARB 0x8B8B -#endif - -#ifndef GL_ARB_shading_language_100 -#define GL_SHADING_LANGUAGE_VERSION_ARB 0x8B8C -#endif - -#ifndef GL_ARB_texture_non_power_of_two -#endif - -#ifndef GL_ARB_point_sprite -#define GL_POINT_SPRITE_ARB 0x8861 -#define GL_COORD_REPLACE_ARB 0x8862 -#endif - -#ifndef GL_ARB_fragment_program_shadow -#endif - -#ifndef GL_ARB_draw_buffers -#define GL_MAX_DRAW_BUFFERS_ARB 0x8824 -#define GL_DRAW_BUFFER0_ARB 0x8825 -#define GL_DRAW_BUFFER1_ARB 0x8826 -#define GL_DRAW_BUFFER2_ARB 0x8827 -#define GL_DRAW_BUFFER3_ARB 0x8828 -#define GL_DRAW_BUFFER4_ARB 0x8829 -#define GL_DRAW_BUFFER5_ARB 0x882A -#define GL_DRAW_BUFFER6_ARB 0x882B -#define GL_DRAW_BUFFER7_ARB 0x882C -#define GL_DRAW_BUFFER8_ARB 0x882D -#define GL_DRAW_BUFFER9_ARB 0x882E -#define GL_DRAW_BUFFER10_ARB 0x882F -#define GL_DRAW_BUFFER11_ARB 0x8830 -#define GL_DRAW_BUFFER12_ARB 0x8831 -#define GL_DRAW_BUFFER13_ARB 0x8832 -#define GL_DRAW_BUFFER14_ARB 0x8833 -#define GL_DRAW_BUFFER15_ARB 0x8834 -#endif - -#ifndef GL_ARB_texture_rectangle -#define GL_TEXTURE_RECTANGLE_ARB 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE_ARB 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE_ARB 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE_ARB 0x84F8 -#endif - -#ifndef GL_ARB_color_buffer_float -#define GL_RGBA_FLOAT_MODE_ARB 0x8820 -#define GL_CLAMP_VERTEX_COLOR_ARB 0x891A -#define GL_CLAMP_FRAGMENT_COLOR_ARB 0x891B -#define GL_CLAMP_READ_COLOR_ARB 0x891C -#define GL_FIXED_ONLY_ARB 0x891D -#endif - -#ifndef GL_ARB_half_float_pixel -#define GL_HALF_FLOAT_ARB 0x140B -#endif - -#ifndef GL_ARB_texture_float -#define GL_TEXTURE_RED_TYPE_ARB 0x8C10 -#define GL_TEXTURE_GREEN_TYPE_ARB 0x8C11 -#define GL_TEXTURE_BLUE_TYPE_ARB 0x8C12 -#define GL_TEXTURE_ALPHA_TYPE_ARB 0x8C13 -#define GL_TEXTURE_LUMINANCE_TYPE_ARB 0x8C14 -#define GL_TEXTURE_INTENSITY_TYPE_ARB 0x8C15 -#define GL_TEXTURE_DEPTH_TYPE_ARB 0x8C16 -#define GL_UNSIGNED_NORMALIZED_ARB 0x8C17 -#define GL_RGBA32F_ARB 0x8814 -#define GL_RGB32F_ARB 0x8815 -#define GL_ALPHA32F_ARB 0x8816 -#define GL_INTENSITY32F_ARB 0x8817 -#define GL_LUMINANCE32F_ARB 0x8818 -#define GL_LUMINANCE_ALPHA32F_ARB 0x8819 -#define GL_RGBA16F_ARB 0x881A -#define GL_RGB16F_ARB 0x881B -#define GL_ALPHA16F_ARB 0x881C -#define GL_INTENSITY16F_ARB 0x881D -#define GL_LUMINANCE16F_ARB 0x881E -#define GL_LUMINANCE_ALPHA16F_ARB 0x881F -#endif - -#ifndef GL_ARB_pixel_buffer_object -#define GL_PIXEL_PACK_BUFFER_ARB 0x88EB -#define GL_PIXEL_UNPACK_BUFFER_ARB 0x88EC -#define GL_PIXEL_PACK_BUFFER_BINDING_ARB 0x88ED -#define GL_PIXEL_UNPACK_BUFFER_BINDING_ARB 0x88EF -#endif - -#ifndef GL_EXT_abgr -#define GL_ABGR_EXT 0x8000 -#endif - -#ifndef GL_EXT_blend_color -#define GL_CONSTANT_COLOR_EXT 0x8001 -#define GL_ONE_MINUS_CONSTANT_COLOR_EXT 0x8002 -#define GL_CONSTANT_ALPHA_EXT 0x8003 -#define GL_ONE_MINUS_CONSTANT_ALPHA_EXT 0x8004 -#define GL_BLEND_COLOR_EXT 0x8005 -#endif - -#ifndef GL_EXT_polygon_offset -#define GL_POLYGON_OFFSET_EXT 0x8037 -#define GL_POLYGON_OFFSET_FACTOR_EXT 0x8038 -#define GL_POLYGON_OFFSET_BIAS_EXT 0x8039 -#endif - -#ifndef GL_EXT_texture -#define GL_ALPHA4_EXT 0x803B -#define GL_ALPHA8_EXT 0x803C -#define GL_ALPHA12_EXT 0x803D -#define GL_ALPHA16_EXT 0x803E -#define GL_LUMINANCE4_EXT 0x803F -#define GL_LUMINANCE8_EXT 0x8040 -#define GL_LUMINANCE12_EXT 0x8041 -#define GL_LUMINANCE16_EXT 0x8042 -#define GL_LUMINANCE4_ALPHA4_EXT 0x8043 -#define GL_LUMINANCE6_ALPHA2_EXT 0x8044 -#define GL_LUMINANCE8_ALPHA8_EXT 0x8045 -#define GL_LUMINANCE12_ALPHA4_EXT 0x8046 -#define GL_LUMINANCE12_ALPHA12_EXT 0x8047 -#define GL_LUMINANCE16_ALPHA16_EXT 0x8048 -#define GL_INTENSITY_EXT 0x8049 -#define GL_INTENSITY4_EXT 0x804A -#define GL_INTENSITY8_EXT 0x804B -#define GL_INTENSITY12_EXT 0x804C -#define GL_INTENSITY16_EXT 0x804D -#define GL_RGB2_EXT 0x804E -#define GL_RGB4_EXT 0x804F -#define GL_RGB5_EXT 0x8050 -#define GL_RGB8_EXT 0x8051 -#define GL_RGB10_EXT 0x8052 -#define GL_RGB12_EXT 0x8053 -#define GL_RGB16_EXT 0x8054 -#define GL_RGBA2_EXT 0x8055 -#define GL_RGBA4_EXT 0x8056 -#define GL_RGB5_A1_EXT 0x8057 -#define GL_RGBA8_EXT 0x8058 -#define GL_RGB10_A2_EXT 0x8059 -#define GL_RGBA12_EXT 0x805A -#define GL_RGBA16_EXT 0x805B -#define GL_TEXTURE_RED_SIZE_EXT 0x805C -#define GL_TEXTURE_GREEN_SIZE_EXT 0x805D -#define GL_TEXTURE_BLUE_SIZE_EXT 0x805E -#define GL_TEXTURE_ALPHA_SIZE_EXT 0x805F -#define GL_TEXTURE_LUMINANCE_SIZE_EXT 0x8060 -#define GL_TEXTURE_INTENSITY_SIZE_EXT 0x8061 -#define GL_REPLACE_EXT 0x8062 -#define GL_PROXY_TEXTURE_1D_EXT 0x8063 -#define GL_PROXY_TEXTURE_2D_EXT 0x8064 -#define GL_TEXTURE_TOO_LARGE_EXT 0x8065 -#endif - -#ifndef GL_EXT_texture3D -#define GL_PACK_SKIP_IMAGES_EXT 0x806B -#define GL_PACK_IMAGE_HEIGHT_EXT 0x806C -#define GL_UNPACK_SKIP_IMAGES_EXT 0x806D -#define GL_UNPACK_IMAGE_HEIGHT_EXT 0x806E -#define GL_TEXTURE_3D_EXT 0x806F -#define GL_PROXY_TEXTURE_3D_EXT 0x8070 -#define GL_TEXTURE_DEPTH_EXT 0x8071 -#define GL_TEXTURE_WRAP_R_EXT 0x8072 -#define GL_MAX_3D_TEXTURE_SIZE_EXT 0x8073 -#endif - -#ifndef GL_SGIS_texture_filter4 -#define GL_FILTER4_SGIS 0x8146 -#define GL_TEXTURE_FILTER4_SIZE_SGIS 0x8147 -#endif - -#ifndef GL_EXT_subtexture -#endif - -#ifndef GL_EXT_copy_texture -#endif - -#ifndef GL_EXT_histogram -#define GL_HISTOGRAM_EXT 0x8024 -#define GL_PROXY_HISTOGRAM_EXT 0x8025 -#define GL_HISTOGRAM_WIDTH_EXT 0x8026 -#define GL_HISTOGRAM_FORMAT_EXT 0x8027 -#define GL_HISTOGRAM_RED_SIZE_EXT 0x8028 -#define GL_HISTOGRAM_GREEN_SIZE_EXT 0x8029 -#define GL_HISTOGRAM_BLUE_SIZE_EXT 0x802A -#define GL_HISTOGRAM_ALPHA_SIZE_EXT 0x802B -#define GL_HISTOGRAM_LUMINANCE_SIZE_EXT 0x802C -#define GL_HISTOGRAM_SINK_EXT 0x802D -#define GL_MINMAX_EXT 0x802E -#define GL_MINMAX_FORMAT_EXT 0x802F -#define GL_MINMAX_SINK_EXT 0x8030 -#define GL_TABLE_TOO_LARGE_EXT 0x8031 -#endif - -#ifndef GL_EXT_convolution -#define GL_CONVOLUTION_1D_EXT 0x8010 -#define GL_CONVOLUTION_2D_EXT 0x8011 -#define GL_SEPARABLE_2D_EXT 0x8012 -#define GL_CONVOLUTION_BORDER_MODE_EXT 0x8013 -#define GL_CONVOLUTION_FILTER_SCALE_EXT 0x8014 -#define GL_CONVOLUTION_FILTER_BIAS_EXT 0x8015 -#define GL_REDUCE_EXT 0x8016 -#define GL_CONVOLUTION_FORMAT_EXT 0x8017 -#define GL_CONVOLUTION_WIDTH_EXT 0x8018 -#define GL_CONVOLUTION_HEIGHT_EXT 0x8019 -#define GL_MAX_CONVOLUTION_WIDTH_EXT 0x801A -#define GL_MAX_CONVOLUTION_HEIGHT_EXT 0x801B -#define GL_POST_CONVOLUTION_RED_SCALE_EXT 0x801C -#define GL_POST_CONVOLUTION_GREEN_SCALE_EXT 0x801D -#define GL_POST_CONVOLUTION_BLUE_SCALE_EXT 0x801E -#define GL_POST_CONVOLUTION_ALPHA_SCALE_EXT 0x801F -#define GL_POST_CONVOLUTION_RED_BIAS_EXT 0x8020 -#define GL_POST_CONVOLUTION_GREEN_BIAS_EXT 0x8021 -#define GL_POST_CONVOLUTION_BLUE_BIAS_EXT 0x8022 -#define GL_POST_CONVOLUTION_ALPHA_BIAS_EXT 0x8023 -#endif - -#ifndef GL_SGI_color_matrix -#define GL_COLOR_MATRIX_SGI 0x80B1 -#define GL_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B2 -#define GL_MAX_COLOR_MATRIX_STACK_DEPTH_SGI 0x80B3 -#define GL_POST_COLOR_MATRIX_RED_SCALE_SGI 0x80B4 -#define GL_POST_COLOR_MATRIX_GREEN_SCALE_SGI 0x80B5 -#define GL_POST_COLOR_MATRIX_BLUE_SCALE_SGI 0x80B6 -#define GL_POST_COLOR_MATRIX_ALPHA_SCALE_SGI 0x80B7 -#define GL_POST_COLOR_MATRIX_RED_BIAS_SGI 0x80B8 -#define GL_POST_COLOR_MATRIX_GREEN_BIAS_SGI 0x80B9 -#define GL_POST_COLOR_MATRIX_BLUE_BIAS_SGI 0x80BA -#define GL_POST_COLOR_MATRIX_ALPHA_BIAS_SGI 0x80BB -#endif - -#ifndef GL_SGI_color_table -#define GL_COLOR_TABLE_SGI 0x80D0 -#define GL_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D1 -#define GL_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D2 -#define GL_PROXY_COLOR_TABLE_SGI 0x80D3 -#define GL_PROXY_POST_CONVOLUTION_COLOR_TABLE_SGI 0x80D4 -#define GL_PROXY_POST_COLOR_MATRIX_COLOR_TABLE_SGI 0x80D5 -#define GL_COLOR_TABLE_SCALE_SGI 0x80D6 -#define GL_COLOR_TABLE_BIAS_SGI 0x80D7 -#define GL_COLOR_TABLE_FORMAT_SGI 0x80D8 -#define GL_COLOR_TABLE_WIDTH_SGI 0x80D9 -#define GL_COLOR_TABLE_RED_SIZE_SGI 0x80DA -#define GL_COLOR_TABLE_GREEN_SIZE_SGI 0x80DB -#define GL_COLOR_TABLE_BLUE_SIZE_SGI 0x80DC -#define GL_COLOR_TABLE_ALPHA_SIZE_SGI 0x80DD -#define GL_COLOR_TABLE_LUMINANCE_SIZE_SGI 0x80DE -#define GL_COLOR_TABLE_INTENSITY_SIZE_SGI 0x80DF -#endif - -#ifndef GL_SGIS_pixel_texture -#define GL_PIXEL_TEXTURE_SGIS 0x8353 -#define GL_PIXEL_FRAGMENT_RGB_SOURCE_SGIS 0x8354 -#define GL_PIXEL_FRAGMENT_ALPHA_SOURCE_SGIS 0x8355 -#define GL_PIXEL_GROUP_COLOR_SGIS 0x8356 -#endif - -#ifndef GL_SGIX_pixel_texture -#define GL_PIXEL_TEX_GEN_SGIX 0x8139 -#define GL_PIXEL_TEX_GEN_MODE_SGIX 0x832B -#endif - -#ifndef GL_SGIS_texture4D -#define GL_PACK_SKIP_VOLUMES_SGIS 0x8130 -#define GL_PACK_IMAGE_DEPTH_SGIS 0x8131 -#define GL_UNPACK_SKIP_VOLUMES_SGIS 0x8132 -#define GL_UNPACK_IMAGE_DEPTH_SGIS 0x8133 -#define GL_TEXTURE_4D_SGIS 0x8134 -#define GL_PROXY_TEXTURE_4D_SGIS 0x8135 -#define GL_TEXTURE_4DSIZE_SGIS 0x8136 -#define GL_TEXTURE_WRAP_Q_SGIS 0x8137 -#define GL_MAX_4D_TEXTURE_SIZE_SGIS 0x8138 -#define GL_TEXTURE_4D_BINDING_SGIS 0x814F -#endif - -#ifndef GL_SGI_texture_color_table -#define GL_TEXTURE_COLOR_TABLE_SGI 0x80BC -#define GL_PROXY_TEXTURE_COLOR_TABLE_SGI 0x80BD -#endif - -#ifndef GL_EXT_cmyka -#define GL_CMYK_EXT 0x800C -#define GL_CMYKA_EXT 0x800D -#define GL_PACK_CMYK_HINT_EXT 0x800E -#define GL_UNPACK_CMYK_HINT_EXT 0x800F -#endif - -#ifndef GL_EXT_texture_object -#define GL_TEXTURE_PRIORITY_EXT 0x8066 -#define GL_TEXTURE_RESIDENT_EXT 0x8067 -#define GL_TEXTURE_1D_BINDING_EXT 0x8068 -#define GL_TEXTURE_2D_BINDING_EXT 0x8069 -#define GL_TEXTURE_3D_BINDING_EXT 0x806A -#endif - -#ifndef GL_SGIS_detail_texture -#define GL_DETAIL_TEXTURE_2D_SGIS 0x8095 -#define GL_DETAIL_TEXTURE_2D_BINDING_SGIS 0x8096 -#define GL_LINEAR_DETAIL_SGIS 0x8097 -#define GL_LINEAR_DETAIL_ALPHA_SGIS 0x8098 -#define GL_LINEAR_DETAIL_COLOR_SGIS 0x8099 -#define GL_DETAIL_TEXTURE_LEVEL_SGIS 0x809A -#define GL_DETAIL_TEXTURE_MODE_SGIS 0x809B -#define GL_DETAIL_TEXTURE_FUNC_POINTS_SGIS 0x809C -#endif - -#ifndef GL_SGIS_sharpen_texture -#define GL_LINEAR_SHARPEN_SGIS 0x80AD -#define GL_LINEAR_SHARPEN_ALPHA_SGIS 0x80AE -#define GL_LINEAR_SHARPEN_COLOR_SGIS 0x80AF -#define GL_SHARPEN_TEXTURE_FUNC_POINTS_SGIS 0x80B0 -#endif - -#ifndef GL_EXT_packed_pixels -#define GL_UNSIGNED_BYTE_3_3_2_EXT 0x8032 -#define GL_UNSIGNED_SHORT_4_4_4_4_EXT 0x8033 -#define GL_UNSIGNED_SHORT_5_5_5_1_EXT 0x8034 -#define GL_UNSIGNED_INT_8_8_8_8_EXT 0x8035 -#define GL_UNSIGNED_INT_10_10_10_2_EXT 0x8036 -#endif - -#ifndef GL_SGIS_texture_lod -#define GL_TEXTURE_MIN_LOD_SGIS 0x813A -#define GL_TEXTURE_MAX_LOD_SGIS 0x813B -#define GL_TEXTURE_BASE_LEVEL_SGIS 0x813C -#define GL_TEXTURE_MAX_LEVEL_SGIS 0x813D -#endif - -#ifndef GL_SGIS_multisample -#define GL_MULTISAMPLE_SGIS 0x809D -#define GL_SAMPLE_ALPHA_TO_MASK_SGIS 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_SGIS 0x809F -#define GL_SAMPLE_MASK_SGIS 0x80A0 -#define GL_1PASS_SGIS 0x80A1 -#define GL_2PASS_0_SGIS 0x80A2 -#define GL_2PASS_1_SGIS 0x80A3 -#define GL_4PASS_0_SGIS 0x80A4 -#define GL_4PASS_1_SGIS 0x80A5 -#define GL_4PASS_2_SGIS 0x80A6 -#define GL_4PASS_3_SGIS 0x80A7 -#define GL_SAMPLE_BUFFERS_SGIS 0x80A8 -#define GL_SAMPLES_SGIS 0x80A9 -#define GL_SAMPLE_MASK_VALUE_SGIS 0x80AA -#define GL_SAMPLE_MASK_INVERT_SGIS 0x80AB -#define GL_SAMPLE_PATTERN_SGIS 0x80AC -#endif - -#ifndef GL_EXT_rescale_normal -#define GL_RESCALE_NORMAL_EXT 0x803A -#endif - -#ifndef GL_EXT_vertex_array -#define GL_VERTEX_ARRAY_EXT 0x8074 -#define GL_NORMAL_ARRAY_EXT 0x8075 -#define GL_COLOR_ARRAY_EXT 0x8076 -#define GL_INDEX_ARRAY_EXT 0x8077 -#define GL_TEXTURE_COORD_ARRAY_EXT 0x8078 -#define GL_EDGE_FLAG_ARRAY_EXT 0x8079 -#define GL_VERTEX_ARRAY_SIZE_EXT 0x807A -#define GL_VERTEX_ARRAY_TYPE_EXT 0x807B -#define GL_VERTEX_ARRAY_STRIDE_EXT 0x807C -#define GL_VERTEX_ARRAY_COUNT_EXT 0x807D -#define GL_NORMAL_ARRAY_TYPE_EXT 0x807E -#define GL_NORMAL_ARRAY_STRIDE_EXT 0x807F -#define GL_NORMAL_ARRAY_COUNT_EXT 0x8080 -#define GL_COLOR_ARRAY_SIZE_EXT 0x8081 -#define GL_COLOR_ARRAY_TYPE_EXT 0x8082 -#define GL_COLOR_ARRAY_STRIDE_EXT 0x8083 -#define GL_COLOR_ARRAY_COUNT_EXT 0x8084 -#define GL_INDEX_ARRAY_TYPE_EXT 0x8085 -#define GL_INDEX_ARRAY_STRIDE_EXT 0x8086 -#define GL_INDEX_ARRAY_COUNT_EXT 0x8087 -#define GL_TEXTURE_COORD_ARRAY_SIZE_EXT 0x8088 -#define GL_TEXTURE_COORD_ARRAY_TYPE_EXT 0x8089 -#define GL_TEXTURE_COORD_ARRAY_STRIDE_EXT 0x808A -#define GL_TEXTURE_COORD_ARRAY_COUNT_EXT 0x808B -#define GL_EDGE_FLAG_ARRAY_STRIDE_EXT 0x808C -#define GL_EDGE_FLAG_ARRAY_COUNT_EXT 0x808D -#define GL_VERTEX_ARRAY_POINTER_EXT 0x808E -#define GL_NORMAL_ARRAY_POINTER_EXT 0x808F -#define GL_COLOR_ARRAY_POINTER_EXT 0x8090 -#define GL_INDEX_ARRAY_POINTER_EXT 0x8091 -#define GL_TEXTURE_COORD_ARRAY_POINTER_EXT 0x8092 -#define GL_EDGE_FLAG_ARRAY_POINTER_EXT 0x8093 -#endif - -#ifndef GL_EXT_misc_attribute -#endif - -#ifndef GL_SGIS_generate_mipmap -#define GL_GENERATE_MIPMAP_SGIS 0x8191 -#define GL_GENERATE_MIPMAP_HINT_SGIS 0x8192 -#endif - -#ifndef GL_SGIX_clipmap -#define GL_LINEAR_CLIPMAP_LINEAR_SGIX 0x8170 -#define GL_TEXTURE_CLIPMAP_CENTER_SGIX 0x8171 -#define GL_TEXTURE_CLIPMAP_FRAME_SGIX 0x8172 -#define GL_TEXTURE_CLIPMAP_OFFSET_SGIX 0x8173 -#define GL_TEXTURE_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8174 -#define GL_TEXTURE_CLIPMAP_LOD_OFFSET_SGIX 0x8175 -#define GL_TEXTURE_CLIPMAP_DEPTH_SGIX 0x8176 -#define GL_MAX_CLIPMAP_DEPTH_SGIX 0x8177 -#define GL_MAX_CLIPMAP_VIRTUAL_DEPTH_SGIX 0x8178 -#define GL_NEAREST_CLIPMAP_NEAREST_SGIX 0x844D -#define GL_NEAREST_CLIPMAP_LINEAR_SGIX 0x844E -#define GL_LINEAR_CLIPMAP_NEAREST_SGIX 0x844F -#endif - -#ifndef GL_SGIX_shadow -#define GL_TEXTURE_COMPARE_SGIX 0x819A -#define GL_TEXTURE_COMPARE_OPERATOR_SGIX 0x819B -#define GL_TEXTURE_LEQUAL_R_SGIX 0x819C -#define GL_TEXTURE_GEQUAL_R_SGIX 0x819D -#endif - -#ifndef GL_SGIS_texture_edge_clamp -#define GL_CLAMP_TO_EDGE_SGIS 0x812F -#endif - -#ifndef GL_SGIS_texture_border_clamp -#define GL_CLAMP_TO_BORDER_SGIS 0x812D -#endif - -#ifndef GL_EXT_blend_minmax -#define GL_FUNC_ADD_EXT 0x8006 -#define GL_MIN_EXT 0x8007 -#define GL_MAX_EXT 0x8008 -#define GL_BLEND_EQUATION_EXT 0x8009 -#endif - -#ifndef GL_EXT_blend_subtract -#define GL_FUNC_SUBTRACT_EXT 0x800A -#define GL_FUNC_REVERSE_SUBTRACT_EXT 0x800B -#endif - -#ifndef GL_EXT_blend_logic_op -#endif - -#ifndef GL_SGIX_interlace -#define GL_INTERLACE_SGIX 0x8094 -#endif - -#ifndef GL_SGIX_pixel_tiles -#define GL_PIXEL_TILE_BEST_ALIGNMENT_SGIX 0x813E -#define GL_PIXEL_TILE_CACHE_INCREMENT_SGIX 0x813F -#define GL_PIXEL_TILE_WIDTH_SGIX 0x8140 -#define GL_PIXEL_TILE_HEIGHT_SGIX 0x8141 -#define GL_PIXEL_TILE_GRID_WIDTH_SGIX 0x8142 -#define GL_PIXEL_TILE_GRID_HEIGHT_SGIX 0x8143 -#define GL_PIXEL_TILE_GRID_DEPTH_SGIX 0x8144 -#define GL_PIXEL_TILE_CACHE_SIZE_SGIX 0x8145 -#endif - -#ifndef GL_SGIS_texture_select -#define GL_DUAL_ALPHA4_SGIS 0x8110 -#define GL_DUAL_ALPHA8_SGIS 0x8111 -#define GL_DUAL_ALPHA12_SGIS 0x8112 -#define GL_DUAL_ALPHA16_SGIS 0x8113 -#define GL_DUAL_LUMINANCE4_SGIS 0x8114 -#define GL_DUAL_LUMINANCE8_SGIS 0x8115 -#define GL_DUAL_LUMINANCE12_SGIS 0x8116 -#define GL_DUAL_LUMINANCE16_SGIS 0x8117 -#define GL_DUAL_INTENSITY4_SGIS 0x8118 -#define GL_DUAL_INTENSITY8_SGIS 0x8119 -#define GL_DUAL_INTENSITY12_SGIS 0x811A -#define GL_DUAL_INTENSITY16_SGIS 0x811B -#define GL_DUAL_LUMINANCE_ALPHA4_SGIS 0x811C -#define GL_DUAL_LUMINANCE_ALPHA8_SGIS 0x811D -#define GL_QUAD_ALPHA4_SGIS 0x811E -#define GL_QUAD_ALPHA8_SGIS 0x811F -#define GL_QUAD_LUMINANCE4_SGIS 0x8120 -#define GL_QUAD_LUMINANCE8_SGIS 0x8121 -#define GL_QUAD_INTENSITY4_SGIS 0x8122 -#define GL_QUAD_INTENSITY8_SGIS 0x8123 -#define GL_DUAL_TEXTURE_SELECT_SGIS 0x8124 -#define GL_QUAD_TEXTURE_SELECT_SGIS 0x8125 -#endif - -#ifndef GL_SGIX_sprite -#define GL_SPRITE_SGIX 0x8148 -#define GL_SPRITE_MODE_SGIX 0x8149 -#define GL_SPRITE_AXIS_SGIX 0x814A -#define GL_SPRITE_TRANSLATION_SGIX 0x814B -#define GL_SPRITE_AXIAL_SGIX 0x814C -#define GL_SPRITE_OBJECT_ALIGNED_SGIX 0x814D -#define GL_SPRITE_EYE_ALIGNED_SGIX 0x814E -#endif - -#ifndef GL_SGIX_texture_multi_buffer -#define GL_TEXTURE_MULTI_BUFFER_HINT_SGIX 0x812E -#endif - -#ifndef GL_EXT_point_parameters -#define GL_POINT_SIZE_MIN_EXT 0x8126 -#define GL_POINT_SIZE_MAX_EXT 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE_EXT 0x8128 -#define GL_DISTANCE_ATTENUATION_EXT 0x8129 -#endif - -#ifndef GL_SGIS_point_parameters -#define GL_POINT_SIZE_MIN_SGIS 0x8126 -#define GL_POINT_SIZE_MAX_SGIS 0x8127 -#define GL_POINT_FADE_THRESHOLD_SIZE_SGIS 0x8128 -#define GL_DISTANCE_ATTENUATION_SGIS 0x8129 -#endif - -#ifndef GL_SGIX_instruments -#define GL_INSTRUMENT_BUFFER_POINTER_SGIX 0x8180 -#define GL_INSTRUMENT_MEASUREMENTS_SGIX 0x8181 -#endif - -#ifndef GL_SGIX_texture_scale_bias -#define GL_POST_TEXTURE_FILTER_BIAS_SGIX 0x8179 -#define GL_POST_TEXTURE_FILTER_SCALE_SGIX 0x817A -#define GL_POST_TEXTURE_FILTER_BIAS_RANGE_SGIX 0x817B -#define GL_POST_TEXTURE_FILTER_SCALE_RANGE_SGIX 0x817C -#endif - -#ifndef GL_SGIX_framezoom -#define GL_FRAMEZOOM_SGIX 0x818B -#define GL_FRAMEZOOM_FACTOR_SGIX 0x818C -#define GL_MAX_FRAMEZOOM_FACTOR_SGIX 0x818D -#endif - -#ifndef GL_SGIX_tag_sample_buffer -#endif - -#ifndef GL_FfdMaskSGIX -#define GL_TEXTURE_DEFORMATION_BIT_SGIX 0x00000001 -#define GL_GEOMETRY_DEFORMATION_BIT_SGIX 0x00000002 -#endif - -#ifndef GL_SGIX_polynomial_ffd -#define GL_GEOMETRY_DEFORMATION_SGIX 0x8194 -#define GL_TEXTURE_DEFORMATION_SGIX 0x8195 -#define GL_DEFORMATIONS_MASK_SGIX 0x8196 -#define GL_MAX_DEFORMATION_ORDER_SGIX 0x8197 -#endif - -#ifndef GL_SGIX_reference_plane -#define GL_REFERENCE_PLANE_SGIX 0x817D -#define GL_REFERENCE_PLANE_EQUATION_SGIX 0x817E -#endif - -#ifndef GL_SGIX_flush_raster -#endif - -#ifndef GL_SGIX_depth_texture -#define GL_DEPTH_COMPONENT16_SGIX 0x81A5 -#define GL_DEPTH_COMPONENT24_SGIX 0x81A6 -#define GL_DEPTH_COMPONENT32_SGIX 0x81A7 -#endif - -#ifndef GL_SGIS_fog_function -#define GL_FOG_FUNC_SGIS 0x812A -#define GL_FOG_FUNC_POINTS_SGIS 0x812B -#define GL_MAX_FOG_FUNC_POINTS_SGIS 0x812C -#endif - -#ifndef GL_SGIX_fog_offset -#define GL_FOG_OFFSET_SGIX 0x8198 -#define GL_FOG_OFFSET_VALUE_SGIX 0x8199 -#endif - -#ifndef GL_HP_image_transform -#define GL_IMAGE_SCALE_X_HP 0x8155 -#define GL_IMAGE_SCALE_Y_HP 0x8156 -#define GL_IMAGE_TRANSLATE_X_HP 0x8157 -#define GL_IMAGE_TRANSLATE_Y_HP 0x8158 -#define GL_IMAGE_ROTATE_ANGLE_HP 0x8159 -#define GL_IMAGE_ROTATE_ORIGIN_X_HP 0x815A -#define GL_IMAGE_ROTATE_ORIGIN_Y_HP 0x815B -#define GL_IMAGE_MAG_FILTER_HP 0x815C -#define GL_IMAGE_MIN_FILTER_HP 0x815D -#define GL_IMAGE_CUBIC_WEIGHT_HP 0x815E -#define GL_CUBIC_HP 0x815F -#define GL_AVERAGE_HP 0x8160 -#define GL_IMAGE_TRANSFORM_2D_HP 0x8161 -#define GL_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8162 -#define GL_PROXY_POST_IMAGE_TRANSFORM_COLOR_TABLE_HP 0x8163 -#endif - -#ifndef GL_HP_convolution_border_modes -#define GL_IGNORE_BORDER_HP 0x8150 -#define GL_CONSTANT_BORDER_HP 0x8151 -#define GL_REPLICATE_BORDER_HP 0x8153 -#define GL_CONVOLUTION_BORDER_COLOR_HP 0x8154 -#endif - -#ifndef GL_INGR_palette_buffer -#endif - -#ifndef GL_SGIX_texture_add_env -#define GL_TEXTURE_ENV_BIAS_SGIX 0x80BE -#endif - -#ifndef GL_EXT_color_subtable -#endif - -#ifndef GL_PGI_vertex_hints -#define GL_VERTEX_DATA_HINT_PGI 0x1A22A -#define GL_VERTEX_CONSISTENT_HINT_PGI 0x1A22B -#define GL_MATERIAL_SIDE_HINT_PGI 0x1A22C -#define GL_MAX_VERTEX_HINT_PGI 0x1A22D -#define GL_COLOR3_BIT_PGI 0x00010000 -#define GL_COLOR4_BIT_PGI 0x00020000 -#define GL_EDGEFLAG_BIT_PGI 0x00040000 -#define GL_INDEX_BIT_PGI 0x00080000 -#define GL_MAT_AMBIENT_BIT_PGI 0x00100000 -#define GL_MAT_AMBIENT_AND_DIFFUSE_BIT_PGI 0x00200000 -#define GL_MAT_DIFFUSE_BIT_PGI 0x00400000 -#define GL_MAT_EMISSION_BIT_PGI 0x00800000 -#define GL_MAT_COLOR_INDEXES_BIT_PGI 0x01000000 -#define GL_MAT_SHININESS_BIT_PGI 0x02000000 -#define GL_MAT_SPECULAR_BIT_PGI 0x04000000 -#define GL_NORMAL_BIT_PGI 0x08000000 -#define GL_TEXCOORD1_BIT_PGI 0x10000000 -#define GL_TEXCOORD2_BIT_PGI 0x20000000 -#define GL_TEXCOORD3_BIT_PGI 0x40000000 -#define GL_TEXCOORD4_BIT_PGI 0x80000000 -#define GL_VERTEX23_BIT_PGI 0x00000004 -#define GL_VERTEX4_BIT_PGI 0x00000008 -#endif - -#ifndef GL_PGI_misc_hints -#define GL_PREFER_DOUBLEBUFFER_HINT_PGI 0x1A1F8 -#define GL_CONSERVE_MEMORY_HINT_PGI 0x1A1FD -#define GL_RECLAIM_MEMORY_HINT_PGI 0x1A1FE -#define GL_NATIVE_GRAPHICS_HANDLE_PGI 0x1A202 -#define GL_NATIVE_GRAPHICS_BEGIN_HINT_PGI 0x1A203 -#define GL_NATIVE_GRAPHICS_END_HINT_PGI 0x1A204 -#define GL_ALWAYS_FAST_HINT_PGI 0x1A20C -#define GL_ALWAYS_SOFT_HINT_PGI 0x1A20D -#define GL_ALLOW_DRAW_OBJ_HINT_PGI 0x1A20E -#define GL_ALLOW_DRAW_WIN_HINT_PGI 0x1A20F -#define GL_ALLOW_DRAW_FRG_HINT_PGI 0x1A210 -#define GL_ALLOW_DRAW_MEM_HINT_PGI 0x1A211 -#define GL_STRICT_DEPTHFUNC_HINT_PGI 0x1A216 -#define GL_STRICT_LIGHTING_HINT_PGI 0x1A217 -#define GL_STRICT_SCISSOR_HINT_PGI 0x1A218 -#define GL_FULL_STIPPLE_HINT_PGI 0x1A219 -#define GL_CLIP_NEAR_HINT_PGI 0x1A220 -#define GL_CLIP_FAR_HINT_PGI 0x1A221 -#define GL_WIDE_LINE_HINT_PGI 0x1A222 -#define GL_BACK_NORMALS_HINT_PGI 0x1A223 -#endif - -#ifndef GL_EXT_paletted_texture -#define GL_COLOR_INDEX1_EXT 0x80E2 -#define GL_COLOR_INDEX2_EXT 0x80E3 -#define GL_COLOR_INDEX4_EXT 0x80E4 -#define GL_COLOR_INDEX8_EXT 0x80E5 -#define GL_COLOR_INDEX12_EXT 0x80E6 -#define GL_COLOR_INDEX16_EXT 0x80E7 -#define GL_TEXTURE_INDEX_SIZE_EXT 0x80ED -#endif - -#ifndef GL_EXT_clip_volume_hint -#define GL_CLIP_VOLUME_CLIPPING_HINT_EXT 0x80F0 -#endif - -#ifndef GL_SGIX_list_priority -#define GL_LIST_PRIORITY_SGIX 0x8182 -#endif - -#ifndef GL_SGIX_ir_instrument1 -#define GL_IR_INSTRUMENT1_SGIX 0x817F -#endif - -#ifndef GL_SGIX_calligraphic_fragment -#define GL_CALLIGRAPHIC_FRAGMENT_SGIX 0x8183 -#endif - -#ifndef GL_SGIX_texture_lod_bias -#define GL_TEXTURE_LOD_BIAS_S_SGIX 0x818E -#define GL_TEXTURE_LOD_BIAS_T_SGIX 0x818F -#define GL_TEXTURE_LOD_BIAS_R_SGIX 0x8190 -#endif - -#ifndef GL_SGIX_shadow_ambient -#define GL_SHADOW_AMBIENT_SGIX 0x80BF -#endif - -#ifndef GL_EXT_index_texture -#endif - -#ifndef GL_EXT_index_material -#define GL_INDEX_MATERIAL_EXT 0x81B8 -#define GL_INDEX_MATERIAL_PARAMETER_EXT 0x81B9 -#define GL_INDEX_MATERIAL_FACE_EXT 0x81BA -#endif - -#ifndef GL_EXT_index_func -#define GL_INDEX_TEST_EXT 0x81B5 -#define GL_INDEX_TEST_FUNC_EXT 0x81B6 -#define GL_INDEX_TEST_REF_EXT 0x81B7 -#endif - -#ifndef GL_EXT_index_array_formats -#define GL_IUI_V2F_EXT 0x81AD -#define GL_IUI_V3F_EXT 0x81AE -#define GL_IUI_N3F_V2F_EXT 0x81AF -#define GL_IUI_N3F_V3F_EXT 0x81B0 -#define GL_T2F_IUI_V2F_EXT 0x81B1 -#define GL_T2F_IUI_V3F_EXT 0x81B2 -#define GL_T2F_IUI_N3F_V2F_EXT 0x81B3 -#define GL_T2F_IUI_N3F_V3F_EXT 0x81B4 -#endif - -#ifndef GL_EXT_compiled_vertex_array -#define GL_ARRAY_ELEMENT_LOCK_FIRST_EXT 0x81A8 -#define GL_ARRAY_ELEMENT_LOCK_COUNT_EXT 0x81A9 -#endif - -#ifndef GL_EXT_cull_vertex -#define GL_CULL_VERTEX_EXT 0x81AA -#define GL_CULL_VERTEX_EYE_POSITION_EXT 0x81AB -#define GL_CULL_VERTEX_OBJECT_POSITION_EXT 0x81AC -#endif - -#ifndef GL_SGIX_ycrcb -#define GL_YCRCB_422_SGIX 0x81BB -#define GL_YCRCB_444_SGIX 0x81BC -#endif - -#ifndef GL_SGIX_fragment_lighting -#define GL_FRAGMENT_LIGHTING_SGIX 0x8400 -#define GL_FRAGMENT_COLOR_MATERIAL_SGIX 0x8401 -#define GL_FRAGMENT_COLOR_MATERIAL_FACE_SGIX 0x8402 -#define GL_FRAGMENT_COLOR_MATERIAL_PARAMETER_SGIX 0x8403 -#define GL_MAX_FRAGMENT_LIGHTS_SGIX 0x8404 -#define GL_MAX_ACTIVE_LIGHTS_SGIX 0x8405 -#define GL_CURRENT_RASTER_NORMAL_SGIX 0x8406 -#define GL_LIGHT_ENV_MODE_SGIX 0x8407 -#define GL_FRAGMENT_LIGHT_MODEL_LOCAL_VIEWER_SGIX 0x8408 -#define GL_FRAGMENT_LIGHT_MODEL_TWO_SIDE_SGIX 0x8409 -#define GL_FRAGMENT_LIGHT_MODEL_AMBIENT_SGIX 0x840A -#define GL_FRAGMENT_LIGHT_MODEL_NORMAL_INTERPOLATION_SGIX 0x840B -#define GL_FRAGMENT_LIGHT0_SGIX 0x840C -#define GL_FRAGMENT_LIGHT1_SGIX 0x840D -#define GL_FRAGMENT_LIGHT2_SGIX 0x840E -#define GL_FRAGMENT_LIGHT3_SGIX 0x840F -#define GL_FRAGMENT_LIGHT4_SGIX 0x8410 -#define GL_FRAGMENT_LIGHT5_SGIX 0x8411 -#define GL_FRAGMENT_LIGHT6_SGIX 0x8412 -#define GL_FRAGMENT_LIGHT7_SGIX 0x8413 -#endif - -#ifndef GL_IBM_rasterpos_clip -#define GL_RASTER_POSITION_UNCLIPPED_IBM 0x19262 -#endif - -#ifndef GL_HP_texture_lighting -#define GL_TEXTURE_LIGHTING_MODE_HP 0x8167 -#define GL_TEXTURE_POST_SPECULAR_HP 0x8168 -#define GL_TEXTURE_PRE_SPECULAR_HP 0x8169 -#endif - -#ifndef GL_EXT_draw_range_elements -#define GL_MAX_ELEMENTS_VERTICES_EXT 0x80E8 -#define GL_MAX_ELEMENTS_INDICES_EXT 0x80E9 -#endif - -#ifndef GL_WIN_phong_shading -#define GL_PHONG_WIN 0x80EA -#define GL_PHONG_HINT_WIN 0x80EB -#endif - -#ifndef GL_WIN_specular_fog -#define GL_FOG_SPECULAR_TEXTURE_WIN 0x80EC -#endif - -#ifndef GL_EXT_light_texture -#define GL_FRAGMENT_MATERIAL_EXT 0x8349 -#define GL_FRAGMENT_NORMAL_EXT 0x834A -#define GL_FRAGMENT_COLOR_EXT 0x834C -#define GL_ATTENUATION_EXT 0x834D -#define GL_SHADOW_ATTENUATION_EXT 0x834E -#define GL_TEXTURE_APPLICATION_MODE_EXT 0x834F -#define GL_TEXTURE_LIGHT_EXT 0x8350 -#define GL_TEXTURE_MATERIAL_FACE_EXT 0x8351 -#define GL_TEXTURE_MATERIAL_PARAMETER_EXT 0x8352 -/* reuse GL_FRAGMENT_DEPTH_EXT */ -#endif - -#ifndef GL_SGIX_blend_alpha_minmax -#define GL_ALPHA_MIN_SGIX 0x8320 -#define GL_ALPHA_MAX_SGIX 0x8321 -#endif - -#ifndef GL_SGIX_impact_pixel_texture -#define GL_PIXEL_TEX_GEN_Q_CEILING_SGIX 0x8184 -#define GL_PIXEL_TEX_GEN_Q_ROUND_SGIX 0x8185 -#define GL_PIXEL_TEX_GEN_Q_FLOOR_SGIX 0x8186 -#define GL_PIXEL_TEX_GEN_ALPHA_REPLACE_SGIX 0x8187 -#define GL_PIXEL_TEX_GEN_ALPHA_NO_REPLACE_SGIX 0x8188 -#define GL_PIXEL_TEX_GEN_ALPHA_LS_SGIX 0x8189 -#define GL_PIXEL_TEX_GEN_ALPHA_MS_SGIX 0x818A -#endif - -#ifndef GL_EXT_bgra -#define GL_BGR_EXT 0x80E0 -#define GL_BGRA_EXT 0x80E1 -#endif - -#ifndef GL_SGIX_async -#define GL_ASYNC_MARKER_SGIX 0x8329 -#endif - -#ifndef GL_SGIX_async_pixel -#define GL_ASYNC_TEX_IMAGE_SGIX 0x835C -#define GL_ASYNC_DRAW_PIXELS_SGIX 0x835D -#define GL_ASYNC_READ_PIXELS_SGIX 0x835E -#define GL_MAX_ASYNC_TEX_IMAGE_SGIX 0x835F -#define GL_MAX_ASYNC_DRAW_PIXELS_SGIX 0x8360 -#define GL_MAX_ASYNC_READ_PIXELS_SGIX 0x8361 -#endif - -#ifndef GL_SGIX_async_histogram -#define GL_ASYNC_HISTOGRAM_SGIX 0x832C -#define GL_MAX_ASYNC_HISTOGRAM_SGIX 0x832D -#endif - -#ifndef GL_INTEL_texture_scissor -#endif - -#ifndef GL_INTEL_parallel_arrays -#define GL_PARALLEL_ARRAYS_INTEL 0x83F4 -#define GL_VERTEX_ARRAY_PARALLEL_POINTERS_INTEL 0x83F5 -#define GL_NORMAL_ARRAY_PARALLEL_POINTERS_INTEL 0x83F6 -#define GL_COLOR_ARRAY_PARALLEL_POINTERS_INTEL 0x83F7 -#define GL_TEXTURE_COORD_ARRAY_PARALLEL_POINTERS_INTEL 0x83F8 -#endif - -#ifndef GL_HP_occlusion_test -#define GL_OCCLUSION_TEST_HP 0x8165 -#define GL_OCCLUSION_TEST_RESULT_HP 0x8166 -#endif - -#ifndef GL_EXT_pixel_transform -#define GL_PIXEL_TRANSFORM_2D_EXT 0x8330 -#define GL_PIXEL_MAG_FILTER_EXT 0x8331 -#define GL_PIXEL_MIN_FILTER_EXT 0x8332 -#define GL_PIXEL_CUBIC_WEIGHT_EXT 0x8333 -#define GL_CUBIC_EXT 0x8334 -#define GL_AVERAGE_EXT 0x8335 -#define GL_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8336 -#define GL_MAX_PIXEL_TRANSFORM_2D_STACK_DEPTH_EXT 0x8337 -#define GL_PIXEL_TRANSFORM_2D_MATRIX_EXT 0x8338 -#endif - -#ifndef GL_EXT_pixel_transform_color_table -#endif - -#ifndef GL_EXT_shared_texture_palette -#define GL_SHARED_TEXTURE_PALETTE_EXT 0x81FB -#endif - -#ifndef GL_EXT_separate_specular_color -#define GL_LIGHT_MODEL_COLOR_CONTROL_EXT 0x81F8 -#define GL_SINGLE_COLOR_EXT 0x81F9 -#define GL_SEPARATE_SPECULAR_COLOR_EXT 0x81FA -#endif - -#ifndef GL_EXT_secondary_color -#define GL_COLOR_SUM_EXT 0x8458 -#define GL_CURRENT_SECONDARY_COLOR_EXT 0x8459 -#define GL_SECONDARY_COLOR_ARRAY_SIZE_EXT 0x845A -#define GL_SECONDARY_COLOR_ARRAY_TYPE_EXT 0x845B -#define GL_SECONDARY_COLOR_ARRAY_STRIDE_EXT 0x845C -#define GL_SECONDARY_COLOR_ARRAY_POINTER_EXT 0x845D -#define GL_SECONDARY_COLOR_ARRAY_EXT 0x845E -#endif - -#ifndef GL_EXT_texture_perturb_normal -#define GL_PERTURB_EXT 0x85AE -#define GL_TEXTURE_NORMAL_EXT 0x85AF -#endif - -#ifndef GL_EXT_multi_draw_arrays -#endif - -#ifndef GL_EXT_fog_coord -#define GL_FOG_COORDINATE_SOURCE_EXT 0x8450 -#define GL_FOG_COORDINATE_EXT 0x8451 -#define GL_FRAGMENT_DEPTH_EXT 0x8452 -#define GL_CURRENT_FOG_COORDINATE_EXT 0x8453 -#define GL_FOG_COORDINATE_ARRAY_TYPE_EXT 0x8454 -#define GL_FOG_COORDINATE_ARRAY_STRIDE_EXT 0x8455 -#define GL_FOG_COORDINATE_ARRAY_POINTER_EXT 0x8456 -#define GL_FOG_COORDINATE_ARRAY_EXT 0x8457 -#endif - -#ifndef GL_REND_screen_coordinates -#define GL_SCREEN_COORDINATES_REND 0x8490 -#define GL_INVERTED_SCREEN_W_REND 0x8491 -#endif - -#ifndef GL_EXT_coordinate_frame -#define GL_TANGENT_ARRAY_EXT 0x8439 -#define GL_BINORMAL_ARRAY_EXT 0x843A -#define GL_CURRENT_TANGENT_EXT 0x843B -#define GL_CURRENT_BINORMAL_EXT 0x843C -#define GL_TANGENT_ARRAY_TYPE_EXT 0x843E -#define GL_TANGENT_ARRAY_STRIDE_EXT 0x843F -#define GL_BINORMAL_ARRAY_TYPE_EXT 0x8440 -#define GL_BINORMAL_ARRAY_STRIDE_EXT 0x8441 -#define GL_TANGENT_ARRAY_POINTER_EXT 0x8442 -#define GL_BINORMAL_ARRAY_POINTER_EXT 0x8443 -#define GL_MAP1_TANGENT_EXT 0x8444 -#define GL_MAP2_TANGENT_EXT 0x8445 -#define GL_MAP1_BINORMAL_EXT 0x8446 -#define GL_MAP2_BINORMAL_EXT 0x8447 -#endif - -#ifndef GL_EXT_texture_env_combine -#define GL_COMBINE_EXT 0x8570 -#define GL_COMBINE_RGB_EXT 0x8571 -#define GL_COMBINE_ALPHA_EXT 0x8572 -#define GL_RGB_SCALE_EXT 0x8573 -#define GL_ADD_SIGNED_EXT 0x8574 -#define GL_INTERPOLATE_EXT 0x8575 -#define GL_CONSTANT_EXT 0x8576 -#define GL_PRIMARY_COLOR_EXT 0x8577 -#define GL_PREVIOUS_EXT 0x8578 -#define GL_SOURCE0_RGB_EXT 0x8580 -#define GL_SOURCE1_RGB_EXT 0x8581 -#define GL_SOURCE2_RGB_EXT 0x8582 -#define GL_SOURCE0_ALPHA_EXT 0x8588 -#define GL_SOURCE1_ALPHA_EXT 0x8589 -#define GL_SOURCE2_ALPHA_EXT 0x858A -#define GL_OPERAND0_RGB_EXT 0x8590 -#define GL_OPERAND1_RGB_EXT 0x8591 -#define GL_OPERAND2_RGB_EXT 0x8592 -#define GL_OPERAND0_ALPHA_EXT 0x8598 -#define GL_OPERAND1_ALPHA_EXT 0x8599 -#define GL_OPERAND2_ALPHA_EXT 0x859A -#endif - -#ifndef GL_APPLE_specular_vector -#define GL_LIGHT_MODEL_SPECULAR_VECTOR_APPLE 0x85B0 -#endif - -#ifndef GL_APPLE_transform_hint -#define GL_TRANSFORM_HINT_APPLE 0x85B1 -#endif - -#ifndef GL_SGIX_fog_scale -#define GL_FOG_SCALE_SGIX 0x81FC -#define GL_FOG_SCALE_VALUE_SGIX 0x81FD -#endif - -#ifndef GL_SUNX_constant_data -#define GL_UNPACK_CONSTANT_DATA_SUNX 0x81D5 -#define GL_TEXTURE_CONSTANT_DATA_SUNX 0x81D6 -#endif - -#ifndef GL_SUN_global_alpha -#define GL_GLOBAL_ALPHA_SUN 0x81D9 -#define GL_GLOBAL_ALPHA_FACTOR_SUN 0x81DA -#endif - -#ifndef GL_SUN_triangle_list -#define GL_RESTART_SUN 0x0001 -#define GL_REPLACE_MIDDLE_SUN 0x0002 -#define GL_REPLACE_OLDEST_SUN 0x0003 -#define GL_TRIANGLE_LIST_SUN 0x81D7 -#define GL_REPLACEMENT_CODE_SUN 0x81D8 -#define GL_REPLACEMENT_CODE_ARRAY_SUN 0x85C0 -#define GL_REPLACEMENT_CODE_ARRAY_TYPE_SUN 0x85C1 -#define GL_REPLACEMENT_CODE_ARRAY_STRIDE_SUN 0x85C2 -#define GL_REPLACEMENT_CODE_ARRAY_POINTER_SUN 0x85C3 -#define GL_R1UI_V3F_SUN 0x85C4 -#define GL_R1UI_C4UB_V3F_SUN 0x85C5 -#define GL_R1UI_C3F_V3F_SUN 0x85C6 -#define GL_R1UI_N3F_V3F_SUN 0x85C7 -#define GL_R1UI_C4F_N3F_V3F_SUN 0x85C8 -#define GL_R1UI_T2F_V3F_SUN 0x85C9 -#define GL_R1UI_T2F_N3F_V3F_SUN 0x85CA -#define GL_R1UI_T2F_C4F_N3F_V3F_SUN 0x85CB -#endif - -#ifndef GL_SUN_vertex -#endif - -#ifndef GL_EXT_blend_func_separate -#define GL_BLEND_DST_RGB_EXT 0x80C8 -#define GL_BLEND_SRC_RGB_EXT 0x80C9 -#define GL_BLEND_DST_ALPHA_EXT 0x80CA -#define GL_BLEND_SRC_ALPHA_EXT 0x80CB -#endif - -#ifndef GL_INGR_color_clamp -#define GL_RED_MIN_CLAMP_INGR 0x8560 -#define GL_GREEN_MIN_CLAMP_INGR 0x8561 -#define GL_BLUE_MIN_CLAMP_INGR 0x8562 -#define GL_ALPHA_MIN_CLAMP_INGR 0x8563 -#define GL_RED_MAX_CLAMP_INGR 0x8564 -#define GL_GREEN_MAX_CLAMP_INGR 0x8565 -#define GL_BLUE_MAX_CLAMP_INGR 0x8566 -#define GL_ALPHA_MAX_CLAMP_INGR 0x8567 -#endif - -#ifndef GL_INGR_interlace_read -#define GL_INTERLACE_READ_INGR 0x8568 -#endif - -#ifndef GL_EXT_stencil_wrap -#define GL_INCR_WRAP_EXT 0x8507 -#define GL_DECR_WRAP_EXT 0x8508 -#endif - -#ifndef GL_EXT_422_pixels -#define GL_422_EXT 0x80CC -#define GL_422_REV_EXT 0x80CD -#define GL_422_AVERAGE_EXT 0x80CE -#define GL_422_REV_AVERAGE_EXT 0x80CF -#endif - -#ifndef GL_NV_texgen_reflection -#define GL_NORMAL_MAP_NV 0x8511 -#define GL_REFLECTION_MAP_NV 0x8512 -#endif - -#ifndef GL_EXT_texture_cube_map -#define GL_NORMAL_MAP_EXT 0x8511 -#define GL_REFLECTION_MAP_EXT 0x8512 -#define GL_TEXTURE_CUBE_MAP_EXT 0x8513 -#define GL_TEXTURE_BINDING_CUBE_MAP_EXT 0x8514 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_X_EXT 0x8515 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_X_EXT 0x8516 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Y_EXT 0x8517 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Y_EXT 0x8518 -#define GL_TEXTURE_CUBE_MAP_POSITIVE_Z_EXT 0x8519 -#define GL_TEXTURE_CUBE_MAP_NEGATIVE_Z_EXT 0x851A -#define GL_PROXY_TEXTURE_CUBE_MAP_EXT 0x851B -#define GL_MAX_CUBE_MAP_TEXTURE_SIZE_EXT 0x851C -#endif - -#ifndef GL_SUN_convolution_border_modes -#define GL_WRAP_BORDER_SUN 0x81D4 -#endif - -#ifndef GL_EXT_texture_env_add -#endif - -#ifndef GL_EXT_texture_lod_bias -#define GL_MAX_TEXTURE_LOD_BIAS_EXT 0x84FD -#define GL_TEXTURE_FILTER_CONTROL_EXT 0x8500 -#define GL_TEXTURE_LOD_BIAS_EXT 0x8501 -#endif - -#ifndef GL_EXT_texture_filter_anisotropic -#define GL_TEXTURE_MAX_ANISOTROPY_EXT 0x84FE -#define GL_MAX_TEXTURE_MAX_ANISOTROPY_EXT 0x84FF -#endif - -#ifndef GL_EXT_vertex_weighting -#define GL_MODELVIEW0_STACK_DEPTH_EXT GL_MODELVIEW_STACK_DEPTH -#define GL_MODELVIEW1_STACK_DEPTH_EXT 0x8502 -#define GL_MODELVIEW0_MATRIX_EXT GL_MODELVIEW_MATRIX -#define GL_MODELVIEW1_MATRIX_EXT 0x8506 -#define GL_VERTEX_WEIGHTING_EXT 0x8509 -#define GL_MODELVIEW0_EXT GL_MODELVIEW -#define GL_MODELVIEW1_EXT 0x850A -#define GL_CURRENT_VERTEX_WEIGHT_EXT 0x850B -#define GL_VERTEX_WEIGHT_ARRAY_EXT 0x850C -#define GL_VERTEX_WEIGHT_ARRAY_SIZE_EXT 0x850D -#define GL_VERTEX_WEIGHT_ARRAY_TYPE_EXT 0x850E -#define GL_VERTEX_WEIGHT_ARRAY_STRIDE_EXT 0x850F -#define GL_VERTEX_WEIGHT_ARRAY_POINTER_EXT 0x8510 -#endif - -#ifndef GL_NV_light_max_exponent -#define GL_MAX_SHININESS_NV 0x8504 -#define GL_MAX_SPOT_EXPONENT_NV 0x8505 -#endif - -#ifndef GL_NV_vertex_array_range -#define GL_VERTEX_ARRAY_RANGE_NV 0x851D -#define GL_VERTEX_ARRAY_RANGE_LENGTH_NV 0x851E -#define GL_VERTEX_ARRAY_RANGE_VALID_NV 0x851F -#define GL_MAX_VERTEX_ARRAY_RANGE_ELEMENT_NV 0x8520 -#define GL_VERTEX_ARRAY_RANGE_POINTER_NV 0x8521 -#endif - -#ifndef GL_NV_register_combiners -#define GL_REGISTER_COMBINERS_NV 0x8522 -#define GL_VARIABLE_A_NV 0x8523 -#define GL_VARIABLE_B_NV 0x8524 -#define GL_VARIABLE_C_NV 0x8525 -#define GL_VARIABLE_D_NV 0x8526 -#define GL_VARIABLE_E_NV 0x8527 -#define GL_VARIABLE_F_NV 0x8528 -#define GL_VARIABLE_G_NV 0x8529 -#define GL_CONSTANT_COLOR0_NV 0x852A -#define GL_CONSTANT_COLOR1_NV 0x852B -#define GL_PRIMARY_COLOR_NV 0x852C -#define GL_SECONDARY_COLOR_NV 0x852D -#define GL_SPARE0_NV 0x852E -#define GL_SPARE1_NV 0x852F -#define GL_DISCARD_NV 0x8530 -#define GL_E_TIMES_F_NV 0x8531 -#define GL_SPARE0_PLUS_SECONDARY_COLOR_NV 0x8532 -#define GL_UNSIGNED_IDENTITY_NV 0x8536 -#define GL_UNSIGNED_INVERT_NV 0x8537 -#define GL_EXPAND_NORMAL_NV 0x8538 -#define GL_EXPAND_NEGATE_NV 0x8539 -#define GL_HALF_BIAS_NORMAL_NV 0x853A -#define GL_HALF_BIAS_NEGATE_NV 0x853B -#define GL_SIGNED_IDENTITY_NV 0x853C -#define GL_SIGNED_NEGATE_NV 0x853D -#define GL_SCALE_BY_TWO_NV 0x853E -#define GL_SCALE_BY_FOUR_NV 0x853F -#define GL_SCALE_BY_ONE_HALF_NV 0x8540 -#define GL_BIAS_BY_NEGATIVE_ONE_HALF_NV 0x8541 -#define GL_COMBINER_INPUT_NV 0x8542 -#define GL_COMBINER_MAPPING_NV 0x8543 -#define GL_COMBINER_COMPONENT_USAGE_NV 0x8544 -#define GL_COMBINER_AB_DOT_PRODUCT_NV 0x8545 -#define GL_COMBINER_CD_DOT_PRODUCT_NV 0x8546 -#define GL_COMBINER_MUX_SUM_NV 0x8547 -#define GL_COMBINER_SCALE_NV 0x8548 -#define GL_COMBINER_BIAS_NV 0x8549 -#define GL_COMBINER_AB_OUTPUT_NV 0x854A -#define GL_COMBINER_CD_OUTPUT_NV 0x854B -#define GL_COMBINER_SUM_OUTPUT_NV 0x854C -#define GL_MAX_GENERAL_COMBINERS_NV 0x854D -#define GL_NUM_GENERAL_COMBINERS_NV 0x854E -#define GL_COLOR_SUM_CLAMP_NV 0x854F -#define GL_COMBINER0_NV 0x8550 -#define GL_COMBINER1_NV 0x8551 -#define GL_COMBINER2_NV 0x8552 -#define GL_COMBINER3_NV 0x8553 -#define GL_COMBINER4_NV 0x8554 -#define GL_COMBINER5_NV 0x8555 -#define GL_COMBINER6_NV 0x8556 -#define GL_COMBINER7_NV 0x8557 -/* reuse GL_TEXTURE0_ARB */ -/* reuse GL_TEXTURE1_ARB */ -/* reuse GL_ZERO */ -/* reuse GL_NONE */ -/* reuse GL_FOG */ -#endif - -#ifndef GL_NV_fog_distance -#define GL_FOG_DISTANCE_MODE_NV 0x855A -#define GL_EYE_RADIAL_NV 0x855B -#define GL_EYE_PLANE_ABSOLUTE_NV 0x855C -/* reuse GL_EYE_PLANE */ -#endif - -#ifndef GL_NV_texgen_emboss -#define GL_EMBOSS_LIGHT_NV 0x855D -#define GL_EMBOSS_CONSTANT_NV 0x855E -#define GL_EMBOSS_MAP_NV 0x855F -#endif - -#ifndef GL_NV_blend_square -#endif - -#ifndef GL_NV_texture_env_combine4 -#define GL_COMBINE4_NV 0x8503 -#define GL_SOURCE3_RGB_NV 0x8583 -#define GL_SOURCE3_ALPHA_NV 0x858B -#define GL_OPERAND3_RGB_NV 0x8593 -#define GL_OPERAND3_ALPHA_NV 0x859B -#endif - -#ifndef GL_MESA_resize_buffers -#endif - -#ifndef GL_MESA_window_pos -#endif - -#ifndef GL_EXT_texture_compression_s3tc -#define GL_COMPRESSED_RGB_S3TC_DXT1_EXT 0x83F0 -#define GL_COMPRESSED_RGBA_S3TC_DXT1_EXT 0x83F1 -#define GL_COMPRESSED_RGBA_S3TC_DXT3_EXT 0x83F2 -#define GL_COMPRESSED_RGBA_S3TC_DXT5_EXT 0x83F3 -#endif - -#ifndef GL_IBM_cull_vertex -#define GL_CULL_VERTEX_IBM 103050 -#endif - -#ifndef GL_IBM_multimode_draw_arrays -#endif - -#ifndef GL_IBM_vertex_array_lists -#define GL_VERTEX_ARRAY_LIST_IBM 103070 -#define GL_NORMAL_ARRAY_LIST_IBM 103071 -#define GL_COLOR_ARRAY_LIST_IBM 103072 -#define GL_INDEX_ARRAY_LIST_IBM 103073 -#define GL_TEXTURE_COORD_ARRAY_LIST_IBM 103074 -#define GL_EDGE_FLAG_ARRAY_LIST_IBM 103075 -#define GL_FOG_COORDINATE_ARRAY_LIST_IBM 103076 -#define GL_SECONDARY_COLOR_ARRAY_LIST_IBM 103077 -#define GL_VERTEX_ARRAY_LIST_STRIDE_IBM 103080 -#define GL_NORMAL_ARRAY_LIST_STRIDE_IBM 103081 -#define GL_COLOR_ARRAY_LIST_STRIDE_IBM 103082 -#define GL_INDEX_ARRAY_LIST_STRIDE_IBM 103083 -#define GL_TEXTURE_COORD_ARRAY_LIST_STRIDE_IBM 103084 -#define GL_EDGE_FLAG_ARRAY_LIST_STRIDE_IBM 103085 -#define GL_FOG_COORDINATE_ARRAY_LIST_STRIDE_IBM 103086 -#define GL_SECONDARY_COLOR_ARRAY_LIST_STRIDE_IBM 103087 -#endif - -#ifndef GL_SGIX_subsample -#define GL_PACK_SUBSAMPLE_RATE_SGIX 0x85A0 -#define GL_UNPACK_SUBSAMPLE_RATE_SGIX 0x85A1 -#define GL_PIXEL_SUBSAMPLE_4444_SGIX 0x85A2 -#define GL_PIXEL_SUBSAMPLE_2424_SGIX 0x85A3 -#define GL_PIXEL_SUBSAMPLE_4242_SGIX 0x85A4 -#endif - -#ifndef GL_SGIX_ycrcb_subsample -#endif - -#ifndef GL_SGIX_ycrcba -#define GL_YCRCB_SGIX 0x8318 -#define GL_YCRCBA_SGIX 0x8319 -#endif - -#ifndef GL_SGI_depth_pass_instrument -#define GL_DEPTH_PASS_INSTRUMENT_SGIX 0x8310 -#define GL_DEPTH_PASS_INSTRUMENT_COUNTERS_SGIX 0x8311 -#define GL_DEPTH_PASS_INSTRUMENT_MAX_SGIX 0x8312 -#endif - -#ifndef GL_3DFX_texture_compression_FXT1 -#define GL_COMPRESSED_RGB_FXT1_3DFX 0x86B0 -#define GL_COMPRESSED_RGBA_FXT1_3DFX 0x86B1 -#endif - -#ifndef GL_3DFX_multisample -#define GL_MULTISAMPLE_3DFX 0x86B2 -#define GL_SAMPLE_BUFFERS_3DFX 0x86B3 -#define GL_SAMPLES_3DFX 0x86B4 -#define GL_MULTISAMPLE_BIT_3DFX 0x20000000 -#endif - -#ifndef GL_3DFX_tbuffer -#endif - -#ifndef GL_EXT_multisample -#define GL_MULTISAMPLE_EXT 0x809D -#define GL_SAMPLE_ALPHA_TO_MASK_EXT 0x809E -#define GL_SAMPLE_ALPHA_TO_ONE_EXT 0x809F -#define GL_SAMPLE_MASK_EXT 0x80A0 -#define GL_1PASS_EXT 0x80A1 -#define GL_2PASS_0_EXT 0x80A2 -#define GL_2PASS_1_EXT 0x80A3 -#define GL_4PASS_0_EXT 0x80A4 -#define GL_4PASS_1_EXT 0x80A5 -#define GL_4PASS_2_EXT 0x80A6 -#define GL_4PASS_3_EXT 0x80A7 -#define GL_SAMPLE_BUFFERS_EXT 0x80A8 -#define GL_SAMPLES_EXT 0x80A9 -#define GL_SAMPLE_MASK_VALUE_EXT 0x80AA -#define GL_SAMPLE_MASK_INVERT_EXT 0x80AB -#define GL_SAMPLE_PATTERN_EXT 0x80AC -#define GL_MULTISAMPLE_BIT_EXT 0x20000000 -#endif - -#ifndef GL_SGIX_vertex_preclip -#define GL_VERTEX_PRECLIP_SGIX 0x83EE -#define GL_VERTEX_PRECLIP_HINT_SGIX 0x83EF -#endif - -#ifndef GL_SGIX_convolution_accuracy -#define GL_CONVOLUTION_HINT_SGIX 0x8316 -#endif - -#ifndef GL_SGIX_resample -#define GL_PACK_RESAMPLE_SGIX 0x842C -#define GL_UNPACK_RESAMPLE_SGIX 0x842D -#define GL_RESAMPLE_REPLICATE_SGIX 0x842E -#define GL_RESAMPLE_ZERO_FILL_SGIX 0x842F -#define GL_RESAMPLE_DECIMATE_SGIX 0x8430 -#endif - -#ifndef GL_SGIS_point_line_texgen -#define GL_EYE_DISTANCE_TO_POINT_SGIS 0x81F0 -#define GL_OBJECT_DISTANCE_TO_POINT_SGIS 0x81F1 -#define GL_EYE_DISTANCE_TO_LINE_SGIS 0x81F2 -#define GL_OBJECT_DISTANCE_TO_LINE_SGIS 0x81F3 -#define GL_EYE_POINT_SGIS 0x81F4 -#define GL_OBJECT_POINT_SGIS 0x81F5 -#define GL_EYE_LINE_SGIS 0x81F6 -#define GL_OBJECT_LINE_SGIS 0x81F7 -#endif - -#ifndef GL_SGIS_texture_color_mask -#define GL_TEXTURE_COLOR_WRITEMASK_SGIS 0x81EF -#endif - -#ifndef GL_EXT_texture_env_dot3 -#define GL_DOT3_RGB_EXT 0x8740 -#define GL_DOT3_RGBA_EXT 0x8741 -#endif - -#ifndef GL_ATI_texture_mirror_once -#define GL_MIRROR_CLAMP_ATI 0x8742 -#define GL_MIRROR_CLAMP_TO_EDGE_ATI 0x8743 -#endif - -#ifndef GL_NV_fence -#define GL_ALL_COMPLETED_NV 0x84F2 -#define GL_FENCE_STATUS_NV 0x84F3 -#define GL_FENCE_CONDITION_NV 0x84F4 -#endif - -#ifndef GL_IBM_texture_mirrored_repeat -#define GL_MIRRORED_REPEAT_IBM 0x8370 -#endif - -#ifndef GL_NV_evaluators -#define GL_EVAL_2D_NV 0x86C0 -#define GL_EVAL_TRIANGULAR_2D_NV 0x86C1 -#define GL_MAP_TESSELLATION_NV 0x86C2 -#define GL_MAP_ATTRIB_U_ORDER_NV 0x86C3 -#define GL_MAP_ATTRIB_V_ORDER_NV 0x86C4 -#define GL_EVAL_FRACTIONAL_TESSELLATION_NV 0x86C5 -#define GL_EVAL_VERTEX_ATTRIB0_NV 0x86C6 -#define GL_EVAL_VERTEX_ATTRIB1_NV 0x86C7 -#define GL_EVAL_VERTEX_ATTRIB2_NV 0x86C8 -#define GL_EVAL_VERTEX_ATTRIB3_NV 0x86C9 -#define GL_EVAL_VERTEX_ATTRIB4_NV 0x86CA -#define GL_EVAL_VERTEX_ATTRIB5_NV 0x86CB -#define GL_EVAL_VERTEX_ATTRIB6_NV 0x86CC -#define GL_EVAL_VERTEX_ATTRIB7_NV 0x86CD -#define GL_EVAL_VERTEX_ATTRIB8_NV 0x86CE -#define GL_EVAL_VERTEX_ATTRIB9_NV 0x86CF -#define GL_EVAL_VERTEX_ATTRIB10_NV 0x86D0 -#define GL_EVAL_VERTEX_ATTRIB11_NV 0x86D1 -#define GL_EVAL_VERTEX_ATTRIB12_NV 0x86D2 -#define GL_EVAL_VERTEX_ATTRIB13_NV 0x86D3 -#define GL_EVAL_VERTEX_ATTRIB14_NV 0x86D4 -#define GL_EVAL_VERTEX_ATTRIB15_NV 0x86D5 -#define GL_MAX_MAP_TESSELLATION_NV 0x86D6 -#define GL_MAX_RATIONAL_EVAL_ORDER_NV 0x86D7 -#endif - -#ifndef GL_NV_packed_depth_stencil -#define GL_DEPTH_STENCIL_NV 0x84F9 -#define GL_UNSIGNED_INT_24_8_NV 0x84FA -#endif - -#ifndef GL_NV_register_combiners2 -#define GL_PER_STAGE_CONSTANTS_NV 0x8535 -#endif - -#ifndef GL_NV_texture_compression_vtc -#endif - -#ifndef GL_NV_texture_rectangle -#define GL_TEXTURE_RECTANGLE_NV 0x84F5 -#define GL_TEXTURE_BINDING_RECTANGLE_NV 0x84F6 -#define GL_PROXY_TEXTURE_RECTANGLE_NV 0x84F7 -#define GL_MAX_RECTANGLE_TEXTURE_SIZE_NV 0x84F8 -#endif - -#ifndef GL_NV_texture_shader -#define GL_OFFSET_TEXTURE_RECTANGLE_NV 0x864C -#define GL_OFFSET_TEXTURE_RECTANGLE_SCALE_NV 0x864D -#define GL_DOT_PRODUCT_TEXTURE_RECTANGLE_NV 0x864E -#define GL_RGBA_UNSIGNED_DOT_PRODUCT_MAPPING_NV 0x86D9 -#define GL_UNSIGNED_INT_S8_S8_8_8_NV 0x86DA -#define GL_UNSIGNED_INT_8_8_S8_S8_REV_NV 0x86DB -#define GL_DSDT_MAG_INTENSITY_NV 0x86DC -#define GL_SHADER_CONSISTENT_NV 0x86DD -#define GL_TEXTURE_SHADER_NV 0x86DE -#define GL_SHADER_OPERATION_NV 0x86DF -#define GL_CULL_MODES_NV 0x86E0 -#define GL_OFFSET_TEXTURE_MATRIX_NV 0x86E1 -#define GL_OFFSET_TEXTURE_SCALE_NV 0x86E2 -#define GL_OFFSET_TEXTURE_BIAS_NV 0x86E3 -#define GL_OFFSET_TEXTURE_2D_MATRIX_NV GL_OFFSET_TEXTURE_MATRIX_NV -#define GL_OFFSET_TEXTURE_2D_SCALE_NV GL_OFFSET_TEXTURE_SCALE_NV -#define GL_OFFSET_TEXTURE_2D_BIAS_NV GL_OFFSET_TEXTURE_BIAS_NV -#define GL_PREVIOUS_TEXTURE_INPUT_NV 0x86E4 -#define GL_CONST_EYE_NV 0x86E5 -#define GL_PASS_THROUGH_NV 0x86E6 -#define GL_CULL_FRAGMENT_NV 0x86E7 -#define GL_OFFSET_TEXTURE_2D_NV 0x86E8 -#define GL_DEPENDENT_AR_TEXTURE_2D_NV 0x86E9 -#define GL_DEPENDENT_GB_TEXTURE_2D_NV 0x86EA -#define GL_DOT_PRODUCT_NV 0x86EC -#define GL_DOT_PRODUCT_DEPTH_REPLACE_NV 0x86ED -#define GL_DOT_PRODUCT_TEXTURE_2D_NV 0x86EE -#define GL_DOT_PRODUCT_TEXTURE_CUBE_MAP_NV 0x86F0 -#define GL_DOT_PRODUCT_DIFFUSE_CUBE_MAP_NV 0x86F1 -#define GL_DOT_PRODUCT_REFLECT_CUBE_MAP_NV 0x86F2 -#define GL_DOT_PRODUCT_CONST_EYE_REFLECT_CUBE_MAP_NV 0x86F3 -#define GL_HILO_NV 0x86F4 -#define GL_DSDT_NV 0x86F5 -#define GL_DSDT_MAG_NV 0x86F6 -#define GL_DSDT_MAG_VIB_NV 0x86F7 -#define GL_HILO16_NV 0x86F8 -#define GL_SIGNED_HILO_NV 0x86F9 -#define GL_SIGNED_HILO16_NV 0x86FA -#define GL_SIGNED_RGBA_NV 0x86FB -#define GL_SIGNED_RGBA8_NV 0x86FC -#define GL_SIGNED_RGB_NV 0x86FE -#define GL_SIGNED_RGB8_NV 0x86FF -#define GL_SIGNED_LUMINANCE_NV 0x8701 -#define GL_SIGNED_LUMINANCE8_NV 0x8702 -#define GL_SIGNED_LUMINANCE_ALPHA_NV 0x8703 -#define GL_SIGNED_LUMINANCE8_ALPHA8_NV 0x8704 -#define GL_SIGNED_ALPHA_NV 0x8705 -#define GL_SIGNED_ALPHA8_NV 0x8706 -#define GL_SIGNED_INTENSITY_NV 0x8707 -#define GL_SIGNED_INTENSITY8_NV 0x8708 -#define GL_DSDT8_NV 0x8709 -#define GL_DSDT8_MAG8_NV 0x870A -#define GL_DSDT8_MAG8_INTENSITY8_NV 0x870B -#define GL_SIGNED_RGB_UNSIGNED_ALPHA_NV 0x870C -#define GL_SIGNED_RGB8_UNSIGNED_ALPHA8_NV 0x870D -#define GL_HI_SCALE_NV 0x870E -#define GL_LO_SCALE_NV 0x870F -#define GL_DS_SCALE_NV 0x8710 -#define GL_DT_SCALE_NV 0x8711 -#define GL_MAGNITUDE_SCALE_NV 0x8712 -#define GL_VIBRANCE_SCALE_NV 0x8713 -#define GL_HI_BIAS_NV 0x8714 -#define GL_LO_BIAS_NV 0x8715 -#define GL_DS_BIAS_NV 0x8716 -#define GL_DT_BIAS_NV 0x8717 -#define GL_MAGNITUDE_BIAS_NV 0x8718 -#define GL_VIBRANCE_BIAS_NV 0x8719 -#define GL_TEXTURE_BORDER_VALUES_NV 0x871A -#define GL_TEXTURE_HI_SIZE_NV 0x871B -#define GL_TEXTURE_LO_SIZE_NV 0x871C -#define GL_TEXTURE_DS_SIZE_NV 0x871D -#define GL_TEXTURE_DT_SIZE_NV 0x871E -#define GL_TEXTURE_MAG_SIZE_NV 0x871F -#endif - -#ifndef GL_NV_texture_shader2 -#define GL_DOT_PRODUCT_TEXTURE_3D_NV 0x86EF -#endif - -#ifndef GL_NV_vertex_array_range2 -#define GL_VERTEX_ARRAY_RANGE_WITHOUT_FLUSH_NV 0x8533 -#endif - -#ifndef GL_NV_vertex_program -#define GL_VERTEX_PROGRAM_NV 0x8620 -#define GL_VERTEX_STATE_PROGRAM_NV 0x8621 -#define GL_ATTRIB_ARRAY_SIZE_NV 0x8623 -#define GL_ATTRIB_ARRAY_STRIDE_NV 0x8624 -#define GL_ATTRIB_ARRAY_TYPE_NV 0x8625 -#define GL_CURRENT_ATTRIB_NV 0x8626 -#define GL_PROGRAM_LENGTH_NV 0x8627 -#define GL_PROGRAM_STRING_NV 0x8628 -#define GL_MODELVIEW_PROJECTION_NV 0x8629 -#define GL_IDENTITY_NV 0x862A -#define GL_INVERSE_NV 0x862B -#define GL_TRANSPOSE_NV 0x862C -#define GL_INVERSE_TRANSPOSE_NV 0x862D -#define GL_MAX_TRACK_MATRIX_STACK_DEPTH_NV 0x862E -#define GL_MAX_TRACK_MATRICES_NV 0x862F -#define GL_MATRIX0_NV 0x8630 -#define GL_MATRIX1_NV 0x8631 -#define GL_MATRIX2_NV 0x8632 -#define GL_MATRIX3_NV 0x8633 -#define GL_MATRIX4_NV 0x8634 -#define GL_MATRIX5_NV 0x8635 -#define GL_MATRIX6_NV 0x8636 -#define GL_MATRIX7_NV 0x8637 -#define GL_CURRENT_MATRIX_STACK_DEPTH_NV 0x8640 -#define GL_CURRENT_MATRIX_NV 0x8641 -#define GL_VERTEX_PROGRAM_POINT_SIZE_NV 0x8642 -#define GL_VERTEX_PROGRAM_TWO_SIDE_NV 0x8643 -#define GL_PROGRAM_PARAMETER_NV 0x8644 -#define GL_ATTRIB_ARRAY_POINTER_NV 0x8645 -#define GL_PROGRAM_TARGET_NV 0x8646 -#define GL_PROGRAM_RESIDENT_NV 0x8647 -#define GL_TRACK_MATRIX_NV 0x8648 -#define GL_TRACK_MATRIX_TRANSFORM_NV 0x8649 -#define GL_VERTEX_PROGRAM_BINDING_NV 0x864A -#define GL_PROGRAM_ERROR_POSITION_NV 0x864B -#define GL_VERTEX_ATTRIB_ARRAY0_NV 0x8650 -#define GL_VERTEX_ATTRIB_ARRAY1_NV 0x8651 -#define GL_VERTEX_ATTRIB_ARRAY2_NV 0x8652 -#define GL_VERTEX_ATTRIB_ARRAY3_NV 0x8653 -#define GL_VERTEX_ATTRIB_ARRAY4_NV 0x8654 -#define GL_VERTEX_ATTRIB_ARRAY5_NV 0x8655 -#define GL_VERTEX_ATTRIB_ARRAY6_NV 0x8656 -#define GL_VERTEX_ATTRIB_ARRAY7_NV 0x8657 -#define GL_VERTEX_ATTRIB_ARRAY8_NV 0x8658 -#define GL_VERTEX_ATTRIB_ARRAY9_NV 0x8659 -#define GL_VERTEX_ATTRIB_ARRAY10_NV 0x865A -#define GL_VERTEX_ATTRIB_ARRAY11_NV 0x865B -#define GL_VERTEX_ATTRIB_ARRAY12_NV 0x865C -#define GL_VERTEX_ATTRIB_ARRAY13_NV 0x865D -#define GL_VERTEX_ATTRIB_ARRAY14_NV 0x865E -#define GL_VERTEX_ATTRIB_ARRAY15_NV 0x865F -#define GL_MAP1_VERTEX_ATTRIB0_4_NV 0x8660 -#define GL_MAP1_VERTEX_ATTRIB1_4_NV 0x8661 -#define GL_MAP1_VERTEX_ATTRIB2_4_NV 0x8662 -#define GL_MAP1_VERTEX_ATTRIB3_4_NV 0x8663 -#define GL_MAP1_VERTEX_ATTRIB4_4_NV 0x8664 -#define GL_MAP1_VERTEX_ATTRIB5_4_NV 0x8665 -#define GL_MAP1_VERTEX_ATTRIB6_4_NV 0x8666 -#define GL_MAP1_VERTEX_ATTRIB7_4_NV 0x8667 -#define GL_MAP1_VERTEX_ATTRIB8_4_NV 0x8668 -#define GL_MAP1_VERTEX_ATTRIB9_4_NV 0x8669 -#define GL_MAP1_VERTEX_ATTRIB10_4_NV 0x866A -#define GL_MAP1_VERTEX_ATTRIB11_4_NV 0x866B -#define GL_MAP1_VERTEX_ATTRIB12_4_NV 0x866C -#define GL_MAP1_VERTEX_ATTRIB13_4_NV 0x866D -#define GL_MAP1_VERTEX_ATTRIB14_4_NV 0x866E -#define GL_MAP1_VERTEX_ATTRIB15_4_NV 0x866F -#define GL_MAP2_VERTEX_ATTRIB0_4_NV 0x8670 -#define GL_MAP2_VERTEX_ATTRIB1_4_NV 0x8671 -#define GL_MAP2_VERTEX_ATTRIB2_4_NV 0x8672 -#define GL_MAP2_VERTEX_ATTRIB3_4_NV 0x8673 -#define GL_MAP2_VERTEX_ATTRIB4_4_NV 0x8674 -#define GL_MAP2_VERTEX_ATTRIB5_4_NV 0x8675 -#define GL_MAP2_VERTEX_ATTRIB6_4_NV 0x8676 -#define GL_MAP2_VERTEX_ATTRIB7_4_NV 0x8677 -#define GL_MAP2_VERTEX_ATTRIB8_4_NV 0x8678 -#define GL_MAP2_VERTEX_ATTRIB9_4_NV 0x8679 -#define GL_MAP2_VERTEX_ATTRIB10_4_NV 0x867A -#define GL_MAP2_VERTEX_ATTRIB11_4_NV 0x867B -#define GL_MAP2_VERTEX_ATTRIB12_4_NV 0x867C -#define GL_MAP2_VERTEX_ATTRIB13_4_NV 0x867D -#define GL_MAP2_VERTEX_ATTRIB14_4_NV 0x867E -#define GL_MAP2_VERTEX_ATTRIB15_4_NV 0x867F -#endif - -#ifndef GL_SGIX_texture_coordinate_clamp -#define GL_TEXTURE_MAX_CLAMP_S_SGIX 0x8369 -#define GL_TEXTURE_MAX_CLAMP_T_SGIX 0x836A -#define GL_TEXTURE_MAX_CLAMP_R_SGIX 0x836B -#endif - -#ifndef GL_SGIX_scalebias_hint -#define GL_SCALEBIAS_HINT_SGIX 0x8322 -#endif - -#ifndef GL_OML_interlace -#define GL_INTERLACE_OML 0x8980 -#define GL_INTERLACE_READ_OML 0x8981 -#endif - -#ifndef GL_OML_subsample -#define GL_FORMAT_SUBSAMPLE_24_24_OML 0x8982 -#define GL_FORMAT_SUBSAMPLE_244_244_OML 0x8983 -#endif - -#ifndef GL_OML_resample -#define GL_PACK_RESAMPLE_OML 0x8984 -#define GL_UNPACK_RESAMPLE_OML 0x8985 -#define GL_RESAMPLE_REPLICATE_OML 0x8986 -#define GL_RESAMPLE_ZERO_FILL_OML 0x8987 -#define GL_RESAMPLE_AVERAGE_OML 0x8988 -#define GL_RESAMPLE_DECIMATE_OML 0x8989 -#endif - -#ifndef GL_NV_copy_depth_to_color -#define GL_DEPTH_STENCIL_TO_RGBA_NV 0x886E -#define GL_DEPTH_STENCIL_TO_BGRA_NV 0x886F -#endif - -#ifndef GL_ATI_envmap_bumpmap -#define GL_BUMP_ROT_MATRIX_ATI 0x8775 -#define GL_BUMP_ROT_MATRIX_SIZE_ATI 0x8776 -#define GL_BUMP_NUM_TEX_UNITS_ATI 0x8777 -#define GL_BUMP_TEX_UNITS_ATI 0x8778 -#define GL_DUDV_ATI 0x8779 -#define GL_DU8DV8_ATI 0x877A -#define GL_BUMP_ENVMAP_ATI 0x877B -#define GL_BUMP_TARGET_ATI 0x877C -#endif - -#ifndef GL_ATI_fragment_shader -#define GL_FRAGMENT_SHADER_ATI 0x8920 -#define GL_REG_0_ATI 0x8921 -#define GL_REG_1_ATI 0x8922 -#define GL_REG_2_ATI 0x8923 -#define GL_REG_3_ATI 0x8924 -#define GL_REG_4_ATI 0x8925 -#define GL_REG_5_ATI 0x8926 -#define GL_REG_6_ATI 0x8927 -#define GL_REG_7_ATI 0x8928 -#define GL_REG_8_ATI 0x8929 -#define GL_REG_9_ATI 0x892A -#define GL_REG_10_ATI 0x892B -#define GL_REG_11_ATI 0x892C -#define GL_REG_12_ATI 0x892D -#define GL_REG_13_ATI 0x892E -#define GL_REG_14_ATI 0x892F -#define GL_REG_15_ATI 0x8930 -#define GL_REG_16_ATI 0x8931 -#define GL_REG_17_ATI 0x8932 -#define GL_REG_18_ATI 0x8933 -#define GL_REG_19_ATI 0x8934 -#define GL_REG_20_ATI 0x8935 -#define GL_REG_21_ATI 0x8936 -#define GL_REG_22_ATI 0x8937 -#define GL_REG_23_ATI 0x8938 -#define GL_REG_24_ATI 0x8939 -#define GL_REG_25_ATI 0x893A -#define GL_REG_26_ATI 0x893B -#define GL_REG_27_ATI 0x893C -#define GL_REG_28_ATI 0x893D -#define GL_REG_29_ATI 0x893E -#define GL_REG_30_ATI 0x893F -#define GL_REG_31_ATI 0x8940 -#define GL_CON_0_ATI 0x8941 -#define GL_CON_1_ATI 0x8942 -#define GL_CON_2_ATI 0x8943 -#define GL_CON_3_ATI 0x8944 -#define GL_CON_4_ATI 0x8945 -#define GL_CON_5_ATI 0x8946 -#define GL_CON_6_ATI 0x8947 -#define GL_CON_7_ATI 0x8948 -#define GL_CON_8_ATI 0x8949 -#define GL_CON_9_ATI 0x894A -#define GL_CON_10_ATI 0x894B -#define GL_CON_11_ATI 0x894C -#define GL_CON_12_ATI 0x894D -#define GL_CON_13_ATI 0x894E -#define GL_CON_14_ATI 0x894F -#define GL_CON_15_ATI 0x8950 -#define GL_CON_16_ATI 0x8951 -#define GL_CON_17_ATI 0x8952 -#define GL_CON_18_ATI 0x8953 -#define GL_CON_19_ATI 0x8954 -#define GL_CON_20_ATI 0x8955 -#define GL_CON_21_ATI 0x8956 -#define GL_CON_22_ATI 0x8957 -#define GL_CON_23_ATI 0x8958 -#define GL_CON_24_ATI 0x8959 -#define GL_CON_25_ATI 0x895A -#define GL_CON_26_ATI 0x895B -#define GL_CON_27_ATI 0x895C -#define GL_CON_28_ATI 0x895D -#define GL_CON_29_ATI 0x895E -#define GL_CON_30_ATI 0x895F -#define GL_CON_31_ATI 0x8960 -#define GL_MOV_ATI 0x8961 -#define GL_ADD_ATI 0x8963 -#define GL_MUL_ATI 0x8964 -#define GL_SUB_ATI 0x8965 -#define GL_DOT3_ATI 0x8966 -#define GL_DOT4_ATI 0x8967 -#define GL_MAD_ATI 0x8968 -#define GL_LERP_ATI 0x8969 -#define GL_CND_ATI 0x896A -#define GL_CND0_ATI 0x896B -#define GL_DOT2_ADD_ATI 0x896C -#define GL_SECONDARY_INTERPOLATOR_ATI 0x896D -#define GL_NUM_FRAGMENT_REGISTERS_ATI 0x896E -#define GL_NUM_FRAGMENT_CONSTANTS_ATI 0x896F -#define GL_NUM_PASSES_ATI 0x8970 -#define GL_NUM_INSTRUCTIONS_PER_PASS_ATI 0x8971 -#define GL_NUM_INSTRUCTIONS_TOTAL_ATI 0x8972 -#define GL_NUM_INPUT_INTERPOLATOR_COMPONENTS_ATI 0x8973 -#define GL_NUM_LOOPBACK_COMPONENTS_ATI 0x8974 -#define GL_COLOR_ALPHA_PAIRING_ATI 0x8975 -#define GL_SWIZZLE_STR_ATI 0x8976 -#define GL_SWIZZLE_STQ_ATI 0x8977 -#define GL_SWIZZLE_STR_DR_ATI 0x8978 -#define GL_SWIZZLE_STQ_DQ_ATI 0x8979 -#define GL_SWIZZLE_STRQ_ATI 0x897A -#define GL_SWIZZLE_STRQ_DQ_ATI 0x897B -#define GL_RED_BIT_ATI 0x00000001 -#define GL_GREEN_BIT_ATI 0x00000002 -#define GL_BLUE_BIT_ATI 0x00000004 -#define GL_2X_BIT_ATI 0x00000001 -#define GL_4X_BIT_ATI 0x00000002 -#define GL_8X_BIT_ATI 0x00000004 -#define GL_HALF_BIT_ATI 0x00000008 -#define GL_QUARTER_BIT_ATI 0x00000010 -#define GL_EIGHTH_BIT_ATI 0x00000020 -#define GL_SATURATE_BIT_ATI 0x00000040 -#define GL_COMP_BIT_ATI 0x00000002 -#define GL_NEGATE_BIT_ATI 0x00000004 -#define GL_BIAS_BIT_ATI 0x00000008 -#endif - -#ifndef GL_ATI_pn_triangles -#define GL_PN_TRIANGLES_ATI 0x87F0 -#define GL_MAX_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F1 -#define GL_PN_TRIANGLES_POINT_MODE_ATI 0x87F2 -#define GL_PN_TRIANGLES_NORMAL_MODE_ATI 0x87F3 -#define GL_PN_TRIANGLES_TESSELATION_LEVEL_ATI 0x87F4 -#define GL_PN_TRIANGLES_POINT_MODE_LINEAR_ATI 0x87F5 -#define GL_PN_TRIANGLES_POINT_MODE_CUBIC_ATI 0x87F6 -#define GL_PN_TRIANGLES_NORMAL_MODE_LINEAR_ATI 0x87F7 -#define GL_PN_TRIANGLES_NORMAL_MODE_QUADRATIC_ATI 0x87F8 -#endif - -#ifndef GL_ATI_vertex_array_object -#define GL_STATIC_ATI 0x8760 -#define GL_DYNAMIC_ATI 0x8761 -#define GL_PRESERVE_ATI 0x8762 -#define GL_DISCARD_ATI 0x8763 -#define GL_OBJECT_BUFFER_SIZE_ATI 0x8764 -#define GL_OBJECT_BUFFER_USAGE_ATI 0x8765 -#define GL_ARRAY_OBJECT_BUFFER_ATI 0x8766 -#define GL_ARRAY_OBJECT_OFFSET_ATI 0x8767 -#endif - -#ifndef GL_EXT_vertex_shader -#define GL_VERTEX_SHADER_EXT 0x8780 -#define GL_VERTEX_SHADER_BINDING_EXT 0x8781 -#define GL_OP_INDEX_EXT 0x8782 -#define GL_OP_NEGATE_EXT 0x8783 -#define GL_OP_DOT3_EXT 0x8784 -#define GL_OP_DOT4_EXT 0x8785 -#define GL_OP_MUL_EXT 0x8786 -#define GL_OP_ADD_EXT 0x8787 -#define GL_OP_MADD_EXT 0x8788 -#define GL_OP_FRAC_EXT 0x8789 -#define GL_OP_MAX_EXT 0x878A -#define GL_OP_MIN_EXT 0x878B -#define GL_OP_SET_GE_EXT 0x878C -#define GL_OP_SET_LT_EXT 0x878D -#define GL_OP_CLAMP_EXT 0x878E -#define GL_OP_FLOOR_EXT 0x878F -#define GL_OP_ROUND_EXT 0x8790 -#define GL_OP_EXP_BASE_2_EXT 0x8791 -#define GL_OP_LOG_BASE_2_EXT 0x8792 -#define GL_OP_POWER_EXT 0x8793 -#define GL_OP_RECIP_EXT 0x8794 -#define GL_OP_RECIP_SQRT_EXT 0x8795 -#define GL_OP_SUB_EXT 0x8796 -#define GL_OP_CROSS_PRODUCT_EXT 0x8797 -#define GL_OP_MULTIPLY_MATRIX_EXT 0x8798 -#define GL_OP_MOV_EXT 0x8799 -#define GL_OUTPUT_VERTEX_EXT 0x879A -#define GL_OUTPUT_COLOR0_EXT 0x879B -#define GL_OUTPUT_COLOR1_EXT 0x879C -#define GL_OUTPUT_TEXTURE_COORD0_EXT 0x879D -#define GL_OUTPUT_TEXTURE_COORD1_EXT 0x879E -#define GL_OUTPUT_TEXTURE_COORD2_EXT 0x879F -#define GL_OUTPUT_TEXTURE_COORD3_EXT 0x87A0 -#define GL_OUTPUT_TEXTURE_COORD4_EXT 0x87A1 -#define GL_OUTPUT_TEXTURE_COORD5_EXT 0x87A2 -#define GL_OUTPUT_TEXTURE_COORD6_EXT 0x87A3 -#define GL_OUTPUT_TEXTURE_COORD7_EXT 0x87A4 -#define GL_OUTPUT_TEXTURE_COORD8_EXT 0x87A5 -#define GL_OUTPUT_TEXTURE_COORD9_EXT 0x87A6 -#define GL_OUTPUT_TEXTURE_COORD10_EXT 0x87A7 -#define GL_OUTPUT_TEXTURE_COORD11_EXT 0x87A8 -#define GL_OUTPUT_TEXTURE_COORD12_EXT 0x87A9 -#define GL_OUTPUT_TEXTURE_COORD13_EXT 0x87AA -#define GL_OUTPUT_TEXTURE_COORD14_EXT 0x87AB -#define GL_OUTPUT_TEXTURE_COORD15_EXT 0x87AC -#define GL_OUTPUT_TEXTURE_COORD16_EXT 0x87AD -#define GL_OUTPUT_TEXTURE_COORD17_EXT 0x87AE -#define GL_OUTPUT_TEXTURE_COORD18_EXT 0x87AF -#define GL_OUTPUT_TEXTURE_COORD19_EXT 0x87B0 -#define GL_OUTPUT_TEXTURE_COORD20_EXT 0x87B1 -#define GL_OUTPUT_TEXTURE_COORD21_EXT 0x87B2 -#define GL_OUTPUT_TEXTURE_COORD22_EXT 0x87B3 -#define GL_OUTPUT_TEXTURE_COORD23_EXT 0x87B4 -#define GL_OUTPUT_TEXTURE_COORD24_EXT 0x87B5 -#define GL_OUTPUT_TEXTURE_COORD25_EXT 0x87B6 -#define GL_OUTPUT_TEXTURE_COORD26_EXT 0x87B7 -#define GL_OUTPUT_TEXTURE_COORD27_EXT 0x87B8 -#define GL_OUTPUT_TEXTURE_COORD28_EXT 0x87B9 -#define GL_OUTPUT_TEXTURE_COORD29_EXT 0x87BA -#define GL_OUTPUT_TEXTURE_COORD30_EXT 0x87BB -#define GL_OUTPUT_TEXTURE_COORD31_EXT 0x87BC -#define GL_OUTPUT_FOG_EXT 0x87BD -#define GL_SCALAR_EXT 0x87BE -#define GL_VECTOR_EXT 0x87BF -#define GL_MATRIX_EXT 0x87C0 -#define GL_VARIANT_EXT 0x87C1 -#define GL_INVARIANT_EXT 0x87C2 -#define GL_LOCAL_CONSTANT_EXT 0x87C3 -#define GL_LOCAL_EXT 0x87C4 -#define GL_MAX_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87C5 -#define GL_MAX_VERTEX_SHADER_VARIANTS_EXT 0x87C6 -#define GL_MAX_VERTEX_SHADER_INVARIANTS_EXT 0x87C7 -#define GL_MAX_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87C8 -#define GL_MAX_VERTEX_SHADER_LOCALS_EXT 0x87C9 -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CA -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_VARIANTS_EXT 0x87CB -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87CC -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_INVARIANTS_EXT 0x87CD -#define GL_MAX_OPTIMIZED_VERTEX_SHADER_LOCALS_EXT 0x87CE -#define GL_VERTEX_SHADER_INSTRUCTIONS_EXT 0x87CF -#define GL_VERTEX_SHADER_VARIANTS_EXT 0x87D0 -#define GL_VERTEX_SHADER_INVARIANTS_EXT 0x87D1 -#define GL_VERTEX_SHADER_LOCAL_CONSTANTS_EXT 0x87D2 -#define GL_VERTEX_SHADER_LOCALS_EXT 0x87D3 -#define GL_VERTEX_SHADER_OPTIMIZED_EXT 0x87D4 -#define GL_X_EXT 0x87D5 -#define GL_Y_EXT 0x87D6 -#define GL_Z_EXT 0x87D7 -#define GL_W_EXT 0x87D8 -#define GL_NEGATIVE_X_EXT 0x87D9 -#define GL_NEGATIVE_Y_EXT 0x87DA -#define GL_NEGATIVE_Z_EXT 0x87DB -#define GL_NEGATIVE_W_EXT 0x87DC -#define GL_ZERO_EXT 0x87DD -#define GL_ONE_EXT 0x87DE -#define GL_NEGATIVE_ONE_EXT 0x87DF -#define GL_NORMALIZED_RANGE_EXT 0x87E0 -#define GL_FULL_RANGE_EXT 0x87E1 -#define GL_CURRENT_VERTEX_EXT 0x87E2 -#define GL_MVP_MATRIX_EXT 0x87E3 -#define GL_VARIANT_VALUE_EXT 0x87E4 -#define GL_VARIANT_DATATYPE_EXT 0x87E5 -#define GL_VARIANT_ARRAY_STRIDE_EXT 0x87E6 -#define GL_VARIANT_ARRAY_TYPE_EXT 0x87E7 -#define GL_VARIANT_ARRAY_EXT 0x87E8 -#define GL_VARIANT_ARRAY_POINTER_EXT 0x87E9 -#define GL_INVARIANT_VALUE_EXT 0x87EA -#define GL_INVARIANT_DATATYPE_EXT 0x87EB -#define GL_LOCAL_CONSTANT_VALUE_EXT 0x87EC -#define GL_LOCAL_CONSTANT_DATATYPE_EXT 0x87ED -#endif - -#ifndef GL_ATI_vertex_streams -#define GL_MAX_VERTEX_STREAMS_ATI 0x876B -#define GL_VERTEX_STREAM0_ATI 0x876C -#define GL_VERTEX_STREAM1_ATI 0x876D -#define GL_VERTEX_STREAM2_ATI 0x876E -#define GL_VERTEX_STREAM3_ATI 0x876F -#define GL_VERTEX_STREAM4_ATI 0x8770 -#define GL_VERTEX_STREAM5_ATI 0x8771 -#define GL_VERTEX_STREAM6_ATI 0x8772 -#define GL_VERTEX_STREAM7_ATI 0x8773 -#define GL_VERTEX_SOURCE_ATI 0x8774 -#endif - -#ifndef GL_ATI_element_array -#define GL_ELEMENT_ARRAY_ATI 0x8768 -#define GL_ELEMENT_ARRAY_TYPE_ATI 0x8769 -#define GL_ELEMENT_ARRAY_POINTER_ATI 0x876A -#endif - -#ifndef GL_SUN_mesh_array -#define GL_QUAD_MESH_SUN 0x8614 -#define GL_TRIANGLE_MESH_SUN 0x8615 -#endif - -#ifndef GL_SUN_slice_accum -#define GL_SLICE_ACCUM_SUN 0x85CC -#endif - -#ifndef GL_NV_multisample_filter_hint -#define GL_MULTISAMPLE_FILTER_HINT_NV 0x8534 -#endif - -#ifndef GL_NV_depth_clamp -#define GL_DEPTH_CLAMP_NV 0x864F -#endif - -#ifndef GL_NV_occlusion_query -#define GL_PIXEL_COUNTER_BITS_NV 0x8864 -#define GL_CURRENT_OCCLUSION_QUERY_ID_NV 0x8865 -#define GL_PIXEL_COUNT_NV 0x8866 -#define GL_PIXEL_COUNT_AVAILABLE_NV 0x8867 -#endif - -#ifndef GL_NV_point_sprite -#define GL_POINT_SPRITE_NV 0x8861 -#define GL_COORD_REPLACE_NV 0x8862 -#define GL_POINT_SPRITE_R_MODE_NV 0x8863 -#endif - -#ifndef GL_NV_texture_shader3 -#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_NV 0x8850 -#define GL_OFFSET_PROJECTIVE_TEXTURE_2D_SCALE_NV 0x8851 -#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8852 -#define GL_OFFSET_PROJECTIVE_TEXTURE_RECTANGLE_SCALE_NV 0x8853 -#define GL_OFFSET_HILO_TEXTURE_2D_NV 0x8854 -#define GL_OFFSET_HILO_TEXTURE_RECTANGLE_NV 0x8855 -#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_2D_NV 0x8856 -#define GL_OFFSET_HILO_PROJECTIVE_TEXTURE_RECTANGLE_NV 0x8857 -#define GL_DEPENDENT_HILO_TEXTURE_2D_NV 0x8858 -#define GL_DEPENDENT_RGB_TEXTURE_3D_NV 0x8859 -#define GL_DEPENDENT_RGB_TEXTURE_CUBE_MAP_NV 0x885A -#define GL_DOT_PRODUCT_PASS_THROUGH_NV 0x885B -#define GL_DOT_PRODUCT_TEXTURE_1D_NV 0x885C -#define GL_DOT_PRODUCT_AFFINE_DEPTH_REPLACE_NV 0x885D -#define GL_HILO8_NV 0x885E -#define GL_SIGNED_HILO8_NV 0x885F -#define GL_FORCE_BLUE_TO_ONE_NV 0x8860 -#endif - -#ifndef GL_NV_vertex_program1_1 -#endif - -#ifndef GL_EXT_shadow_funcs -#endif - -#ifndef GL_EXT_stencil_two_side -#define GL_STENCIL_TEST_TWO_SIDE_EXT 0x8910 -#define GL_ACTIVE_STENCIL_FACE_EXT 0x8911 -#endif - -#ifndef GL_ATI_text_fragment_shader -#define GL_TEXT_FRAGMENT_SHADER_ATI 0x8200 -#endif - -#ifndef GL_APPLE_client_storage -#define GL_UNPACK_CLIENT_STORAGE_APPLE 0x85B2 -#endif - -#ifndef GL_APPLE_element_array -#define GL_ELEMENT_ARRAY_APPLE 0x8768 -#define GL_ELEMENT_ARRAY_TYPE_APPLE 0x8769 -#define GL_ELEMENT_ARRAY_POINTER_APPLE 0x876A -#endif - -#ifndef GL_APPLE_fence -#define GL_DRAW_PIXELS_APPLE 0x8A0A -#define GL_FENCE_APPLE 0x8A0B -#endif - -#ifndef GL_APPLE_vertex_array_object -#define GL_VERTEX_ARRAY_BINDING_APPLE 0x85B5 -#endif - -#ifndef GL_APPLE_vertex_array_range -#define GL_VERTEX_ARRAY_RANGE_APPLE 0x851D -#define GL_VERTEX_ARRAY_RANGE_LENGTH_APPLE 0x851E -#define GL_VERTEX_ARRAY_STORAGE_HINT_APPLE 0x851F -#define GL_VERTEX_ARRAY_RANGE_POINTER_APPLE 0x8521 -#define GL_STORAGE_CACHED_APPLE 0x85BE -#define GL_STORAGE_SHARED_APPLE 0x85BF -#endif - -#ifndef GL_APPLE_ycbcr_422 -#define GL_YCBCR_422_APPLE 0x85B9 -#define GL_UNSIGNED_SHORT_8_8_APPLE 0x85BA -#define GL_UNSIGNED_SHORT_8_8_REV_APPLE 0x85BB -#endif - -#ifndef GL_S3_s3tc -#define GL_RGB_S3TC 0x83A0 -#define GL_RGB4_S3TC 0x83A1 -#define GL_RGBA_S3TC 0x83A2 -#define GL_RGBA4_S3TC 0x83A3 -#endif - -#ifndef GL_ATI_draw_buffers -#define GL_MAX_DRAW_BUFFERS_ATI 0x8824 -#define GL_DRAW_BUFFER0_ATI 0x8825 -#define GL_DRAW_BUFFER1_ATI 0x8826 -#define GL_DRAW_BUFFER2_ATI 0x8827 -#define GL_DRAW_BUFFER3_ATI 0x8828 -#define GL_DRAW_BUFFER4_ATI 0x8829 -#define GL_DRAW_BUFFER5_ATI 0x882A -#define GL_DRAW_BUFFER6_ATI 0x882B -#define GL_DRAW_BUFFER7_ATI 0x882C -#define GL_DRAW_BUFFER8_ATI 0x882D -#define GL_DRAW_BUFFER9_ATI 0x882E -#define GL_DRAW_BUFFER10_ATI 0x882F -#define GL_DRAW_BUFFER11_ATI 0x8830 -#define GL_DRAW_BUFFER12_ATI 0x8831 -#define GL_DRAW_BUFFER13_ATI 0x8832 -#define GL_DRAW_BUFFER14_ATI 0x8833 -#define GL_DRAW_BUFFER15_ATI 0x8834 -#endif - -#ifndef GL_ATI_pixel_format_float -#define GL_TYPE_RGBA_FLOAT_ATI 0x8820 -#define GL_COLOR_CLEAR_UNCLAMPED_VALUE_ATI 0x8835 -#endif - -#ifndef GL_ATI_texture_env_combine3 -#define GL_MODULATE_ADD_ATI 0x8744 -#define GL_MODULATE_SIGNED_ADD_ATI 0x8745 -#define GL_MODULATE_SUBTRACT_ATI 0x8746 -#endif - -#ifndef GL_ATI_texture_float -#define GL_RGBA_FLOAT32_ATI 0x8814 -#define GL_RGB_FLOAT32_ATI 0x8815 -#define GL_ALPHA_FLOAT32_ATI 0x8816 -#define GL_INTENSITY_FLOAT32_ATI 0x8817 -#define GL_LUMINANCE_FLOAT32_ATI 0x8818 -#define GL_LUMINANCE_ALPHA_FLOAT32_ATI 0x8819 -#define GL_RGBA_FLOAT16_ATI 0x881A -#define GL_RGB_FLOAT16_ATI 0x881B -#define GL_ALPHA_FLOAT16_ATI 0x881C -#define GL_INTENSITY_FLOAT16_ATI 0x881D -#define GL_LUMINANCE_FLOAT16_ATI 0x881E -#define GL_LUMINANCE_ALPHA_FLOAT16_ATI 0x881F -#endif - -#ifndef GL_NV_float_buffer -#define GL_FLOAT_R_NV 0x8880 -#define GL_FLOAT_RG_NV 0x8881 -#define GL_FLOAT_RGB_NV 0x8882 -#define GL_FLOAT_RGBA_NV 0x8883 -#define GL_FLOAT_R16_NV 0x8884 -#define GL_FLOAT_R32_NV 0x8885 -#define GL_FLOAT_RG16_NV 0x8886 -#define GL_FLOAT_RG32_NV 0x8887 -#define GL_FLOAT_RGB16_NV 0x8888 -#define GL_FLOAT_RGB32_NV 0x8889 -#define GL_FLOAT_RGBA16_NV 0x888A -#define GL_FLOAT_RGBA32_NV 0x888B -#define GL_TEXTURE_FLOAT_COMPONENTS_NV 0x888C -#define GL_FLOAT_CLEAR_COLOR_VALUE_NV 0x888D -#define GL_FLOAT_RGBA_MODE_NV 0x888E -#endif - -#ifndef GL_NV_fragment_program -#define GL_MAX_FRAGMENT_PROGRAM_LOCAL_PARAMETERS_NV 0x8868 -#define GL_FRAGMENT_PROGRAM_NV 0x8870 -#define GL_MAX_TEXTURE_COORDS_NV 0x8871 -#define GL_MAX_TEXTURE_IMAGE_UNITS_NV 0x8872 -#define GL_FRAGMENT_PROGRAM_BINDING_NV 0x8873 -#define GL_PROGRAM_ERROR_STRING_NV 0x8874 -#endif - -#ifndef GL_NV_half_float -#define GL_HALF_FLOAT_NV 0x140B -#endif - -#ifndef GL_NV_pixel_data_range -#define GL_WRITE_PIXEL_DATA_RANGE_NV 0x8878 -#define GL_READ_PIXEL_DATA_RANGE_NV 0x8879 -#define GL_WRITE_PIXEL_DATA_RANGE_LENGTH_NV 0x887A -#define GL_READ_PIXEL_DATA_RANGE_LENGTH_NV 0x887B -#define GL_WRITE_PIXEL_DATA_RANGE_POINTER_NV 0x887C -#define GL_READ_PIXEL_DATA_RANGE_POINTER_NV 0x887D -#endif - -#ifndef GL_NV_primitive_restart -#define GL_PRIMITIVE_RESTART_NV 0x8558 -#define GL_PRIMITIVE_RESTART_INDEX_NV 0x8559 -#endif - -#ifndef GL_NV_texture_expand_normal -#define GL_TEXTURE_UNSIGNED_REMAP_MODE_NV 0x888F -#endif - -#ifndef GL_NV_vertex_program2 -#endif - -#ifndef GL_ATI_map_object_buffer -#endif - -#ifndef GL_ATI_separate_stencil -#define GL_STENCIL_BACK_FUNC_ATI 0x8800 -#define GL_STENCIL_BACK_FAIL_ATI 0x8801 -#define GL_STENCIL_BACK_PASS_DEPTH_FAIL_ATI 0x8802 -#define GL_STENCIL_BACK_PASS_DEPTH_PASS_ATI 0x8803 -#endif - -#ifndef GL_ATI_vertex_attrib_array_object -#endif - -#ifndef GL_OES_read_format -#define GL_IMPLEMENTATION_COLOR_READ_TYPE_OES 0x8B9A -#define GL_IMPLEMENTATION_COLOR_READ_FORMAT_OES 0x8B9B -#endif - -#ifndef GL_EXT_depth_bounds_test -#define GL_DEPTH_BOUNDS_TEST_EXT 0x8890 -#define GL_DEPTH_BOUNDS_EXT 0x8891 -#endif - -#ifndef GL_EXT_texture_mirror_clamp -#define GL_MIRROR_CLAMP_EXT 0x8742 -#define GL_MIRROR_CLAMP_TO_EDGE_EXT 0x8743 -#define GL_MIRROR_CLAMP_TO_BORDER_EXT 0x8912 -#endif - -#ifndef GL_EXT_blend_equation_separate -#define GL_BLEND_EQUATION_RGB_EXT GL_BLEND_EQUATION -#define GL_BLEND_EQUATION_ALPHA_EXT 0x883D -#endif - -#ifndef GL_MESA_pack_invert -#define GL_PACK_INVERT_MESA 0x8758 -#endif - -#ifndef GL_MESA_ycbcr_texture -#define GL_UNSIGNED_SHORT_8_8_MESA 0x85BA -#define GL_UNSIGNED_SHORT_8_8_REV_MESA 0x85BB -#define GL_YCBCR_MESA 0x8757 -#endif - -#ifndef GL_EXT_pixel_buffer_object -#define GL_PIXEL_PACK_BUFFER_EXT 0x88EB -#define GL_PIXEL_UNPACK_BUFFER_EXT 0x88EC -#define GL_PIXEL_PACK_BUFFER_BINDING_EXT 0x88ED -#define GL_PIXEL_UNPACK_BUFFER_BINDING_EXT 0x88EF -#endif - -#ifndef GL_NV_fragment_program_option -#endif - -#ifndef GL_NV_fragment_program2 -#define GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV 0x88F4 -#define GL_MAX_PROGRAM_CALL_DEPTH_NV 0x88F5 -#define GL_MAX_PROGRAM_IF_DEPTH_NV 0x88F6 -#define GL_MAX_PROGRAM_LOOP_DEPTH_NV 0x88F7 -#define GL_MAX_PROGRAM_LOOP_COUNT_NV 0x88F8 -#endif - -#ifndef GL_NV_vertex_program2_option -/* reuse GL_MAX_PROGRAM_EXEC_INSTRUCTIONS_NV */ -/* reuse GL_MAX_PROGRAM_CALL_DEPTH_NV */ -#endif - -#ifndef GL_NV_vertex_program3 -/* reuse GL_MAX_VERTEX_TEXTURE_IMAGE_UNITS_ARB */ -#endif - -#ifndef GL_EXT_framebuffer_object -#define GL_INVALID_FRAMEBUFFER_OPERATION_EXT 0x0506 -#define GL_MAX_RENDERBUFFER_SIZE_EXT 0x84E8 -#define GL_FRAMEBUFFER_BINDING_EXT 0x8CA6 -#define GL_RENDERBUFFER_BINDING_EXT 0x8CA7 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_TYPE_EXT 0x8CD0 -#define GL_FRAMEBUFFER_ATTACHMENT_OBJECT_NAME_EXT 0x8CD1 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LEVEL_EXT 0x8CD2 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_CUBE_MAP_FACE_EXT 0x8CD3 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_3D_ZOFFSET_EXT 0x8CD4 -#define GL_FRAMEBUFFER_COMPLETE_EXT 0x8CD5 -#define GL_FRAMEBUFFER_INCOMPLETE_ATTACHMENT_EXT 0x8CD6 -#define GL_FRAMEBUFFER_INCOMPLETE_MISSING_ATTACHMENT_EXT 0x8CD7 -#define GL_FRAMEBUFFER_INCOMPLETE_DIMENSIONS_EXT 0x8CD9 -#define GL_FRAMEBUFFER_INCOMPLETE_FORMATS_EXT 0x8CDA -#define GL_FRAMEBUFFER_INCOMPLETE_DRAW_BUFFER_EXT 0x8CDB -#define GL_FRAMEBUFFER_INCOMPLETE_READ_BUFFER_EXT 0x8CDC -#define GL_FRAMEBUFFER_UNSUPPORTED_EXT 0x8CDD -#define GL_MAX_COLOR_ATTACHMENTS_EXT 0x8CDF -#define GL_COLOR_ATTACHMENT0_EXT 0x8CE0 -#define GL_COLOR_ATTACHMENT1_EXT 0x8CE1 -#define GL_COLOR_ATTACHMENT2_EXT 0x8CE2 -#define GL_COLOR_ATTACHMENT3_EXT 0x8CE3 -#define GL_COLOR_ATTACHMENT4_EXT 0x8CE4 -#define GL_COLOR_ATTACHMENT5_EXT 0x8CE5 -#define GL_COLOR_ATTACHMENT6_EXT 0x8CE6 -#define GL_COLOR_ATTACHMENT7_EXT 0x8CE7 -#define GL_COLOR_ATTACHMENT8_EXT 0x8CE8 -#define GL_COLOR_ATTACHMENT9_EXT 0x8CE9 -#define GL_COLOR_ATTACHMENT10_EXT 0x8CEA -#define GL_COLOR_ATTACHMENT11_EXT 0x8CEB -#define GL_COLOR_ATTACHMENT12_EXT 0x8CEC -#define GL_COLOR_ATTACHMENT13_EXT 0x8CED -#define GL_COLOR_ATTACHMENT14_EXT 0x8CEE -#define GL_COLOR_ATTACHMENT15_EXT 0x8CEF -#define GL_DEPTH_ATTACHMENT_EXT 0x8D00 -#define GL_STENCIL_ATTACHMENT_EXT 0x8D20 -#define GL_FRAMEBUFFER_EXT 0x8D40 -#define GL_RENDERBUFFER_EXT 0x8D41 -#define GL_RENDERBUFFER_WIDTH_EXT 0x8D42 -#define GL_RENDERBUFFER_HEIGHT_EXT 0x8D43 -#define GL_RENDERBUFFER_INTERNAL_FORMAT_EXT 0x8D44 -#define GL_STENCIL_INDEX1_EXT 0x8D46 -#define GL_STENCIL_INDEX4_EXT 0x8D47 -#define GL_STENCIL_INDEX8_EXT 0x8D48 -#define GL_STENCIL_INDEX16_EXT 0x8D49 -#define GL_RENDERBUFFER_RED_SIZE_EXT 0x8D50 -#define GL_RENDERBUFFER_GREEN_SIZE_EXT 0x8D51 -#define GL_RENDERBUFFER_BLUE_SIZE_EXT 0x8D52 -#define GL_RENDERBUFFER_ALPHA_SIZE_EXT 0x8D53 -#define GL_RENDERBUFFER_DEPTH_SIZE_EXT 0x8D54 -#define GL_RENDERBUFFER_STENCIL_SIZE_EXT 0x8D55 -#endif - -#ifndef GL_GREMEDY_string_marker -#endif - -#ifndef GL_EXT_packed_depth_stencil -#define GL_DEPTH_STENCIL_EXT 0x84F9 -#define GL_UNSIGNED_INT_24_8_EXT 0x84FA -#define GL_DEPTH24_STENCIL8_EXT 0x88F0 -#define GL_TEXTURE_STENCIL_SIZE_EXT 0x88F1 -#endif - -#ifndef GL_EXT_stencil_clear_tag -#define GL_STENCIL_TAG_BITS_EXT 0x88F2 -#define GL_STENCIL_CLEAR_TAG_VALUE_EXT 0x88F3 -#endif - -#ifndef GL_EXT_texture_sRGB -#define GL_SRGB_EXT 0x8C40 -#define GL_SRGB8_EXT 0x8C41 -#define GL_SRGB_ALPHA_EXT 0x8C42 -#define GL_SRGB8_ALPHA8_EXT 0x8C43 -#define GL_SLUMINANCE_ALPHA_EXT 0x8C44 -#define GL_SLUMINANCE8_ALPHA8_EXT 0x8C45 -#define GL_SLUMINANCE_EXT 0x8C46 -#define GL_SLUMINANCE8_EXT 0x8C47 -#define GL_COMPRESSED_SRGB_EXT 0x8C48 -#define GL_COMPRESSED_SRGB_ALPHA_EXT 0x8C49 -#define GL_COMPRESSED_SLUMINANCE_EXT 0x8C4A -#define GL_COMPRESSED_SLUMINANCE_ALPHA_EXT 0x8C4B -#define GL_COMPRESSED_SRGB_S3TC_DXT1_EXT 0x8C4C -#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT1_EXT 0x8C4D -#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT3_EXT 0x8C4E -#define GL_COMPRESSED_SRGB_ALPHA_S3TC_DXT5_EXT 0x8C4F -#endif - -#ifndef GL_EXT_framebuffer_blit -#define GL_READ_FRAMEBUFFER_EXT 0x8CA8 -#define GL_DRAW_FRAMEBUFFER_EXT 0x8CA9 -#define GL_READ_FRAMEBUFFER_BINDING_EXT GL_FRAMEBUFFER_BINDING_EXT -#define GL_DRAW_FRAMEBUFFER_BINDING_EXT 0x8CAA -#endif - -#ifndef GL_EXT_framebuffer_multisample -#define GL_RENDERBUFFER_SAMPLES_EXT 0x8CAB -#define GL_FRAMEBUFFER_INCOMPLETE_MULTISAMPLE_EXT 0x8D56 -#define GL_MAX_SAMPLES_EXT 0x8D57 -#endif - -#ifndef GL_MESAX_texture_stack -#define GL_TEXTURE_1D_STACK_MESAX 0x8759 -#define GL_TEXTURE_2D_STACK_MESAX 0x875A -#define GL_PROXY_TEXTURE_1D_STACK_MESAX 0x875B -#define GL_PROXY_TEXTURE_2D_STACK_MESAX 0x875C -#define GL_TEXTURE_1D_STACK_BINDING_MESAX 0x875D -#define GL_TEXTURE_2D_STACK_BINDING_MESAX 0x875E -#endif - -#ifndef GL_EXT_timer_query -#define GL_TIME_ELAPSED_EXT 0x88BF -#endif - -#ifndef GL_EXT_gpu_program_parameters -#endif - -#ifndef GL_APPLE_flush_buffer_range -#define GL_BUFFER_SERIALIZED_MODIFY_APPLE 0x8A12 -#define GL_BUFFER_FLUSHING_UNMAP_APPLE 0x8A13 -#endif - -#ifndef GL_NV_gpu_program4 -#define GL_MIN_PROGRAM_TEXEL_OFFSET_NV 0x8904 -#define GL_MAX_PROGRAM_TEXEL_OFFSET_NV 0x8905 -#define GL_PROGRAM_ATTRIB_COMPONENTS_NV 0x8906 -#define GL_PROGRAM_RESULT_COMPONENTS_NV 0x8907 -#define GL_MAX_PROGRAM_ATTRIB_COMPONENTS_NV 0x8908 -#define GL_MAX_PROGRAM_RESULT_COMPONENTS_NV 0x8909 -#define GL_MAX_PROGRAM_GENERIC_ATTRIBS_NV 0x8DA5 -#define GL_MAX_PROGRAM_GENERIC_RESULTS_NV 0x8DA6 -#endif - -#ifndef GL_NV_geometry_program4 -#define GL_LINES_ADJACENCY_EXT 0x000A -#define GL_LINE_STRIP_ADJACENCY_EXT 0x000B -#define GL_TRIANGLES_ADJACENCY_EXT 0x000C -#define GL_TRIANGLE_STRIP_ADJACENCY_EXT 0x000D -#define GL_GEOMETRY_PROGRAM_NV 0x8C26 -#define GL_MAX_PROGRAM_OUTPUT_VERTICES_NV 0x8C27 -#define GL_MAX_PROGRAM_TOTAL_OUTPUT_COMPONENTS_NV 0x8C28 -#define GL_GEOMETRY_VERTICES_OUT_EXT 0x8DDA -#define GL_GEOMETRY_INPUT_TYPE_EXT 0x8DDB -#define GL_GEOMETRY_OUTPUT_TYPE_EXT 0x8DDC -#define GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT 0x8C29 -#define GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT 0x8DA7 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT 0x8DA8 -#define GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT 0x8DA9 -#define GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT 0x8CD4 -#define GL_PROGRAM_POINT_SIZE_EXT 0x8642 -#endif - -#ifndef GL_EXT_geometry_shader4 -#define GL_GEOMETRY_SHADER_EXT 0x8DD9 -/* reuse GL_GEOMETRY_VERTICES_OUT_EXT */ -/* reuse GL_GEOMETRY_INPUT_TYPE_EXT */ -/* reuse GL_GEOMETRY_OUTPUT_TYPE_EXT */ -/* reuse GL_MAX_GEOMETRY_TEXTURE_IMAGE_UNITS_EXT */ -#define GL_MAX_GEOMETRY_VARYING_COMPONENTS_EXT 0x8DDD -#define GL_MAX_VERTEX_VARYING_COMPONENTS_EXT 0x8DDE -#define GL_MAX_VARYING_COMPONENTS_EXT 0x8B4B -#define GL_MAX_GEOMETRY_UNIFORM_COMPONENTS_EXT 0x8DDF -#define GL_MAX_GEOMETRY_OUTPUT_VERTICES_EXT 0x8DE0 -#define GL_MAX_GEOMETRY_TOTAL_OUTPUT_COMPONENTS_EXT 0x8DE1 -/* reuse GL_LINES_ADJACENCY_EXT */ -/* reuse GL_LINE_STRIP_ADJACENCY_EXT */ -/* reuse GL_TRIANGLES_ADJACENCY_EXT */ -/* reuse GL_TRIANGLE_STRIP_ADJACENCY_EXT */ -/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_TARGETS_EXT */ -/* reuse GL_FRAMEBUFFER_INCOMPLETE_LAYER_COUNT_EXT */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_LAYERED_EXT */ -/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */ -/* reuse GL_PROGRAM_POINT_SIZE_EXT */ -#endif - -#ifndef GL_NV_vertex_program4 -#define GL_VERTEX_ATTRIB_ARRAY_INTEGER_NV 0x88FD -#endif - -#ifndef GL_EXT_gpu_shader4 -#define GL_SAMPLER_1D_ARRAY_EXT 0x8DC0 -#define GL_SAMPLER_2D_ARRAY_EXT 0x8DC1 -#define GL_SAMPLER_BUFFER_EXT 0x8DC2 -#define GL_SAMPLER_1D_ARRAY_SHADOW_EXT 0x8DC3 -#define GL_SAMPLER_2D_ARRAY_SHADOW_EXT 0x8DC4 -#define GL_SAMPLER_CUBE_SHADOW_EXT 0x8DC5 -#define GL_UNSIGNED_INT_VEC2_EXT 0x8DC6 -#define GL_UNSIGNED_INT_VEC3_EXT 0x8DC7 -#define GL_UNSIGNED_INT_VEC4_EXT 0x8DC8 -#define GL_INT_SAMPLER_1D_EXT 0x8DC9 -#define GL_INT_SAMPLER_2D_EXT 0x8DCA -#define GL_INT_SAMPLER_3D_EXT 0x8DCB -#define GL_INT_SAMPLER_CUBE_EXT 0x8DCC -#define GL_INT_SAMPLER_2D_RECT_EXT 0x8DCD -#define GL_INT_SAMPLER_1D_ARRAY_EXT 0x8DCE -#define GL_INT_SAMPLER_2D_ARRAY_EXT 0x8DCF -#define GL_INT_SAMPLER_BUFFER_EXT 0x8DD0 -#define GL_UNSIGNED_INT_SAMPLER_1D_EXT 0x8DD1 -#define GL_UNSIGNED_INT_SAMPLER_2D_EXT 0x8DD2 -#define GL_UNSIGNED_INT_SAMPLER_3D_EXT 0x8DD3 -#define GL_UNSIGNED_INT_SAMPLER_CUBE_EXT 0x8DD4 -#define GL_UNSIGNED_INT_SAMPLER_2D_RECT_EXT 0x8DD5 -#define GL_UNSIGNED_INT_SAMPLER_1D_ARRAY_EXT 0x8DD6 -#define GL_UNSIGNED_INT_SAMPLER_2D_ARRAY_EXT 0x8DD7 -#define GL_UNSIGNED_INT_SAMPLER_BUFFER_EXT 0x8DD8 -#endif - -#ifndef GL_EXT_draw_instanced -#endif - -#ifndef GL_EXT_packed_float -#define GL_R11F_G11F_B10F_EXT 0x8C3A -#define GL_UNSIGNED_INT_10F_11F_11F_REV_EXT 0x8C3B -#define GL_RGBA_SIGNED_COMPONENTS_EXT 0x8C3C -#endif - -#ifndef GL_EXT_texture_array -#define GL_TEXTURE_1D_ARRAY_EXT 0x8C18 -#define GL_PROXY_TEXTURE_1D_ARRAY_EXT 0x8C19 -#define GL_TEXTURE_2D_ARRAY_EXT 0x8C1A -#define GL_PROXY_TEXTURE_2D_ARRAY_EXT 0x8C1B -#define GL_TEXTURE_BINDING_1D_ARRAY_EXT 0x8C1C -#define GL_TEXTURE_BINDING_2D_ARRAY_EXT 0x8C1D -#define GL_MAX_ARRAY_TEXTURE_LAYERS_EXT 0x88FF -#define GL_COMPARE_REF_DEPTH_TO_TEXTURE_EXT 0x884E -/* reuse GL_FRAMEBUFFER_ATTACHMENT_TEXTURE_LAYER_EXT */ -#endif - -#ifndef GL_EXT_texture_buffer_object -#define GL_TEXTURE_BUFFER_EXT 0x8C2A -#define GL_MAX_TEXTURE_BUFFER_SIZE_EXT 0x8C2B -#define GL_TEXTURE_BINDING_BUFFER_EXT 0x8C2C -#define GL_TEXTURE_BUFFER_DATA_STORE_BINDING_EXT 0x8C2D -#define GL_TEXTURE_BUFFER_FORMAT_EXT 0x8C2E -#endif - -#ifndef GL_EXT_texture_compression_latc -#define GL_COMPRESSED_LUMINANCE_LATC1_EXT 0x8C70 -#define GL_COMPRESSED_SIGNED_LUMINANCE_LATC1_EXT 0x8C71 -#define GL_COMPRESSED_LUMINANCE_ALPHA_LATC2_EXT 0x8C72 -#define GL_COMPRESSED_SIGNED_LUMINANCE_ALPHA_LATC2_EXT 0x8C73 -#endif - -#ifndef GL_EXT_texture_compression_rgtc -#define GL_COMPRESSED_RED_RGTC1_EXT 0x8DBB -#define GL_COMPRESSED_SIGNED_RED_RGTC1_EXT 0x8DBC -#define GL_COMPRESSED_RED_GREEN_RGTC2_EXT 0x8DBD -#define GL_COMPRESSED_SIGNED_RED_GREEN_RGTC2_EXT 0x8DBE -#endif - -#ifndef GL_EXT_texture_shared_exponent -#define GL_RGB9_E5_EXT 0x8C3D -#define GL_UNSIGNED_INT_5_9_9_9_REV_EXT 0x8C3E -#define GL_TEXTURE_SHARED_SIZE_EXT 0x8C3F -#endif - -#ifndef GL_NV_depth_buffer_float -#define GL_DEPTH_COMPONENT32F_NV 0x8DAB -#define GL_DEPTH32F_STENCIL8_NV 0x8DAC -#define GL_FLOAT_32_UNSIGNED_INT_24_8_REV_NV 0x8DAD -#define GL_DEPTH_BUFFER_FLOAT_MODE_NV 0x8DAF -#endif - -#ifndef GL_NV_fragment_program4 -#endif - -#ifndef GL_NV_framebuffer_multisample_coverage -#define GL_RENDERBUFFER_COVERAGE_SAMPLES_NV 0x8CAB -#define GL_RENDERBUFFER_COLOR_SAMPLES_NV 0x8E10 -#define GL_MAX_MULTISAMPLE_COVERAGE_MODES_NV 0x8E11 -#define GL_MULTISAMPLE_COVERAGE_MODES_NV 0x8E12 -#endif - -#ifndef GL_EXT_framebuffer_sRGB -#define GL_FRAMEBUFFER_SRGB_EXT 0x8DB9 -#define GL_FRAMEBUFFER_SRGB_CAPABLE_EXT 0x8DBA -#endif - -#ifndef GL_NV_geometry_shader4 -#endif - -#ifndef GL_NV_parameter_buffer_object -#define GL_MAX_PROGRAM_PARAMETER_BUFFER_BINDINGS_NV 0x8DA0 -#define GL_MAX_PROGRAM_PARAMETER_BUFFER_SIZE_NV 0x8DA1 -#define GL_VERTEX_PROGRAM_PARAMETER_BUFFER_NV 0x8DA2 -#define GL_GEOMETRY_PROGRAM_PARAMETER_BUFFER_NV 0x8DA3 -#define GL_FRAGMENT_PROGRAM_PARAMETER_BUFFER_NV 0x8DA4 -#endif - -#ifndef GL_EXT_draw_buffers2 -#endif - -#ifndef GL_NV_transform_feedback -#define GL_BACK_PRIMARY_COLOR_NV 0x8C77 -#define GL_BACK_SECONDARY_COLOR_NV 0x8C78 -#define GL_TEXTURE_COORD_NV 0x8C79 -#define GL_CLIP_DISTANCE_NV 0x8C7A -#define GL_VERTEX_ID_NV 0x8C7B -#define GL_PRIMITIVE_ID_NV 0x8C7C -#define GL_GENERIC_ATTRIB_NV 0x8C7D -#define GL_TRANSFORM_FEEDBACK_ATTRIBS_NV 0x8C7E -#define GL_TRANSFORM_FEEDBACK_BUFFER_MODE_NV 0x8C7F -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_COMPONENTS_NV 0x8C80 -#define GL_ACTIVE_VARYINGS_NV 0x8C81 -#define GL_ACTIVE_VARYING_MAX_LENGTH_NV 0x8C82 -#define GL_TRANSFORM_FEEDBACK_VARYINGS_NV 0x8C83 -#define GL_TRANSFORM_FEEDBACK_BUFFER_START_NV 0x8C84 -#define GL_TRANSFORM_FEEDBACK_BUFFER_SIZE_NV 0x8C85 -#define GL_TRANSFORM_FEEDBACK_RECORD_NV 0x8C86 -#define GL_PRIMITIVES_GENERATED_NV 0x8C87 -#define GL_TRANSFORM_FEEDBACK_PRIMITIVES_WRITTEN_NV 0x8C88 -#define GL_RASTERIZER_DISCARD_NV 0x8C89 -#define GL_MAX_TRANSFORM_FEEDBACK_INTERLEAVED_ATTRIBS_NV 0x8C8A -#define GL_MAX_TRANSFORM_FEEDBACK_SEPARATE_ATTRIBS_NV 0x8C8B -#define GL_INTERLEAVED_ATTRIBS_NV 0x8C8C -#define GL_SEPARATE_ATTRIBS_NV 0x8C8D -#define GL_TRANSFORM_FEEDBACK_BUFFER_NV 0x8C8E -#define GL_TRANSFORM_FEEDBACK_BUFFER_BINDING_NV 0x8C8F -#endif - -#ifndef GL_EXT_bindable_uniform -#define GL_MAX_VERTEX_BINDABLE_UNIFORMS_EXT 0x8DE2 -#define GL_MAX_FRAGMENT_BINDABLE_UNIFORMS_EXT 0x8DE3 -#define GL_MAX_GEOMETRY_BINDABLE_UNIFORMS_EXT 0x8DE4 -#define GL_MAX_BINDABLE_UNIFORM_SIZE_EXT 0x8DED -#define GL_UNIFORM_BUFFER_EXT 0x8DEE -#define GL_UNIFORM_BUFFER_BINDING_EXT 0x8DEF -#endif - -#ifndef GL_EXT_texture_integer -#define GL_RGBA32UI_EXT 0x8D70 -#define GL_RGB32UI_EXT 0x8D71 -#define GL_ALPHA32UI_EXT 0x8D72 -#define GL_INTENSITY32UI_EXT 0x8D73 -#define GL_LUMINANCE32UI_EXT 0x8D74 -#define GL_LUMINANCE_ALPHA32UI_EXT 0x8D75 -#define GL_RGBA16UI_EXT 0x8D76 -#define GL_RGB16UI_EXT 0x8D77 -#define GL_ALPHA16UI_EXT 0x8D78 -#define GL_INTENSITY16UI_EXT 0x8D79 -#define GL_LUMINANCE16UI_EXT 0x8D7A -#define GL_LUMINANCE_ALPHA16UI_EXT 0x8D7B -#define GL_RGBA8UI_EXT 0x8D7C -#define GL_RGB8UI_EXT 0x8D7D -#define GL_ALPHA8UI_EXT 0x8D7E -#define GL_INTENSITY8UI_EXT 0x8D7F -#define GL_LUMINANCE8UI_EXT 0x8D80 -#define GL_LUMINANCE_ALPHA8UI_EXT 0x8D81 -#define GL_RGBA32I_EXT 0x8D82 -#define GL_RGB32I_EXT 0x8D83 -#define GL_ALPHA32I_EXT 0x8D84 -#define GL_INTENSITY32I_EXT 0x8D85 -#define GL_LUMINANCE32I_EXT 0x8D86 -#define GL_LUMINANCE_ALPHA32I_EXT 0x8D87 -#define GL_RGBA16I_EXT 0x8D88 -#define GL_RGB16I_EXT 0x8D89 -#define GL_ALPHA16I_EXT 0x8D8A -#define GL_INTENSITY16I_EXT 0x8D8B -#define GL_LUMINANCE16I_EXT 0x8D8C -#define GL_LUMINANCE_ALPHA16I_EXT 0x8D8D -#define GL_RGBA8I_EXT 0x8D8E -#define GL_RGB8I_EXT 0x8D8F -#define GL_ALPHA8I_EXT 0x8D90 -#define GL_INTENSITY8I_EXT 0x8D91 -#define GL_LUMINANCE8I_EXT 0x8D92 -#define GL_LUMINANCE_ALPHA8I_EXT 0x8D93 -#define GL_RED_INTEGER_EXT 0x8D94 -#define GL_GREEN_INTEGER_EXT 0x8D95 -#define GL_BLUE_INTEGER_EXT 0x8D96 -#define GL_ALPHA_INTEGER_EXT 0x8D97 -#define GL_RGB_INTEGER_EXT 0x8D98 -#define GL_RGBA_INTEGER_EXT 0x8D99 -#define GL_BGR_INTEGER_EXT 0x8D9A -#define GL_BGRA_INTEGER_EXT 0x8D9B -#define GL_LUMINANCE_INTEGER_EXT 0x8D9C -#define GL_LUMINANCE_ALPHA_INTEGER_EXT 0x8D9D -#define GL_RGBA_INTEGER_MODE_EXT 0x8D9E -#endif - -/*************************************************************/ - -#include -#ifndef GL_VERSION_2_0 -/* GL type for program/shader text */ -typedef char GLchar; /* native character */ -#endif - -#ifndef GL_VERSION_1_5 -/* GL types for handling large vertex buffer objects */ -typedef ptrdiff_t GLintptr; -typedef ptrdiff_t GLsizeiptr; -#endif - -#ifndef GL_ARB_vertex_buffer_object -/* GL types for handling large vertex buffer objects */ -typedef ptrdiff_t GLintptrARB; -typedef ptrdiff_t GLsizeiptrARB; -#endif - -#ifndef GL_ARB_shader_objects -/* GL types for handling shader object handles and program/shader text */ -typedef char GLcharARB; /* native character */ -typedef unsigned int GLhandleARB; /* shader object handle */ -#endif - -/* GL types for "half" precision (s10e5) float data in host memory */ -#ifndef GL_ARB_half_float_pixel -typedef unsigned short GLhalfARB; -#endif - -#ifndef GL_NV_half_float -typedef unsigned short GLhalfNV; -#endif - -#ifndef GLEXT_64_TYPES_DEFINED -/* This code block is duplicated in glext.h, so must be protected */ -#define GLEXT_64_TYPES_DEFINED -/* Define int32_t, int64_t, and uint64_t types for UST/MSC */ -/* (as used in the GL_EXT_timer_query extension). */ -#if defined(__STDC_VERSION__) && __STDC_VERSION__ >= 199901L -#include -#elif defined(__sun__) -#include -#if defined(__STDC__) -#if defined(__arch64__) -typedef long int int64_t; -typedef unsigned long int uint64_t; -#else -typedef long long int int64_t; -typedef unsigned long long int uint64_t; -#endif /* __arch64__ */ -#endif /* __STDC__ */ -#elif defined(__VMS) -#include -#elif defined(__SCO__) || defined(__USLC__) -#include -#elif defined(__UNIXOS2__) || defined(__SOL64__) -typedef long int int32_t; -typedef long long int int64_t; -typedef unsigned long long int uint64_t; -#elif defined(_WIN32) && defined(__GNUC__) -#include -#elif defined(_WIN32) -typedef __int32 int32_t; -typedef __int64 int64_t; -typedef unsigned __int64 uint64_t; -#else -#include /* Fallback option */ -#endif -#endif - -#ifndef GL_EXT_timer_query -typedef int64_t GLint64EXT; -typedef uint64_t GLuint64EXT; -#endif - -#ifndef GL_VERSION_1_2 -#define GL_VERSION_1_2 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendColor(GLclampf, GLclampf, GLclampf, GLclampf); -GLAPI void APIENTRY glBlendEquation(GLenum); -GLAPI void APIENTRY glDrawRangeElements(GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *); -GLAPI void APIENTRY glColorTable(GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glColorTableParameterfv(GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glColorTableParameteriv(GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glCopyColorTable(GLenum, GLenum, GLint, GLint, GLsizei); -GLAPI void APIENTRY glGetColorTable(GLenum, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetColorTableParameterfv(GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetColorTableParameteriv(GLenum, GLenum, GLint *); -GLAPI void APIENTRY glColorSubTable(GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glCopyColorSubTable(GLenum, GLsizei, GLint, GLint, GLsizei); -GLAPI void APIENTRY glConvolutionFilter1D(GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glConvolutionFilter2D(GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glConvolutionParameterf(GLenum, GLenum, GLfloat); -GLAPI void APIENTRY glConvolutionParameterfv(GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glConvolutionParameteri(GLenum, GLenum, GLint); -GLAPI void APIENTRY glConvolutionParameteriv(GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glCopyConvolutionFilter1D(GLenum, GLenum, GLint, GLint, GLsizei); -GLAPI void APIENTRY glCopyConvolutionFilter2D(GLenum, GLenum, GLint, GLint, GLsizei, GLsizei); -GLAPI void APIENTRY glGetConvolutionFilter(GLenum, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetConvolutionParameterfv(GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetConvolutionParameteriv(GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetSeparableFilter(GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *); -GLAPI void APIENTRY glSeparableFilter2D(GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *); -GLAPI void APIENTRY glGetHistogram(GLenum, GLboolean, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetHistogramParameterfv(GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetHistogramParameteriv(GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetMinmax(GLenum, GLboolean, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetMinmaxParameterfv(GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetMinmaxParameteriv(GLenum, GLenum, GLint *); -GLAPI void APIENTRY glHistogram(GLenum, GLsizei, GLenum, GLboolean); -GLAPI void APIENTRY glMinmax(GLenum, GLenum, GLboolean); -GLAPI void APIENTRY glResetHistogram(GLenum); -GLAPI void APIENTRY glResetMinmax(GLenum); -GLAPI void APIENTRY glTexImage3D(GLenum, GLint, GLint, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glTexSubImage3D(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glCopyTexSubImage3D(GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLBLENDCOLORPROC)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -typedef void(APIENTRYP PFNGLBLENDEQUATIONPROC)(GLenum mode); -typedef void(APIENTRYP PFNGLDRAWRANGEELEMENTSPROC)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); -typedef void(APIENTRYP PFNGLCOLORTABLEPROC)(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -typedef void(APIENTRYP PFNGLCOLORTABLEPARAMETERFVPROC)(GLenum target, GLenum pname, const GLfloat *params); -typedef void(APIENTRYP PFNGLCOLORTABLEPARAMETERIVPROC)(GLenum target, GLenum pname, const GLint *params); -typedef void(APIENTRYP PFNGLCOPYCOLORTABLEPROC)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void(APIENTRYP PFNGLGETCOLORTABLEPROC)(GLenum target, GLenum format, GLenum type, GLvoid *table); -typedef void(APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVPROC)(GLenum target, GLenum pname, GLfloat *params); -typedef void(APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVPROC)(GLenum target, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLCOLORSUBTABLEPROC)(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data); -typedef void(APIENTRYP PFNGLCOPYCOLORSUBTABLEPROC)(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); -typedef void(APIENTRYP PFNGLCONVOLUTIONFILTER1DPROC)(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image); -typedef void(APIENTRYP PFNGLCONVOLUTIONFILTER2DPROC)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image); -typedef void(APIENTRYP PFNGLCONVOLUTIONPARAMETERFPROC)(GLenum target, GLenum pname, GLfloat params); -typedef void(APIENTRYP PFNGLCONVOLUTIONPARAMETERFVPROC)(GLenum target, GLenum pname, const GLfloat *params); -typedef void(APIENTRYP PFNGLCONVOLUTIONPARAMETERIPROC)(GLenum target, GLenum pname, GLint params); -typedef void(APIENTRYP PFNGLCONVOLUTIONPARAMETERIVPROC)(GLenum target, GLenum pname, const GLint *params); -typedef void(APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DPROC)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void(APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DPROC)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void(APIENTRYP PFNGLGETCONVOLUTIONFILTERPROC)(GLenum target, GLenum format, GLenum type, GLvoid *image); -typedef void(APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVPROC)(GLenum target, GLenum pname, GLfloat *params); -typedef void(APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVPROC)(GLenum target, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETSEPARABLEFILTERPROC)(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span); -typedef void(APIENTRYP PFNGLSEPARABLEFILTER2DPROC)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column); -typedef void(APIENTRYP PFNGLGETHISTOGRAMPROC)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -typedef void(APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVPROC)(GLenum target, GLenum pname, GLfloat *params); -typedef void(APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVPROC)(GLenum target, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETMINMAXPROC)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -typedef void(APIENTRYP PFNGLGETMINMAXPARAMETERFVPROC)(GLenum target, GLenum pname, GLfloat *params); -typedef void(APIENTRYP PFNGLGETMINMAXPARAMETERIVPROC)(GLenum target, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLHISTOGRAMPROC)(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); -typedef void(APIENTRYP PFNGLMINMAXPROC)(GLenum target, GLenum internalformat, GLboolean sink); -typedef void(APIENTRYP PFNGLRESETHISTOGRAMPROC)(GLenum target); -typedef void(APIENTRYP PFNGLRESETMINMAXPROC)(GLenum target); -typedef void(APIENTRYP PFNGLTEXIMAGE3DPROC)(GLenum target, GLint level, GLint internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void(APIENTRYP PFNGLTEXSUBIMAGE3DPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -typedef void(APIENTRYP PFNGLCOPYTEXSUBIMAGE3DPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -#endif - -#ifndef GL_VERSION_1_3 -#define GL_VERSION_1_3 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glActiveTexture(GLenum); -GLAPI void APIENTRY glClientActiveTexture(GLenum); -GLAPI void APIENTRY glMultiTexCoord1d(GLenum, GLdouble); -GLAPI void APIENTRY glMultiTexCoord1dv(GLenum, const GLdouble *); -GLAPI void APIENTRY glMultiTexCoord1f(GLenum, GLfloat); -GLAPI void APIENTRY glMultiTexCoord1fv(GLenum, const GLfloat *); -GLAPI void APIENTRY glMultiTexCoord1i(GLenum, GLint); -GLAPI void APIENTRY glMultiTexCoord1iv(GLenum, const GLint *); -GLAPI void APIENTRY glMultiTexCoord1s(GLenum, GLshort); -GLAPI void APIENTRY glMultiTexCoord1sv(GLenum, const GLshort *); -GLAPI void APIENTRY glMultiTexCoord2d(GLenum, GLdouble, GLdouble); -GLAPI void APIENTRY glMultiTexCoord2dv(GLenum, const GLdouble *); -GLAPI void APIENTRY glMultiTexCoord2f(GLenum, GLfloat, GLfloat); -GLAPI void APIENTRY glMultiTexCoord2fv(GLenum, const GLfloat *); -GLAPI void APIENTRY glMultiTexCoord2i(GLenum, GLint, GLint); -GLAPI void APIENTRY glMultiTexCoord2iv(GLenum, const GLint *); -GLAPI void APIENTRY glMultiTexCoord2s(GLenum, GLshort, GLshort); -GLAPI void APIENTRY glMultiTexCoord2sv(GLenum, const GLshort *); -GLAPI void APIENTRY glMultiTexCoord3d(GLenum, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glMultiTexCoord3dv(GLenum, const GLdouble *); -GLAPI void APIENTRY glMultiTexCoord3f(GLenum, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glMultiTexCoord3fv(GLenum, const GLfloat *); -GLAPI void APIENTRY glMultiTexCoord3i(GLenum, GLint, GLint, GLint); -GLAPI void APIENTRY glMultiTexCoord3iv(GLenum, const GLint *); -GLAPI void APIENTRY glMultiTexCoord3s(GLenum, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glMultiTexCoord3sv(GLenum, const GLshort *); -GLAPI void APIENTRY glMultiTexCoord4d(GLenum, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glMultiTexCoord4dv(GLenum, const GLdouble *); -GLAPI void APIENTRY glMultiTexCoord4f(GLenum, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glMultiTexCoord4fv(GLenum, const GLfloat *); -GLAPI void APIENTRY glMultiTexCoord4i(GLenum, GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glMultiTexCoord4iv(GLenum, const GLint *); -GLAPI void APIENTRY glMultiTexCoord4s(GLenum, GLshort, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glMultiTexCoord4sv(GLenum, const GLshort *); -GLAPI void APIENTRY glLoadTransposeMatrixf(const GLfloat *); -GLAPI void APIENTRY glLoadTransposeMatrixd(const GLdouble *); -GLAPI void APIENTRY glMultTransposeMatrixf(const GLfloat *); -GLAPI void APIENTRY glMultTransposeMatrixd(const GLdouble *); -GLAPI void APIENTRY glSampleCoverage(GLclampf, GLboolean); -GLAPI void APIENTRY glCompressedTexImage3D(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexImage2D(GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexImage1D(GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexSubImage3D(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexSubImage2D(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexSubImage1D(GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glGetCompressedTexImage(GLenum, GLint, GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLACTIVETEXTUREPROC)(GLenum texture); -typedef void(APIENTRYP PFNGLCLIENTACTIVETEXTUREPROC)(GLenum texture); -typedef void(APIENTRYP PFNGLMULTITEXCOORD1DPROC)(GLenum target, GLdouble s); -typedef void(APIENTRYP PFNGLMULTITEXCOORD1DVPROC)(GLenum target, const GLdouble *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD1FPROC)(GLenum target, GLfloat s); -typedef void(APIENTRYP PFNGLMULTITEXCOORD1FVPROC)(GLenum target, const GLfloat *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD1IPROC)(GLenum target, GLint s); -typedef void(APIENTRYP PFNGLMULTITEXCOORD1IVPROC)(GLenum target, const GLint *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD1SPROC)(GLenum target, GLshort s); -typedef void(APIENTRYP PFNGLMULTITEXCOORD1SVPROC)(GLenum target, const GLshort *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD2DPROC)(GLenum target, GLdouble s, GLdouble t); -typedef void(APIENTRYP PFNGLMULTITEXCOORD2DVPROC)(GLenum target, const GLdouble *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD2FPROC)(GLenum target, GLfloat s, GLfloat t); -typedef void(APIENTRYP PFNGLMULTITEXCOORD2FVPROC)(GLenum target, const GLfloat *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD2IPROC)(GLenum target, GLint s, GLint t); -typedef void(APIENTRYP PFNGLMULTITEXCOORD2IVPROC)(GLenum target, const GLint *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD2SPROC)(GLenum target, GLshort s, GLshort t); -typedef void(APIENTRYP PFNGLMULTITEXCOORD2SVPROC)(GLenum target, const GLshort *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD3DPROC)(GLenum target, GLdouble s, GLdouble t, GLdouble r); -typedef void(APIENTRYP PFNGLMULTITEXCOORD3DVPROC)(GLenum target, const GLdouble *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD3FPROC)(GLenum target, GLfloat s, GLfloat t, GLfloat r); -typedef void(APIENTRYP PFNGLMULTITEXCOORD3FVPROC)(GLenum target, const GLfloat *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD3IPROC)(GLenum target, GLint s, GLint t, GLint r); -typedef void(APIENTRYP PFNGLMULTITEXCOORD3IVPROC)(GLenum target, const GLint *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD3SPROC)(GLenum target, GLshort s, GLshort t, GLshort r); -typedef void(APIENTRYP PFNGLMULTITEXCOORD3SVPROC)(GLenum target, const GLshort *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD4DPROC)(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); -typedef void(APIENTRYP PFNGLMULTITEXCOORD4DVPROC)(GLenum target, const GLdouble *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD4FPROC)(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); -typedef void(APIENTRYP PFNGLMULTITEXCOORD4FVPROC)(GLenum target, const GLfloat *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD4IPROC)(GLenum target, GLint s, GLint t, GLint r, GLint q); -typedef void(APIENTRYP PFNGLMULTITEXCOORD4IVPROC)(GLenum target, const GLint *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD4SPROC)(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); -typedef void(APIENTRYP PFNGLMULTITEXCOORD4SVPROC)(GLenum target, const GLshort *v); -typedef void(APIENTRYP PFNGLLOADTRANSPOSEMATRIXFPROC)(const GLfloat *m); -typedef void(APIENTRYP PFNGLLOADTRANSPOSEMATRIXDPROC)(const GLdouble *m); -typedef void(APIENTRYP PFNGLMULTTRANSPOSEMATRIXFPROC)(const GLfloat *m); -typedef void(APIENTRYP PFNGLMULTTRANSPOSEMATRIXDPROC)(const GLdouble *m); -typedef void(APIENTRYP PFNGLSAMPLECOVERAGEPROC)(GLclampf value, GLboolean invert); -typedef void(APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DPROC)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void(APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DPROC)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void(APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DPROC)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void(APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void(APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void(APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DPROC)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void(APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEPROC)(GLenum target, GLint level, GLvoid *img); -#endif - -#ifndef GL_VERSION_1_4 -#define GL_VERSION_1_4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendFuncSeparate(GLenum, GLenum, GLenum, GLenum); -GLAPI void APIENTRY glFogCoordf(GLfloat); -GLAPI void APIENTRY glFogCoordfv(const GLfloat *); -GLAPI void APIENTRY glFogCoordd(GLdouble); -GLAPI void APIENTRY glFogCoorddv(const GLdouble *); -GLAPI void APIENTRY glFogCoordPointer(GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glMultiDrawArrays(GLenum, GLint *, GLsizei *, GLsizei); -GLAPI void APIENTRY glMultiDrawElements(GLenum, const GLsizei *, GLenum, const GLvoid **, GLsizei); -GLAPI void APIENTRY glPointParameterf(GLenum, GLfloat); -GLAPI void APIENTRY glPointParameterfv(GLenum, const GLfloat *); -GLAPI void APIENTRY glPointParameteri(GLenum, GLint); -GLAPI void APIENTRY glPointParameteriv(GLenum, const GLint *); -GLAPI void APIENTRY glSecondaryColor3b(GLbyte, GLbyte, GLbyte); -GLAPI void APIENTRY glSecondaryColor3bv(const GLbyte *); -GLAPI void APIENTRY glSecondaryColor3d(GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glSecondaryColor3dv(const GLdouble *); -GLAPI void APIENTRY glSecondaryColor3f(GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glSecondaryColor3fv(const GLfloat *); -GLAPI void APIENTRY glSecondaryColor3i(GLint, GLint, GLint); -GLAPI void APIENTRY glSecondaryColor3iv(const GLint *); -GLAPI void APIENTRY glSecondaryColor3s(GLshort, GLshort, GLshort); -GLAPI void APIENTRY glSecondaryColor3sv(const GLshort *); -GLAPI void APIENTRY glSecondaryColor3ub(GLubyte, GLubyte, GLubyte); -GLAPI void APIENTRY glSecondaryColor3ubv(const GLubyte *); -GLAPI void APIENTRY glSecondaryColor3ui(GLuint, GLuint, GLuint); -GLAPI void APIENTRY glSecondaryColor3uiv(const GLuint *); -GLAPI void APIENTRY glSecondaryColor3us(GLushort, GLushort, GLushort); -GLAPI void APIENTRY glSecondaryColor3usv(const GLushort *); -GLAPI void APIENTRY glSecondaryColorPointer(GLint, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glWindowPos2d(GLdouble, GLdouble); -GLAPI void APIENTRY glWindowPos2dv(const GLdouble *); -GLAPI void APIENTRY glWindowPos2f(GLfloat, GLfloat); -GLAPI void APIENTRY glWindowPos2fv(const GLfloat *); -GLAPI void APIENTRY glWindowPos2i(GLint, GLint); -GLAPI void APIENTRY glWindowPos2iv(const GLint *); -GLAPI void APIENTRY glWindowPos2s(GLshort, GLshort); -GLAPI void APIENTRY glWindowPos2sv(const GLshort *); -GLAPI void APIENTRY glWindowPos3d(GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glWindowPos3dv(const GLdouble *); -GLAPI void APIENTRY glWindowPos3f(GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glWindowPos3fv(const GLfloat *); -GLAPI void APIENTRY glWindowPos3i(GLint, GLint, GLint); -GLAPI void APIENTRY glWindowPos3iv(const GLint *); -GLAPI void APIENTRY glWindowPos3s(GLshort, GLshort, GLshort); -GLAPI void APIENTRY glWindowPos3sv(const GLshort *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLBLENDFUNCSEPARATEPROC)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -typedef void(APIENTRYP PFNGLFOGCOORDFPROC)(GLfloat coord); -typedef void(APIENTRYP PFNGLFOGCOORDFVPROC)(const GLfloat *coord); -typedef void(APIENTRYP PFNGLFOGCOORDDPROC)(GLdouble coord); -typedef void(APIENTRYP PFNGLFOGCOORDDVPROC)(const GLdouble *coord); -typedef void(APIENTRYP PFNGLFOGCOORDPOINTERPROC)(GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void(APIENTRYP PFNGLMULTIDRAWARRAYSPROC)(GLenum mode, GLint *first, GLsizei *count, GLsizei primcount); -typedef void(APIENTRYP PFNGLMULTIDRAWELEMENTSPROC)(GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount); -typedef void(APIENTRYP PFNGLPOINTPARAMETERFPROC)(GLenum pname, GLfloat param); -typedef void(APIENTRYP PFNGLPOINTPARAMETERFVPROC)(GLenum pname, const GLfloat *params); -typedef void(APIENTRYP PFNGLPOINTPARAMETERIPROC)(GLenum pname, GLint param); -typedef void(APIENTRYP PFNGLPOINTPARAMETERIVPROC)(GLenum pname, const GLint *params); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3BPROC)(GLbyte red, GLbyte green, GLbyte blue); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3BVPROC)(const GLbyte *v); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3DPROC)(GLdouble red, GLdouble green, GLdouble blue); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3DVPROC)(const GLdouble *v); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3FPROC)(GLfloat red, GLfloat green, GLfloat blue); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3FVPROC)(const GLfloat *v); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3IPROC)(GLint red, GLint green, GLint blue); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3IVPROC)(const GLint *v); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3SPROC)(GLshort red, GLshort green, GLshort blue); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3SVPROC)(const GLshort *v); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3UBPROC)(GLubyte red, GLubyte green, GLubyte blue); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3UBVPROC)(const GLubyte *v); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3UIPROC)(GLuint red, GLuint green, GLuint blue); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3UIVPROC)(const GLuint *v); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3USPROC)(GLushort red, GLushort green, GLushort blue); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3USVPROC)(const GLushort *v); -typedef void(APIENTRYP PFNGLSECONDARYCOLORPOINTERPROC)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void(APIENTRYP PFNGLWINDOWPOS2DPROC)(GLdouble x, GLdouble y); -typedef void(APIENTRYP PFNGLWINDOWPOS2DVPROC)(const GLdouble *v); -typedef void(APIENTRYP PFNGLWINDOWPOS2FPROC)(GLfloat x, GLfloat y); -typedef void(APIENTRYP PFNGLWINDOWPOS2FVPROC)(const GLfloat *v); -typedef void(APIENTRYP PFNGLWINDOWPOS2IPROC)(GLint x, GLint y); -typedef void(APIENTRYP PFNGLWINDOWPOS2IVPROC)(const GLint *v); -typedef void(APIENTRYP PFNGLWINDOWPOS2SPROC)(GLshort x, GLshort y); -typedef void(APIENTRYP PFNGLWINDOWPOS2SVPROC)(const GLshort *v); -typedef void(APIENTRYP PFNGLWINDOWPOS3DPROC)(GLdouble x, GLdouble y, GLdouble z); -typedef void(APIENTRYP PFNGLWINDOWPOS3DVPROC)(const GLdouble *v); -typedef void(APIENTRYP PFNGLWINDOWPOS3FPROC)(GLfloat x, GLfloat y, GLfloat z); -typedef void(APIENTRYP PFNGLWINDOWPOS3FVPROC)(const GLfloat *v); -typedef void(APIENTRYP PFNGLWINDOWPOS3IPROC)(GLint x, GLint y, GLint z); -typedef void(APIENTRYP PFNGLWINDOWPOS3IVPROC)(const GLint *v); -typedef void(APIENTRYP PFNGLWINDOWPOS3SPROC)(GLshort x, GLshort y, GLshort z); -typedef void(APIENTRYP PFNGLWINDOWPOS3SVPROC)(const GLshort *v); -#endif - -#ifndef GL_VERSION_1_5 -#define GL_VERSION_1_5 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenQueries(GLsizei, GLuint *); -GLAPI void APIENTRY glDeleteQueries(GLsizei, const GLuint *); -GLAPI GLboolean APIENTRY glIsQuery(GLuint); -GLAPI void APIENTRY glBeginQuery(GLenum, GLuint); -GLAPI void APIENTRY glEndQuery(GLenum); -GLAPI void APIENTRY glGetQueryiv(GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetQueryObjectiv(GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetQueryObjectuiv(GLuint, GLenum, GLuint *); -GLAPI void APIENTRY glBindBuffer(GLenum, GLuint); -GLAPI void APIENTRY glDeleteBuffers(GLsizei, const GLuint *); -GLAPI void APIENTRY glGenBuffers(GLsizei, GLuint *); -GLAPI GLboolean APIENTRY glIsBuffer(GLuint); -GLAPI void APIENTRY glBufferData(GLenum, GLsizeiptr, const GLvoid *, GLenum); -GLAPI void APIENTRY glBufferSubData(GLenum, GLintptr, GLsizeiptr, const GLvoid *); -GLAPI void APIENTRY glGetBufferSubData(GLenum, GLintptr, GLsizeiptr, GLvoid *); -GLAPI GLvoid *APIENTRY glMapBuffer(GLenum, GLenum); -GLAPI GLboolean APIENTRY glUnmapBuffer(GLenum); -GLAPI void APIENTRY glGetBufferParameteriv(GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetBufferPointerv(GLenum, GLenum, GLvoid **); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLGENQUERIESPROC)(GLsizei n, GLuint *ids); -typedef void(APIENTRYP PFNGLDELETEQUERIESPROC)(GLsizei n, const GLuint *ids); -typedef GLboolean(APIENTRYP PFNGLISQUERYPROC)(GLuint id); -typedef void(APIENTRYP PFNGLBEGINQUERYPROC)(GLenum target, GLuint id); -typedef void(APIENTRYP PFNGLENDQUERYPROC)(GLenum target); -typedef void(APIENTRYP PFNGLGETQUERYIVPROC)(GLenum target, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETQUERYOBJECTIVPROC)(GLuint id, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETQUERYOBJECTUIVPROC)(GLuint id, GLenum pname, GLuint *params); -typedef void(APIENTRYP PFNGLBINDBUFFERPROC)(GLenum target, GLuint buffer); -typedef void(APIENTRYP PFNGLDELETEBUFFERSPROC)(GLsizei n, const GLuint *buffers); -typedef void(APIENTRYP PFNGLGENBUFFERSPROC)(GLsizei n, GLuint *buffers); -typedef GLboolean(APIENTRYP PFNGLISBUFFERPROC)(GLuint buffer); -typedef void(APIENTRYP PFNGLBUFFERDATAPROC)(GLenum target, GLsizeiptr size, const GLvoid *data, GLenum usage); -typedef void(APIENTRYP PFNGLBUFFERSUBDATAPROC)(GLenum target, GLintptr offset, GLsizeiptr size, const GLvoid *data); -typedef void(APIENTRYP PFNGLGETBUFFERSUBDATAPROC)(GLenum target, GLintptr offset, GLsizeiptr size, GLvoid *data); -typedef GLvoid *(APIENTRYP PFNGLMAPBUFFERPROC)(GLenum target, GLenum access); -typedef GLboolean(APIENTRYP PFNGLUNMAPBUFFERPROC)(GLenum target); -typedef void(APIENTRYP PFNGLGETBUFFERPARAMETERIVPROC)(GLenum target, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETBUFFERPOINTERVPROC)(GLenum target, GLenum pname, GLvoid **params); -#endif - -#ifndef GL_VERSION_2_0 -#define GL_VERSION_2_0 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendEquationSeparate(GLenum, GLenum); -GLAPI void APIENTRY glDrawBuffers(GLsizei, const GLenum *); -GLAPI void APIENTRY glStencilOpSeparate(GLenum, GLenum, GLenum, GLenum); -GLAPI void APIENTRY glStencilFuncSeparate(GLenum, GLenum, GLint, GLuint); -GLAPI void APIENTRY glStencilMaskSeparate(GLenum, GLuint); -GLAPI void APIENTRY glAttachShader(GLuint, GLuint); -GLAPI void APIENTRY glBindAttribLocation(GLuint, GLuint, const GLchar *); -GLAPI void APIENTRY glCompileShader(GLuint); -GLAPI GLuint APIENTRY glCreateProgram(void); -GLAPI GLuint APIENTRY glCreateShader(GLenum); -GLAPI void APIENTRY glDeleteProgram(GLuint); -GLAPI void APIENTRY glDeleteShader(GLuint); -GLAPI void APIENTRY glDetachShader(GLuint, GLuint); -GLAPI void APIENTRY glDisableVertexAttribArray(GLuint); -GLAPI void APIENTRY glEnableVertexAttribArray(GLuint); -GLAPI void APIENTRY glGetActiveAttrib(GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *); -GLAPI void APIENTRY glGetActiveUniform(GLuint, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLchar *); -GLAPI void APIENTRY glGetAttachedShaders(GLuint, GLsizei, GLsizei *, GLuint *); -GLAPI GLint APIENTRY glGetAttribLocation(GLuint, const GLchar *); -GLAPI void APIENTRY glGetProgramiv(GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetProgramInfoLog(GLuint, GLsizei, GLsizei *, GLchar *); -GLAPI void APIENTRY glGetShaderiv(GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetShaderInfoLog(GLuint, GLsizei, GLsizei *, GLchar *); -GLAPI void APIENTRY glGetShaderSource(GLuint, GLsizei, GLsizei *, GLchar *); -GLAPI GLint APIENTRY glGetUniformLocation(GLuint, const GLchar *); -GLAPI void APIENTRY glGetUniformfv(GLuint, GLint, GLfloat *); -GLAPI void APIENTRY glGetUniformiv(GLuint, GLint, GLint *); -GLAPI void APIENTRY glGetVertexAttribdv(GLuint, GLenum, GLdouble *); -GLAPI void APIENTRY glGetVertexAttribfv(GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetVertexAttribiv(GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetVertexAttribPointerv(GLuint, GLenum, GLvoid **); -GLAPI GLboolean APIENTRY glIsProgram(GLuint); -GLAPI GLboolean APIENTRY glIsShader(GLuint); -GLAPI void APIENTRY glLinkProgram(GLuint); -GLAPI void APIENTRY glShaderSource(GLuint, GLsizei, const GLchar **, const GLint *); -GLAPI void APIENTRY glUseProgram(GLuint); -GLAPI void APIENTRY glUniform1f(GLint, GLfloat); -GLAPI void APIENTRY glUniform2f(GLint, GLfloat, GLfloat); -GLAPI void APIENTRY glUniform3f(GLint, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glUniform4f(GLint, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glUniform1i(GLint, GLint); -GLAPI void APIENTRY glUniform2i(GLint, GLint, GLint); -GLAPI void APIENTRY glUniform3i(GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glUniform4i(GLint, GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glUniform1fv(GLint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glUniform2fv(GLint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glUniform3fv(GLint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glUniform4fv(GLint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glUniform1iv(GLint, GLsizei, const GLint *); -GLAPI void APIENTRY glUniform2iv(GLint, GLsizei, const GLint *); -GLAPI void APIENTRY glUniform3iv(GLint, GLsizei, const GLint *); -GLAPI void APIENTRY glUniform4iv(GLint, GLsizei, const GLint *); -GLAPI void APIENTRY glUniformMatrix2fv(GLint, GLsizei, GLboolean, const GLfloat *); -GLAPI void APIENTRY glUniformMatrix3fv(GLint, GLsizei, GLboolean, const GLfloat *); -GLAPI void APIENTRY glUniformMatrix4fv(GLint, GLsizei, GLboolean, const GLfloat *); -GLAPI void APIENTRY glValidateProgram(GLuint); -GLAPI void APIENTRY glVertexAttrib1d(GLuint, GLdouble); -GLAPI void APIENTRY glVertexAttrib1dv(GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib1f(GLuint, GLfloat); -GLAPI void APIENTRY glVertexAttrib1fv(GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib1s(GLuint, GLshort); -GLAPI void APIENTRY glVertexAttrib1sv(GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib2d(GLuint, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib2dv(GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib2f(GLuint, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib2fv(GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib2s(GLuint, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib2sv(GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib3d(GLuint, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib3dv(GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib3f(GLuint, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib3fv(GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib3s(GLuint, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib3sv(GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib4Nbv(GLuint, const GLbyte *); -GLAPI void APIENTRY glVertexAttrib4Niv(GLuint, const GLint *); -GLAPI void APIENTRY glVertexAttrib4Nsv(GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib4Nub(GLuint, GLubyte, GLubyte, GLubyte, GLubyte); -GLAPI void APIENTRY glVertexAttrib4Nubv(GLuint, const GLubyte *); -GLAPI void APIENTRY glVertexAttrib4Nuiv(GLuint, const GLuint *); -GLAPI void APIENTRY glVertexAttrib4Nusv(GLuint, const GLushort *); -GLAPI void APIENTRY glVertexAttrib4bv(GLuint, const GLbyte *); -GLAPI void APIENTRY glVertexAttrib4d(GLuint, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib4dv(GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib4f(GLuint, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib4fv(GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib4iv(GLuint, const GLint *); -GLAPI void APIENTRY glVertexAttrib4s(GLuint, GLshort, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib4sv(GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib4ubv(GLuint, const GLubyte *); -GLAPI void APIENTRY glVertexAttrib4uiv(GLuint, const GLuint *); -GLAPI void APIENTRY glVertexAttrib4usv(GLuint, const GLushort *); -GLAPI void APIENTRY glVertexAttribPointer(GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLBLENDEQUATIONSEPARATEPROC)(GLenum modeRGB, GLenum modeAlpha); -typedef void(APIENTRYP PFNGLDRAWBUFFERSPROC)(GLsizei n, const GLenum *bufs); -typedef void(APIENTRYP PFNGLSTENCILOPSEPARATEPROC)(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); -typedef void(APIENTRYP PFNGLSTENCILFUNCSEPARATEPROC)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); -typedef void(APIENTRYP PFNGLSTENCILMASKSEPARATEPROC)(GLenum face, GLuint mask); -typedef void(APIENTRYP PFNGLATTACHSHADERPROC)(GLuint program, GLuint shader); -typedef void(APIENTRYP PFNGLBINDATTRIBLOCATIONPROC)(GLuint program, GLuint index, const GLchar *name); -typedef void(APIENTRYP PFNGLCOMPILESHADERPROC)(GLuint shader); -typedef GLuint(APIENTRYP PFNGLCREATEPROGRAMPROC)(void); -typedef GLuint(APIENTRYP PFNGLCREATESHADERPROC)(GLenum type); -typedef void(APIENTRYP PFNGLDELETEPROGRAMPROC)(GLuint program); -typedef void(APIENTRYP PFNGLDELETESHADERPROC)(GLuint shader); -typedef void(APIENTRYP PFNGLDETACHSHADERPROC)(GLuint program, GLuint shader); -typedef void(APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYPROC)(GLuint index); -typedef void(APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYPROC)(GLuint index); -typedef void(APIENTRYP PFNGLGETACTIVEATTRIBPROC)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); -typedef void(APIENTRYP PFNGLGETACTIVEUNIFORMPROC)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLint *size, GLenum *type, GLchar *name); -typedef void(APIENTRYP PFNGLGETATTACHEDSHADERSPROC)(GLuint program, GLsizei maxCount, GLsizei *count, GLuint *obj); -typedef GLint(APIENTRYP PFNGLGETATTRIBLOCATIONPROC)(GLuint program, const GLchar *name); -typedef void(APIENTRYP PFNGLGETPROGRAMIVPROC)(GLuint program, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETPROGRAMINFOLOGPROC)(GLuint program, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -typedef void(APIENTRYP PFNGLGETSHADERIVPROC)(GLuint shader, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETSHADERINFOLOGPROC)(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *infoLog); -typedef void(APIENTRYP PFNGLGETSHADERSOURCEPROC)(GLuint shader, GLsizei bufSize, GLsizei *length, GLchar *source); -typedef GLint(APIENTRYP PFNGLGETUNIFORMLOCATIONPROC)(GLuint program, const GLchar *name); -typedef void(APIENTRYP PFNGLGETUNIFORMFVPROC)(GLuint program, GLint location, GLfloat *params); -typedef void(APIENTRYP PFNGLGETUNIFORMIVPROC)(GLuint program, GLint location, GLint *params); -typedef void(APIENTRYP PFNGLGETVERTEXATTRIBDVPROC)(GLuint index, GLenum pname, GLdouble *params); -typedef void(APIENTRYP PFNGLGETVERTEXATTRIBFVPROC)(GLuint index, GLenum pname, GLfloat *params); -typedef void(APIENTRYP PFNGLGETVERTEXATTRIBIVPROC)(GLuint index, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVPROC)(GLuint index, GLenum pname, GLvoid **pointer); -typedef GLboolean(APIENTRYP PFNGLISPROGRAMPROC)(GLuint program); -typedef GLboolean(APIENTRYP PFNGLISSHADERPROC)(GLuint shader); -typedef void(APIENTRYP PFNGLLINKPROGRAMPROC)(GLuint program); -typedef void(APIENTRYP PFNGLSHADERSOURCEPROC)(GLuint shader, GLsizei count, const GLchar **string, const GLint *length); -typedef void(APIENTRYP PFNGLUSEPROGRAMPROC)(GLuint program); -typedef void(APIENTRYP PFNGLUNIFORM1FPROC)(GLint location, GLfloat v0); -typedef void(APIENTRYP PFNGLUNIFORM2FPROC)(GLint location, GLfloat v0, GLfloat v1); -typedef void(APIENTRYP PFNGLUNIFORM3FPROC)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -typedef void(APIENTRYP PFNGLUNIFORM4FPROC)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void(APIENTRYP PFNGLUNIFORM1IPROC)(GLint location, GLint v0); -typedef void(APIENTRYP PFNGLUNIFORM2IPROC)(GLint location, GLint v0, GLint v1); -typedef void(APIENTRYP PFNGLUNIFORM3IPROC)(GLint location, GLint v0, GLint v1, GLint v2); -typedef void(APIENTRYP PFNGLUNIFORM4IPROC)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void(APIENTRYP PFNGLUNIFORM1FVPROC)(GLint location, GLsizei count, const GLfloat *value); -typedef void(APIENTRYP PFNGLUNIFORM2FVPROC)(GLint location, GLsizei count, const GLfloat *value); -typedef void(APIENTRYP PFNGLUNIFORM3FVPROC)(GLint location, GLsizei count, const GLfloat *value); -typedef void(APIENTRYP PFNGLUNIFORM4FVPROC)(GLint location, GLsizei count, const GLfloat *value); -typedef void(APIENTRYP PFNGLUNIFORM1IVPROC)(GLint location, GLsizei count, const GLint *value); -typedef void(APIENTRYP PFNGLUNIFORM2IVPROC)(GLint location, GLsizei count, const GLint *value); -typedef void(APIENTRYP PFNGLUNIFORM3IVPROC)(GLint location, GLsizei count, const GLint *value); -typedef void(APIENTRYP PFNGLUNIFORM4IVPROC)(GLint location, GLsizei count, const GLint *value); -typedef void(APIENTRYP PFNGLUNIFORMMATRIX2FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void(APIENTRYP PFNGLUNIFORMMATRIX3FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void(APIENTRYP PFNGLUNIFORMMATRIX4FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void(APIENTRYP PFNGLVALIDATEPROGRAMPROC)(GLuint program); -typedef void(APIENTRYP PFNGLVERTEXATTRIB1DPROC)(GLuint index, GLdouble x); -typedef void(APIENTRYP PFNGLVERTEXATTRIB1DVPROC)(GLuint index, const GLdouble *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB1FPROC)(GLuint index, GLfloat x); -typedef void(APIENTRYP PFNGLVERTEXATTRIB1FVPROC)(GLuint index, const GLfloat *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB1SPROC)(GLuint index, GLshort x); -typedef void(APIENTRYP PFNGLVERTEXATTRIB1SVPROC)(GLuint index, const GLshort *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB2DPROC)(GLuint index, GLdouble x, GLdouble y); -typedef void(APIENTRYP PFNGLVERTEXATTRIB2DVPROC)(GLuint index, const GLdouble *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB2FPROC)(GLuint index, GLfloat x, GLfloat y); -typedef void(APIENTRYP PFNGLVERTEXATTRIB2FVPROC)(GLuint index, const GLfloat *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB2SPROC)(GLuint index, GLshort x, GLshort y); -typedef void(APIENTRYP PFNGLVERTEXATTRIB2SVPROC)(GLuint index, const GLshort *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB3DPROC)(GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void(APIENTRYP PFNGLVERTEXATTRIB3DVPROC)(GLuint index, const GLdouble *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB3FPROC)(GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void(APIENTRYP PFNGLVERTEXATTRIB3FVPROC)(GLuint index, const GLfloat *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB3SPROC)(GLuint index, GLshort x, GLshort y, GLshort z); -typedef void(APIENTRYP PFNGLVERTEXATTRIB3SVPROC)(GLuint index, const GLshort *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4NBVPROC)(GLuint index, const GLbyte *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4NIVPROC)(GLuint index, const GLint *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4NSVPROC)(GLuint index, const GLshort *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4NUBPROC)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4NUBVPROC)(GLuint index, const GLubyte *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4NUIVPROC)(GLuint index, const GLuint *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4NUSVPROC)(GLuint index, const GLushort *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4BVPROC)(GLuint index, const GLbyte *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4DPROC)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4DVPROC)(GLuint index, const GLdouble *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4FPROC)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4FVPROC)(GLuint index, const GLfloat *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4IVPROC)(GLuint index, const GLint *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4SPROC)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4SVPROC)(GLuint index, const GLshort *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4UBVPROC)(GLuint index, const GLubyte *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4UIVPROC)(GLuint index, const GLuint *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4USVPROC)(GLuint index, const GLushort *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBPOINTERPROC)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_VERSION_2_1 -#define GL_VERSION_2_1 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glUniformMatrix2x3fv(GLint, GLsizei, GLboolean, const GLfloat *); -GLAPI void APIENTRY glUniformMatrix3x2fv(GLint, GLsizei, GLboolean, const GLfloat *); -GLAPI void APIENTRY glUniformMatrix2x4fv(GLint, GLsizei, GLboolean, const GLfloat *); -GLAPI void APIENTRY glUniformMatrix4x2fv(GLint, GLsizei, GLboolean, const GLfloat *); -GLAPI void APIENTRY glUniformMatrix3x4fv(GLint, GLsizei, GLboolean, const GLfloat *); -GLAPI void APIENTRY glUniformMatrix4x3fv(GLint, GLsizei, GLboolean, const GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLUNIFORMMATRIX2X3FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void(APIENTRYP PFNGLUNIFORMMATRIX3X2FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void(APIENTRYP PFNGLUNIFORMMATRIX2X4FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void(APIENTRYP PFNGLUNIFORMMATRIX4X2FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void(APIENTRYP PFNGLUNIFORMMATRIX3X4FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void(APIENTRYP PFNGLUNIFORMMATRIX4X3FVPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -#endif - -#ifndef GL_ARB_multitexture -#define GL_ARB_multitexture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glActiveTextureARB(GLenum); -GLAPI void APIENTRY glClientActiveTextureARB(GLenum); -GLAPI void APIENTRY glMultiTexCoord1dARB(GLenum, GLdouble); -GLAPI void APIENTRY glMultiTexCoord1dvARB(GLenum, const GLdouble *); -GLAPI void APIENTRY glMultiTexCoord1fARB(GLenum, GLfloat); -GLAPI void APIENTRY glMultiTexCoord1fvARB(GLenum, const GLfloat *); -GLAPI void APIENTRY glMultiTexCoord1iARB(GLenum, GLint); -GLAPI void APIENTRY glMultiTexCoord1ivARB(GLenum, const GLint *); -GLAPI void APIENTRY glMultiTexCoord1sARB(GLenum, GLshort); -GLAPI void APIENTRY glMultiTexCoord1svARB(GLenum, const GLshort *); -GLAPI void APIENTRY glMultiTexCoord2dARB(GLenum, GLdouble, GLdouble); -GLAPI void APIENTRY glMultiTexCoord2dvARB(GLenum, const GLdouble *); -GLAPI void APIENTRY glMultiTexCoord2fARB(GLenum, GLfloat, GLfloat); -GLAPI void APIENTRY glMultiTexCoord2fvARB(GLenum, const GLfloat *); -GLAPI void APIENTRY glMultiTexCoord2iARB(GLenum, GLint, GLint); -GLAPI void APIENTRY glMultiTexCoord2ivARB(GLenum, const GLint *); -GLAPI void APIENTRY glMultiTexCoord2sARB(GLenum, GLshort, GLshort); -GLAPI void APIENTRY glMultiTexCoord2svARB(GLenum, const GLshort *); -GLAPI void APIENTRY glMultiTexCoord3dARB(GLenum, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glMultiTexCoord3dvARB(GLenum, const GLdouble *); -GLAPI void APIENTRY glMultiTexCoord3fARB(GLenum, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glMultiTexCoord3fvARB(GLenum, const GLfloat *); -GLAPI void APIENTRY glMultiTexCoord3iARB(GLenum, GLint, GLint, GLint); -GLAPI void APIENTRY glMultiTexCoord3ivARB(GLenum, const GLint *); -GLAPI void APIENTRY glMultiTexCoord3sARB(GLenum, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glMultiTexCoord3svARB(GLenum, const GLshort *); -GLAPI void APIENTRY glMultiTexCoord4dARB(GLenum, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glMultiTexCoord4dvARB(GLenum, const GLdouble *); -GLAPI void APIENTRY glMultiTexCoord4fARB(GLenum, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glMultiTexCoord4fvARB(GLenum, const GLfloat *); -GLAPI void APIENTRY glMultiTexCoord4iARB(GLenum, GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glMultiTexCoord4ivARB(GLenum, const GLint *); -GLAPI void APIENTRY glMultiTexCoord4sARB(GLenum, GLshort, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glMultiTexCoord4svARB(GLenum, const GLshort *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLACTIVETEXTUREARBPROC)(GLenum texture); -typedef void(APIENTRYP PFNGLCLIENTACTIVETEXTUREARBPROC)(GLenum texture); -typedef void(APIENTRYP PFNGLMULTITEXCOORD1DARBPROC)(GLenum target, GLdouble s); -typedef void(APIENTRYP PFNGLMULTITEXCOORD1DVARBPROC)(GLenum target, const GLdouble *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD1FARBPROC)(GLenum target, GLfloat s); -typedef void(APIENTRYP PFNGLMULTITEXCOORD1FVARBPROC)(GLenum target, const GLfloat *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD1IARBPROC)(GLenum target, GLint s); -typedef void(APIENTRYP PFNGLMULTITEXCOORD1IVARBPROC)(GLenum target, const GLint *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD1SARBPROC)(GLenum target, GLshort s); -typedef void(APIENTRYP PFNGLMULTITEXCOORD1SVARBPROC)(GLenum target, const GLshort *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD2DARBPROC)(GLenum target, GLdouble s, GLdouble t); -typedef void(APIENTRYP PFNGLMULTITEXCOORD2DVARBPROC)(GLenum target, const GLdouble *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD2FARBPROC)(GLenum target, GLfloat s, GLfloat t); -typedef void(APIENTRYP PFNGLMULTITEXCOORD2FVARBPROC)(GLenum target, const GLfloat *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD2IARBPROC)(GLenum target, GLint s, GLint t); -typedef void(APIENTRYP PFNGLMULTITEXCOORD2IVARBPROC)(GLenum target, const GLint *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD2SARBPROC)(GLenum target, GLshort s, GLshort t); -typedef void(APIENTRYP PFNGLMULTITEXCOORD2SVARBPROC)(GLenum target, const GLshort *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD3DARBPROC)(GLenum target, GLdouble s, GLdouble t, GLdouble r); -typedef void(APIENTRYP PFNGLMULTITEXCOORD3DVARBPROC)(GLenum target, const GLdouble *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD3FARBPROC)(GLenum target, GLfloat s, GLfloat t, GLfloat r); -typedef void(APIENTRYP PFNGLMULTITEXCOORD3FVARBPROC)(GLenum target, const GLfloat *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD3IARBPROC)(GLenum target, GLint s, GLint t, GLint r); -typedef void(APIENTRYP PFNGLMULTITEXCOORD3IVARBPROC)(GLenum target, const GLint *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD3SARBPROC)(GLenum target, GLshort s, GLshort t, GLshort r); -typedef void(APIENTRYP PFNGLMULTITEXCOORD3SVARBPROC)(GLenum target, const GLshort *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD4DARBPROC)(GLenum target, GLdouble s, GLdouble t, GLdouble r, GLdouble q); -typedef void(APIENTRYP PFNGLMULTITEXCOORD4DVARBPROC)(GLenum target, const GLdouble *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD4FARBPROC)(GLenum target, GLfloat s, GLfloat t, GLfloat r, GLfloat q); -typedef void(APIENTRYP PFNGLMULTITEXCOORD4FVARBPROC)(GLenum target, const GLfloat *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD4IARBPROC)(GLenum target, GLint s, GLint t, GLint r, GLint q); -typedef void(APIENTRYP PFNGLMULTITEXCOORD4IVARBPROC)(GLenum target, const GLint *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD4SARBPROC)(GLenum target, GLshort s, GLshort t, GLshort r, GLshort q); -typedef void(APIENTRYP PFNGLMULTITEXCOORD4SVARBPROC)(GLenum target, const GLshort *v); -#endif - -#ifndef GL_ARB_transpose_matrix -#define GL_ARB_transpose_matrix 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glLoadTransposeMatrixfARB(const GLfloat *); -GLAPI void APIENTRY glLoadTransposeMatrixdARB(const GLdouble *); -GLAPI void APIENTRY glMultTransposeMatrixfARB(const GLfloat *); -GLAPI void APIENTRY glMultTransposeMatrixdARB(const GLdouble *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLLOADTRANSPOSEMATRIXFARBPROC)(const GLfloat *m); -typedef void(APIENTRYP PFNGLLOADTRANSPOSEMATRIXDARBPROC)(const GLdouble *m); -typedef void(APIENTRYP PFNGLMULTTRANSPOSEMATRIXFARBPROC)(const GLfloat *m); -typedef void(APIENTRYP PFNGLMULTTRANSPOSEMATRIXDARBPROC)(const GLdouble *m); -#endif - -#ifndef GL_ARB_multisample -#define GL_ARB_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSampleCoverageARB(GLclampf, GLboolean); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLSAMPLECOVERAGEARBPROC)(GLclampf value, GLboolean invert); -#endif - -#ifndef GL_ARB_texture_env_add -#define GL_ARB_texture_env_add 1 -#endif - -#ifndef GL_ARB_texture_cube_map -#define GL_ARB_texture_cube_map 1 -#endif - -#ifndef GL_ARB_texture_compression -#define GL_ARB_texture_compression 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCompressedTexImage3DARB(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexImage2DARB(GLenum, GLint, GLenum, GLsizei, GLsizei, GLint, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexImage1DARB(GLenum, GLint, GLenum, GLsizei, GLint, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexSubImage3DARB(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexSubImage2DARB(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glCompressedTexSubImage1DARB(GLenum, GLint, GLint, GLsizei, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glGetCompressedTexImageARB(GLenum, GLint, GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLCOMPRESSEDTEXIMAGE3DARBPROC)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void(APIENTRYP PFNGLCOMPRESSEDTEXIMAGE2DARBPROC)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void(APIENTRYP PFNGLCOMPRESSEDTEXIMAGE1DARBPROC)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLint border, GLsizei imageSize, const GLvoid *data); -typedef void(APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE3DARBPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void(APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE2DARBPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void(APIENTRYP PFNGLCOMPRESSEDTEXSUBIMAGE1DARBPROC)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLsizei imageSize, const GLvoid *data); -typedef void(APIENTRYP PFNGLGETCOMPRESSEDTEXIMAGEARBPROC)(GLenum target, GLint level, GLvoid *img); -#endif - -#ifndef GL_ARB_texture_border_clamp -#define GL_ARB_texture_border_clamp 1 -#endif - -#ifndef GL_ARB_point_parameters -#define GL_ARB_point_parameters 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPointParameterfARB(GLenum, GLfloat); -GLAPI void APIENTRY glPointParameterfvARB(GLenum, const GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLPOINTPARAMETERFARBPROC)(GLenum pname, GLfloat param); -typedef void(APIENTRYP PFNGLPOINTPARAMETERFVARBPROC)(GLenum pname, const GLfloat *params); -#endif - -#ifndef GL_ARB_vertex_blend -#define GL_ARB_vertex_blend 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glWeightbvARB(GLint, const GLbyte *); -GLAPI void APIENTRY glWeightsvARB(GLint, const GLshort *); -GLAPI void APIENTRY glWeightivARB(GLint, const GLint *); -GLAPI void APIENTRY glWeightfvARB(GLint, const GLfloat *); -GLAPI void APIENTRY glWeightdvARB(GLint, const GLdouble *); -GLAPI void APIENTRY glWeightubvARB(GLint, const GLubyte *); -GLAPI void APIENTRY glWeightusvARB(GLint, const GLushort *); -GLAPI void APIENTRY glWeightuivARB(GLint, const GLuint *); -GLAPI void APIENTRY glWeightPointerARB(GLint, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glVertexBlendARB(GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLWEIGHTBVARBPROC)(GLint size, const GLbyte *weights); -typedef void(APIENTRYP PFNGLWEIGHTSVARBPROC)(GLint size, const GLshort *weights); -typedef void(APIENTRYP PFNGLWEIGHTIVARBPROC)(GLint size, const GLint *weights); -typedef void(APIENTRYP PFNGLWEIGHTFVARBPROC)(GLint size, const GLfloat *weights); -typedef void(APIENTRYP PFNGLWEIGHTDVARBPROC)(GLint size, const GLdouble *weights); -typedef void(APIENTRYP PFNGLWEIGHTUBVARBPROC)(GLint size, const GLubyte *weights); -typedef void(APIENTRYP PFNGLWEIGHTUSVARBPROC)(GLint size, const GLushort *weights); -typedef void(APIENTRYP PFNGLWEIGHTUIVARBPROC)(GLint size, const GLuint *weights); -typedef void(APIENTRYP PFNGLWEIGHTPOINTERARBPROC)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void(APIENTRYP PFNGLVERTEXBLENDARBPROC)(GLint count); -#endif - -#ifndef GL_ARB_matrix_palette -#define GL_ARB_matrix_palette 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCurrentPaletteMatrixARB(GLint); -GLAPI void APIENTRY glMatrixIndexubvARB(GLint, const GLubyte *); -GLAPI void APIENTRY glMatrixIndexusvARB(GLint, const GLushort *); -GLAPI void APIENTRY glMatrixIndexuivARB(GLint, const GLuint *); -GLAPI void APIENTRY glMatrixIndexPointerARB(GLint, GLenum, GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLCURRENTPALETTEMATRIXARBPROC)(GLint index); -typedef void(APIENTRYP PFNGLMATRIXINDEXUBVARBPROC)(GLint size, const GLubyte *indices); -typedef void(APIENTRYP PFNGLMATRIXINDEXUSVARBPROC)(GLint size, const GLushort *indices); -typedef void(APIENTRYP PFNGLMATRIXINDEXUIVARBPROC)(GLint size, const GLuint *indices); -typedef void(APIENTRYP PFNGLMATRIXINDEXPOINTERARBPROC)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_ARB_texture_env_combine -#define GL_ARB_texture_env_combine 1 -#endif - -#ifndef GL_ARB_texture_env_crossbar -#define GL_ARB_texture_env_crossbar 1 -#endif - -#ifndef GL_ARB_texture_env_dot3 -#define GL_ARB_texture_env_dot3 1 -#endif - -#ifndef GL_ARB_texture_mirrored_repeat -#define GL_ARB_texture_mirrored_repeat 1 -#endif - -#ifndef GL_ARB_depth_texture -#define GL_ARB_depth_texture 1 -#endif - -#ifndef GL_ARB_shadow -#define GL_ARB_shadow 1 -#endif - -#ifndef GL_ARB_shadow_ambient -#define GL_ARB_shadow_ambient 1 -#endif - -#ifndef GL_ARB_window_pos -#define GL_ARB_window_pos 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glWindowPos2dARB(GLdouble, GLdouble); -GLAPI void APIENTRY glWindowPos2dvARB(const GLdouble *); -GLAPI void APIENTRY glWindowPos2fARB(GLfloat, GLfloat); -GLAPI void APIENTRY glWindowPos2fvARB(const GLfloat *); -GLAPI void APIENTRY glWindowPos2iARB(GLint, GLint); -GLAPI void APIENTRY glWindowPos2ivARB(const GLint *); -GLAPI void APIENTRY glWindowPos2sARB(GLshort, GLshort); -GLAPI void APIENTRY glWindowPos2svARB(const GLshort *); -GLAPI void APIENTRY glWindowPos3dARB(GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glWindowPos3dvARB(const GLdouble *); -GLAPI void APIENTRY glWindowPos3fARB(GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glWindowPos3fvARB(const GLfloat *); -GLAPI void APIENTRY glWindowPos3iARB(GLint, GLint, GLint); -GLAPI void APIENTRY glWindowPos3ivARB(const GLint *); -GLAPI void APIENTRY glWindowPos3sARB(GLshort, GLshort, GLshort); -GLAPI void APIENTRY glWindowPos3svARB(const GLshort *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLWINDOWPOS2DARBPROC)(GLdouble x, GLdouble y); -typedef void(APIENTRYP PFNGLWINDOWPOS2DVARBPROC)(const GLdouble *v); -typedef void(APIENTRYP PFNGLWINDOWPOS2FARBPROC)(GLfloat x, GLfloat y); -typedef void(APIENTRYP PFNGLWINDOWPOS2FVARBPROC)(const GLfloat *v); -typedef void(APIENTRYP PFNGLWINDOWPOS2IARBPROC)(GLint x, GLint y); -typedef void(APIENTRYP PFNGLWINDOWPOS2IVARBPROC)(const GLint *v); -typedef void(APIENTRYP PFNGLWINDOWPOS2SARBPROC)(GLshort x, GLshort y); -typedef void(APIENTRYP PFNGLWINDOWPOS2SVARBPROC)(const GLshort *v); -typedef void(APIENTRYP PFNGLWINDOWPOS3DARBPROC)(GLdouble x, GLdouble y, GLdouble z); -typedef void(APIENTRYP PFNGLWINDOWPOS3DVARBPROC)(const GLdouble *v); -typedef void(APIENTRYP PFNGLWINDOWPOS3FARBPROC)(GLfloat x, GLfloat y, GLfloat z); -typedef void(APIENTRYP PFNGLWINDOWPOS3FVARBPROC)(const GLfloat *v); -typedef void(APIENTRYP PFNGLWINDOWPOS3IARBPROC)(GLint x, GLint y, GLint z); -typedef void(APIENTRYP PFNGLWINDOWPOS3IVARBPROC)(const GLint *v); -typedef void(APIENTRYP PFNGLWINDOWPOS3SARBPROC)(GLshort x, GLshort y, GLshort z); -typedef void(APIENTRYP PFNGLWINDOWPOS3SVARBPROC)(const GLshort *v); -#endif - -#ifndef GL_ARB_vertex_program -#define GL_ARB_vertex_program 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttrib1dARB(GLuint, GLdouble); -GLAPI void APIENTRY glVertexAttrib1dvARB(GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib1fARB(GLuint, GLfloat); -GLAPI void APIENTRY glVertexAttrib1fvARB(GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib1sARB(GLuint, GLshort); -GLAPI void APIENTRY glVertexAttrib1svARB(GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib2dARB(GLuint, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib2dvARB(GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib2fARB(GLuint, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib2fvARB(GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib2sARB(GLuint, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib2svARB(GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib3dARB(GLuint, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib3dvARB(GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib3fARB(GLuint, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib3fvARB(GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib3sARB(GLuint, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib3svARB(GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib4NbvARB(GLuint, const GLbyte *); -GLAPI void APIENTRY glVertexAttrib4NivARB(GLuint, const GLint *); -GLAPI void APIENTRY glVertexAttrib4NsvARB(GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib4NubARB(GLuint, GLubyte, GLubyte, GLubyte, GLubyte); -GLAPI void APIENTRY glVertexAttrib4NubvARB(GLuint, const GLubyte *); -GLAPI void APIENTRY glVertexAttrib4NuivARB(GLuint, const GLuint *); -GLAPI void APIENTRY glVertexAttrib4NusvARB(GLuint, const GLushort *); -GLAPI void APIENTRY glVertexAttrib4bvARB(GLuint, const GLbyte *); -GLAPI void APIENTRY glVertexAttrib4dARB(GLuint, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib4dvARB(GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib4fARB(GLuint, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib4fvARB(GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib4ivARB(GLuint, const GLint *); -GLAPI void APIENTRY glVertexAttrib4sARB(GLuint, GLshort, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib4svARB(GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib4ubvARB(GLuint, const GLubyte *); -GLAPI void APIENTRY glVertexAttrib4uivARB(GLuint, const GLuint *); -GLAPI void APIENTRY glVertexAttrib4usvARB(GLuint, const GLushort *); -GLAPI void APIENTRY glVertexAttribPointerARB(GLuint, GLint, GLenum, GLboolean, GLsizei, const GLvoid *); -GLAPI void APIENTRY glEnableVertexAttribArrayARB(GLuint); -GLAPI void APIENTRY glDisableVertexAttribArrayARB(GLuint); -GLAPI void APIENTRY glProgramStringARB(GLenum, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glBindProgramARB(GLenum, GLuint); -GLAPI void APIENTRY glDeleteProgramsARB(GLsizei, const GLuint *); -GLAPI void APIENTRY glGenProgramsARB(GLsizei, GLuint *); -GLAPI void APIENTRY glProgramEnvParameter4dARB(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glProgramEnvParameter4dvARB(GLenum, GLuint, const GLdouble *); -GLAPI void APIENTRY glProgramEnvParameter4fARB(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glProgramEnvParameter4fvARB(GLenum, GLuint, const GLfloat *); -GLAPI void APIENTRY glProgramLocalParameter4dARB(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glProgramLocalParameter4dvARB(GLenum, GLuint, const GLdouble *); -GLAPI void APIENTRY glProgramLocalParameter4fARB(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glProgramLocalParameter4fvARB(GLenum, GLuint, const GLfloat *); -GLAPI void APIENTRY glGetProgramEnvParameterdvARB(GLenum, GLuint, GLdouble *); -GLAPI void APIENTRY glGetProgramEnvParameterfvARB(GLenum, GLuint, GLfloat *); -GLAPI void APIENTRY glGetProgramLocalParameterdvARB(GLenum, GLuint, GLdouble *); -GLAPI void APIENTRY glGetProgramLocalParameterfvARB(GLenum, GLuint, GLfloat *); -GLAPI void APIENTRY glGetProgramivARB(GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetProgramStringARB(GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetVertexAttribdvARB(GLuint, GLenum, GLdouble *); -GLAPI void APIENTRY glGetVertexAttribfvARB(GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetVertexAttribivARB(GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetVertexAttribPointervARB(GLuint, GLenum, GLvoid **); -GLAPI GLboolean APIENTRY glIsProgramARB(GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLVERTEXATTRIB1DARBPROC)(GLuint index, GLdouble x); -typedef void(APIENTRYP PFNGLVERTEXATTRIB1DVARBPROC)(GLuint index, const GLdouble *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB1FARBPROC)(GLuint index, GLfloat x); -typedef void(APIENTRYP PFNGLVERTEXATTRIB1FVARBPROC)(GLuint index, const GLfloat *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB1SARBPROC)(GLuint index, GLshort x); -typedef void(APIENTRYP PFNGLVERTEXATTRIB1SVARBPROC)(GLuint index, const GLshort *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB2DARBPROC)(GLuint index, GLdouble x, GLdouble y); -typedef void(APIENTRYP PFNGLVERTEXATTRIB2DVARBPROC)(GLuint index, const GLdouble *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB2FARBPROC)(GLuint index, GLfloat x, GLfloat y); -typedef void(APIENTRYP PFNGLVERTEXATTRIB2FVARBPROC)(GLuint index, const GLfloat *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB2SARBPROC)(GLuint index, GLshort x, GLshort y); -typedef void(APIENTRYP PFNGLVERTEXATTRIB2SVARBPROC)(GLuint index, const GLshort *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB3DARBPROC)(GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void(APIENTRYP PFNGLVERTEXATTRIB3DVARBPROC)(GLuint index, const GLdouble *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB3FARBPROC)(GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void(APIENTRYP PFNGLVERTEXATTRIB3FVARBPROC)(GLuint index, const GLfloat *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB3SARBPROC)(GLuint index, GLshort x, GLshort y, GLshort z); -typedef void(APIENTRYP PFNGLVERTEXATTRIB3SVARBPROC)(GLuint index, const GLshort *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4NBVARBPROC)(GLuint index, const GLbyte *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4NIVARBPROC)(GLuint index, const GLint *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4NSVARBPROC)(GLuint index, const GLshort *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4NUBARBPROC)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4NUBVARBPROC)(GLuint index, const GLubyte *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4NUIVARBPROC)(GLuint index, const GLuint *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4NUSVARBPROC)(GLuint index, const GLushort *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4BVARBPROC)(GLuint index, const GLbyte *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4DARBPROC)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4DVARBPROC)(GLuint index, const GLdouble *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4FARBPROC)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4FVARBPROC)(GLuint index, const GLfloat *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4IVARBPROC)(GLuint index, const GLint *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4SARBPROC)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4SVARBPROC)(GLuint index, const GLshort *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4UBVARBPROC)(GLuint index, const GLubyte *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4UIVARBPROC)(GLuint index, const GLuint *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4USVARBPROC)(GLuint index, const GLushort *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBPOINTERARBPROC)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, const GLvoid *pointer); -typedef void(APIENTRYP PFNGLENABLEVERTEXATTRIBARRAYARBPROC)(GLuint index); -typedef void(APIENTRYP PFNGLDISABLEVERTEXATTRIBARRAYARBPROC)(GLuint index); -typedef void(APIENTRYP PFNGLPROGRAMSTRINGARBPROC)(GLenum target, GLenum format, GLsizei len, const GLvoid *string); -typedef void(APIENTRYP PFNGLBINDPROGRAMARBPROC)(GLenum target, GLuint program); -typedef void(APIENTRYP PFNGLDELETEPROGRAMSARBPROC)(GLsizei n, const GLuint *programs); -typedef void(APIENTRYP PFNGLGENPROGRAMSARBPROC)(GLsizei n, GLuint *programs); -typedef void(APIENTRYP PFNGLPROGRAMENVPARAMETER4DARBPROC)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void(APIENTRYP PFNGLPROGRAMENVPARAMETER4DVARBPROC)(GLenum target, GLuint index, const GLdouble *params); -typedef void(APIENTRYP PFNGLPROGRAMENVPARAMETER4FARBPROC)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void(APIENTRYP PFNGLPROGRAMENVPARAMETER4FVARBPROC)(GLenum target, GLuint index, const GLfloat *params); -typedef void(APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DARBPROC)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void(APIENTRYP PFNGLPROGRAMLOCALPARAMETER4DVARBPROC)(GLenum target, GLuint index, const GLdouble *params); -typedef void(APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FARBPROC)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void(APIENTRYP PFNGLPROGRAMLOCALPARAMETER4FVARBPROC)(GLenum target, GLuint index, const GLfloat *params); -typedef void(APIENTRYP PFNGLGETPROGRAMENVPARAMETERDVARBPROC)(GLenum target, GLuint index, GLdouble *params); -typedef void(APIENTRYP PFNGLGETPROGRAMENVPARAMETERFVARBPROC)(GLenum target, GLuint index, GLfloat *params); -typedef void(APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERDVARBPROC)(GLenum target, GLuint index, GLdouble *params); -typedef void(APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERFVARBPROC)(GLenum target, GLuint index, GLfloat *params); -typedef void(APIENTRYP PFNGLGETPROGRAMIVARBPROC)(GLenum target, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETPROGRAMSTRINGARBPROC)(GLenum target, GLenum pname, GLvoid *string); -typedef void(APIENTRYP PFNGLGETVERTEXATTRIBDVARBPROC)(GLuint index, GLenum pname, GLdouble *params); -typedef void(APIENTRYP PFNGLGETVERTEXATTRIBFVARBPROC)(GLuint index, GLenum pname, GLfloat *params); -typedef void(APIENTRYP PFNGLGETVERTEXATTRIBIVARBPROC)(GLuint index, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVARBPROC)(GLuint index, GLenum pname, GLvoid **pointer); -typedef GLboolean(APIENTRYP PFNGLISPROGRAMARBPROC)(GLuint program); -#endif - -#ifndef GL_ARB_fragment_program -#define GL_ARB_fragment_program 1 -/* All ARB_fragment_program entry points are shared with ARB_vertex_program. */ -#endif - -#ifndef GL_ARB_vertex_buffer_object -#define GL_ARB_vertex_buffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindBufferARB(GLenum, GLuint); -GLAPI void APIENTRY glDeleteBuffersARB(GLsizei, const GLuint *); -GLAPI void APIENTRY glGenBuffersARB(GLsizei, GLuint *); -GLAPI GLboolean APIENTRY glIsBufferARB(GLuint); -GLAPI void APIENTRY glBufferDataARB(GLenum, GLsizeiptrARB, const GLvoid *, GLenum); -GLAPI void APIENTRY glBufferSubDataARB(GLenum, GLintptrARB, GLsizeiptrARB, const GLvoid *); -GLAPI void APIENTRY glGetBufferSubDataARB(GLenum, GLintptrARB, GLsizeiptrARB, GLvoid *); -GLAPI GLvoid *APIENTRY glMapBufferARB(GLenum, GLenum); -GLAPI GLboolean APIENTRY glUnmapBufferARB(GLenum); -GLAPI void APIENTRY glGetBufferParameterivARB(GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetBufferPointervARB(GLenum, GLenum, GLvoid **); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLBINDBUFFERARBPROC)(GLenum target, GLuint buffer); -typedef void(APIENTRYP PFNGLDELETEBUFFERSARBPROC)(GLsizei n, const GLuint *buffers); -typedef void(APIENTRYP PFNGLGENBUFFERSARBPROC)(GLsizei n, GLuint *buffers); -typedef GLboolean(APIENTRYP PFNGLISBUFFERARBPROC)(GLuint buffer); -typedef void(APIENTRYP PFNGLBUFFERDATAARBPROC)(GLenum target, GLsizeiptrARB size, const GLvoid *data, GLenum usage); -typedef void(APIENTRYP PFNGLBUFFERSUBDATAARBPROC)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, const GLvoid *data); -typedef void(APIENTRYP PFNGLGETBUFFERSUBDATAARBPROC)(GLenum target, GLintptrARB offset, GLsizeiptrARB size, GLvoid *data); -typedef GLvoid *(APIENTRYP PFNGLMAPBUFFERARBPROC)(GLenum target, GLenum access); -typedef GLboolean(APIENTRYP PFNGLUNMAPBUFFERARBPROC)(GLenum target); -typedef void(APIENTRYP PFNGLGETBUFFERPARAMETERIVARBPROC)(GLenum target, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETBUFFERPOINTERVARBPROC)(GLenum target, GLenum pname, GLvoid **params); -#endif - -#ifndef GL_ARB_occlusion_query -#define GL_ARB_occlusion_query 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenQueriesARB(GLsizei, GLuint *); -GLAPI void APIENTRY glDeleteQueriesARB(GLsizei, const GLuint *); -GLAPI GLboolean APIENTRY glIsQueryARB(GLuint); -GLAPI void APIENTRY glBeginQueryARB(GLenum, GLuint); -GLAPI void APIENTRY glEndQueryARB(GLenum); -GLAPI void APIENTRY glGetQueryivARB(GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetQueryObjectivARB(GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetQueryObjectuivARB(GLuint, GLenum, GLuint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLGENQUERIESARBPROC)(GLsizei n, GLuint *ids); -typedef void(APIENTRYP PFNGLDELETEQUERIESARBPROC)(GLsizei n, const GLuint *ids); -typedef GLboolean(APIENTRYP PFNGLISQUERYARBPROC)(GLuint id); -typedef void(APIENTRYP PFNGLBEGINQUERYARBPROC)(GLenum target, GLuint id); -typedef void(APIENTRYP PFNGLENDQUERYARBPROC)(GLenum target); -typedef void(APIENTRYP PFNGLGETQUERYIVARBPROC)(GLenum target, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETQUERYOBJECTIVARBPROC)(GLuint id, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETQUERYOBJECTUIVARBPROC)(GLuint id, GLenum pname, GLuint *params); -#endif - -#ifndef GL_ARB_shader_objects -#define GL_ARB_shader_objects 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDeleteObjectARB(GLhandleARB); -GLAPI GLhandleARB APIENTRY glGetHandleARB(GLenum); -GLAPI void APIENTRY glDetachObjectARB(GLhandleARB, GLhandleARB); -GLAPI GLhandleARB APIENTRY glCreateShaderObjectARB(GLenum); -GLAPI void APIENTRY glShaderSourceARB(GLhandleARB, GLsizei, const GLcharARB **, const GLint *); -GLAPI void APIENTRY glCompileShaderARB(GLhandleARB); -GLAPI GLhandleARB APIENTRY glCreateProgramObjectARB(void); -GLAPI void APIENTRY glAttachObjectARB(GLhandleARB, GLhandleARB); -GLAPI void APIENTRY glLinkProgramARB(GLhandleARB); -GLAPI void APIENTRY glUseProgramObjectARB(GLhandleARB); -GLAPI void APIENTRY glValidateProgramARB(GLhandleARB); -GLAPI void APIENTRY glUniform1fARB(GLint, GLfloat); -GLAPI void APIENTRY glUniform2fARB(GLint, GLfloat, GLfloat); -GLAPI void APIENTRY glUniform3fARB(GLint, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glUniform4fARB(GLint, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glUniform1iARB(GLint, GLint); -GLAPI void APIENTRY glUniform2iARB(GLint, GLint, GLint); -GLAPI void APIENTRY glUniform3iARB(GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glUniform4iARB(GLint, GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glUniform1fvARB(GLint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glUniform2fvARB(GLint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glUniform3fvARB(GLint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glUniform4fvARB(GLint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glUniform1ivARB(GLint, GLsizei, const GLint *); -GLAPI void APIENTRY glUniform2ivARB(GLint, GLsizei, const GLint *); -GLAPI void APIENTRY glUniform3ivARB(GLint, GLsizei, const GLint *); -GLAPI void APIENTRY glUniform4ivARB(GLint, GLsizei, const GLint *); -GLAPI void APIENTRY glUniformMatrix2fvARB(GLint, GLsizei, GLboolean, const GLfloat *); -GLAPI void APIENTRY glUniformMatrix3fvARB(GLint, GLsizei, GLboolean, const GLfloat *); -GLAPI void APIENTRY glUniformMatrix4fvARB(GLint, GLsizei, GLboolean, const GLfloat *); -GLAPI void APIENTRY glGetObjectParameterfvARB(GLhandleARB, GLenum, GLfloat *); -GLAPI void APIENTRY glGetObjectParameterivARB(GLhandleARB, GLenum, GLint *); -GLAPI void APIENTRY glGetInfoLogARB(GLhandleARB, GLsizei, GLsizei *, GLcharARB *); -GLAPI void APIENTRY glGetAttachedObjectsARB(GLhandleARB, GLsizei, GLsizei *, GLhandleARB *); -GLAPI GLint APIENTRY glGetUniformLocationARB(GLhandleARB, const GLcharARB *); -GLAPI void APIENTRY glGetActiveUniformARB(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *); -GLAPI void APIENTRY glGetUniformfvARB(GLhandleARB, GLint, GLfloat *); -GLAPI void APIENTRY glGetUniformivARB(GLhandleARB, GLint, GLint *); -GLAPI void APIENTRY glGetShaderSourceARB(GLhandleARB, GLsizei, GLsizei *, GLcharARB *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLDELETEOBJECTARBPROC)(GLhandleARB obj); -typedef GLhandleARB(APIENTRYP PFNGLGETHANDLEARBPROC)(GLenum pname); -typedef void(APIENTRYP PFNGLDETACHOBJECTARBPROC)(GLhandleARB containerObj, GLhandleARB attachedObj); -typedef GLhandleARB(APIENTRYP PFNGLCREATESHADEROBJECTARBPROC)(GLenum shaderType); -typedef void(APIENTRYP PFNGLSHADERSOURCEARBPROC)(GLhandleARB shaderObj, GLsizei count, const GLcharARB **string, const GLint *length); -typedef void(APIENTRYP PFNGLCOMPILESHADERARBPROC)(GLhandleARB shaderObj); -typedef GLhandleARB(APIENTRYP PFNGLCREATEPROGRAMOBJECTARBPROC)(void); -typedef void(APIENTRYP PFNGLATTACHOBJECTARBPROC)(GLhandleARB containerObj, GLhandleARB obj); -typedef void(APIENTRYP PFNGLLINKPROGRAMARBPROC)(GLhandleARB programObj); -typedef void(APIENTRYP PFNGLUSEPROGRAMOBJECTARBPROC)(GLhandleARB programObj); -typedef void(APIENTRYP PFNGLVALIDATEPROGRAMARBPROC)(GLhandleARB programObj); -typedef void(APIENTRYP PFNGLUNIFORM1FARBPROC)(GLint location, GLfloat v0); -typedef void(APIENTRYP PFNGLUNIFORM2FARBPROC)(GLint location, GLfloat v0, GLfloat v1); -typedef void(APIENTRYP PFNGLUNIFORM3FARBPROC)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2); -typedef void(APIENTRYP PFNGLUNIFORM4FARBPROC)(GLint location, GLfloat v0, GLfloat v1, GLfloat v2, GLfloat v3); -typedef void(APIENTRYP PFNGLUNIFORM1IARBPROC)(GLint location, GLint v0); -typedef void(APIENTRYP PFNGLUNIFORM2IARBPROC)(GLint location, GLint v0, GLint v1); -typedef void(APIENTRYP PFNGLUNIFORM3IARBPROC)(GLint location, GLint v0, GLint v1, GLint v2); -typedef void(APIENTRYP PFNGLUNIFORM4IARBPROC)(GLint location, GLint v0, GLint v1, GLint v2, GLint v3); -typedef void(APIENTRYP PFNGLUNIFORM1FVARBPROC)(GLint location, GLsizei count, const GLfloat *value); -typedef void(APIENTRYP PFNGLUNIFORM2FVARBPROC)(GLint location, GLsizei count, const GLfloat *value); -typedef void(APIENTRYP PFNGLUNIFORM3FVARBPROC)(GLint location, GLsizei count, const GLfloat *value); -typedef void(APIENTRYP PFNGLUNIFORM4FVARBPROC)(GLint location, GLsizei count, const GLfloat *value); -typedef void(APIENTRYP PFNGLUNIFORM1IVARBPROC)(GLint location, GLsizei count, const GLint *value); -typedef void(APIENTRYP PFNGLUNIFORM2IVARBPROC)(GLint location, GLsizei count, const GLint *value); -typedef void(APIENTRYP PFNGLUNIFORM3IVARBPROC)(GLint location, GLsizei count, const GLint *value); -typedef void(APIENTRYP PFNGLUNIFORM4IVARBPROC)(GLint location, GLsizei count, const GLint *value); -typedef void(APIENTRYP PFNGLUNIFORMMATRIX2FVARBPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void(APIENTRYP PFNGLUNIFORMMATRIX3FVARBPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void(APIENTRYP PFNGLUNIFORMMATRIX4FVARBPROC)(GLint location, GLsizei count, GLboolean transpose, const GLfloat *value); -typedef void(APIENTRYP PFNGLGETOBJECTPARAMETERFVARBPROC)(GLhandleARB obj, GLenum pname, GLfloat *params); -typedef void(APIENTRYP PFNGLGETOBJECTPARAMETERIVARBPROC)(GLhandleARB obj, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETINFOLOGARBPROC)(GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *infoLog); -typedef void(APIENTRYP PFNGLGETATTACHEDOBJECTSARBPROC)(GLhandleARB containerObj, GLsizei maxCount, GLsizei *count, GLhandleARB *obj); -typedef GLint(APIENTRYP PFNGLGETUNIFORMLOCATIONARBPROC)(GLhandleARB programObj, const GLcharARB *name); -typedef void(APIENTRYP PFNGLGETACTIVEUNIFORMARBPROC)(GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name); -typedef void(APIENTRYP PFNGLGETUNIFORMFVARBPROC)(GLhandleARB programObj, GLint location, GLfloat *params); -typedef void(APIENTRYP PFNGLGETUNIFORMIVARBPROC)(GLhandleARB programObj, GLint location, GLint *params); -typedef void(APIENTRYP PFNGLGETSHADERSOURCEARBPROC)(GLhandleARB obj, GLsizei maxLength, GLsizei *length, GLcharARB *source); -#endif - -#ifndef GL_ARB_vertex_shader -#define GL_ARB_vertex_shader 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindAttribLocationARB(GLhandleARB, GLuint, const GLcharARB *); -GLAPI void APIENTRY glGetActiveAttribARB(GLhandleARB, GLuint, GLsizei, GLsizei *, GLint *, GLenum *, GLcharARB *); -GLAPI GLint APIENTRY glGetAttribLocationARB(GLhandleARB, const GLcharARB *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLBINDATTRIBLOCATIONARBPROC)(GLhandleARB programObj, GLuint index, const GLcharARB *name); -typedef void(APIENTRYP PFNGLGETACTIVEATTRIBARBPROC)(GLhandleARB programObj, GLuint index, GLsizei maxLength, GLsizei *length, GLint *size, GLenum *type, GLcharARB *name); -typedef GLint(APIENTRYP PFNGLGETATTRIBLOCATIONARBPROC)(GLhandleARB programObj, const GLcharARB *name); -#endif - -#ifndef GL_ARB_fragment_shader -#define GL_ARB_fragment_shader 1 -#endif - -#ifndef GL_ARB_shading_language_100 -#define GL_ARB_shading_language_100 1 -#endif - -#ifndef GL_ARB_texture_non_power_of_two -#define GL_ARB_texture_non_power_of_two 1 -#endif - -#ifndef GL_ARB_point_sprite -#define GL_ARB_point_sprite 1 -#endif - -#ifndef GL_ARB_fragment_program_shadow -#define GL_ARB_fragment_program_shadow 1 -#endif - -#ifndef GL_ARB_draw_buffers -#define GL_ARB_draw_buffers 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawBuffersARB(GLsizei, const GLenum *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLDRAWBUFFERSARBPROC)(GLsizei n, const GLenum *bufs); -#endif - -#ifndef GL_ARB_texture_rectangle -#define GL_ARB_texture_rectangle 1 -#endif - -#ifndef GL_ARB_color_buffer_float -#define GL_ARB_color_buffer_float 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glClampColorARB(GLenum, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLCLAMPCOLORARBPROC)(GLenum target, GLenum clamp); -#endif - -#ifndef GL_ARB_half_float_pixel -#define GL_ARB_half_float_pixel 1 -#endif - -#ifndef GL_ARB_texture_float -#define GL_ARB_texture_float 1 -#endif - -#ifndef GL_ARB_pixel_buffer_object -#define GL_ARB_pixel_buffer_object 1 -#endif - -#ifndef GL_EXT_abgr -#define GL_EXT_abgr 1 -#endif - -#ifndef GL_EXT_blend_color -#define GL_EXT_blend_color 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendColorEXT(GLclampf, GLclampf, GLclampf, GLclampf); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLBLENDCOLOREXTPROC)(GLclampf red, GLclampf green, GLclampf blue, GLclampf alpha); -#endif - -#ifndef GL_EXT_polygon_offset -#define GL_EXT_polygon_offset 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPolygonOffsetEXT(GLfloat, GLfloat); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLPOLYGONOFFSETEXTPROC)(GLfloat factor, GLfloat bias); -#endif - -#ifndef GL_EXT_texture -#define GL_EXT_texture 1 -#endif - -#ifndef GL_EXT_texture3D -#define GL_EXT_texture3D 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexImage3DEXT(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glTexSubImage3DEXT(GLenum, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLTEXIMAGE3DEXTPROC)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void(APIENTRYP PFNGLTEXSUBIMAGE3DEXTPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLsizei width, GLsizei height, GLsizei depth, GLenum format, GLenum type, const GLvoid *pixels); -#endif - -#ifndef GL_SGIS_texture_filter4 -#define GL_SGIS_texture_filter4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetTexFilterFuncSGIS(GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glTexFilterFuncSGIS(GLenum, GLenum, GLsizei, const GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLGETTEXFILTERFUNCSGISPROC)(GLenum target, GLenum filter, GLfloat *weights); -typedef void(APIENTRYP PFNGLTEXFILTERFUNCSGISPROC)(GLenum target, GLenum filter, GLsizei n, const GLfloat *weights); -#endif - -#ifndef GL_EXT_subtexture -#define GL_EXT_subtexture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexSubImage1DEXT(GLenum, GLint, GLint, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glTexSubImage2DEXT(GLenum, GLint, GLint, GLint, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLTEXSUBIMAGE1DEXTPROC)(GLenum target, GLint level, GLint xoffset, GLsizei width, GLenum format, GLenum type, const GLvoid *pixels); -typedef void(APIENTRYP PFNGLTEXSUBIMAGE2DEXTPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *pixels); -#endif - -#ifndef GL_EXT_copy_texture -#define GL_EXT_copy_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCopyTexImage1DEXT(GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLint); -GLAPI void APIENTRY glCopyTexImage2DEXT(GLenum, GLint, GLenum, GLint, GLint, GLsizei, GLsizei, GLint); -GLAPI void APIENTRY glCopyTexSubImage1DEXT(GLenum, GLint, GLint, GLint, GLint, GLsizei); -GLAPI void APIENTRY glCopyTexSubImage2DEXT(GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei); -GLAPI void APIENTRY glCopyTexSubImage3DEXT(GLenum, GLint, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLCOPYTEXIMAGE1DEXTPROC)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLint border); -typedef void(APIENTRYP PFNGLCOPYTEXIMAGE2DEXTPROC)(GLenum target, GLint level, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height, GLint border); -typedef void(APIENTRYP PFNGLCOPYTEXSUBIMAGE1DEXTPROC)(GLenum target, GLint level, GLint xoffset, GLint x, GLint y, GLsizei width); -typedef void(APIENTRYP PFNGLCOPYTEXSUBIMAGE2DEXTPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void(APIENTRYP PFNGLCOPYTEXSUBIMAGE3DEXTPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint x, GLint y, GLsizei width, GLsizei height); -#endif - -#ifndef GL_EXT_histogram -#define GL_EXT_histogram 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetHistogramEXT(GLenum, GLboolean, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetHistogramParameterfvEXT(GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetHistogramParameterivEXT(GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetMinmaxEXT(GLenum, GLboolean, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetMinmaxParameterfvEXT(GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetMinmaxParameterivEXT(GLenum, GLenum, GLint *); -GLAPI void APIENTRY glHistogramEXT(GLenum, GLsizei, GLenum, GLboolean); -GLAPI void APIENTRY glMinmaxEXT(GLenum, GLenum, GLboolean); -GLAPI void APIENTRY glResetHistogramEXT(GLenum); -GLAPI void APIENTRY glResetMinmaxEXT(GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLGETHISTOGRAMEXTPROC)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -typedef void(APIENTRYP PFNGLGETHISTOGRAMPARAMETERFVEXTPROC)(GLenum target, GLenum pname, GLfloat *params); -typedef void(APIENTRYP PFNGLGETHISTOGRAMPARAMETERIVEXTPROC)(GLenum target, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETMINMAXEXTPROC)(GLenum target, GLboolean reset, GLenum format, GLenum type, GLvoid *values); -typedef void(APIENTRYP PFNGLGETMINMAXPARAMETERFVEXTPROC)(GLenum target, GLenum pname, GLfloat *params); -typedef void(APIENTRYP PFNGLGETMINMAXPARAMETERIVEXTPROC)(GLenum target, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLHISTOGRAMEXTPROC)(GLenum target, GLsizei width, GLenum internalformat, GLboolean sink); -typedef void(APIENTRYP PFNGLMINMAXEXTPROC)(GLenum target, GLenum internalformat, GLboolean sink); -typedef void(APIENTRYP PFNGLRESETHISTOGRAMEXTPROC)(GLenum target); -typedef void(APIENTRYP PFNGLRESETMINMAXEXTPROC)(GLenum target); -#endif - -#ifndef GL_EXT_convolution -#define GL_EXT_convolution 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glConvolutionFilter1DEXT(GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glConvolutionFilter2DEXT(GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glConvolutionParameterfEXT(GLenum, GLenum, GLfloat); -GLAPI void APIENTRY glConvolutionParameterfvEXT(GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glConvolutionParameteriEXT(GLenum, GLenum, GLint); -GLAPI void APIENTRY glConvolutionParameterivEXT(GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glCopyConvolutionFilter1DEXT(GLenum, GLenum, GLint, GLint, GLsizei); -GLAPI void APIENTRY glCopyConvolutionFilter2DEXT(GLenum, GLenum, GLint, GLint, GLsizei, GLsizei); -GLAPI void APIENTRY glGetConvolutionFilterEXT(GLenum, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetConvolutionParameterfvEXT(GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetConvolutionParameterivEXT(GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetSeparableFilterEXT(GLenum, GLenum, GLenum, GLvoid *, GLvoid *, GLvoid *); -GLAPI void APIENTRY glSeparableFilter2DEXT(GLenum, GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLCONVOLUTIONFILTER1DEXTPROC)(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *image); -typedef void(APIENTRYP PFNGLCONVOLUTIONFILTER2DEXTPROC)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *image); -typedef void(APIENTRYP PFNGLCONVOLUTIONPARAMETERFEXTPROC)(GLenum target, GLenum pname, GLfloat params); -typedef void(APIENTRYP PFNGLCONVOLUTIONPARAMETERFVEXTPROC)(GLenum target, GLenum pname, const GLfloat *params); -typedef void(APIENTRYP PFNGLCONVOLUTIONPARAMETERIEXTPROC)(GLenum target, GLenum pname, GLint params); -typedef void(APIENTRYP PFNGLCONVOLUTIONPARAMETERIVEXTPROC)(GLenum target, GLenum pname, const GLint *params); -typedef void(APIENTRYP PFNGLCOPYCONVOLUTIONFILTER1DEXTPROC)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void(APIENTRYP PFNGLCOPYCONVOLUTIONFILTER2DEXTPROC)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width, GLsizei height); -typedef void(APIENTRYP PFNGLGETCONVOLUTIONFILTEREXTPROC)(GLenum target, GLenum format, GLenum type, GLvoid *image); -typedef void(APIENTRYP PFNGLGETCONVOLUTIONPARAMETERFVEXTPROC)(GLenum target, GLenum pname, GLfloat *params); -typedef void(APIENTRYP PFNGLGETCONVOLUTIONPARAMETERIVEXTPROC)(GLenum target, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETSEPARABLEFILTEREXTPROC)(GLenum target, GLenum format, GLenum type, GLvoid *row, GLvoid *column, GLvoid *span); -typedef void(APIENTRYP PFNGLSEPARABLEFILTER2DEXTPROC)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height, GLenum format, GLenum type, const GLvoid *row, const GLvoid *column); -#endif - -#ifndef GL_SGI_color_matrix -#define GL_SGI_color_matrix 1 -#endif - -#ifndef GL_SGI_color_table -#define GL_SGI_color_table 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorTableSGI(GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glColorTableParameterfvSGI(GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glColorTableParameterivSGI(GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glCopyColorTableSGI(GLenum, GLenum, GLint, GLint, GLsizei); -GLAPI void APIENTRY glGetColorTableSGI(GLenum, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetColorTableParameterfvSGI(GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetColorTableParameterivSGI(GLenum, GLenum, GLint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLCOLORTABLESGIPROC)(GLenum target, GLenum internalformat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -typedef void(APIENTRYP PFNGLCOLORTABLEPARAMETERFVSGIPROC)(GLenum target, GLenum pname, const GLfloat *params); -typedef void(APIENTRYP PFNGLCOLORTABLEPARAMETERIVSGIPROC)(GLenum target, GLenum pname, const GLint *params); -typedef void(APIENTRYP PFNGLCOPYCOLORTABLESGIPROC)(GLenum target, GLenum internalformat, GLint x, GLint y, GLsizei width); -typedef void(APIENTRYP PFNGLGETCOLORTABLESGIPROC)(GLenum target, GLenum format, GLenum type, GLvoid *table); -typedef void(APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVSGIPROC)(GLenum target, GLenum pname, GLfloat *params); -typedef void(APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVSGIPROC)(GLenum target, GLenum pname, GLint *params); -#endif - -#ifndef GL_SGIX_pixel_texture -#define GL_SGIX_pixel_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPixelTexGenSGIX(GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLPIXELTEXGENSGIXPROC)(GLenum mode); -#endif - -#ifndef GL_SGIS_pixel_texture -#define GL_SGIS_pixel_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPixelTexGenParameteriSGIS(GLenum, GLint); -GLAPI void APIENTRY glPixelTexGenParameterivSGIS(GLenum, const GLint *); -GLAPI void APIENTRY glPixelTexGenParameterfSGIS(GLenum, GLfloat); -GLAPI void APIENTRY glPixelTexGenParameterfvSGIS(GLenum, const GLfloat *); -GLAPI void APIENTRY glGetPixelTexGenParameterivSGIS(GLenum, GLint *); -GLAPI void APIENTRY glGetPixelTexGenParameterfvSGIS(GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLPIXELTEXGENPARAMETERISGISPROC)(GLenum pname, GLint param); -typedef void(APIENTRYP PFNGLPIXELTEXGENPARAMETERIVSGISPROC)(GLenum pname, const GLint *params); -typedef void(APIENTRYP PFNGLPIXELTEXGENPARAMETERFSGISPROC)(GLenum pname, GLfloat param); -typedef void(APIENTRYP PFNGLPIXELTEXGENPARAMETERFVSGISPROC)(GLenum pname, const GLfloat *params); -typedef void(APIENTRYP PFNGLGETPIXELTEXGENPARAMETERIVSGISPROC)(GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETPIXELTEXGENPARAMETERFVSGISPROC)(GLenum pname, GLfloat *params); -#endif - -#ifndef GL_SGIS_texture4D -#define GL_SGIS_texture4D 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexImage4DSGIS(GLenum, GLint, GLenum, GLsizei, GLsizei, GLsizei, GLsizei, GLint, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glTexSubImage4DSGIS(GLenum, GLint, GLint, GLint, GLint, GLint, GLsizei, GLsizei, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLTEXIMAGE4DSGISPROC)(GLenum target, GLint level, GLenum internalformat, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLint border, GLenum format, GLenum type, const GLvoid *pixels); -typedef void(APIENTRYP PFNGLTEXSUBIMAGE4DSGISPROC)(GLenum target, GLint level, GLint xoffset, GLint yoffset, GLint zoffset, GLint woffset, GLsizei width, GLsizei height, GLsizei depth, GLsizei size4d, GLenum format, GLenum type, const GLvoid *pixels); -#endif - -#ifndef GL_SGI_texture_color_table -#define GL_SGI_texture_color_table 1 -#endif - -#ifndef GL_EXT_cmyka -#define GL_EXT_cmyka 1 -#endif - -#ifndef GL_EXT_texture_object -#define GL_EXT_texture_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLboolean APIENTRY glAreTexturesResidentEXT(GLsizei, const GLuint *, GLboolean *); -GLAPI void APIENTRY glBindTextureEXT(GLenum, GLuint); -GLAPI void APIENTRY glDeleteTexturesEXT(GLsizei, const GLuint *); -GLAPI void APIENTRY glGenTexturesEXT(GLsizei, GLuint *); -GLAPI GLboolean APIENTRY glIsTextureEXT(GLuint); -GLAPI void APIENTRY glPrioritizeTexturesEXT(GLsizei, const GLuint *, const GLclampf *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLboolean(APIENTRYP PFNGLARETEXTURESRESIDENTEXTPROC)(GLsizei n, const GLuint *textures, GLboolean *residences); -typedef void(APIENTRYP PFNGLBINDTEXTUREEXTPROC)(GLenum target, GLuint texture); -typedef void(APIENTRYP PFNGLDELETETEXTURESEXTPROC)(GLsizei n, const GLuint *textures); -typedef void(APIENTRYP PFNGLGENTEXTURESEXTPROC)(GLsizei n, GLuint *textures); -typedef GLboolean(APIENTRYP PFNGLISTEXTUREEXTPROC)(GLuint texture); -typedef void(APIENTRYP PFNGLPRIORITIZETEXTURESEXTPROC)(GLsizei n, const GLuint *textures, const GLclampf *priorities); -#endif - -#ifndef GL_SGIS_detail_texture -#define GL_SGIS_detail_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDetailTexFuncSGIS(GLenum, GLsizei, const GLfloat *); -GLAPI void APIENTRY glGetDetailTexFuncSGIS(GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLDETAILTEXFUNCSGISPROC)(GLenum target, GLsizei n, const GLfloat *points); -typedef void(APIENTRYP PFNGLGETDETAILTEXFUNCSGISPROC)(GLenum target, GLfloat *points); -#endif - -#ifndef GL_SGIS_sharpen_texture -#define GL_SGIS_sharpen_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSharpenTexFuncSGIS(GLenum, GLsizei, const GLfloat *); -GLAPI void APIENTRY glGetSharpenTexFuncSGIS(GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLSHARPENTEXFUNCSGISPROC)(GLenum target, GLsizei n, const GLfloat *points); -typedef void(APIENTRYP PFNGLGETSHARPENTEXFUNCSGISPROC)(GLenum target, GLfloat *points); -#endif - -#ifndef GL_EXT_packed_pixels -#define GL_EXT_packed_pixels 1 -#endif - -#ifndef GL_SGIS_texture_lod -#define GL_SGIS_texture_lod 1 -#endif - -#ifndef GL_SGIS_multisample -#define GL_SGIS_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSampleMaskSGIS(GLclampf, GLboolean); -GLAPI void APIENTRY glSamplePatternSGIS(GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLSAMPLEMASKSGISPROC)(GLclampf value, GLboolean invert); -typedef void(APIENTRYP PFNGLSAMPLEPATTERNSGISPROC)(GLenum pattern); -#endif - -#ifndef GL_EXT_rescale_normal -#define GL_EXT_rescale_normal 1 -#endif - -#ifndef GL_EXT_vertex_array -#define GL_EXT_vertex_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glArrayElementEXT(GLint); -GLAPI void APIENTRY glColorPointerEXT(GLint, GLenum, GLsizei, GLsizei, const GLvoid *); -GLAPI void APIENTRY glDrawArraysEXT(GLenum, GLint, GLsizei); -GLAPI void APIENTRY glEdgeFlagPointerEXT(GLsizei, GLsizei, const GLboolean *); -GLAPI void APIENTRY glGetPointervEXT(GLenum, GLvoid **); -GLAPI void APIENTRY glIndexPointerEXT(GLenum, GLsizei, GLsizei, const GLvoid *); -GLAPI void APIENTRY glNormalPointerEXT(GLenum, GLsizei, GLsizei, const GLvoid *); -GLAPI void APIENTRY glTexCoordPointerEXT(GLint, GLenum, GLsizei, GLsizei, const GLvoid *); -GLAPI void APIENTRY glVertexPointerEXT(GLint, GLenum, GLsizei, GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLARRAYELEMENTEXTPROC)(GLint i); -typedef void(APIENTRYP PFNGLCOLORPOINTEREXTPROC)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -typedef void(APIENTRYP PFNGLDRAWARRAYSEXTPROC)(GLenum mode, GLint first, GLsizei count); -typedef void(APIENTRYP PFNGLEDGEFLAGPOINTEREXTPROC)(GLsizei stride, GLsizei count, const GLboolean *pointer); -typedef void(APIENTRYP PFNGLGETPOINTERVEXTPROC)(GLenum pname, GLvoid **params); -typedef void(APIENTRYP PFNGLINDEXPOINTEREXTPROC)(GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -typedef void(APIENTRYP PFNGLNORMALPOINTEREXTPROC)(GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -typedef void(APIENTRYP PFNGLTEXCOORDPOINTEREXTPROC)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -typedef void(APIENTRYP PFNGLVERTEXPOINTEREXTPROC)(GLint size, GLenum type, GLsizei stride, GLsizei count, const GLvoid *pointer); -#endif - -#ifndef GL_EXT_misc_attribute -#define GL_EXT_misc_attribute 1 -#endif - -#ifndef GL_SGIS_generate_mipmap -#define GL_SGIS_generate_mipmap 1 -#endif - -#ifndef GL_SGIX_clipmap -#define GL_SGIX_clipmap 1 -#endif - -#ifndef GL_SGIX_shadow -#define GL_SGIX_shadow 1 -#endif - -#ifndef GL_SGIS_texture_edge_clamp -#define GL_SGIS_texture_edge_clamp 1 -#endif - -#ifndef GL_SGIS_texture_border_clamp -#define GL_SGIS_texture_border_clamp 1 -#endif - -#ifndef GL_EXT_blend_minmax -#define GL_EXT_blend_minmax 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendEquationEXT(GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLBLENDEQUATIONEXTPROC)(GLenum mode); -#endif - -#ifndef GL_EXT_blend_subtract -#define GL_EXT_blend_subtract 1 -#endif - -#ifndef GL_EXT_blend_logic_op -#define GL_EXT_blend_logic_op 1 -#endif - -#ifndef GL_SGIX_interlace -#define GL_SGIX_interlace 1 -#endif - -#ifndef GL_SGIX_pixel_tiles -#define GL_SGIX_pixel_tiles 1 -#endif - -#ifndef GL_SGIX_texture_select -#define GL_SGIX_texture_select 1 -#endif - -#ifndef GL_SGIX_sprite -#define GL_SGIX_sprite 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSpriteParameterfSGIX(GLenum, GLfloat); -GLAPI void APIENTRY glSpriteParameterfvSGIX(GLenum, const GLfloat *); -GLAPI void APIENTRY glSpriteParameteriSGIX(GLenum, GLint); -GLAPI void APIENTRY glSpriteParameterivSGIX(GLenum, const GLint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLSPRITEPARAMETERFSGIXPROC)(GLenum pname, GLfloat param); -typedef void(APIENTRYP PFNGLSPRITEPARAMETERFVSGIXPROC)(GLenum pname, const GLfloat *params); -typedef void(APIENTRYP PFNGLSPRITEPARAMETERISGIXPROC)(GLenum pname, GLint param); -typedef void(APIENTRYP PFNGLSPRITEPARAMETERIVSGIXPROC)(GLenum pname, const GLint *params); -#endif - -#ifndef GL_SGIX_texture_multi_buffer -#define GL_SGIX_texture_multi_buffer 1 -#endif - -#ifndef GL_EXT_point_parameters -#define GL_EXT_point_parameters 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPointParameterfEXT(GLenum, GLfloat); -GLAPI void APIENTRY glPointParameterfvEXT(GLenum, const GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLPOINTPARAMETERFEXTPROC)(GLenum pname, GLfloat param); -typedef void(APIENTRYP PFNGLPOINTPARAMETERFVEXTPROC)(GLenum pname, const GLfloat *params); -#endif - -#ifndef GL_SGIS_point_parameters -#define GL_SGIS_point_parameters 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPointParameterfSGIS(GLenum, GLfloat); -GLAPI void APIENTRY glPointParameterfvSGIS(GLenum, const GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLPOINTPARAMETERFSGISPROC)(GLenum pname, GLfloat param); -typedef void(APIENTRYP PFNGLPOINTPARAMETERFVSGISPROC)(GLenum pname, const GLfloat *params); -#endif - -#ifndef GL_SGIX_instruments -#define GL_SGIX_instruments 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLint APIENTRY glGetInstrumentsSGIX(void); -GLAPI void APIENTRY glInstrumentsBufferSGIX(GLsizei, GLint *); -GLAPI GLint APIENTRY glPollInstrumentsSGIX(GLint *); -GLAPI void APIENTRY glReadInstrumentsSGIX(GLint); -GLAPI void APIENTRY glStartInstrumentsSGIX(void); -GLAPI void APIENTRY glStopInstrumentsSGIX(GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLint(APIENTRYP PFNGLGETINSTRUMENTSSGIXPROC)(void); -typedef void(APIENTRYP PFNGLINSTRUMENTSBUFFERSGIXPROC)(GLsizei size, GLint *buffer); -typedef GLint(APIENTRYP PFNGLPOLLINSTRUMENTSSGIXPROC)(GLint *marker_p); -typedef void(APIENTRYP PFNGLREADINSTRUMENTSSGIXPROC)(GLint marker); -typedef void(APIENTRYP PFNGLSTARTINSTRUMENTSSGIXPROC)(void); -typedef void(APIENTRYP PFNGLSTOPINSTRUMENTSSGIXPROC)(GLint marker); -#endif - -#ifndef GL_SGIX_texture_scale_bias -#define GL_SGIX_texture_scale_bias 1 -#endif - -#ifndef GL_SGIX_framezoom -#define GL_SGIX_framezoom 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFrameZoomSGIX(GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLFRAMEZOOMSGIXPROC)(GLint factor); -#endif - -#ifndef GL_SGIX_tag_sample_buffer -#define GL_SGIX_tag_sample_buffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTagSampleBufferSGIX(void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLTAGSAMPLEBUFFERSGIXPROC)(void); -#endif - -#ifndef GL_SGIX_polynomial_ffd -#define GL_SGIX_polynomial_ffd 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDeformationMap3dSGIX(GLenum, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, GLdouble, GLdouble, GLint, GLint, const GLdouble *); -GLAPI void APIENTRY glDeformationMap3fSGIX(GLenum, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, GLfloat, GLfloat, GLint, GLint, const GLfloat *); -GLAPI void APIENTRY glDeformSGIX(GLbitfield); -GLAPI void APIENTRY glLoadIdentityDeformationMapSGIX(GLbitfield); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLDEFORMATIONMAP3DSGIXPROC)(GLenum target, GLdouble u1, GLdouble u2, GLint ustride, GLint uorder, GLdouble v1, GLdouble v2, GLint vstride, GLint vorder, GLdouble w1, GLdouble w2, GLint wstride, GLint worder, const GLdouble *points); -typedef void(APIENTRYP PFNGLDEFORMATIONMAP3FSGIXPROC)(GLenum target, GLfloat u1, GLfloat u2, GLint ustride, GLint uorder, GLfloat v1, GLfloat v2, GLint vstride, GLint vorder, GLfloat w1, GLfloat w2, GLint wstride, GLint worder, const GLfloat *points); -typedef void(APIENTRYP PFNGLDEFORMSGIXPROC)(GLbitfield mask); -typedef void(APIENTRYP PFNGLLOADIDENTITYDEFORMATIONMAPSGIXPROC)(GLbitfield mask); -#endif - -#ifndef GL_SGIX_reference_plane -#define GL_SGIX_reference_plane 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glReferencePlaneSGIX(const GLdouble *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLREFERENCEPLANESGIXPROC)(const GLdouble *equation); -#endif - -#ifndef GL_SGIX_flush_raster -#define GL_SGIX_flush_raster 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFlushRasterSGIX(void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLFLUSHRASTERSGIXPROC)(void); -#endif - -#ifndef GL_SGIX_depth_texture -#define GL_SGIX_depth_texture 1 -#endif - -#ifndef GL_SGIS_fog_function -#define GL_SGIS_fog_function 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFogFuncSGIS(GLsizei, const GLfloat *); -GLAPI void APIENTRY glGetFogFuncSGIS(GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLFOGFUNCSGISPROC)(GLsizei n, const GLfloat *points); -typedef void(APIENTRYP PFNGLGETFOGFUNCSGISPROC)(GLfloat *points); -#endif - -#ifndef GL_SGIX_fog_offset -#define GL_SGIX_fog_offset 1 -#endif - -#ifndef GL_HP_image_transform -#define GL_HP_image_transform 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glImageTransformParameteriHP(GLenum, GLenum, GLint); -GLAPI void APIENTRY glImageTransformParameterfHP(GLenum, GLenum, GLfloat); -GLAPI void APIENTRY glImageTransformParameterivHP(GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glImageTransformParameterfvHP(GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glGetImageTransformParameterivHP(GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetImageTransformParameterfvHP(GLenum, GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIHPPROC)(GLenum target, GLenum pname, GLint param); -typedef void(APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFHPPROC)(GLenum target, GLenum pname, GLfloat param); -typedef void(APIENTRYP PFNGLIMAGETRANSFORMPARAMETERIVHPPROC)(GLenum target, GLenum pname, const GLint *params); -typedef void(APIENTRYP PFNGLIMAGETRANSFORMPARAMETERFVHPPROC)(GLenum target, GLenum pname, const GLfloat *params); -typedef void(APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERIVHPPROC)(GLenum target, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETIMAGETRANSFORMPARAMETERFVHPPROC)(GLenum target, GLenum pname, GLfloat *params); -#endif - -#ifndef GL_HP_convolution_border_modes -#define GL_HP_convolution_border_modes 1 -#endif - -#ifndef GL_SGIX_texture_add_env -#define GL_SGIX_texture_add_env 1 -#endif - -#ifndef GL_EXT_color_subtable -#define GL_EXT_color_subtable 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorSubTableEXT(GLenum, GLsizei, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glCopyColorSubTableEXT(GLenum, GLsizei, GLint, GLint, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLCOLORSUBTABLEEXTPROC)(GLenum target, GLsizei start, GLsizei count, GLenum format, GLenum type, const GLvoid *data); -typedef void(APIENTRYP PFNGLCOPYCOLORSUBTABLEEXTPROC)(GLenum target, GLsizei start, GLint x, GLint y, GLsizei width); -#endif - -#ifndef GL_PGI_vertex_hints -#define GL_PGI_vertex_hints 1 -#endif - -#ifndef GL_PGI_misc_hints -#define GL_PGI_misc_hints 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glHintPGI(GLenum, GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLHINTPGIPROC)(GLenum target, GLint mode); -#endif - -#ifndef GL_EXT_paletted_texture -#define GL_EXT_paletted_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorTableEXT(GLenum, GLenum, GLsizei, GLenum, GLenum, const GLvoid *); -GLAPI void APIENTRY glGetColorTableEXT(GLenum, GLenum, GLenum, GLvoid *); -GLAPI void APIENTRY glGetColorTableParameterivEXT(GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetColorTableParameterfvEXT(GLenum, GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLCOLORTABLEEXTPROC)(GLenum target, GLenum internalFormat, GLsizei width, GLenum format, GLenum type, const GLvoid *table); -typedef void(APIENTRYP PFNGLGETCOLORTABLEEXTPROC)(GLenum target, GLenum format, GLenum type, GLvoid *data); -typedef void(APIENTRYP PFNGLGETCOLORTABLEPARAMETERIVEXTPROC)(GLenum target, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETCOLORTABLEPARAMETERFVEXTPROC)(GLenum target, GLenum pname, GLfloat *params); -#endif - -#ifndef GL_EXT_clip_volume_hint -#define GL_EXT_clip_volume_hint 1 -#endif - -#ifndef GL_SGIX_list_priority -#define GL_SGIX_list_priority 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetListParameterfvSGIX(GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetListParameterivSGIX(GLuint, GLenum, GLint *); -GLAPI void APIENTRY glListParameterfSGIX(GLuint, GLenum, GLfloat); -GLAPI void APIENTRY glListParameterfvSGIX(GLuint, GLenum, const GLfloat *); -GLAPI void APIENTRY glListParameteriSGIX(GLuint, GLenum, GLint); -GLAPI void APIENTRY glListParameterivSGIX(GLuint, GLenum, const GLint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLGETLISTPARAMETERFVSGIXPROC)(GLuint list, GLenum pname, GLfloat *params); -typedef void(APIENTRYP PFNGLGETLISTPARAMETERIVSGIXPROC)(GLuint list, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLLISTPARAMETERFSGIXPROC)(GLuint list, GLenum pname, GLfloat param); -typedef void(APIENTRYP PFNGLLISTPARAMETERFVSGIXPROC)(GLuint list, GLenum pname, const GLfloat *params); -typedef void(APIENTRYP PFNGLLISTPARAMETERISGIXPROC)(GLuint list, GLenum pname, GLint param); -typedef void(APIENTRYP PFNGLLISTPARAMETERIVSGIXPROC)(GLuint list, GLenum pname, const GLint *params); -#endif - -#ifndef GL_SGIX_ir_instrument1 -#define GL_SGIX_ir_instrument1 1 -#endif - -#ifndef GL_SGIX_calligraphic_fragment -#define GL_SGIX_calligraphic_fragment 1 -#endif - -#ifndef GL_SGIX_texture_lod_bias -#define GL_SGIX_texture_lod_bias 1 -#endif - -#ifndef GL_SGIX_shadow_ambient -#define GL_SGIX_shadow_ambient 1 -#endif - -#ifndef GL_EXT_index_texture -#define GL_EXT_index_texture 1 -#endif - -#ifndef GL_EXT_index_material -#define GL_EXT_index_material 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glIndexMaterialEXT(GLenum, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLINDEXMATERIALEXTPROC)(GLenum face, GLenum mode); -#endif - -#ifndef GL_EXT_index_func -#define GL_EXT_index_func 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glIndexFuncEXT(GLenum, GLclampf); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLINDEXFUNCEXTPROC)(GLenum func, GLclampf ref); -#endif - -#ifndef GL_EXT_index_array_formats -#define GL_EXT_index_array_formats 1 -#endif - -#ifndef GL_EXT_compiled_vertex_array -#define GL_EXT_compiled_vertex_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glLockArraysEXT(GLint, GLsizei); -GLAPI void APIENTRY glUnlockArraysEXT(void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLLOCKARRAYSEXTPROC)(GLint first, GLsizei count); -typedef void(APIENTRYP PFNGLUNLOCKARRAYSEXTPROC)(void); -#endif - -#ifndef GL_EXT_cull_vertex -#define GL_EXT_cull_vertex 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCullParameterdvEXT(GLenum, GLdouble *); -GLAPI void APIENTRY glCullParameterfvEXT(GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLCULLPARAMETERDVEXTPROC)(GLenum pname, GLdouble *params); -typedef void(APIENTRYP PFNGLCULLPARAMETERFVEXTPROC)(GLenum pname, GLfloat *params); -#endif - -#ifndef GL_SGIX_ycrcb -#define GL_SGIX_ycrcb 1 -#endif - -#ifndef GL_SGIX_fragment_lighting -#define GL_SGIX_fragment_lighting 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFragmentColorMaterialSGIX(GLenum, GLenum); -GLAPI void APIENTRY glFragmentLightfSGIX(GLenum, GLenum, GLfloat); -GLAPI void APIENTRY glFragmentLightfvSGIX(GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glFragmentLightiSGIX(GLenum, GLenum, GLint); -GLAPI void APIENTRY glFragmentLightivSGIX(GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glFragmentLightModelfSGIX(GLenum, GLfloat); -GLAPI void APIENTRY glFragmentLightModelfvSGIX(GLenum, const GLfloat *); -GLAPI void APIENTRY glFragmentLightModeliSGIX(GLenum, GLint); -GLAPI void APIENTRY glFragmentLightModelivSGIX(GLenum, const GLint *); -GLAPI void APIENTRY glFragmentMaterialfSGIX(GLenum, GLenum, GLfloat); -GLAPI void APIENTRY glFragmentMaterialfvSGIX(GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glFragmentMaterialiSGIX(GLenum, GLenum, GLint); -GLAPI void APIENTRY glFragmentMaterialivSGIX(GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glGetFragmentLightfvSGIX(GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetFragmentLightivSGIX(GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetFragmentMaterialfvSGIX(GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetFragmentMaterialivSGIX(GLenum, GLenum, GLint *); -GLAPI void APIENTRY glLightEnviSGIX(GLenum, GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLFRAGMENTCOLORMATERIALSGIXPROC)(GLenum face, GLenum mode); -typedef void(APIENTRYP PFNGLFRAGMENTLIGHTFSGIXPROC)(GLenum light, GLenum pname, GLfloat param); -typedef void(APIENTRYP PFNGLFRAGMENTLIGHTFVSGIXPROC)(GLenum light, GLenum pname, const GLfloat *params); -typedef void(APIENTRYP PFNGLFRAGMENTLIGHTISGIXPROC)(GLenum light, GLenum pname, GLint param); -typedef void(APIENTRYP PFNGLFRAGMENTLIGHTIVSGIXPROC)(GLenum light, GLenum pname, const GLint *params); -typedef void(APIENTRYP PFNGLFRAGMENTLIGHTMODELFSGIXPROC)(GLenum pname, GLfloat param); -typedef void(APIENTRYP PFNGLFRAGMENTLIGHTMODELFVSGIXPROC)(GLenum pname, const GLfloat *params); -typedef void(APIENTRYP PFNGLFRAGMENTLIGHTMODELISGIXPROC)(GLenum pname, GLint param); -typedef void(APIENTRYP PFNGLFRAGMENTLIGHTMODELIVSGIXPROC)(GLenum pname, const GLint *params); -typedef void(APIENTRYP PFNGLFRAGMENTMATERIALFSGIXPROC)(GLenum face, GLenum pname, GLfloat param); -typedef void(APIENTRYP PFNGLFRAGMENTMATERIALFVSGIXPROC)(GLenum face, GLenum pname, const GLfloat *params); -typedef void(APIENTRYP PFNGLFRAGMENTMATERIALISGIXPROC)(GLenum face, GLenum pname, GLint param); -typedef void(APIENTRYP PFNGLFRAGMENTMATERIALIVSGIXPROC)(GLenum face, GLenum pname, const GLint *params); -typedef void(APIENTRYP PFNGLGETFRAGMENTLIGHTFVSGIXPROC)(GLenum light, GLenum pname, GLfloat *params); -typedef void(APIENTRYP PFNGLGETFRAGMENTLIGHTIVSGIXPROC)(GLenum light, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETFRAGMENTMATERIALFVSGIXPROC)(GLenum face, GLenum pname, GLfloat *params); -typedef void(APIENTRYP PFNGLGETFRAGMENTMATERIALIVSGIXPROC)(GLenum face, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLLIGHTENVISGIXPROC)(GLenum pname, GLint param); -#endif - -#ifndef GL_IBM_rasterpos_clip -#define GL_IBM_rasterpos_clip 1 -#endif - -#ifndef GL_HP_texture_lighting -#define GL_HP_texture_lighting 1 -#endif - -#ifndef GL_EXT_draw_range_elements -#define GL_EXT_draw_range_elements 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawRangeElementsEXT(GLenum, GLuint, GLuint, GLsizei, GLenum, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLDRAWRANGEELEMENTSEXTPROC)(GLenum mode, GLuint start, GLuint end, GLsizei count, GLenum type, const GLvoid *indices); -#endif - -#ifndef GL_WIN_phong_shading -#define GL_WIN_phong_shading 1 -#endif - -#ifndef GL_WIN_specular_fog -#define GL_WIN_specular_fog 1 -#endif - -#ifndef GL_EXT_light_texture -#define GL_EXT_light_texture 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glApplyTextureEXT(GLenum); -GLAPI void APIENTRY glTextureLightEXT(GLenum); -GLAPI void APIENTRY glTextureMaterialEXT(GLenum, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLAPPLYTEXTUREEXTPROC)(GLenum mode); -typedef void(APIENTRYP PFNGLTEXTURELIGHTEXTPROC)(GLenum pname); -typedef void(APIENTRYP PFNGLTEXTUREMATERIALEXTPROC)(GLenum face, GLenum mode); -#endif - -#ifndef GL_SGIX_blend_alpha_minmax -#define GL_SGIX_blend_alpha_minmax 1 -#endif - -#ifndef GL_EXT_bgra -#define GL_EXT_bgra 1 -#endif - -#ifndef GL_SGIX_async -#define GL_SGIX_async 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glAsyncMarkerSGIX(GLuint); -GLAPI GLint APIENTRY glFinishAsyncSGIX(GLuint *); -GLAPI GLint APIENTRY glPollAsyncSGIX(GLuint *); -GLAPI GLuint APIENTRY glGenAsyncMarkersSGIX(GLsizei); -GLAPI void APIENTRY glDeleteAsyncMarkersSGIX(GLuint, GLsizei); -GLAPI GLboolean APIENTRY glIsAsyncMarkerSGIX(GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLASYNCMARKERSGIXPROC)(GLuint marker); -typedef GLint(APIENTRYP PFNGLFINISHASYNCSGIXPROC)(GLuint *markerp); -typedef GLint(APIENTRYP PFNGLPOLLASYNCSGIXPROC)(GLuint *markerp); -typedef GLuint(APIENTRYP PFNGLGENASYNCMARKERSSGIXPROC)(GLsizei range); -typedef void(APIENTRYP PFNGLDELETEASYNCMARKERSSGIXPROC)(GLuint marker, GLsizei range); -typedef GLboolean(APIENTRYP PFNGLISASYNCMARKERSGIXPROC)(GLuint marker); -#endif - -#ifndef GL_SGIX_async_pixel -#define GL_SGIX_async_pixel 1 -#endif - -#ifndef GL_SGIX_async_histogram -#define GL_SGIX_async_histogram 1 -#endif - -#ifndef GL_INTEL_parallel_arrays -#define GL_INTEL_parallel_arrays 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexPointervINTEL(GLint, GLenum, const GLvoid **); -GLAPI void APIENTRY glNormalPointervINTEL(GLenum, const GLvoid **); -GLAPI void APIENTRY glColorPointervINTEL(GLint, GLenum, const GLvoid **); -GLAPI void APIENTRY glTexCoordPointervINTEL(GLint, GLenum, const GLvoid **); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLVERTEXPOINTERVINTELPROC)(GLint size, GLenum type, const GLvoid **pointer); -typedef void(APIENTRYP PFNGLNORMALPOINTERVINTELPROC)(GLenum type, const GLvoid **pointer); -typedef void(APIENTRYP PFNGLCOLORPOINTERVINTELPROC)(GLint size, GLenum type, const GLvoid **pointer); -typedef void(APIENTRYP PFNGLTEXCOORDPOINTERVINTELPROC)(GLint size, GLenum type, const GLvoid **pointer); -#endif - -#ifndef GL_HP_occlusion_test -#define GL_HP_occlusion_test 1 -#endif - -#ifndef GL_EXT_pixel_transform -#define GL_EXT_pixel_transform 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPixelTransformParameteriEXT(GLenum, GLenum, GLint); -GLAPI void APIENTRY glPixelTransformParameterfEXT(GLenum, GLenum, GLfloat); -GLAPI void APIENTRY glPixelTransformParameterivEXT(GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glPixelTransformParameterfvEXT(GLenum, GLenum, const GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIEXTPROC)(GLenum target, GLenum pname, GLint param); -typedef void(APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFEXTPROC)(GLenum target, GLenum pname, GLfloat param); -typedef void(APIENTRYP PFNGLPIXELTRANSFORMPARAMETERIVEXTPROC)(GLenum target, GLenum pname, const GLint *params); -typedef void(APIENTRYP PFNGLPIXELTRANSFORMPARAMETERFVEXTPROC)(GLenum target, GLenum pname, const GLfloat *params); -#endif - -#ifndef GL_EXT_pixel_transform_color_table -#define GL_EXT_pixel_transform_color_table 1 -#endif - -#ifndef GL_EXT_shared_texture_palette -#define GL_EXT_shared_texture_palette 1 -#endif - -#ifndef GL_EXT_separate_specular_color -#define GL_EXT_separate_specular_color 1 -#endif - -#ifndef GL_EXT_secondary_color -#define GL_EXT_secondary_color 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSecondaryColor3bEXT(GLbyte, GLbyte, GLbyte); -GLAPI void APIENTRY glSecondaryColor3bvEXT(const GLbyte *); -GLAPI void APIENTRY glSecondaryColor3dEXT(GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glSecondaryColor3dvEXT(const GLdouble *); -GLAPI void APIENTRY glSecondaryColor3fEXT(GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glSecondaryColor3fvEXT(const GLfloat *); -GLAPI void APIENTRY glSecondaryColor3iEXT(GLint, GLint, GLint); -GLAPI void APIENTRY glSecondaryColor3ivEXT(const GLint *); -GLAPI void APIENTRY glSecondaryColor3sEXT(GLshort, GLshort, GLshort); -GLAPI void APIENTRY glSecondaryColor3svEXT(const GLshort *); -GLAPI void APIENTRY glSecondaryColor3ubEXT(GLubyte, GLubyte, GLubyte); -GLAPI void APIENTRY glSecondaryColor3ubvEXT(const GLubyte *); -GLAPI void APIENTRY glSecondaryColor3uiEXT(GLuint, GLuint, GLuint); -GLAPI void APIENTRY glSecondaryColor3uivEXT(const GLuint *); -GLAPI void APIENTRY glSecondaryColor3usEXT(GLushort, GLushort, GLushort); -GLAPI void APIENTRY glSecondaryColor3usvEXT(const GLushort *); -GLAPI void APIENTRY glSecondaryColorPointerEXT(GLint, GLenum, GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3BEXTPROC)(GLbyte red, GLbyte green, GLbyte blue); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3BVEXTPROC)(const GLbyte *v); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3DEXTPROC)(GLdouble red, GLdouble green, GLdouble blue); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3DVEXTPROC)(const GLdouble *v); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3FEXTPROC)(GLfloat red, GLfloat green, GLfloat blue); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3FVEXTPROC)(const GLfloat *v); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3IEXTPROC)(GLint red, GLint green, GLint blue); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3IVEXTPROC)(const GLint *v); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3SEXTPROC)(GLshort red, GLshort green, GLshort blue); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3SVEXTPROC)(const GLshort *v); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3UBEXTPROC)(GLubyte red, GLubyte green, GLubyte blue); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3UBVEXTPROC)(const GLubyte *v); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3UIEXTPROC)(GLuint red, GLuint green, GLuint blue); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3UIVEXTPROC)(const GLuint *v); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3USEXTPROC)(GLushort red, GLushort green, GLushort blue); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3USVEXTPROC)(const GLushort *v); -typedef void(APIENTRYP PFNGLSECONDARYCOLORPOINTEREXTPROC)(GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_EXT_texture_perturb_normal -#define GL_EXT_texture_perturb_normal 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTextureNormalEXT(GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLTEXTURENORMALEXTPROC)(GLenum mode); -#endif - -#ifndef GL_EXT_multi_draw_arrays -#define GL_EXT_multi_draw_arrays 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMultiDrawArraysEXT(GLenum, GLint *, GLsizei *, GLsizei); -GLAPI void APIENTRY glMultiDrawElementsEXT(GLenum, const GLsizei *, GLenum, const GLvoid **, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLMULTIDRAWARRAYSEXTPROC)(GLenum mode, GLint *first, GLsizei *count, GLsizei primcount); -typedef void(APIENTRYP PFNGLMULTIDRAWELEMENTSEXTPROC)(GLenum mode, const GLsizei *count, GLenum type, const GLvoid **indices, GLsizei primcount); -#endif - -#ifndef GL_EXT_fog_coord -#define GL_EXT_fog_coord 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFogCoordfEXT(GLfloat); -GLAPI void APIENTRY glFogCoordfvEXT(const GLfloat *); -GLAPI void APIENTRY glFogCoorddEXT(GLdouble); -GLAPI void APIENTRY glFogCoorddvEXT(const GLdouble *); -GLAPI void APIENTRY glFogCoordPointerEXT(GLenum, GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLFOGCOORDFEXTPROC)(GLfloat coord); -typedef void(APIENTRYP PFNGLFOGCOORDFVEXTPROC)(const GLfloat *coord); -typedef void(APIENTRYP PFNGLFOGCOORDDEXTPROC)(GLdouble coord); -typedef void(APIENTRYP PFNGLFOGCOORDDVEXTPROC)(const GLdouble *coord); -typedef void(APIENTRYP PFNGLFOGCOORDPOINTEREXTPROC)(GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_REND_screen_coordinates -#define GL_REND_screen_coordinates 1 -#endif - -#ifndef GL_EXT_coordinate_frame -#define GL_EXT_coordinate_frame 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTangent3bEXT(GLbyte, GLbyte, GLbyte); -GLAPI void APIENTRY glTangent3bvEXT(const GLbyte *); -GLAPI void APIENTRY glTangent3dEXT(GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glTangent3dvEXT(const GLdouble *); -GLAPI void APIENTRY glTangent3fEXT(GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glTangent3fvEXT(const GLfloat *); -GLAPI void APIENTRY glTangent3iEXT(GLint, GLint, GLint); -GLAPI void APIENTRY glTangent3ivEXT(const GLint *); -GLAPI void APIENTRY glTangent3sEXT(GLshort, GLshort, GLshort); -GLAPI void APIENTRY glTangent3svEXT(const GLshort *); -GLAPI void APIENTRY glBinormal3bEXT(GLbyte, GLbyte, GLbyte); -GLAPI void APIENTRY glBinormal3bvEXT(const GLbyte *); -GLAPI void APIENTRY glBinormal3dEXT(GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glBinormal3dvEXT(const GLdouble *); -GLAPI void APIENTRY glBinormal3fEXT(GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glBinormal3fvEXT(const GLfloat *); -GLAPI void APIENTRY glBinormal3iEXT(GLint, GLint, GLint); -GLAPI void APIENTRY glBinormal3ivEXT(const GLint *); -GLAPI void APIENTRY glBinormal3sEXT(GLshort, GLshort, GLshort); -GLAPI void APIENTRY glBinormal3svEXT(const GLshort *); -GLAPI void APIENTRY glTangentPointerEXT(GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glBinormalPointerEXT(GLenum, GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLTANGENT3BEXTPROC)(GLbyte tx, GLbyte ty, GLbyte tz); -typedef void(APIENTRYP PFNGLTANGENT3BVEXTPROC)(const GLbyte *v); -typedef void(APIENTRYP PFNGLTANGENT3DEXTPROC)(GLdouble tx, GLdouble ty, GLdouble tz); -typedef void(APIENTRYP PFNGLTANGENT3DVEXTPROC)(const GLdouble *v); -typedef void(APIENTRYP PFNGLTANGENT3FEXTPROC)(GLfloat tx, GLfloat ty, GLfloat tz); -typedef void(APIENTRYP PFNGLTANGENT3FVEXTPROC)(const GLfloat *v); -typedef void(APIENTRYP PFNGLTANGENT3IEXTPROC)(GLint tx, GLint ty, GLint tz); -typedef void(APIENTRYP PFNGLTANGENT3IVEXTPROC)(const GLint *v); -typedef void(APIENTRYP PFNGLTANGENT3SEXTPROC)(GLshort tx, GLshort ty, GLshort tz); -typedef void(APIENTRYP PFNGLTANGENT3SVEXTPROC)(const GLshort *v); -typedef void(APIENTRYP PFNGLBINORMAL3BEXTPROC)(GLbyte bx, GLbyte by, GLbyte bz); -typedef void(APIENTRYP PFNGLBINORMAL3BVEXTPROC)(const GLbyte *v); -typedef void(APIENTRYP PFNGLBINORMAL3DEXTPROC)(GLdouble bx, GLdouble by, GLdouble bz); -typedef void(APIENTRYP PFNGLBINORMAL3DVEXTPROC)(const GLdouble *v); -typedef void(APIENTRYP PFNGLBINORMAL3FEXTPROC)(GLfloat bx, GLfloat by, GLfloat bz); -typedef void(APIENTRYP PFNGLBINORMAL3FVEXTPROC)(const GLfloat *v); -typedef void(APIENTRYP PFNGLBINORMAL3IEXTPROC)(GLint bx, GLint by, GLint bz); -typedef void(APIENTRYP PFNGLBINORMAL3IVEXTPROC)(const GLint *v); -typedef void(APIENTRYP PFNGLBINORMAL3SEXTPROC)(GLshort bx, GLshort by, GLshort bz); -typedef void(APIENTRYP PFNGLBINORMAL3SVEXTPROC)(const GLshort *v); -typedef void(APIENTRYP PFNGLTANGENTPOINTEREXTPROC)(GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void(APIENTRYP PFNGLBINORMALPOINTEREXTPROC)(GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_EXT_texture_env_combine -#define GL_EXT_texture_env_combine 1 -#endif - -#ifndef GL_APPLE_specular_vector -#define GL_APPLE_specular_vector 1 -#endif - -#ifndef GL_APPLE_transform_hint -#define GL_APPLE_transform_hint 1 -#endif - -#ifndef GL_SGIX_fog_scale -#define GL_SGIX_fog_scale 1 -#endif - -#ifndef GL_SUNX_constant_data -#define GL_SUNX_constant_data 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFinishTextureSUNX(void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLFINISHTEXTURESUNXPROC)(void); -#endif - -#ifndef GL_SUN_global_alpha -#define GL_SUN_global_alpha 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGlobalAlphaFactorbSUN(GLbyte); -GLAPI void APIENTRY glGlobalAlphaFactorsSUN(GLshort); -GLAPI void APIENTRY glGlobalAlphaFactoriSUN(GLint); -GLAPI void APIENTRY glGlobalAlphaFactorfSUN(GLfloat); -GLAPI void APIENTRY glGlobalAlphaFactordSUN(GLdouble); -GLAPI void APIENTRY glGlobalAlphaFactorubSUN(GLubyte); -GLAPI void APIENTRY glGlobalAlphaFactorusSUN(GLushort); -GLAPI void APIENTRY glGlobalAlphaFactoruiSUN(GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLGLOBALALPHAFACTORBSUNPROC)(GLbyte factor); -typedef void(APIENTRYP PFNGLGLOBALALPHAFACTORSSUNPROC)(GLshort factor); -typedef void(APIENTRYP PFNGLGLOBALALPHAFACTORISUNPROC)(GLint factor); -typedef void(APIENTRYP PFNGLGLOBALALPHAFACTORFSUNPROC)(GLfloat factor); -typedef void(APIENTRYP PFNGLGLOBALALPHAFACTORDSUNPROC)(GLdouble factor); -typedef void(APIENTRYP PFNGLGLOBALALPHAFACTORUBSUNPROC)(GLubyte factor); -typedef void(APIENTRYP PFNGLGLOBALALPHAFACTORUSSUNPROC)(GLushort factor); -typedef void(APIENTRYP PFNGLGLOBALALPHAFACTORUISUNPROC)(GLuint factor); -#endif - -#ifndef GL_SUN_triangle_list -#define GL_SUN_triangle_list 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glReplacementCodeuiSUN(GLuint); -GLAPI void APIENTRY glReplacementCodeusSUN(GLushort); -GLAPI void APIENTRY glReplacementCodeubSUN(GLubyte); -GLAPI void APIENTRY glReplacementCodeuivSUN(const GLuint *); -GLAPI void APIENTRY glReplacementCodeusvSUN(const GLushort *); -GLAPI void APIENTRY glReplacementCodeubvSUN(const GLubyte *); -GLAPI void APIENTRY glReplacementCodePointerSUN(GLenum, GLsizei, const GLvoid **); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLREPLACEMENTCODEUISUNPROC)(GLuint code); -typedef void(APIENTRYP PFNGLREPLACEMENTCODEUSSUNPROC)(GLushort code); -typedef void(APIENTRYP PFNGLREPLACEMENTCODEUBSUNPROC)(GLubyte code); -typedef void(APIENTRYP PFNGLREPLACEMENTCODEUIVSUNPROC)(const GLuint *code); -typedef void(APIENTRYP PFNGLREPLACEMENTCODEUSVSUNPROC)(const GLushort *code); -typedef void(APIENTRYP PFNGLREPLACEMENTCODEUBVSUNPROC)(const GLubyte *code); -typedef void(APIENTRYP PFNGLREPLACEMENTCODEPOINTERSUNPROC)(GLenum type, GLsizei stride, const GLvoid **pointer); -#endif - -#ifndef GL_SUN_vertex -#define GL_SUN_vertex 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColor4ubVertex2fSUN(GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat); -GLAPI void APIENTRY glColor4ubVertex2fvSUN(const GLubyte *, const GLfloat *); -GLAPI void APIENTRY glColor4ubVertex3fSUN(GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glColor4ubVertex3fvSUN(const GLubyte *, const GLfloat *); -GLAPI void APIENTRY glColor3fVertex3fSUN(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glColor3fVertex3fvSUN(const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glNormal3fVertex3fSUN(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glNormal3fVertex3fvSUN(const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glColor4fNormal3fVertex3fSUN(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glColor4fNormal3fVertex3fvSUN(const GLfloat *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glTexCoord2fVertex3fSUN(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glTexCoord2fVertex3fvSUN(const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glTexCoord4fVertex4fSUN(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glTexCoord4fVertex4fvSUN(const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fSUN(GLfloat, GLfloat, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glTexCoord2fColor4ubVertex3fvSUN(const GLfloat *, const GLubyte *, const GLfloat *); -GLAPI void APIENTRY glTexCoord2fColor3fVertex3fSUN(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glTexCoord2fColor3fVertex3fvSUN(const GLfloat *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fSUN(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glTexCoord2fNormal3fVertex3fvSUN(const GLfloat *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fSUN(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glTexCoord2fColor4fNormal3fVertex3fvSUN(const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fSUN(GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glTexCoord4fColor4fNormal3fVertex4fvSUN(const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glReplacementCodeuiVertex3fSUN(GLuint, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glReplacementCodeuiVertex3fvSUN(const GLuint *, const GLfloat *); -GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fSUN(GLuint, GLubyte, GLubyte, GLubyte, GLubyte, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glReplacementCodeuiColor4ubVertex3fvSUN(const GLuint *, const GLubyte *, const GLfloat *); -GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fSUN(GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glReplacementCodeuiColor3fVertex3fvSUN(const GLuint *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fSUN(GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glReplacementCodeuiNormal3fVertex3fvSUN(const GLuint *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fSUN(GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glReplacementCodeuiColor4fNormal3fVertex3fvSUN(const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fSUN(GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fVertex3fvSUN(const GLuint *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fSUN(GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fNormal3fVertex3fvSUN(const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fSUN(GLuint, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glReplacementCodeuiTexCoord2fColor4fNormal3fVertex3fvSUN(const GLuint *, const GLfloat *, const GLfloat *, const GLfloat *, const GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLCOLOR4UBVERTEX2FSUNPROC)(GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y); -typedef void(APIENTRYP PFNGLCOLOR4UBVERTEX2FVSUNPROC)(const GLubyte *c, const GLfloat *v); -typedef void(APIENTRYP PFNGLCOLOR4UBVERTEX3FSUNPROC)(GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -typedef void(APIENTRYP PFNGLCOLOR4UBVERTEX3FVSUNPROC)(const GLubyte *c, const GLfloat *v); -typedef void(APIENTRYP PFNGLCOLOR3FVERTEX3FSUNPROC)(GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -typedef void(APIENTRYP PFNGLCOLOR3FVERTEX3FVSUNPROC)(const GLfloat *c, const GLfloat *v); -typedef void(APIENTRYP PFNGLNORMAL3FVERTEX3FSUNPROC)(GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void(APIENTRYP PFNGLNORMAL3FVERTEX3FVSUNPROC)(const GLfloat *n, const GLfloat *v); -typedef void(APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FSUNPROC)(GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void(APIENTRYP PFNGLCOLOR4FNORMAL3FVERTEX3FVSUNPROC)(const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void(APIENTRYP PFNGLTEXCOORD2FVERTEX3FSUNPROC)(GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z); -typedef void(APIENTRYP PFNGLTEXCOORD2FVERTEX3FVSUNPROC)(const GLfloat *tc, const GLfloat *v); -typedef void(APIENTRYP PFNGLTEXCOORD4FVERTEX4FSUNPROC)(GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void(APIENTRYP PFNGLTEXCOORD4FVERTEX4FVSUNPROC)(const GLfloat *tc, const GLfloat *v); -typedef void(APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FSUNPROC)(GLfloat s, GLfloat t, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -typedef void(APIENTRYP PFNGLTEXCOORD2FCOLOR4UBVERTEX3FVSUNPROC)(const GLfloat *tc, const GLubyte *c, const GLfloat *v); -typedef void(APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FSUNPROC)(GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -typedef void(APIENTRYP PFNGLTEXCOORD2FCOLOR3FVERTEX3FVSUNPROC)(const GLfloat *tc, const GLfloat *c, const GLfloat *v); -typedef void(APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FSUNPROC)(GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void(APIENTRYP PFNGLTEXCOORD2FNORMAL3FVERTEX3FVSUNPROC)(const GLfloat *tc, const GLfloat *n, const GLfloat *v); -typedef void(APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC)(GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void(APIENTRYP PFNGLTEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC)(const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void(APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FSUNPROC)(GLfloat s, GLfloat t, GLfloat p, GLfloat q, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void(APIENTRYP PFNGLTEXCOORD4FCOLOR4FNORMAL3FVERTEX4FVSUNPROC)(const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void(APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FSUNPROC)(GLuint rc, GLfloat x, GLfloat y, GLfloat z); -typedef void(APIENTRYP PFNGLREPLACEMENTCODEUIVERTEX3FVSUNPROC)(const GLuint *rc, const GLfloat *v); -typedef void(APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FSUNPROC)(GLuint rc, GLubyte r, GLubyte g, GLubyte b, GLubyte a, GLfloat x, GLfloat y, GLfloat z); -typedef void(APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4UBVERTEX3FVSUNPROC)(const GLuint *rc, const GLubyte *c, const GLfloat *v); -typedef void(APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FSUNPROC)(GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat x, GLfloat y, GLfloat z); -typedef void(APIENTRYP PFNGLREPLACEMENTCODEUICOLOR3FVERTEX3FVSUNPROC)(const GLuint *rc, const GLfloat *c, const GLfloat *v); -typedef void(APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FSUNPROC)(GLuint rc, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void(APIENTRYP PFNGLREPLACEMENTCODEUINORMAL3FVERTEX3FVSUNPROC)(const GLuint *rc, const GLfloat *n, const GLfloat *v); -typedef void(APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FSUNPROC)(GLuint rc, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void(APIENTRYP PFNGLREPLACEMENTCODEUICOLOR4FNORMAL3FVERTEX3FVSUNPROC)(const GLuint *rc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -typedef void(APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FSUNPROC)(GLuint rc, GLfloat s, GLfloat t, GLfloat x, GLfloat y, GLfloat z); -typedef void(APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FVERTEX3FVSUNPROC)(const GLuint *rc, const GLfloat *tc, const GLfloat *v); -typedef void(APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FSUNPROC)(GLuint rc, GLfloat s, GLfloat t, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void(APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FNORMAL3FVERTEX3FVSUNPROC)(const GLuint *rc, const GLfloat *tc, const GLfloat *n, const GLfloat *v); -typedef void(APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FSUNPROC)(GLuint rc, GLfloat s, GLfloat t, GLfloat r, GLfloat g, GLfloat b, GLfloat a, GLfloat nx, GLfloat ny, GLfloat nz, GLfloat x, GLfloat y, GLfloat z); -typedef void(APIENTRYP PFNGLREPLACEMENTCODEUITEXCOORD2FCOLOR4FNORMAL3FVERTEX3FVSUNPROC)(const GLuint *rc, const GLfloat *tc, const GLfloat *c, const GLfloat *n, const GLfloat *v); -#endif - -#ifndef GL_EXT_blend_func_separate -#define GL_EXT_blend_func_separate 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendFuncSeparateEXT(GLenum, GLenum, GLenum, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLBLENDFUNCSEPARATEEXTPROC)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -#endif - -#ifndef GL_INGR_blend_func_separate -#define GL_INGR_blend_func_separate 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendFuncSeparateINGR(GLenum, GLenum, GLenum, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLBLENDFUNCSEPARATEINGRPROC)(GLenum sfactorRGB, GLenum dfactorRGB, GLenum sfactorAlpha, GLenum dfactorAlpha); -#endif - -#ifndef GL_INGR_color_clamp -#define GL_INGR_color_clamp 1 -#endif - -#ifndef GL_INGR_interlace_read -#define GL_INGR_interlace_read 1 -#endif - -#ifndef GL_EXT_stencil_wrap -#define GL_EXT_stencil_wrap 1 -#endif - -#ifndef GL_EXT_422_pixels -#define GL_EXT_422_pixels 1 -#endif - -#ifndef GL_NV_texgen_reflection -#define GL_NV_texgen_reflection 1 -#endif - -#ifndef GL_SUN_convolution_border_modes -#define GL_SUN_convolution_border_modes 1 -#endif - -#ifndef GL_EXT_texture_env_add -#define GL_EXT_texture_env_add 1 -#endif - -#ifndef GL_EXT_texture_lod_bias -#define GL_EXT_texture_lod_bias 1 -#endif - -#ifndef GL_EXT_texture_filter_anisotropic -#define GL_EXT_texture_filter_anisotropic 1 -#endif - -#ifndef GL_EXT_vertex_weighting -#define GL_EXT_vertex_weighting 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexWeightfEXT(GLfloat); -GLAPI void APIENTRY glVertexWeightfvEXT(const GLfloat *); -GLAPI void APIENTRY glVertexWeightPointerEXT(GLsizei, GLenum, GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLVERTEXWEIGHTFEXTPROC)(GLfloat weight); -typedef void(APIENTRYP PFNGLVERTEXWEIGHTFVEXTPROC)(const GLfloat *weight); -typedef void(APIENTRYP PFNGLVERTEXWEIGHTPOINTEREXTPROC)(GLsizei size, GLenum type, GLsizei stride, const GLvoid *pointer); -#endif - -#ifndef GL_NV_light_max_exponent -#define GL_NV_light_max_exponent 1 -#endif - -#ifndef GL_NV_vertex_array_range -#define GL_NV_vertex_array_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glFlushVertexArrayRangeNV(void); -GLAPI void APIENTRY glVertexArrayRangeNV(GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLFLUSHVERTEXARRAYRANGENVPROC)(void); -typedef void(APIENTRYP PFNGLVERTEXARRAYRANGENVPROC)(GLsizei length, const GLvoid *pointer); -#endif - -#ifndef GL_NV_register_combiners -#define GL_NV_register_combiners 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCombinerParameterfvNV(GLenum, const GLfloat *); -GLAPI void APIENTRY glCombinerParameterfNV(GLenum, GLfloat); -GLAPI void APIENTRY glCombinerParameterivNV(GLenum, const GLint *); -GLAPI void APIENTRY glCombinerParameteriNV(GLenum, GLint); -GLAPI void APIENTRY glCombinerInputNV(GLenum, GLenum, GLenum, GLenum, GLenum, GLenum); -GLAPI void APIENTRY glCombinerOutputNV(GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLenum, GLboolean, GLboolean, GLboolean); -GLAPI void APIENTRY glFinalCombinerInputNV(GLenum, GLenum, GLenum, GLenum); -GLAPI void APIENTRY glGetCombinerInputParameterfvNV(GLenum, GLenum, GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetCombinerInputParameterivNV(GLenum, GLenum, GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetCombinerOutputParameterfvNV(GLenum, GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetCombinerOutputParameterivNV(GLenum, GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetFinalCombinerInputParameterfvNV(GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetFinalCombinerInputParameterivNV(GLenum, GLenum, GLint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLCOMBINERPARAMETERFVNVPROC)(GLenum pname, const GLfloat *params); -typedef void(APIENTRYP PFNGLCOMBINERPARAMETERFNVPROC)(GLenum pname, GLfloat param); -typedef void(APIENTRYP PFNGLCOMBINERPARAMETERIVNVPROC)(GLenum pname, const GLint *params); -typedef void(APIENTRYP PFNGLCOMBINERPARAMETERINVPROC)(GLenum pname, GLint param); -typedef void(APIENTRYP PFNGLCOMBINERINPUTNVPROC)(GLenum stage, GLenum portion, GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); -typedef void(APIENTRYP PFNGLCOMBINEROUTPUTNVPROC)(GLenum stage, GLenum portion, GLenum abOutput, GLenum cdOutput, GLenum sumOutput, GLenum scale, GLenum bias, GLboolean abDotProduct, GLboolean cdDotProduct, GLboolean muxSum); -typedef void(APIENTRYP PFNGLFINALCOMBINERINPUTNVPROC)(GLenum variable, GLenum input, GLenum mapping, GLenum componentUsage); -typedef void(APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERFVNVPROC)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLfloat *params); -typedef void(APIENTRYP PFNGLGETCOMBINERINPUTPARAMETERIVNVPROC)(GLenum stage, GLenum portion, GLenum variable, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERFVNVPROC)(GLenum stage, GLenum portion, GLenum pname, GLfloat *params); -typedef void(APIENTRYP PFNGLGETCOMBINEROUTPUTPARAMETERIVNVPROC)(GLenum stage, GLenum portion, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERFVNVPROC)(GLenum variable, GLenum pname, GLfloat *params); -typedef void(APIENTRYP PFNGLGETFINALCOMBINERINPUTPARAMETERIVNVPROC)(GLenum variable, GLenum pname, GLint *params); -#endif - -#ifndef GL_NV_fog_distance -#define GL_NV_fog_distance 1 -#endif - -#ifndef GL_NV_texgen_emboss -#define GL_NV_texgen_emboss 1 -#endif - -#ifndef GL_NV_blend_square -#define GL_NV_blend_square 1 -#endif - -#ifndef GL_NV_texture_env_combine4 -#define GL_NV_texture_env_combine4 1 -#endif - -#ifndef GL_MESA_resize_buffers -#define GL_MESA_resize_buffers 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glResizeBuffersMESA(void); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLRESIZEBUFFERSMESAPROC)(void); -#endif - -#ifndef GL_MESA_window_pos -#define GL_MESA_window_pos 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glWindowPos2dMESA(GLdouble, GLdouble); -GLAPI void APIENTRY glWindowPos2dvMESA(const GLdouble *); -GLAPI void APIENTRY glWindowPos2fMESA(GLfloat, GLfloat); -GLAPI void APIENTRY glWindowPos2fvMESA(const GLfloat *); -GLAPI void APIENTRY glWindowPos2iMESA(GLint, GLint); -GLAPI void APIENTRY glWindowPos2ivMESA(const GLint *); -GLAPI void APIENTRY glWindowPos2sMESA(GLshort, GLshort); -GLAPI void APIENTRY glWindowPos2svMESA(const GLshort *); -GLAPI void APIENTRY glWindowPos3dMESA(GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glWindowPos3dvMESA(const GLdouble *); -GLAPI void APIENTRY glWindowPos3fMESA(GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glWindowPos3fvMESA(const GLfloat *); -GLAPI void APIENTRY glWindowPos3iMESA(GLint, GLint, GLint); -GLAPI void APIENTRY glWindowPos3ivMESA(const GLint *); -GLAPI void APIENTRY glWindowPos3sMESA(GLshort, GLshort, GLshort); -GLAPI void APIENTRY glWindowPos3svMESA(const GLshort *); -GLAPI void APIENTRY glWindowPos4dMESA(GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glWindowPos4dvMESA(const GLdouble *); -GLAPI void APIENTRY glWindowPos4fMESA(GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glWindowPos4fvMESA(const GLfloat *); -GLAPI void APIENTRY glWindowPos4iMESA(GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glWindowPos4ivMESA(const GLint *); -GLAPI void APIENTRY glWindowPos4sMESA(GLshort, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glWindowPos4svMESA(const GLshort *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLWINDOWPOS2DMESAPROC)(GLdouble x, GLdouble y); -typedef void(APIENTRYP PFNGLWINDOWPOS2DVMESAPROC)(const GLdouble *v); -typedef void(APIENTRYP PFNGLWINDOWPOS2FMESAPROC)(GLfloat x, GLfloat y); -typedef void(APIENTRYP PFNGLWINDOWPOS2FVMESAPROC)(const GLfloat *v); -typedef void(APIENTRYP PFNGLWINDOWPOS2IMESAPROC)(GLint x, GLint y); -typedef void(APIENTRYP PFNGLWINDOWPOS2IVMESAPROC)(const GLint *v); -typedef void(APIENTRYP PFNGLWINDOWPOS2SMESAPROC)(GLshort x, GLshort y); -typedef void(APIENTRYP PFNGLWINDOWPOS2SVMESAPROC)(const GLshort *v); -typedef void(APIENTRYP PFNGLWINDOWPOS3DMESAPROC)(GLdouble x, GLdouble y, GLdouble z); -typedef void(APIENTRYP PFNGLWINDOWPOS3DVMESAPROC)(const GLdouble *v); -typedef void(APIENTRYP PFNGLWINDOWPOS3FMESAPROC)(GLfloat x, GLfloat y, GLfloat z); -typedef void(APIENTRYP PFNGLWINDOWPOS3FVMESAPROC)(const GLfloat *v); -typedef void(APIENTRYP PFNGLWINDOWPOS3IMESAPROC)(GLint x, GLint y, GLint z); -typedef void(APIENTRYP PFNGLWINDOWPOS3IVMESAPROC)(const GLint *v); -typedef void(APIENTRYP PFNGLWINDOWPOS3SMESAPROC)(GLshort x, GLshort y, GLshort z); -typedef void(APIENTRYP PFNGLWINDOWPOS3SVMESAPROC)(const GLshort *v); -typedef void(APIENTRYP PFNGLWINDOWPOS4DMESAPROC)(GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void(APIENTRYP PFNGLWINDOWPOS4DVMESAPROC)(const GLdouble *v); -typedef void(APIENTRYP PFNGLWINDOWPOS4FMESAPROC)(GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void(APIENTRYP PFNGLWINDOWPOS4FVMESAPROC)(const GLfloat *v); -typedef void(APIENTRYP PFNGLWINDOWPOS4IMESAPROC)(GLint x, GLint y, GLint z, GLint w); -typedef void(APIENTRYP PFNGLWINDOWPOS4IVMESAPROC)(const GLint *v); -typedef void(APIENTRYP PFNGLWINDOWPOS4SMESAPROC)(GLshort x, GLshort y, GLshort z, GLshort w); -typedef void(APIENTRYP PFNGLWINDOWPOS4SVMESAPROC)(const GLshort *v); -#endif - -#ifndef GL_IBM_cull_vertex -#define GL_IBM_cull_vertex 1 -#endif - -#ifndef GL_IBM_multimode_draw_arrays -#define GL_IBM_multimode_draw_arrays 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMultiModeDrawArraysIBM(const GLenum *, const GLint *, const GLsizei *, GLsizei, GLint); -GLAPI void APIENTRY glMultiModeDrawElementsIBM(const GLenum *, const GLsizei *, GLenum, const GLvoid *const *, GLsizei, GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLMULTIMODEDRAWARRAYSIBMPROC)(const GLenum *mode, const GLint *first, const GLsizei *count, GLsizei primcount, GLint modestride); -typedef void(APIENTRYP PFNGLMULTIMODEDRAWELEMENTSIBMPROC)(const GLenum *mode, const GLsizei *count, GLenum type, const GLvoid *const *indices, GLsizei primcount, GLint modestride); -#endif - -#ifndef GL_IBM_vertex_array_lists -#define GL_IBM_vertex_array_lists 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorPointerListIBM(GLint, GLenum, GLint, const GLvoid **, GLint); -GLAPI void APIENTRY glSecondaryColorPointerListIBM(GLint, GLenum, GLint, const GLvoid **, GLint); -GLAPI void APIENTRY glEdgeFlagPointerListIBM(GLint, const GLboolean **, GLint); -GLAPI void APIENTRY glFogCoordPointerListIBM(GLenum, GLint, const GLvoid **, GLint); -GLAPI void APIENTRY glIndexPointerListIBM(GLenum, GLint, const GLvoid **, GLint); -GLAPI void APIENTRY glNormalPointerListIBM(GLenum, GLint, const GLvoid **, GLint); -GLAPI void APIENTRY glTexCoordPointerListIBM(GLint, GLenum, GLint, const GLvoid **, GLint); -GLAPI void APIENTRY glVertexPointerListIBM(GLint, GLenum, GLint, const GLvoid **, GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLCOLORPOINTERLISTIBMPROC)(GLint size, GLenum type, GLint stride, const GLvoid **pointer, GLint ptrstride); -typedef void(APIENTRYP PFNGLSECONDARYCOLORPOINTERLISTIBMPROC)(GLint size, GLenum type, GLint stride, const GLvoid **pointer, GLint ptrstride); -typedef void(APIENTRYP PFNGLEDGEFLAGPOINTERLISTIBMPROC)(GLint stride, const GLboolean **pointer, GLint ptrstride); -typedef void(APIENTRYP PFNGLFOGCOORDPOINTERLISTIBMPROC)(GLenum type, GLint stride, const GLvoid **pointer, GLint ptrstride); -typedef void(APIENTRYP PFNGLINDEXPOINTERLISTIBMPROC)(GLenum type, GLint stride, const GLvoid **pointer, GLint ptrstride); -typedef void(APIENTRYP PFNGLNORMALPOINTERLISTIBMPROC)(GLenum type, GLint stride, const GLvoid **pointer, GLint ptrstride); -typedef void(APIENTRYP PFNGLTEXCOORDPOINTERLISTIBMPROC)(GLint size, GLenum type, GLint stride, const GLvoid **pointer, GLint ptrstride); -typedef void(APIENTRYP PFNGLVERTEXPOINTERLISTIBMPROC)(GLint size, GLenum type, GLint stride, const GLvoid **pointer, GLint ptrstride); -#endif - -#ifndef GL_SGIX_subsample -#define GL_SGIX_subsample 1 -#endif - -#ifndef GL_SGIX_ycrcba -#define GL_SGIX_ycrcba 1 -#endif - -#ifndef GL_SGIX_ycrcb_subsample -#define GL_SGIX_ycrcb_subsample 1 -#endif - -#ifndef GL_SGIX_depth_pass_instrument -#define GL_SGIX_depth_pass_instrument 1 -#endif - -#ifndef GL_3DFX_texture_compression_FXT1 -#define GL_3DFX_texture_compression_FXT1 1 -#endif - -#ifndef GL_3DFX_multisample -#define GL_3DFX_multisample 1 -#endif - -#ifndef GL_3DFX_tbuffer -#define GL_3DFX_tbuffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTbufferMask3DFX(GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLTBUFFERMASK3DFXPROC)(GLuint mask); -#endif - -#ifndef GL_EXT_multisample -#define GL_EXT_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glSampleMaskEXT(GLclampf, GLboolean); -GLAPI void APIENTRY glSamplePatternEXT(GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLSAMPLEMASKEXTPROC)(GLclampf value, GLboolean invert); -typedef void(APIENTRYP PFNGLSAMPLEPATTERNEXTPROC)(GLenum pattern); -#endif - -#ifndef GL_SGIX_vertex_preclip -#define GL_SGIX_vertex_preclip 1 -#endif - -#ifndef GL_SGIX_convolution_accuracy -#define GL_SGIX_convolution_accuracy 1 -#endif - -#ifndef GL_SGIX_resample -#define GL_SGIX_resample 1 -#endif - -#ifndef GL_SGIS_point_line_texgen -#define GL_SGIS_point_line_texgen 1 -#endif - -#ifndef GL_SGIS_texture_color_mask -#define GL_SGIS_texture_color_mask 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTextureColorMaskSGIS(GLboolean, GLboolean, GLboolean, GLboolean); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLTEXTURECOLORMASKSGISPROC)(GLboolean red, GLboolean green, GLboolean blue, GLboolean alpha); -#endif - -#ifndef GL_SGIX_igloo_interface -#define GL_SGIX_igloo_interface 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glIglooInterfaceSGIX(GLenum, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLIGLOOINTERFACESGIXPROC)(GLenum pname, const GLvoid *params); -#endif - -#ifndef GL_EXT_texture_env_dot3 -#define GL_EXT_texture_env_dot3 1 -#endif - -#ifndef GL_ATI_texture_mirror_once -#define GL_ATI_texture_mirror_once 1 -#endif - -#ifndef GL_NV_fence -#define GL_NV_fence 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDeleteFencesNV(GLsizei, const GLuint *); -GLAPI void APIENTRY glGenFencesNV(GLsizei, GLuint *); -GLAPI GLboolean APIENTRY glIsFenceNV(GLuint); -GLAPI GLboolean APIENTRY glTestFenceNV(GLuint); -GLAPI void APIENTRY glGetFenceivNV(GLuint, GLenum, GLint *); -GLAPI void APIENTRY glFinishFenceNV(GLuint); -GLAPI void APIENTRY glSetFenceNV(GLuint, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLDELETEFENCESNVPROC)(GLsizei n, const GLuint *fences); -typedef void(APIENTRYP PFNGLGENFENCESNVPROC)(GLsizei n, GLuint *fences); -typedef GLboolean(APIENTRYP PFNGLISFENCENVPROC)(GLuint fence); -typedef GLboolean(APIENTRYP PFNGLTESTFENCENVPROC)(GLuint fence); -typedef void(APIENTRYP PFNGLGETFENCEIVNVPROC)(GLuint fence, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLFINISHFENCENVPROC)(GLuint fence); -typedef void(APIENTRYP PFNGLSETFENCENVPROC)(GLuint fence, GLenum condition); -#endif - -#ifndef GL_NV_evaluators -#define GL_NV_evaluators 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glMapControlPointsNV(GLenum, GLuint, GLenum, GLsizei, GLsizei, GLint, GLint, GLboolean, const GLvoid *); -GLAPI void APIENTRY glMapParameterivNV(GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glMapParameterfvNV(GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glGetMapControlPointsNV(GLenum, GLuint, GLenum, GLsizei, GLsizei, GLboolean, GLvoid *); -GLAPI void APIENTRY glGetMapParameterivNV(GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetMapParameterfvNV(GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetMapAttribParameterivNV(GLenum, GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetMapAttribParameterfvNV(GLenum, GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glEvalMapsNV(GLenum, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLMAPCONTROLPOINTSNVPROC)(GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLint uorder, GLint vorder, GLboolean packed, const GLvoid *points); -typedef void(APIENTRYP PFNGLMAPPARAMETERIVNVPROC)(GLenum target, GLenum pname, const GLint *params); -typedef void(APIENTRYP PFNGLMAPPARAMETERFVNVPROC)(GLenum target, GLenum pname, const GLfloat *params); -typedef void(APIENTRYP PFNGLGETMAPCONTROLPOINTSNVPROC)(GLenum target, GLuint index, GLenum type, GLsizei ustride, GLsizei vstride, GLboolean packed, GLvoid *points); -typedef void(APIENTRYP PFNGLGETMAPPARAMETERIVNVPROC)(GLenum target, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETMAPPARAMETERFVNVPROC)(GLenum target, GLenum pname, GLfloat *params); -typedef void(APIENTRYP PFNGLGETMAPATTRIBPARAMETERIVNVPROC)(GLenum target, GLuint index, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETMAPATTRIBPARAMETERFVNVPROC)(GLenum target, GLuint index, GLenum pname, GLfloat *params); -typedef void(APIENTRYP PFNGLEVALMAPSNVPROC)(GLenum target, GLenum mode); -#endif - -#ifndef GL_NV_packed_depth_stencil -#define GL_NV_packed_depth_stencil 1 -#endif - -#ifndef GL_NV_register_combiners2 -#define GL_NV_register_combiners2 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glCombinerStageParameterfvNV(GLenum, GLenum, const GLfloat *); -GLAPI void APIENTRY glGetCombinerStageParameterfvNV(GLenum, GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLCOMBINERSTAGEPARAMETERFVNVPROC)(GLenum stage, GLenum pname, const GLfloat *params); -typedef void(APIENTRYP PFNGLGETCOMBINERSTAGEPARAMETERFVNVPROC)(GLenum stage, GLenum pname, GLfloat *params); -#endif - -#ifndef GL_NV_texture_compression_vtc -#define GL_NV_texture_compression_vtc 1 -#endif - -#ifndef GL_NV_texture_rectangle -#define GL_NV_texture_rectangle 1 -#endif - -#ifndef GL_NV_texture_shader -#define GL_NV_texture_shader 1 -#endif - -#ifndef GL_NV_texture_shader2 -#define GL_NV_texture_shader2 1 -#endif - -#ifndef GL_NV_vertex_array_range2 -#define GL_NV_vertex_array_range2 1 -#endif - -#ifndef GL_NV_vertex_program -#define GL_NV_vertex_program 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLboolean APIENTRY glAreProgramsResidentNV(GLsizei, const GLuint *, GLboolean *); -GLAPI void APIENTRY glBindProgramNV(GLenum, GLuint); -GLAPI void APIENTRY glDeleteProgramsNV(GLsizei, const GLuint *); -GLAPI void APIENTRY glExecuteProgramNV(GLenum, GLuint, const GLfloat *); -GLAPI void APIENTRY glGenProgramsNV(GLsizei, GLuint *); -GLAPI void APIENTRY glGetProgramParameterdvNV(GLenum, GLuint, GLenum, GLdouble *); -GLAPI void APIENTRY glGetProgramParameterfvNV(GLenum, GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetProgramivNV(GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetProgramStringNV(GLuint, GLenum, GLubyte *); -GLAPI void APIENTRY glGetTrackMatrixivNV(GLenum, GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetVertexAttribdvNV(GLuint, GLenum, GLdouble *); -GLAPI void APIENTRY glGetVertexAttribfvNV(GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetVertexAttribivNV(GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetVertexAttribPointervNV(GLuint, GLenum, GLvoid **); -GLAPI GLboolean APIENTRY glIsProgramNV(GLuint); -GLAPI void APIENTRY glLoadProgramNV(GLenum, GLuint, GLsizei, const GLubyte *); -GLAPI void APIENTRY glProgramParameter4dNV(GLenum, GLuint, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glProgramParameter4dvNV(GLenum, GLuint, const GLdouble *); -GLAPI void APIENTRY glProgramParameter4fNV(GLenum, GLuint, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glProgramParameter4fvNV(GLenum, GLuint, const GLfloat *); -GLAPI void APIENTRY glProgramParameters4dvNV(GLenum, GLuint, GLuint, const GLdouble *); -GLAPI void APIENTRY glProgramParameters4fvNV(GLenum, GLuint, GLuint, const GLfloat *); -GLAPI void APIENTRY glRequestResidentProgramsNV(GLsizei, const GLuint *); -GLAPI void APIENTRY glTrackMatrixNV(GLenum, GLuint, GLenum, GLenum); -GLAPI void APIENTRY glVertexAttribPointerNV(GLuint, GLint, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glVertexAttrib1dNV(GLuint, GLdouble); -GLAPI void APIENTRY glVertexAttrib1dvNV(GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib1fNV(GLuint, GLfloat); -GLAPI void APIENTRY glVertexAttrib1fvNV(GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib1sNV(GLuint, GLshort); -GLAPI void APIENTRY glVertexAttrib1svNV(GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib2dNV(GLuint, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib2dvNV(GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib2fNV(GLuint, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib2fvNV(GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib2sNV(GLuint, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib2svNV(GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib3dNV(GLuint, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib3dvNV(GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib3fNV(GLuint, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib3fvNV(GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib3sNV(GLuint, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib3svNV(GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib4dNV(GLuint, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexAttrib4dvNV(GLuint, const GLdouble *); -GLAPI void APIENTRY glVertexAttrib4fNV(GLuint, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexAttrib4fvNV(GLuint, const GLfloat *); -GLAPI void APIENTRY glVertexAttrib4sNV(GLuint, GLshort, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glVertexAttrib4svNV(GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttrib4ubNV(GLuint, GLubyte, GLubyte, GLubyte, GLubyte); -GLAPI void APIENTRY glVertexAttrib4ubvNV(GLuint, const GLubyte *); -GLAPI void APIENTRY glVertexAttribs1dvNV(GLuint, GLsizei, const GLdouble *); -GLAPI void APIENTRY glVertexAttribs1fvNV(GLuint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glVertexAttribs1svNV(GLuint, GLsizei, const GLshort *); -GLAPI void APIENTRY glVertexAttribs2dvNV(GLuint, GLsizei, const GLdouble *); -GLAPI void APIENTRY glVertexAttribs2fvNV(GLuint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glVertexAttribs2svNV(GLuint, GLsizei, const GLshort *); -GLAPI void APIENTRY glVertexAttribs3dvNV(GLuint, GLsizei, const GLdouble *); -GLAPI void APIENTRY glVertexAttribs3fvNV(GLuint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glVertexAttribs3svNV(GLuint, GLsizei, const GLshort *); -GLAPI void APIENTRY glVertexAttribs4dvNV(GLuint, GLsizei, const GLdouble *); -GLAPI void APIENTRY glVertexAttribs4fvNV(GLuint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glVertexAttribs4svNV(GLuint, GLsizei, const GLshort *); -GLAPI void APIENTRY glVertexAttribs4ubvNV(GLuint, GLsizei, const GLubyte *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLboolean(APIENTRYP PFNGLAREPROGRAMSRESIDENTNVPROC)(GLsizei n, const GLuint *programs, GLboolean *residences); -typedef void(APIENTRYP PFNGLBINDPROGRAMNVPROC)(GLenum target, GLuint id); -typedef void(APIENTRYP PFNGLDELETEPROGRAMSNVPROC)(GLsizei n, const GLuint *programs); -typedef void(APIENTRYP PFNGLEXECUTEPROGRAMNVPROC)(GLenum target, GLuint id, const GLfloat *params); -typedef void(APIENTRYP PFNGLGENPROGRAMSNVPROC)(GLsizei n, GLuint *programs); -typedef void(APIENTRYP PFNGLGETPROGRAMPARAMETERDVNVPROC)(GLenum target, GLuint index, GLenum pname, GLdouble *params); -typedef void(APIENTRYP PFNGLGETPROGRAMPARAMETERFVNVPROC)(GLenum target, GLuint index, GLenum pname, GLfloat *params); -typedef void(APIENTRYP PFNGLGETPROGRAMIVNVPROC)(GLuint id, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETPROGRAMSTRINGNVPROC)(GLuint id, GLenum pname, GLubyte *program); -typedef void(APIENTRYP PFNGLGETTRACKMATRIXIVNVPROC)(GLenum target, GLuint address, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETVERTEXATTRIBDVNVPROC)(GLuint index, GLenum pname, GLdouble *params); -typedef void(APIENTRYP PFNGLGETVERTEXATTRIBFVNVPROC)(GLuint index, GLenum pname, GLfloat *params); -typedef void(APIENTRYP PFNGLGETVERTEXATTRIBIVNVPROC)(GLuint index, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETVERTEXATTRIBPOINTERVNVPROC)(GLuint index, GLenum pname, GLvoid **pointer); -typedef GLboolean(APIENTRYP PFNGLISPROGRAMNVPROC)(GLuint id); -typedef void(APIENTRYP PFNGLLOADPROGRAMNVPROC)(GLenum target, GLuint id, GLsizei len, const GLubyte *program); -typedef void(APIENTRYP PFNGLPROGRAMPARAMETER4DNVPROC)(GLenum target, GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void(APIENTRYP PFNGLPROGRAMPARAMETER4DVNVPROC)(GLenum target, GLuint index, const GLdouble *v); -typedef void(APIENTRYP PFNGLPROGRAMPARAMETER4FNVPROC)(GLenum target, GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void(APIENTRYP PFNGLPROGRAMPARAMETER4FVNVPROC)(GLenum target, GLuint index, const GLfloat *v); -typedef void(APIENTRYP PFNGLPROGRAMPARAMETERS4DVNVPROC)(GLenum target, GLuint index, GLuint count, const GLdouble *v); -typedef void(APIENTRYP PFNGLPROGRAMPARAMETERS4FVNVPROC)(GLenum target, GLuint index, GLuint count, const GLfloat *v); -typedef void(APIENTRYP PFNGLREQUESTRESIDENTPROGRAMSNVPROC)(GLsizei n, const GLuint *programs); -typedef void(APIENTRYP PFNGLTRACKMATRIXNVPROC)(GLenum target, GLuint address, GLenum matrix, GLenum transform); -typedef void(APIENTRYP PFNGLVERTEXATTRIBPOINTERNVPROC)(GLuint index, GLint fsize, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void(APIENTRYP PFNGLVERTEXATTRIB1DNVPROC)(GLuint index, GLdouble x); -typedef void(APIENTRYP PFNGLVERTEXATTRIB1DVNVPROC)(GLuint index, const GLdouble *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB1FNVPROC)(GLuint index, GLfloat x); -typedef void(APIENTRYP PFNGLVERTEXATTRIB1FVNVPROC)(GLuint index, const GLfloat *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB1SNVPROC)(GLuint index, GLshort x); -typedef void(APIENTRYP PFNGLVERTEXATTRIB1SVNVPROC)(GLuint index, const GLshort *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB2DNVPROC)(GLuint index, GLdouble x, GLdouble y); -typedef void(APIENTRYP PFNGLVERTEXATTRIB2DVNVPROC)(GLuint index, const GLdouble *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB2FNVPROC)(GLuint index, GLfloat x, GLfloat y); -typedef void(APIENTRYP PFNGLVERTEXATTRIB2FVNVPROC)(GLuint index, const GLfloat *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB2SNVPROC)(GLuint index, GLshort x, GLshort y); -typedef void(APIENTRYP PFNGLVERTEXATTRIB2SVNVPROC)(GLuint index, const GLshort *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB3DNVPROC)(GLuint index, GLdouble x, GLdouble y, GLdouble z); -typedef void(APIENTRYP PFNGLVERTEXATTRIB3DVNVPROC)(GLuint index, const GLdouble *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB3FNVPROC)(GLuint index, GLfloat x, GLfloat y, GLfloat z); -typedef void(APIENTRYP PFNGLVERTEXATTRIB3FVNVPROC)(GLuint index, const GLfloat *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB3SNVPROC)(GLuint index, GLshort x, GLshort y, GLshort z); -typedef void(APIENTRYP PFNGLVERTEXATTRIB3SVNVPROC)(GLuint index, const GLshort *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4DNVPROC)(GLuint index, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4DVNVPROC)(GLuint index, const GLdouble *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4FNVPROC)(GLuint index, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4FVNVPROC)(GLuint index, const GLfloat *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4SNVPROC)(GLuint index, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4SVNVPROC)(GLuint index, const GLshort *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4UBNVPROC)(GLuint index, GLubyte x, GLubyte y, GLubyte z, GLubyte w); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4UBVNVPROC)(GLuint index, const GLubyte *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBS1DVNVPROC)(GLuint index, GLsizei count, const GLdouble *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBS1FVNVPROC)(GLuint index, GLsizei count, const GLfloat *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBS1SVNVPROC)(GLuint index, GLsizei count, const GLshort *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBS2DVNVPROC)(GLuint index, GLsizei count, const GLdouble *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBS2FVNVPROC)(GLuint index, GLsizei count, const GLfloat *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBS2SVNVPROC)(GLuint index, GLsizei count, const GLshort *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBS3DVNVPROC)(GLuint index, GLsizei count, const GLdouble *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBS3FVNVPROC)(GLuint index, GLsizei count, const GLfloat *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBS3SVNVPROC)(GLuint index, GLsizei count, const GLshort *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBS4DVNVPROC)(GLuint index, GLsizei count, const GLdouble *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBS4FVNVPROC)(GLuint index, GLsizei count, const GLfloat *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBS4SVNVPROC)(GLuint index, GLsizei count, const GLshort *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBS4UBVNVPROC)(GLuint index, GLsizei count, const GLubyte *v); -#endif - -#ifndef GL_SGIX_texture_coordinate_clamp -#define GL_SGIX_texture_coordinate_clamp 1 -#endif - -#ifndef GL_SGIX_scalebias_hint -#define GL_SGIX_scalebias_hint 1 -#endif - -#ifndef GL_OML_interlace -#define GL_OML_interlace 1 -#endif - -#ifndef GL_OML_subsample -#define GL_OML_subsample 1 -#endif - -#ifndef GL_OML_resample -#define GL_OML_resample 1 -#endif - -#ifndef GL_NV_copy_depth_to_color -#define GL_NV_copy_depth_to_color 1 -#endif - -#ifndef GL_ATI_envmap_bumpmap -#define GL_ATI_envmap_bumpmap 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexBumpParameterivATI(GLenum, const GLint *); -GLAPI void APIENTRY glTexBumpParameterfvATI(GLenum, const GLfloat *); -GLAPI void APIENTRY glGetTexBumpParameterivATI(GLenum, GLint *); -GLAPI void APIENTRY glGetTexBumpParameterfvATI(GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLTEXBUMPPARAMETERIVATIPROC)(GLenum pname, const GLint *param); -typedef void(APIENTRYP PFNGLTEXBUMPPARAMETERFVATIPROC)(GLenum pname, const GLfloat *param); -typedef void(APIENTRYP PFNGLGETTEXBUMPPARAMETERIVATIPROC)(GLenum pname, GLint *param); -typedef void(APIENTRYP PFNGLGETTEXBUMPPARAMETERFVATIPROC)(GLenum pname, GLfloat *param); -#endif - -#ifndef GL_ATI_fragment_shader -#define GL_ATI_fragment_shader 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLuint APIENTRY glGenFragmentShadersATI(GLuint); -GLAPI void APIENTRY glBindFragmentShaderATI(GLuint); -GLAPI void APIENTRY glDeleteFragmentShaderATI(GLuint); -GLAPI void APIENTRY glBeginFragmentShaderATI(void); -GLAPI void APIENTRY glEndFragmentShaderATI(void); -GLAPI void APIENTRY glPassTexCoordATI(GLuint, GLuint, GLenum); -GLAPI void APIENTRY glSampleMapATI(GLuint, GLuint, GLenum); -GLAPI void APIENTRY glColorFragmentOp1ATI(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glColorFragmentOp2ATI(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glColorFragmentOp3ATI(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glAlphaFragmentOp1ATI(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glAlphaFragmentOp2ATI(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glAlphaFragmentOp3ATI(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glSetFragmentShaderConstantATI(GLuint, const GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLuint(APIENTRYP PFNGLGENFRAGMENTSHADERSATIPROC)(GLuint range); -typedef void(APIENTRYP PFNGLBINDFRAGMENTSHADERATIPROC)(GLuint id); -typedef void(APIENTRYP PFNGLDELETEFRAGMENTSHADERATIPROC)(GLuint id); -typedef void(APIENTRYP PFNGLBEGINFRAGMENTSHADERATIPROC)(void); -typedef void(APIENTRYP PFNGLENDFRAGMENTSHADERATIPROC)(void); -typedef void(APIENTRYP PFNGLPASSTEXCOORDATIPROC)(GLuint dst, GLuint coord, GLenum swizzle); -typedef void(APIENTRYP PFNGLSAMPLEMAPATIPROC)(GLuint dst, GLuint interp, GLenum swizzle); -typedef void(APIENTRYP PFNGLCOLORFRAGMENTOP1ATIPROC)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); -typedef void(APIENTRYP PFNGLCOLORFRAGMENTOP2ATIPROC)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); -typedef void(APIENTRYP PFNGLCOLORFRAGMENTOP3ATIPROC)(GLenum op, GLuint dst, GLuint dstMask, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); -typedef void(APIENTRYP PFNGLALPHAFRAGMENTOP1ATIPROC)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod); -typedef void(APIENTRYP PFNGLALPHAFRAGMENTOP2ATIPROC)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod); -typedef void(APIENTRYP PFNGLALPHAFRAGMENTOP3ATIPROC)(GLenum op, GLuint dst, GLuint dstMod, GLuint arg1, GLuint arg1Rep, GLuint arg1Mod, GLuint arg2, GLuint arg2Rep, GLuint arg2Mod, GLuint arg3, GLuint arg3Rep, GLuint arg3Mod); -typedef void(APIENTRYP PFNGLSETFRAGMENTSHADERCONSTANTATIPROC)(GLuint dst, const GLfloat *value); -#endif - -#ifndef GL_ATI_pn_triangles -#define GL_ATI_pn_triangles 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPNTrianglesiATI(GLenum, GLint); -GLAPI void APIENTRY glPNTrianglesfATI(GLenum, GLfloat); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLPNTRIANGLESIATIPROC)(GLenum pname, GLint param); -typedef void(APIENTRYP PFNGLPNTRIANGLESFATIPROC)(GLenum pname, GLfloat param); -#endif - -#ifndef GL_ATI_vertex_array_object -#define GL_ATI_vertex_array_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLuint APIENTRY glNewObjectBufferATI(GLsizei, const GLvoid *, GLenum); -GLAPI GLboolean APIENTRY glIsObjectBufferATI(GLuint); -GLAPI void APIENTRY glUpdateObjectBufferATI(GLuint, GLuint, GLsizei, const GLvoid *, GLenum); -GLAPI void APIENTRY glGetObjectBufferfvATI(GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetObjectBufferivATI(GLuint, GLenum, GLint *); -GLAPI void APIENTRY glFreeObjectBufferATI(GLuint); -GLAPI void APIENTRY glArrayObjectATI(GLenum, GLint, GLenum, GLsizei, GLuint, GLuint); -GLAPI void APIENTRY glGetArrayObjectfvATI(GLenum, GLenum, GLfloat *); -GLAPI void APIENTRY glGetArrayObjectivATI(GLenum, GLenum, GLint *); -GLAPI void APIENTRY glVariantArrayObjectATI(GLuint, GLenum, GLsizei, GLuint, GLuint); -GLAPI void APIENTRY glGetVariantArrayObjectfvATI(GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetVariantArrayObjectivATI(GLuint, GLenum, GLint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLuint(APIENTRYP PFNGLNEWOBJECTBUFFERATIPROC)(GLsizei size, const GLvoid *pointer, GLenum usage); -typedef GLboolean(APIENTRYP PFNGLISOBJECTBUFFERATIPROC)(GLuint buffer); -typedef void(APIENTRYP PFNGLUPDATEOBJECTBUFFERATIPROC)(GLuint buffer, GLuint offset, GLsizei size, const GLvoid *pointer, GLenum preserve); -typedef void(APIENTRYP PFNGLGETOBJECTBUFFERFVATIPROC)(GLuint buffer, GLenum pname, GLfloat *params); -typedef void(APIENTRYP PFNGLGETOBJECTBUFFERIVATIPROC)(GLuint buffer, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLFREEOBJECTBUFFERATIPROC)(GLuint buffer); -typedef void(APIENTRYP PFNGLARRAYOBJECTATIPROC)(GLenum array, GLint size, GLenum type, GLsizei stride, GLuint buffer, GLuint offset); -typedef void(APIENTRYP PFNGLGETARRAYOBJECTFVATIPROC)(GLenum array, GLenum pname, GLfloat *params); -typedef void(APIENTRYP PFNGLGETARRAYOBJECTIVATIPROC)(GLenum array, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLVARIANTARRAYOBJECTATIPROC)(GLuint id, GLenum type, GLsizei stride, GLuint buffer, GLuint offset); -typedef void(APIENTRYP PFNGLGETVARIANTARRAYOBJECTFVATIPROC)(GLuint id, GLenum pname, GLfloat *params); -typedef void(APIENTRYP PFNGLGETVARIANTARRAYOBJECTIVATIPROC)(GLuint id, GLenum pname, GLint *params); -#endif - -#ifndef GL_EXT_vertex_shader -#define GL_EXT_vertex_shader 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBeginVertexShaderEXT(void); -GLAPI void APIENTRY glEndVertexShaderEXT(void); -GLAPI void APIENTRY glBindVertexShaderEXT(GLuint); -GLAPI GLuint APIENTRY glGenVertexShadersEXT(GLuint); -GLAPI void APIENTRY glDeleteVertexShaderEXT(GLuint); -GLAPI void APIENTRY glShaderOp1EXT(GLenum, GLuint, GLuint); -GLAPI void APIENTRY glShaderOp2EXT(GLenum, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glShaderOp3EXT(GLenum, GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glSwizzleEXT(GLuint, GLuint, GLenum, GLenum, GLenum, GLenum); -GLAPI void APIENTRY glWriteMaskEXT(GLuint, GLuint, GLenum, GLenum, GLenum, GLenum); -GLAPI void APIENTRY glInsertComponentEXT(GLuint, GLuint, GLuint); -GLAPI void APIENTRY glExtractComponentEXT(GLuint, GLuint, GLuint); -GLAPI GLuint APIENTRY glGenSymbolsEXT(GLenum, GLenum, GLenum, GLuint); -GLAPI void APIENTRY glSetInvariantEXT(GLuint, GLenum, const GLvoid *); -GLAPI void APIENTRY glSetLocalConstantEXT(GLuint, GLenum, const GLvoid *); -GLAPI void APIENTRY glVariantbvEXT(GLuint, const GLbyte *); -GLAPI void APIENTRY glVariantsvEXT(GLuint, const GLshort *); -GLAPI void APIENTRY glVariantivEXT(GLuint, const GLint *); -GLAPI void APIENTRY glVariantfvEXT(GLuint, const GLfloat *); -GLAPI void APIENTRY glVariantdvEXT(GLuint, const GLdouble *); -GLAPI void APIENTRY glVariantubvEXT(GLuint, const GLubyte *); -GLAPI void APIENTRY glVariantusvEXT(GLuint, const GLushort *); -GLAPI void APIENTRY glVariantuivEXT(GLuint, const GLuint *); -GLAPI void APIENTRY glVariantPointerEXT(GLuint, GLenum, GLuint, const GLvoid *); -GLAPI void APIENTRY glEnableVariantClientStateEXT(GLuint); -GLAPI void APIENTRY glDisableVariantClientStateEXT(GLuint); -GLAPI GLuint APIENTRY glBindLightParameterEXT(GLenum, GLenum); -GLAPI GLuint APIENTRY glBindMaterialParameterEXT(GLenum, GLenum); -GLAPI GLuint APIENTRY glBindTexGenParameterEXT(GLenum, GLenum, GLenum); -GLAPI GLuint APIENTRY glBindTextureUnitParameterEXT(GLenum, GLenum); -GLAPI GLuint APIENTRY glBindParameterEXT(GLenum); -GLAPI GLboolean APIENTRY glIsVariantEnabledEXT(GLuint, GLenum); -GLAPI void APIENTRY glGetVariantBooleanvEXT(GLuint, GLenum, GLboolean *); -GLAPI void APIENTRY glGetVariantIntegervEXT(GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetVariantFloatvEXT(GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetVariantPointervEXT(GLuint, GLenum, GLvoid **); -GLAPI void APIENTRY glGetInvariantBooleanvEXT(GLuint, GLenum, GLboolean *); -GLAPI void APIENTRY glGetInvariantIntegervEXT(GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetInvariantFloatvEXT(GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetLocalConstantBooleanvEXT(GLuint, GLenum, GLboolean *); -GLAPI void APIENTRY glGetLocalConstantIntegervEXT(GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetLocalConstantFloatvEXT(GLuint, GLenum, GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLBEGINVERTEXSHADEREXTPROC)(void); -typedef void(APIENTRYP PFNGLENDVERTEXSHADEREXTPROC)(void); -typedef void(APIENTRYP PFNGLBINDVERTEXSHADEREXTPROC)(GLuint id); -typedef GLuint(APIENTRYP PFNGLGENVERTEXSHADERSEXTPROC)(GLuint range); -typedef void(APIENTRYP PFNGLDELETEVERTEXSHADEREXTPROC)(GLuint id); -typedef void(APIENTRYP PFNGLSHADEROP1EXTPROC)(GLenum op, GLuint res, GLuint arg1); -typedef void(APIENTRYP PFNGLSHADEROP2EXTPROC)(GLenum op, GLuint res, GLuint arg1, GLuint arg2); -typedef void(APIENTRYP PFNGLSHADEROP3EXTPROC)(GLenum op, GLuint res, GLuint arg1, GLuint arg2, GLuint arg3); -typedef void(APIENTRYP PFNGLSWIZZLEEXTPROC)(GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW); -typedef void(APIENTRYP PFNGLWRITEMASKEXTPROC)(GLuint res, GLuint in, GLenum outX, GLenum outY, GLenum outZ, GLenum outW); -typedef void(APIENTRYP PFNGLINSERTCOMPONENTEXTPROC)(GLuint res, GLuint src, GLuint num); -typedef void(APIENTRYP PFNGLEXTRACTCOMPONENTEXTPROC)(GLuint res, GLuint src, GLuint num); -typedef GLuint(APIENTRYP PFNGLGENSYMBOLSEXTPROC)(GLenum datatype, GLenum storagetype, GLenum range, GLuint components); -typedef void(APIENTRYP PFNGLSETINVARIANTEXTPROC)(GLuint id, GLenum type, const GLvoid *addr); -typedef void(APIENTRYP PFNGLSETLOCALCONSTANTEXTPROC)(GLuint id, GLenum type, const GLvoid *addr); -typedef void(APIENTRYP PFNGLVARIANTBVEXTPROC)(GLuint id, const GLbyte *addr); -typedef void(APIENTRYP PFNGLVARIANTSVEXTPROC)(GLuint id, const GLshort *addr); -typedef void(APIENTRYP PFNGLVARIANTIVEXTPROC)(GLuint id, const GLint *addr); -typedef void(APIENTRYP PFNGLVARIANTFVEXTPROC)(GLuint id, const GLfloat *addr); -typedef void(APIENTRYP PFNGLVARIANTDVEXTPROC)(GLuint id, const GLdouble *addr); -typedef void(APIENTRYP PFNGLVARIANTUBVEXTPROC)(GLuint id, const GLubyte *addr); -typedef void(APIENTRYP PFNGLVARIANTUSVEXTPROC)(GLuint id, const GLushort *addr); -typedef void(APIENTRYP PFNGLVARIANTUIVEXTPROC)(GLuint id, const GLuint *addr); -typedef void(APIENTRYP PFNGLVARIANTPOINTEREXTPROC)(GLuint id, GLenum type, GLuint stride, const GLvoid *addr); -typedef void(APIENTRYP PFNGLENABLEVARIANTCLIENTSTATEEXTPROC)(GLuint id); -typedef void(APIENTRYP PFNGLDISABLEVARIANTCLIENTSTATEEXTPROC)(GLuint id); -typedef GLuint(APIENTRYP PFNGLBINDLIGHTPARAMETEREXTPROC)(GLenum light, GLenum value); -typedef GLuint(APIENTRYP PFNGLBINDMATERIALPARAMETEREXTPROC)(GLenum face, GLenum value); -typedef GLuint(APIENTRYP PFNGLBINDTEXGENPARAMETEREXTPROC)(GLenum unit, GLenum coord, GLenum value); -typedef GLuint(APIENTRYP PFNGLBINDTEXTUREUNITPARAMETEREXTPROC)(GLenum unit, GLenum value); -typedef GLuint(APIENTRYP PFNGLBINDPARAMETEREXTPROC)(GLenum value); -typedef GLboolean(APIENTRYP PFNGLISVARIANTENABLEDEXTPROC)(GLuint id, GLenum cap); -typedef void(APIENTRYP PFNGLGETVARIANTBOOLEANVEXTPROC)(GLuint id, GLenum value, GLboolean *data); -typedef void(APIENTRYP PFNGLGETVARIANTINTEGERVEXTPROC)(GLuint id, GLenum value, GLint *data); -typedef void(APIENTRYP PFNGLGETVARIANTFLOATVEXTPROC)(GLuint id, GLenum value, GLfloat *data); -typedef void(APIENTRYP PFNGLGETVARIANTPOINTERVEXTPROC)(GLuint id, GLenum value, GLvoid **data); -typedef void(APIENTRYP PFNGLGETINVARIANTBOOLEANVEXTPROC)(GLuint id, GLenum value, GLboolean *data); -typedef void(APIENTRYP PFNGLGETINVARIANTINTEGERVEXTPROC)(GLuint id, GLenum value, GLint *data); -typedef void(APIENTRYP PFNGLGETINVARIANTFLOATVEXTPROC)(GLuint id, GLenum value, GLfloat *data); -typedef void(APIENTRYP PFNGLGETLOCALCONSTANTBOOLEANVEXTPROC)(GLuint id, GLenum value, GLboolean *data); -typedef void(APIENTRYP PFNGLGETLOCALCONSTANTINTEGERVEXTPROC)(GLuint id, GLenum value, GLint *data); -typedef void(APIENTRYP PFNGLGETLOCALCONSTANTFLOATVEXTPROC)(GLuint id, GLenum value, GLfloat *data); -#endif - -#ifndef GL_ATI_vertex_streams -#define GL_ATI_vertex_streams 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexStream1sATI(GLenum, GLshort); -GLAPI void APIENTRY glVertexStream1svATI(GLenum, const GLshort *); -GLAPI void APIENTRY glVertexStream1iATI(GLenum, GLint); -GLAPI void APIENTRY glVertexStream1ivATI(GLenum, const GLint *); -GLAPI void APIENTRY glVertexStream1fATI(GLenum, GLfloat); -GLAPI void APIENTRY glVertexStream1fvATI(GLenum, const GLfloat *); -GLAPI void APIENTRY glVertexStream1dATI(GLenum, GLdouble); -GLAPI void APIENTRY glVertexStream1dvATI(GLenum, const GLdouble *); -GLAPI void APIENTRY glVertexStream2sATI(GLenum, GLshort, GLshort); -GLAPI void APIENTRY glVertexStream2svATI(GLenum, const GLshort *); -GLAPI void APIENTRY glVertexStream2iATI(GLenum, GLint, GLint); -GLAPI void APIENTRY glVertexStream2ivATI(GLenum, const GLint *); -GLAPI void APIENTRY glVertexStream2fATI(GLenum, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexStream2fvATI(GLenum, const GLfloat *); -GLAPI void APIENTRY glVertexStream2dATI(GLenum, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexStream2dvATI(GLenum, const GLdouble *); -GLAPI void APIENTRY glVertexStream3sATI(GLenum, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glVertexStream3svATI(GLenum, const GLshort *); -GLAPI void APIENTRY glVertexStream3iATI(GLenum, GLint, GLint, GLint); -GLAPI void APIENTRY glVertexStream3ivATI(GLenum, const GLint *); -GLAPI void APIENTRY glVertexStream3fATI(GLenum, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexStream3fvATI(GLenum, const GLfloat *); -GLAPI void APIENTRY glVertexStream3dATI(GLenum, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexStream3dvATI(GLenum, const GLdouble *); -GLAPI void APIENTRY glVertexStream4sATI(GLenum, GLshort, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glVertexStream4svATI(GLenum, const GLshort *); -GLAPI void APIENTRY glVertexStream4iATI(GLenum, GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glVertexStream4ivATI(GLenum, const GLint *); -GLAPI void APIENTRY glVertexStream4fATI(GLenum, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glVertexStream4fvATI(GLenum, const GLfloat *); -GLAPI void APIENTRY glVertexStream4dATI(GLenum, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glVertexStream4dvATI(GLenum, const GLdouble *); -GLAPI void APIENTRY glNormalStream3bATI(GLenum, GLbyte, GLbyte, GLbyte); -GLAPI void APIENTRY glNormalStream3bvATI(GLenum, const GLbyte *); -GLAPI void APIENTRY glNormalStream3sATI(GLenum, GLshort, GLshort, GLshort); -GLAPI void APIENTRY glNormalStream3svATI(GLenum, const GLshort *); -GLAPI void APIENTRY glNormalStream3iATI(GLenum, GLint, GLint, GLint); -GLAPI void APIENTRY glNormalStream3ivATI(GLenum, const GLint *); -GLAPI void APIENTRY glNormalStream3fATI(GLenum, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glNormalStream3fvATI(GLenum, const GLfloat *); -GLAPI void APIENTRY glNormalStream3dATI(GLenum, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glNormalStream3dvATI(GLenum, const GLdouble *); -GLAPI void APIENTRY glClientActiveVertexStreamATI(GLenum); -GLAPI void APIENTRY glVertexBlendEnviATI(GLenum, GLint); -GLAPI void APIENTRY glVertexBlendEnvfATI(GLenum, GLfloat); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLVERTEXSTREAM1SATIPROC)(GLenum stream, GLshort x); -typedef void(APIENTRYP PFNGLVERTEXSTREAM1SVATIPROC)(GLenum stream, const GLshort *coords); -typedef void(APIENTRYP PFNGLVERTEXSTREAM1IATIPROC)(GLenum stream, GLint x); -typedef void(APIENTRYP PFNGLVERTEXSTREAM1IVATIPROC)(GLenum stream, const GLint *coords); -typedef void(APIENTRYP PFNGLVERTEXSTREAM1FATIPROC)(GLenum stream, GLfloat x); -typedef void(APIENTRYP PFNGLVERTEXSTREAM1FVATIPROC)(GLenum stream, const GLfloat *coords); -typedef void(APIENTRYP PFNGLVERTEXSTREAM1DATIPROC)(GLenum stream, GLdouble x); -typedef void(APIENTRYP PFNGLVERTEXSTREAM1DVATIPROC)(GLenum stream, const GLdouble *coords); -typedef void(APIENTRYP PFNGLVERTEXSTREAM2SATIPROC)(GLenum stream, GLshort x, GLshort y); -typedef void(APIENTRYP PFNGLVERTEXSTREAM2SVATIPROC)(GLenum stream, const GLshort *coords); -typedef void(APIENTRYP PFNGLVERTEXSTREAM2IATIPROC)(GLenum stream, GLint x, GLint y); -typedef void(APIENTRYP PFNGLVERTEXSTREAM2IVATIPROC)(GLenum stream, const GLint *coords); -typedef void(APIENTRYP PFNGLVERTEXSTREAM2FATIPROC)(GLenum stream, GLfloat x, GLfloat y); -typedef void(APIENTRYP PFNGLVERTEXSTREAM2FVATIPROC)(GLenum stream, const GLfloat *coords); -typedef void(APIENTRYP PFNGLVERTEXSTREAM2DATIPROC)(GLenum stream, GLdouble x, GLdouble y); -typedef void(APIENTRYP PFNGLVERTEXSTREAM2DVATIPROC)(GLenum stream, const GLdouble *coords); -typedef void(APIENTRYP PFNGLVERTEXSTREAM3SATIPROC)(GLenum stream, GLshort x, GLshort y, GLshort z); -typedef void(APIENTRYP PFNGLVERTEXSTREAM3SVATIPROC)(GLenum stream, const GLshort *coords); -typedef void(APIENTRYP PFNGLVERTEXSTREAM3IATIPROC)(GLenum stream, GLint x, GLint y, GLint z); -typedef void(APIENTRYP PFNGLVERTEXSTREAM3IVATIPROC)(GLenum stream, const GLint *coords); -typedef void(APIENTRYP PFNGLVERTEXSTREAM3FATIPROC)(GLenum stream, GLfloat x, GLfloat y, GLfloat z); -typedef void(APIENTRYP PFNGLVERTEXSTREAM3FVATIPROC)(GLenum stream, const GLfloat *coords); -typedef void(APIENTRYP PFNGLVERTEXSTREAM3DATIPROC)(GLenum stream, GLdouble x, GLdouble y, GLdouble z); -typedef void(APIENTRYP PFNGLVERTEXSTREAM3DVATIPROC)(GLenum stream, const GLdouble *coords); -typedef void(APIENTRYP PFNGLVERTEXSTREAM4SATIPROC)(GLenum stream, GLshort x, GLshort y, GLshort z, GLshort w); -typedef void(APIENTRYP PFNGLVERTEXSTREAM4SVATIPROC)(GLenum stream, const GLshort *coords); -typedef void(APIENTRYP PFNGLVERTEXSTREAM4IATIPROC)(GLenum stream, GLint x, GLint y, GLint z, GLint w); -typedef void(APIENTRYP PFNGLVERTEXSTREAM4IVATIPROC)(GLenum stream, const GLint *coords); -typedef void(APIENTRYP PFNGLVERTEXSTREAM4FATIPROC)(GLenum stream, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void(APIENTRYP PFNGLVERTEXSTREAM4FVATIPROC)(GLenum stream, const GLfloat *coords); -typedef void(APIENTRYP PFNGLVERTEXSTREAM4DATIPROC)(GLenum stream, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void(APIENTRYP PFNGLVERTEXSTREAM4DVATIPROC)(GLenum stream, const GLdouble *coords); -typedef void(APIENTRYP PFNGLNORMALSTREAM3BATIPROC)(GLenum stream, GLbyte nx, GLbyte ny, GLbyte nz); -typedef void(APIENTRYP PFNGLNORMALSTREAM3BVATIPROC)(GLenum stream, const GLbyte *coords); -typedef void(APIENTRYP PFNGLNORMALSTREAM3SATIPROC)(GLenum stream, GLshort nx, GLshort ny, GLshort nz); -typedef void(APIENTRYP PFNGLNORMALSTREAM3SVATIPROC)(GLenum stream, const GLshort *coords); -typedef void(APIENTRYP PFNGLNORMALSTREAM3IATIPROC)(GLenum stream, GLint nx, GLint ny, GLint nz); -typedef void(APIENTRYP PFNGLNORMALSTREAM3IVATIPROC)(GLenum stream, const GLint *coords); -typedef void(APIENTRYP PFNGLNORMALSTREAM3FATIPROC)(GLenum stream, GLfloat nx, GLfloat ny, GLfloat nz); -typedef void(APIENTRYP PFNGLNORMALSTREAM3FVATIPROC)(GLenum stream, const GLfloat *coords); -typedef void(APIENTRYP PFNGLNORMALSTREAM3DATIPROC)(GLenum stream, GLdouble nx, GLdouble ny, GLdouble nz); -typedef void(APIENTRYP PFNGLNORMALSTREAM3DVATIPROC)(GLenum stream, const GLdouble *coords); -typedef void(APIENTRYP PFNGLCLIENTACTIVEVERTEXSTREAMATIPROC)(GLenum stream); -typedef void(APIENTRYP PFNGLVERTEXBLENDENVIATIPROC)(GLenum pname, GLint param); -typedef void(APIENTRYP PFNGLVERTEXBLENDENVFATIPROC)(GLenum pname, GLfloat param); -#endif - -#ifndef GL_ATI_element_array -#define GL_ATI_element_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glElementPointerATI(GLenum, const GLvoid *); -GLAPI void APIENTRY glDrawElementArrayATI(GLenum, GLsizei); -GLAPI void APIENTRY glDrawRangeElementArrayATI(GLenum, GLuint, GLuint, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLELEMENTPOINTERATIPROC)(GLenum type, const GLvoid *pointer); -typedef void(APIENTRYP PFNGLDRAWELEMENTARRAYATIPROC)(GLenum mode, GLsizei count); -typedef void(APIENTRYP PFNGLDRAWRANGEELEMENTARRAYATIPROC)(GLenum mode, GLuint start, GLuint end, GLsizei count); -#endif - -#ifndef GL_SUN_mesh_array -#define GL_SUN_mesh_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawMeshArraysSUN(GLenum, GLint, GLsizei, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLDRAWMESHARRAYSSUNPROC)(GLenum mode, GLint first, GLsizei count, GLsizei width); -#endif - -#ifndef GL_SUN_slice_accum -#define GL_SUN_slice_accum 1 -#endif - -#ifndef GL_NV_multisample_filter_hint -#define GL_NV_multisample_filter_hint 1 -#endif - -#ifndef GL_NV_depth_clamp -#define GL_NV_depth_clamp 1 -#endif - -#ifndef GL_NV_occlusion_query -#define GL_NV_occlusion_query 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenOcclusionQueriesNV(GLsizei, GLuint *); -GLAPI void APIENTRY glDeleteOcclusionQueriesNV(GLsizei, const GLuint *); -GLAPI GLboolean APIENTRY glIsOcclusionQueryNV(GLuint); -GLAPI void APIENTRY glBeginOcclusionQueryNV(GLuint); -GLAPI void APIENTRY glEndOcclusionQueryNV(void); -GLAPI void APIENTRY glGetOcclusionQueryivNV(GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetOcclusionQueryuivNV(GLuint, GLenum, GLuint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLGENOCCLUSIONQUERIESNVPROC)(GLsizei n, GLuint *ids); -typedef void(APIENTRYP PFNGLDELETEOCCLUSIONQUERIESNVPROC)(GLsizei n, const GLuint *ids); -typedef GLboolean(APIENTRYP PFNGLISOCCLUSIONQUERYNVPROC)(GLuint id); -typedef void(APIENTRYP PFNGLBEGINOCCLUSIONQUERYNVPROC)(GLuint id); -typedef void(APIENTRYP PFNGLENDOCCLUSIONQUERYNVPROC)(void); -typedef void(APIENTRYP PFNGLGETOCCLUSIONQUERYIVNVPROC)(GLuint id, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETOCCLUSIONQUERYUIVNVPROC)(GLuint id, GLenum pname, GLuint *params); -#endif - -#ifndef GL_NV_point_sprite -#define GL_NV_point_sprite 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPointParameteriNV(GLenum, GLint); -GLAPI void APIENTRY glPointParameterivNV(GLenum, const GLint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLPOINTPARAMETERINVPROC)(GLenum pname, GLint param); -typedef void(APIENTRYP PFNGLPOINTPARAMETERIVNVPROC)(GLenum pname, const GLint *params); -#endif - -#ifndef GL_NV_texture_shader3 -#define GL_NV_texture_shader3 1 -#endif - -#ifndef GL_NV_vertex_program1_1 -#define GL_NV_vertex_program1_1 1 -#endif - -#ifndef GL_EXT_shadow_funcs -#define GL_EXT_shadow_funcs 1 -#endif - -#ifndef GL_EXT_stencil_two_side -#define GL_EXT_stencil_two_side 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glActiveStencilFaceEXT(GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLACTIVESTENCILFACEEXTPROC)(GLenum face); -#endif - -#ifndef GL_ATI_text_fragment_shader -#define GL_ATI_text_fragment_shader 1 -#endif - -#ifndef GL_APPLE_client_storage -#define GL_APPLE_client_storage 1 -#endif - -#ifndef GL_APPLE_element_array -#define GL_APPLE_element_array 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glElementPointerAPPLE(GLenum, const GLvoid *); -GLAPI void APIENTRY glDrawElementArrayAPPLE(GLenum, GLint, GLsizei); -GLAPI void APIENTRY glDrawRangeElementArrayAPPLE(GLenum, GLuint, GLuint, GLint, GLsizei); -GLAPI void APIENTRY glMultiDrawElementArrayAPPLE(GLenum, const GLint *, const GLsizei *, GLsizei); -GLAPI void APIENTRY glMultiDrawRangeElementArrayAPPLE(GLenum, GLuint, GLuint, const GLint *, const GLsizei *, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLELEMENTPOINTERAPPLEPROC)(GLenum type, const GLvoid *pointer); -typedef void(APIENTRYP PFNGLDRAWELEMENTARRAYAPPLEPROC)(GLenum mode, GLint first, GLsizei count); -typedef void(APIENTRYP PFNGLDRAWRANGEELEMENTARRAYAPPLEPROC)(GLenum mode, GLuint start, GLuint end, GLint first, GLsizei count); -typedef void(APIENTRYP PFNGLMULTIDRAWELEMENTARRAYAPPLEPROC)(GLenum mode, const GLint *first, const GLsizei *count, GLsizei primcount); -typedef void(APIENTRYP PFNGLMULTIDRAWRANGEELEMENTARRAYAPPLEPROC)(GLenum mode, GLuint start, GLuint end, const GLint *first, const GLsizei *count, GLsizei primcount); -#endif - -#ifndef GL_APPLE_fence -#define GL_APPLE_fence 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGenFencesAPPLE(GLsizei, GLuint *); -GLAPI void APIENTRY glDeleteFencesAPPLE(GLsizei, const GLuint *); -GLAPI void APIENTRY glSetFenceAPPLE(GLuint); -GLAPI GLboolean APIENTRY glIsFenceAPPLE(GLuint); -GLAPI GLboolean APIENTRY glTestFenceAPPLE(GLuint); -GLAPI void APIENTRY glFinishFenceAPPLE(GLuint); -GLAPI GLboolean APIENTRY glTestObjectAPPLE(GLenum, GLuint); -GLAPI void APIENTRY glFinishObjectAPPLE(GLenum, GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLGENFENCESAPPLEPROC)(GLsizei n, GLuint *fences); -typedef void(APIENTRYP PFNGLDELETEFENCESAPPLEPROC)(GLsizei n, const GLuint *fences); -typedef void(APIENTRYP PFNGLSETFENCEAPPLEPROC)(GLuint fence); -typedef GLboolean(APIENTRYP PFNGLISFENCEAPPLEPROC)(GLuint fence); -typedef GLboolean(APIENTRYP PFNGLTESTFENCEAPPLEPROC)(GLuint fence); -typedef void(APIENTRYP PFNGLFINISHFENCEAPPLEPROC)(GLuint fence); -typedef GLboolean(APIENTRYP PFNGLTESTOBJECTAPPLEPROC)(GLenum object, GLuint name); -typedef void(APIENTRYP PFNGLFINISHOBJECTAPPLEPROC)(GLenum object, GLint name); -#endif - -#ifndef GL_APPLE_vertex_array_object -#define GL_APPLE_vertex_array_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBindVertexArrayAPPLE(GLuint); -GLAPI void APIENTRY glDeleteVertexArraysAPPLE(GLsizei, const GLuint *); -GLAPI void APIENTRY glGenVertexArraysAPPLE(GLsizei, GLuint *); -GLAPI GLboolean APIENTRY glIsVertexArrayAPPLE(GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLBINDVERTEXARRAYAPPLEPROC)(GLuint array); -typedef void(APIENTRYP PFNGLDELETEVERTEXARRAYSAPPLEPROC)(GLsizei n, const GLuint *arrays); -typedef void(APIENTRYP PFNGLGENVERTEXARRAYSAPPLEPROC)(GLsizei n, GLuint *arrays); -typedef GLboolean(APIENTRYP PFNGLISVERTEXARRAYAPPLEPROC)(GLuint array); -#endif - -#ifndef GL_APPLE_vertex_array_range -#define GL_APPLE_vertex_array_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexArrayRangeAPPLE(GLsizei, GLvoid *); -GLAPI void APIENTRY glFlushVertexArrayRangeAPPLE(GLsizei, GLvoid *); -GLAPI void APIENTRY glVertexArrayParameteriAPPLE(GLenum, GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLVERTEXARRAYRANGEAPPLEPROC)(GLsizei length, GLvoid *pointer); -typedef void(APIENTRYP PFNGLFLUSHVERTEXARRAYRANGEAPPLEPROC)(GLsizei length, GLvoid *pointer); -typedef void(APIENTRYP PFNGLVERTEXARRAYPARAMETERIAPPLEPROC)(GLenum pname, GLint param); -#endif - -#ifndef GL_APPLE_ycbcr_422 -#define GL_APPLE_ycbcr_422 1 -#endif - -#ifndef GL_S3_s3tc -#define GL_S3_s3tc 1 -#endif - -#ifndef GL_ATI_draw_buffers -#define GL_ATI_draw_buffers 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawBuffersATI(GLsizei, const GLenum *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLDRAWBUFFERSATIPROC)(GLsizei n, const GLenum *bufs); -#endif - -#ifndef GL_ATI_pixel_format_float -#define GL_ATI_pixel_format_float 1 -/* This is really a WGL extension, but defines some associated GL enums. - * ATI does not export "GL_ATI_pixel_format_float" in the GL_EXTENSIONS string. - */ -#endif - -#ifndef GL_ATI_texture_env_combine3 -#define GL_ATI_texture_env_combine3 1 -#endif - -#ifndef GL_ATI_texture_float -#define GL_ATI_texture_float 1 -#endif - -#ifndef GL_NV_float_buffer -#define GL_NV_float_buffer 1 -#endif - -#ifndef GL_NV_fragment_program -#define GL_NV_fragment_program 1 -/* Some NV_fragment_program entry points are shared with ARB_vertex_program. */ -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramNamedParameter4fNV(GLuint, GLsizei, const GLubyte *, GLfloat, GLfloat, GLfloat, GLfloat); -GLAPI void APIENTRY glProgramNamedParameter4dNV(GLuint, GLsizei, const GLubyte *, GLdouble, GLdouble, GLdouble, GLdouble); -GLAPI void APIENTRY glProgramNamedParameter4fvNV(GLuint, GLsizei, const GLubyte *, const GLfloat *); -GLAPI void APIENTRY glProgramNamedParameter4dvNV(GLuint, GLsizei, const GLubyte *, const GLdouble *); -GLAPI void APIENTRY glGetProgramNamedParameterfvNV(GLuint, GLsizei, const GLubyte *, GLfloat *); -GLAPI void APIENTRY glGetProgramNamedParameterdvNV(GLuint, GLsizei, const GLubyte *, GLdouble *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FNVPROC)(GLuint id, GLsizei len, const GLubyte *name, GLfloat x, GLfloat y, GLfloat z, GLfloat w); -typedef void(APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DNVPROC)(GLuint id, GLsizei len, const GLubyte *name, GLdouble x, GLdouble y, GLdouble z, GLdouble w); -typedef void(APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4FVNVPROC)(GLuint id, GLsizei len, const GLubyte *name, const GLfloat *v); -typedef void(APIENTRYP PFNGLPROGRAMNAMEDPARAMETER4DVNVPROC)(GLuint id, GLsizei len, const GLubyte *name, const GLdouble *v); -typedef void(APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERFVNVPROC)(GLuint id, GLsizei len, const GLubyte *name, GLfloat *params); -typedef void(APIENTRYP PFNGLGETPROGRAMNAMEDPARAMETERDVNVPROC)(GLuint id, GLsizei len, const GLubyte *name, GLdouble *params); -#endif - -#ifndef GL_NV_half_float -#define GL_NV_half_float 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertex2hNV(GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glVertex2hvNV(const GLhalfNV *); -GLAPI void APIENTRY glVertex3hNV(GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glVertex3hvNV(const GLhalfNV *); -GLAPI void APIENTRY glVertex4hNV(GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glVertex4hvNV(const GLhalfNV *); -GLAPI void APIENTRY glNormal3hNV(GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glNormal3hvNV(const GLhalfNV *); -GLAPI void APIENTRY glColor3hNV(GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glColor3hvNV(const GLhalfNV *); -GLAPI void APIENTRY glColor4hNV(GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glColor4hvNV(const GLhalfNV *); -GLAPI void APIENTRY glTexCoord1hNV(GLhalfNV); -GLAPI void APIENTRY glTexCoord1hvNV(const GLhalfNV *); -GLAPI void APIENTRY glTexCoord2hNV(GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glTexCoord2hvNV(const GLhalfNV *); -GLAPI void APIENTRY glTexCoord3hNV(GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glTexCoord3hvNV(const GLhalfNV *); -GLAPI void APIENTRY glTexCoord4hNV(GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glTexCoord4hvNV(const GLhalfNV *); -GLAPI void APIENTRY glMultiTexCoord1hNV(GLenum, GLhalfNV); -GLAPI void APIENTRY glMultiTexCoord1hvNV(GLenum, const GLhalfNV *); -GLAPI void APIENTRY glMultiTexCoord2hNV(GLenum, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glMultiTexCoord2hvNV(GLenum, const GLhalfNV *); -GLAPI void APIENTRY glMultiTexCoord3hNV(GLenum, GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glMultiTexCoord3hvNV(GLenum, const GLhalfNV *); -GLAPI void APIENTRY glMultiTexCoord4hNV(GLenum, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glMultiTexCoord4hvNV(GLenum, const GLhalfNV *); -GLAPI void APIENTRY glFogCoordhNV(GLhalfNV); -GLAPI void APIENTRY glFogCoordhvNV(const GLhalfNV *); -GLAPI void APIENTRY glSecondaryColor3hNV(GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glSecondaryColor3hvNV(const GLhalfNV *); -GLAPI void APIENTRY glVertexWeighthNV(GLhalfNV); -GLAPI void APIENTRY glVertexWeighthvNV(const GLhalfNV *); -GLAPI void APIENTRY glVertexAttrib1hNV(GLuint, GLhalfNV); -GLAPI void APIENTRY glVertexAttrib1hvNV(GLuint, const GLhalfNV *); -GLAPI void APIENTRY glVertexAttrib2hNV(GLuint, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glVertexAttrib2hvNV(GLuint, const GLhalfNV *); -GLAPI void APIENTRY glVertexAttrib3hNV(GLuint, GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glVertexAttrib3hvNV(GLuint, const GLhalfNV *); -GLAPI void APIENTRY glVertexAttrib4hNV(GLuint, GLhalfNV, GLhalfNV, GLhalfNV, GLhalfNV); -GLAPI void APIENTRY glVertexAttrib4hvNV(GLuint, const GLhalfNV *); -GLAPI void APIENTRY glVertexAttribs1hvNV(GLuint, GLsizei, const GLhalfNV *); -GLAPI void APIENTRY glVertexAttribs2hvNV(GLuint, GLsizei, const GLhalfNV *); -GLAPI void APIENTRY glVertexAttribs3hvNV(GLuint, GLsizei, const GLhalfNV *); -GLAPI void APIENTRY glVertexAttribs4hvNV(GLuint, GLsizei, const GLhalfNV *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLVERTEX2HNVPROC)(GLhalfNV x, GLhalfNV y); -typedef void(APIENTRYP PFNGLVERTEX2HVNVPROC)(const GLhalfNV *v); -typedef void(APIENTRYP PFNGLVERTEX3HNVPROC)(GLhalfNV x, GLhalfNV y, GLhalfNV z); -typedef void(APIENTRYP PFNGLVERTEX3HVNVPROC)(const GLhalfNV *v); -typedef void(APIENTRYP PFNGLVERTEX4HNVPROC)(GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w); -typedef void(APIENTRYP PFNGLVERTEX4HVNVPROC)(const GLhalfNV *v); -typedef void(APIENTRYP PFNGLNORMAL3HNVPROC)(GLhalfNV nx, GLhalfNV ny, GLhalfNV nz); -typedef void(APIENTRYP PFNGLNORMAL3HVNVPROC)(const GLhalfNV *v); -typedef void(APIENTRYP PFNGLCOLOR3HNVPROC)(GLhalfNV red, GLhalfNV green, GLhalfNV blue); -typedef void(APIENTRYP PFNGLCOLOR3HVNVPROC)(const GLhalfNV *v); -typedef void(APIENTRYP PFNGLCOLOR4HNVPROC)(GLhalfNV red, GLhalfNV green, GLhalfNV blue, GLhalfNV alpha); -typedef void(APIENTRYP PFNGLCOLOR4HVNVPROC)(const GLhalfNV *v); -typedef void(APIENTRYP PFNGLTEXCOORD1HNVPROC)(GLhalfNV s); -typedef void(APIENTRYP PFNGLTEXCOORD1HVNVPROC)(const GLhalfNV *v); -typedef void(APIENTRYP PFNGLTEXCOORD2HNVPROC)(GLhalfNV s, GLhalfNV t); -typedef void(APIENTRYP PFNGLTEXCOORD2HVNVPROC)(const GLhalfNV *v); -typedef void(APIENTRYP PFNGLTEXCOORD3HNVPROC)(GLhalfNV s, GLhalfNV t, GLhalfNV r); -typedef void(APIENTRYP PFNGLTEXCOORD3HVNVPROC)(const GLhalfNV *v); -typedef void(APIENTRYP PFNGLTEXCOORD4HNVPROC)(GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q); -typedef void(APIENTRYP PFNGLTEXCOORD4HVNVPROC)(const GLhalfNV *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD1HNVPROC)(GLenum target, GLhalfNV s); -typedef void(APIENTRYP PFNGLMULTITEXCOORD1HVNVPROC)(GLenum target, const GLhalfNV *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD2HNVPROC)(GLenum target, GLhalfNV s, GLhalfNV t); -typedef void(APIENTRYP PFNGLMULTITEXCOORD2HVNVPROC)(GLenum target, const GLhalfNV *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD3HNVPROC)(GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r); -typedef void(APIENTRYP PFNGLMULTITEXCOORD3HVNVPROC)(GLenum target, const GLhalfNV *v); -typedef void(APIENTRYP PFNGLMULTITEXCOORD4HNVPROC)(GLenum target, GLhalfNV s, GLhalfNV t, GLhalfNV r, GLhalfNV q); -typedef void(APIENTRYP PFNGLMULTITEXCOORD4HVNVPROC)(GLenum target, const GLhalfNV *v); -typedef void(APIENTRYP PFNGLFOGCOORDHNVPROC)(GLhalfNV fog); -typedef void(APIENTRYP PFNGLFOGCOORDHVNVPROC)(const GLhalfNV *fog); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3HNVPROC)(GLhalfNV red, GLhalfNV green, GLhalfNV blue); -typedef void(APIENTRYP PFNGLSECONDARYCOLOR3HVNVPROC)(const GLhalfNV *v); -typedef void(APIENTRYP PFNGLVERTEXWEIGHTHNVPROC)(GLhalfNV weight); -typedef void(APIENTRYP PFNGLVERTEXWEIGHTHVNVPROC)(const GLhalfNV *weight); -typedef void(APIENTRYP PFNGLVERTEXATTRIB1HNVPROC)(GLuint index, GLhalfNV x); -typedef void(APIENTRYP PFNGLVERTEXATTRIB1HVNVPROC)(GLuint index, const GLhalfNV *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB2HNVPROC)(GLuint index, GLhalfNV x, GLhalfNV y); -typedef void(APIENTRYP PFNGLVERTEXATTRIB2HVNVPROC)(GLuint index, const GLhalfNV *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB3HNVPROC)(GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z); -typedef void(APIENTRYP PFNGLVERTEXATTRIB3HVNVPROC)(GLuint index, const GLhalfNV *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4HNVPROC)(GLuint index, GLhalfNV x, GLhalfNV y, GLhalfNV z, GLhalfNV w); -typedef void(APIENTRYP PFNGLVERTEXATTRIB4HVNVPROC)(GLuint index, const GLhalfNV *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBS1HVNVPROC)(GLuint index, GLsizei n, const GLhalfNV *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBS2HVNVPROC)(GLuint index, GLsizei n, const GLhalfNV *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBS3HVNVPROC)(GLuint index, GLsizei n, const GLhalfNV *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBS4HVNVPROC)(GLuint index, GLsizei n, const GLhalfNV *v); -#endif - -#ifndef GL_NV_pixel_data_range -#define GL_NV_pixel_data_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPixelDataRangeNV(GLenum, GLsizei, GLvoid *); -GLAPI void APIENTRY glFlushPixelDataRangeNV(GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLPIXELDATARANGENVPROC)(GLenum target, GLsizei length, GLvoid *pointer); -typedef void(APIENTRYP PFNGLFLUSHPIXELDATARANGENVPROC)(GLenum target); -#endif - -#ifndef GL_NV_primitive_restart -#define GL_NV_primitive_restart 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glPrimitiveRestartNV(void); -GLAPI void APIENTRY glPrimitiveRestartIndexNV(GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLPRIMITIVERESTARTNVPROC)(void); -typedef void(APIENTRYP PFNGLPRIMITIVERESTARTINDEXNVPROC)(GLuint index); -#endif - -#ifndef GL_NV_texture_expand_normal -#define GL_NV_texture_expand_normal 1 -#endif - -#ifndef GL_NV_vertex_program2 -#define GL_NV_vertex_program2 1 -#endif - -#ifndef GL_ATI_map_object_buffer -#define GL_ATI_map_object_buffer 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLvoid *APIENTRY glMapObjectBufferATI(GLuint); -GLAPI void APIENTRY glUnmapObjectBufferATI(GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLvoid *(APIENTRYP PFNGLMAPOBJECTBUFFERATIPROC)(GLuint buffer); -typedef void(APIENTRYP PFNGLUNMAPOBJECTBUFFERATIPROC)(GLuint buffer); -#endif - -#ifndef GL_ATI_separate_stencil -#define GL_ATI_separate_stencil 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glStencilOpSeparateATI(GLenum, GLenum, GLenum, GLenum); -GLAPI void APIENTRY glStencilFuncSeparateATI(GLenum, GLenum, GLint, GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLSTENCILOPSEPARATEATIPROC)(GLenum face, GLenum sfail, GLenum dpfail, GLenum dppass); -typedef void(APIENTRYP PFNGLSTENCILFUNCSEPARATEATIPROC)(GLenum frontfunc, GLenum backfunc, GLint ref, GLuint mask); -#endif - -#ifndef GL_ATI_vertex_attrib_array_object -#define GL_ATI_vertex_attrib_array_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttribArrayObjectATI(GLuint, GLint, GLenum, GLboolean, GLsizei, GLuint, GLuint); -GLAPI void APIENTRY glGetVertexAttribArrayObjectfvATI(GLuint, GLenum, GLfloat *); -GLAPI void APIENTRY glGetVertexAttribArrayObjectivATI(GLuint, GLenum, GLint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLVERTEXATTRIBARRAYOBJECTATIPROC)(GLuint index, GLint size, GLenum type, GLboolean normalized, GLsizei stride, GLuint buffer, GLuint offset); -typedef void(APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTFVATIPROC)(GLuint index, GLenum pname, GLfloat *params); -typedef void(APIENTRYP PFNGLGETVERTEXATTRIBARRAYOBJECTIVATIPROC)(GLuint index, GLenum pname, GLint *params); -#endif - -#ifndef GL_OES_read_format -#define GL_OES_read_format 1 -#endif - -#ifndef GL_EXT_depth_bounds_test -#define GL_EXT_depth_bounds_test 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDepthBoundsEXT(GLclampd, GLclampd); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLDEPTHBOUNDSEXTPROC)(GLclampd zmin, GLclampd zmax); -#endif - -#ifndef GL_EXT_texture_mirror_clamp -#define GL_EXT_texture_mirror_clamp 1 -#endif - -#ifndef GL_EXT_blend_equation_separate -#define GL_EXT_blend_equation_separate 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlendEquationSeparateEXT(GLenum, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLBLENDEQUATIONSEPARATEEXTPROC)(GLenum modeRGB, GLenum modeAlpha); -#endif - -#ifndef GL_MESA_pack_invert -#define GL_MESA_pack_invert 1 -#endif - -#ifndef GL_MESA_ycbcr_texture -#define GL_MESA_ycbcr_texture 1 -#endif - -#ifndef GL_EXT_pixel_buffer_object -#define GL_EXT_pixel_buffer_object 1 -#endif - -#ifndef GL_NV_fragment_program_option -#define GL_NV_fragment_program_option 1 -#endif - -#ifndef GL_NV_fragment_program2 -#define GL_NV_fragment_program2 1 -#endif - -#ifndef GL_NV_vertex_program2_option -#define GL_NV_vertex_program2_option 1 -#endif - -#ifndef GL_NV_vertex_program3 -#define GL_NV_vertex_program3 1 -#endif - -#ifndef GL_EXT_framebuffer_object -#define GL_EXT_framebuffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI GLboolean APIENTRY glIsRenderbufferEXT(GLuint); -GLAPI void APIENTRY glBindRenderbufferEXT(GLenum, GLuint); -GLAPI void APIENTRY glDeleteRenderbuffersEXT(GLsizei, const GLuint *); -GLAPI void APIENTRY glGenRenderbuffersEXT(GLsizei, GLuint *); -GLAPI void APIENTRY glRenderbufferStorageEXT(GLenum, GLenum, GLsizei, GLsizei); -GLAPI void APIENTRY glGetRenderbufferParameterivEXT(GLenum, GLenum, GLint *); -GLAPI GLboolean APIENTRY glIsFramebufferEXT(GLuint); -GLAPI void APIENTRY glBindFramebufferEXT(GLenum, GLuint); -GLAPI void APIENTRY glDeleteFramebuffersEXT(GLsizei, const GLuint *); -GLAPI void APIENTRY glGenFramebuffersEXT(GLsizei, GLuint *); -GLAPI GLenum APIENTRY glCheckFramebufferStatusEXT(GLenum); -GLAPI void APIENTRY glFramebufferTexture1DEXT(GLenum, GLenum, GLenum, GLuint, GLint); -GLAPI void APIENTRY glFramebufferTexture2DEXT(GLenum, GLenum, GLenum, GLuint, GLint); -GLAPI void APIENTRY glFramebufferTexture3DEXT(GLenum, GLenum, GLenum, GLuint, GLint, GLint); -GLAPI void APIENTRY glFramebufferRenderbufferEXT(GLenum, GLenum, GLenum, GLuint); -GLAPI void APIENTRY glGetFramebufferAttachmentParameterivEXT(GLenum, GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGenerateMipmapEXT(GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef GLboolean(APIENTRYP PFNGLISRENDERBUFFEREXTPROC)(GLuint renderbuffer); -typedef void(APIENTRYP PFNGLBINDRENDERBUFFEREXTPROC)(GLenum target, GLuint renderbuffer); -typedef void(APIENTRYP PFNGLDELETERENDERBUFFERSEXTPROC)(GLsizei n, const GLuint *renderbuffers); -typedef void(APIENTRYP PFNGLGENRENDERBUFFERSEXTPROC)(GLsizei n, GLuint *renderbuffers); -typedef void(APIENTRYP PFNGLRENDERBUFFERSTORAGEEXTPROC)(GLenum target, GLenum internalformat, GLsizei width, GLsizei height); -typedef void(APIENTRYP PFNGLGETRENDERBUFFERPARAMETERIVEXTPROC)(GLenum target, GLenum pname, GLint *params); -typedef GLboolean(APIENTRYP PFNGLISFRAMEBUFFEREXTPROC)(GLuint framebuffer); -typedef void(APIENTRYP PFNGLBINDFRAMEBUFFEREXTPROC)(GLenum target, GLuint framebuffer); -typedef void(APIENTRYP PFNGLDELETEFRAMEBUFFERSEXTPROC)(GLsizei n, const GLuint *framebuffers); -typedef void(APIENTRYP PFNGLGENFRAMEBUFFERSEXTPROC)(GLsizei n, GLuint *framebuffers); -typedef GLenum(APIENTRYP PFNGLCHECKFRAMEBUFFERSTATUSEXTPROC)(GLenum target); -typedef void(APIENTRYP PFNGLFRAMEBUFFERTEXTURE1DEXTPROC)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void(APIENTRYP PFNGLFRAMEBUFFERTEXTURE2DEXTPROC)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level); -typedef void(APIENTRYP PFNGLFRAMEBUFFERTEXTURE3DEXTPROC)(GLenum target, GLenum attachment, GLenum textarget, GLuint texture, GLint level, GLint zoffset); -typedef void(APIENTRYP PFNGLFRAMEBUFFERRENDERBUFFEREXTPROC)(GLenum target, GLenum attachment, GLenum renderbuffertarget, GLuint renderbuffer); -typedef void(APIENTRYP PFNGLGETFRAMEBUFFERATTACHMENTPARAMETERIVEXTPROC)(GLenum target, GLenum attachment, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGENERATEMIPMAPEXTPROC)(GLenum target); -#endif - -#ifndef GL_GREMEDY_string_marker -#define GL_GREMEDY_string_marker 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glStringMarkerGREMEDY(GLsizei, const GLvoid *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLSTRINGMARKERGREMEDYPROC)(GLsizei len, const GLvoid *string); -#endif - -#ifndef GL_EXT_packed_depth_stencil -#define GL_EXT_packed_depth_stencil 1 -#endif - -#ifndef GL_EXT_stencil_clear_tag -#define GL_EXT_stencil_clear_tag 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glStencilClearTagEXT(GLsizei, GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLSTENCILCLEARTAGEXTPROC)(GLsizei stencilTagBits, GLuint stencilClearTag); -#endif - -#ifndef GL_EXT_texture_sRGB -#define GL_EXT_texture_sRGB 1 -#endif - -#ifndef GL_EXT_framebuffer_blit -#define GL_EXT_framebuffer_blit 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBlitFramebufferEXT(GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLint, GLbitfield, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLBLITFRAMEBUFFEREXTPROC)(GLint srcX0, GLint srcY0, GLint srcX1, GLint srcY1, GLint dstX0, GLint dstY0, GLint dstX1, GLint dstY1, GLbitfield mask, GLenum filter); -#endif - -#ifndef GL_EXT_framebuffer_multisample -#define GL_EXT_framebuffer_multisample 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glRenderbufferStorageMultisampleEXT(GLenum, GLsizei, GLenum, GLsizei, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLEEXTPROC)(GLenum target, GLsizei samples, GLenum internalformat, GLsizei width, GLsizei height); -#endif - -#ifndef GL_MESAX_texture_stack -#define GL_MESAX_texture_stack 1 -#endif - -#ifndef GL_EXT_timer_query -#define GL_EXT_timer_query 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetQueryObjecti64vEXT(GLuint, GLenum, GLint64EXT *); -GLAPI void APIENTRY glGetQueryObjectui64vEXT(GLuint, GLenum, GLuint64EXT *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLGETQUERYOBJECTI64VEXTPROC)(GLuint id, GLenum pname, GLint64EXT *params); -typedef void(APIENTRYP PFNGLGETQUERYOBJECTUI64VEXTPROC)(GLuint id, GLenum pname, GLuint64EXT *params); -#endif - -#ifndef GL_EXT_gpu_program_parameters -#define GL_EXT_gpu_program_parameters 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramEnvParameters4fvEXT(GLenum, GLuint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glProgramLocalParameters4fvEXT(GLenum, GLuint, GLsizei, const GLfloat *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLPROGRAMENVPARAMETERS4FVEXTPROC)(GLenum target, GLuint index, GLsizei count, const GLfloat *params); -typedef void(APIENTRYP PFNGLPROGRAMLOCALPARAMETERS4FVEXTPROC)(GLenum target, GLuint index, GLsizei count, const GLfloat *params); -#endif - -#ifndef GL_APPLE_flush_buffer_range -#define GL_APPLE_flush_buffer_range 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBufferParameteriAPPLE(GLenum, GLenum, GLint); -GLAPI void APIENTRY glFlushMappedBufferRangeAPPLE(GLenum, GLintptr, GLsizeiptr); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLBUFFERPARAMETERIAPPLEPROC)(GLenum target, GLenum pname, GLint param); -typedef void(APIENTRYP PFNGLFLUSHMAPPEDBUFFERRANGEAPPLEPROC)(GLenum target, GLintptr offset, GLsizeiptr size); -#endif - -#ifndef GL_NV_gpu_program4 -#define GL_NV_gpu_program4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramLocalParameterI4iNV(GLenum, GLuint, GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glProgramLocalParameterI4ivNV(GLenum, GLuint, const GLint *); -GLAPI void APIENTRY glProgramLocalParametersI4ivNV(GLenum, GLuint, GLsizei, const GLint *); -GLAPI void APIENTRY glProgramLocalParameterI4uiNV(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glProgramLocalParameterI4uivNV(GLenum, GLuint, const GLuint *); -GLAPI void APIENTRY glProgramLocalParametersI4uivNV(GLenum, GLuint, GLsizei, const GLuint *); -GLAPI void APIENTRY glProgramEnvParameterI4iNV(GLenum, GLuint, GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glProgramEnvParameterI4ivNV(GLenum, GLuint, const GLint *); -GLAPI void APIENTRY glProgramEnvParametersI4ivNV(GLenum, GLuint, GLsizei, const GLint *); -GLAPI void APIENTRY glProgramEnvParameterI4uiNV(GLenum, GLuint, GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glProgramEnvParameterI4uivNV(GLenum, GLuint, const GLuint *); -GLAPI void APIENTRY glProgramEnvParametersI4uivNV(GLenum, GLuint, GLsizei, const GLuint *); -GLAPI void APIENTRY glGetProgramLocalParameterIivNV(GLenum, GLuint, GLint *); -GLAPI void APIENTRY glGetProgramLocalParameterIuivNV(GLenum, GLuint, GLuint *); -GLAPI void APIENTRY glGetProgramEnvParameterIivNV(GLenum, GLuint, GLint *); -GLAPI void APIENTRY glGetProgramEnvParameterIuivNV(GLenum, GLuint, GLuint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4INVPROC)(GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void(APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4IVNVPROC)(GLenum target, GLuint index, const GLint *params); -typedef void(APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4IVNVPROC)(GLenum target, GLuint index, GLsizei count, const GLint *params); -typedef void(APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UINVPROC)(GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void(APIENTRYP PFNGLPROGRAMLOCALPARAMETERI4UIVNVPROC)(GLenum target, GLuint index, const GLuint *params); -typedef void(APIENTRYP PFNGLPROGRAMLOCALPARAMETERSI4UIVNVPROC)(GLenum target, GLuint index, GLsizei count, const GLuint *params); -typedef void(APIENTRYP PFNGLPROGRAMENVPARAMETERI4INVPROC)(GLenum target, GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void(APIENTRYP PFNGLPROGRAMENVPARAMETERI4IVNVPROC)(GLenum target, GLuint index, const GLint *params); -typedef void(APIENTRYP PFNGLPROGRAMENVPARAMETERSI4IVNVPROC)(GLenum target, GLuint index, GLsizei count, const GLint *params); -typedef void(APIENTRYP PFNGLPROGRAMENVPARAMETERI4UINVPROC)(GLenum target, GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void(APIENTRYP PFNGLPROGRAMENVPARAMETERI4UIVNVPROC)(GLenum target, GLuint index, const GLuint *params); -typedef void(APIENTRYP PFNGLPROGRAMENVPARAMETERSI4UIVNVPROC)(GLenum target, GLuint index, GLsizei count, const GLuint *params); -typedef void(APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIIVNVPROC)(GLenum target, GLuint index, GLint *params); -typedef void(APIENTRYP PFNGLGETPROGRAMLOCALPARAMETERIUIVNVPROC)(GLenum target, GLuint index, GLuint *params); -typedef void(APIENTRYP PFNGLGETPROGRAMENVPARAMETERIIVNVPROC)(GLenum target, GLuint index, GLint *params); -typedef void(APIENTRYP PFNGLGETPROGRAMENVPARAMETERIUIVNVPROC)(GLenum target, GLuint index, GLuint *params); -#endif - -#ifndef GL_NV_geometry_program4 -#define GL_NV_geometry_program4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramVertexLimitNV(GLenum, GLint); -GLAPI void APIENTRY glFramebufferTextureEXT(GLenum, GLenum, GLuint, GLint); -GLAPI void APIENTRY glFramebufferTextureLayerEXT(GLenum, GLenum, GLuint, GLint, GLint); -GLAPI void APIENTRY glFramebufferTextureFaceEXT(GLenum, GLenum, GLuint, GLint, GLenum); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLPROGRAMVERTEXLIMITNVPROC)(GLenum target, GLint limit); -typedef void(APIENTRYP PFNGLFRAMEBUFFERTEXTUREEXTPROC)(GLenum target, GLenum attachment, GLuint texture, GLint level); -typedef void(APIENTRYP PFNGLFRAMEBUFFERTEXTURELAYEREXTPROC)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLint layer); -typedef void(APIENTRYP PFNGLFRAMEBUFFERTEXTUREFACEEXTPROC)(GLenum target, GLenum attachment, GLuint texture, GLint level, GLenum face); -#endif - -#ifndef GL_EXT_geometry_shader4 -#define GL_EXT_geometry_shader4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramParameteriEXT(GLuint, GLenum, GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLPROGRAMPARAMETERIEXTPROC)(GLuint program, GLenum pname, GLint value); -#endif - -#ifndef GL_NV_vertex_program4 -#define GL_NV_vertex_program4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glVertexAttribI1iEXT(GLuint, GLint); -GLAPI void APIENTRY glVertexAttribI2iEXT(GLuint, GLint, GLint); -GLAPI void APIENTRY glVertexAttribI3iEXT(GLuint, GLint, GLint, GLint); -GLAPI void APIENTRY glVertexAttribI4iEXT(GLuint, GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glVertexAttribI1uiEXT(GLuint, GLuint); -GLAPI void APIENTRY glVertexAttribI2uiEXT(GLuint, GLuint, GLuint); -GLAPI void APIENTRY glVertexAttribI3uiEXT(GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glVertexAttribI4uiEXT(GLuint, GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glVertexAttribI1ivEXT(GLuint, const GLint *); -GLAPI void APIENTRY glVertexAttribI2ivEXT(GLuint, const GLint *); -GLAPI void APIENTRY glVertexAttribI3ivEXT(GLuint, const GLint *); -GLAPI void APIENTRY glVertexAttribI4ivEXT(GLuint, const GLint *); -GLAPI void APIENTRY glVertexAttribI1uivEXT(GLuint, const GLuint *); -GLAPI void APIENTRY glVertexAttribI2uivEXT(GLuint, const GLuint *); -GLAPI void APIENTRY glVertexAttribI3uivEXT(GLuint, const GLuint *); -GLAPI void APIENTRY glVertexAttribI4uivEXT(GLuint, const GLuint *); -GLAPI void APIENTRY glVertexAttribI4bvEXT(GLuint, const GLbyte *); -GLAPI void APIENTRY glVertexAttribI4svEXT(GLuint, const GLshort *); -GLAPI void APIENTRY glVertexAttribI4ubvEXT(GLuint, const GLubyte *); -GLAPI void APIENTRY glVertexAttribI4usvEXT(GLuint, const GLushort *); -GLAPI void APIENTRY glVertexAttribIPointerEXT(GLuint, GLint, GLenum, GLsizei, const GLvoid *); -GLAPI void APIENTRY glGetVertexAttribIivEXT(GLuint, GLenum, GLint *); -GLAPI void APIENTRY glGetVertexAttribIuivEXT(GLuint, GLenum, GLuint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLVERTEXATTRIBI1IEXTPROC)(GLuint index, GLint x); -typedef void(APIENTRYP PFNGLVERTEXATTRIBI2IEXTPROC)(GLuint index, GLint x, GLint y); -typedef void(APIENTRYP PFNGLVERTEXATTRIBI3IEXTPROC)(GLuint index, GLint x, GLint y, GLint z); -typedef void(APIENTRYP PFNGLVERTEXATTRIBI4IEXTPROC)(GLuint index, GLint x, GLint y, GLint z, GLint w); -typedef void(APIENTRYP PFNGLVERTEXATTRIBI1UIEXTPROC)(GLuint index, GLuint x); -typedef void(APIENTRYP PFNGLVERTEXATTRIBI2UIEXTPROC)(GLuint index, GLuint x, GLuint y); -typedef void(APIENTRYP PFNGLVERTEXATTRIBI3UIEXTPROC)(GLuint index, GLuint x, GLuint y, GLuint z); -typedef void(APIENTRYP PFNGLVERTEXATTRIBI4UIEXTPROC)(GLuint index, GLuint x, GLuint y, GLuint z, GLuint w); -typedef void(APIENTRYP PFNGLVERTEXATTRIBI1IVEXTPROC)(GLuint index, const GLint *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBI2IVEXTPROC)(GLuint index, const GLint *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBI3IVEXTPROC)(GLuint index, const GLint *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBI4IVEXTPROC)(GLuint index, const GLint *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBI1UIVEXTPROC)(GLuint index, const GLuint *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBI2UIVEXTPROC)(GLuint index, const GLuint *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBI3UIVEXTPROC)(GLuint index, const GLuint *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBI4UIVEXTPROC)(GLuint index, const GLuint *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBI4BVEXTPROC)(GLuint index, const GLbyte *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBI4SVEXTPROC)(GLuint index, const GLshort *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBI4UBVEXTPROC)(GLuint index, const GLubyte *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBI4USVEXTPROC)(GLuint index, const GLushort *v); -typedef void(APIENTRYP PFNGLVERTEXATTRIBIPOINTEREXTPROC)(GLuint index, GLint size, GLenum type, GLsizei stride, const GLvoid *pointer); -typedef void(APIENTRYP PFNGLGETVERTEXATTRIBIIVEXTPROC)(GLuint index, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETVERTEXATTRIBIUIVEXTPROC)(GLuint index, GLenum pname, GLuint *params); -#endif - -#ifndef GL_EXT_gpu_shader4 -#define GL_EXT_gpu_shader4 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glGetUniformuivEXT(GLuint, GLint, GLuint *); -GLAPI void APIENTRY glBindFragDataLocationEXT(GLuint, GLuint, const GLchar *); -GLAPI GLint APIENTRY glGetFragDataLocationEXT(GLuint, const GLchar *); -GLAPI void APIENTRY glUniform1uiEXT(GLint, GLuint); -GLAPI void APIENTRY glUniform2uiEXT(GLint, GLuint, GLuint); -GLAPI void APIENTRY glUniform3uiEXT(GLint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glUniform4uiEXT(GLint, GLuint, GLuint, GLuint, GLuint); -GLAPI void APIENTRY glUniform1uivEXT(GLint, GLsizei, const GLuint *); -GLAPI void APIENTRY glUniform2uivEXT(GLint, GLsizei, const GLuint *); -GLAPI void APIENTRY glUniform3uivEXT(GLint, GLsizei, const GLuint *); -GLAPI void APIENTRY glUniform4uivEXT(GLint, GLsizei, const GLuint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLGETUNIFORMUIVEXTPROC)(GLuint program, GLint location, GLuint *params); -typedef void(APIENTRYP PFNGLBINDFRAGDATALOCATIONEXTPROC)(GLuint program, GLuint color, const GLchar *name); -typedef GLint(APIENTRYP PFNGLGETFRAGDATALOCATIONEXTPROC)(GLuint program, const GLchar *name); -typedef void(APIENTRYP PFNGLUNIFORM1UIEXTPROC)(GLint location, GLuint v0); -typedef void(APIENTRYP PFNGLUNIFORM2UIEXTPROC)(GLint location, GLuint v0, GLuint v1); -typedef void(APIENTRYP PFNGLUNIFORM3UIEXTPROC)(GLint location, GLuint v0, GLuint v1, GLuint v2); -typedef void(APIENTRYP PFNGLUNIFORM4UIEXTPROC)(GLint location, GLuint v0, GLuint v1, GLuint v2, GLuint v3); -typedef void(APIENTRYP PFNGLUNIFORM1UIVEXTPROC)(GLint location, GLsizei count, const GLuint *value); -typedef void(APIENTRYP PFNGLUNIFORM2UIVEXTPROC)(GLint location, GLsizei count, const GLuint *value); -typedef void(APIENTRYP PFNGLUNIFORM3UIVEXTPROC)(GLint location, GLsizei count, const GLuint *value); -typedef void(APIENTRYP PFNGLUNIFORM4UIVEXTPROC)(GLint location, GLsizei count, const GLuint *value); -#endif - -#ifndef GL_EXT_draw_instanced -#define GL_EXT_draw_instanced 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDrawArraysInstancedEXT(GLenum, GLint, GLsizei, GLsizei); -GLAPI void APIENTRY glDrawElementsInstancedEXT(GLenum, GLsizei, GLenum, const GLvoid *, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLDRAWARRAYSINSTANCEDEXTPROC)(GLenum mode, GLint start, GLsizei count, GLsizei primcount); -typedef void(APIENTRYP PFNGLDRAWELEMENTSINSTANCEDEXTPROC)(GLenum mode, GLsizei count, GLenum type, const GLvoid *indices, GLsizei primcount); -#endif - -#ifndef GL_EXT_packed_float -#define GL_EXT_packed_float 1 -#endif - -#ifndef GL_EXT_texture_array -#define GL_EXT_texture_array 1 -#endif - -#ifndef GL_EXT_texture_buffer_object -#define GL_EXT_texture_buffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexBufferEXT(GLenum, GLenum, GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLTEXBUFFEREXTPROC)(GLenum target, GLenum internalformat, GLuint buffer); -#endif - -#ifndef GL_EXT_texture_compression_latc -#define GL_EXT_texture_compression_latc 1 -#endif - -#ifndef GL_EXT_texture_compression_rgtc -#define GL_EXT_texture_compression_rgtc 1 -#endif - -#ifndef GL_EXT_texture_shared_exponent -#define GL_EXT_texture_shared_exponent 1 -#endif - -#ifndef GL_NV_depth_buffer_float -#define GL_NV_depth_buffer_float 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glDepthRangedNV(GLdouble, GLdouble); -GLAPI void APIENTRY glClearDepthdNV(GLdouble); -GLAPI void APIENTRY glDepthBoundsdNV(GLdouble, GLdouble); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLDEPTHRANGEDNVPROC)(GLdouble zNear, GLdouble zFar); -typedef void(APIENTRYP PFNGLCLEARDEPTHDNVPROC)(GLdouble depth); -typedef void(APIENTRYP PFNGLDEPTHBOUNDSDNVPROC)(GLdouble zmin, GLdouble zmax); -#endif - -#ifndef GL_NV_fragment_program4 -#define GL_NV_fragment_program4 1 -#endif - -#ifndef GL_NV_framebuffer_multisample_coverage -#define GL_NV_framebuffer_multisample_coverage 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glRenderbufferStorageMultisampleCoverageNV(GLenum, GLsizei, GLsizei, GLenum, GLsizei, GLsizei); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLRENDERBUFFERSTORAGEMULTISAMPLECOVERAGENVPROC)(GLenum target, GLsizei coverageSamples, GLsizei colorSamples, GLenum internalformat, GLsizei width, GLsizei height); -#endif - -#ifndef GL_EXT_framebuffer_sRGB -#define GL_EXT_framebuffer_sRGB 1 -#endif - -#ifndef GL_NV_geometry_shader4 -#define GL_NV_geometry_shader4 1 -#endif - -#ifndef GL_NV_parameter_buffer_object -#define GL_NV_parameter_buffer_object 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glProgramBufferParametersfvNV(GLenum, GLuint, GLuint, GLsizei, const GLfloat *); -GLAPI void APIENTRY glProgramBufferParametersIivNV(GLenum, GLuint, GLuint, GLsizei, const GLint *); -GLAPI void APIENTRY glProgramBufferParametersIuivNV(GLenum, GLuint, GLuint, GLsizei, const GLuint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSFVNVPROC)(GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLfloat *params); -typedef void(APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIIVNVPROC)(GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLint *params); -typedef void(APIENTRYP PFNGLPROGRAMBUFFERPARAMETERSIUIVNVPROC)(GLenum target, GLuint buffer, GLuint index, GLsizei count, const GLuint *params); -#endif - -#ifndef GL_EXT_draw_buffers2 -#define GL_EXT_draw_buffers2 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glColorMaskIndexedEXT(GLuint, GLboolean, GLboolean, GLboolean, GLboolean); -GLAPI void APIENTRY glGetBooleanIndexedvEXT(GLenum, GLuint, GLboolean *); -GLAPI void APIENTRY glGetIntegerIndexedvEXT(GLenum, GLuint, GLint *); -GLAPI void APIENTRY glEnableIndexedEXT(GLenum, GLuint); -GLAPI void APIENTRY glDisableIndexedEXT(GLenum, GLuint); -GLAPI GLboolean APIENTRY glIsEnabledIndexedEXT(GLenum, GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLCOLORMASKINDEXEDEXTPROC)(GLuint index, GLboolean r, GLboolean g, GLboolean b, GLboolean a); -typedef void(APIENTRYP PFNGLGETBOOLEANINDEXEDVEXTPROC)(GLenum target, GLuint index, GLboolean *data); -typedef void(APIENTRYP PFNGLGETINTEGERINDEXEDVEXTPROC)(GLenum target, GLuint index, GLint *data); -typedef void(APIENTRYP PFNGLENABLEINDEXEDEXTPROC)(GLenum target, GLuint index); -typedef void(APIENTRYP PFNGLDISABLEINDEXEDEXTPROC)(GLenum target, GLuint index); -typedef GLboolean(APIENTRYP PFNGLISENABLEDINDEXEDEXTPROC)(GLenum target, GLuint index); -#endif - -#ifndef GL_NV_transform_feedback -#define GL_NV_transform_feedback 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glBeginTransformFeedbackNV(GLenum); -GLAPI void APIENTRY glEndTransformFeedbackNV(void); -GLAPI void APIENTRY glTransformFeedbackAttribsNV(GLuint, const GLint *, GLenum); -GLAPI void APIENTRY glBindBufferRangeNV(GLenum, GLuint, GLuint, GLintptr, GLsizeiptr); -GLAPI void APIENTRY glBindBufferOffsetNV(GLenum, GLuint, GLuint, GLintptr); -GLAPI void APIENTRY glBindBufferBaseNV(GLenum, GLuint, GLuint); -GLAPI void APIENTRY glTransformFeedbackVaryingsNV(GLuint, GLsizei, const GLint *, GLenum); -GLAPI void APIENTRY glActiveVaryingNV(GLuint, const GLchar *); -GLAPI GLint APIENTRY glGetVaryingLocationNV(GLuint, const GLchar *); -GLAPI void APIENTRY glGetActiveVaryingNV(GLuint, GLuint, GLsizei, GLsizei *, GLsizei *, GLenum *, GLchar *); -GLAPI void APIENTRY glGetTransformFeedbackVaryingNV(GLuint, GLuint, GLint *); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLBEGINTRANSFORMFEEDBACKNVPROC)(GLenum primitiveMode); -typedef void(APIENTRYP PFNGLENDTRANSFORMFEEDBACKNVPROC)(void); -typedef void(APIENTRYP PFNGLTRANSFORMFEEDBACKATTRIBSNVPROC)(GLuint count, const GLint *attribs, GLenum bufferMode); -typedef void(APIENTRYP PFNGLBINDBUFFERRANGENVPROC)(GLenum target, GLuint index, GLuint buffer, GLintptr offset, GLsizeiptr size); -typedef void(APIENTRYP PFNGLBINDBUFFEROFFSETNVPROC)(GLenum target, GLuint index, GLuint buffer, GLintptr offset); -typedef void(APIENTRYP PFNGLBINDBUFFERBASENVPROC)(GLenum target, GLuint index, GLuint buffer); -typedef void(APIENTRYP PFNGLTRANSFORMFEEDBACKVARYINGSNVPROC)(GLuint program, GLsizei count, const GLint *locations, GLenum bufferMode); -typedef void(APIENTRYP PFNGLACTIVEVARYINGNVPROC)(GLuint program, const GLchar *name); -typedef GLint(APIENTRYP PFNGLGETVARYINGLOCATIONNVPROC)(GLuint program, const GLchar *name); -typedef void(APIENTRYP PFNGLGETACTIVEVARYINGNVPROC)(GLuint program, GLuint index, GLsizei bufSize, GLsizei *length, GLsizei *size, GLenum *type, GLchar *name); -typedef void(APIENTRYP PFNGLGETTRANSFORMFEEDBACKVARYINGNVPROC)(GLuint program, GLuint index, GLint *location); -#endif - -#ifndef GL_EXT_bindable_uniform -#define GL_EXT_bindable_uniform 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glUniformBufferEXT(GLuint, GLint, GLuint); -GLAPI GLint APIENTRY glGetUniformBufferSizeEXT(GLuint, GLint); -GLAPI GLintptr APIENTRY glGetUniformOffsetEXT(GLuint, GLint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLUNIFORMBUFFEREXTPROC)(GLuint program, GLint location, GLuint buffer); -typedef GLint(APIENTRYP PFNGLGETUNIFORMBUFFERSIZEEXTPROC)(GLuint program, GLint location); -typedef GLintptr(APIENTRYP PFNGLGETUNIFORMOFFSETEXTPROC)(GLuint program, GLint location); -#endif - -#ifndef GL_EXT_texture_integer -#define GL_EXT_texture_integer 1 -#ifdef GL_GLEXT_PROTOTYPES -GLAPI void APIENTRY glTexParameterIivEXT(GLenum, GLenum, const GLint *); -GLAPI void APIENTRY glTexParameterIuivEXT(GLenum, GLenum, const GLuint *); -GLAPI void APIENTRY glGetTexParameterIivEXT(GLenum, GLenum, GLint *); -GLAPI void APIENTRY glGetTexParameterIuivEXT(GLenum, GLenum, GLuint *); -GLAPI void APIENTRY glClearColorIiEXT(GLint, GLint, GLint, GLint); -GLAPI void APIENTRY glClearColorIuiEXT(GLuint, GLuint, GLuint, GLuint); -#endif /* GL_GLEXT_PROTOTYPES */ -typedef void(APIENTRYP PFNGLTEXPARAMETERIIVEXTPROC)(GLenum target, GLenum pname, const GLint *params); -typedef void(APIENTRYP PFNGLTEXPARAMETERIUIVEXTPROC)(GLenum target, GLenum pname, const GLuint *params); -typedef void(APIENTRYP PFNGLGETTEXPARAMETERIIVEXTPROC)(GLenum target, GLenum pname, GLint *params); -typedef void(APIENTRYP PFNGLGETTEXPARAMETERIUIVEXTPROC)(GLenum target, GLenum pname, GLuint *params); -typedef void(APIENTRYP PFNGLCLEARCOLORIIEXTPROC)(GLint red, GLint green, GLint blue, GLint alpha); -typedef void(APIENTRYP PFNGLCLEARCOLORIUIEXTPROC)(GLuint red, GLuint green, GLuint blue, GLuint alpha); -#endif - -#ifdef __cplusplus -} -#endif - -#endif diff --git a/toonz/sources/toonz/linetestviewer.cpp b/toonz/sources/toonz/linetestviewer.cpp index e4593a6..dcc9639 100644 --- a/toonz/sources/toonz/linetestviewer.cpp +++ b/toonz/sources/toonz/linetestviewer.cpp @@ -7,7 +7,6 @@ #include "timagecache.h" #include "tgl.h" #include "trop.h" -#include "glext.h" #include "toonz/txsheethandle.h" #include "toonz/tframehandle.h" #include "toonz/tcolumnhandle.h" diff --git a/toonz/sources/toonz/main.cpp b/toonz/sources/toonz/main.cpp index 32e34b7..14ae56e 100644 --- a/toonz/sources/toonz/main.cpp +++ b/toonz/sources/toonz/main.cpp @@ -599,11 +599,7 @@ int main(int argc, char *argv[]) // Carico lo styleSheet QString currentStyle = Preferences::instance()->getCurrentStyleSheet(); - QFile file(currentStyle); - file.open(QFile::ReadOnly); - QString styleSheet = QString(file.readAll()); - a.setStyleSheet(styleSheet); - file.close(); + a.setStyleSheet(currentStyle); TApp::instance()->setMainWindow(&w); w.setWindowTitle(applicationFullName); diff --git a/toonz/sources/toonz/mainwindow.cpp b/toonz/sources/toonz/mainwindow.cpp index d7c92b5..dbf8b72 100644 --- a/toonz/sources/toonz/mainwindow.cpp +++ b/toonz/sources/toonz/mainwindow.cpp @@ -1845,8 +1845,8 @@ void MainWindow::defineActions() // createAction(MI_TestAnimation, "Test Animation", "Ctrl+Return"); // createAction(MI_Export, "Export", "Ctrl+E"); - createMenuWindowsAction(MI_OpenComboViewer, "&ComboViewer", ""); - createMenuWindowsAction(MI_OpenHistoryPanel, "&History", ""); + createMenuWindowsAction(MI_OpenComboViewer, tr("&ComboViewer"), ""); + createMenuWindowsAction(MI_OpenHistoryPanel, tr("&History"), ""); createMenuWindowsAction(MI_ResetRoomLayout, tr("&Reset to Default Rooms"), ""); diff --git a/toonz/sources/toonz/preferencespopup.cpp b/toonz/sources/toonz/preferencespopup.cpp index acf33ee..fb3b5ae 100644 --- a/toonz/sources/toonz/preferencespopup.cpp +++ b/toonz/sources/toonz/preferencespopup.cpp @@ -642,11 +642,7 @@ void PreferencesPopup::onStyleSheetTypeChanged(int index) m_pref->setCurrentStyleSheet(index); QApplication::setOverrideCursor(Qt::WaitCursor); QString currentStyle = m_pref->getCurrentStyleSheet(); - QFile file(currentStyle); - file.open(QFile::ReadOnly); - QString styleSheet = QString(file.readAll()); - qApp->setStyleSheet(styleSheet); - file.close(); + qApp->setStyleSheet(currentStyle); QApplication::restoreOverrideCursor(); } @@ -1049,8 +1045,8 @@ PreferencesPopup::PreferencesPopup() showRasterImageDarkenBlendedInViewerCB->setChecked(m_pref->isShowRasterImagesDarkenBlendedInViewerEnabled()); showShowFrameNumberWithLettersCB->setChecked(m_pref->isShowFrameNumberWithLettersEnabled()); QStringList zoomCenters; - zoomCenters << "Mouse Cursor" - << "Viewer Center"; + zoomCenters << tr("Mouse Cursor") + << tr("Viewer Center"); viewerZoomCenterComboBox->addItems(zoomCenters); viewerZoomCenterComboBox->setCurrentIndex(m_pref->getViewerZoomCenter()); @@ -1120,9 +1116,9 @@ PreferencesPopup::PreferencesPopup() m_defLevelDpi->setRange(0.1, (std::numeric_limits::max)()); m_defLevelDpi->setValue(m_pref->getDefLevelDpi()); QStringList autocreationTypes; - autocreationTypes << "Disabled" - << "Enabled" - << "Use Xsheet as Animation Sheet"; + autocreationTypes << tr("Disabled") + << tr("Enabled") + << tr("Use Xsheet as Animation Sheet"); m_autocreationType->addItems(autocreationTypes); int autocreationType = m_pref->getAutocreationType(); m_autocreationType->setCurrentIndex(autocreationType); diff --git a/toonz/sources/toonz/sceneviewer.cpp b/toonz/sources/toonz/sceneviewer.cpp index f6021f8..29467a9 100644 --- a/toonz/sources/toonz/sceneviewer.cpp +++ b/toonz/sources/toonz/sceneviewer.cpp @@ -1014,21 +1014,25 @@ void SceneViewer::drawBackground() glClear(GL_COLOR_BUFFER_BIT); if (glGetError() == GL_INVALID_FRAMEBUFFER_OPERATION) { /* 起動時一回目になぜか GL_FRAMEBUFFER_COMPLETE なのに invalid operation が出る */ - printf("GL_INVALID_FRAMEBUFFER_OPERATION: framebuffer:%d\n", + GLenum status = 0; #if WIN32 - reinterpret_cast( - wglGetProcAddress("glCheckFramebufferStatusEXT"))(GL_FRAMEBUFFER)); + PROC proc = wglGetProcAddress("glCheckFramebufferStatusEXT"); + if (proc != nullptr) + status = reinterpret_cast(proc)(GL_FRAMEBUFFER); #else - glCheckFramebufferStatus(GL_FRAMEBUFFER)); + status = glCheckFramebufferStatus(GL_FRAMEBUFFER); #endif + printf("GL_INVALID_FRAMEBUFFER_OPERATION: framebuffer:%d\n", status); } } bool check_framebuffer_status() { #if WIN32 - GLenum s = reinterpret_cast( - wglGetProcAddress("glCheckFramebufferStatusEXT"))(GL_FRAMEBUFFER); + PROC proc = wglGetProcAddress("glCheckFramebufferStatusEXT"); + if (proc == nullptr) + return true; + GLenum s = reinterpret_cast(proc)(GL_FRAMEBUFFER); #else GLenum s = glCheckFramebufferStatus(GL_FRAMEBUFFER); #endif diff --git a/toonz/sources/toonz/toonz.ico b/toonz/sources/toonz/toonz.ico index 06d2f20..7c59d6f 100644 Binary files a/toonz/sources/toonz/toonz.ico and b/toonz/sources/toonz/toonz.ico differ diff --git a/toonz/sources/toonz/tpanels.cpp b/toonz/sources/toonz/tpanels.cpp index a024fb8..18e590d 100644 --- a/toonz/sources/toonz/tpanels.cpp +++ b/toonz/sources/toonz/tpanels.cpp @@ -1300,7 +1300,7 @@ public: { ComboViewerPanel *panel = new ComboViewerPanel(parent); panel->setObjectName(getPanelType()); - panel->setWindowTitle("Combo Viewer"); + panel->setWindowTitle(QObject::tr("Combo Viewer")); panel->resize(700, 600); return panel; } @@ -1333,7 +1333,7 @@ public: } cleanupSettingsFactory; //============================================================================= -OpenFloatingPanel openCleanupSettingsDockCommand(MI_OpenCleanupSettings, "CleanupSettings", QObject::tr("Cleeanup Settings")); +OpenFloatingPanel openCleanupSettingsDockCommand(MI_OpenCleanupSettings, "CleanupSettings", QObject::tr("Cleanup Settings")); //----------------------------------------------------------------------------- //============================================================================= @@ -1354,5 +1354,5 @@ public: } } historyPanelFactory; -OpenFloatingPanel openHistoryPanelCommand(MI_OpenHistoryPanel, "HistoryPanel", "History"); +OpenFloatingPanel openHistoryPanelCommand(MI_OpenHistoryPanel, "HistoryPanel", QObject::tr("History")); //============================================================================= diff --git a/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp b/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp index 9b5ec10..5a9f70f 100644 --- a/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp +++ b/toonz/sources/toonzfarm/tfarmcontroller/tfarmcontroller.cpp @@ -2384,7 +2384,7 @@ void ControllerService::onStart(int argc, char *argv[]) TFilePath globalRoot = getGlobalRoot(); if (globalRoot.isEmpty()) { - QString errMsg("Unable to get TFARMGLOBALROOT environment variable\n"); + QString errMsg("Unable to get FARMROOT environment variable\n"); addToMessageLog(errMsg); // exit the program diff --git a/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp b/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp index a8fa96d..abbaeda 100644 --- a/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp +++ b/toonz/sources/toonzfarm/tfarmserver/tfarmserver.cpp @@ -835,7 +835,7 @@ void FarmServerService::onStart(int argc, char *argv[]) if (!lRootDirExists) { string errMsg("Unable to start the Server"); errMsg += "\n"; - errMsg += "The directorya specified as Local Root does not exist"; + errMsg += "The directory specified as Local Root does not exist"; errMsg += "\n"; addToMessageLog(errMsg); diff --git a/toonz/sources/toonzlib/preferences.cpp b/toonz/sources/toonzlib/preferences.cpp index df0ec9d..b40c6be 100644 --- a/toonz/sources/toonzlib/preferences.cpp +++ b/toonz/sources/toonzlib/preferences.cpp @@ -389,7 +389,7 @@ Preferences::Preferences() #endif if (fpName == QString("standard")) m_currentStyleSheet = i; - m_styleSheetMaps[i] = path.getQString() + "/" + string; + m_styleSheetMaps[i] = "file:///" + path.getQString() + "/" + string; } } catch (...) { } diff --git a/toonz/sources/toonzlib/tproject.cpp b/toonz/sources/toonzlib/tproject.cpp index 2e3d9f5..8d17e17 100644 --- a/toonz/sources/toonzlib/tproject.cpp +++ b/toonz/sources/toonzlib/tproject.cpp @@ -595,8 +595,10 @@ bool TProject::save(const TFilePath &projectPath) pm->getFolderNames(foldernames); for (int f = 0; f < foldernames.size(); f++) { TFilePath folderpath = decode(getFolder(foldernames.at(f))); - if (folderpath.isEmpty()) + if (folderpath.isEmpty() + ||!isConstantFolder(f) ) continue; + TFilePath xmlPath = folderpath + "scenes.xml"; TFileStatus xmlfs(xmlPath); if (xmlfs.doesExist() && !xmlfs.isWritable()) diff --git a/toonz/sources/toonzqt/pluginhost.cpp b/toonz/sources/toonzqt/pluginhost.cpp index 0af9568..efbd37b 100644 --- a/toonz/sources/toonzqt/pluginhost.cpp +++ b/toonz/sources/toonzqt/pluginhost.cpp @@ -630,9 +630,19 @@ Param *RasterFxPluginHost::createParam(const toonz_param_desc_t *desc, bool from /* pi は永続性があるので clone から呼ばれた場合は書き換えない */ if (!fromclone) { // add to a map - pi_->params_.push_back(nullptr); - pi_->params_.back() = new Param(this, desc->key, toonz_param_type_enum(desc->traits_tag), desc); - return pi_->params_.back(); + Param *param = nullptr; + for (auto const &p : pi_->params_) { + if (p->name() == desc->key) { + param = p; + break; + } + } + if (!param) { + pi_->params_.push_back(nullptr); + pi_->params_.back() = new Param(this, desc->key, toonz_param_type_enum(desc->traits_tag), desc); + param = pi_->params_.back(); + } + return param; } return nullptr; } diff --git a/toonz/sources/translations/japanese/colorfx.ts b/toonz/sources/translations/japanese/colorfx.ts index fcc2402..fa67ca0 100644 --- a/toonz/sources/translations/japanese/colorfx.ts +++ b/toonz/sources/translations/japanese/colorfx.ts @@ -1,6 +1,6 @@ - + ArtisticSolidColor @@ -39,7 +39,7 @@ OutlineViewerStyle OutlineViewer(OnlyDebug) - アウトラインビューア（デバッグだけ） + アウトラインビューア（デバッグのみ） Control Point @@ -51,7 +51,7 @@ Outline Mode - 外側線モード + アウトラインモード Distance @@ -85,7 +85,7 @@ ShadowStyle2 Plain Shadow - 標準影 + 影（標準） Angle @@ -104,7 +104,7 @@ Blur value - ぼかす価値 + ぼかしの度合 @@ -144,7 +144,7 @@ TBraidStrokeStyle Plait - プリーツ + 編みひも Twirl @@ -188,7 +188,7 @@ Border Fade - ボーダーフェード + 境界フェード Density @@ -211,7 +211,7 @@ TCheckedFillStyle Square - 正方形 + 四角模様 Horiz Dist @@ -257,15 +257,15 @@ TCircleStripeFillStyle Concentric - 同心 + 同心円 X Position - Xの位置 + 水平位置 Y Position - Yの位置 + 垂直位置 Distance @@ -288,29 +288,29 @@ Opacity - 不透明 + 不透明度 TDottedFillStyle Polka Dots - ポルカドット + 水玉模様 Dot Size - ドットサイズ + 水玉のサイズ Dot Distance - ドット距離 + 水玉の距離 TDottedLineStrokeStyle Vanishing - パニシング + 減衰 Fade In @@ -318,7 +318,7 @@ Dash - ダッシュ + 線の部分 Fade Out @@ -326,7 +326,7 @@ Gap - ギャップ + 空白の部分 @@ -359,7 +359,7 @@ TFurStrokeStyle Herringbone - ヘリンボン + ヘリンボーン Angle @@ -374,7 +374,7 @@ TGraphicPenStrokeStyle Dashes - ダッシュ + ストローク Density @@ -393,11 +393,11 @@ X Position - Xの位置 + 水平位置 Y Position - Yの位置 + 垂直位置 Smoothness @@ -426,7 +426,7 @@ TMosaicFillStyle Stained Glass - ステンドガラス + ステンドグラス Size @@ -434,22 +434,22 @@ Distortion - ひずみ + ゆがみ Min Thick - 最小厚さ + 厚さの最小値 Max Thick - 最大厚さ + 厚さの最大値 TMultiLineStrokeStyle2 Gouache - グワッシュ画法 + グワッシュ Density @@ -479,19 +479,19 @@ TNormal2StrokeStyle Bump - 衝突 + バンプ Light X Pos - 光　［Xの位置］ + 光源の水平位置 Light Y Pos - 光　［Yの位置］ + 光源の垂直位置 Shininess - 光沢 + 光沢度 Plastic @@ -502,7 +502,7 @@ TPatchFillStyle Beehive - ビーハイヴ + 蜂の巣模様 Size @@ -510,7 +510,7 @@ Distortion - ひずみ + ゆがみ Thickness @@ -548,15 +548,15 @@ X Position - Xの位置 + 水平位置 Y Position - Yの位置 + 垂直位置 Radius - レイディアス + 半径 Smoothness @@ -589,7 +589,7 @@ TSawToothStrokeStyle Jagged - ぎざぎざ + ぎざぎざの度合 Distance @@ -604,14 +604,14 @@ Frequency - 頻度 + 周波数 TSketchStrokeStyle Fuzz - ファズ + ぼかし具合 Density @@ -622,11 +622,11 @@ TSprayStrokeStyle Circlets - サークレット + 小さい円 Border Fade - ボーダーフェード + 境界フェード Density @@ -641,7 +641,7 @@ TStripeFillStyle Banded - 結合 + 縞模様 Distance @@ -660,7 +660,7 @@ TTissueStrokeStyle Gauze - ガーゼ + 網目模様 Density @@ -668,7 +668,7 @@ Border Size - ボーダーサイズ + 境界のサイズ @@ -683,7 +683,7 @@ Shade - シェード + 影 @@ -701,19 +701,19 @@ Min Distance - 最小距離 + 距離の最小値 Max Distance - 最大距離 + 距離の最大値 Min Angle - 最小角度 + 角度の最大値 Max Angle - 最大角度 + 角度の最大値 Thickness diff --git a/toonz/sources/translations/japanese/tnzcore.ts b/toonz/sources/translations/japanese/tnzcore.ts index cd1ef70..92de542 100644 --- a/toonz/sources/translations/japanese/tnzcore.ts +++ b/toonz/sources/translations/japanese/tnzcore.ts @@ -1,22 +1,22 @@ - + QObject colors - メインの色 + 色 Unidentified Action - + 未定義のアクション TCenterLineStrokeStyle Constant - 固定 + 定数 Thickness diff --git a/toonz/sources/translations/japanese/tnztools.ts b/toonz/sources/translations/japanese/tnztools.ts index ba2fbab..87b6403 100644 --- a/toonz/sources/translations/japanese/tnztools.ts +++ b/toonz/sources/translations/japanese/tnztools.ts @@ -1,11 +1,11 @@ - + ArrowToolOptionsBox Pick: - 自動選択： + 選択オブジェクト： Position @@ -13,19 +13,19 @@ E/W: - X： + E/W: N/S: - Y： + N/S: Z: - Z： + Z: SO: - 列オフセット： + 重ね順: Rotation @@ -33,7 +33,7 @@ Scale - 拡大・縮小 + 拡大率 Global: @@ -41,19 +41,19 @@ H: - 横： + 水平： V: - 縦： + 垂直： Maintain: - 比率： + 値を固定: Shear - 変形 + シアー Center @@ -65,15 +65,15 @@ ( - + ( ) - + ) Center Position - 基準点位置 + センター位置 @@ -124,41 +124,41 @@ Size - + サイズ Break - + 鋭角で線を分割 Pencil - + 鉛筆モード Pressure - + 圧力感知 BrushToolOptionsBox Preset Name - + プリセット名 OK - + OK Cancel - キャンセル + キャンセル ControlPointEditorTool Auto Select Drawing - 列を自動選択 + レベルをまたいで選択 @@ -169,7 +169,7 @@ Set Nonlinear Control Point - カーブポイントに変更 + スムーズポイントに変更 @@ -236,7 +236,7 @@ SO - 列オフセット + 重ね順 Rotation @@ -252,15 +252,15 @@ Shear - 変形 + シアー Center Position - 基準点位置 + センター位置 Active Axis - + 操作する軸 @@ -279,8 +279,7 @@ Mode: - モード： - + モード： Selective @@ -323,7 +322,7 @@ Fill Depth - 色の浸透度 + 塗りの浸透度 Segment @@ -334,11 +333,11 @@ FingerTool Size: - サイズ： + サイズ： Invert - 反転 + 反転 @@ -349,7 +348,7 @@ Pressure Sensitivity - 圧力感度 + 圧力感知 Opacity: @@ -451,7 +450,7 @@ Rigid - 固定 + 剛体 Flex @@ -463,11 +462,11 @@ Vertex Name: - 頂点名前： + 頂点名： Allow Stretching - ストレッチングを適用 + ストレッチを許可 Thickness @@ -485,9 +484,9 @@ A group of skeletons already exists for current column. Replacing it will also substitute any existing vertex animation. Do you want to continue? - 列の作成されたボーンは、既に存在します。 -列の交換はさらに既存の頂点アニメーションも変わります。 -継続しますか？ + 現在の列には、既にボーンが存在します。 +ボーンを置き換えることで、既存の頂点アニメーションも変更されます。 +継続してよろしいですか？ Ok @@ -515,7 +514,7 @@ Do you want to continue? Set Rest Key - レストキーを設定 + 停止キーを設定 Set Global Key @@ -523,7 +522,7 @@ Do you want to continue? Set Global Rest Key - グローバルレストキーを設定 + グローバル停止キーを設定 Show Mesh @@ -531,23 +530,23 @@ Do you want to continue? Show Rigidity - 固定の表示 + 剛性の表示 Show SO - SO表示 + 重ね順の表示 Show Skeleton Onion Skin - ボーンオニオンスキン表示 + ボーンをオニオンスキン表示 The previous vertex name will be discarded, and all associated keys will be lost. Do you want to proceed? - 前の頂点名は破棄し、関連するキーがすべて削除します。 + 既存の頂点名は破棄され、全ての関連するキーが削除されます。 -継続しますか？ +継続してよろしいですか？ Edit Mesh @@ -555,23 +554,23 @@ Do you want to proceed? Snap To Mesh - メッシュに合わせる + メッシュにスナップ Angle Bounds - 角度制限を設定 + 角度の範囲を設定 Swap Edge - エッジ（辺）を90度回転 + エッジをスワップ Collapse Edge - エッジ（辺）を削除 + エッジを削除 Split Edge - エッジ（辺）を二分割 + エッジを分割 Cut Mesh @@ -590,7 +589,7 @@ Do you want to proceed? SO - 列オフセット + 重ね順 Angle @@ -621,11 +620,11 @@ Do you want to proceed? Polygon Sides: - 多角形の面： + 多角形の辺の数： Auto Group - 自動グループ + 自動グループ化 Auto Fill @@ -653,7 +652,7 @@ Do you want to proceed? Size: - サイズ： + サイズ： @@ -707,15 +706,15 @@ Do you want to proceed? The current tool cannot be used on a Level column. - 現在のツールはレベルの列に使用できません。 + 現在のツールはレベルの列には使用できません。 The current tool cannot be used on a Mesh column. - 現在のツールはメッシュ列に使用できません。 + 現在のツールはメッシュ列には使用できません。 The current tool cannot be used in Level Strip mode. - 現在のツールはレベルビューアモードに使用できません。 + 現在のツールはレベル編集モードでは使用できません。 The current tool cannot be used to edit a motion path. @@ -727,23 +726,23 @@ Do you want to proceed? The current tool cannot be used on a Vector Level. - 現在のツールはベクトルレベルに使用できません。 + 現在のツールはベクトルレベルには使用できません。 The current tool cannot be used on a Toonz Level. - 現在のツールはTOONZレベルに使用できません。 + 現在のツールはToonzレベルには使用できません。 The current tool cannot be used on a Raster Level. - 現在のツールはラスターレベルに使用できません。 + 現在のツールはラスターレベルには使用できません。 The current tool cannot be used on a Mesh Level. - 現在のツールはメッシュレベルに使用できません。 + 現在のツールはメッシュレベルには使用できません。 The current tool cannot be used on a mesh-deformed level - 現在のツールはメッシュ変形されたレベルに使用できません。 + 現在のツールはメッシュ変形されたレベルには使用できません The current frame is locked: any editing is forbidden. @@ -759,51 +758,55 @@ Do you want to proceed? Paste - + 貼り付け Move Center - + センター位置を移動 RGB Picker (R%1, G%2, B%3) - + RGBスポイトツール （R%1, G%2, B%3） Group - + グループ化 Ungroup - + グループ解除 Move Group - + グループを移動 Modify Fx Gadget - + エフェクト・ガジェットでパラメータを変更 %1 Level : %2 Frame : %3 - + %1 レベル : %2 フレーム : %3 Modify Stroke Tool - + アイロンツール Modify Spline - + スプラインを編集 Deform Raster - + 画像を変形 Transform Raster - + 画像を変形 + + + Set Save Box : (X%1,Y%2,W%3,H%4)->(X%5,Y%6,W%7,H%8) + セーブボックスを設定 : (X%1,Y%2,W%3,H%4)->(X%5,Y%6,W%7,H%8) @@ -814,7 +817,7 @@ Do you want to proceed? Passive Pick - + マウス位置の色を拾う @@ -828,11 +831,11 @@ Do you want to proceed? RasterSelectionTool No Antialiasing - 二値化する + ハードな輪郭を維持 Modify Savebox - セーブボックスを変更する + セーブボックス編集モード @@ -885,11 +888,11 @@ Do you want to proceed? E/W: - X： + E/W: N/S: - Y： + N/S: Thickness @@ -897,7 +900,7 @@ Do you want to proceed? Link - 連結 + 縦横比を固定 @@ -908,7 +911,7 @@ Do you want to proceed? Show Only Active Skeleton - 有効ボーンのみ表示 + アクティブなボーンのみ表示 Mode: @@ -950,7 +953,7 @@ Do you want to proceed? Vertical Orientation - 垂直方向 + 縦書きにする Size: @@ -965,7 +968,7 @@ Do you want to proceed? Preserve Thickness - 太さを保持 + 線の太さを保持 Cap @@ -984,7 +987,7 @@ Do you want to proceed? VectorTapeTool Smooth - カーブで連結 + 滑らかに連結 Join Vectors diff --git a/toonz/sources/translations/japanese/toonz.ts b/toonz/sources/translations/japanese/toonz.ts index 3d81f59..a89a684 100644 --- a/toonz/sources/translations/japanese/toonz.ts +++ b/toonz/sources/translations/japanese/toonz.ts @@ -1,6 +1,6 @@ - + AddFilmstripFramesPopup @@ -32,12 +32,11 @@ AdjustLevelsPopup Adjust Levels - 色調整 + レベルを色調整する Clamp - クランプ - + クランプ Auto @@ -56,7 +55,7 @@ AdjustThicknessPopup Adjust Thickness - 線の太さの設定 + 線の太さの調整 Mode: @@ -181,21 +180,21 @@ In order to use the render farm you have to define the Farm Global Root first. - TOONZレンダリングファームルートパズはまだ指定されていません。TOONZレンダリングファームを使用する前に、パスを指定して下さい。 + Toonzレンダリングファームルートパスはまだ指定されていません。Toonzレンダリングファームを使用する前に、ルートのパスを指定して下さい。 The Farm Global Root folder doesn't exist Please create this folder before using the render farm. - TOONZレンダリングファームルートフォルダーは存在しません。 -TOONZレンダリングファームルートを使用する前に、作成して下さい。 + Toonzレンダリングファームルートフォルダーが存在しません。 +Toonzレンダリングファームを使用する前に、作成して下さい。 Unable to connect to the ToonzFarm Controller The Controller should run on %1 at port %2 Please start the Controller before using the ToonzFarm - TOONZレンダリングファームコントローラーに接続出来ません。 -コントローラーはポート %2 で %1 の上で使って下さい。 -TOONZレンダリングファームを使用する前にコントローラーを起動して下さい。 + Toonzファームコントローラーに接続出来ません。 +コントローラーはポート %2 で %1 の上で実行して下さい。 +Toonzファームを使用する前にコントローラーを起動して下さい @@ -206,21 +205,21 @@ TOONZレンダリングファームを使用する前にコントローラーを The Task List is empty! - タスクリストが空です。 + タスクリストが空です！ The current task list has been modified. Do you want to save your changes? 現在のタスクリストは変更されました。 -変更点を保存しますか？ +変更を保存しますか？ Save - はい + 保存する Discard - いいえ + 変更を破棄する Cancel @@ -229,8 +228,8 @@ Do you want to save your changes? The %1 task is currently active. Stop it or wait for its completion before removing it. - %1 タスクは現在処理しています。 -それを止めるか、あるいは削除する前に完成を待ってください。 + %1 タスクは現在アクティブです。 +削除する前にタスクを止めるか、または完成を待ってください。 @@ -253,11 +252,11 @@ Stop it or wait for its completion before removing it. No raster frames selected - ラスターフレームは選択されていません。 + ラスターフレームが選択されていません Binarizing images - 二値化中... + 画像を二値化中 Cancel @@ -362,51 +361,51 @@ Do you want to crop the canvas? CaptureSettingsPopup Define Device - + デバイスの定義 V Resolution - + 垂直ピクセルサイズ H Resolution - + 水平ピクセルサイズ White Calibration - + ホワイトの調整 Capture - 画面取り込み + 画面取り込み Brightness: - 明るさ： + 明るさ： Contrast: - コントラスト： + コントラスト： Upside-down - + 上下反転 A Device is Connected. - + デバイスが接続されています。 No cameras found. - + カメラが見つかりません。 Device Disconnected. - + デバイスが切断されました。 No Device Defined. - + デバイスが定義されていません。 @@ -417,21 +416,19 @@ Do you want to crop the canvas? It is not possible to edit more than one file at once. - 同時に1個のファイルしか編集できません。 + 同時に複数のファイルを編集できません。 It is not possible to show the folder containing the selected file, as the file has not been saved yet. - ファイルがまだ保存されていないので、選択されたファイルを含んでいるフォルダーを示すことは可能ではありません。 - + ファイルがまだ保存されていないので、選択されたファイルを含むフォルダーを表示できません。 It is not possible to view the selected file, as the file has not been saved yet. - ファイルがまだ保存されていないので、選択されたファイルを見ることは可能ではありません。 - + ファイルがまだ保存されていないので、選択されたファイルを表示することができません。 It is not possible to show the info of the selected file, as the file has not been saved yet. - ファイルがまだ保存されていないので、選択されたファイルの情報を示すことは可能ではありません。 + ファイルがまだ保存されていないので、選択されたファイルの情報を表示できません。 @@ -453,11 +450,11 @@ Do you want to crop the canvas? ChooseCameraDialog Ok - OK + OK Cancel - キャンセル + キャンセル @@ -500,15 +497,15 @@ does not match with that of previously cleaned up level drawings. Please set the right camera resolution and closest field, or choose to delete the existing level and create a new one when running the cleanup process. - レベル "%1" -の結果の解像度は、以前トレースされたレベルの画像に一致しません。 + レベル "%1"のトレース処理後の解像度は、以前トレースされた他のフレームと一致しません。 -正しいカメラの解像度と拡大値を設定して下さい。または、トレースの処理中、既存レベルを削除して、新規レベルを作成して下さい。 +正しいカメラの解像度を設定して下さい。または、トレースの処理時に +「既存のレベルを削除して、新規レベルを作成する」オプションを選択して下さい。 Selected drawings will overwrite the original files after the cleanup process. Do you want to continue? - 選択された画像は、トレースの後、元のファイルに上書きします。 + 選択された画像は、トレースの処理後、元のファイルに上書き保存されます。 続けますか？ @@ -520,36 +517,35 @@ Do you want to continue? Please choose to delete the existing level and create a new one when running the cleanup process. - 既存レベル "%1" -を開く時、エラーが発生しました。 -トレースの処理中、既存レベルを削除して、新規レベルを作成して下さい。 + 既存レベル "%1"を開く時にエラーが発生しました。 +トレースの処理時に、「既存レベルを削除して、新規レベルを作成する」オプションを選択して下さい。 Couldn't create directory "%1" - フォルダ”％１”を作成できませんでした + フォルダ”%1”を作成できませんでした Couldn't open "%1" for write - ファイル”％１”を書き込めませんでした + ファイル”%1”を書き込みのために開くことができませんでした Couldn't remove file "%1" - ファイル”％１”を削除できませんでした + ファイル”%1”を削除できませんでした View - 表示 + 表示 : Cleanup in progress - + : トレース処理中 CleanupPopup::OverwriteDialog Warning! - 警告： + 警告! Cleanup all selected drawings overwriting those previously cleaned up. @@ -561,7 +557,7 @@ when running the cleanup process. Delete existing level and create a new level with selected drawings only. - 既存レベルを削除して、新規レベルを作成する + 既存レベルを削除して、選択フレームのみで新規レベルを作成する。 Rename the new level adding the suffix @@ -574,19 +570,19 @@ What do you want to do? Cleanup all selected drawings overwriting those previously cleaned up.* - + 既存のフレームに全て上書きして、選択フレームをトレースする * Cleanup only non-cleaned up drawings and keep those previously cleaned up.* - + 既にトレースされたフレームは飛ばして、未処理のフレームのみをトレースする * This is Re-Cleanup. Overwrite only to the no-paint files. - + 再トレース　:　no-paintのデータのみに上書きする。 * Palette will not be changed. - + * 印のオプションを実行すると、パレットは更新されません。 @@ -597,7 +593,7 @@ What do you want to do? Processing - 修理 + 描線の処理 Camera @@ -605,11 +601,11 @@ What do you want to do? Toggle Swatch Preview - スワッチ表示/非表示 + プレビュー表示/非表示 Toggle Opacity Check - 不透明度の確認表示/非表示 + 不透明チェック Save Settings @@ -636,79 +632,79 @@ What do you want to do? CleanupSettingsPane Horizontal - 左右 + 水平方向 Vertical - 上下 + 垂直方向 MLAA Intensity: - MLAA強度： + MLAA強度： Save - + 設定を保存 Load - + 設定を読み込み Reset - リセット + 設定をリセット Standard - 標準 + 標準 None - なし + 行わない Morphological - 形態処理 + MLAA Greyscale - グレースケール + グレースケール Color - 色トレース + 色トレース Rotate - + 回転 Flip - + 反転 Line Processing: - 描線の修理 + 描線の処理: Antialias: - アンチエイリアス： + アンチエイリアス： Sharpness: - 鮮明度： + シャープネス： Despeckling: - ドットノイズを自動除去： + ドットノイズを自動除去： Cleanup Settings - トレース設定 + トレース設定 Cleanup Settings: %1 - トレース設定: %1 + トレース設定: %1 @@ -780,7 +776,7 @@ What do you want to do? It is not possible to retrieve the color model set for the current level. - レベルのカラーモデルを読み込むことができません。 + 現在のレベルのカラーモデルを取得することができません。 Reset View @@ -795,47 +791,47 @@ What do you want to do? ComboViewerPanel GUI Show / Hide - + GUI 表示/非表示 Toolbar - + ツールバー Tool Options Bar - + ツールオプション Console - + コンソール Preview - プレビュー + プレビュー Sub-camera Preview - サブカメラプレビュー + サブカメラプレビュー Untitled - + 名称未設定 Scene: - シーン： + シーン： :: Frame: - ：：フレーム： + ：：フレーム： :: Level: - ：：レベル： + ：：レベル： Level: - レベル： + レベル： @@ -857,11 +853,11 @@ What do you want to do? Start: - 開始： + Start: Save in: - 保存先： + 保存先フォルダ： Options @@ -877,7 +873,7 @@ What do you want to do? Converting %1 - %1 変換中... + %1 を変換中 Convert... @@ -893,31 +889,31 @@ What do you want to do? Convert 1 Level - 一つレベルを変換 + １つのレベルを変換 Convert %1 Levels - %1 レベルを変換 + %1 個のレベルを変換 Converting level %1 of %2: %3 - %1 に %2 レベルを変換中： %3 + %1 / %2 レベルを変換中： %3 Unpainted File Folder: - 塗装されたないファイルのフォルダ： + 線画素材ファイルのフォルダ： Unpainted File Suffix: - 塗装されたないファイルの接尾語： + 線画素材ファイルの接尾語： Apply Autoclose - 自動連結を適用 + テープツールを適用 Keep Original Antialiasing - 元アンチエイリアスを維持 + 変更しない Add Antialiasing with Intensity: @@ -949,11 +945,11 @@ What do you want to do? Same as Painted - 塗装されたのと同じ + 彩色済み素材と同じ No unpainted suffix specified: cannot convert. - 塗装されたない接尾語は指定されていません：変換できません。 + 変換できません：線画素材ファイルの接尾語が指定されていません。 Level @@ -961,11 +957,11 @@ What do you want to do? already exists; skipped - 既に存在します[飛ばされた] + ファイルが既に存在しています。スキップされました Generating level - レベルを作成中... + レベルを作成中 converted to tlv. @@ -973,15 +969,15 @@ What do you want to do? Level %1 converted to TLV Format - レベル %1 はTLV形式に変換されました。 + レベル %1 はTLV形式に変換されました Warning: Level %1 NOT converted to TLV Format - 警告：レベル %1 はTLV形式に変換できませんでした。 + 警告：レベル %1 はTLV形式に変換できませんでした Converted %1 out of %2 Levels to TLV Format - %2 個のレベルのうちの %1 はTLV形式に変換されました。 + %2 個のレベルのうちの %1 個はTLV形式に変換されました No output filename specified: please choose a valid level name. @@ -993,39 +989,39 @@ What do you want to do? Warning: Can't read palette '%1' - 警告：　パレット”％１”を読み込めません + 警告：　パレット”%1”を読み込めません Level %1 already exists; skipped. - レベル　％1　は既に存在します。スキップしました + レベル　%1　は既に存在します。スキップしました。 Level %1 has no frame; skipped. - レベル　％1　はフレームがありません。スキップしました + レベル　%1　はフレームがありません。スキップしました。 Unpainted tlv - 線描きのToonzレベル + 線画TLV Painted tlv from two images - 彩色Toonzレベル（線描きTIF＋彩色TIF） + 2枚の画像（線画/彩色済み） から 彩色済みTLVに変換 Painted tlv from non AA source - 彩色Toonzレベル（TGA二値化） + カラー二値画像 から 彩色済みTLVに変換 Convert completed with %1 error(s) and %2 level(s) skipped - 変換は完了しました。　％１　エラー、　％２　レベルをスキップしました + 変換は完了しました。　%1　個のエラー、　%2　個のレベルをスキップしました Convert completed with %1 error(s) - 変換は完了しました。　％１　エラー + 変換は完了しました。　%1　個のエラー %1 level(s) skipped - レベル　％1　をスキップしました + %1　個のレベルをスキップしました Create new palette @@ -1045,31 +1041,31 @@ What do you want to do? Unpainted tlv from non AA source - + カラー二値画像 から 線画TLVに変換 Remove dot before frame number - + フレーム番号前のピリオドを打たない End: - + End: File Name: - ファイル名： + ファイル名： Save Backup to "nopaint" Folder - + nopaint フォルダにバックアップを保存 Antialias: - アンチエイリアス： + アンチエイリアス： Palette: - + パレット : @@ -1106,7 +1102,7 @@ What do you want to do? DefineScannerPopup Define Scanner - スキャナー定義 + スキャナーを指定 Scanner Driver: @@ -1145,11 +1141,11 @@ What do you want to do? Style Index: - + スタイル番号： Apply to Frames: - + 適用されるフレーム範囲： @@ -1164,7 +1160,7 @@ What do you want to do? Up to Frame: - フレームまで： + 指定のフレームまで： Cancel @@ -1172,11 +1168,11 @@ What do you want to do? Close - 閉じる + 閉じる Apply - 適用 + 適用 @@ -1203,7 +1199,7 @@ What do you want to do? Cleanup - クリーンアップ + クリーン Delete folder @@ -1220,7 +1216,7 @@ What do you want to do? Refresh operation failed: - 更新に失敗がありました： + 更新に失敗しました： Purge @@ -1263,30 +1259,30 @@ What do you want to do? Back - + 戻る Forward - + 進む Icons View - + アイコン表示 Export File List - + ファイルリストをエクスポート DvItemViewerPanel Save File List - + ファイルリストを保存 File List (*.csv) - + ファイルリスト (*.csv) @@ -1332,7 +1328,7 @@ What do you want to do? ExportCurvePopup Export Curve - 曲線の書き出し + パラメータの書き出し Export @@ -1367,7 +1363,7 @@ What do you want to do? The file name cannot be empty or contain any of the following characters:(new line) \ / : * ? " | - ファイル名は空であることができませんし、次の記号のどれかを含むことができません： --- \ / : ? " | --- + ファイル名は空であることができません。また、次の記号のどれかを含むことができません： :(new line) \ / : * ? " | File Browser @@ -1398,11 +1394,11 @@ What do you want to do? H Resolution: - 横解像度： + 水平ピクセルサイズ: V Resolution: - 縦解像度： + 垂直ピクセルサイズ: DPI: @@ -1418,11 +1414,11 @@ What do you want to do? Scale Thickness - 線の太さをスケール + 線の太さを拡大 Add Thickness - 線を太く／細く + 線の太さを調整 Constant Thickness @@ -1500,26 +1496,26 @@ What do you want to do? There was an error exporting the scene. - シーンを書き出し時、エラーが発生しました。 + シーンの書き出し時に、エラーが発生しました。 The project name cannot be empty or contain any of the following characters:(new line) \ / : * ? " | - プロジェクト名は空であることができませんし、次の記号のどれかを含むことができません： --- \ / : ? " | --- + プロジェクト名は空であることができません。また、次の記号のいずれかを含むことができません：:(new line) \ / : * ? " | The project name you specified is already used. - プロジェクト名はすでに使用中です：新たなプロジェクト名を指定してください。 + 指定されたプロジェクト名はすでに使用中です：別の名前を指定してください。 FarmServerListView Activate - 有効する + 有効にする Deactivate - 無効する + 無効にする @@ -1530,15 +1526,15 @@ What do you want to do? Can't set a drawing number - 画像番号を設定できません。 + 動画番号を設定できません Can't rename. File already exists: - 名前を変更できません。そのファイルは既に存在します： + リネームできません。ファイルが既に存在します： Couldn't rename - 名前を変更できませんでした。 + リネームできませんでした Preview Screensaver @@ -1550,7 +1546,7 @@ What do you want to do? Load As Sub-xsheet - サブシーンとして読み込み... + サブシーンとして読み込み Load @@ -1558,15 +1554,15 @@ What do you want to do? Rename - 名前の変更 + リネーム Convert to Painted TLV - 塗装したTLVファイルに変換 + 彩色済TLVファイルに変換 Convert to Unpainted TLV - 塗装されたないTLVファイルに変換 + 線画TLVファイルに変換 Version Control @@ -1574,7 +1570,7 @@ What do you want to do? Save Scene - シーンの保存 + シーンを保存 Scene name: @@ -1590,15 +1586,15 @@ What do you want to do? Warning: level %1 already exists; overwrite? - 警告：レベル %１ は既に存在します。上書きしますか？ + 警告：レベル %1 は既に存在します。上書きしますか？ Done: 2 Levels converted to TLV Format - 完了：2つのレベルがTLV形式に変換されました。 + 完了：2つのレベルがTLV形式に変換されました Done: All Levels converted to TLV Format - 完了：すべてレベルがTLV形式に変換されました。 + 完了：すべてのレベルがTLV形式に変換されました Edit @@ -1638,7 +1634,7 @@ What do you want to do? Revision History... - 改訂版の履歴... + 改訂履歴... Unlock Frame Range @@ -1650,7 +1646,7 @@ What do you want to do? There was an error copying %1 to %2 - %2 に　%1 をコピーする時、エラーが発生しました。 + %1 を %2 にコピーする時、エラーが発生しました It is not possible to create the %1 folder. @@ -1658,34 +1654,34 @@ What do you want to do? Some files that you want to edit are currently opened. Close them first. - いくつかの編集したいファイルは現在空いております。最初に閉じて下さい。 + いくつかのファイルが開いています。編集を行う前にファイルを閉じて下さい。 Some files that you want to unlock are currently opened. Close them first. - いくつかのロック解除したいファイルは現在空いております。最初に閉じて下さい。 + いくつかのファイルが開いています。ロック解除の前にファイルを閉じて下さい。 Convert To Unpainted Tlv - 塗装されたないTLVファイルに変換 + 線画TLVファイルに変換 Convert To Painted Tlv - 塗装されたTLVファイルに変換 + 彩色済TLVファイルに変換 Open folder failed - + フォルダを開けませんでした The input folder path was invalid. - + 入力されたフォルダパスは無効です FileBrowserPopup Invalid file - 無効のファイル + 無効なファイル OK @@ -1709,18 +1705,18 @@ What do you want to do? Apply - 適用 + 適用 FileData It is not possible to find the %1 level. - %1 レベルを見つけることができません。 + レベル %1 を見つけることができません。 There was an error copying %1 - %1 をコピーする時、エラーが発生しました。 + %1 をコピーする時、エラーが発生しました @@ -1731,7 +1727,7 @@ What do you want to do? Collecting assets... - 要素を集めます... + 素材を集めています... Importing scenes... @@ -1742,11 +1738,11 @@ What do you want to do? FileSettingsPopup Save in: - + 保存先フォルダ： File Format: - ファイル形式： + ファイル形式： @@ -1761,22 +1757,22 @@ What do you want to do? - No Current Level - - + - カレントレベルがありません - FilmstripFrameHeadGadget Click to Toggle Fixed Onion Skin - + [クリック] 固定オニオンスキン表示/非表示 Click / Drag to Toggle Onion Skin - + [クリック/ドラッグ] オニオンスキン表示/非表示 Drag to Extend Onion Skin, Double Click to Toggle All - + [ドラッグ] オニオンスキン範囲を設定 [ダブルクリック] 全フレーム切り替え @@ -1787,38 +1783,38 @@ What do you want to do? no icon - + アイコンなし FlipBook Flipbook - フリップビューア + フリップブック Rendered Frames :: From %1 To %2 :: Step %3 - レンダリングされたフレーム：： %1 から %2 まで：：ステップ %3 + レンダリングされたフレーム：： フレーム %1 から %2 まで：：ステップ %3 :: Shrink - ：：縮小 + ：：圧縮 It is not possible to save Flipbook content. - フリップビューアの内容を保存できません。 + フリップブックの内容を保存できません。 Saved %1 frames out of %2 in %3 - %2 個のフレームのうちの %1 は %3 に保存されました。 + %2 フレーム中 %1 フレームが %3 に保存されました The file name cannot be empty or contain any of the following characters:(new line) \ / : * ? " | - ファイル名は空であることができませんし、次の記号のどれかを含むことができません： --- \ / : ? " | --- + ファイル名は空であることができません。また、次の記号のどれかを含むことができません： :(new line) \ / : * ? " | It is not possible to save because the selected file format is not supported. - 選択したファイル形式は対応されてないために、保存できません。 + 選択したファイル形式は対応されていないため、保存できません。 There are no rendered images to save. @@ -1826,8 +1822,7 @@ What do you want to do? It is not possible to take or compare snapshots for Toonz vector levels. - TOONZベクトルのレベルでスナップショットをとるか比較することは可能ではありません。 - + Toonzベクターレベルのスナップショットを撮る／比較することはできません。 File %1 already exists. @@ -1851,45 +1846,45 @@ Do you want to overwrite it? Relative Onion Skin Toggle - オニオンスキン表示/非表示［連結］ + オニオンスキン表示/非表示 Fixed Onion Skin Toggle - オニオンスキン表示/非表示［固定］ + 固定オニオンスキン表示/非表示 FxParamEditorPopup Fx Settings - イフェクト設定 + エフェクト設定 ImageViewer Flipbook Histogram - フリップビューア度数分布図 + フリップブックのヒストグラム Clone Preview - クローンプレビュー + プレビューをクローン Unfreeze Preview - 凍結したプレビューを解除 + プレビューをフリーズ解除 Freeze Preview - プレビューの凍結 + プレビューをフリーズ Regenerate Preview - プレビューの更新 + プレビューを再計算 Regenerate Frame Preview - フレームプレビューの更新 + プレビューを再計算（現在のフレームのみ） Reset View @@ -1901,7 +1896,7 @@ Do you want to overwrite it? Exit Full Screen Mode - 全画面モードを抜ける + 全画面モードを解除 Full Screen Mode @@ -1917,15 +1912,15 @@ Do you want to overwrite it? Save Images - 画像の保存 + 画像を保存 Show Histogram - 度数分布図の表示 + ヒストグラムを表示 Swap Compared Images - 比較された画像を交換 + 比較画像の位置を入れ替え :: Zoom : @@ -1933,14 +1928,14 @@ Do you want to overwrite it? Load / Append Images - + 画像の読み込み/追加 ImportMagpieFilePopup Import Magpie File - MAGPIEファイルの読み込み + MAGPIEファイルを読み込み Load @@ -1955,7 +1950,7 @@ Do you want to overwrite it? InbetweenDialog Inbetween - 画像を補間挿入 + 中割り Linear @@ -1963,15 +1958,15 @@ Do you want to overwrite it? Ease In - イージーイン + スローイン Ease Out - イージーアウト + スローアウト Ease In / Ease Out - イージーイン/イージーアウト + スローイン/スローアウト Interpolation: @@ -2022,7 +2017,7 @@ Do you want to overwrite it? Are you sure you want to delete %1? - %1 を削除してもいいですか？ + %1 を削除してもよろしいですか？ It is not possible to delete %1. @@ -2049,7 +2044,7 @@ Do you want to overwrite it? Increment: - レベル番号の増分： + 動画番号の増分： Step: @@ -2089,21 +2084,21 @@ Do you want to overwrite it? Invalid frame range - 無効のフレーム範囲 + 無効なフレーム範囲 Invalid step value - 無効のステップ値 + 無効なステップ値 The level name specified is already used: please choose a different level name - レベル名はすでに使用中：新たなレベル名を指定してください。 + 指定されたレベル名はすでに使用中です：別の名前を指定してください Folder %1 doesn't exist. Do you want to create it? フォルダー %1 は存在しません。 -作成しますか。 +作成しますか？ Unable to create @@ -2111,26 +2106,26 @@ Do you want to create it? Invalid increment value - 無効の増分値 + 無効な増分値 OK - OK + OK Apply - 適用 + 適用 Save In: - + 保存先フォルダ： LevelSettingsPopup Level Settings - レベルの設定 + レベル設定 Name: @@ -2146,7 +2141,7 @@ Do you want to create it? Forced Squared Pixel - 正方ピクセル維持を適用 + 正方ピクセルを維持 Width: @@ -2166,7 +2161,7 @@ Do you want to create it? Image DPI: - 画像DPI： + 画像のDPI： Image Resolution: @@ -2174,7 +2169,7 @@ Do you want to create it? Premultiply - 合成チャンネル［黒マット］ + 合成チャンネル（黒マット） White As Transparent @@ -2198,106 +2193,106 @@ Do you want to create it? Antialias Softness: - アンチエイリアスのぼかす： + アンチエイリアスの柔らかさ： Subsampling: - 飛び飛びのサンプリング: + 離散サンプリング: Name && Path - + レベル名とファイルパス DPI && Resolution - + 解像度とピクセルサイズ Resolution: - + ピクセルサイズ： LineTestCapturePane Name: - 名前： + 名前： Frame: - + Increment: - レベル番号の増分： + 動画番号の増分： Step: - ステップ： + ステップ： Mode: - モード： + モード： New - + 新規作成 Overwite - + 上書き Insert - 挿入 + 挿入 Onion Skin - + オニオンスキン View Frame - + フレームを表示 Fade: - 色褪せ + フェード: Connection - + 接続 Capture - + 取り込み Capture Settings - + 取り込み設定 File Settings - + ファイル設定 Bad Selection. - + 選択が不正です。 No Device Defined. - + デバイスが定義されていません。 Cannot connect Camera - + カメラに接続できません Device Disconnected. - + デバイスが切断されました。 LineTest Capture - LineTest キャプチャ + LineTest キャプチャ @@ -2335,11 +2330,11 @@ Do you want to create it? Fade: - 色褪せ + フェード: Intensity: - 強度 + 強度: @@ -2358,14 +2353,14 @@ Do you want to create it? Frames : - + フレーム : LoadCurvePopup Load Curve - 曲線を読み込み + エフェクトパラメータを読み込み Load @@ -2407,15 +2402,15 @@ Do you want to create it? Shrink: - 縮小： + 圧縮： Append - + 追加 Load / Append Images - + 画像の読み込み/追加 @@ -2434,47 +2429,47 @@ Do you want to create it? TLV Caching Behavior - + TLV画像データのキャッシュ Load Subsequence Level - + 一部フレームを読み込み Arrangement in Xsheet - + タイムシート内の配置 (FILE DOES NOT EXIST) - + （ファイルが存在しません） From: - + 開始動画番号: To: - + 終了動画番号: Step: - + コマ打ち: Inc: - + 動画番号の増分: Level Name: - レベル名： + レベル名： Frames: - + 配置されるフレーム範囲: :: - + @@ -2489,11 +2484,11 @@ Do you want to create it? is not a scene file. - シーンファイルではありません。 + はシーンファイルではありません。 does not exist. - 存在しません。 + は存在しません。 @@ -2508,7 +2503,7 @@ Do you want to create it? %1 does not exist. - %1 存在しません。 + %1 は存在しません。 @@ -2523,11 +2518,11 @@ Do you want to create it? is not a scene file. - シーンファイルではありません。 + はシーンファイルではありません。 does not exist. - 存在しません。 + は存在しません。 @@ -2542,7 +2537,7 @@ Do you want to create it? does not exist. - 存在しません。 + は存在しません。 It is possible to load only TNZBAT files. @@ -2557,7 +2552,7 @@ Do you want to create it? does not exist. - 存在しません。 + は存在しません。 Add Render Task to Batch List @@ -2573,11 +2568,11 @@ Do you want to create it? you can load only TNZ files for render task. - + レンダリングタスクにはTNZファイルのみ使用できます。 you can load only TNZ or CLN files for cleanup task. - + トレースタスクにはTNZまたはCLNファイルのみ使用できます。 @@ -2627,7 +2622,7 @@ Do you want to create it? MainWindow Cannot delete - 削除できません。 + 削除できません Visit Web Site @@ -2639,175 +2634,175 @@ Do you want to create it? &New Scene - 新規シーン + 新規シーン (&N) &Load Scene... - シーンを開く... + シーンを開く (&L)... &Save Scene - シーンを保存 + シーンを保存 (&S) &Save Scene As... - シーンを別名で保存... + シーンを別名で保存 (&S)... &Revert Scene - シーンを元に戻す + シーンを元に戻す (&R) &Open Recent Scene File - 最近使ったシーンを開く + 最近使ったシーンを開く (&O) &Open Recent Level File - 最近使ったレベルを読み込み + 最近使ったレベルを読み込み (&O) &Clear Recent Scene File List - 最近開いたシーンリストを消去 + 最近開いたシーンリストを消去 (&C) &Clear Recent level File List - 最近開いたレベルリストを消去 + 最近開いたレベルリストを消去 (&C) &New Level... - 新規レベル... + 新規レベル (&N)... &Load Level... - レベルを読み込み... + レベルを読み込み (&L)... &Save Level - レベルを保存 + レベルを保存 (&S) &Save Level As... - レベルを別名で保存... + レベルを別名で保存 (&S)... &Export Level... - レベルを書き出し... + レベルを書き出し (&E)... &Save Palette As... - パレットを保存... + パレットを保存 (&S)... &Load Color Model... - カラーモデルを読み込み... + カラーモデルを読み込み (&L)... &Import Magpie File... - MAGPIEファイルを読み込み... + MAGPIEファイルを読み込み (&I)... &New Project... - 新規プロジェクト... + 新規プロジェクト (&N)... &Project Settings... - プロジェクト設定... + プロジェクト設定 (&P)... &Save Default Settings - 現在のシーン設定をプロジェクト設定として保存 + 現在のシーン設定を既定値としてプロジェクト設定に保存 (&S) &Output Settings... - 出力設定... + 出力設定 (&O)... &Preview Settings... - プレビュー設定... + プレビュー設定 (&P)... &Render - レンダリング + レンダリング (&R) &Preview - プレビュー + プレビュー (&P) &Save Previewed Frames - プレビューしたフレームの保存 + プレビューしたフレームの保存 (&S) &Regenerate Preview - プレビューの更新 + プレビューを再計算 (&R) &Regenerate Frame Preview - プレビューを更新［現在フレームのみ］ + プレビューを再計算（現在のフレームのみ）(&R) &Clone Preview - クローンプレビュー + プレビューをクローン (&C) &Freeze//Unfreeze Preview - プレビューの凍結切り替え + プレビューのフリーズ切り替え (&F) Freeze Preview - プレビューの凍結 + プレビューをフリーズ Unfreeze Preview - 凍結したプレビューを解除 + プレビューをフリーズ解除 &Save As Preset - プリセットとして保存 + プリセットとして保存 (&S) &Preferences... - 環境設定... + 環境設定 (&P)... &Configure Shortcuts... - キーボードショートカット... + キーボードショートカット (&C)... &Print Xsheet - タイムシートを印刷 + タイムシートの内容をHTMLに出力 (&P) &Print Current Frame... - 現在のフレームを印刷... + 現在のフレームを印刷 (&P)... &Quit - 終了 + 終了 (&Q) &Select All - すべて選択 + すべて選択 (&S) &Invert Selection - 選択範囲の反転 + 選択範囲の反転 (&I) &Undo - 元に戻す + 元に戻す (&U) &Redo - やり直す + やり直す (&R) &Cut - 切り取り + 切り取り (&C) &Copy - コピー + コピー (&C) &Paste @@ -2815,11 +2810,11 @@ Do you want to create it? &Merge - 結合 + 結合 (&M) &Paste Into - 貼り付け［重ね書き］ + 上書き貼り付け (&P) Paste RGBA Values @@ -2827,123 +2822,123 @@ Do you want to create it? &Delete - 削除 + 削除 (&D) &Insert - 挿入 + 挿入 (&I) &Group - グループ + グループ化 (&G) &Ungroup - グループ解除 + グループ解除 (&U) &Bring to Front - 最前面へ + 最前面へ移動 (&B) &Bring Forward - 前面へ + 前面へ移動 (&B) &Send Back - 最背面へ + 最背面へ移動 (&S) &Send Backward - 背面へ + 背面へ移動 (&S) &Enter Group - グループ編集モード + グループ編集モード (&E) &Exit Group - グループ編集モードを終了 + グループ編集モードを終了 (&E) &Remove Vector Overflow - ベクトルのはみ出しを削除 + ベクトルのはみ出しを削除 (&R) &Define Scanner... - スキャナを指定... + スキャナーを指定 (&D)... &Scan Settings... - スキャン設定... + スキャン設定 (&S)... &Scan - スキャン + スキャン (&S) &Set Cropbox - クロップボックス設定 + クロップボックス設定 (&S) &Reset Cropbox - クロップボックスをリセット + クロップボックスをリセット (&R) &Cleanup Settings... - トレース設定... + トレース設定 (&C)... &Preview Cleanup - トレースプレビュー + トレースプレビュー (&P) &Camera Test - カメラテスト + カメラテスト (&C) &Cleanup - トレース + トレース (&C) &Add Frames... - フレームを追加... + フレームを追加 (&A)... &Renumber... - 番号を付け替え... + 番号を振りなおす (&R)... &Replace Level... - レベルを置き換え... + レベルを置き換え (&R)... &Revert to Cleaned Up - トレース段階に戻る + トレース直後のデータに戻す (&R) &Revert to Last Saved Version - 最後に保存したバージョンに戻す + 最後に保存したバージョンに戻す (&R) &Expose in Xsheet - シーンに追加 + タイムシート内に配置 (&E) &Display in Level Strip - レベルビューアに表示 + レベルビューアに表示 (&D) &Level Settings... - レベル設定... + レベル設定 (&L)... &Brightness and Contrast... - 明るさとコントラスト... + 明るさとコントラスト (&B)... &Color Fade... - 指定色のフェード... + カラーフェード (&C)... &Capture @@ -2951,83 +2946,83 @@ Do you want to create it? &Canvas Size... - カンバスサイズ... + カンバスサイズ (&C)... &Info... - 情報... + ファイル情報 (&I)... &View... - 表示... + フリップブックに表示 (&V)... &Remove All Unused Levels - シーンに使われてないレベルを取り除く + シーンに使われてないレベルを除外する (&R) &Scene Settings... - シーン設定... + シーン設定 (&S)... &Camera Settings... - カメラ設定... + カメラ設定 (&C)... &Open Sub-xsheet - サブシーン編集モード + サブシートを開く (&O) &Close Sub-xsheet - サブシーンを閉じる + サブシートを閉じる (&C) Explode Sub-xsheet - サブシーンを展開 + サブシートを解除する Collapse - サブシーンに畳む + サブシートに畳む &Save Sub-xsheet As... - サブシーンを別名で保存... + サブシートを別名で保存 (&S)... Resequence - サブシーンの再整列 + サブシートのフレームを再整列 Clone Sub-xsheet - サブシーンをクローンする + サブシートをクローン &Apply Match Lines... - マッチラインを適用... + マッチラインを適用 (&A)... &Delete Match Lines - マッチラインを削除 + マッチラインを削除 (&D) &Delete Lines... - 線を削除... + 描線を削除 (&D)... &Merge Levels - レベルの結合 + レベルを結合 (&M) &New FX... - 新規エフェクト... + 新規エフェクト (&N)... &New Output - 新規出力 + 新規出力ノード (&N) &Edit FX... - エフェクトを編集... + エフェクトを編集 (&E)... Insert Frame @@ -3047,123 +3042,123 @@ Do you want to create it? &Reverse - 系列を逆にする + 順序を逆にする (&R) &Swing - スイング + スイング (&S) &Random - ランダム + ランダム (&R) &Autoexpose - 自動貼り付け + 自動配置 (&A) &Repeat... - 反復... + 反復 (&R)... &Step 2 - ステップ２［選択*2］ + 2コマ打ち (&S) &Step 3 - ステップ３［選択*3］ + 3コマ打ち (&S) &Step 4 - ステップ４［選択*4］ + 4コマ打ち (&S) &Each 2 - イーチ２　［選択/2］ + 2コマ毎に詰める (&E) &Each 3 - イーチ３　［選択/3］ + 3コマ毎に詰める (&E) &Each 4 - イーチ４　［選択/4］ + 4コマ毎に詰める (&E) &Roll Up - 繰り上げる + 繰り上げる (&R) &Roll Down - 繰り下げる + 繰り下げる (&R) &Time Stretch... - 時間伸縮... + 時間伸縮 (&T)... &Duplicate Drawing - 画像を複製 + 動画を複製 (&D) &Clone - クローン + クローン (&C) &Set Key - キーを設定 + キーを設定 (&S) &Camera Box - カメラボックス + カメラボックス (&C) &Table - テーブル + テーブル (&T) &Field Guide - フィールドガイド + フィールドガイド (&F) &Safe Area - セーフエリア + セーフエリア (&S) &Camera BG Color - カメラ背景色 + カメラ背景色 (&C) &Transparency Check - 色校正 － 不透明度 + 透明度チェック (&T) &Ink Check - 色校正 － 線とベクトル + 線チェック (&I) &Paint Check - 色校正 － 塗りつぶし + 塗りチェック (&P) &Fill Check - 色校正 － 全体確認 + 閉領域チェック (&F) &Black BG Check - 色校正 － 黒背景 + 黒背景チェック (&B) &Gap Check - 色校正 － 連結できる間 + すきまチェック (&G) &Visualize Vector As Raster - ベクトルをラスタとして表示 + ベクター画像をラスタライズ表示 (&V) &Histogram - 度数分布図 + ヒストグラム (&H) Play @@ -3211,87 +3206,87 @@ Do you want to create it? Red Channel Greyscale - グレースケールに赤チャンネル + 赤チャンネル(グレースケール) Green Channel Greyscale - グレースケールに緑チャンネル + 緑チャンネル(グレースケール) Blue Channel Greyscale - グレースケールに青チャンネル + 青チャンネル(グレースケール) &Lock Room Panes - ワークスペース全てをロック + ワークスペースをロック (&L) &File Browser - ファイルブラウザ + ファイルブラウザ (&F) &Flipbook - フリップビューア + フリップブック (&F) &Function Editor - パラメータ + パラメータエディタ (&F) &Level Strip - レベルビューア + レベルビューア (&L) &Palette - パレット + パレット (&P) &Palette Gizmo - パレット編集 + スタイルをまとめて色調整 (&P) &Delete Unused Styles - 使用していないスタイルを削除 + 使用していないスタイルを削除 (&D) &Tasks - タスク + タスク (&T) &Batch Servers - バッチサーバー + バッチサーバー (&B) &Color Model - カラーモデル + カラーモデル (&C) &Studio Palette - スタジオパレット + スタジオパレット (&S) &Schematic - スキマティック + スキマティック (&S) &Scene Cast - シーンクリップボード + シーンアセット (&S) &Style Editor - スタイル + スタイルエディタ (&S) &Toolbar - ツールバー + ツールバー (&T) &Tool Option Bar - &ツールパレット + ツールオプション (&T) &Viewer - メインビューア + メインビューア (&V) &LineTest Capture @@ -3303,11 +3298,11 @@ Do you want to create it? &Xsheet - &タイムシート + タイムシート (&X) &Reset to Default Rooms - ワークスペースをすべてリセット + ワークスペースを初期化 (&R) Onion Skin @@ -3319,7 +3314,7 @@ Do you want to create it? Show Folder Contents - フォルダ内容の表示 + フォルダ内容を表示 Convert... @@ -3327,11 +3322,11 @@ Do you want to create it? Collect Assets - ローカルコピーされてないファイルを完全に読み込み + ローカルにない全てのアセットをローカルにコピー Import Scene - 空いているプロジェクトにシーンを読み込み + 他のプロジェクトのシーンをインポート Export Scene... @@ -3363,11 +3358,11 @@ Do you want to create it? Select All Keys in this Row - キーをすべて選択［現在の行］ + このフレームのキーをすべて選択 Select All Keys in this Column - キーをすべて選択［現在の列］ + この列のキーをすべて選択 Select All Keys @@ -3375,43 +3370,43 @@ Do you want to create it? Select All Following Keys - 以降のキーをすべて選択 + 後ろのキーをすべて選択 Select All Previous Keys - 以前のキーをすべて選択 + 前のキーをすべて選択 Select Previous Keys in this Column - 以前のキーをすべて選択［現在の列］ + この列の前のキーをすべて選択 Select Following Keys in this Column - 以降のキーをすべて選択［現在の列］ + この列の後ろのキーをすべて選択 Select Previous Keys in this Row - 以前のキーをすべて選択［現在の行］ + このフレームの前のキーをすべて選択 Select Following Keys in this Row - 以降のキーをすべて選択［現在の行］ + このフレームの後ろのキーをすべて選択 Invert Key Selection - 選択したキーを反転 + キーの選択を反転 Set Acceleration - 加速設定 + 加速に設定 Set Deceleration - 減速設定 + 減速に設定 Set Constant Speed - 定速設定 + 定速に設定 Reset Interpolation @@ -3419,7 +3414,7 @@ Do you want to create it? Fold Column - 列を一時的に非表示 + 列を一時的に隠す Activate this column only @@ -3527,7 +3522,7 @@ Do you want to create it? Tape Tool - 線をつなぐ + 線つなぎツール Style Picker Tool @@ -3535,7 +3530,7 @@ Do you want to create it? RGB Picker Tool - スポイトツール[RGB] + RGBスポイトツール Control Point Editor Tool @@ -3547,7 +3542,7 @@ Do you want to create it? Pump Tool - 幅を変える + 線幅変更ツール Magnet Tool @@ -3559,7 +3554,7 @@ Do you want to create it? Iron Tool - ジグザグツール + アイロンツール Cutter Tool @@ -3575,7 +3570,7 @@ Do you want to create it? Hook Tool - ホックツール + フックツール Zoom Tool @@ -3599,7 +3594,7 @@ Do you want to create it? Reset View - 表示をリセット + ズームをリセット Fit to Window @@ -3607,7 +3602,7 @@ Do you want to create it? Actual Pixel Size - 実際の画素サイズ + ピクセル等倍 Show//Hide Full Screen @@ -3647,7 +3642,7 @@ Do you want to create it? Inverse kinematics - 逆運動学 + 逆運動学(IK) Invert @@ -3695,7 +3690,7 @@ Do you want to create it? Auto Select Drawing - 関連するレベルの自動選択 + クリックでレベルを切り替える Auto Fill @@ -3739,7 +3734,7 @@ Do you want to create it? Type - タイプ： + タイプ Normal Type @@ -3779,7 +3774,7 @@ Do you want to create it? Inverse Kinematics Mode - 逆運動学モード + 逆運動学（IK)モード None Pick Mode @@ -3795,15 +3790,15 @@ Do you want to create it? &Reset Step - ステップをリセット + ステップをリセット (&R) &Increase Step - ステップを上げる + ステップを上げる (&I) &Decrease Step - ステップを下げる + ステップを下げる (&D) Drawing @@ -3827,23 +3822,23 @@ Do you want to create it? Reload qss - QSSファイルを再読み込み + スタイルシートを再読み込み &Autocenter... - 自動位置合わせ... + 自動位置合わせ (&A)... &Field Guide in Capture Window - 画面取り込みのフィールドガイド + 取り込みウィンドウ内のフィールドガイド (&F) &Guide - ガイド + ガイド (&G) &Ruler - 定規 + 定規 (&R) Next Drawing @@ -3855,15 +3850,15 @@ Do you want to create it? Toggle Autofill on Current Palette Color - 現在のパレット色に自動塗りつぶし/自動塗りつぶしなし + 現在のパレット色で自動塗りつぶしオプションを切り替え &Export - 書き出し + 書き出し (&E) &Autorenumber - 番号順に自動陳列 + 配置フレームに合わせ動画番号を振りなおす (&A) Shift and Trace @@ -3871,15 +3866,15 @@ Do you want to create it? Edit Shift - 移動編集 + オフセット位置を変更 No Shift - 移動無し + オフセット無し Reset Shift - 移動リセット + オフセットをリセット Increase max brush thickness @@ -3899,15 +3894,15 @@ Do you want to create it? &Binarize... - 二値化する... + 二値化する (&B)... Pick Screen - 画面を選択 + スクリーン上から拾う &Blend colors - 色をブレンド + 色をブレンド (&B) Linetest @@ -3915,11 +3910,11 @@ Do you want to create it? &Load As Sub-xsheet... - サブシーンとして読み込み... + シーンをサブシートとして読み込み (&L)... &Convert File... - ファイルを変換... + ファイルを変換 (&C)... Run Script... @@ -3931,27 +3926,27 @@ Do you want to create it? &Antialias... - アンチエイリアス... + アンチエイリアス (&A)... Adjust Levels... - 色調整... + レベルの色調整... &Raster Bounding Box - ラスター境界ボックス + ラスターのバウンディングボックス (&R) Link Flipbooks - フリップビューアを連結 + フリップブックをリンク &Message Center - メッセージセンター + メッセージセンター (&M) &Cleanup Settings - トレース設定 + トレース設定 (&C) Plastic Tool @@ -3963,11 +3958,11 @@ Do you want to create it? &Merge Tlv Levels... - Cマップされたレベルを結合... + TLVを結合 (&M)... Adjust Thickness... - 線の太さの設定 + 線の太さの調整... Toggle &Opacity Check @@ -3975,235 +3970,255 @@ Do you want to create it? &Load Folder... - &フォルダーの読み込み… + フォルダーの読み込み (&L)... Inks &Only - インク　&Only + 線のみ表示 (&O) Next Step - １段階進む + 1ステップ進む Prev Step - １段階戻る + 1ステップ戻る Untitled - + 名称未設定 Cleanup - + トレース PltEdit - + 色指定 InknPaint - + 仕上 Xsheet - タイムシート + 撮影 &Load Recent Image Files - + 最近使った画像を読み込む(&L) &Clear Recent Flipbook Image List - + 最近開いた画像リスト（フリップブック）を消去 (&C) Preview Fx - + エフェクトプレビュー &Insert Paste - + 挿入して貼り付け (&I) &Paste Color && Name - + 色と名前を貼り付け (&P) Paste Color - + 色を貼り付け Paste Name - + 名前を貼り付け Get Color from Studio Palette - + スタジオパレットから色を取得 &Opacity Check - + 不透明チェック (&O) &Replace Parent Directory... - + 親フォルダパスの置き換え (&R)... 1's - + 1コマ 2's - + 2コマ 3's - + 3コマ 4's - + 4コマ &Ink#1 Check - + 実線チェック (&I) Compare to Snapshot - + スナップショットと比較 Show This Only - + この列のみ表示 Show Selected - + 選択列を表示 Show All - + 全ての列を表示 Hide Selected - + 選択列を隠す Hide All - + 全ての列を隠す Toggle Show/Hide - + 表示/非表示切り替え ON This Only - + この列のみ有効化 ON Selected - + 選択列を有効化 ON All - + 全ての列を有効化 OFF All - + 全ての列を無効化 OFF Selected - + 選択列を無効化 Swap ON/OFF - + 有効/無効切り替え Lock This Only - + この列のみロック Lock Selected - + 選択列をロック Lock All - + 全ての列をロック Unlock Selected - + 選択列をアンロック Unlock All - + 全ての列をアンロック Swap Lock/Unlock - + ロック切り替え Ruler Tool - + ものさしツール Finger Tool - + 塗りのばしツール Brush size - Increase max - + ブラシサイズ - 最大値を増加 Brush size - Decrease max - + ブラシサイズ - 最大値を減少 Brush size - Increase min - + ブラシサイズ - 最小値を増加 Brush size - Decrease min - + ブラシサイズ - 最小値を減少 Brush hardness - Increase - + ブラシ硬さ - 増加 Brush hardness - Decrease - + ブラシ硬さ - 減少 Mode - Areas - + モード - 塗り Mode - Lines - + モード - 線 Mode - Lines & Areas - + モード - 線と塗り Type - Normal - + タイプ - 標準 Type - Rectangular - + タイプ - 長方形 Type - Freehand - + タイプ - なげなわ Type - Polyline - + タイプ - 多角形 + + + About OpenToonz + OpenToonzについて + + + Close + 閉じる + + + &Abount OpenToonz... + OpenToonzについて (&A)... + + + &ComboViewer + メインビューア (&C) + + + &History + ヒストリー (&H) @@ -4234,63 +4249,65 @@ Do you want to create it? Apply Match Lines - + マッチラインを適用 Add Match Line Inks - + マッチラインの線に用いたスタイルを追加する Use Ink: - + 既存のスタイル番号を指定して使用 : Ink Usage - + 線に用いるスタイル Line Stacking Order - + マッチラインの食い込み方の設定 L-Up R-Down - + 左列が上 右列が下 L-Down R-Up - + 左列が下 右列が上 Keep Halftone - + アンチエイリ +アスを保持 Fill Gaps - + 線を食い +込ませる MergeCmappedCommand It is not possible to merge tlv columns because no column was selected. - Cマップされたレベルを結合できません：列が選択されていません。 + 列が選択されていないため、TLVレベル列を結合できません。 It is not possible to merge tlv columns because at least two columns have to be selected. - Cマップされたレベルを結合できません：少なくとも2列を選択しなければならない。 + 少なくとも2列以上を選択しなくてはいけません。TLVレベル列を結合できません。 Merging Tlv Levels... - カラーマップを結合中... + TLVレベルを結合中... MergeCmappedDialog Save in: - 保存先の指定： + 保存先フォルダ： File Name: @@ -4310,7 +4327,7 @@ Gaps Merge Tlv Levels - Cマップされたレベルを結合 + TLVレベルを結合 @@ -4321,7 +4338,7 @@ Gaps It is not possible to execute the merge column command because only one columns is selected. - 二つの列が選択されていないので、列を結合できません。 + 2つの列が選択されていないので、列を結合できません。 @@ -4329,21 +4346,21 @@ Gaps A level with the preferred path "%1" already exists. What do you want to do? - 「 %1 」パスは既に存在します。 -どのように保存しますか？ + 指定されたパス"%1"には既にレベルファイルが存在します。 +どうしますか？ Delete the old level entirely - 古いレベルを完全に削除 + 既存のレベルを完全に削除 Keep the old level and overwrite processed frames - 古いレベルを維持し、処理されたフレームに上書き + 既存のレベルを維持し、処理されたフレームを上書き Choose a different path (%1) - 異なるパス (%1) を選び + 別のパス (%1) を選択する Create Mesh @@ -4351,15 +4368,15 @@ What do you want to do? Mesh Edges Length: - メッシュ頂点数： + メッシュのエッジの長さ： Rasterization DPI: - ラスター化DPI： + ラスタライズDPI： Mesh Margin (pixels): - メッシュのマージン[ピクセル]： + メッシュのマージン（ピクセル）： Apply @@ -4371,12 +4388,11 @@ What do you want to do? Current selection contains mixed image and mesh level types - 選択は混合画像やメッシュ・レベルを含んでいます。 - + 現在の選択範囲には、画像およびメッシュのレベルが混在しています Current selection contains no image or mesh level types - 選択は画像やメッシュ・レベルを含んでいません。 + 現在の選択範囲には、画像またはメッシュのレベルがどちらも含まれていません @@ -4387,23 +4403,23 @@ What do you want to do? The scanning process is completed. - スキャンは終了しました。 + スキャンが終了しました。 There was an error during the scanning process. - 対応されてないスキャンメッセージがありました。 + スキャン処理中にエラーが発生しました。 Please, place the next paper drawing on the scanner flatbed, then select the relevant command in the TWAIN interface. - 次の画像をスキャナに置いて、TWAINインタフェースにコマンドを選択してください。 + 次の紙をスキャナのフラットベッドに置き、TWAINインタフェースの関連するコマンドを実行してください。 Please, place the next paper drawing on the scanner flatbed, then click the Scan button. - 次の画像をスキャナに置いて、TWAINインタフェースにコマンドを選択してください。 + 次の紙をスキャナのフラットベッドに置き、スキャンボタンをクリックしてください。 The pixel type is not supported. - 対応されてない画素型式です。 + ピクセル形式が対応されていません。 @@ -4422,7 +4438,7 @@ What do you want to do? Output Camera: - 出力のカメラ： + 出力に用いるカメラ： To Frame: @@ -4434,7 +4450,7 @@ What do you want to do? Shrink: - 縮小： + 圧縮： Step: @@ -4446,11 +4462,11 @@ What do you want to do? Fx Schematic Flows - スキマティック［FX］の各ノード + エフェクトスキマティックの各ノード Fx Schematic Terminal Nodes - スキマティック［FX］でタイムシートに接続している各ノード + エフェクトスキマティックでタイムシートに接続している各ノード Multiple Rendering: @@ -4482,11 +4498,11 @@ What do you want to do? Odd (NTSC) - 奇数フィールドから［NTSC］ + 奇数フィールドから（NTSC） Even (PAL) - 偶数フィールドから［PAL］ + 偶数フィールドから（PAL） Dominant Field: @@ -4502,7 +4518,7 @@ What do you want to do? Single - 1つ + シングル Half @@ -4538,11 +4554,11 @@ What do you want to do? Use Sub-Camera - サブカメラの使用 + サブカメラを使用 Apply Shrink to Main Viewer - メインビューアにも適用 + メインビューアに画像の圧縮を適用 Preview Settings @@ -4566,7 +4582,7 @@ What do you want to do? Camera Shift: - カメラの変更： + カメラシフト： Stereoscopic Render: @@ -4574,139 +4590,139 @@ What do you want to do? Camera Settings - + カメラ設定 File Settings - ファイルの設定 + ファイル設定 Other Settings - + その他の設定 Add - 追加 + 追加 Remove - 削除 + 削除 Triangle filter - + Mitchell-Netravali filter - + Cubic convolution, a = .5 - + Cubic convolution, a = .75 - + Cubic convolution, a = 1 - + Hann window, rad = 2 - + Hann window, rad = 3 - + Hamming window, rad = 2 - + Hamming window, rad = 3 - + Lanczos window, rad = 2 - + Lanczos window, rad = 3 - + Gaussian convolution - + Closest Pixel (Nearest Neighbor) - + ニアレストネイバー Bilinear - + バイリニア 8 bit - + 8 ビット 16 bit - + 16 ビット Presets: - + プリセット : Frame Start: - + 開始フレーム： End: - 終了： + 終了フレーム： Name: - 名前： + ファイル名: Frame Rate (linked to Scene Settings): - + FPS （シーン設定）: To: - + 変換後: Multiple Rendering: - 複数レンダリング： + 複数レンダリング： Add preset - + プリセットを追加 Enter the name for the output settings preset. - + 出力設定のプリセット名を入力してください。 Add output settings preset - + 出力設定のプリセットの追加 <custom> - + <カスタム> Remove preset - + プリセットの削除 Warning - + 警告 @@ -4742,27 +4758,31 @@ What do you want to do? File %1 already exists. What do you want to do? - ファイル %1 は、既に存在します。 どのように保存しますか？ + ファイル %1 は既に存在します。 +どうしますか？ The suffix field is empty. Please specify a suffix. - 接尾辞フィールドは空です。接尾辞を指定してください。 + 接尾語フィールドが空です。接尾語を指定してください。 File %1 exists as well; please choose a different suffix. - ファイル %1 は既に存在します。異なる接尾辞を選んでください。 + ファイル %1 は既に存在します。異なる接尾語を選んでください。 Level "%1" already exists. What do you want to do? - レベル"%1"は既に存在します。どうしますか？ + レベル"%1"は既に存在します。 + +どうしますか？ File "%1" already exists. What do you want to do? - ファイル"%1"は既に存在します。どうしますか？ + ファイル"%1"は既に存在します。 +どうしますか？ Overwrite @@ -4775,14 +4795,15 @@ What do you want to do? File "%1" already exists. Do you want to overwrite it? - ファイル"%1"は既に存在します。(new line)上書きしますか？ + ファイル"%1"は既に存在します。 +上書きしますか？ PltGizmoPopup Palette Gizmo - パレット編集 + スタイルをまとめて色調整 Luminance: @@ -4802,7 +4823,7 @@ Do you want to overwrite it? Fade to Color - 指定色のフェード + 指定色にフェード Color: @@ -4810,7 +4831,7 @@ Do you want to overwrite it? Fade - 色褪せ + フェード Blend @@ -4818,39 +4839,39 @@ Do you want to overwrite it? Full Matte - + 不透明化 Zero Matte - + 透明化 Scale (%) - + スケーリング(%) Shift (value) - + シフト（値を入力） Value - + 明度 Saturation - + 彩度 Hue - + 色相 Matte - + アルファチャンネル Color - 色トレース + 色 @@ -4865,7 +4886,7 @@ Do you want to overwrite it? Use Default Viewer for Movie Formats - 映画形式を見る時、既定メディアプレーヤーを使用 + 動画形式を再生するとき、既定のメディアプレーヤーを使用 Minimize Raster Memory Fragmentation* @@ -4893,7 +4914,7 @@ Do you want to overwrite it? Open Flipbook after Rendering - レンダリング後にフリップビューアを開く + レンダリング後にフリップブックを開く Unit: @@ -4921,23 +4942,23 @@ Do you want to overwrite it? Expose Loaded Levels in Xsheet - シーンクリップボードにレベルを読み込む時、シーンにも追加 + シーンアセットにレベルを読み込む時、タイムシートにも配置 Create Sub-folder when Importing Sub-xsheet - サブシーンを読み込む時、サブフォルダを作成する + サブシートをインポートして読み込む時、サブフォルダを作成する Drawing - 画像 + 作画 Keep Original Cleaned Up Drawings As Backup - トレースした画像の元ファイルをバックアップとして保持する + トレース直後のTLVをバックアップとして保持する Animation - レベル + アニメーション Default Interpolation: @@ -4945,7 +4966,7 @@ Do you want to overwrite it? Linear - 線形 + リニア Speed In / Speed Out @@ -4953,15 +4974,15 @@ Do you want to overwrite it? Ease In / Ease Out - イージーイン/イージーアウト + スローイン/スローアウト Ease In / Ease Out % - イージーイン/イージアウト [%] + スローイン/スローアウト（%） Animation Step: - レベルのステップ： + アニメーションステップ： Preview @@ -4969,15 +4990,15 @@ Do you want to overwrite it? Blank Frames: - 空フレームの枚数［再生ループ目印用］： + ブランクフレーム数： Blank Frames Color: - 空フレームの色づけ： + ブランクフレームの色： Display in a New Flipbook Window - 新規フリップビューアウィンドウで表示 + 新規フリップブックを開いて表示 Rewind after Playback @@ -5009,11 +5030,11 @@ Do you want to overwrite it? Cells Only - セルのみ + タイムシートのコマのみ Cells and Column Data - セルと列のデータ + タイムシートのコマと列のデータ Language*: @@ -5029,7 +5050,7 @@ Do you want to overwrite it? Show Info in Rendered Frames - レンダリングされたフレームに情報を表示 + レンダリングされたフレーム内に情報を表示 *Changes will take effect the next time you run Toonz @@ -5053,7 +5074,7 @@ Do you want to overwrite it? Xsheet Autopan during Playback - 再生すると同時にタイムシートをオートスクロール + 再生中にタイムシートをオートスクロール Level Strip Frames Width*: @@ -5085,15 +5106,15 @@ Do you want to overwrite it? Minimize Savebox after Editing - 編集の後、セーブボックスを最小化する + 画像編集の後、セーブボックスを最小化する Use the TLV Savebox to Limit Filling Operations - TLVセーブボックスを限界として、塗りつぶす + TLVのセーブボックスを塗りつぶしの境界線として用いる Paper Thickness: - 紙厚さ: + 紙厚: Enable Version Control * @@ -5101,16 +5122,15 @@ Do you want to overwrite it? Default Level Type: - 既定レベルタイプ： + 既定のレベル形式： Autocreation: - 自動作成: - + 自動作成: Transparency Check - 色校正 －不透明度 + 透明度チェック Ink Color on White Bg: @@ -5126,23 +5146,23 @@ Do you want to overwrite it? Fit to Flipbook - フリップビューアに全体を表示 + フリップブックに全体を表示 New Level Format - 新規レベルのフォーマット + 新規レベル形式 Assign the new level format name: - 新規レベルのフォーマット名: + 新規レベル形式の名前をアサイン: New Format - 新規フォーマット + 新規形式 Level Settings by File Format: - 条件別レベル設定: + ファイル形式毎のレベル設定: Edit @@ -5162,15 +5182,16 @@ Do you want to overwrite it? Antialiased region boundaries - アンチエイリアス範囲の境界線 + 元訳：アンチエイリアス範囲の境界線 + Next/Previous Step Frames: - 次の/前の段階のフレーム + 次の/前のステップのフレーム Ignore Alpha Channel on Levels in Column 1 - 1セルのレベルのアルファチャンネルを無視する + 列１のレベルのアルファチャンネルを無視する pixel @@ -5178,142 +5199,190 @@ Do you want to overwrite it? Minimize Raster Memory Fragmentation * - + ラスターメモリのフラグメンテーションを最小化する* Replace Level after SaveLevelAs command - + レベルを別名で保存した後、レベルを置き換える * Changes will take effect the next time you run Toonz - + *印の項目は、次回OpenToonz起動時に反映されます Move Current Frame by Clicking on Xsheet / Numerical Columns Cell Area - + タイムシートまたはファンクションエディタのエリアをクリックした時、カレントフレームを移動する Enable Actual Pixel View on Scene Editing Mode - + シーン編集モードのとき、ピクセル等倍表示を有効にする Display Level Name on Each Marker - + タイムシートの各マーカー上にレベル名を表示する Show Raster Images Darken Blended in Camstand View - + カメラスタンド表示時、ラスター画像を「比較暗」合成して表示する Show "ABC" Appendix to the Frame Number in Xsheet Cell - + タイムシートのセル内で、フレーム番号下一ケタを「A,B,C…」の文字に置き換えて表示する Automatically Remove Scene Number from Loaded Level Name - + 読み込んだレベル名からシーン番号("c####_")を自動的に消去する Multi Layer Style Picker : Switch Levels by Picking - + 多層スポイトツールを有効化：スタイルを拾うと同時にカレントレベルを切り替える Onion Skin ON - + オニオンスキンを使用する Enable Version Control* - + バージョン管理を有効にする* Category - + カテゴリー Undo Memory Size (MB) - + 「元に戻す」の記憶容量（MB） Icon Size * - + アイコンサイズ * X - + X Viewer Shrink - + メインビューアの画像圧縮 Step - + ステップ Viewer BG Color - + メインビューアの背景色 Preview BG Color - + プレビューの背景色 ChessBoard Color 1 - + チェックボード色 1 Chessboard Color 2 - + チェックボード色 2 Viewer Zoom Center - + ビューア上のズームの中心位置 Language *: - + 言語*： Default TLV Caching Behavior - + TLV画像データのキャッシュ（既定値） Column Icon - + 列アイコン表示のタイミング Height: - + 高さ： Default Interpolation: - + キーフレーム補間方式の既定値 : Following Frames Correction: - + 後フレームの色 : Previous Frames Correction: - + 前フレームの色 : Ink Color on White Bg: - + 線の色 : Ink Color on Black Bg: - + 黒背景チェック時の線の色 : Paint Color: - + 塗りの色 : + + + On Demand + 必要に応じて読み込む + + + All Icons + 全フレームのアイコンを最初に読み込む + + + All Icons & Images + 全フレームのアイコンと画像を最初に読み込む + + + At Once + ロード時に全て表示 + + + Pick Every Colors as Different Styles + 画像の全ての異なる色を別々のスタイルにする + + + Integrate Similar Colors as One Style + 近似色を１つのスタイルとして統合する + + + Palette Type on Loading Raster Image as Color Model + カラーモデルにラスター画像を読み込む際の、パレット生成方法 + + + Mouse Cursor + マウスカーソル位置 + + + Viewer Center + メインビューアの中心 + + + Disabled + 無効 + + + Enabled + 有効 + + + Use Xsheet as Animation Sheet + タイムシートを動画シートとして用いる PreferencesPopup::FormatProperties Level Settings by File Format - 条件別レベル設定: + ファイル形式毎のレベル設定 Name: @@ -5321,18 +5390,18 @@ Do you want to overwrite it? Regular Expression: - ファイル形式（正規表現） + ファイル形式（正規表現）: Priority - 優先順位 + 優先順位 Previewer The file name cannot be empty or contain any of the following characters:(new line) \ / : * ? " | - ファイル名は空であることができませんし、次の記号のどれかを含むことができません： --- \ / : ? " | --- + ファイル名は空であることができません。また、次の記号のどれかを含むことができません： \ / : * ? " | File %1 already exists. @@ -5345,7 +5414,7 @@ Do you want to overwrite it? ProcessingTab Line Processing: - 描線の修理 + 描線の処理: None @@ -5369,7 +5438,7 @@ Do you want to overwrite it? Morphological - 形態処理 + MLAA Autoadjust: @@ -5377,7 +5446,7 @@ Do you want to overwrite it? Sharpness: - 鮮明度： + シャープネス： Despeckling: @@ -5404,21 +5473,21 @@ Do you want to overwrite it? It is not possible to create the %1 project. - %1 プロジェクトを作成できません。 + プロジェクト %1 を作成できません。 Project Name cannot be empty or contain any of the following characters: \ / : * ? " < > | - ファイル名は空であることができませんし、次の記号のどれかを含むことができません： --- \ / : ? " | --- - + プロジェクト名は空であることができません。また、次の記号のいずれかを含むことができません： + \ / : * ? " < > | Bad project name: '%1' looks like an absolute file path - 悪いプロジェクト名: %1 は絶対ファイル・パスのように見えます。 + 不正なプロジェクト名: '%1' は絶対パスのように見えます Project '%1' already exists - プロジェクト %1 は、既に存在します。 + プロジェクト '%1' は、既に存在します @@ -5441,7 +5510,7 @@ Do you want to overwrite it? Project: - + プロジェクト : @@ -5455,7 +5524,7 @@ Do you want to overwrite it? PsdSettingsPopup Load PSD File - PSDファイルを読み込み + PSDファイルを読み込む Name: @@ -5467,7 +5536,7 @@ Do you want to overwrite it? Expose in a Sub-xsheet - サブシーンとして追加 + サブシートとして配置 Load As: @@ -5483,11 +5552,11 @@ Do you want to overwrite it? Expose layers in a group as columns in a sub-xsheet - グループのそれぞれレイヤーを１つずつサブシーン列に追加 + グループ内の各レイヤーをサブシートの各列に配置する Expose layers in a group as frames in a column - グループのすべてレイヤーを１つ列のそれぞれフレームに追加 + グループ内の各レイヤーを１つの列の各フレームに配置 @@ -5525,11 +5594,11 @@ Do you want to overwrite it? Save - はい + 保存する Discard - いいえ + 変更を破棄する Cancel @@ -5538,20 +5607,20 @@ Do you want to overwrite it? The color model palette is different from the destination palette. What do you want to do? - カラーモデルパレットは移動先のパレットと違います。 -どのように読み込みしますか？ + カラーモデルのパレットは対象のパレットと異なります。 +どうしますか？ Overwrite the destination palette. - 移動先のパレットを上書きする。 + 対象のパレットを上書きする。 Keep the destination palette and apply it to the color model. - 移動先のパレットを保持して、カラーモデルに適用します。 + 対象のパレットを保持して、カラーモデルにも適用する。 It is not possible to paste the columns: there is a circular reference. - 列を貼る付けできません：循環参照があります。 + 列を貼り付けできません：循環参照があります。 None @@ -5559,7 +5628,7 @@ What do you want to do? Edited - 編集 + 編集済み Normal @@ -5571,15 +5640,15 @@ What do you want to do? Modified - 変更された + 変更済み Locked - ロックされた + ロック中 Unversioned - バージョンがまだ付けてない + バージョンなし Missing @@ -5596,8 +5665,7 @@ What do you want to do? Deleting %n files. Are you sure? - - + %n 個のファイルを削除します。よろしいですか？ @@ -5607,46 +5675,47 @@ What do you want to do? You are going to premultiply selected files. The operation cannot be undone: are you sure? - 選択したファイルを乗合成チャンネル［黒マット］します。 + 選択したファイルをチャンネル合成します。 この操作は元に戻すことができません：よろしいですか？ Premultiply - 乗合成チャンネル［黒マット］ + チャンネル合成（黒マット） %1 has an invalid extension format. - %1 には、無効の拡張子形式があります。 + %1 には、無効な拡張形式があります。 File %1 doesn't belong to the current project. Do you want to import it or load it from its original location? - 読み込みする時、シーンフォルダにローカルコピーも作りますか。 - + ファイル %1 は現在のプロジェクトに属していません。 +ファイルをインポート（プロジェクト内にコピーして読み込み）しますか、 +それとも元の場所から読み込みますか？ Import - はい + インポートする Load - いいえ + 元の場所から読み込む The camera settings of the scene you are loading as sub-xsheet are different from those of your current scene. What you want to do? - 読み込みするサブシーンのカメラ設定がシーンの設定と異なります。どのように読み込しますか？ + サブシートとして読み込むシーンのカメラ設定が現在のシーンと異なります。どうしますか？ Keep the sub-xsheet original camera settings. - サブシーンカメラ設定を保持する。 + サブシートのカメラ設定を保持する。 Apply the current scene camera settings to the sub-xsheet. - シーンカメラ設定を適用する。 + サブシートに、現在のシーンのカメラ設定を適用する。 %1 has an invalid file extension. - %1 は無効なファイル拡張子です。 + %1 のファイル拡張子は無効です。 %1 is an invalid path. @@ -5654,19 +5723,19 @@ Do you want to import it or load it from its original location? Import Scene - はい + シーンをインポートする Change Project - いいえ + プロジェクトを切り替える No cleaned up drawings available for the current selection. - トレースされた画像を現在の選択範囲で使用できません。 + 現在の選択範囲に、使用可能なトレース後の画像がありません。 No saved drawings available for the current selection. - 保存された画像を現在の選択範囲で使用できません。 + 現在の選択範囲に、使用可能な保存された画像がありません。 The current selection is invalid. @@ -5696,7 +5765,7 @@ Do you want to import it or load it from its original location? An update is available for this software. Visit the Web site for more information. ソフトウェアのアップデートがあります。 -詳しい情報に関しては、ウェブサイトを見て下さい。 +詳細はウェブサイトをご覧下さい。 Quit @@ -5716,47 +5785,47 @@ Visit the Web site for more information. Collapsing columns: what you want to do? - 列を折り畳む：どうしますか？ + 列をサブシートに畳む：どうしますか？ Include relevant pegbars in the sub-xsheet as well. - サブシーンにタップ情報も含む + 関連するタップ情報もサブシート内に持ち込む。 Include only selected columns in the sub-xsheet. - サブシーンに選択した列のみ含む + 選択した列のみサブシート内に持ち込む。 Exploding Sub-xsheet: what you want to do? - サブシーンを展開：どのように展開しますか？ + サブシートを展開する：どのように展開しますか？ Bring relevant pegbars in the main xsheet. - シーンにサブシーンのタップ情報も含む + 親タイムシートにサブシートのタップ情報も持ち出す。 Bring only columns in the main xsheet. - シーンにサブシーンの列のみ含む + 親タイムシートにサブシートの列のみ持ち出す。 Are you sure you want to override - 次を最優先してもよろしいですか？ + 次を優先的に実行してもよろしいですか Override - 最優先する + 優先して実行する It is not possible to track the level: allocation error. レベルを追跡できません： -配分エラー。 +アロケーション・エラー。 It is not possible to track the level: no region defined. レベルを追跡できません： -範囲が指定されていません。 +領域が指定されていません。 It is not possible to track specified regions: @@ -5774,29 +5843,29 @@ defined regions are not valid. It is not possible to track specified regions: some regions are too wide. 指定された領域を追跡できません： -領域設定は広すぎます。 +いくつかの領域が広すぎます。 It is not possible to track specified regions: some regions are too high. 指定された領域を追跡できません： -領域設定は高すぎます。 +いくつかの領域が高すぎます。 Frame Start Error - 開始フレームは正しく選択されていません。 + 開始フレームのエラー Frame End Error - 終了フレームは正しく選択されていません。 + 終了フレームのエラー Threshold Distance Error - しきい値距離エラー + 距離しきい値のエラー Sensibility Error - 感度エラー + 感度のエラー No Frame Found @@ -5811,14 +5880,14 @@ the selected level is not valid. It is not possible to track the level: no level selected. - 追跡できません： + レベルを追跡できません： レベルが選択されていません。 It is not possible to track specified regions: the level has to be saved first. 指定された領域を追跡できません： -最初にレベルを保存して下さい。 +先にレベルを保存して下さい。 It is not possible to track the level: @@ -5828,7 +5897,7 @@ undefinied error. Invalid selection: each selected column must contain one single level with increasing frame numbering. - 無効の選択：それぞれの選択した列はただ一つのレベルを含まなければなりません。 + 選択は無効です：それぞれの選択した列は、ただ一つのレベルを含まなければなりません。 Viewer @@ -5836,11 +5905,11 @@ undefinied error. Function Editor - パラメータ + パラメータエディタ Scene Cast - シーンクリップボード + シーンアセット Color Model @@ -5872,11 +5941,11 @@ undefinied error. Style Editor - スタイル + スタイルエディタ Tool Options - ツールパレット + ツールオプション LineTest Viewer @@ -5888,11 +5957,11 @@ undefinied error. FlipBook - フリップビューア + フリップブック Deactivate Onion Skin - オニオンスキンを無効 + オニオンスキンを無効化 Limit Onion Skin To Level @@ -5904,11 +5973,11 @@ undefinied error. Activate Onion Skin - オニオンスキンを有効 + オニオンスキンを有効化 Are you sure you want to save the Default Settings? - 既定の設定を上書きしてもよろしいですか？ + プロジェクト既定のシーン設定を上書きしてもよろしいですか？ Choose Folder @@ -5917,8 +5986,8 @@ undefinied error. Revert: the current scene has been modified. Are you sure you want to revert to previous version? - 復帰：現在のシーンは変更されました。 -前のバージョンに戻してもよろしいですか？ + シーンを復帰：現在のシーンは変更されています。 +最後に保存されたバージョンに戻してもよろしいですか？ Revert @@ -5926,16 +5995,17 @@ Are you sure you want to revert to previous version? Deleting %1. Are you sure? - %1削除します。よろしいですか？ + %1 を削除します。よろしいですか？ The %1 file has been generated - %1 ファイルが作成されました。 + %1 ファイルが作成されました %1: the current scene has been modified. Do you want to save your changes? - %1 ：現在のシーンは変更されました。変更点を保存しますか？ + %1 ： 現在のシーンは変更されました。 +変更を保存しますか？ The scene %1 already exists. @@ -5946,8 +6016,8 @@ Do you want to overwrite it? The Scene '%1' belongs to project '%2'. What do you want to do? - 読み込みするシーンと開いているプロジェクトは異なります。 -属しているプロジェクトに変更せず、読み込みしますか。 + シーン '%1' は、別のプロジェクト '%2' に属しています。 +どうしますか？ No unused levels @@ -5959,7 +6029,7 @@ What do you want to do? Preview FX :: %1 - エフィクトプレビュー：： %1 + エフェクトプレビュー：： %1 Batch Servers @@ -5967,7 +6037,7 @@ What do you want to do? Task added to the Batch Render List. - タスクはバッチレンダリング一覧に追加しました。 + タスクはバッチレンダリングリストに追加されました。 Task added to the Batch Cleanup List. @@ -5975,44 +6045,44 @@ What do you want to do? There are no assets to collect - シーンファイルのロカルコピーすべてもあります。 + インポートする必要のあるアセットはありません One asset imported - 1つファイルをシーンにコピーしました。。 + 1つのアセットをインポートしました %1 assets imported - %1 ファイルをシーンにコピーしました。 + %1 個のアセットをインポートしました Converting %1 images to tlv format... - %1 画像をTLV形式に変換... + %1 個の画像をTLV形式に変換しています... No scene imported - 読み込まれたシーンはありません。 + インポートされたシーンはありません。 One scene imported - １つのシーンが読み込みされました。 + １つのシーンがインポートされました。 %1 scenes imported - %1 のシーンが読み込みされました + %1 個のシーンがインポートされました It is not possible to delete lines because no column, cell or level strip frame was selected. - 列、セル又はレベルビューアのフレームが選択されていないので、線を削除することができません。 + 描線を削除することができません：列、コマ又はレベルビューアのフレームのいずれも選択されていません。 The rooms will be reset the next time you run Toonz. - TOONZを再起動して、ワークスペースをすべてリセットします。 + Toonzを次回起動するとき、ワークスペースが初期化されます。 The license validation process was not able to confirm the right to use this software on this computer. Please contact [ support@toonz.com ] for assistance. - ライセンス合法化プロセスはこのソフトウェアを使用する権利の確認できませんでした。 + ライセンス確認プロセスは、このコンピュータ上で本ソフトウェアを使用する権利を確認できませんでした。 support@toonz.com に連絡してください。 @@ -6021,7 +6091,7 @@ support@toonz.com に連絡してください。 The command cannot be executed because the scene is empty. - シーンが空であるので、コマンドを実行できません。 + シーンが空なので、コマンドを実行できません。 Change project @@ -6033,21 +6103,21 @@ support@toonz.com に連絡してください。 It is not possible to paste vectors in the current cell. - 現在のセルにベクターを貼り付けできません。 + 現在のコマにベクターを貼り付けできません。 It is not possible to paste data: there is nothing to paste. - データを貼り付けできません。貼り付けるものがありません。 + データを貼り付けできません：貼り付けるものがありません。 The copied selection cannot be pasted in the current drawing. - コーピーした選択範囲を現在の画像に貼り付けできません。 + コピーした選択範囲は現在の画像に貼り付けられません。 A filename cannot be empty or contain any of the following characters: \ / : * ? " < > | - ファイル名は空であることができませんし、次の記号のどれかを含むことができません： --- \ / : ? " | --- - + ファイル名は空であることができません。また、次の記号のいずれかを含むことができません： + \ / : * ? " < > | The palette %1 already exists. @@ -6056,7 +6126,7 @@ Do you want to overwrite it? Cannot load Color Model in current palette. - 現在のパレットにカラーモデルを読み込みできません。 + 現在のパレットにカラーモデルを読み込めません。 Image DPI @@ -6080,23 +6150,23 @@ Do you want to overwrite it? Couldn't save %1 - %1 を保存できませんでした。 + %1 を保存できませんでした No level selected! - レベルが選択されていません。 + レベルが選択されていません! Exporting level of %1 frames in %2 - %2 に　1% フレームのレベルを書き出し中... + %2 に %1 フレームのレベルを書き出し中... Warning: file %1 already exists. - 警告： %1 ファイルは既に存在します。 + 警告： ファイル %1 は既に存在します。 Continue Exporting - 書き出しを続く + 書き出しを続ける Stop Exporting @@ -6105,16 +6175,18 @@ Do you want to overwrite it? The level %1 already exists. Do you want to overwrite it? - レベル %1 は既に存在します。上書きしてもよろしいですか？ + レベル %1 は既に存在します。 +上書きしてもよろしいですか？ The soundtrack %1 already exists. Do you want to overwrite it? - サウンドトラック %1 は既に存在します。上書きしてもよろしいですか？ + サウンドトラック %1 は既に存在します。 +上書きしてもよろしいですか？ File %1 doesn't look like a TOONZ Scene - ファイル %1 はTOONZ シーンに似ていません。 + ファイル %1 はToonzシーンファイルと認識されませんでした It is not possible to load the scene %1 because it does not belong to any project. @@ -6123,26 +6195,26 @@ Do you want to overwrite it? There were problems loading the scene %1. Some files may be missing. - シーン %1 を読み込みに問題がありました。 -いくつかのシーンフィアルを見つけられない、読み込みできませんでした。 + シーン %1 の読み込み中に問題が発生しました。 +いくつかのファイルが見つかりませんでした。 There were problems loading the scene %1. Some levels have not been loaded because their version is not supported - シーン %1 を読み込みに問題がありました。 -いくつかのレベルのバージョンがサポートされないので、読み込みできませんでした。 + シーン %1 の読み込み中に問題が発生しました。 +いくつかのレベルがバージョン対応外のため読み込まれませんでした It is not possible to load the level %1 - レベル %1 を読み込みできません。 + レベル %1 を読み込めません Save the scene first - 最初にシーンを保存する + 先にシーンを保存してください It is not possible to load the %1 level. - レベル %1 を読み込みできません。 + レベル %1 を読み込めません。 The scene %1 doesn't exist. @@ -6150,11 +6222,11 @@ Some levels have not been loaded because their version is not supported It is not possible to delete the used level %1. - 使われている %1 シーンを削除できません。 + 使用されているレベル %1 を削除できません。 The Revert to Last Saved command is not supported for the current selection. - 現在の選択したものが元のファイルに戻すコマンドは対応されておりません。 + 「最後に保存されたバージョンに戻す」コマンドは、現在の選択範囲に対応していません。 The selected column is empty. @@ -6162,23 +6234,23 @@ Some levels have not been loaded because their version is not supported Selected cells must be in the same column. - セルを選択する時、同じ列のセルを選択しなければなりません。 + 同じ列のコマを選択しなければなりません。 Match lines can be deleted from Toonz raster levels only - マッチラインの削除はカラーマップされたラスタレベルのみ可能です。 + マッチラインの削除はToonzラスターレベルのみ可能です。 Partially Edited - 部分的に編集された + 一部編集済み Partially Locked - 部分的にロックされた + 一部ロック Partially Modified - 部分的に変更された + 一部変更済み Name @@ -6210,77 +6282,75 @@ Some levels have not been loaded because their version is not supported Warning: level %1 already exists; overwrite? - 警告：レベル %1 は既に存在します。上書きしますか。 + 警告：レベル %1 は既に存在します。上書きしますか？ It is not possible to paste image on the current cell. - 現在のセルに画像を貼り付けできません。 + 現在のコマに画像を貼り付けられません。 Are you sure you want to delete the selected cleanup color? - 選択されたトレース色を削除してもいいですか？ + 選択されたトレース色を削除してもよろしいですか？ Installing %1 again could fix the problem. - ライセンスとライセンスサーバーの確認上にサポートに連絡してください。 + %1 を再インストールすると、問題が解決できることがあります。 It is not possible to apply match lines to a column containing more than one level. - 1レベル以上を含んでいる列にマッチラインを合成できません。 + 複数のレベルを含む列にマッチラインを合成することはできません。 It is not possible to use a match lines column containing more than one level. - 1レベル以上を含んでいるマッチライン列を使用できません。 + 複数のレベルを含む列をマッチライン列として使用することはできません。 Match lines can be applied to Toonz raster levels only. - マッチラインはTOONZラスターレベルだけに適用することができます。 + マッチラインはToonzラスターレベルだけに適用することができます。 The style index you specified is not available in the palette of the destination level. - 指定したスタイル番号はレベル先のパレットにはありません。 + 指定されたスタイル番号は対象レベルのパレット内に存在しません。 The style index range you specified is not valid: please separate values with a comma (e.g. 1,2,5) or with a dash (e.g. 4-7 will refer to indexes 4, 5, 6 and 7). - 指定したスタイル番号の範囲は有効ではありません：コンマ(例えば1, 2, 5)、あるいはダッシュを備えた値を分離してください(例えば、4-7はインデックス4、5、6および7を指す)。 - + 指定されたスタイル番号の範囲は無効です：カンマ(例：1,2,5)、またはダッシュ(例：4-7は4,5,6,7を示す)を用いて下さい。 The frame range you specified is not valid: please separate values with a comma (e.g. 1,2,5) or with a dash (e.g. 4-7 will refer to frames 4, 5, 6 and 7). - 指定したフレーム範囲は有効ではありません：コンマ(例えば1, 2, 5)、あるいはダッシュを備えた値を分離してください(例えば、4-7はインデックス4、5、6および7を指す)。 + 指定されたフレーム範囲は無効です：カンマ(例：1,2,5)、またはダッシュ(例：4-7は4,5,6,7を示す)を用いて下さい。 No drawing is available in the frame range you specified. - 指定したフレーム範囲には利用可能の画像がありません。 + 指定されたフレーム範囲には利用可能な画像がありません。 It is not possible to perform a merging involving more than one level per column. - 1レベル以上を含んでいる列を結合できません + 複数レベルを含む列を結合できません。 Only raster levels can be merged to a raster level. - ラスターレベルだけはラスターレベルに結合できます。 - + ラスターレベルはラスターレベルにのみ結合できます。 Only vector levels can be merged to a vector level. - ベクトルレベルだけはベクトルレベルに結合できます。 + ベクターレベルはベクﾀｰレベルにのみ結合できます。 It is possible to merge only Toonz vector levels or standard raster levels. - TOONZベクトルレベルあるいは標準ラスターレベルだけを結合することは可能です。 + Toonzベクターレベルまたは汎用ラスターレベルのみ結合が可能です。 It is not possible to display the file %1: no player associated with its format - ファイル %1 を表示できません：フォーマットに関連したプレーヤーはありません。 + ファイル %1 を表示できません：このファイル形式に対応したプレーヤーがありません。 The specified name is already assigned to the %1 file. - 指定された名前は、 %1 ファイルに既に割り当てられています。 + 指定された名前は、 既に %1 ファイルに割り当てられています。 It is not possible to rename the %1 file. - %1 ファイル名前を変更できません。 + %1 ファイルをリネームできません。 It is not possible to copy the %1 file. @@ -6288,11 +6358,11 @@ Some levels have not been loaded because their version is not supported It is not possible to save the curve. - 曲線を保存できません。 + パラメータを保存できません。 It is not possible to load the curve. - 曲線を読み込みできません。 + パラメータを読み込みできません。 It is not possible to export data. @@ -6308,27 +6378,27 @@ Some levels have not been loaded because their version is not supported It is not possible to save images in camera stand view. - テーブル表示に画像を保存することができません。 + カメラスタンド表示中は画像を保存することができません。 The preview images are not ready yet. - プレビューイメージはまだ準備中です。 + プレビュー画像がまだありません。 A convertion task is in progress! wait until it stops or cancel it - 変換の処理中：完成まで、待つか、あるいは取り消て下さい。 + 変換タスクの処理中です! 完了まで待つか、またはキャンセルして下さい Error loading scene %1 :%2 - %1 ： %2 シーンを読み込みする時エラーが発生しました。 + シーン %1 を読み込む時にエラーが発生しました： %2 Error loading scene %1 - %1 シーンを読み込みする時エラーが発生しました。 + シーン %1 を読み込む時にエラーが発生しました There was an error saving the %1 scene. - %1 シーンを保存する時エラーが発生しました。 + シーン %1 を保存する時にエラーが発生しました。 It is not possible to export the scene %1 because it does not belong to any project. @@ -6336,27 +6406,27 @@ Some levels have not been loaded because their version is not supported Continue to All - すべてに続く + すべてに適用 The selected paper format is not available for %1. - 選択された紙フォーマットは、%1 に利用できません。 + 選択された紙フォーマットは、%1 に使用できません。 No TWAIN scanner is available - TWAINスキャナは利用できません。 + 使用可能なTWAINスキャナがありません No scanner is available - スキャナは利用できません。 + 使用可能なスキャナがありません The autocentering failed on the current drawing. - 現在の画像に自動位置合わせはできませんでした。 + 現在の画像に対する自動位置合わせが失敗しました。 Some of the selected drawings were already scanned. Do you want to scan them again? - 選択された画像のうちのいくつかは既にスキャンされていました。再びスキャンしますか。 + 選択された画像のうちのいくつかは既にスキャンされています。再スキャンします？ There was an error saving frames for the %1 level. @@ -6372,11 +6442,11 @@ Some levels have not been loaded because their version is not supported The resolution of the output camera does not fit with the options chosen for the output file format. - 出力カメラの解像度は選択している出力ファイル形式の選択しているオプションと一致しません。 + 出力カメラのピクセルサイズは出力ファイル形式として選択されたオプションと一致しません。 It is not possible to complete the rendering. - レンダリングを完成することができません。 + レンダリングを完了することができません。 Type @@ -6389,14 +6459,13 @@ Some levels have not been loaded because their version is not supported The merge command is not available for greytones images. - 結合コマンドはグレートーン -イメージに利用可能ではありません。 + 結合コマンドはグレースケールの画像に利用できません。 The cleanup settings for the current level have been modified... Do you want to save your changes? - 現レベルのトレース設定は変更されました... + 現在のレベルのトレース設定が変更されています... 変更を保存しますか？ @@ -6406,17 +6475,17 @@ Do you want to save your changes? The scene %1 was created with Toonz and cannot be loaded in LineTest. - シーン %1 はTOONZで作成され、LINETESTに読み込みできません。 + シーン %1 はToonzで作成され、LINETESTに読み込みできません。 File %1 already exists. Do you want to overwrite it? - ファイル %1 は、既に存在します。 + ファイル %1 は既に存在します。 上書きしてもよろしいですか？ The level you are using has not a valid palette. - 使用しているレベルは有効なパレットを持っていません。 + 使用中のレベルには有効なパレットがありません。 Message Center @@ -6436,11 +6505,11 @@ Do you want to overwrite it? already exists! Are you sure you want to overwrite it? - は既に存在します。上書きしてもよろしいですか？ + は既に存在します! 上書きしてもよろしいですか？ It is not possible to merge tlv columns containing more than one level - Cマップされたレベルを結合できません：列が1レベル以上を含んでいます。 + TLVレベル列を結合できません：1つの列に複数のレベルが含まれています Ok @@ -6449,399 +6518,422 @@ Do you want to overwrite it? Selected folders don't belong to the current project. Do you want to import them or load from their original location? - 選択したフォルダーは、現プロジェクトに属していません。(new line) + 選択されたフォルダーは、現在のプロジェクトに属していません。 インポートしますか、それとも元の場所から読み込みますか？ Move Cleanup Camera - + トレースカメラを移動 Scale Cleanup Camera - + トレースカメラを拡大縮小 Delete and Re-cleanup : The following files will be deleted. - + 消去して再トレース : 以下のファイルは消去されます。 + + Are you sure ? - + +よろしいですか？ Replace with copied palette - + コピーされたパレットで置き換える Keep original palette - + オリジナルのパレットを保持する Insert Frame at Frame %1 - + フレーム %1 にフレームを挿入 Remove Frame at Frame %1 - + フレーム %1 のフレームを消去 Insert Multiple Keys at Frame %1 - + フレーム %1 に複数のキーを挿入 Remove Multiple Keys at Frame %1 - + フレーム %1 の複数のキーを削除 Set Keyframe : %1 - + キーフレームを設定 : %1 Close SubXsheet - + サブシートを閉じる Select a sub-xsheet cell. - + サブシートのコマを選択して下さい。 Collapse - サブシーンに畳む + サブシートに畳む Collapse (Fx) - + サブシートに畳む（エフェクトスキマティック内） Explode - + サブシートを展開する Delete Level : %1 - + レベルを消去 : %1 Revert To %1 : Level %2 - + %1 に戻す : レベル %2 Load Level %1 - + レベルを読み込み %1 Load and Replace Level %1 - + レベルを読み込んで置き換え %1 Expose Level %1 - + レベルの配置 %1 Following file(s) are modified. - + 以下のファイルは変更されました。 + + Are you sure to - + +それでも anyway ? - + してよろしいですか？ OK - OK + OK Overwrite Palette - + パレットを上書きする Don't Overwrite Palette - + パレットを上書きしない No Current Level - + カレントレベルがありません Toonz cannot Save this Level - + このレベルを保存できません No Current Scene - + 現在のシーンがありません Save level Failed - + レベルの保存に失敗しました Paste : Level %1 : Frame - + 貼り付け : レベル %1 : フレーム Delete Frames : Level %1 : Frame - + フレームの削除 : レベル %1 : フレーム Cut Frames : Level %1 : Frame - + フレームのカット : レベル %1 : フレーム Add Frames : Level %1 : Frame - + フレームの追加 : レベル %1 : フレーム Renumber : Level %1 - + 動画番号を振り直す : レベル %1 Insert : Level %1 - + 動画フレームの挿入 : Level %1 Reverse : Level %1 - + 順番を反転 : レベル %1 Swing : Level %1 - + スウィング : レベル %1 Step %1 : Level %2 - + %1 コマ打ち : レベル %2 Each %1 : Level %2 - + %1 コマ毎に詰める : レベル %2 Duplicate : Level %1 - + 複製 : レベル %1 Move Level to Scene : Level %1 - + レベルをシーンに移動 : レベル %1 Inbeteween : Level %1, - + 中割り : レベル %1 Paste Column : - + 列を貼り付け : Delete Column : - + 列を削除 : Insert Column : - + 列を挿入 : Resequence : Col%1 - + サブシートのフレームを再整列 : Col %1 Clone Sub-xsheet : Col%1 - + サブシートをクローン : Col%1 Clear Cells : Col%1 - + セルのクリア : Col%1 Reverse - + 順序を逆にする Swing - + スイング Autoexpose - + 自動配置 Random - + ランダム Step %1 - + %1 コマ打ち Each %1 - + コマを詰める %1 Reframe to %1's - + %1コマ毎にリフレーム Roll Up - + 繰り上げる Roll Down - + 繰り下げる Clone Level : %1 > %2 - + レベルのクローンを作る : %1 > %2 Clone Levels : - + レベルのクローンを作る : Time Stretch - 時間伸縮 + 時間伸縮 Palette Gizmo - パレット編集 + パレット編集 Create Level %1 at Column %2 - + 列 %2 に レベル %1 を作成 Do you want to expose the renamed level ? - + リネームしたレベルをタイムシート上に配置しますか？ Expose - + 配置する Don't expose - + 配置しない Paste Key Frames - + キーフレームを貼り付け Delete Key Frames - + キーフレームを削除 Copy File - + ファイルのコピー Paste File : - + ファイルを貼り付け : Duplicate File : - + ファイルを複製 : Paste Cells - + コマの貼り付け Delete Cells - + コマの削除 Cut Cells - + コマのカット Insert Cells - + 空白コマの挿入 Paste (Strokes) - + 貼り付け（ストローク） Paste - + 貼り付け Paste (Raster) - + 貼り付け（ラスター） Overwrite Paste Cells - + コマを上書きして貼り付け Cannot paste data Nothing to paste - + 貼り付けできません +クリップボードに貼り付け可能なデータがありません Modify Play Range : %1 - %2 - + 再生範囲の変更 : %1 - %2 Modify Play Range : %1 - %2 > %3 - %4 - + 再生範囲の変更 : %1 - %2 > %3 - %4 Use Level Extender - + スマートタブを使用 Modify Sound Level - + サウンドレベルを編集 Set Keyframe : %1 at Frame %2 - + キーフレームを設定 : %1 フレーム %2 Move Columns - + 列を移動 Change Pegbar - + タップを変更 Rename Cell at Column %1 Frame %2 - + 列 %1 フレーム %2のコマをリネーム Move Level - + レベルを移動 Combo Viewer - + メインビューア Cleeanup Settings - + トレース設定 Move Level to Cast Folder - + レベルをシーンアセットに移動 Merge Raster Levels - + ラスターレベルを結合 Delete Matchline : Level %1 - + マッチラインを消去 : レベル %1 Apply Matchline : Column%1 < Column%2 - + マッチラインを適用 : 列 %1 < 列 %2 + + + Palette Gizmo %1 + スタイルをまとめて色調整 %1 + + + Warning + 警告 + + + Palette is locked. + パレットがロックされています。 + + + History + ヒストリー @@ -6856,7 +6948,7 @@ Are you sure to Rename - 名前の変更 + リネーム Cancel @@ -6864,7 +6956,7 @@ Are you sure to Renaming File - ファイル名を変更中... + ファイルをリネーム中... Creating an animation level of %1 frames @@ -6872,14 +6964,15 @@ Are you sure to The file name cannot be empty or contain any of the following characters:(new line) \ / : * ? " | - ファイル名は空であることができませんし、次の記号のどれかを含むことができません： --- \ / : ? " | --- + ファイル名は空であることができません。また、次の記号のいずれかを含むことができません： + \ / : * ? " | RenderController Continue - 継続する + 続ける Cancel @@ -6887,7 +6980,7 @@ Are you sure to Exporting ... - 出力中... + 書き出し中... Abort @@ -6895,27 +6988,26 @@ Are you sure to Exporting - 出力中 + 書き出し中 The %1 scene contains an audio file with different characteristics from the one used in the first exported scene. The audio file will not be included in the rendered clip. - %1 シーンのオーディオ・ファイルとレンダリングするオーディオ・ファイルは異なります。 -異なっているオーディオ・ファイルはレンダリングに含めません。 + シーン %1 には、最初に書き出したシーンのオーディオ・ファイルと異なる特性を持つオーディオ・ファイルが含まれています。 +レンダリングするクリップにはそのオーディオ・ファイルが含まれません。 The %1 scene has a different resolution from the %2 scene. The output result may differ from what you expect. What do you want to do? - %1 シーンには %2 シーンとは異なる解像度があります。 -出力結果は、期待するものと異なるかもしれません。 -どのように継続しますか？ + シーン %1 はシーン %2 と異なるピクセルサイズに設定されています。 +期待するものと異なる結果が出力されるかもしれません。どうしますか？ RenumberPopup Renumber - 番号の付け替え + 番号を振りなおす Start: @@ -6934,7 +7026,7 @@ The audio file will not be included in the rendered clip. ReplaceLevelPopup Replace Level - レベルを置き換える + レベルを置き換え Replace @@ -6942,27 +7034,28 @@ The audio file will not be included in the rendered clip. Nothing to replace: no cells selected. - 置き換えることができません：選択されているセルがありません。 + 置き換えることができません：選択されているコマがありません。 File not found - ファイルが見つかりません + ファイルが見つかりません + ReplaceParentDirectoryPopup Replace Parent Directory - + 親フォルダパスの置き換え Replace - + 置き換える Nothing to replace: no cells or columns selected. - + 置き換えることができません：選択されているコマまたは列がありません。 @@ -7022,7 +7115,7 @@ The audio file will not be included in the rendered clip. SVNCommitDialog Version Control: Put changes - バージョン管理：変更点を置き換える + バージョン管理：変更を置き換える Select / Deselect All @@ -7030,11 +7123,11 @@ The audio file will not be included in the rendered clip. 0 Selected / 0 Total - 0 選択された / 0 合計 + 0 個選択 / 合計 0 個中 Getting repository status... - リポジトリの状態を受取中... + リポジトリの状態を取得中... Comment: @@ -7042,11 +7135,11 @@ The audio file will not be included in the rendered clip. Put Scene Contents - シーン内容を置き換える + シーン内容を登録する Put - 置き換える + 登録する Cancel @@ -7054,35 +7147,35 @@ The audio file will not be included in the rendered clip. Adding %1 items... - %1 ファイルを追加中... + %1 項目を追加中... Set needs-lock property... - [ロックが必要]の属性を設定... + 「ロックが必要」の属性を設定... Committing %1 items... - %1 ファイルを置き換えています... + %1 項目をコミットしています... Put done successfully. - 置き換えが完了しました。 + 登録が完了しました。 Putting %1 items... - %1 ファイルを置き換え中... + %1 項目を登録中... No items to put. - 置き換えるファイルがありません。 + 登録する必要のある項目がありません。 %1 items to put. - %1 置き換えるファイルがあります。 + %1 個の登録するファイルがあります。 %1 Selected / %2 Total - %1 選択した / %2 合計 + %1 個選択 / 合計 %2 個中 Close @@ -7093,7 +7186,7 @@ The audio file will not be included in the rendered clip. SVNCommitFrameRangeDialog Version Control: Put - バージョン管理：置き換える + バージョン管理：登録する Note: the file will be updated too. @@ -7105,7 +7198,7 @@ The audio file will not be included in the rendered clip. Put - 置き換える + 登録 Cancel @@ -7113,7 +7206,7 @@ The audio file will not be included in the rendered clip. Put done successfully. - 置き換えが完了しました。 + 登録が完了しました。 Locking file... @@ -7121,7 +7214,7 @@ The audio file will not be included in the rendered clip. Getting frame range edit information... - フレーム範囲の編集情報を受取中... + フレーム範囲の編集情報を取得中... No frame range edited. @@ -7133,7 +7226,7 @@ The audio file will not be included in the rendered clip. Putting changes... - 変更点を置き換え中... + 変更点を登録中... Updating file... @@ -7145,7 +7238,7 @@ The audio file will not be included in the rendered clip. Setting the needs-lock property to hook file... - [ロックが必要]の属性をフックファイルに設定中... + 「ロックが必要」の属性をフックファイルに設定中... @@ -7156,7 +7249,7 @@ The audio file will not be included in the rendered clip. Delete folder that contains %1 items. - %1 ファイルを含むフォルダを削除する。 + %1 個の項目を含むフォルダを削除する。 Delete empty folder. @@ -7164,7 +7257,7 @@ The audio file will not be included in the rendered clip. Delete %1 items. - %1 ファイルを削除する。 + %1 個の項目を削除する。 Comment: @@ -7172,7 +7265,7 @@ The audio file will not be included in the rendered clip. Delete Scene Contents - シーン内容を削除 + シーンの内容を削除 Keep Local Copy @@ -7192,7 +7285,7 @@ The audio file will not be included in the rendered clip. Deleting %1 items... - %1 ファイルを削除中... + %1 項目を削除中... Delete @@ -7200,7 +7293,7 @@ The audio file will not be included in the rendered clip. You are deleting items also on repository. Are you sure ? - リポジトリのファイルも削除しています。よろしいですか？ + リポジトリ上の項目も削除されます。よろしいですか？ @@ -7211,7 +7304,7 @@ The audio file will not be included in the rendered clip. Getting repository status... - リポジトリの状態を受取中... + リポジトリの状態を取得中... Close @@ -7223,7 +7316,7 @@ The audio file will not be included in the rendered clip. %1 on %2 is editing frames from %3 to %4. - %1 が %2 に %3 から %4 までフレームを編集しています。 + %1 が %2 に %3 から %4 までのフレームを編集しています。 @@ -7238,7 +7331,7 @@ The audio file will not be included in the rendered clip. Getting repository status... - リポジトリの状態を受取中... + リポジトリの状態を取得中... Comment: @@ -7246,7 +7339,7 @@ The audio file will not be included in the rendered clip. Edit Scene Contents - シーン内容を編集 + シーンの内容を編集 Unlock Scene Contents @@ -7266,27 +7359,27 @@ The audio file will not be included in the rendered clip. No items to edit. - 編集するファイルがありません。 + 編集する項目がありません。 No items to unlock. - ロックを解除するファイルがありません。 + ロックを解除する項目がありません。 %1 items to edit. - %1 編集するファイルがあります。 + %1 個の編集する項目があります。 %1 items to unlock. - %1 ロックを解除するファイルがあります。 + %1 個のロックを解除する項目があります。 Editing %1 items... - %1 ファイルを編集しています... + %1 個の項目を編集しています... Unlocking %1 items... - %1 ファイルのロックを解除中... + %1 個の項目のロックを解除中... @@ -7325,7 +7418,7 @@ The audio file will not be included in the rendered clip. Getting frame range edit information... - フレーム範囲の編集情報を更新中... + フレーム範囲の編集情報を取得中... %1 on %2 is editing frames from %3 to %4. @@ -7367,7 +7460,7 @@ The audio file will not be included in the rendered clip. Getting repository status... - リポジトリの状態を受取中... + リポジトリの状態を取得中... From: @@ -7395,11 +7488,11 @@ The audio file will not be included in the rendered clip. Editing %1 items... - %1 ファイルを編集しています... + %1 項目を編集しています... %1 is editing frames from %2 to %3 - %1 が %2 から %3 までフレームを編集しています。 + %1 が %2 から %3 までフレームを編集しています @@ -7410,7 +7503,7 @@ The audio file will not be included in the rendered clip. Getting repository status... - リポジトリの状態を受取中... + リポジトリの状態を取得中... Close @@ -7437,7 +7530,7 @@ The audio file will not be included in the rendered clip. Getting repository status... - リポジトリの状態を受取中... + リポジトリの状態を取得中... Purge @@ -7449,11 +7542,11 @@ The audio file will not be included in the rendered clip. No items to purge. - パージするアイテムはありません。 + パージする項目はありません。 %1 items to purge. - %1 パージするファイルがあります。 + %1 個のパージする項目があります。 Purging files... @@ -7464,15 +7557,15 @@ The audio file will not be included in the rendered clip. SVNRevertDialog Version Control: Revert changes - バージョン管理：変更点を元に戻す + バージョン管理：変更を元に戻す Getting repository status... - リポジトリの状態を受取中... + リポジトリの状態を取得中... Revert Scene Contents - シーン内容を復帰する + シーンの内容を復帰する Revert @@ -7484,15 +7577,15 @@ The audio file will not be included in the rendered clip. No items to revert. - 復帰するファイルがありません。 + 復帰する項目がありません。 %1 items to revert. - %1 復帰するファイルがあります。 + %1 個の復帰する項目があります。 Reverting %1 items... - %1 ファイルを復帰しています... + %1 個の項目を復帰しています... Revert done successfully. @@ -7507,7 +7600,7 @@ The audio file will not be included in the rendered clip. 1 item to revert. - 1つ復帰するファイルがあります。 + 1個の復帰する項目があります。 Revert @@ -7519,7 +7612,7 @@ The audio file will not be included in the rendered clip. Reverting 1 item... - 1つファイルを復帰中... + 1つの項目を復帰中... Revert done successfully. @@ -7527,7 +7620,7 @@ The audio file will not be included in the rendered clip. Reverting %1 items... - %1 ファイルを復帰中... + %1 個の項目を復帰中... It is not possible to revert the file. @@ -7542,19 +7635,19 @@ The audio file will not be included in the rendered clip. Getting file history... - ファイル履歴を受取中... + ファイル履歴を取得中... Get Scene Contents - シーン内容を受け取る + シーン内容を取得する Get Last Revision - 最終改訂版を受け取る + 最新バージョンを取得する Get Selected Revision - 選択した改訂版を受け取る + 選択したバージョンを取得する Close @@ -7562,7 +7655,7 @@ The audio file will not be included in the rendered clip. Getting repository status... - リポジトリの状態を受取中... + リポジトリの状態を取得中... Date @@ -7582,23 +7675,23 @@ The audio file will not be included in the rendered clip. Getting the status for %1... - %1 の状態を受け取り中... + %1 の状態を取得中... Getting %1 to revision %2... - %1を %2 改訂版まで受け取り中... + %1を %2 改訂版まで取得中... Getting %1 items to revision %2... - %1 ファイルを %2 改訂版まで受け取り中... + %1 個の項目を %2 改訂版まで取得中... Getting %1... - %1 を受け取り中... + %1 を取得中... Getting %1 items... - %1 ファイルを受け取り中... + %1 個の項目を取得中... @@ -7629,7 +7722,7 @@ The audio file will not be included in the rendered clip. Getting frame range edit information... - フレーム範囲の編集情報を受け取っています... + フレーム範囲の編集情報を取得しています... No frame range edited. @@ -7641,7 +7734,7 @@ The audio file will not be included in the rendered clip. Putting changes... - 変更点を置き換え中... + 変更を登録中... Updating file... @@ -7660,7 +7753,7 @@ The audio file will not be included in the rendered clip. Getting repository status... - リポジトリの状態を受け取っています... + リポジトリの状態を取得しています... Unlock @@ -7672,15 +7765,15 @@ The audio file will not be included in the rendered clip. Unlocking %1 items... - %1 ファイルのロックを解除しています... + %1 個の項目のロックを解除しています... No items to unlock. - ロックを解除するファイルがありません。 + ロックを解除する項目がありません。 %1 items to unlock. - %1 ロックを解除するファイルがあります。 + %1 個のロックを解除する項目があります。 @@ -7695,11 +7788,11 @@ The audio file will not be included in the rendered clip. Edit Scene Contents - シーン内容を編集 + シーンの内容を編集 Get And Edit - 受け取って、編集する + 取得して編集する Edit @@ -7711,19 +7804,19 @@ The audio file will not be included in the rendered clip. No items to edit. - 編集するファイルがありません。 + 編集する項目がありません。 %1 items to edit. - %1 編集するファイルがあります。 + %1 個の編集する項目があります。 Updating %1 items... - %1 ファイルを更新中... + %1 個の項目を更新中... Editing %1 items... - %1 ファイルを編集中... + %1 個の項目を編集中... @@ -7734,11 +7827,11 @@ The audio file will not be included in the rendered clip. Getting repository status... - リポジトリの状態を受け取っています... + リポジトリの状態を取得しています... Get Scene Contents - シーン内容を受け取る + シーンの内容を取得する Update @@ -7754,7 +7847,7 @@ The audio file will not be included in the rendered clip. %1 items to update. - %1 更新するファイルがあります。 + %1 個の更新するアイテムがあります。 Update to: @@ -7766,27 +7859,28 @@ The audio file will not be included in the rendered clip. No items to update. - 更新するファイルがありません。 + 更新する項目がありません。 Some items are currently modified in your working copy. Please commit or revert changes first. - いくつかのローカルファイルが変更されました。変更点を置き換えるか、又は元に戻して下さい。 + あなたの作業用コピーの中で、いくつかの項目が変更されています。 +先に変更をコミットするか、または元に戻して下さい。 Updating items... - ファイルを更新中... + 項目を更新中... Updating to their items... - ファイル先に更新中... + これらの項目に更新中... SaveCurvePopup Save Curve - 曲線を保存 + パラメータを保存 Save @@ -7797,7 +7891,7 @@ Please commit or revert changes first. SaveImagesPopup Save Flipbook Images - フリップビューア画像を保存 + フリップブック上の画像を保存 Save @@ -7865,7 +7959,7 @@ Please commit or revert changes first. SavePreviewedPopup Save Previewed Images - プレビューした画像を保存 + プレビュー画像を保存 Save @@ -7902,7 +7996,7 @@ Please commit or revert changes first. Sub-xsheet - サブシーン + サブシート @@ -7928,7 +8022,7 @@ Please commit or revert changes first. Paper Format: - 用紙の形式： + 紙のフォーマット： Reverse Order @@ -7936,7 +8030,7 @@ Please commit or revert changes first. Paper Feeder - ［ADF］自動原稿送り装置 + 自動原稿送り装置（ADF） Mode: @@ -8023,22 +8117,22 @@ Please commit or revert changes first. Frame Rate: - + フレームレート: Marker Interval: - + マーカー間隔： Start Frame: - + 開始フレーム： SceneViewerContextMenu Swap Compared Images - 比較画像を交換 + 比較画像の位置を入れ替え Save Previewed Frames @@ -8046,11 +8140,11 @@ Please commit or revert changes first. Regenerate Preview - プレビューを更新 + プレビューを再計算 Regenerate Frame Preview - フレームプレビューを更新 + プレビューを再計算（現在のフレームのみ） Select @@ -8058,19 +8152,19 @@ Please commit or revert changes first. Reset Subcamera - + サブカメラをリセット Select Camera - + カメラを選択 Select Pegbar - + タップを選択 Select Column - + 列を選択 @@ -8085,7 +8179,7 @@ Please commit or revert changes first. Untitled - 無題 + 名称未設定 Scene: @@ -8105,11 +8199,11 @@ Please commit or revert changes first. Freeze - 制止 + フリーズ Camera Stand View - テーブル表示 + カメラスタンド表示 3D View @@ -8128,11 +8222,11 @@ Please commit or revert changes first. ShortcutPopup Configure Shortcuts - キーボードショートカットの設定 + キーボードショートカット Remove - 削除 + 消去 @@ -8163,7 +8257,7 @@ Please commit or revert changes first. Cells - セル + コマ View @@ -8183,7 +8277,7 @@ Please commit or revert changes first. Tool Modifiers - ツール修飾子 + ツールオプション Visualization @@ -8203,7 +8297,7 @@ Please commit or revert changes first. Misc - + その他 @@ -8227,99 +8321,103 @@ Assign to '%3'? StackedMenuBar Files - + ファイル Scan - スキャン + スキャン Settings - + 設定 Processing - 修理 + トレース Edit - 編集 + 編集 Windows - ウィンドウ + ウィンドウ Other Windows - + その他のウィンドウ Customize - + カスタマイズ View - 表示 + 表示 Tools - ツール + ツール More Tools - + その他のツール Checks - + チェック Render - + レンダリング Draw - + 作画 Xsheet - タイムシート + タイムシート Subxsheet - + サブシート Levels - + レベル Cells - セル + コマ Reframe - + リフレーム Step - + コマ打ち Each - + コマを詰める File - ファイル + ファイル Scan && Cleanup - スキャン&&トレース + スキャン && トレース Level - レベル + レベル + + + Help + ヘルプ @@ -8362,12 +8460,11 @@ Click the arrow button to create a new sub-xsheet TApp Error allocating memory: not enough memory. - メモリーエラーメモリを割り当てるエラー: -十分なメモリではありません。 + メモリー割り当てエラー: メモリーが不足しています。 It is not possible to save automatically an untitled scene. - 未設定のシーンを保存できません。 + 名称未設定のシーンを自動保存できません。 @@ -8390,15 +8487,15 @@ Click the arrow button to create a new sub-xsheet Submitted By: - 提出者： + 送信者： Submitted On: - 提出元： + 送信先： Submission Date: - 提出日： + 送信日： Start Date: @@ -8414,15 +8511,15 @@ Click the arrow button to create a new sub-xsheet Step Count: - フレーム完了の数： + ステップ数： Failed Steps: - フレーム失敗の数： + 失敗ステップ数： Successfull Steps: - フレーム成功の数： + 成功ステップ数： Priority: @@ -8450,7 +8547,7 @@ Click the arrow button to create a new sub-xsheet Shrink: - 縮小： + 圧縮： Multiple Rendering: @@ -8458,23 +8555,23 @@ Click the arrow button to create a new sub-xsheet None - なし + 行わない Fx Schematic Flows - スキマティック［FX］の各ノード + エフェクトスキマティックの各ノード Fx Schematic Terminal Nodes - スキマティック［FX］でタイムシートに接続している各ノード + エフェクトスキマティックでタイムシートに接続している各ノード Dedicated CPUs: - 専用 CPU 数： + 使用 CPU 数： Single - 1つ + シングル Half @@ -8506,7 +8603,7 @@ Click the arrow button to create a new sub-xsheet Overwrite - 上書き + 上書きの設定 Dependencies: @@ -8522,30 +8619,30 @@ Click the arrow button to create a new sub-xsheet Multimedia: - + 素材毎に複数レンダリング : NoPaint - + NoPaintのみ上書き Off - + 上書きしない Remove >> - + 削除 >> << Add - + << 追加 TaskTreeModel Are you sure you want to remove ALL tasks? - すべてタスクを削除してもいいですか？ + すべてのタスクを削除してもよろしいですか？ Remove All @@ -8575,67 +8672,67 @@ Click the arrow button to create a new sub-xsheet TasksViewer &Start - 開始 + 開始 (&S) &Stop - 停止 + 停止 (&S) &Add Render Task - レンダリングタスクを追加 + レンダリングタスクを追加 (&A) &Add Cleanup Task - トレースタスクを追加 + トレースタスクを追加 (&A) &Save Task List - タスクリストを保存 + タスクリストを保存 (&S) &Save Task List As - タスクリストを別名で保存... + タスクリストを別名で保存 (&S) &Load Task List - タスクリストを開く + タスクリストを開く (&L) &Remove - 削除 + 削除 (&R) Start - 開始 + 開始 Stop - 停止 + 停止 Add Render - + レンダリングタスクを追加 Add Cleanup - + トレースタスクを追加 Save - + タスクリストを保存 Save As - + タスクリストを別名で保存 Load - + タスクリストを読み込み Remove - 削除 + 削除 @@ -8657,7 +8754,7 @@ Click the arrow button to create a new sub-xsheet Selected Cells - 選択したセル + 選択したコマ Selected Frame Range @@ -8665,7 +8762,7 @@ Click the arrow button to create a new sub-xsheet Whole Xsheet - シーン［全体］ + タイムシート全体 Stretch: @@ -8673,7 +8770,7 @@ Click the arrow button to create a new sub-xsheet Old Range: - 古い範囲： + 適用前の範囲： Stretch @@ -8696,14 +8793,14 @@ Click the arrow button to create a new sub-xsheet Older Version - 古いバージョン + 過去のバージョン TrackerPopup Tracking Settings - 特徴点の追跡 + 特徴点の追跡設定 Threshold: @@ -8738,7 +8835,7 @@ Click the arrow button to create a new sub-xsheet VectorizerPopup Convert-to-Vector Settings - ベクターに変換設定 + ベクターに変換 の設定 The current selection is invalid. @@ -8754,7 +8851,7 @@ Click the arrow button to create a new sub-xsheet Outline - 外側の線 + アウトライン Preserve Painted Areas @@ -8770,7 +8867,7 @@ Click the arrow button to create a new sub-xsheet Add Border - 画像の周りにベクター枠を追加［色流れ止め用］ + 周囲に境界線を追加（塗りもれ防止） Conversion in progress: @@ -8786,7 +8883,7 @@ Click the arrow button to create a new sub-xsheet Toggle Centerlines Check - 中心線の確認を表示/非表示 + 中心線チェックを表示/非表示 Corners @@ -8802,11 +8899,11 @@ Click the arrow button to create a new sub-xsheet Full color non-AA images - フルカラー二値化 + フルカラー二値化画像 Enhanced ink recognition - 改善インク線の識別 + 高度な線の識別 Save Settings @@ -8830,7 +8927,7 @@ Click the arrow button to create a new sub-xsheet Save Vectorizer Parameters - ベクター変換の設定を保存 + ベクター変換のパラメータを保存 Load Vectorizer Parameters @@ -8862,7 +8959,7 @@ Click the arrow button to create a new sub-xsheet Adherence - 固着性 + 角に沿わせる度合い Angle @@ -8874,7 +8971,7 @@ Click the arrow button to create a new sub-xsheet Max Colors - 最大の色 + 最大色数 Transparent Color @@ -8882,7 +8979,7 @@ Click the arrow button to create a new sub-xsheet Tone Threshold - トーンしきい値 + トーンのしきい値 @@ -8920,7 +9017,7 @@ Please refer to the user guide for details. ViewerHistogramPopup Viewer Histogram - 度数分布図ビューア + ヒストグラムビューア @@ -8951,7 +9048,7 @@ Please refer to the user guide for details. Click and drag to repeat selected cells - ［ドラッグ］選択されているセルを反復 + ［ドラッグ］選択されているセルを繰り返す Open Memo @@ -8959,23 +9056,23 @@ Please refer to the user guide for details. Delete Memo - メモを閉じる + メモを削除 Reframe - + リフレーム Step - + コマ打ち Each - + コマを詰める Replace - + 置き換える @@ -9026,58 +9123,58 @@ Please refer to the user guide for details. &Subsampling 1 - &飛び飛びのサンプリング 1 + 離散サンプリング 1 (&S) &Subsampling 2 - &飛び飛びのサンプリング 2 + 離散サンプリング 2 (&S) &Subsampling 3 - &飛び飛びのサンプリング 3 + 離散サンプリング 3 (&S) &Subsampling 4 - &飛び飛びのサンプリング 4 + 離散サンプリング 4 (&S) Preview Visibility Toggle - + 有効/無効を切り替え Camera Stand Visibility Toggle - + メインビューアに表示/非表示を切り替え Alt + Click to Toggle Thumbnail - + [Alt+クリック] アイコンを表示/非表示 Reframe - + リフレーム Subsampling - + 離散サンプリング XsheetGUI::NoteArea Frame - + フレーム Sec Frame - + 秒 コマ 6sec Sheet - + 6秒シート 3sec Sheet - + 3秒シート @@ -9088,7 +9185,7 @@ Please refer to the user guide for details. Post - 付ける + 追加する Discard @@ -9115,11 +9212,11 @@ Please refer to the user guide for details. Playback Start Marker - 開始マーカーを再生 + 再生開始マーカー Playback End Marker - 終了マーカーを再生 + 再生終了マーカー Set Start Marker @@ -9135,18 +9232,18 @@ Please refer to the user guide for details. Curren Frame - + 現在のフレーム Preview This - + このフレームのみプレビュー XsheetViewer Untitled - 無題 + 名称未設定 Scene: @@ -9158,31 +9255,31 @@ Please refer to the user guide for details. (Sub) - + (サブ) Level: - + レベル： Selected: - + 選択: frame : - + フレーム : frames * - + フレーム * column - + 列 columns - + 列 diff --git a/toonz/sources/translations/japanese/toonzlib.ts b/toonz/sources/translations/japanese/toonzlib.ts index 1466503..262bf61 100644 --- a/toonz/sources/translations/japanese/toonzlib.ts +++ b/toonz/sources/translations/japanese/toonzlib.ts @@ -1,39 +1,40 @@ - + Preferences Retas Level Format - + RETAS レベル形式 QObject No restrictions for uncompressed avi video - 解凍されたaviビデオは無制限 + 非圧縮AVIビデオに制限はありません video width must be a multiple of %1 - ビデオ幅は %1 の倍数でなければなりません。 + ビデオ幅は %1 の倍数でなければなりません video lenght must be a multiple of %1 - ビデオ長さは %1 の倍数でなければなりません。 + ビデオの長さは %1 の倍数でなければなりません No restrictions for this codec - このコーデックには無制限 + このコーデックに制限はありません Resolution restrictions: - 解像制限: + ピクセルサイズの制限: It is not possible to communicate with the codec. Probably the codec cannot work correctly. - コーデックのエラーが発生しました。 + コーデックの呼び出しができません。 +このコーデックは正常に動作しない恐れがあります。 %1-%2 @@ -45,565 +46,565 @@ Expected %1 argument(s) in %2, got %3 - + %2 に %1 引数を予想していましたが、%3 が入力されました %1 is not a valid color (valid color names are 'red', 'transparent', '#FF8800', ecc.) - + %1 は有効な色ではありません（有効な色名は'red', 'transparent', '#FF8800' 等です） Vectorization failed - + ベクター化に失敗しました Argument doesn't look like a file path : %1 - + 引数はファイルパスではありません : %1 Bad argument (%1): should be an Image (not empty) - + 不正な引数（%1）: 画像を指定する必要があります Argument '%1' does not look like a FrameId - + 引数 '%1' は フレームインデックスではありません First argument must be a scene : %1 - + 1番目の引数はシーンである必要があります : %1 Can't render empty scene - + 空のシーンはレンダリングできません New Camera %1 - + 新規カメラ %1 New Pegbar %1 - + 新規タップ %1 Set Active Camera %1 > %2 - + アクティブカメラの変更 %1 > %2 Remove Spline %1 - + スプラインの削除 %1 New Motion Path %1 - + 新規モーションパス %1 Link Motion Path %1 > %2 - + モーションパスをリンク %1 > %2 Remove Object %1 - + オブジェクトを削除 %1 Remove Column - + 列の削除 Load into Current Palette > %1 - + 現在のパレット内に読み込み > %1 Replace with Current Palette > %1 - + 現在のパレットで置き換え > %1 Delete Studio Palette : %1 - + スタジオパレットを削除 : %1 Create Studio Palette : %1 - + スタジオパレットを作成 : %1 Delete Studio Palette Folder : %1 - + スタジオパレットフォルダの削除 : %1 Create Studio Palette Folder : %1 - + スタジオパレットフォルダの作成 : %1 Move Studio Palette Folder : %1 : %2 > %3 - + スタジオパレットフォルダの移動 : %1 : %2 > %3 Arrange Styles in Palette %1 - + スタイルの並べ替え : パレット %1 Create Style#%1 in Palette %2 - + スタイル#%1 を作成 : パレット %2 Add Style to Palette %1 - + スタイルを追加 : パレット %1 Add Page %1 to Palette %2 - + ページ %1 の追加 : パレット %2 Delete Page %1 from Palette %2 - + ページ %1 の削除 : パレット %2 Load Color Model %1 to Palette %2 - + カラーモデル %1 を読み込み : パレット %2 Move Page - + ページを移動 Rename Page %1 > %2 - + ページのリネーム %1 > %2 Rename Style#%1 in Palette%2 : %3 > %4 - + スタイル#%1 のリネーム : パレット %2 : %3 > %4 Add Fx : - + エフェクトを追加 : Insert Fx : - + エフェクトを挿入 : Create Linked Fx : %1 - + リンクされたエフェクトを作成 : %1 Replace Fx : - + エフェクトを置き換え : Unlink Fx : %1 - - %2 - + エフェクトのリンクを解除 : %1 - - %2 Make Macro Fx : %1 - + マクロエフェクトの作成 : %1 Explode Macro Fx : %1 - + マクロエフェクトを展開 : %1 Create Output Fx - + 出力ノードを作成 Connect to Xsheet : - + タイムシートノードに接続 : Disconnect from Xsheet : - + タイムシートノードから接続を解除 : Delete Link - + リンクを削除 Delete Fx Node : %1 - + エフェクトノードを削除 : %1 Paste Fx : - + エフェクトを貼り付け : Disconnect Fx - + エフェクトの接続を解除 Connect Fx : %1 - %2 - + エフェクトを接続 : %1 - %2 Rename Fx : %1 > %2 - + エフェクトをリネーム : %1 > %2 Group Fx - + エフェクトをグループ化 Ungroup Fx - + エフェクトのグループを解除 Rename Group : %1 > %2 - + グループをリネーム : %1 > %2 Set Keyframe - + キーフレームを設定 Remove Keyframe - + キーフレームを削除 Cycle - + サイクル The autocentering failed on the current drawing. - + 現在の画像上で、自動センタリングが失敗しました。 Move - + 移動 Edit Rotation - + 回転角を変更 Move E/W - + 左右に移動 Move N/S - + 上下に移動 Move Z - + 奥行き方向に移動 Edit Stack Order - + 重ね順を変更 Edit Scale W - + 横方向の倍率を変更 Edit Scale H - + 縦方向の倍率を変更 Edit Scale - + 倍率を変更 Edit PosPath - + パス上の位置を変更 Edit Shear X - + 横方向のシアーを変更 Edit Shear Y - + 縦方向のシアーを変更 %1 %2 Frame : %3 - + %1 %2 フレーム : %3 Set Keyframe %1 at frame %2 - + キーフレームを設定 %1 フレーム %2 Remove Keyframe %1 at frame %2 - + キーフレームを消去 %1 フレーム %2 Move Center %1 Frame %2 - + センター位置を移動 %1 フレーム %2 TScriptBinding::CenterlineVectorizer Can't vectorize a %1 level - + レベル%1をベクター化できません Can't vectorize a level with no frames - + フレームのないレベルはベクター化できません Can't vectorize a %1 image - + 画像 %1 をベクター化できません Bad argument (%1): should be an Image or a Level - + 不正な引数 (%1): 画像またはレベルを指定する必要があります TScriptBinding::FilePath "%1" - + "%1" can't concatenate an absolute path : %1 - + 絶対パス %1 を連結することができません %1 is not a directory - + %1 はディレクトリではありません can't read directory %1 - + ディレクトリ %1 を読み取ることができません TScriptBinding::Image File %1 doesn't exist - + ファイル %1 は存在しません Loaded first frame of %1 - + %1 の最初のフレームを読み込みました Unexpected error while reading image - + 画像の読み取り中に想定外のエラーが発生しました Unrecognized file type : - + 認識できないファイル形式 : Can't save a %1 image to this file type : %2 - + 画像 %1 をこのファイル形式で保存できません : %2 Unexpected error while writing image - + 画像の書き込み中に想定外のエラーが発生しました TScriptBinding::ImageBuilder Bad argument (%1): should be 'Raster' or ToonzRaster' - + 不正な引数 (%1): ラスターまたはToonzラスターを指定する必要があります ImageBuilder(%1 image) - + イメージビルダー(%1 画像) %1 : %2 - + %1 : %2 Bad argument (%1): should be a Transformation - + 不正な引数 (%1): 幾何変換を指定する必要があります TScriptBinding::Level %1 frames - + %1 フレーム Bad argument (%1). It should be FilePath or string - + 不正な引数 (%1): ファイルパスまたは文字列を指定する必要があります Exception loading level (%1) - + レベル読み込みの例外 (%1) File %1 doesn't exist - + ファイル %1 は存在しません File %1 is unsupported - + ファイル %1 はサポートされていません Exception reading %1 - + %1 読み取り中の例外 Can't save an empty level - + 空のレベルを保存できません Unrecognized file type : - + 認識できないファイル形式 : Can't save a %1 level to this file type : %2 - + レベル %1 をこのファイル形式で保存できません : %2 Exception writing %1 - + %1 書き込み中の例外 frame index (%1) must be a number - + フレームインデックス (%1) は数字でなくてはなりません frame index (%1) is out of range (0-%2) - + フレームインデックス (%1)は範囲外です (0-%2) second argument (%1) is not an image - + 2番目の引数 (%1) が画像ではありません can not insert a %1 image into a level - + 画像 %1 をレベルに挿入できません can not insert a %1 image to a %2 level - + 画像 %1 をレベル %2 に挿入できません TScriptBinding::OutlineVectorizer Can't vectorize a %1 level - + レベル%1をベクター化できません Can't vectorize a level with no frames - + フレームのないレベルはベクター化できません Can't vectorize a %1 image - + 画像 %1 をベクター化できません Bad argument (%1): should be an Image or a Level - + 不正な引数 (%1): 画像またはレベルを指定する必要があります Invalid color : - + 無効な色 : TScriptBinding::Rasterizer Expected a vector image: %1 - + ベクター画像ではありません: %1 Expected a vector level: %1 - + ベクターレベルではありません: %1 Argument must be a vector level or image : - + 引数はベクターレベルまたは画像である必要があります : %1 has no palette - + %1 にはパレットがありません TScriptBinding::Scene File %1 doesn't exist - + ファイル %1 は存在しません Exception reading %1 - + %1 読み取り中の例外 Exception writing %1 - + %1 書き込み中の例外 Bad level type (%1): must be Vector,Raster or ToonzRaster - + 不正なレベルタイプ (%1): ベクター、ラスターまたはToonzラスターである必要があります Can't add the level: name(%1) is already used - + レベルを追加できません: レベル名(%1)は既に使用されています Can't load this kind of file as a level : %1 - + この形式のファイルをレベルとして読み込むことはできません : %1 Could not load level %1 - + レベル %1 を読み込めませんでした Level is not included in the scene : %1 - + レベルはシーンに含まれていません : %1 %1 : Expected a Level instance or a level name - + %1 : レベルインスタンスまたはレベルではありません Level '%1' is not included in the scene - + レベル '%1' はシーンに含まれていません TScriptBinding::ToonzRasterConverter Can't convert a %1 level - + レベル%1を変換できません Can't convert a level with no frames - + フレームのないレベルは変換できません Can't convert a %1 image - + 画像%1を変換できません Bad argument (%1): should be a raster Level or a raster Image - + 不正な引数 (%1): レベルまたはラスター画像を指定する必要があります TScriptBinding::Transform Identity - + 単位行列 Translation(%1,%2) - + 移動(%1,%2) Rotation(%1) - + 回転(%1) Scale(%1%) - + 拡大縮小(%1%) Scale(%1%, %2%) - + 拡大縮小(%1%, %2%) Transform(%1, %2, %3; %4, %5, %6) - + 幾何変換(%1, %2, %3; %4, %5, %6) diff --git a/toonz/sources/translations/japanese/toonzqt.ts b/toonz/sources/translations/japanese/toonzqt.ts index f787764..63d8079 100644 --- a/toonz/sources/translations/japanese/toonzqt.ts +++ b/toonz/sources/translations/japanese/toonzqt.ts @@ -1,42 +1,42 @@ - + AddFxContextMenu Insert FX - 挿入［FX］ + エフェクトを挿入 Add FX - 追加［FX］ + エフェクトを追加 Replace FX - 置き換え［FX］ + エフェクトを置き換え Insert - + 挿入 Add - + 追加 Replace - + 置き換え AdjustPaletteDialog Adjust Current Level to This Palette - 現在レベルをパレットに合わせる + 現在のレベルをこのパレットに合わせる Tolerance - しきい値 + 許容量 Apply @@ -51,11 +51,11 @@ CameraPainter &Reset Center - 基準点をリセット + 基準点をリセット (&R) &Activate - 有効 + 有効にする (&A) @@ -82,25 +82,25 @@ Use Current Level Settings - 現在のレベルを使用する + 現在のレベル設定を用いる Bad camera preset - カメラプリセットにはエラーが発生しました。 + 不正なカメラプリセット '%1' doesn't seem a well formed camera preset. Possibly the preset file has been corrupted - %1 カメラプリセットにはエラーが発生しました。 + '%1' は正しく整形されたカメラプリセットではありません。 +プリセットファイルが破損しているおそれがあります Preset name - プリセットの名前 + プリセット名 Enter the name for %1 - %1の名前を入力して下さい。 - + %1の名前を入力して下さい YPx: @@ -112,38 +112,38 @@ Possibly the preset file has been corrupted Add - + 追加 Remove - + 削除 Force Squared Pixel - + 正方ピクセルを保持 ChannelHisto Red - + 赤 Green - + 緑 Blue - + 青 Alpha - + アルファ RGBA - + RGBA @@ -193,11 +193,11 @@ Possibly the preset file has been corrupted ColumnPainter &Reset Center - 基準点をリセット + 基準点をリセット (&R) &Open Subxsheet - サブシーン編集モード + サブシートを開く (&O) @@ -231,81 +231,81 @@ Possibly the preset file has been corrupted H Range - 色相範囲： + 色相の範囲 Line Width - 線の太さ： + 線の太さ Color Thres - + 色のしきい値 White Thres - + 明るさのしきい値 DVGui::DvTextEdit Bold - 太字 + 太字 Italic - 斜体 + 斜体 Underline - 下線 + 下線 Align Left - 左揃 + 左揃え Align Center - 中央揃 + 中央揃え Align Right - 右揃 + 右揃え DVGui::FileField ... - ... + ... DVGui::LineEdit A file name cannot contains any of the following chracters: /\:*?"<>|. - ファイル名は次の記号のどれかを含むことができません： --- \ / : ? " | --- + ファイル名は次の記号を含むことができません： /\:*?"<>| DVGui::ProgressDialog Toonz - TOONZ + OpenToonz DVGui::RadioButtonDialog Toonz - TOONZ + OpenToonz DVGui::ToneCurveField Channel: - チャンネル： + チャンネル： @@ -354,11 +354,11 @@ Possibly the preset file has been corrupted EaseInOutSegmentPage Ease In: - イージーイン： + スローイン： Ease Out: - イージーアウト： + スローアウト： @@ -399,11 +399,11 @@ Possibly the preset file has been corrupted Define Sub-camera - サブカメラの範囲決定 + サブカメラの範囲を指定 Background Colors - 背景色 + プレビュー画像の背景 Framerate @@ -423,35 +423,35 @@ Possibly the preset file has been corrupted Histogram - 度数分布図 + ヒストグラム &Save Images - 画像を保存 + プレビュー画像を保存 (&S) &Snapshot - スナップショット + スナップショット (&S) &Compare to Snapshot - スナップショットと比較 + スナップショットと比較 (&C) &Define Sub-camera - サブカメラの範囲決定 + サブカメラの範囲を指定 (&D) &White Background - 白背景 + 白背景 (&W) &Black Background - 黒背景 + 黒背景 (&B) &Checkered Background - チェック柄背景 + チェック柄背景 (&C) Set the playback frame rate @@ -459,11 +459,11 @@ Possibly the preset file has been corrupted &First Frame - 最初のフレーム + 最初のフレーム (&F) &Previous Frame - 前のフレーム + 前のフレーム (&P) Pause @@ -475,15 +475,15 @@ Possibly the preset file has been corrupted Loop - ルップ再生 + ループ再生 &Next frame - 次のフレーム + 次のフレーム (&N) &Last Frame - 最後のフレーム + 最後のフレーム (&L) Red Channel @@ -491,7 +491,7 @@ Possibly the preset file has been corrupted Red Channel in Grayscale - グレースケールに赤チャンネル + 赤チャンネル(グレースケール) Green Channel @@ -499,7 +499,7 @@ Possibly the preset file has been corrupted Green Channel in Grayscale - グレースケールに緑チャンネル + 緑チャンネル(グレースケール) Blue Channel @@ -507,7 +507,7 @@ Possibly the preset file has been corrupted Blue Channel in Grayscale - グレースケールに青チャンネル + 青チャンネル(グレースケール) Alpha Channel @@ -515,15 +515,15 @@ Possibly the preset file has been corrupted &Soundtrack - サウンドトラック + サウンドトラック (&S) &Histogram - 度数分布図 + ヒストグラム (&H) FPS - FPS + FPS→ Frame @@ -535,7 +535,7 @@ Possibly the preset file has been corrupted Drag to play the animation - ドラッグしてシーンを再生する + [ドラッグ]アニメーションを再生する Define Loading Box @@ -547,19 +547,19 @@ Possibly the preset file has been corrupted &Define Loading Box - 読み込みボックスを指定 + 読み込みボックスを指定 (&D) &Use Loading Box - 読み込みボックスを使用 + 読み込みボックスを使用 (&U) Display Areas as Filled - 塗りつぶししたとして表示 + 領域を塗りつぶししたとして表示 &Display Areas as Filled - 塗りつぶししたとして表示 + 領域を塗りつぶししたとして表示 (&D) @@ -577,7 +577,7 @@ Possibly the preset file has been corrupted FunctionExpressionSegmentPage Expression: - 数式関数： + エクスプレッション： Unit: @@ -585,7 +585,7 @@ Possibly the preset file has been corrupted There is a circular reference in the definition of the interpolation. - 補間の定義に循環参照があります。 + 補間の定義の中に循環参照があります。 @@ -612,15 +612,15 @@ Possibly the preset file has been corrupted Activate Cycle - サイクルの有効 + サイクルを有効化 Deactivate Cycle - サイクルの無効 + サイクルを無効化 Linear Interpolation - 線形補間 + リニア補間 Speed In / Speed Out Interpolation @@ -628,11 +628,11 @@ Possibly the preset file has been corrupted Ease In / Ease Out Interpolation - イージーイン/イージーアウト補間 + スローイン/スローアウト補間 Ease In / Ease Out (%) Interpolation - イージーイン/イージーアウト［%］補間 + スローイン/スローアウト(%)補間 Exponential Interpolation @@ -640,11 +640,11 @@ Possibly the preset file has been corrupted Expression Interpolation - 数式関数補間 + エクスプレッション補間 File Interpolation - ファイル補間 + ファイルを用いて補間 Constant Interpolation @@ -652,11 +652,11 @@ Possibly the preset file has been corrupted Fit Selection - ウィンドウに選択を表示 + 選択範囲をウィンドウに合わせてズーム Fit - ウィンドウに全体表示 + ウィンドウに合わせてズーム Similar Shape Interpolation @@ -664,35 +664,35 @@ Possibly the preset file has been corrupted Step 1 - ステップ１［選択*1］ + ステップ1 Step 2 - ステップ２［選択*2］ + ステップ2 Step 3 - ステップ３［選択*3］ + ステップ3 Step 4 - ステップ４［選択*4］ + ステップ4 Function Curves - + グラフエディター Smooth - + 滑らかに表示 Frame Based - + フレーム毎の値を繋いで表示 Curve Shape - + グラフ形状 @@ -707,11 +707,11 @@ Possibly the preset file has been corrupted Ease In / Ease Out - イージーイン/イージーアウト + スローイン/スローアウト Ease In / Ease Out % - イージーイン/イージーアウト % + スローイン/スローアウト (%) Exponential @@ -719,7 +719,7 @@ Possibly the preset file has been corrupted Expression - 数式関数 + エクスプレッション File @@ -747,54 +747,54 @@ Possibly the preset file has been corrupted Apply - 適用 + 適用 < - + < > - + > Speed - + スピード Ease - + スロー Ease% - + スロー％ Expo - + 指数 Expr - + Expr Const - + 定数 Similar - + 相似 ???? - + ???? FunctionSelection There is a circular reference in the definition of the interpolation. - + 補間の定義に循環参照があります。 @@ -809,7 +809,7 @@ Possibly the preset file has been corrupted Linear Interpolation - 線形補間 + リニア補間 Speed In / Speed Out Interpolation @@ -817,19 +817,19 @@ Possibly the preset file has been corrupted Ease In / Ease Out Interpolation - イージーイン/イージーアウト補間 + スローイン/スローアウト補間 Ease In / Ease Out (%) Interpolation - イージーイン/イージーアウト［%］補間 + スローイン/スローアウト（%）補間 Expression Interpolation - 数式関数補間 + エクスプレッション補間 File Interpolation - ファイル補間 + ファイルを用いて補間 Constant Interpolation @@ -841,19 +841,19 @@ Possibly the preset file has been corrupted Step 1 - ステップ１［選択*1］ + ステップ1 Step 2 - ステップ２［選択*2］ + ステップ2 Step 3 - ステップ３［選択*3］ + ステップ3 Step 4 - ステップ４［選択*4］ + ステップ4 @@ -864,18 +864,18 @@ Possibly the preset file has been corrupted &Function Editor Toggle - パラメータ表示切り替え + パラメータ表示切り替え (&F) FunctionTreeView Save Curve - 曲線を保存 + パラメータを保存 Load Curve - 曲線を取り込み + パラメータを取り込み Export Data @@ -883,7 +883,7 @@ Possibly the preset file has been corrupted Show Animated Only - アニメーションのみ表示 + 変化するパラメータのみ表示 Show All @@ -894,142 +894,150 @@ Possibly the preset file has been corrupted FxColumnPainter &Disconnect from Xsheet - タイムシートから切り離す + タイムシートノードから切り離す (&D) &Connect to Xsheet - タイムシートに接続 + タイムシートノードに接続 (&C) &Paste Add - 貼り付け［追加］ + 貼り付けて追加 (&P) &Preview - プレビュー + プレビュー (&P) &Open Subxsheet - サブシート編集モード + サブシートを開く (&O) &Uncache Fx - 非キャッシュFX + キャッシュを解除 (&U) &Cache FX - キャッシュFX + キャッシュ (&C) FxOutputPainter &Delete - 削除 + 削除 (&D) &Activate - 有効にする + 有効にする (&A) + + + Output + Output + + + Out + Out FxPainter &Open Group - グループ編集モード + グループを開く (&O) &Paste Replace - 貼り付け［交換］ + 貼り付けて置換 (&P) &Paste Add - 貼り付け［追加］ + 貼り付けて追加 (&P) &Delete - 削除 + 削除 (&D) &Disconnect from Xsheet - タイムシートから切り離す + タイムシートノードから切り離す (&D) &Connect to Xsheet - タイムシートに接続 + タイムシートノードに接続 (&C) &Create Linked FX - 連結エフェクトを作成 + リンクされたエフェクトを作成 (&C) &Unlink - 分離 + リンクを解除 (&U) &Make Macro FX - マクロエフェクトを作成 + マクロエフェクトを作成 (&M) &Explode Macro FX - マクロエフェクトを展開 + マクロエフェクトを展開 (&E) &Open Macro FX - マクロエフェクト編集モード + マクロエフェクトを開く (&O) &Save As Preset... - プリセットとして保存... + プリセットとして保存 (&S)... &Preview - プレビュー + プレビュー (&P) &Uncache FX - 非キャッシュFX + キャッシュを解除 (&U) &Cache FX - キャッシュFX + キャッシュ (&C) FxPalettePainter &Disconnect from Xsheet - タイムシートから切り離す + タイムシートノードから切り離す (&D) &Connect to Xsheet - タイムシートに接続 + タイムシートノードに接続 (&C) &Preview - プレビュー + プレビュー (&P) FxSchematicLink &Delete - 削除 + 削除 (&D) &Paste Insert - 貼り付け［挿入］ + 貼り付けて挿入 (&P) FxSchematicPort &Disconnect from Xsheet - タイムシートから切り離す + タイムシートノードから切り離す (&D) &Connect to Xsheet - タイムシートに接続 + タイムシートノードに接続 (&C) @@ -1037,73 +1045,80 @@ Possibly the preset file has been corrupted Cannot Paste Insert a selection of unconnected FX nodes. Select FX nodes and related links before copying or cutting the selection you want to paste. - 選択した無関係のFXノードを貼り付け［挿入］できません。 -コピーまたは切り取る前にFXノードと関連するリンクを選択してください。 + 接続されていない複数のエフェクトノードを「貼り付けて挿入」できません。 +コピーまたは切り取りを行う前に、FXノードと関連するリンクを選択してください。 Cannot Paste Add a selection of unconnected FX nodes. Select FX nodes and related links before copying or cutting the selection you want to paste. - 選択した無関係のFXノードを貼り付け［追加］できません。 -貼り付けしたい選択物をコピーまたは切り取る前にFXノードと関連するリンクを選択してください。 + 接続されていない複数のエフェクトノードを「貼り付けて追加」できません。 +コピーまたは切り取りを行う前に、FXノードと関連するリンクを選択してください。 Cannot Paste Replace a selection of unconnected FX nodes. Select FX nodes and related links before copying or cutting the selection you want to paste. - 選択した無関係のFXノードを貼り付け［交換］できません。 -コピーまたは切り取る前にFXノードと関連するリンクを選択してください。 + 接続されていない複数のエフェクトノードを「貼り付けて置換」できません。 +コピーまたは切り取りを行う前に、FXノードと関連するリンクを選択してください。 FxSettings &Camera Preview - カメラプレビュー + カメラプレビュー (&C) &Preview - プレビュー + プレビュー (&P) &White Background - 白背景 + 白背景 (&W) &Black Background - 黒背景 + 黒背景 (&B) &Checkered Background - チェック柄背景 + チェック柄背景 (&C) : - + : FxXSheetPainter &Paste Add - 貼り付け［追加］ + 貼り付けて追加 (&P) &Preview - プレビュー + プレビュー (&P) + + + XSheet + XSheet + + + X + X GroupPainter &Open Group - グループ編集モード + グループを開く (&O) Histogram Logarithmic Scale - 計算尺 - + 対数スケール @@ -1158,11 +1173,11 @@ Select FX nodes and related links before copying or cutting the selection you wa PaletteViewer &Save Palette As - パレットを別名で保存... + パレットを別名で保存 (&S) &Save Palette - パレットを保存 + パレットを保存 (&S) Options @@ -1170,27 +1185,27 @@ Select FX nodes and related links before copying or cutting the selection you wa &Small Thumbnails View - サムネイル［小］を表示 + 小サムネイル (&S) &Large Thumbnails View - サムネイル［大］を表示 + 大サムネイル (&L) &List View - リスト表示 + リスト表示 (&L) &New Page - 新規ページ + 新規ページ (&N) &New Style - 新規スタイル + 新規スタイル (&N) &Move Palette - パレットを移動 + パレットを移動 (&M) Color Model: @@ -1198,7 +1213,7 @@ Select FX nodes and related links before copying or cutting the selection you wa &Palette Gizmo - パレット編集 + スタイルをまとめて色調整 (&P) New Page @@ -1230,70 +1245,70 @@ Select FX nodes and related links before copying or cutting the selection you wa Lock Palette - + パレットをロック &Lock Palette - + パレットをロック (&L) &Medium Thumbnails View - + 中サムネイル (&M) Style Name - + スタイル名 StudioPalette Name - + リンク元のスタイル名 Both Names - + 両方の名前 Overwrite - + 上書きする Don't Overwrite - + 上書きしない Update - + 更新する Don't Update - + 更新しない (Color Model: - + (カラーモデル： ) - + ) PaletteViewerGUI::PageViewer - No Styles - - + - スタイルがありません - Remove Links - + スタジオパレットとのリンクを消去 New Style - 新規スタイル + 新規スタイル New Page - 新規ページ + 新規ページ @@ -1319,21 +1334,21 @@ Select FX nodes and related links before copying or cutting the selection you wa ParamViewer Swatch Viewer - + スウォッチビューア ParamsPageSet Fx Help - + ヘルプ PegbarPainter &Reset Center - 基準点をリセット + 基準点をリセット (&R) @@ -1344,7 +1359,7 @@ Select FX nodes and related links before copying or cutting the selection you wa X: - + X: @@ -1362,11 +1377,11 @@ Select FX nodes and related links before copying or cutting the selection you wa Warning - 警告： + 警告 Critical - クリティカル + クリティカル警告 Question @@ -1375,12 +1390,12 @@ Select FX nodes and related links before copying or cutting the selection you wa Styles you are going to delete are used to paint lines and areas in the animation level. - 削除しようとするスタイルは、レベルの線と領域に使用されています。 + 削除しようとしているスタイルは、アニメーション・レベル内の線と塗りに使用されています。 How do you want to proceed? - どのように継続しますか？ + どのように処理しますか？ Delete Styles Only @@ -1388,7 +1403,7 @@ Select FX nodes and related links before copying or cutting the selection you wa Delete Styles, Lines and Areas - スタイル、線、および領域を削除 + スタイルと、線および塗りを削除 Cancel @@ -1396,27 +1411,27 @@ Select FX nodes and related links before copying or cutting the selection you wa Cannot premultiply the selected file. - 選択したファイルを乗合成チャンネル［黒マット］することができません。 + 選択したファイルをチャンネル合成（プリマルチプライ）することができません。 Cannot premultiply a vector-based level. - ベクター方式のレベルを乗合成チャンネル［黒マット］できません。 + ベクター形式のレベルはチャンネル合成（プリマルチプライ）できません。 Level %1 premultiplied. - %1 レベルは乗算済みされました。 + %1 レベルはチャンネル合成されました。 Frame %1 : conversion failed! - フレーム %1 ：変換は失敗しました。 + フレーム %1 ：変換は失敗しました! Save - はい + 保存 Discard - いいえ + 変更を破棄 Yes @@ -1428,11 +1443,11 @@ Select FX nodes and related links before copying or cutting the selection you wa Stage Schematic - スキマティック［ステージ］ + ステージ・スキマティック FX Schematic - スキマティック［FX］ + エフェクト・スキマティック Fx Schematic @@ -1444,24 +1459,24 @@ Select FX nodes and related links before copying or cutting the selection you wa Motion Path files (*.mpath) - モーションパスファイル［*.mpath］ + モーションパスファイル(*.mpath) Load Motion Path - モーションパスを読み込み + モーションパスを読み込む Can't paste styles there - スタイルを指定先に貼り付けできません。 + スタイルを指定先に貼り付けできません Can't modify color #0 - #0 色を変更できません。 + スタイル#0 は変更できません There are more cut/copied styles than selected. Paste anyway (adding styles)? - 選択スタイルが切り取りまたはコピーされたスタイルよりも多いです。 -すべて貼り付けを継続しますか？ + 切り取り/コピーされたスタイルの数が選択スタイルよりも多いです。 +貼り付けを継続しますか？（不足分のスタイルは追加されます） Paste @@ -1502,7 +1517,7 @@ For more information visit the %1 site: Owner: - オーナー： + 所有者： Size: @@ -1510,11 +1525,11 @@ For more information visit the %1 site: Created: - 作成： + 作成日時： Modified: - 編集： + 更新日時： Last Access: @@ -1530,11 +1545,11 @@ For more information visit the %1 site: Bits/Sample: - ビット／サンプル： + 色深度： Sample/Pixel: - サンプル／ピクセル： + チャンネル数： Dpi: @@ -1558,7 +1573,7 @@ For more information visit the %1 site: Codec: - こーデック： + コーデック： Alpha Channel: @@ -1566,15 +1581,15 @@ For more information visit the %1 site: Byte Ordering: - バイトアーダー： + バイト順序： H Pos: - H 位置： + 水平位置： Palette Pages: - パレットのパージ： + パレットのページ： Palette Styles: @@ -1602,11 +1617,11 @@ For more information visit the %1 site: Endianess: - インデェアン化： + エンディアン： It is not possible to delete the style # - スタイル # を削除できません。 + スタイルを削除できません：スタイル# It is not possible to delete styles #0 and #1. @@ -1614,15 +1629,15 @@ For more information visit the %1 site: It is not possible to find the %1 level. - %1 レベルを見つけることができません。 + レベル %1 を見つけることができません。 There was an error copying %1 - %1 をコピーする時、エラーが発生しました。 + %1 をコピーする時、エラーが発生しました It is not possible to find the level %1 - %1 レベルを見つけることができません。 + レベル %1 を見つけることができません Length: @@ -1646,7 +1661,7 @@ For more information visit the %1 site: It is not possible to assing a shortcut with modifiers to the visualization commands. - 修飾子が備えたキーボードショートカットを視覚化コマンドに割り当てできません。 + 視覚化コマンドには、修飾キーと組み合わせたキーボードショートカットを割り当てできません。 It is not possible to save the motion path. @@ -1658,173 +1673,176 @@ For more information visit the %1 site: <custom> - ［カスタム］ + <カスタム> Toonz 7.1 - TOONZ 7.1ML + OpenToonz The file name cannot be empty or contain any of the following characters: (new line) \ / : * ? " | - ファイル名は空白にはできません。次の文字を入れることもできません:(new line) \ / : * ? " | + ファイル名は空白にはできません。また、次の文字のいずれかを含むことはできません： +\ / : * ? " | The source image seems not suitable for this kind of conversion - 元画像は、この変換には適していないようです + 元の画像は、この変換に適したものではありません Deleting "%1". Are you sure? - + "%1"を削除します。 +よろしいですか？ Delete - 削除 + 削除 Paste Style in Palette : %1 - + スタイルを貼り付け : パレット %1 Delete Style from Palette : %1 - + スタイルを削除 :パレット %1 Cut Style from Palette : %1 - + スタイルを切り取り : パレット %1 to Palette : %1 - + パレットへ : %1 Paste Color && Name%1 - + 色と名前を貼り付け %1 Paste Name%1 - + 名前を貼り付け %1 Paste Color%1 - + 色を貼り付け %1 Paste%1 - + 貼り付け %1 Blend Colors in Palette : %1 - + 色を混合 : パレット %1 Toggle Link in Palette : %1 - + リンクを切り替え : パレット %1 Remove Link in Palette : %1 - + リンクを消去 : パレット %1 Get Color from Studio Palette - + スタジオパレットからリンクされた色を取得 Paste Object - + オブジェクトを貼り付け Copy Keyframe - + キーフレームをコピー Paste Keyframe at Frame : %1 - + キーフレームを貼り付け : フレーム %1 Delete Keyframe - + キーフレームを削除 Move Keyframe - + キーフレームを移動 Change Style Palette : %1 Style#%2 [R%3 G%4 B%5] -> [R%6 G%7 B%8] - + スタイルを変更 パレット : %1 スタイル#%2 [R%3 G%4 B%5] -> [R%6 G%7 B%8] Replace - + 置き換え Modify Fx Param : %1 - + エフェクトパラメータを変更 : %1 Modify Fx Param : %1 : %2 -> %3 - + エフェクトパラメータを変更 %1 : %2 -> %3 Modify Fx Param : - + エフェクトパラメータを変更 : ON : %1 - + オン : %1 OFF : %1 - + オフ : %1 Modify Fx Param : %1 : %2 Key - + エフェクトパラメータを変更 : %1 : キーフレームを%2 Add - + 追加 Remove - + 削除 Modify Fx Param : %1 : %2 Point - + エフェクトパラメータを変更 : %1 : トーンカーブのポイントを%2 %1 : Linear ON - + %1 : トーンカーブ-線形 オン %1 : Linear OFF - + %1 : トーンカーブ-線形 オフ Overwrite - + 上書きする Don't Overwrite - + 上書きしない Ok - OK + OK Deletion of Lines and Areas from raster-based levels is not undoable. Are you sure? - + ラスター形式のレベルから線と塗りを削除します。この操作は取り消しできません。 +よろしいですか？ Modify Fx Param : %1 Key : %2 Frame %3 - + エフェクトパラメータを変更 : キーフレームを%1 : %2 フレーム %3 Set - + 設定 @@ -1845,39 +1863,39 @@ Are you sure? SchematicViewer &Fit to Window - ウィンドウに全体を表示 + ウィンドウに全体を表示 (&F) &Focus on Current - 現在のオブジェクトを中心に + 現在のオブジェクトを中心に (&F) &Reorder Nodes - ノードを順序付ける + ノードを整列 (&R) &Reset Size - サイズをリセット + サイズをリセット (&R) &Minimize Nodes - ノードを縮小化する + ノードを最小化する (&M) &Maximize Nodes - ノードを最大化する + ノードを最大化する (&M) &New Pegbar - 新規タップ + 新規タップ (&N) &New Camera - 新規カメラ + 新規カメラ (&N) &New Motion Path - 新規モーションパス + 新規モーションパス (&N) &Schematic Toggle @@ -1888,14 +1906,14 @@ Are you sure? SchematicWindowEditor &Close Editor - 編集を閉じる + エディターを閉じる (&C) SimilarShapeSegmentPage Reference Curve: - 参照曲線： + 参照するパラメータ： Frame Offset: @@ -1903,19 +1921,18 @@ Are you sure? There is a syntax error in the definition of the interpolation. - 補間の定義に構文エラーがあります。 + 補間の定義の中に構文エラーがあります。 There is a circular reference in the definition of the interpolation. - 補間の定義に循環参照があります。 - + 補間の定義の中に循環参照があります。 SpecialStyleChooserPage Plain color - 標準色 + 通常の色 @@ -1930,60 +1947,60 @@ Are you sure? First Speed: - + 始点の速度: Handle: - + ハンドル: / - + / Last Speed: - + 終点の速度: --- - + --- SplinePainter &Delete - 削除 + 削除 (&D) &Save Motion Path... - モーションパスを保存... + モーションパスを保存 (&S)... &Load Motion Path... - モーションパスを読み込み... + モーションパスを読み込み (&L)... StageSchematicScene &New Pegbar - 新規タップ + 新規タップ (&N) &New Motion Path - 新規モーションパス + 新規モーションパス (&N) &New Camera - 新規カメラ + 新規カメラ (&N) StudioPaletteTreeViewer This folder is not empty. Delete anyway? - このフォルダは空ではありません。 削除しますか? + このフォルダは空ではありません。 削除してよろしいですか? New Palette @@ -2007,7 +2024,7 @@ Are you sure? Replace with Current Palette - 現在のパレットに置き換え + 現在のパレットで置き換え Delete Palette @@ -2027,7 +2044,7 @@ Are you sure? Convert to Studio Palette and Overwrite - + スタジオパレットに変換して上書き保存 @@ -2057,7 +2074,7 @@ Are you sure? Apply changes to current style - 現在のスタイルに変更点を適用 + 現在のスタイルに変更を適用 Auto @@ -2065,11 +2082,11 @@ Are you sure? Automatically update style changes - スタイルの変更点を自動更新 + スタイルの変更を自動で更新 Return To Previous Style - 前のスタイルに元に戻す + 前のスタイルに戻る Current Style @@ -2081,11 +2098,11 @@ Are you sure? Texture - テキスチャ + テクスチャ Special - 特別 + 特殊 Custom @@ -2093,7 +2110,7 @@ Are you sure? Vector Brush - ベクトルブラシ + ベクターブラシ Settings @@ -2102,60 +2119,61 @@ Are you sure? Auto Apply - + 自動で +適用 StyleEditorGUI::PlainColorPage Wheel - + カラーホイール HSV - + HSV Matte - + アルファ RGB - + RGB StyleEditorGUI::SettingsPage Autopaint for Lines - トレース線として、自動塗りつぶし + 色トレース線として、自動塗りつぶし StyleNameEditor Name Editor - + スタイル名エディタ OK - OK + OK Cancel - キャンセル + キャンセル Apply - 適用 + 適用 Style Name - + スタイル名 Name Editor: # %1 - + スタイル名を編集: # %1 @@ -2174,14 +2192,14 @@ Apply Clear - リセット + クリア TablePainter &Reset Center - 基準点をリセット + 基準点をリセット (&R) @@ -2195,7 +2213,7 @@ Apply VectorBrushStyleChooserPage Plain color - %1 を削除できません。 + 通常の色