Skip to content

Commit c16f56c

Browse files
committed
реализация работы со светом в редакторе модели
реализация динамического размера окна всякие фиксы
1 parent 3876dbe commit c16f56c

File tree

63 files changed

+3457
-62
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

63 files changed

+3457
-62
lines changed

build-native.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -117,7 +117,7 @@
117117
name="jME3-SpaceShift-Editor"
118118
mainClass="com.ss.editor.Starter"
119119
toolkit="fx"
120-
version="0.6.3"
120+
version="0.6.5"
121121
/>
122122

123123
<mkdir dir="build/classes/META-INF"/>
@@ -130,7 +130,7 @@
130130
<manifest>
131131
<attribute name="Implementation-Vendor" value="spaceshift.ru"/>
132132
<attribute name="Implementation-Title" value="jME3 SpaceShift Editor"/>
133-
<attribute name="Implementation-Version" value="0.6.3"/>
133+
<attribute name="Implementation-Version" value="0.6.5"/>
134134
</manifest>
135135
</fx:jar>
136136

build/package/linux/control

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
Package: jme3-spaceshift-editor
2-
Version: 0.6.3
2+
Version: 0.6.5
33
Section: tool
44
Maintainer: spaceshift.ru <[email protected]>
55
Priority: optional
81.1 KB
Binary file not shown.
Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,8 @@
1+
Material MyMaterial : Common/MatDefs/Misc/Unshaded.j3md {
2+
MaterialParameters {
3+
Color : 1.0 1.0 1.0 1.0
4+
}
5+
AdditionalRenderState {
6+
FaceCull Off
7+
}
8+
}
12.4 KB
Binary file not shown.
67.7 KB
Binary file not shown.
16.7 KB
Binary file not shown.
9.39 KB
Binary file not shown.

resources/messages/messages.properties

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,11 @@ ModelFileEditorFastSky=Fast sky
8686
ModelFileEditorNodeTree=Structure
8787
ModelFileEditorProperties=Properties
8888
ModelFileEditorNodeMesh=Mesh
89+
ModelFileEditorNodeAmbientLight=Ambient light
90+
ModelFileEditorNodeDirectionLight=Direction light
91+
ModelFileEditorNodePointLight=Point light
92+
ModelFileEditorNodeSpotLight=Spot light
93+
ModelFileEditorNodeLightProbe=Light probe
8994

9095
ModelNodeTreeActionRemove=Remove
9196
ModelNodeTreeActionRename=Rename
@@ -100,6 +105,11 @@ ModelNodeTreeActionCreatePrimitiveSphere=Sphere
100105
ModelNodeTreeActionCreatePrimitiveQuad=Quad
101106
ModelNodeTreeActionLoadModel=Load model
102107
ModelNodeTreeActionTangentGenerator=Generate tangents
108+
ModelNodeTreeActionLight=Light
109+
ModelNodeTreeActionAmbientLight=Ambient light
110+
ModelNodeTreeActionDirectionLight=Direction light
111+
ModelNodeTreeActionPointLight=Point light
112+
ModelNodeTreeActionSpotLight=Spot light
103113

104114
ModelPropertyCullHint=Cull Hint
105115
ModelPropertyShadowMode=Shadow mode
@@ -108,6 +118,11 @@ ModelPropertyLocation=Location
108118
ModelPropertyScale=Scale
109119
ModelPropertyRotation=Rotation
110120
ModelPropertyMaterial=Material
121+
ModelPropertyDirection=Direction
122+
ModelPropertyRadius=Radius
123+
ModelPropertyColor=Color
124+
ModelPropertyInnerAngle=Inner angle
125+
ModelPropertyOuterAngle=Outer angle
111126

112127
MaterialModelPropertyControlNoMaterial=No material
113128

resources/messages/messages_ru.properties

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -86,6 +86,11 @@ ModelFileEditorFastSky=Быстрый фон
8686
ModelFileEditorNodeTree=Структура
8787
ModelFileEditorProperties=Свойства
8888
ModelFileEditorNodeMesh=Сетка
89+
ModelFileEditorNodeAmbientLight=Рассеянный свет
90+
ModelFileEditorNodeDirectionLight=Направленный свет
91+
ModelFileEditorNodePointLight=Точечный источник света
92+
ModelFileEditorNodeSpotLight=Световое пятно
93+
ModelFileEditorNodeLightProbe=Цветопроба
8994

9095
ModelNodeTreeActionRemove=Удалить
9196
ModelNodeTreeActionRename=Переименовать
@@ -100,6 +105,11 @@ ModelNodeTreeActionCreatePrimitiveSphere=Сфера
100105
ModelNodeTreeActionCreatePrimitiveQuad=Плоскость
101106
ModelNodeTreeActionLoadModel=Загрузить модель
102107
ModelNodeTreeActionTangentGenerator=Сгенерировать тангенты
108+
ModelNodeTreeActionLight=Источник света
109+
ModelNodeTreeActionAmbientLight=Рассеянный свет
110+
ModelNodeTreeActionDirectionLight=Направленный свет
111+
ModelNodeTreeActionPointLight=Точечный источник света
112+
ModelNodeTreeActionSpotLight=Световое пятно
103113

104114
ModelPropertyCullHint=Cull Hint
105115
ModelPropertyShadowMode=Режим теней
@@ -108,6 +118,11 @@ ModelPropertyLocation=Положение
108118
ModelPropertyScale=Маштаб
109119
ModelPropertyRotation=Вращение
110120
ModelPropertyMaterial=Материал
121+
ModelPropertyDirection=Направление
122+
ModelPropertyRadius=Радиус
123+
ModelPropertyColor=Цвет
124+
ModelPropertyInnerAngle=Внутренний угол
125+
ModelPropertyOuterAngle=Внешний угол
111126

112127
MaterialModelPropertyControlNoMaterial=Материал отсутствует
113128

0 commit comments

Comments
 (0)