Merge remote-tracking branch 'origin/master' into new_main_page_ui
This commit is contained in:
YuSanka
commit
0371f368a4
87 changed files with 12046 additions and 4249 deletions
BIN
resources/icons/bed/mk2_bottom.png
Normal file
BIN
resources/icons/bed/mk2_bottom.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 27 KiB |
BIN
resources/icons/bed/mk2_top.png
Normal file
BIN
resources/icons/bed/mk2_top.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 100 KiB |
BIN
resources/icons/bed/mk3_bottom.png
Normal file
BIN
resources/icons/bed/mk3_bottom.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 170 KiB |
BIN
resources/icons/bed/mk3_top.png
Normal file
BIN
resources/icons/bed/mk3_top.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 83 KiB |
BIN
resources/icons/overlay/rotate_hover.png
Normal file
BIN
resources/icons/overlay/rotate_hover.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.7 KiB |
BIN
resources/icons/overlay/rotate_off.png
Normal file
BIN
resources/icons/overlay/rotate_off.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 4.4 KiB |
BIN
resources/icons/overlay/rotate_on.png
Normal file
BIN
resources/icons/overlay/rotate_on.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 3.4 KiB |
BIN
resources/icons/overlay/scale_hover.png
Normal file
BIN
resources/icons/overlay/scale_hover.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 6.3 KiB |
BIN
resources/icons/overlay/scale_off.png
Normal file
BIN
resources/icons/overlay/scale_off.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 7.1 KiB |
BIN
resources/icons/overlay/scale_on.png
Normal file
BIN
resources/icons/overlay/scale_on.png
Normal file
Binary file not shown.
|
After Width: | Height: | Size: 5.2 KiB |
Binary file not shown.
|
|
@ -5,7 +5,7 @@ msgstr ""
|
|||
"Content-Type: text/plain; charset=UTF-8\n"
|
||||
"Content-Transfer-Encoding: 8bit\n"
|
||||
"Plural-Forms: nplurals=2; plural=(n > 1);\n"
|
||||
"X-Generator: Poedit 2.0.6\n"
|
||||
"X-Generator: Poedit 2.0.8\n"
|
||||
"Project-Id-Version: \n"
|
||||
"POT-Creation-Date: \n"
|
||||
"PO-Revision-Date: \n"
|
||||
|
|
@ -361,6 +361,10 @@ msgstr "Ajouter…"
|
|||
msgid "Advanced"
|
||||
msgstr "Avancé"
|
||||
|
||||
#: xs/src/slic3r/GUI/FirmwareDialog.cpp:319
|
||||
msgid "Advanced: avrdude output log"
|
||||
msgstr "Avancé : journal de sortie avrdude"
|
||||
|
||||
#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1138
|
||||
#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:766
|
||||
msgid "After layer change G-code"
|
||||
|
|
@ -421,6 +425,14 @@ msgstr "secondes approximatives"
|
|||
msgid "Are you sure you want to "
|
||||
msgstr "Êtes-vous sûr de vouloir "
|
||||
|
||||
#: xs/src/slic3r/GUI/FirmwareDialog.cpp:365
|
||||
msgid ""
|
||||
"Are you sure you want to cancel firmware flashing?\n"
|
||||
"This could leave your printer in an unusable state!"
|
||||
msgstr ""
|
||||
"Êtes-vous certain de vouloir annuler le processus de flash du firmware ?\n"
|
||||
"Cela pourrait rendre votre imprimante inutilisable !"
|
||||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2044
|
||||
msgid "Around X axis…"
|
||||
msgstr "Autour de l'axe X…"
|
||||
|
|
@ -615,6 +627,14 @@ msgstr "Description des Boutons et des Couleurs de Texte"
|
|||
msgid "by the print profile maximum"
|
||||
msgstr "par le maximum du profil de l'imprimante"
|
||||
|
||||
#: xs/src/slic3r/GUI/FirmwareDialog.cpp:85
|
||||
msgid "Cancel"
|
||||
msgstr "Annuler"
|
||||
|
||||
#: xs/src/slic3r/GUI/FirmwareDialog.cpp:213
|
||||
msgid "Cancelling..."
|
||||
msgstr "Annulation..."
|
||||
|
||||
#: xs/src/slic3r/GUI/Tab.cpp:2124
|
||||
msgid "Cannot overwrite a system profile."
|
||||
msgstr "Impossible d'écraser un profil système."
|
||||
|
|
@ -647,14 +667,6 @@ msgstr "Changer le nombre de copies de l'objet sélectionné"
|
|||
msgid "Check for application updates"
|
||||
msgstr "Vérifier les mises à jour de l'application"
|
||||
|
||||
#: xs/src/slic3r/GUI/GUI.cpp:404
|
||||
msgid "Check for configuration updates"
|
||||
msgstr "Vérifier les mises à jour de configuration"
|
||||
|
||||
#: xs/src/slic3r/GUI/GUI.cpp:404
|
||||
msgid "Check for updates"
|
||||
msgstr "Vérifier les mises à jour"
|
||||
|
||||
#: c:\src\Slic3r\xs\src\slic3r\GUI\BedShapeDialog.cpp:298
|
||||
msgid "Choose a file to import bed shape from (STL/OBJ/AMF/3MF/PRUSA):"
|
||||
msgstr "Choisir un fichier à partir duquel importer la forme du plateau (STL/OBJ/AMF/3MF/PRUSA) :"
|
||||
|
|
@ -731,6 +743,10 @@ msgstr "Une mise à jour de la configuration est disponible"
|
|||
msgid "Configuration Wizard"
|
||||
msgstr "Assistant de Configuration"
|
||||
|
||||
#: xs/src/slic3r/GUI/FirmwareDialog.cpp:366
|
||||
msgid "Confirmation"
|
||||
msgstr "Confirmation"
|
||||
|
||||
#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1020
|
||||
msgid "Connection failed."
|
||||
msgstr "La connexion a échoué."
|
||||
|
|
@ -1073,10 +1089,6 @@ msgstr "Entrez la nouvelle taille pour l'objet sélectionné (plateau d'impressi
|
|||
msgid "Enter the number of copies of the selected object:"
|
||||
msgstr "Entrez le nombre de copies de l'objet sélectionné :"
|
||||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:950
|
||||
msgid "Enter the rotation angle:"
|
||||
msgstr "Entrez l'angle de rotation :"
|
||||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1035
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1061
|
||||
#, no-perl-format
|
||||
|
|
@ -1154,6 +1166,10 @@ msgstr "Option expérimentale qui ajuste le flux pour les surplombs (le flux pou
|
|||
msgid "Export all presets to file"
|
||||
msgstr "Exporter tous les préréglage vers un fichier"
|
||||
|
||||
#: lib/Slic3r/GUI/Plater.pm:1416
|
||||
msgid "Export cancelled"
|
||||
msgstr "Exportation annulée"
|
||||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:257
|
||||
msgid "Export current configuration to file"
|
||||
msgstr "Exporter la configuration actuelle vers un fichier"
|
||||
|
|
@ -1423,6 +1439,14 @@ msgstr "Terminé"
|
|||
msgid "Firmware"
|
||||
msgstr "Firmware"
|
||||
|
||||
#: xs/src/slic3r/GUI/FirmwareDialog.cpp:266
|
||||
msgid "Firmware flasher"
|
||||
msgstr "Outil de flash du firmware"
|
||||
|
||||
#: xs/src/slic3r/GUI/FirmwareDialog.cpp:293
|
||||
msgid "Firmware image:"
|
||||
msgstr "Image du firmware :"
|
||||
|
||||
#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1314
|
||||
msgid "Firmware Retraction"
|
||||
msgstr "Rétraction du Firmware"
|
||||
|
|
@ -1450,6 +1474,30 @@ msgstr "Vitesse de la première couche"
|
|||
msgid "First layer volumetric"
|
||||
msgstr "Volume de la première couche"
|
||||
|
||||
#: xs/src/slic3r/GUI/GUI.cpp:326
|
||||
msgid "Flash printer firmware"
|
||||
msgstr "Flasher le firmware de l'imprimante"
|
||||
|
||||
#: xs/src/slic3r/GUI/FirmwareDialog.cpp:84
|
||||
msgid "Flash!"
|
||||
msgstr "Flash !"
|
||||
|
||||
#: xs/src/slic3r/GUI/FirmwareDialog.cpp:147
|
||||
msgid "Flashing cancelled."
|
||||
msgstr "Processus de flash annulé."
|
||||
|
||||
#: xs/src/slic3r/GUI/FirmwareDialog.cpp:146
|
||||
msgid "Flashing failed. Please see the avrdude log below."
|
||||
msgstr "Le processus de flash a échoué. Veuillez consulter le journal avrdude ci-dessous."
|
||||
|
||||
#: xs/src/slic3r/GUI/FirmwareDialog.cpp:123
|
||||
msgid "Flashing in progress. Please do not disconnect the printer!"
|
||||
msgstr "Processus de flash en cours. Veuillez ne pas déconnecter l'imprimante !"
|
||||
|
||||
#: xs/src/slic3r/GUI/FirmwareDialog.cpp:145
|
||||
msgid "Flashing succeeded!"
|
||||
msgstr "Flash effectué avec succès !"
|
||||
|
||||
#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:466
|
||||
msgid "Flow"
|
||||
msgstr "Flux"
|
||||
|
|
@ -1555,10 +1603,9 @@ msgstr "Hauteur de la jupe exprimée en couches. Mettez une valeur élevée pour
|
|||
msgid "Hello, welcome to Slic3r Prusa Edition! This %s helps you with the initial configuration; just a few settings and you will be ready to print."
|
||||
msgstr "Bonjour, bienvenu dans Slic3r Prusa Edition ! Ce %s vous aide à la configuration initiale ; juste quelques paramètres et vous serez prêt à imprimer."
|
||||
|
||||
#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:223
|
||||
#, c-format
|
||||
msgid "Here you can adjust required purging volume (mm%s) for any given pair of tools."
|
||||
msgstr "Ici, vous pouvez ajuster le volume de purge requis (mm%s) pour chaque paire d'outils."
|
||||
#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:218
|
||||
msgid "Here you can adjust required purging volume (mm³) for any given pair of tools."
|
||||
msgstr "Ici vous pouvez ajuster le volume de purge nécessaire (mm³) pour une paire d'outils donnée."
|
||||
|
||||
#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:329
|
||||
msgid "Horizontal shells"
|
||||
|
|
@ -1745,10 +1792,6 @@ msgstr "Remplissage interne"
|
|||
msgid "Invalid API key"
|
||||
msgstr "Clé API invalide"
|
||||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:950
|
||||
msgid "Invalid rotation angle entered"
|
||||
msgstr "Angle de rotation entré invalide"
|
||||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1031
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1035
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1056
|
||||
|
|
@ -1966,14 +2009,14 @@ msgstr "Vitesse d'impression minimale"
|
|||
msgid "min slic3r version"
|
||||
msgstr "version minimale de slic3r"
|
||||
|
||||
#: xs/src/libslic3r/PrintConfig.cpp:951
|
||||
msgid "Minimal filament extrusion length"
|
||||
msgstr "Longueur minimale d'extrusion de filament"
|
||||
|
||||
#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1040
|
||||
msgid "Minimum detail resolution, used to simplify the input file for speeding up the slicing job and reducing memory usage. High-resolution models often carry more detail than printers can render. Set to zero to disable any simplification and use full resolution from input."
|
||||
msgstr "Résolution minimale pour les détails, utilisée pour simplifier le fichier d'entrée afin d'accélérer le découpage et de réduire l'utilisation de la mémoire. Les modèles haute-résolution possèdent souvent plus de détails que ce que les imprimantes peuvent produire. Mettez à zéro pour désactiver toute simplification et utiliser la résolution complète de l'entrée."
|
||||
|
||||
#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:874
|
||||
msgid "Minimum extrusion length"
|
||||
msgstr "Longueur d'extrusion minimale"
|
||||
|
||||
#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1050
|
||||
msgid "Minimum travel after retraction"
|
||||
msgstr "Trajet minimal après une rétraction"
|
||||
|
|
@ -2284,9 +2327,9 @@ msgstr "Ouvrir un modèle"
|
|||
msgid "Open CA certificate file"
|
||||
msgstr "Ouvrir le fichier de certificat CA"
|
||||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:251
|
||||
msgid "Open STL/OBJ/AMF…\tCtrl+O"
|
||||
msgstr "Ouvrir STL/OBJ/AMF…\tCtrl+O"
|
||||
#: lib/Slic3r/GUI/MainFrame.pm:194
|
||||
msgid "Open STL/OBJ/AMF/3MF…\tCtrl+O"
|
||||
msgstr "Ouvrir STL/OBJ/AMF/3MF…\tCtrl+O"
|
||||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2102
|
||||
msgid "Open the 3D cutting tool"
|
||||
|
|
@ -2414,6 +2457,10 @@ msgstr "Placer une copie supplémentaire de l'objet sélectionné"
|
|||
msgid "Plater"
|
||||
msgstr "Plateau"
|
||||
|
||||
#: lib/Slic3r/GUI/Plater.pm:1897
|
||||
msgid "Please install the OpenGL modules to use this feature (see build instructions)."
|
||||
msgstr "Veuillez installer les modules OpenGL pour pouvoir utiliser cette fonctionnalité (voir les instructions de montage)."
|
||||
|
||||
#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1199
|
||||
msgid "Position (for multi-extruder printers)"
|
||||
msgstr "Position (pour les imprimantes multi-extrudeurs)"
|
||||
|
|
@ -2531,6 +2578,10 @@ msgstr "Traitement du fichier d'entrée\n"
|
|||
msgid "Profile dependencies"
|
||||
msgstr "Dépendances du profil"
|
||||
|
||||
#: xs/src/slic3r/GUI/FirmwareDialog.cpp:300
|
||||
msgid "Progress:"
|
||||
msgstr "Progression :"
|
||||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:385
|
||||
msgid "Prusa 3D Drivers"
|
||||
msgstr "Drivers Prusa 3D"
|
||||
|
|
@ -2617,6 +2668,10 @@ msgstr "Réglages de l'expulsion"
|
|||
msgid "Re-configure"
|
||||
msgstr "Reconfigurer"
|
||||
|
||||
#: xs/src/slic3r/GUI/FirmwareDialog.cpp:297
|
||||
msgid "Ready"
|
||||
msgstr "Prêt"
|
||||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:372
|
||||
msgid "Rear"
|
||||
msgstr "Arrière"
|
||||
|
|
@ -2694,6 +2749,15 @@ msgstr "Signaler un problème"
|
|||
msgid "Report an issue on the Slic3r Prusa Edition"
|
||||
msgstr "Signaler un problème sur la Prusa Edition de Slic3r"
|
||||
|
||||
#: xs/src/slic3r/Utils/PresetUpdater.cpp:514
|
||||
#, c-format
|
||||
msgid "requires min. %s and max. %s"
|
||||
msgstr "nécessite min. %s et max. %s"
|
||||
|
||||
#: xs/src/slic3r/GUI/FirmwareDialog.cpp:288
|
||||
msgid "Rescan"
|
||||
msgstr "Scanner à nouveau"
|
||||
|
||||
#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:995
|
||||
msgid "Rescan serial ports"
|
||||
msgstr "Rescanner les ports série"
|
||||
|
|
@ -2759,10 +2823,6 @@ msgstr "Pivoter de 45° dans le sens des aiguilles d'une montre"
|
|||
msgid "Rotate 45° counter-clockwise"
|
||||
msgstr "Pivoter de 45° dans le sens inverse des aiguilles d'une montre"
|
||||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:950
|
||||
msgid "Rotate around "
|
||||
msgstr "Pivoter autour de "
|
||||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2034
|
||||
msgid "Rotate the selected object by 45° clockwise"
|
||||
msgstr "Pivoter l'objet sélectionné de 45° dans le sens des aiguilles d'une montre"
|
||||
|
|
@ -2812,6 +2872,10 @@ msgstr "Enregistrer la configuration sous :"
|
|||
msgid "Save current "
|
||||
msgstr "Enregistrer l'état actuel "
|
||||
|
||||
#: lib/Slic3r/GUI/Plater.pm:1399
|
||||
msgid "Save G-code file as:"
|
||||
msgstr "Sauvegarder le fichier G-code en tant que :"
|
||||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:580
|
||||
msgid "Save OBJ file (less prone to coordinate errors than STL) as:"
|
||||
msgstr "Enregistrer le fichier OBJ (moins enclin aux erreurs de coordonnées que le STL) sous :"
|
||||
|
|
@ -2956,6 +3020,10 @@ msgstr "Port série"
|
|||
msgid "Serial port speed"
|
||||
msgstr "Vitesse du port série"
|
||||
|
||||
#: xs/src/slic3r/GUI/FirmwareDialog.cpp:286
|
||||
msgid "Serial port:"
|
||||
msgstr "Port série :"
|
||||
|
||||
#: xs/src/slic3r/GUI/BonjourDialog.cpp:68
|
||||
msgid "Service name"
|
||||
msgstr "Nom du service"
|
||||
|
|
@ -3034,6 +3102,10 @@ msgstr "Coques"
|
|||
msgid "Show"
|
||||
msgstr "Afficher"
|
||||
|
||||
#: lib/Slic3r/GUI/MainFrame.pm:337
|
||||
msgid "Show &Configuration Folder"
|
||||
msgstr "Afficher le Répertoire de &Configuration"
|
||||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:408
|
||||
msgid "Show about dialog"
|
||||
msgstr "Afficher la boîte de dialogue à propos"
|
||||
|
|
@ -3074,6 +3146,10 @@ msgstr "Afficher le contrôleur de l'imprimante"
|
|||
msgid "Show the printer settings"
|
||||
msgstr "Afficher les réglages de l'imprimante"
|
||||
|
||||
#: lib/Slic3r/GUI/MainFrame.pm:337
|
||||
msgid "Show user configuration folder (datadir)"
|
||||
msgstr "Afficher le répertoire de configuration utilisateur (datadir)"
|
||||
|
||||
#: xs/src/slic3r/GUI/Tab.cpp:1716 xs/src/slic3r/GUI/Tab.cpp:1722
|
||||
msgid "Single extruder MM setup"
|
||||
msgstr "Réglage MM pour extrudeur unique"
|
||||
|
|
@ -3382,6 +3458,10 @@ msgstr "G-code de début"
|
|||
msgid "Start new slicing process"
|
||||
msgstr "Démarrer un nouveau processus de découpe"
|
||||
|
||||
#: xs/src/slic3r/GUI/FirmwareDialog.cpp:296
|
||||
msgid "Status:"
|
||||
msgstr "État :"
|
||||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1539
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:1581
|
||||
msgid "STL file exported to "
|
||||
|
|
@ -4045,6 +4125,10 @@ msgstr "Les mises à jour ne sont jamais appliquées sans l'accord de l'utilisat
|
|||
msgid "Upgrade"
|
||||
msgstr "Mise à jour"
|
||||
|
||||
#: xs/src/slic3r/GUI/GUI.cpp:326
|
||||
msgid "Upload a firmware image into an Arduino based printer"
|
||||
msgstr "Charger un firmware dans une imprimante basée sur un Arduino"
|
||||
|
||||
#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:989
|
||||
msgid "USB/Serial connection"
|
||||
msgstr "Port USB/Série"
|
||||
|
|
@ -4142,10 +4226,9 @@ msgstr "Vue"
|
|||
msgid "Volume"
|
||||
msgstr "Volume"
|
||||
|
||||
#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:246
|
||||
#, c-format
|
||||
msgid "Volume to purge (mm%s) when the filament is being"
|
||||
msgstr "Volume à purger (mm%s) quand le filament est en train d'être"
|
||||
#: xs/src/slic3r/GUI/WipeTowerDialog.cpp:241
|
||||
msgid "Volume to purge (mm³) when the filament is being"
|
||||
msgstr "Volume à purger (mm³) lorsque le filament est"
|
||||
|
||||
#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:214
|
||||
msgid "Volumetric"
|
||||
|
|
|
|||
Binary file not shown.
|
|
@ -97,7 +97,7 @@ msgstr " jako:"
|
|||
#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:226
|
||||
#, c-format
|
||||
msgid " at filament speed %3.2f mm/s."
|
||||
msgstr " z prędkocią filamentu %3.2f mm/s."
|
||||
msgstr " z prędkością filamentu %3.2f mm/s."
|
||||
|
||||
#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:1035
|
||||
msgid " Browse "
|
||||
|
|
@ -574,7 +574,7 @@ msgstr "G-code wykonywany przy przejściach pomiędzy modelami (druk sekwencyjny
|
|||
#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:68
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:370
|
||||
msgid "Bottom"
|
||||
msgstr "Spód"
|
||||
msgstr "Dolne"
|
||||
|
||||
#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:72
|
||||
msgid "Bottom solid layers"
|
||||
|
|
@ -834,7 +834,7 @@ msgstr "Własne ustawienia"
|
|||
#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:205
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2102
|
||||
msgid "Cut…"
|
||||
msgstr "Tnij…"
|
||||
msgstr "Obcinanie..."
|
||||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2027
|
||||
msgid "Decrease copies"
|
||||
|
|
@ -859,7 +859,7 @@ msgstr "Domyślny kąt linii wypełnienia. Mosty będą wypełniane z użyciem n
|
|||
|
||||
#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:376
|
||||
msgid "Default extrusion width"
|
||||
msgstr "Domyślna szerokość ekstrudowanej linii"
|
||||
msgstr "Domyślna szerokość linii"
|
||||
|
||||
#: xs/src/slic3r/GUI/Tab.cpp:767
|
||||
msgid "default filament profile"
|
||||
|
|
@ -1166,7 +1166,7 @@ msgstr "Funkcja eksperymentalna mająca zapobiegać tworzeniu podpór pod mostam
|
|||
|
||||
#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:942
|
||||
msgid "Experimental option to adjust flow for overhangs (bridge flow will be used), to apply bridge speed to them and enable fan."
|
||||
msgstr "Opcja eksperymentalna dostosowująca przepływ przy zwisach (zostanie zastosowany przepływ taki jak dla mostów), zastosuje również prędkość taką jak dla mostów i chłodzenie."
|
||||
msgstr "Opcja eksperymentalna dostosowująca przepływ przy zwisach (zostanie zastosowany przepływ taki jak dla mostów), zastosuje również prędkość i chłodzenie takie jak dla mostów."
|
||||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:263
|
||||
msgid "Export all presets to file"
|
||||
|
|
@ -1248,7 +1248,7 @@ msgstr "Obrysy zewnętrzne"
|
|||
|
||||
#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:151
|
||||
msgid "external perimeters"
|
||||
msgstr "obrysy zewnętrzne"
|
||||
msgstr "obrysów zewnętrznych"
|
||||
|
||||
#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:289
|
||||
msgid "External perimeters first"
|
||||
|
|
@ -1399,7 +1399,7 @@ msgstr "Właściwości filamentu"
|
|||
|
||||
#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.hpp:202
|
||||
msgid "Filament Settings"
|
||||
msgstr "Ustawienia filamentu"
|
||||
msgstr "Ustawienia Filamentu"
|
||||
|
||||
#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:450
|
||||
msgid "Filament type"
|
||||
|
|
@ -1478,7 +1478,7 @@ msgstr "Prędkość pierwszej warstwy"
|
|||
|
||||
#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:214
|
||||
msgid "First layer volumetric"
|
||||
msgstr "Objętościowa pierwszej warstwy"
|
||||
msgstr "Na pierwszej warstwie"
|
||||
|
||||
#: xs/src/slic3r/GUI/GUI.cpp:326
|
||||
msgid "Flash printer firmware"
|
||||
|
|
@ -1651,7 +1651,7 @@ msgstr "Włączenie powoduje pobieranie wbudowanych systemowych zestawów ustawi
|
|||
#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:26
|
||||
#, c-format
|
||||
msgid "If estimated layer time is below ~%ds, fan will run at %d%% and print speed will be reduced so that no less than %ds are spent on that layer (however, speed will never be reduced below %dmm/s)."
|
||||
msgstr "Jeśli szacowany czas druku warstwy jest mniejszy niż ~%d s, wentylator będzie pracował na %d %% a prędkość druku zostanie obniżona tak, aby warstwa była drukowana przez nie mniej niż %d s (jednakże prędkość nie zostanie obniżona poniżej %d mm/s)."
|
||||
msgstr "Jeśli szacowany czas druku warstwy jest niższy niż ~%d s, wentylator będzie pracował na %d %% a prędkość druku zostanie obniżona tak, aby warstwa była drukowana przez nie mniej niż %d s (jednakże prędkość nie zejdzie poniżej %d mm/s)."
|
||||
|
||||
#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:616
|
||||
msgid "If expressed as absolute value in mm/s, this speed will be applied to all the print moves of the first layer, regardless of their type. If expressed as a percentage (for example: 40%) it will scale the default speeds."
|
||||
|
|
@ -1659,11 +1659,11 @@ msgstr "Jeśli ustawisz wartość bezwzględną wyrażoną w mm/s, taka prędko
|
|||
|
||||
#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:395
|
||||
msgid "If layer print time is estimated below this number of seconds, fan will be enabled and its speed will be calculated by interpolating the minimum and maximum speeds."
|
||||
msgstr "Jeśli szacowany czas druku warstwy będzie mniejszy niż ta wartość to wentylator będzie włączony a jego prędkość będzie interpolowana na podstawie górnego i dolnego limitu prędkości."
|
||||
msgstr "Jeśli szacowany czas druku warstwy będzie niższy niż ta wartość to wentylator będzie włączony a jego prędkość będzie interpolowana na podstawie górnego i dolnego limitu prędkości."
|
||||
|
||||
#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1240
|
||||
msgid "If layer print time is estimated below this number of seconds, print moves speed will be scaled down to extend duration to this value."
|
||||
msgstr "Jeśli szacowany czas druku warstwy będzie mniejszy niż ta wartość to prędkość ruchów drukujących będzie zmniejszona aby wydłużyć czas druku."
|
||||
msgstr "Jeśli szacowany czas druku warstwy będzie niższy niż ta wartość to prędkość ruchów drukujących będzie zmniejszona aby wydłużyć czas druku."
|
||||
|
||||
#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:388
|
||||
msgid "If this is enabled, fan will never be disabled and will be kept running at least at its minimum speed. Useful for PLA, harmful for ABS."
|
||||
|
|
@ -1742,7 +1742,7 @@ msgstr "Wypełnienie"
|
|||
|
||||
#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:169
|
||||
msgid "infill"
|
||||
msgstr "wypełnienie"
|
||||
msgstr "wypełnienia"
|
||||
|
||||
#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:720
|
||||
msgid "Infill before perimeters"
|
||||
|
|
@ -1987,7 +1987,7 @@ msgstr "Maksymalny objętościowo kąt pozytywny"
|
|||
#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:421
|
||||
#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:817
|
||||
msgid "Max volumetric speed"
|
||||
msgstr "Maksymalna prędkość objętościowa"
|
||||
msgstr "Maksymalny przepływ"
|
||||
|
||||
#: xs/src/libslic3r/PrintConfig.cpp:1854
|
||||
msgid "Maximal bridging distance"
|
||||
|
|
@ -2220,7 +2220,7 @@ msgstr "Nowa wersja:"
|
|||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:469
|
||||
msgid "No previously sliced file."
|
||||
msgstr "Brak poprzednio pociętych pliku."
|
||||
msgstr "Brak poprzednio pociętych plików."
|
||||
|
||||
#: xs/src/slic3r/GUI/RammingChart.cpp:28
|
||||
msgid "NO RAMMING AT ALL"
|
||||
|
|
@ -2325,7 +2325,7 @@ msgstr "Retrakcja tylko przy przechodzeniu nad obrysami"
|
|||
|
||||
#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:438
|
||||
msgid "Ooze prevention"
|
||||
msgstr "Zapobieganie wyciekom"
|
||||
msgstr "Zapobieganie wyciekom (ooze)"
|
||||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:251
|
||||
msgid "Open a model"
|
||||
|
|
@ -2341,7 +2341,7 @@ msgstr "Otwórz plik STL/OBJ/AMF/3MF... \tCrtl+O"
|
|||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2102
|
||||
msgid "Open the 3D cutting tool"
|
||||
msgstr "Otwórz narzędzie do przecinania 3D"
|
||||
msgstr "Otwórz narzędzie do wycinania 3D"
|
||||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:2106
|
||||
msgid "Open the object editor dialog"
|
||||
|
|
@ -2463,7 +2463,7 @@ msgstr "Umieść jedną kopię zaznaczonego modelu"
|
|||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:118
|
||||
msgid "Plater"
|
||||
msgstr "Zawartość stołu"
|
||||
msgstr "Zawartość Stołu"
|
||||
|
||||
#: lib/Slic3r/GUI/Plater.pm:1897
|
||||
msgid "Please install the OpenGL modules to use this feature (see build instructions)."
|
||||
|
|
@ -2691,7 +2691,7 @@ msgstr "Widok z tyłu"
|
|||
#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:262
|
||||
#, c-format
|
||||
msgid "Recommended object thin wall thickness for layer height %.2f and "
|
||||
msgstr "Zalecana grubość ściany obiektu dla danej wysokości warstwy %.2f i "
|
||||
msgstr "Zalecana grubość ściany modelu dla wysokości warstwy %.2f i "
|
||||
|
||||
#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:245
|
||||
msgid "Recommended object thin wall thickness: Not available due to invalid layer height."
|
||||
|
|
@ -3265,23 +3265,23 @@ msgstr "Slic3r nie będzie skalował prędkości poniżej tej wartości."
|
|||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:268
|
||||
msgid "Slice a file into a G-code"
|
||||
msgstr "Potnij plik jako G-code"
|
||||
msgstr "Cięcie jako G-code"
|
||||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:274
|
||||
msgid "Slice a file into a G-code, save as"
|
||||
msgstr "Potnij plik jako G-code, zapisz jako"
|
||||
msgstr "Cięcie jako G-code, zapisz jako"
|
||||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:287
|
||||
msgid "Slice file to a multi-layer SVG"
|
||||
msgstr "Potnij plik jako wielowarstwowy SVG"
|
||||
msgstr "Cięcie jako wielowarstwowy SVG"
|
||||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:237
|
||||
msgid "Slice now"
|
||||
msgstr "Potnij teraz"
|
||||
msgstr "Cięcie"
|
||||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:287
|
||||
msgid "Slice to SV&G…\tCtrl+G"
|
||||
msgstr "Tnij do SV&G...\tCtrl+G"
|
||||
msgstr "Cięcie do SV&G...\tCtrl+G"
|
||||
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\Plater.pm:438
|
||||
msgid "Sliced Info"
|
||||
|
|
@ -3485,7 +3485,7 @@ msgstr "podpora"
|
|||
|
||||
#: xs/src/slic3r/GUI/GUI.cpp:879
|
||||
msgid "Support"
|
||||
msgstr "Wsparcie"
|
||||
msgstr "Podpory"
|
||||
|
||||
#: c:\src\Slic3r\xs\src\slic3r\GUI\Tab.cpp:620
|
||||
msgid "Support Generator"
|
||||
|
|
@ -4011,7 +4011,7 @@ msgstr "Parametry zmiany narzędzia dla drukarek MM z jednym ekstruderem"
|
|||
#: C:\src\Slic3r\xs\src\libslic3r\PrintConfig.cpp:1638
|
||||
#: c:\src\Slic3r\lib\Slic3r\GUI\MainFrame.pm:369
|
||||
msgid "Top"
|
||||
msgstr "Szczyt"
|
||||
msgstr "Górne"
|
||||
|
||||
#: c:\src\Slic3r\xs\src\slic3r\GUI\PresetHints.cpp:187
|
||||
msgid "top solid infill"
|
||||
|
|
|
|||
|
|
@ -211,7 +211,7 @@ fill_pattern = grid
|
|||
top_infill_extrusion_width = 0.4
|
||||
|
||||
[print:0.05mm ULTRADETAIL 0.25 nozzle]
|
||||
inherits = *0.05mm*
|
||||
inherits = *0.05mm*; *0.25nozzle*
|
||||
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.*/ and nozzle_diameter[0]==0.25 and num_extruders==1
|
||||
external_perimeter_extrusion_width = 0
|
||||
extrusion_width = 0.28
|
||||
|
|
@ -271,7 +271,7 @@ top_infill_extrusion_width = 0.4
|
|||
top_solid_infill_speed = 50
|
||||
|
||||
[print:0.10mm DETAIL 0.25 nozzle]
|
||||
inherits = *0.10mm*
|
||||
inherits = *0.10mm*; *0.25nozzle*
|
||||
bridge_acceleration = 600
|
||||
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK2.*/ and nozzle_diameter[0]==0.25
|
||||
external_perimeter_speed = 20
|
||||
|
|
@ -284,7 +284,7 @@ solid_infill_speed = 40
|
|||
top_solid_infill_speed = 30
|
||||
|
||||
[print:0.10mm DETAIL 0.25 nozzle MK3]
|
||||
inherits = *0.10mm*
|
||||
inherits = *0.10mm*; *0.25nozzle*
|
||||
bridge_speed = 30
|
||||
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.25
|
||||
external_perimeter_speed = 35
|
||||
|
|
@ -298,7 +298,7 @@ top_infill_extrusion_width = 0.4
|
|||
top_solid_infill_speed = 50
|
||||
|
||||
[print:0.10mm DETAIL 0.6 nozzle MK3]
|
||||
inherits = *0.10mm*
|
||||
inherits = *0.10mm*; *0.6nozzle*
|
||||
bridge_speed = 30
|
||||
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.6
|
||||
external_perimeter_speed = 35
|
||||
|
|
@ -398,7 +398,7 @@ support_material_with_sheath = 0
|
|||
support_material_xy_spacing = 80%
|
||||
|
||||
[print:0.15mm OPTIMAL 0.25 nozzle MK3]
|
||||
inherits = *0.15mm*
|
||||
inherits = *0.15mm*; *0.25nozzle*
|
||||
bridge_speed = 30
|
||||
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.25
|
||||
external_perimeter_speed = 35
|
||||
|
|
@ -424,7 +424,7 @@ top_infill_extrusion_width = 0.4
|
|||
top_solid_layers = 5
|
||||
|
||||
[print:0.15mm OPTIMAL 0.6 nozzle MK3]
|
||||
inherits = *0.15mm*
|
||||
inherits = *0.15mm*; *0.6nozzle*
|
||||
bridge_speed = 30
|
||||
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.6
|
||||
external_perimeter_speed = 35
|
||||
|
|
@ -491,7 +491,7 @@ support_material_with_sheath = 0
|
|||
support_material_xy_spacing = 80%
|
||||
|
||||
[print:0.20mm FAST 0.6 nozzle MK3]
|
||||
inherits = *0.20mm*
|
||||
inherits = *0.20mm*; *0.6nozzle*
|
||||
bridge_speed = 30
|
||||
compatible_printers_condition = printer_notes=~/.*PRINTER_VENDOR_PRUSA3D.*/ and printer_notes=~/.*PRINTER_MODEL_MK3.*/ and nozzle_diameter[0]==0.6
|
||||
external_perimeter_speed = 35
|
||||
|
|
@ -1005,7 +1005,7 @@ printer_variant = 0.25
|
|||
default_print_profile = 0.10mm DETAIL 0.25 nozzle
|
||||
|
||||
[printer:Original Prusa i3 MK2 0.6 nozzle]
|
||||
inherits = *common*
|
||||
inherits = *common*; *0.6nozzle*
|
||||
max_layer_height = 0.35
|
||||
min_layer_height = 0.1
|
||||
nozzle_diameter = 0.6
|
||||
|
|
@ -1020,7 +1020,7 @@ default_print_profile = 0.20mm NORMAL 0.6 nozzle
|
|||
inherits = *mm-single*
|
||||
|
||||
[printer:Original Prusa i3 MK2 MM Single Mode 0.6 nozzle]
|
||||
inherits = *mm-single*
|
||||
inherits = *mm-single*; *0.6nozzle*
|
||||
nozzle_diameter = 0.6
|
||||
printer_variant = 0.6
|
||||
default_print_profile = 0.20mm NORMAL 0.6 nozzle
|
||||
|
|
@ -1030,7 +1030,7 @@ inherits = *mm-multi*
|
|||
nozzle_diameter = 0.4,0.4,0.4,0.4
|
||||
|
||||
[printer:Original Prusa i3 MK2 MultiMaterial 0.6 nozzle]
|
||||
inherits = *mm-multi*
|
||||
inherits = *mm-multi*; *0.6nozzle*
|
||||
nozzle_diameter = 0.6,0.6,0.6,0.6
|
||||
printer_variant = 0.6
|
||||
default_print_profile = 0.20mm NORMAL 0.6 nozzle
|
||||
|
|
|
|||
18
resources/shaders/gouraud.fs
Normal file
18
resources/shaders/gouraud.fs
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
#version 110
|
||||
|
||||
const vec3 ZERO = vec3(0.0, 0.0, 0.0);
|
||||
|
||||
// x = tainted, y = specular;
|
||||
varying vec2 intensity;
|
||||
|
||||
varying vec3 delta_box_min;
|
||||
varying vec3 delta_box_max;
|
||||
|
||||
uniform vec4 uniform_color;
|
||||
|
||||
void main()
|
||||
{
|
||||
// if the fragment is outside the print volume -> use darker color
|
||||
vec3 color = (any(lessThan(delta_box_min, ZERO)) || any(greaterThan(delta_box_max, ZERO))) ? mix(uniform_color.rgb, ZERO, 0.3333) : uniform_color.rgb;
|
||||
gl_FragColor = vec4(vec3(intensity.y, intensity.y, intensity.y) + color * intensity.x, uniform_color.a);
|
||||
}
|
||||
70
resources/shaders/gouraud.vs
Normal file
70
resources/shaders/gouraud.vs
Normal file
|
|
@ -0,0 +1,70 @@
|
|||
#version 110
|
||||
|
||||
#define INTENSITY_CORRECTION 0.6
|
||||
|
||||
// normalized values for (-0.6/1.31, 0.6/1.31, 1./1.31)
|
||||
const vec3 LIGHT_TOP_DIR = vec3(-0.4574957, 0.4574957, 0.7624929);
|
||||
#define LIGHT_TOP_DIFFUSE (0.8 * INTENSITY_CORRECTION)
|
||||
#define LIGHT_TOP_SPECULAR (0.125 * INTENSITY_CORRECTION)
|
||||
#define LIGHT_TOP_SHININESS 20.0
|
||||
|
||||
// normalized values for (1./1.43, 0.2/1.43, 1./1.43)
|
||||
const vec3 LIGHT_FRONT_DIR = vec3(0.6985074, 0.1397015, 0.6985074);
|
||||
#define LIGHT_FRONT_DIFFUSE (0.3 * INTENSITY_CORRECTION)
|
||||
//#define LIGHT_FRONT_SPECULAR (0.0 * INTENSITY_CORRECTION)
|
||||
//#define LIGHT_FRONT_SHININESS 5.0
|
||||
|
||||
#define INTENSITY_AMBIENT 0.3
|
||||
|
||||
const vec3 ZERO = vec3(0.0, 0.0, 0.0);
|
||||
|
||||
struct PrintBoxDetection
|
||||
{
|
||||
vec3 min;
|
||||
vec3 max;
|
||||
// xyz contains the offset, if w == 1.0 detection needs to be performed
|
||||
vec4 volume_origin;
|
||||
};
|
||||
|
||||
uniform PrintBoxDetection print_box;
|
||||
|
||||
// x = tainted, y = specular;
|
||||
varying vec2 intensity;
|
||||
|
||||
varying vec3 delta_box_min;
|
||||
varying vec3 delta_box_max;
|
||||
|
||||
void main()
|
||||
{
|
||||
// First transform the normal into camera space and normalize the result.
|
||||
vec3 normal = normalize(gl_NormalMatrix * gl_Normal);
|
||||
|
||||
// Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex.
|
||||
// Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range.
|
||||
float NdotL = max(dot(normal, LIGHT_TOP_DIR), 0.0);
|
||||
|
||||
intensity.x = INTENSITY_AMBIENT + NdotL * LIGHT_TOP_DIFFUSE;
|
||||
intensity.y = 0.0;
|
||||
|
||||
if (NdotL > 0.0)
|
||||
intensity.y += LIGHT_TOP_SPECULAR * pow(max(dot(normal, reflect(-LIGHT_TOP_DIR, normal)), 0.0), LIGHT_TOP_SHININESS);
|
||||
|
||||
// Perform the same lighting calculation for the 2nd light source (no specular applied).
|
||||
NdotL = max(dot(normal, LIGHT_FRONT_DIR), 0.0);
|
||||
intensity.x += NdotL * LIGHT_FRONT_DIFFUSE;
|
||||
|
||||
// compute deltas for out of print volume detection (world coordinates)
|
||||
if (print_box.volume_origin.w == 1.0)
|
||||
{
|
||||
vec3 v = gl_Vertex.xyz + print_box.volume_origin.xyz;
|
||||
delta_box_min = v - print_box.min;
|
||||
delta_box_max = v - print_box.max;
|
||||
}
|
||||
else
|
||||
{
|
||||
delta_box_min = ZERO;
|
||||
delta_box_max = ZERO;
|
||||
}
|
||||
|
||||
gl_Position = ftransform();
|
||||
}
|
||||
40
resources/shaders/variable_layer_height.fs
Normal file
40
resources/shaders/variable_layer_height.fs
Normal file
|
|
@ -0,0 +1,40 @@
|
|||
#version 110
|
||||
|
||||
#define M_PI 3.1415926535897932384626433832795
|
||||
|
||||
// 2D texture (1D texture split by the rows) of color along the object Z axis.
|
||||
uniform sampler2D z_texture;
|
||||
// Scaling from the Z texture rows coordinate to the normalized texture row coordinate.
|
||||
uniform float z_to_texture_row;
|
||||
uniform float z_texture_row_to_normalized;
|
||||
uniform float z_cursor;
|
||||
uniform float z_cursor_band_width;
|
||||
|
||||
// x = tainted, y = specular;
|
||||
varying vec2 intensity;
|
||||
|
||||
varying float object_z;
|
||||
|
||||
void main()
|
||||
{
|
||||
float object_z_row = z_to_texture_row * object_z;
|
||||
// Index of the row in the texture.
|
||||
float z_texture_row = floor(object_z_row);
|
||||
// Normalized coordinate from 0. to 1.
|
||||
float z_texture_col = object_z_row - z_texture_row;
|
||||
float z_blend = 0.25 * cos(min(M_PI, abs(M_PI * (object_z - z_cursor) * 1.8 / z_cursor_band_width))) + 0.25;
|
||||
// Calculate level of detail from the object Z coordinate.
|
||||
// This makes the slowly sloping surfaces to be show with high detail (with stripes),
|
||||
// and the vertical surfaces to be shown with low detail (no stripes)
|
||||
float z_in_cells = object_z_row * 190.;
|
||||
// Gradient of Z projected on the screen.
|
||||
float dx_vtc = dFdx(z_in_cells);
|
||||
float dy_vtc = dFdy(z_in_cells);
|
||||
float lod = clamp(0.5 * log2(max(dx_vtc * dx_vtc, dy_vtc * dy_vtc)), 0., 1.);
|
||||
// Sample the Z texture. Texture coordinates are normalized to <0, 1>.
|
||||
vec4 color = mix(texture2D(z_texture, vec2(z_texture_col, z_texture_row_to_normalized * (z_texture_row + 0.5 )), -10000.),
|
||||
texture2D(z_texture, vec2(z_texture_col, z_texture_row_to_normalized * (z_texture_row * 2. + 1.)), 10000.), lod);
|
||||
|
||||
// Mix the final color.
|
||||
gl_FragColor = vec4(intensity.y, intensity.y, intensity.y, 1.0) + intensity.x * mix(color, vec4(1.0, 1.0, 0.0, 1.0), z_blend);
|
||||
}
|
||||
46
resources/shaders/variable_layer_height.vs
Normal file
46
resources/shaders/variable_layer_height.vs
Normal file
|
|
@ -0,0 +1,46 @@
|
|||
#version 110
|
||||
|
||||
#define INTENSITY_CORRECTION 0.6
|
||||
|
||||
const vec3 LIGHT_TOP_DIR = vec3(-0.4574957, 0.4574957, 0.7624929);
|
||||
#define LIGHT_TOP_DIFFUSE (0.8 * INTENSITY_CORRECTION)
|
||||
#define LIGHT_TOP_SPECULAR (0.125 * INTENSITY_CORRECTION)
|
||||
#define LIGHT_TOP_SHININESS 20.0
|
||||
|
||||
const vec3 LIGHT_FRONT_DIR = vec3(0.6985074, 0.1397015, 0.6985074);
|
||||
#define LIGHT_FRONT_DIFFUSE (0.3 * INTENSITY_CORRECTION)
|
||||
//#define LIGHT_FRONT_SPECULAR (0.0 * INTENSITY_CORRECTION)
|
||||
//#define LIGHT_FRONT_SHININESS 5.0
|
||||
|
||||
#define INTENSITY_AMBIENT 0.3
|
||||
|
||||
// x = tainted, y = specular;
|
||||
varying vec2 intensity;
|
||||
|
||||
varying float object_z;
|
||||
|
||||
void main()
|
||||
{
|
||||
// First transform the normal into camera space and normalize the result.
|
||||
vec3 normal = normalize(gl_NormalMatrix * gl_Normal);
|
||||
|
||||
// Compute the cos of the angle between the normal and lights direction. The light is directional so the direction is constant for every vertex.
|
||||
// Since these two are normalized the cosine is the dot product. We also need to clamp the result to the [0,1] range.
|
||||
float NdotL = max(dot(normal, LIGHT_TOP_DIR), 0.0);
|
||||
|
||||
intensity.x = INTENSITY_AMBIENT + NdotL * LIGHT_TOP_DIFFUSE;
|
||||
intensity.y = 0.0;
|
||||
|
||||
if (NdotL > 0.0)
|
||||
intensity.y += LIGHT_TOP_SPECULAR * pow(max(dot(normal, reflect(-LIGHT_TOP_DIR, normal)), 0.0), LIGHT_TOP_SHININESS);
|
||||
|
||||
// Perform the same lighting calculation for the 2nd light source (no specular)
|
||||
NdotL = max(dot(normal, LIGHT_FRONT_DIR), 0.0);
|
||||
|
||||
intensity.x += NdotL * LIGHT_FRONT_DIFFUSE;
|
||||
|
||||
// Scaled to widths of the Z texture.
|
||||
object_z = gl_Vertex.z;
|
||||
|
||||
gl_Position = ftransform();
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue