archive-gh-me/MeteoInfo
1
0
Fork 0
mirror of https://github.com/meteoinfo/MeteoInfo.git synced 2025-12-08 20:36:05 +00:00
Code Issues Projects Releases Wiki Activity

to version 3.5.1

Browse Source
This commit is contained in:
wyq 2022-12-30 16:23:42 +08:00
parent 78adc06e7a
commit ef92f093f2
21 changed files with 94 additions and 67 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
meteoinfo-chart/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>MeteoInfo</artifactId>
<groupId>org.meteothink</groupId>
<version>3.5</version>
<version>3.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

111
meteoinfo-chart/src/main/java/org/meteoinfo/chart/jogl/Lighting.java
View File

@ -22,11 +22,11 @@ public class Lighting {
float[] diffuse;
float[] specular;
float[] position;
float[] mat_ambient;
float[] mat_diffuse;
float[] mat_specular;
float[] mat_emission;
float mat_shininess;
float[] materialAmbient;
float[] materialDiffuse;
float[] materialSpecular;
float[] materialEmission;
float materialShininess;
/**
* Constructor
@ -50,11 +50,11 @@ public class Lighting {
this.position = new float[]{0.f, 0.f, 1.f, 0.f};
else
this.position = new float[]{1.f, 1.f, 2.f, 1.f};
this.mat_ambient = new float[]{0.2f, 0.2f, 0.2f, 1.f};
this.mat_diffuse = new float[]{0.8f, 0.8f, 0.8f, 1.f};
this.mat_specular = new float[]{ 0.0f, 0.0f, 0.0f, 1.0f };
this.mat_emission = new float[]{ 0.0f, 0.0f, 0.0f, 1.0f };
this.mat_shininess = 50.0f;
this.materialAmbient = new float[]{0.2f, 0.2f, 0.2f, 1.f};
this.materialDiffuse = new float[]{0.8f, 0.8f, 0.8f, 1.f};
this.materialSpecular = new float[]{ 0.0f, 0.0f, 0.0f, 1.0f };
this.materialEmission = new float[]{ 0.0f, 0.0f, 0.0f, 1.0f };
this.materialShininess = 50.0f;
}
/**
@ -92,6 +92,15 @@ public class Lighting {
public void setAmbient(float[] value) {
this.ambient = value;
}
/**
* Set ambient
*
* @param value Ambient
*/
public void setAmbient(float value) {
this.ambient = new float[]{value, value, value, 1};
}
/**
* Set ambient
@ -133,6 +142,15 @@ public class Lighting {
public void setDiffuse(float[] value) {
this.diffuse = value;
}
/**
* Get diffuse
*
* @param value Diffuse
*/
public void setDiffuse(float value) {
this.diffuse = new float[]{value, value, value, 1};
}
/**
* Set diffuse
@ -170,8 +188,8 @@ public class Lighting {
* Get material shininess
* @return Material shininess
*/
public float getMat_shininess() {
return this.mat_shininess;
public float getMaterialShininess() {
return this.materialShininess;
}
/**
@ -182,6 +200,15 @@ public class Lighting {
public void setSpecular(float[] value) {
this.specular = value;
}
/**
* Set specular
*
* @param value Specular
*/
public void setSpecular(float value) {
this.specular = new float[]{value, value, value, 1};
}
/**
* Set specular
@ -242,8 +269,8 @@ public class Lighting {
* Set material ambient light
* @param value Material ambient light
*/
public void setMat_Ambient(float[] value) {
this.mat_ambient = value;
public void setMaterialAmbient(float[] value) {
this.materialAmbient = value;
}
/**
@ -251,12 +278,12 @@ public class Lighting {
*
* @param value Material ambient light
*/
public void setMat_Ambient(List value) {
public void setMaterialAmbient(List value) {
if (value.size() < 4) {
return;
}
this.mat_ambient = new float[]{(float) value.get(0), (float) value.get(1), (float) value.get(2),
this.materialAmbient = new float[]{(float) value.get(0), (float) value.get(1), (float) value.get(2),
(float) value.get(3)};
}
@ -264,16 +291,16 @@ public class Lighting {
* Set material ambient light
* @param value Material ambient light value
*/
public void setMat_Ambient(float value) {
this.mat_ambient = new float[]{value, value, value, 1};
public void setMaterialAmbient(float value) {
this.materialAmbient = new float[]{value, value, value, 1};
}
/**
* Set material diffuse light
* @param value Material diffuse light
*/
public void setMat_Diffuse(float[] value) {
this.mat_diffuse = value;
public void setMaterialDiffuse(float[] value) {
this.materialDiffuse = value;
}
/**
@ -281,12 +308,12 @@ public class Lighting {
*
* @param value Material diffuse light
*/
public void setMat_Diffuse(List value) {
public void setMaterialDiffuse(List value) {
if (value.size() < 4) {
return;
}
this.mat_diffuse = new float[]{(float) value.get(0), (float) value.get(1), (float) value.get(2),
this.materialDiffuse = new float[]{(float) value.get(0), (float) value.get(1), (float) value.get(2),
(float) value.get(3)};
}
@ -294,16 +321,16 @@ public class Lighting {
* Set material diffuse light
* @param value Material diffuse light value
*/
public void setMat_Diffuse(float value) {
this.mat_diffuse = new float[]{value, value, value, 1};
public void setMaterialDiffuse(float value) {
this.materialDiffuse = new float[]{value, value, value, 1};
}
/**
* Set material specular light
* @param value Material specular light
*/
public void setMat_Specular(float[] value) {
this.mat_specular = value;
public void setMaterialSpecular(float[] value) {
this.materialSpecular = value;
}
/**
@ -311,12 +338,12 @@ public class Lighting {
*
* @param value Material specular light
*/
public void setMat_Specular(List value) {
public void setMaterialSpecular(List value) {
if (value.size() < 4) {
return;
}
this.mat_specular = new float[]{(float) value.get(0), (float) value.get(1), (float) value.get(2),
this.materialSpecular = new float[]{(float) value.get(0), (float) value.get(1), (float) value.get(2),
(float) value.get(3)};
}
@ -324,16 +351,16 @@ public class Lighting {
* Set material specular light
* @param value Material specular light
*/
public void setMat_Specular(float value) {
this.mat_specular = new float[]{value, value, value, 1};
public void setMaterialSpecular(float value) {
this.materialSpecular = new float[]{value, value, value, 1};
}
/**
* Set material emission light
* @param value Material emission light
*/
public void setMat_Emission(float[] value) {
this.mat_emission = value;
public void setMaterialEmission(float[] value) {
this.materialEmission = value;
}
/**
@ -341,12 +368,12 @@ public class Lighting {
*
* @param value Material emission light
*/
public void setMat_Emission(List value) {
public void setMaterialEmission(List value) {
if (value.size() < 4) {
return;
}
this.mat_emission = new float[]{(float) value.get(0), (float) value.get(1), (float) value.get(2),
this.materialEmission = new float[]{(float) value.get(0), (float) value.get(1), (float) value.get(2),
(float) value.get(3)};
}
@ -354,16 +381,16 @@ public class Lighting {
* Set material emission light
* @param value Material emission light value
*/
public void setMat_Emission(float value) {
this.mat_emission = new float[]{value, value, value, 1};
public void setMaterialEmission(float value) {
this.materialEmission = new float[]{value, value, value, 1};
}
/**
* Set material shininess
* @param value Material shininess
*/
public void setMat_Shininess(float value) {
this.mat_shininess = value;
public void setMaterialShininess(float value) {
this.materialShininess = value;
}
/**
@ -395,10 +422,10 @@ public class Lighting {
//gl.glLightfv(this.light, GL2.GL_POSITION, position, 0);
//Material
gl.glMaterialfv(GL2.GL_FRONT_AND_BACK, GL2.GL_AMBIENT, mat_ambient, 0);
gl.glMaterialfv(GL2.GL_FRONT_AND_BACK, GL2.GL_DIFFUSE, mat_diffuse, 0);
gl.glMaterialfv(GL2.GL_FRONT_AND_BACK, GL2.GL_SPECULAR, mat_specular, 0);
gl.glMaterialf(GL2.GL_FRONT_AND_BACK, GL2.GL_SHININESS, mat_shininess);
gl.glMaterialfv(GL2.GL_FRONT_AND_BACK, GL2.GL_AMBIENT, materialAmbient, 0);
gl.glMaterialfv(GL2.GL_FRONT_AND_BACK, GL2.GL_DIFFUSE, materialDiffuse, 0);
gl.glMaterialfv(GL2.GL_FRONT_AND_BACK, GL2.GL_SPECULAR, materialSpecular, 0);
gl.glMaterialf(GL2.GL_FRONT_AND_BACK, GL2.GL_SHININESS, materialShininess);
}
/**

2
meteoinfo-common/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>MeteoInfo</artifactId>
<groupId>org.meteothink</groupId>
<version>3.5</version>
<version>3.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
meteoinfo-common/src/main/java/org/meteoinfo/common/util/GlobalUtil.java
View File

@ -67,7 +67,7 @@ import java.util.zip.ZipInputStream;
public static String getVersion(){
String version = GlobalUtil.class.getPackage().getImplementationVersion();
if (version == null || version.equals("")) {
version = "3.5";
version = "3.5.1";
}
return version;
}

2
meteoinfo-console/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>MeteoInfo</artifactId>
<groupId>org.meteothink</groupId>
<version>3.5</version>
<version>3.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
meteoinfo-data/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>MeteoInfo</artifactId>
<groupId>org.meteothink</groupId>
<version>3.5</version>
<version>3.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
meteoinfo-dataframe/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>MeteoInfo</artifactId>
<groupId>org.meteothink</groupId>
<version>3.5</version>
<version>3.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
meteoinfo-geo/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>MeteoInfo</artifactId>
<groupId>org.meteothink</groupId>
<version>3.5</version>
<version>3.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
meteoinfo-geometry/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>MeteoInfo</artifactId>
<groupId>org.meteothink</groupId>
<version>3.5</version>
<version>3.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
meteoinfo-image/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>MeteoInfo</artifactId>
<groupId>org.meteothink</groupId>
<version>3.5</version>
<version>3.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

6
meteoinfo-lab/milconfig.xml
View File

@ -1,6 +1,6 @@
<?xml version="1.0" encoding="UTF-8" standalone="no"?>
<MeteoInfo File="milconfig.xml" Type="configurefile">
<Path OpenPath="D:\Working\MIScript\Jython\mis\common_math\special">
<Path OpenPath="D:\Working\MIScript\Jython\mis\plot_types\funny">
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\map\topology"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\LaSW"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\LaSW\airship"/>
@ -12,10 +12,10 @@
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\3d"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\others"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\funny"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\common_math\special"/>
<RecentFolder Folder="D:\Working\MIScript\Jython\mis\plot_types\funny"/>
</Path>
<File>
<OpenedFiles>
@ -34,5 +34,5 @@
</Font>
<LookFeel DockWindowDecorated="true" LafDecorated="true" Name="FlatDarkLaf"/>
<Figure DoubleBuffering="true"/>
<Startup MainFormLocation="-7,-7" MainFormSize="1293,685"/>
<Startup MainFormLocation="-7,0" MainFormSize="1373,771"/>
</MeteoInfo>

2
meteoinfo-lab/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.meteothink</groupId>
<artifactId>MeteoInfo</artifactId>
<version>3.5</version>
<version>3.6-SNAPSHOT</version>
</parent>
<artifactId>meteoinfo-lab</artifactId>
<packaging>jar</packaging>

BIN
meteoinfo-lab/pylib/mipylib/plotlib/_axes3dgl$py.class
View File

Binary file not shown.

10
meteoinfo-lab/pylib/mipylib/plotlib/_axes3dgl.py
View File

@ -295,19 +295,19 @@ class Axes3DGL(Axes3D):
lighting.setSpecular(specular)
mat_ambient = kwargs.pop('mat_ambient', None)
if not mat_ambient is None:
lighting.setMat_Ambient(mat_ambient)
lighting.setMaterialAmbient(mat_ambient)
mat_diffuse = kwargs.pop('mat_diffuse', None)
if not mat_diffuse is None:
lighting.setMat_Diffuse(mat_diffuse)
lighting.setMaterailDiffuse(mat_diffuse)
mat_specular = kwargs.pop('mat_specular', None)
if not mat_specular is None:
lighting.setMat_Specular(mat_specular)
lighting.setMaterialSpecular(mat_specular)
mat_emission = kwargs.pop('mat_emission', None)
if not mat_emission is None:
lighting.setMat_Emission(mat_emission)
lighting.setMaterialEmission(mat_emission)
mat_shininess = kwargs.pop('mat_shininess', None)
if not mat_shininess is None:
lighting.setMat_Shininess(mat_shininess)
lighting.setMaterialShininess(mat_shininess)
def set_material(self, mvalues):
"""

2
meteoinfo-map/pom.xml
View File

@ -4,7 +4,7 @@
<parent>
<groupId>org.meteothink</groupId>
<artifactId>MeteoInfo</artifactId>
<version>3.5</version>
<version>3.6-SNAPSHOT</version>
</parent>
<artifactId>meteoinfo-map</artifactId>
<packaging>jar</packaging>

2
meteoinfo-math/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>MeteoInfo</artifactId>
<groupId>org.meteothink</groupId>
<version>3.5</version>
<version>3.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
meteoinfo-ndarray/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<groupId>org.meteothink</groupId>
<artifactId>MeteoInfo</artifactId>
<version>3.5</version>
<version>3.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
meteoinfo-projection/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>MeteoInfo</artifactId>
<groupId>org.meteothink</groupId>
<version>3.5</version>
<version>3.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
meteoinfo-table/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>MeteoInfo</artifactId>
<groupId>org.meteothink</groupId>
<version>3.5</version>
<version>3.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
meteoinfo-ui/pom.xml
View File

@ -5,7 +5,7 @@
<parent>
<artifactId>MeteoInfo</artifactId>
<groupId>org.meteothink</groupId>
<version>3.5</version>
<version>3.6-SNAPSHOT</version>
</parent>
<modelVersion>4.0.0</modelVersion>

2
pom.xml
View File

@ -3,7 +3,7 @@
<modelVersion>4.0.0</modelVersion>
<groupId>org.meteothink</groupId>
<artifactId>MeteoInfo</artifactId>
<version>3.5</version>
<version>3.6-SNAPSHOT</version>
<packaging>pom</packaging>
<parent>